From b5e92815e27c40c65c8103c20cb298ec36a7da85 Mon Sep 17 00:00:00 2001 From: Filipe Marins Date: Wed, 23 Nov 2022 14:49:48 -0300 Subject: [PATCH 1/4] refactor: move stop propagation to parent component Co-authored-by: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com> --- .../MessageList/components/Toolbox/MessageActionMenu.tsx | 5 ++++- .../views/room/MessageList/components/Toolbox/Toolbox.tsx | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx index 12f7fca0664ed..b7cca1c7e0e79 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx @@ -35,7 +35,10 @@ export const MessageActionMenu: FC<{ setVisible(!visible)} + onClick={(e): void => { + e.stopPropagation(); + setVisible(!visible); + }} data-qa-id='menu' data-qa-type='message-action-menu' title={t('More')} diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx index 00e5c413af8bf..3946c45b07438 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx @@ -39,7 +39,6 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => { {messageActions.map((action) => ( { - e.stopPropagation(); action.action(e, { message, tabbar: toolbox, room }); }} key={action.id} @@ -54,7 +53,6 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => { options={menuActions.map((action) => ({ ...action, action: (e): void => { - e.stopPropagation(); action.action(e, { message, tabbar: toolbox, room }); }, }))} From 1430d14bbb4d992ab0acd0fad21b22e8c97b4354 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Wed, 7 Dec 2022 20:26:27 +0530 Subject: [PATCH 2/4] lint --- .../views/room/MessageList/components/Toolbox/Toolbox.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx index f7dec53c46ae3..d651203379237 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/Toolbox.tsx @@ -54,9 +54,7 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => { {messageActions.map((action) => ( { - action.action(e, { message, tabbar: toolbox, room, chat }); - }} + onClick={(e): void => action.action(e, { message, tabbar: toolbox, room, chat })} key={action.id} icon={action.icon} title={t(action.label)} @@ -68,9 +66,7 @@ export const Toolbox: FC<{ message: IMessage }> = ({ message }) => { ({ ...action, - action: (e): void => { - action.action(e, { message, tabbar: toolbox, room, chat }); - }, + action: (e): void => action.action(e, { message, tabbar: toolbox, room, chat }), }))} data-qa-type='message-action-menu-options' /> From 640d523145960e5f12257c3d991f7977e3dc6e32 Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Fri, 9 Dec 2022 10:18:04 -0300 Subject: [PATCH 3/4] fix: removing stop propagation to prevent tooltip visible when clicked --- .../room/MessageList/components/Toolbox/MessageActionMenu.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx index 439d257569b8f..dc601f71a0c3d 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx @@ -38,8 +38,7 @@ export const MessageActionMenu: FC<{ { - e.stopPropagation(); + onClick={(): void => { setVisible(!visible); }} data-qa-id='menu' From 309c9d3e41c4cf07f3f406e106fc0126dc9435de Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Mon, 12 Dec 2022 09:21:50 -0300 Subject: [PATCH 4/4] Revert "fix: removing stop propagation to prevent tooltip visible when clicked" This reverts commit 640d523145960e5f12257c3d991f7977e3dc6e32. --- .../room/MessageList/components/Toolbox/MessageActionMenu.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx index dc601f71a0c3d..439d257569b8f 100644 --- a/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx +++ b/apps/meteor/client/views/room/MessageList/components/Toolbox/MessageActionMenu.tsx @@ -38,7 +38,8 @@ export const MessageActionMenu: FC<{ { + onClick={(e): void => { + e.stopPropagation(); setVisible(!visible); }} data-qa-id='menu'