RSSNext
diff --git a/‎apps/desktop/layer/renderer/src/components/ui/modal/stacked/modal.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎apps/desktop/layer/renderer/src/components/ui/modal/stacked/modal.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/desktop/layer/renderer/src/hooks/biz/useFeedActions.tsx
Copy file name to clipboard
+23-62Lines changed: 23 additions & 62 deletions b/‎apps/desktop/layer/renderer/src/hooks/biz/useFeedActions.tsx
Copy file name to clipboard
+23-62Lines changed: 23 additions & 62 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/global.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎apps/desktop/layer/renderer/src/modules/command/commands/global.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/desktop/layer/renderer/src/modules/modal/ConfirmDestroyModalContent.tsx
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/modal/ConfirmDestroyModalContent.tsx
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/modal/shortcuts.tsx renamed to ‎apps/desktop/layer/renderer/src/modules/modal/ShortcutModalContent.tsx
Copy file name to clipboard
+2-29Lines changed: 2 additions & 29 deletions b/‎apps/desktop/layer/renderer/src/modules/modal/shortcuts.tsx renamed to ‎apps/desktop/layer/renderer/src/modules/modal/ShortcutModalContent.tsx
Copy file name to clipboard
+2-29Lines changed: 2 additions & 29 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/modal/hooks/useConfirmUnsubscribeSubscriptionModal.tsx
Copy file name to clipboard
+30Lines changed: 30 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/modal/hooks/useConfirmUnsubscribeSubscriptionModal.tsx
Copy file name to clipboard
+30Lines changed: 30 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/modal/hooks/useShortcutsModal.tsx
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/modal/hooks/useShortcutsModal.tsx
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
@@ -366,7 +366,7 @@ export const ModalInternal = memo(function Modal({
                       onPointerDownCapture={handleDrag}
                       onPointerDown={relocateModal}
                     >
-                      {!!icon && <span className="size-4">{icon}</span>}
+                      {!!icon && <span className="center flex size-4">{icon}</span>}
                       <EllipsisHorizontalTextWithTooltip className="truncate">
                         <span>{title}</span>
                       </EllipsisHorizontalTextWithTooltip>
 
@@ -1,4 +1,3 @@
-import { Button } from "@follow/components/ui/button/index.js"
 import type { FeedViewType } from "@follow/constants"
 import { IN_ELECTRON } from "@follow/shared/constants"
 import { env } from "@follow/shared/env.desktop"
@@ -22,10 +21,9 @@ import { useCommandShortcuts } from "~/modules/command/hooks/use-command-binding
 import { FeedForm } from "~/modules/discover/FeedForm"
 import { InboxForm } from "~/modules/discover/InboxForm"
 import { ListForm } from "~/modules/discover/ListForm"
-import {
-  CategoryCreationModalContent,
-  ListCreationModalContent,
-} from "~/modules/settings/tabs/lists/modals"
+import { useConfirmUnsubscribeSubscriptionModal } from "~/modules/modal/hooks/useConfirmUnsubscribeSubscriptionModal"
+import { useCategoryCreationModal } from "~/modules/settings/tabs/lists/hooks"
+import { ListCreationModalContent } from "~/modules/settings/tabs/lists/modals"
 import { useResetFeed } from "~/queries/feed"
 import { getFeedById, useFeedById } from "~/store/feed"
 import { useInboxById } from "~/store/inbox"
@@ -41,24 +39,6 @@ import { useNavigateEntry } from "./useNavigateEntry"
 import { getRouteParams } from "./useRouteParams"
 import { useBatchUpdateSubscription, useDeleteSubscription } from "./useSubscriptionActions"
 
-const ConfirmDestroyModalContent = ({ onConfirm }: { onConfirm: () => void }) => {
-  const { t } = useTranslation()
-
-  return (
-    <div className="w-[540px]">
-      <div className="mb-4">
-        <i className="i-mingcute-warning-fill text-red -mb-1 mr-1 size-5" />
-        {t("sidebar.feed_actions.unfollow_feed_many_warning")}
-      </div>
-      <div className="flex justify-end">
-        <Button buttonClassName="bg-red" onClick={onConfirm}>
-          {t("words.confirm")}
-        </Button>
-      </div>
-    </div>
-  )
-}
-
 export const useFeedActions = ({
   feedId,
   feedIds,
@@ -89,6 +69,7 @@ export const useFeedActions = ({
     useMemo(() => feedIds || [feedId], [feedId, feedIds]),
   )
   const { present } = useModalStack()
+  const presentDeleteSubscription = useConfirmUnsubscribeSubscriptionModal()
   const deleteSubscription = useDeleteSubscription({})
   const claimFeed = useFeedClaimModal()
 
@@ -99,6 +80,7 @@ export const useFeedActions = ({
   const { mutateAsync: removeFeedFromListMutation } = useRemoveFeedFromFeedList()
   const { mutateAsync: resetFeed } = useResetFeed()
   const { mutate: addFeedsToCategoryMutation } = useBatchUpdateSubscription()
+  const presentCategoryCreationModal = useCategoryCreationModal()
   const openBoostModal = useBoostModal()
 
   const listByView = useOwnedListByView(view!)
@@ -239,20 +221,7 @@ export const useFeedActions = ({
             label: t("sidebar.feed_column.context_menu.create_category"),
             icon: <i className="i-mgc-add-cute-re" />,
             click() {
-              present({
-                title: t("sidebar.feed_column.context_menu.title"),
-                content: () => (
-                  <CategoryCreationModalContent
-                    onSubmit={(category: string) => {
-                      addFeedsToCategoryMutation({
-                        feedIdList: isMultipleSelection ? feedIds : [feedId],
-                        category,
-                        view: view!,
-                      })
-                    }}
-                  />
-                ),
-              })
+              presentCategoryCreationModal(view!, isMultipleSelection ? feedIds : [feedId])
             },
           }),
         ],
@@ -281,17 +250,7 @@ export const useFeedActions = ({
         supportMultipleSelection: true,
         click: () => {
           if (isMultipleSelection) {
-            present({
-              title: t("sidebar.feed_actions.unfollow_feed_many_confirm"),
-              content: ({ dismiss }) => (
-                <ConfirmDestroyModalContent
-                  onConfirm={() => {
-                    deleteSubscription.mutate({ feedIdList: feedIds })
-                    dismiss()
-                  }}
-                />
-              ),
-            })
+            presentDeleteSubscription(feedIds)
             return
           }
           deleteSubscription.mutate({ subscription })
@@ -367,30 +326,32 @@ export const useFeedActions = ({
           item.supportMultipleSelection),
     )
   }, [
+    addFeedToListMutation,
+    addFeedsToCategoryMutation,
+    categories,
+    claimFeed,
+    deleteSubscription,
     feed,
+    feedId,
+    feedIds,
     inbox,
-    t,
-    shortcuts,
     isEntryList,
     isInMASReview,
     isInbox,
-    listByView,
-    categories,
     isMultipleSelection,
-    feedId,
-    feedIds,
-    claimFeed,
-    resetFeed,
+    listByView,
+    navigateEntry,
     openBoostModal,
-    addFeedToListMutation,
-    removeFeedFromListMutation,
     present,
-    subscriptions,
+    presentCategoryCreationModal,
+    presentDeleteSubscription,
+    removeFeedFromListMutation,
+    resetFeed,
+    shortcuts,
     subscription,
-    addFeedsToCategoryMutation,
+    subscriptions,
+    t,
     view,
-    deleteSubscription,
-    navigateEntry,
   ])
 
   return items
 
@@ -1,7 +1,7 @@
 import { EventBus } from "@follow/utils/event-bus"
 import { useTranslation } from "react-i18next"
 
-import { useShortcutsModal } from "~/modules/modal/shortcuts"
+import { useShortcutsModal } from "~/modules/modal/hooks/useShortcutsModal"
 
 import { useRegisterCommandEffect } from "../hooks/use-register-command"
 import type { Command, CommandCategory } from "../types"
 
@@ -0,0 +1,17 @@
+import { Button } from "@follow/components/ui/button/index.js"
+import { useTranslation } from "react-i18next"
+
+export const ConfirmDestroyModalContent = ({ onConfirm }: { onConfirm: () => void }) => {
+  const { t } = useTranslation()
+
+  return (
+    <div className="w-[540px]">
+      <div className="mb-4 text-sm">{t("sidebar.feed_actions.unfollow_feed_many_warning")}</div>
+      <div className="flex justify-end">
+        <Button buttonClassName="bg-red" onClick={onConfirm}>
+          {t("words.confirm")}
+        </Button>
+      </div>
+    </div>
+  )
+}
@@ -2,16 +2,14 @@ import { MotionButtonBase } from "@follow/components/ui/button/index.js"
 import { ScrollArea } from "@follow/components/ui/scroll-area/index.js"
 import { clsx } from "@follow/utils/utils"
 import { m, useDragControls } from "motion/react"
-import { useCallback } from "react"
 import { useTranslation } from "react-i18next"
 
 import { useUISettingKey } from "~/atoms/settings/ui"
-import { PlainModal } from "~/components/ui/modal/stacked/custom-modal"
-import { useCurrentModal, useModalStack } from "~/components/ui/modal/stacked/hooks"
+import { useCurrentModal } from "~/components/ui/modal/stacked/hooks"
 
 import { ShortcutsGuideline } from "../command/shortcuts/SettingShortcuts"
 
-const ShortcutModalContent = () => {
+export const ShortcutModalContent = () => {
   const { dismiss } = useCurrentModal()
   const modalOverlay = useUISettingKey("modalOverlay")
   const dragControls = useDragControls()
@@ -54,28 +52,3 @@ const ShortcutModalContent = () => {
     </m.div>
   )
 }
-
-export const useShortcutsModal = () => {
-  const { present, dismiss, getModalStackById } = useModalStack()
-  const id = "shortcuts"
-
-  const showShortcutsModal = useCallback(() => {
-    present({
-      title: "Shortcuts",
-      id,
-      overlay: false,
-      content: () => <ShortcutModalContent />,
-      CustomModalComponent: PlainModal,
-      clickOutsideToDismiss: true,
-    })
-  }, [present])
-
-  return useCallback(() => {
-    const shortcutsModal = getModalStackById(id)
-    if (shortcutsModal && shortcutsModal.modal) {
-      dismiss(id)
-      return
-    }
-    showShortcutsModal()
-  }, [dismiss, getModalStackById, showShortcutsModal])
-}
@@ -0,0 +1,30 @@
+import { useCallback } from "react"
+import { useTranslation } from "react-i18next"
+
+import { useModalStack } from "~/components/ui/modal/stacked/hooks"
+import { useDeleteSubscription } from "~/hooks/biz/useSubscriptionActions"
+
+import { ConfirmDestroyModalContent } from "../ConfirmDestroyModalContent"
+
+export const useConfirmUnsubscribeSubscriptionModal = () => {
+  const { present } = useModalStack()
+  const deleteSubscription = useDeleteSubscription({})
+  const { t } = useTranslation()
+  return useCallback(
+    (feedIds: string[]) => {
+      present({
+        title: t("sidebar.feed_actions.unfollow_feed_many_confirm"),
+        icon: <i className="i-mingcute-warning-fill text-red" />,
+        content: ({ dismiss }) => (
+          <ConfirmDestroyModalContent
+            onConfirm={() => {
+              deleteSubscription.mutate({ feedIdList: feedIds })
+              dismiss()
+            }}
+          />
+        ),
+      })
+    },
+    [deleteSubscription, present, t],
+  )
+}
@@ -0,0 +1,31 @@
+import { useCallback } from "react"
+
+import { PlainModal } from "~/components/ui/modal/stacked/custom-modal"
+import { useModalStack } from "~/components/ui/modal/stacked/hooks"
+
+import { ShortcutModalContent } from "../ShortcutModalContent"
+
+export const useShortcutsModal = () => {
+  const { present, dismiss, getModalStackById } = useModalStack()
+  const id = "shortcuts"
+
+  const showShortcutsModal = useCallback(() => {
+    present({
+      title: "Shortcuts",
+      id,
+      overlay: false,
+      content: () => <ShortcutModalContent />,
+      CustomModalComponent: PlainModal,
+      clickOutsideToDismiss: true,
+    })
+  }, [present])
+
+  return useCallback(() => {
+    const shortcutsModal = getModalStackById(id)
+    if (shortcutsModal && shortcutsModal.modal) {
+      dismiss(id)
+      return
+    }
+    showShortcutsModal()
+  }, [dismiss, getModalStackById, showShortcutsModal])
+}
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ export const ModalInternal = memo(function Modal({`
`366`	`366`	`onPointerDownCapture={handleDrag}`
`367`	`367`	`onPointerDown={relocateModal}`
`368`	`368`	`>`
`369`		`- {!!icon && <span className="size-4">{icon}</span>}`
	`369`	`+ {!!icon && <span className="center flex size-4">{icon}</span>}`
`370`	`370`	`<EllipsisHorizontalTextWithTooltip className="truncate">`
`371`	`371`	`<span>{title}</span>`
`372`	`372`	`</EllipsisHorizontalTextWithTooltip>`