From 6eec4688db5a6469b4dc9a6e780141ba3b92b187 Mon Sep 17 00:00:00 2001 From: Michael An <2331806369@qq.com> Date: Tue, 19 Dec 2023 12:13:49 +0800 Subject: [PATCH] fix toggle tags popover (#5835) --- .../src/components/common/seahub-popover.js | 4 +-- .../src/components/cur-dir-path/dir-tool.js | 31 ++++++++++++++++--- .../dialog/org-admin-invite-user-dialog.js | 8 ++--- ...org-admin-invite-user-via-weixin-dialog.js | 6 ++-- .../repo-seatable-integration-dialog.js | 2 +- frontend/src/components/search/ai-search.js | 14 ++++----- .../add-seatable-account-setting.js | 1 - frontend/src/pages/markdown-editor/index.js | 2 +- .../src/pages/org-admin/org-users-users.js | 6 ++-- 9 files changed, 48 insertions(+), 26 deletions(-) diff --git a/frontend/src/components/common/seahub-popover.js b/frontend/src/components/common/seahub-popover.js index 68c9f60a33..754a503d59 100644 --- a/frontend/src/components/common/seahub-popover.js +++ b/frontend/src/components/common/seahub-popover.js @@ -23,12 +23,12 @@ class SeahubPopover extends React.Component { isSelectOpen = false; componentDidMount() { - document.addEventListener('mousedown', this.onMouseDown, true); + document.addEventListener('mousedown', this.onMouseDown); document.addEventListener('keydown', this.onKeyDown); } componentWillUnmount() { - document.removeEventListener('mousedown', this.onMouseDown, true); + document.removeEventListener('mousedown', this.onMouseDown); document.removeEventListener('keydown', this.onKeyDown); } diff --git a/frontend/src/components/cur-dir-path/dir-tool.js b/frontend/src/components/cur-dir-path/dir-tool.js index 3b02df4286..3f71a3854c 100644 --- a/frontend/src/components/cur-dir-path/dir-tool.js +++ b/frontend/src/components/cur-dir-path/dir-tool.js @@ -24,8 +24,13 @@ class DirTool extends React.Component { this.tagsIconID = `tags-icon-${uuidv4()}`; } - onShowListRepoTag = (e) => { - this.setState({ isListRepoTagShow: true }); + onMouseDown = (e) => { + e.stopPropagation(); + }; + + toggleRepoTag = (e) => { + e.stopPropagation(); + this.setState({ isListRepoTagShow: !this.state.isListRepoTagShow }); }; hidePopover = (e) => { @@ -61,7 +66,16 @@ class DirTool extends React.Component { toolbarDom = (