Skip to content

Commit adfaee7

Browse files
authored
fix: prevent AppIconPicker click event from propagating (#15575) (#15647)
1 parent d37490a commit adfaee7

File tree

1 file changed

+18
-16
lines changed
  • web/app/components/app/overview/settings

1 file changed

+18
-16
lines changed

web/app/components/app/overview/settings/index.tsx

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -439,23 +439,25 @@ const SettingsModal: FC<ISettingsModalProps> = ({
439439
<Button className='mr-2' onClick={onHide}>{t('common.operation.cancel')}</Button>
440440
<Button variant='primary' onClick={onClickSave} loading={saveLoading}>{t('common.operation.save')}</Button>
441441
</div>
442-
</Modal >
443-
{showAppIconPicker && (
444-
<AppIconPicker
445-
onSelect={(payload) => {
446-
setAppIcon(payload)
447-
setShowAppIconPicker(false)
448-
}}
449-
onClose={() => {
450-
setAppIcon(icon_type === 'image'
451-
? { type: 'image', url: icon_url!, fileId: icon }
452-
: { type: 'emoji', icon, background: icon_background! })
453-
setShowAppIconPicker(false)
454-
}}
455-
/>
456-
)}
457-
</>
458442

443+
{showAppIconPicker && (
444+
<div onClick={e => e.stopPropagation()}>
445+
<AppIconPicker
446+
onSelect={(payload) => {
447+
setAppIcon(payload)
448+
setShowAppIconPicker(false)
449+
}}
450+
onClose={() => {
451+
setAppIcon(icon_type === 'image'
452+
? { type: 'image', url: icon_url!, fileId: icon }
453+
: { type: 'emoji', icon, background: icon_background! })
454+
setShowAppIconPicker(false)
455+
}}
456+
/>
457+
</div>
458+
)}
459+
</Modal>
460+
</>
459461
)
460462
}
461463
export default React.memo(SettingsModal)

0 commit comments

Comments
 (0)