From d35639f57ab5986d5dcd89ef6d2cfd82eb6eb4c7 Mon Sep 17 00:00:00 2001 From: Innei Date: Sun, 27 Apr 2025 21:56:43 +0800 Subject: [PATCH] fix(modal): feed modal preview view cls - Added `modalContentClassName` prop to various modal presentations to allow for better content overflow handling. - Updated modal components to utilize the new class for improved layout in specific contexts. - Introduced new `EntryItemSkeleton` component for loading states in entry columns, enhancing user experience during data fetching. Signed-off-by: Innei --- .../FeedFoundCanBeFollowErrorFallback.tsx | 1 + .../errors/previews/FeedPreview.tsx | 2 +- .../components/ui/modal/stacked/context.tsx | 2 + .../src/components/ui/modal/stacked/hooks.tsx | 2 + .../src/components/ui/modal/stacked/modal.tsx | 15 +- .../src/components/ui/modal/stacked/types.tsx | 2 +- .../renderer/src/hooks/biz/useFeedActions.tsx | 1 + .../src/hooks/biz/useFeedFormModal.tsx | 42 ---- .../src/renderer/src/hooks/biz/useFollow.tsx | 1 + .../src/modules/discover/DiscoverFeedForm.tsx | 1 + .../src/modules/discover/feed-form.tsx | 201 ++++++++++-------- .../entry-column/EntryItemSkeleton.tsx | 38 ++++ .../Items/getItemComponentByView.ts | 20 ++ .../Items/getSkeletonItemComponentByView.ts | 21 ++ .../src/modules/entry-column/Items/index.ts | 33 --- .../Items/picture-item-stateless.tsx | 119 ++++++----- .../entry-column/Items/social-media-item.tsx | 4 +- .../src/modules/entry-column/grid.tsx | 3 +- .../src/modules/entry-column/item.tsx | 36 +--- .../src/modules/entry-column/list.tsx | 3 +- .../src/renderer/src/modules/panel/cmdn.tsx | 1 + .../modules/shared/ViewSelectorRadioGroup.tsx | 15 +- 22 files changed, 293 insertions(+), 270 deletions(-) delete mode 100644 apps/desktop/src/renderer/src/hooks/biz/useFeedFormModal.tsx create mode 100644 apps/desktop/src/renderer/src/modules/entry-column/EntryItemSkeleton.tsx create mode 100644 apps/desktop/src/renderer/src/modules/entry-column/Items/getItemComponentByView.ts create mode 100644 apps/desktop/src/renderer/src/modules/entry-column/Items/getSkeletonItemComponentByView.ts delete mode 100644 apps/desktop/src/renderer/src/modules/entry-column/Items/index.ts diff --git a/apps/desktop/src/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx b/apps/desktop/src/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx index 60d399d7a..473f6c8c4 100644 --- a/apps/desktop/src/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx +++ b/apps/desktop/src/renderer/src/components/errors/FeedFoundCanBeFollowErrorFallback.tsx @@ -47,6 +47,7 @@ const FeedFoundCanBeFollowErrorFallback: FC = ({ resetErr onClick={() => { present({ title: t("feed_form.add_feed"), + modalContentClassName: "overflow-visible", content: ({ dismiss }) => ( (defaultCtxValue) export const CurrentModalStateContext = createContextSelector<{ isTop: boolean + isInModal: boolean }>({ isTop: true, + isInModal: false, }) export type ModalContentComponent = FC diff --git a/apps/desktop/src/renderer/src/components/ui/modal/stacked/hooks.tsx b/apps/desktop/src/renderer/src/components/ui/modal/stacked/hooks.tsx index efb199485..8d4bddbb1 100644 --- a/apps/desktop/src/renderer/src/components/ui/modal/stacked/hooks.tsx +++ b/apps/desktop/src/renderer/src/components/ui/modal/stacked/hooks.tsx @@ -100,6 +100,8 @@ const actions = { export const useCurrentModal = () => useContext(CurrentModalContext) +export const useIsInModal = () => useContextSelector(CurrentModalStateContext, (v) => v.isInModal) + export const useResizeableModal = ( modalElementRef: React.RefObject, { diff --git a/apps/desktop/src/renderer/src/components/ui/modal/stacked/modal.tsx b/apps/desktop/src/renderer/src/components/ui/modal/stacked/modal.tsx index ff329480a..f18dc3e6f 100644 --- a/apps/desktop/src/renderer/src/components/ui/modal/stacked/modal.tsx +++ b/apps/desktop/src/renderer/src/components/ui/modal/stacked/modal.tsx @@ -66,11 +66,14 @@ export const ModalInternal = memo( ) { const { CustomModalComponent, - modalClassName, content, title, clickOutsideToDismiss, + + modalClassName, modalContainerClassName, + modalContentClassName, + wrapper: Wrapper = Fragment, max, icon, @@ -268,7 +271,7 @@ export const ModalInternal = memo( > {DragBar}
-
+
{finalChildren} @@ -426,6 +434,7 @@ const ModalContext: FC< value={useMemo( () => ({ isTop: !!isTop, + isInModal: true, }), [isTop], )} diff --git a/apps/desktop/src/renderer/src/components/ui/modal/stacked/types.tsx b/apps/desktop/src/renderer/src/components/ui/modal/stacked/types.tsx index 9aecce2db..2fb4c03bf 100644 --- a/apps/desktop/src/renderer/src/components/ui/modal/stacked/types.tsx +++ b/apps/desktop/src/renderer/src/components/ui/modal/stacked/types.tsx @@ -16,7 +16,7 @@ export interface ModalProps { clickOutsideToDismiss?: boolean modalClassName?: string modalContainerClassName?: string - + modalContentClassName?: string max?: boolean wrapper?: FC diff --git a/apps/desktop/src/renderer/src/hooks/biz/useFeedActions.tsx b/apps/desktop/src/renderer/src/hooks/biz/useFeedActions.tsx index 92b85c27d..5983b5c0f 100644 --- a/apps/desktop/src/renderer/src/hooks/biz/useFeedActions.tsx +++ b/apps/desktop/src/renderer/src/hooks/biz/useFeedActions.tsx @@ -257,6 +257,7 @@ export const useFeedActions = ({ disabled: isInbox, click: () => { present({ + modalContentClassName: "overflow-visible", title: t("sidebar.feed_actions.edit_feed"), content: ({ dismiss }) => , }) diff --git a/apps/desktop/src/renderer/src/hooks/biz/useFeedFormModal.tsx b/apps/desktop/src/renderer/src/hooks/biz/useFeedFormModal.tsx deleted file mode 100644 index 3840d51b9..000000000 --- a/apps/desktop/src/renderer/src/hooks/biz/useFeedFormModal.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import { DEEPLINK_SCHEME } from "@follow/shared/constants" -import { useCallback } from "react" - -import { useWhoami } from "~/atoms/user" -import { useModalStack } from "~/components/ui/modal/stacked/hooks" -import { FeedForm } from "~/modules/discover/feed-form" -import { ListForm } from "~/modules/discover/list-form" - -import { useI18n } from "../common" - -export const usePresentFeedFormModal = () => { - const { present } = useModalStack() - const me = useWhoami() - const t = useI18n() - return useCallback( - ( - params: - | { - feedId: string - } - | { - listId: string - }, - ) => { - if (me) { - const isList = !!("listId" in params) - present({ - title: isList ? t("sidebar.feed_actions.edit_list") : t("sidebar.feed_actions.edit_feed"), - content: ({ dismiss }) => - isList ? ( - - ) : ( - - ), - }) - } else { - window.location.href = `${DEEPLINK_SCHEME}add?id=${"feedId" in params ? params.feedId : params.listId}` - } - }, - [me, present, t], - ) -} diff --git a/apps/desktop/src/renderer/src/hooks/biz/useFollow.tsx b/apps/desktop/src/renderer/src/hooks/biz/useFollow.tsx index e63aee0fa..d2979eb98 100644 --- a/apps/desktop/src/renderer/src/hooks/biz/useFollow.tsx +++ b/apps/desktop/src/renderer/src/hooks/biz/useFollow.tsx @@ -80,6 +80,7 @@ export const useFollow = () => { present({ title: `${isFollowed ? `${t("common:words.edit")} ` : ""}${options?.isList ? t("words.lists") : t("words.feeds")}`, + modalContentClassName: "overflow-visible", content: ({ dismiss }) => { const onSuccess = () => { options?.onSuccess?.() diff --git a/apps/desktop/src/renderer/src/modules/discover/DiscoverFeedForm.tsx b/apps/desktop/src/renderer/src/modules/discover/DiscoverFeedForm.tsx index fd411daa0..24fa2da28 100644 --- a/apps/desktop/src/renderer/src/modules/discover/DiscoverFeedForm.tsx +++ b/apps/desktop/src/renderer/src/modules/discover/DiscoverFeedForm.tsx @@ -200,6 +200,7 @@ export const DiscoverFeedForm = ({ present({ title: t("feed_form.add_feed"), + modalContentClassName: "overflow-visible", content: () => ( (null) + return ( -
- {feed ? ( - + + {feed ? ( + - ) : feedQuery.isLoading ? ( -
- -
- ) : feedQuery.error ? ( -
- -

{t("feed_form.error_fetching_feed")}

-

- {getFetchErrorMessage(feedQuery.error)} -

- -
- - - + onSuccess, + subscriptionData: feedQuery.data?.subscription, + entries: feedQuery.data?.entries, + feed, + rootContainerRef, + }} + /> + ) : feedQuery.isLoading ? ( +
+
-
- ) : ( -
- -

{t("feed_form.feed_not_found")}

-

{url}

-
- )} + ) : feedQuery.error ? ( +
+ +

{t("feed_form.error_fetching_feed")}

+

+ {getFetchErrorMessage(feedQuery.error)} +

+ +
+ + + +
+
+ ) : ( +
+ +

{t("feed_form.feed_not_found")}

+

{url}

+
+ )} +
) } @@ -160,6 +169,8 @@ const FeedInnerForm = ({ subscriptionData, feed, entries, + + rootContainerRef, }: { defaultValues?: z.infer id?: string @@ -173,10 +184,11 @@ const FeedInnerForm = ({ } feed: FeedModel entries?: EntryModelSimple[] + + rootContainerRef: React.RefObject }) => { const subscription = useSubscriptionByFeedId(id || "") || subscriptionData const isSubscribed = !!subscription - const buttonRef = useRef(null) const form = useForm>({ resolver: zodResolver(formSchema), @@ -367,23 +379,24 @@ const FeedInnerForm = ({ )} /> -
- {isSubscribed && ( - + )} + - )} - -
+
+
diff --git a/apps/desktop/src/renderer/src/modules/entry-column/EntryItemSkeleton.tsx b/apps/desktop/src/renderer/src/modules/entry-column/EntryItemSkeleton.tsx new file mode 100644 index 000000000..23ced348e --- /dev/null +++ b/apps/desktop/src/renderer/src/modules/entry-column/EntryItemSkeleton.tsx @@ -0,0 +1,38 @@ +import { LoadingCircle } from "@follow/components/ui/loading/index.js" +import type { FeedViewType } from "@follow/constants" +import { views } from "@follow/constants" +import { cn } from "@follow/utils/utils" +import type { FC } from "react" +import { memo } from "react" + +import { getSkeletonItemComponentByView } from "./Items/getSkeletonItemComponentByView" +import { girdClassNames } from "./styles" + +const LoadingCircleFallback = ( +
+ +
+) +export const EntryItemSkeleton: FC<{ + view: FeedViewType + count?: number +}> = memo(({ view, count = 10 }) => { + const SkeletonItem = getSkeletonItemComponentByView(view) + + if (!SkeletonItem) { + return LoadingCircleFallback + } + + if (count === 1) { + return SkeletonItem + } + + return ( +
+ {Array.from({ length: count }).map((_, index) => ( + // eslint-disable-next-line @eslint-react/no-array-index-key -- index is unique +
{SkeletonItem}
+ ))} +
+ ) +}) diff --git a/apps/desktop/src/renderer/src/modules/entry-column/Items/getItemComponentByView.ts b/apps/desktop/src/renderer/src/modules/entry-column/Items/getItemComponentByView.ts new file mode 100644 index 000000000..ce1e4f35a --- /dev/null +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/getItemComponentByView.ts @@ -0,0 +1,20 @@ +import { FeedViewType } from "@follow/constants" + +import { ArticleItem } from "./article-item" +import { AudioItem } from "./audio-item" +import { NotificationItem } from "./notification-item" +import { PictureItem } from "./picture-item" +import { SocialMediaItem } from "./social-media-item" +import { VideoItem } from "./video-item" + +const ItemMap = { + [FeedViewType.Articles]: ArticleItem, + [FeedViewType.SocialMedia]: SocialMediaItem, + [FeedViewType.Pictures]: PictureItem, + [FeedViewType.Videos]: VideoItem, + [FeedViewType.Audios]: AudioItem, + [FeedViewType.Notifications]: NotificationItem, +} +export const getItemComponentByView = (view: FeedViewType) => { + return ItemMap[view] || ArticleItem +} diff --git a/apps/desktop/src/renderer/src/modules/entry-column/Items/getSkeletonItemComponentByView.ts b/apps/desktop/src/renderer/src/modules/entry-column/Items/getSkeletonItemComponentByView.ts new file mode 100644 index 000000000..3553fbddc --- /dev/null +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/getSkeletonItemComponentByView.ts @@ -0,0 +1,21 @@ +import { FeedViewType } from "@follow/constants" + +import { ArticleItemSkeleton } from "./article-item" +import { AudioItemSkeleton } from "./audio-item" +import { NotificationItemSkeleton } from "./notification-item" +import { PictureItemSkeleton } from "./picture-item" +import { SocialMediaItemSkeleton } from "./social-media-item" +import { VideoItemSkeleton } from "./video-item" + +const SkeletonItemMap = { + [FeedViewType.Articles]: ArticleItemSkeleton, + [FeedViewType.SocialMedia]: SocialMediaItemSkeleton, + [FeedViewType.Pictures]: PictureItemSkeleton, + [FeedViewType.Videos]: VideoItemSkeleton, + [FeedViewType.Audios]: AudioItemSkeleton, + [FeedViewType.Notifications]: NotificationItemSkeleton, +} + +export const getSkeletonItemComponentByView = (view: FeedViewType) => { + return SkeletonItemMap[view] +} diff --git a/apps/desktop/src/renderer/src/modules/entry-column/Items/index.ts b/apps/desktop/src/renderer/src/modules/entry-column/Items/index.ts deleted file mode 100644 index 761728a30..000000000 --- a/apps/desktop/src/renderer/src/modules/entry-column/Items/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { FeedViewType } from "@follow/constants" - -import { ArticleItem, ArticleItemSkeleton } from "./article-item" -import { AudioItem, AudioItemSkeleton } from "./audio-item" -import { NotificationItem, NotificationItemSkeleton } from "./notification-item" -import { PictureItem, PictureItemSkeleton } from "./picture-item" -import { SocialMediaItem, SocialMediaItemSkeleton } from "./social-media-item" -import { VideoItem, VideoItemSkeleton } from "./video-item" - -const ItemMap = { - [FeedViewType.Articles]: ArticleItem, - [FeedViewType.SocialMedia]: SocialMediaItem, - [FeedViewType.Pictures]: PictureItem, - [FeedViewType.Videos]: VideoItem, - [FeedViewType.Audios]: AudioItem, - [FeedViewType.Notifications]: NotificationItem, -} -export const getItemComponentByView = (view: FeedViewType) => { - return ItemMap[view] || ArticleItem -} - -const SkeletonItemMap = { - [FeedViewType.Articles]: ArticleItemSkeleton, - [FeedViewType.SocialMedia]: SocialMediaItemSkeleton, - [FeedViewType.Pictures]: PictureItemSkeleton, - [FeedViewType.Videos]: VideoItemSkeleton, - [FeedViewType.Audios]: AudioItemSkeleton, - [FeedViewType.Notifications]: NotificationItemSkeleton, -} - -export const getSkeletonItemComponentByView = (view: FeedViewType) => { - return SkeletonItemMap[view] -} diff --git a/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx index 243ab0eda..d016ad30f 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/picture-item-stateless.tsx @@ -1,60 +1,75 @@ -import { Skeleton } from "@follow/components/ui/skeleton/index.jsx" -import { cn } from "@follow/utils/utils" +import { + MasonryItemsAspectRatioContext, + MasonryItemsAspectRatioSetterContext, + MasonryItemWidthContext, + useMasonryItemWidth, +} from "@follow/components/ui/masonry/contexts.jsx" +import { Masonry } from "@follow/components/ui/masonry/index.js" +import { useMeasure } from "@follow/hooks" +import { useState } from "react" -import { RelativeTime } from "~/components/ui/datetime" -import { Media } from "~/components/ui/media" -import { FeedIcon } from "~/modules/feed/feed-icon" -import { FeedTitle } from "~/modules/feed/feed-title" +import { Media, MediaContainerWidthProvider } from "~/components/ui/media" import type { EntryItemStatelessProps } from "../types" -export function PictureItemStateLess({ entry, feed }: EntryItemStatelessProps) { +const MasonryRender = ({ data }) => { + const { url, type, previewImageUrl, height, width, blurhash } = data + const itemWidth = useMasonryItemWidth() + return ( -
-
-
-
-
- {entry.media?.[0] ? ( - - ) : ( - - )} -
-
-
-
- {entry.title} -
-
- - - ยท - {!!entry.publishedAt && } -
-
-
-
+ + ) +} + +export function PictureItemStateLess({ entry }: EntryItemStatelessProps) { + const [masonryItemsRadio, setMasonryItemsRadio] = useState>({}) + + const [ref, bounds] = useMeasure() + const mediaItems = + entry.media?.map((item) => ({ + url: item.url, + type: item.type, + previewImageUrl: item.preview_image_url, + height: item.height, + width: item.width, + blurhash: item.blurhash, + })) || [] + + const currentItemWidth = (bounds.width - 12) / 2 + + return ( +
+ + + + + + + + +
) } diff --git a/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx index 54247279a..e0d5cc0d2 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/Items/social-media-item.tsx @@ -157,7 +157,7 @@ const ActionBar = ({ entryId }: { entryId: string }) => { export function SocialMediaItemStateLess({ entry, feed }: EntryItemStatelessProps) { return ( -
+
@@ -171,7 +171,7 @@ export function SocialMediaItemStateLess({ entry, feed }: EntryItemStatelessProp
{entry.description}
- {entry.media?.map((media) => ( + {entry.media?.slice(0, 2).map((media) => ( ) }) - -const LoadingCircleFallback = ( -
- -
-) - -export const EntryItemSkeleton: FC<{ - view: FeedViewType - count?: number -}> = memo(({ view, count = 10 }) => { - const SkeletonItem = getSkeletonItemComponentByView(view) - - if (!SkeletonItem) { - return LoadingCircleFallback - } - - if (count === 1) { - return SkeletonItem - } - - return ( -
- {Array.from({ length: count }).map((_, index) => ( - // eslint-disable-next-line @eslint-react/no-array-index-key -- index is unique -
{SkeletonItem}
- ))} -
- ) -}) diff --git a/apps/desktop/src/renderer/src/modules/entry-column/list.tsx b/apps/desktop/src/renderer/src/modules/entry-column/list.tsx index 3b0d7256b..06a2d973d 100644 --- a/apps/desktop/src/renderer/src/modules/entry-column/list.tsx +++ b/apps/desktop/src/renderer/src/modules/entry-column/list.tsx @@ -29,7 +29,8 @@ import { isListSubscription } from "~/store/subscription" import { DateItem } from "./components/DateItem" import { EntryColumnShortcutHandler } from "./EntryColumnShortcutHandler" -import { EntryItemSkeleton, EntryVirtualListItem } from "./item" +import { EntryItemSkeleton } from "./EntryItemSkeleton" +import { EntryVirtualListItem } from "./item" export const EntryEmptyList = forwardRef>((props, ref) => { const unreadOnly = useGeneralSettingKey("unreadOnly") diff --git a/apps/desktop/src/renderer/src/modules/panel/cmdn.tsx b/apps/desktop/src/renderer/src/modules/panel/cmdn.tsx index c1df5b214..7f7bb5ab7 100644 --- a/apps/desktop/src/renderer/src/modules/panel/cmdn.tsx +++ b/apps/desktop/src/renderer/src/modules/panel/cmdn.tsx @@ -53,6 +53,7 @@ const CmdNPanel = () => { present({ title: t("feed_form.add_feed"), + modalContentClassName: "overflow-visible", content: () => ( {showPreview && ( - - {entries.slice(0, 2).map((entry) => ( - - ))} + +
+ + {entries.slice(0, 2).map((entry) => ( + + ))} + +
)} {showLoading && }