refactor: update source content view entry

RSSNext · Sep 27, 2024 · 55c27ba · 55c27ba
1 parent 58a1291
commit 55c27ba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/apps/renderer/src/hooks/biz/useEntryActions.tsx b/apps/renderer/src/hooks/biz/useEntryActions.tsx
@@ -13,7 +13,11 @@ import {
   setReadabilityStatus,
 } from "~/atoms/readability"
 import { useIntegrationSettingKey } from "~/atoms/settings/integration"
-import { getShowSourceContent, toggleShowSourceContent } from "~/atoms/source-content"
+import {
+  getShowSourceContent,
+  setShowSourceContent,
+  toggleShowSourceContent,
+} from "~/atoms/source-content"
 import { whoami } from "~/atoms/user"
 import { mountLottie } from "~/components/ui/lottie-container"
 import {
@@ -32,6 +36,8 @@ import type { FlatEntryModel } from "~/store/entry"
 import { entryActions } from "~/store/entry"
 import { useFeedById } from "~/store/feed"
 
+import { navigateEntry } from "./useNavigateEntry"
+
 const absoluteStarAnimationUri = new URL(StarAnimationUri, import.meta.url).href
 
 export const useEntryReadabilityToggle = ({ id, url }: { id: string; url: string }) =>
@@ -172,7 +178,6 @@ export const useEntryActions = ({
       active?: boolean
       disabled?: boolean
       onClick: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void
-      onContextMenu?: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void
     }[] = [
       {
         name: t("entry_actions.save_media_to_eagle"),
@@ -344,14 +349,27 @@ export const useEntryActions = ({
         name: t("entry_actions.open_in_browser"),
         shortcut: shortcuts.entry.openInBrowser.key,
         className: "i-mgc-world-2-cute-re",
-        hide: !populatedEntry.entries.url,
-        active: getShowSourceContent(),
+        hide: type === "toolbar" || !populatedEntry.entries.url,
         onClick: () => {
           if (!populatedEntry.entries.url) return
           window.open(populatedEntry.entries.url, "_blank")
         },
-        onContextMenu: () => {
-          toggleShowSourceContent()
+      },
+      {
+        key: "openSourceContent",
+        // TODO update i18n
+        name: "Open source content",
+        // shortcut: shortcuts.entry.openInBrowser.key,
+        className: "i-mgc-world-2-cute-re",
+        hide: !populatedEntry.entries.url,
+        active: getShowSourceContent(),
+        onClick: () => {
+          if (type === "toolbar") {
+            toggleShowSourceContent()
+            return
+          }
+          navigateEntry({ entryId: populatedEntry.entries.id })
+          setShowSourceContent(true)
         },
       },
       {

diff --git a/apps/renderer/src/modules/entry-content/header.tsx b/apps/renderer/src/modules/entry-content/header.tsx
@@ -109,7 +109,6 @@ function EntryHeaderImpl({
                 active={item.active}
                 shortcut={item.shortcut}
                 onClick={item.onClick}
-                onContextMenu={item.onContextMenu}
                 tooltip={item.name}
                 key={item.name}
               />