From a92f96bf6159316f595a742209a6bbca0d0b41fa Mon Sep 17 00:00:00 2001 From: Innei Date: Thu, 1 Aug 2024 23:42:24 +0800 Subject: [PATCH] fix: stop stopPropagation on Media Imag Signed-off-by: Innei --- src/renderer/src/components/ui/media.tsx | 1 - src/renderer/src/components/ui/media/swipe-media.tsx | 10 ++++++++-- .../src/modules/entry-column/social-media-item.tsx | 11 ++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/renderer/src/components/ui/media.tsx b/src/renderer/src/components/ui/media.tsx index 864ab6005..1b25255e6 100644 --- a/src/renderer/src/components/ui/media.tsx +++ b/src/renderer/src/components/ui/media.tsx @@ -70,7 +70,6 @@ const MediaImpl: FC = ({ const previewMedia = usePreviewMedia() const handleClick = useEventCallback((e: React.MouseEvent) => { if (popper && src) { - e.stopPropagation() previewMedia( [ { diff --git a/src/renderer/src/components/ui/media/swipe-media.tsx b/src/renderer/src/components/ui/media/swipe-media.tsx index e7ffafbf4..f2b141f66 100644 --- a/src/renderer/src/components/ui/media/swipe-media.tsx +++ b/src/renderer/src/components/ui/media/swipe-media.tsx @@ -82,7 +82,10 @@ export function SwipeMedia({ height: 600, }} disableContextMenu - onClick={() => onPreview?.(uniqMedia, i)} + onClick={(e) => { + e.stopPropagation() + onPreview?.(uniqMedia, i) + }} /> ))} @@ -105,7 +108,10 @@ export function SwipeMedia({ ) : uniqMedia?.length >= 1 ? ( onPreview?.(uniqMedia)} + onClick={(e) => { + e.stopPropagation() + onPreview?.(uniqMedia) + }} className="size-full rounded-none object-cover sm:transition-transform sm:duration-300 sm:ease-in-out sm:group-hover:scale-105" alt="cover" src={uniqMedia[0].url} diff --git a/src/renderer/src/modules/entry-column/social-media-item.tsx b/src/renderer/src/modules/entry-column/social-media-item.tsx index 0fbbb714b..f554b3977 100644 --- a/src/renderer/src/modules/entry-column/social-media-item.tsx +++ b/src/renderer/src/modules/entry-column/social-media-item.tsx @@ -87,8 +87,8 @@ export const SocialMediaItem: EntryListItemFC = ({ height: 224, }} onClick={(e) => { - previewMedia(mediaList, i) e.stopPropagation() + previewMedia(mediaList, i) }} /> ))} @@ -119,14 +119,15 @@ const ActionBar = ({ entryId }: { entryId: string }) => { return (
{items - .filter((item) => !item.disabled && (item.key !== "read" && item.key !== "unread")) + .filter( + (item) => + !item.disabled && item.key !== "read" && item.key !== "unread", + ) .map((item) => ( - {item.icon} - + {item.icon} ) : ( )