Skip to content

Commit 3e82984

Browse files
[WEB-5068] fix: CustomMenu closeOnSelect behavior #7897
1 parent 89ddd1b commit 3e82984

20 files changed

Lines changed: 30 additions & 90 deletions

File tree

apps/web/core/components/cycles/quick-actions.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,7 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
223223
return (
224224
<CustomMenu.MenuItem
225225
key={item.key}
226-
onClick={(e) => {
227-
e.preventDefault();
228-
e.stopPropagation();
226+
onClick={() => {
229227
captureClick({
230228
elementName: CYCLE_TRACKER_ELEMENTS.QUICK_ACTIONS,
231229
});

apps/web/core/components/issues/attachment/attachment-list-item.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ export const IssueAttachmentsListItem: FC<TIssueAttachmentsListItem> = observer(
8383

8484
<CustomMenu ellipsis closeOnSelect placement="bottom-end" disabled={disabled}>
8585
<CustomMenu.MenuItem
86-
onClick={(e) => {
87-
e.preventDefault();
88-
e.stopPropagation();
86+
onClick={() => {
8987
toggleDeleteAttachmentModal(attachmentId);
9088
}}
9189
>

apps/web/core/components/issues/issue-detail-widgets/relations/quick-action-button.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ export const RelationActionButton: FC<Props> = observer((props) => {
5050
return (
5151
<CustomMenu.MenuItem
5252
key={index}
53-
onClick={(e) => {
54-
e.preventDefault();
55-
e.stopPropagation();
53+
onClick={() => {
5654
handleOnClick(item.key as TIssueRelationTypes);
5755
}}
5856
>

apps/web/core/components/issues/issue-detail-widgets/sub-issues/issues-list/list-item.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
185185
<CustomMenu placement="bottom-end" ellipsis>
186186
{canEdit && (
187187
<CustomMenu.MenuItem
188-
onClick={(e) => {
189-
e.preventDefault();
190-
e.stopPropagation();
188+
onClick={() => {
191189
handleIssueCrudState("update", parentIssueId, { ...issue });
192190
toggleCreateIssueModal(true);
193191
}}
@@ -200,9 +198,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
200198
)}
201199

202200
<CustomMenu.MenuItem
203-
onClick={(e) => {
204-
e.stopPropagation();
205-
e.preventDefault();
201+
onClick={() => {
206202
subIssueOperations.copyLink(workItemLink);
207203
}}
208204
>
@@ -214,9 +210,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
214210

215211
{canEdit && (
216212
<CustomMenu.MenuItem
217-
onClick={(e) => {
218-
e.stopPropagation();
219-
e.preventDefault();
213+
onClick={() => {
220214
if (issue.project_id)
221215
subIssueOperations.removeSubIssue(workspaceSlug, issue.project_id, parentIssueId, issue.id);
222216
}}
@@ -232,9 +226,7 @@ export const SubIssuesListItem: React.FC<Props> = observer((props) => {
232226

233227
{canEdit && (
234228
<CustomMenu.MenuItem
235-
onClick={(e) => {
236-
e.stopPropagation();
237-
e.preventDefault();
229+
onClick={() => {
238230
handleIssueCrudState("delete", parentIssueId, issue);
239231
toggleDeleteIssueModal(issue.id);
240232
}}

apps/web/core/components/issues/issue-detail-widgets/sub-issues/quick-action-button.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ export const SubIssuesActionButton: FC<Props> = observer((props) => {
8686
{optionItems.map((item, index) => (
8787
<CustomMenu.MenuItem
8888
key={index}
89-
onClick={(e) => {
90-
e.preventDefault();
91-
e.stopPropagation();
89+
onClick={() => {
9290
item.onClick();
9391
}}
9492
>

apps/web/core/components/issues/issue-detail/links/link-item.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ export const IssueLinkItem: FC<TIssueLinkItem> = observer((props) => {
9595
>
9696
<CustomMenu.MenuItem
9797
className="flex items-center gap-2"
98-
onClick={(e) => {
99-
e.preventDefault();
100-
e.stopPropagation();
98+
onClick={() => {
10199
toggleIssueLinkModal(true);
102100
}}
103101
>
@@ -106,9 +104,7 @@ export const IssueLinkItem: FC<TIssueLinkItem> = observer((props) => {
106104
</CustomMenu.MenuItem>
107105
<CustomMenu.MenuItem
108106
className="flex items-center gap-2"
109-
onClick={(e) => {
110-
e.preventDefault();
111-
e.stopPropagation();
107+
onClick={() => {
112108
linkOperations.remove(linkDetail.id);
113109
}}
114110
>

apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/all-issue.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,7 @@ export const AllIssueQuickActions: React.FC<IQuickActionProps> = observer((props
175175
{item.nestedMenuItems.map((nestedItem) => (
176176
<CustomMenu.MenuItem
177177
key={nestedItem.key}
178-
onClick={(e) => {
179-
e.preventDefault();
180-
e.stopPropagation();
178+
onClick={() => {
181179
captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.QUICK_ACTIONS.GLOBAL_VIEW });
182180
nestedItem.action();
183181
}}
@@ -213,9 +211,7 @@ export const AllIssueQuickActions: React.FC<IQuickActionProps> = observer((props
213211
return (
214212
<CustomMenu.MenuItem
215213
key={item.key}
216-
onClick={(e) => {
217-
e.preventDefault();
218-
e.stopPropagation();
214+
onClick={() => {
219215
captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.QUICK_ACTIONS.GLOBAL_VIEW });
220216
item.action();
221217
}}

apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/archived-issue.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ export const ArchivedIssueQuickActions: React.FC<IQuickActionProps> = observer((
9494
return (
9595
<CustomMenu.MenuItem
9696
key={item.key}
97-
onClick={(e) => {
98-
e.preventDefault();
99-
e.stopPropagation();
97+
onClick={() => {
10098
item.action();
10199
captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.QUICK_ACTIONS.ARCHIVED });
102100
}}

apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/cycle-issue.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,7 @@ export const CycleIssueQuickActions: React.FC<IQuickActionProps> = observer((pro
192192
{item.nestedMenuItems.map((nestedItem) => (
193193
<CustomMenu.MenuItem
194194
key={nestedItem.key}
195-
onClick={(e) => {
196-
e.preventDefault();
197-
e.stopPropagation();
195+
onClick={() => {
198196
captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.QUICK_ACTIONS.CYCLE });
199197
nestedItem.action();
200198
}}
@@ -230,9 +228,7 @@ export const CycleIssueQuickActions: React.FC<IQuickActionProps> = observer((pro
230228
return (
231229
<CustomMenu.MenuItem
232230
key={item.key}
233-
onClick={(e) => {
234-
e.preventDefault();
235-
e.stopPropagation();
231+
onClick={() => {
236232
captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.QUICK_ACTIONS.CYCLE });
237233
item.action();
238234
}}

apps/web/core/components/issues/issue-layouts/quick-action-dropdowns/issue-detail.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,7 @@ export const WorkItemDetailQuickActions: React.FC<TWorkItemDetailQuickActionProp
276276
{item.nestedMenuItems.map((nestedItem) => (
277277
<CustomMenu.MenuItem
278278
key={nestedItem.key}
279-
onClick={(e) => {
280-
e.preventDefault();
281-
e.stopPropagation();
279+
onClick={() => {
282280
captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.QUICK_ACTIONS.PROJECT_VIEW });
283281
nestedItem.action();
284282
}}
@@ -314,9 +312,7 @@ export const WorkItemDetailQuickActions: React.FC<TWorkItemDetailQuickActionProp
314312
return (
315313
<CustomMenu.MenuItem
316314
key={item.key}
317-
onClick={(e) => {
318-
e.preventDefault();
319-
e.stopPropagation();
315+
onClick={() => {
320316
captureClick({ elementName: WORK_ITEM_TRACKER_ELEMENTS.QUICK_ACTIONS.PROJECT_VIEW });
321317
item.action();
322318
}}

0 commit comments

Comments
 (0)