RSSNext
diff --git a/‎apps/desktop/layer/main/src/menu.ts
Copy file name to clipboard
-11Lines changed: 0 additions & 11 deletions b/‎apps/desktop/layer/main/src/menu.ts
Copy file name to clipboard
-11Lines changed: 0 additions & 11 deletions
diff --git a/‎apps/desktop/layer/renderer/src/atoms/settings/ui.ts
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎apps/desktop/layer/renderer/src/atoms/settings/ui.ts
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎apps/desktop/layer/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/components/ui/dropdown-menu/dropdown-menu.tsx
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/constants/shortcuts.ts
Copy file name to clipboard
+7-6Lines changed: 7 additions & 6 deletions b/‎apps/desktop/layer/renderer/src/constants/shortcuts.ts
Copy file name to clipboard
+7-6Lines changed: 7 additions & 6 deletions
diff --git a/‎apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx
Copy file name to clipboard
+28-24Lines changed: 28 additions & 24 deletions b/‎apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx
Copy file name to clipboard
+28-24Lines changed: 28 additions & 24 deletions
diff --git a/‎apps/desktop/layer/renderer/src/initialize/global-shortcuts.ts
Copy file name to clipboard
+1-8Lines changed: 1 addition & 8 deletions b/‎apps/desktop/layer/renderer/src/initialize/global-shortcuts.ts
Copy file name to clipboard
+1-8Lines changed: 1 addition & 8 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/id.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/layout.tsx
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/command/commands/timeline.tsx
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/command/commands/timeline.tsx
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
@@ -135,18 +135,7 @@ export const registerAppMenu = () => {
         { role: "zoomIn", label: t("menu.zoomIn") },
         { role: "zoomOut", label: t("menu.zoomOut") },
         { type: "separator" },
-        {
-          type: "normal",
-          label: t("menu.zenMode"),
-          accelerator: "Ctrl+Shift+Z",
-          click: () => {
-            const mainWindow = getMainWindow()
-            if (!mainWindow) return
 
-            const caller = callWindowExpose(mainWindow)
-            caller.zenMode()
-          },
-        },
         { role: "togglefullscreen", label: t("menu.toggleFullScreen") },
       ],
     },
 
@@ -3,7 +3,7 @@ import { defaultUISettings } from "@follow/shared/settings/defaults"
 import { enhancedUISettingKeys } from "@follow/shared/settings/enhanced"
 import type { UISettings } from "@follow/shared/settings/interface"
 import { jotaiStore } from "@follow/utils/jotai"
-import { atom, useAtomValue, useSetAtom } from "jotai"
+import { atom, useAtomValue } from "jotai"
 import { useEventCallback } from "usehooks-ts"
 
 import { getDefaultLanguage } from "~/lib/language"
@@ -69,10 +69,10 @@ export const useIsZenMode = () => useAtomValue(zenModeAtom)
 export const getIsZenMode = () => jotaiStore.get(zenModeAtom)
 
 export const useSetZenMode = () => {
-  const setZenMode = useSetAtom(zenModeAtom)
-  return useEventCallback((checked: boolean) => {
-    setZenMode(checked)
-  })
+  return setZenMode
+}
+export const setZenMode = (checked: boolean) => {
+  jotaiStore.set(zenModeAtom, checked)
 }
 
 export const useToggleZenMode = () => {
 
@@ -1,4 +1,5 @@
 import { Divider } from "@follow/components/ui/divider/Divider.js"
+import { Kbd } from "@follow/components/ui/kbd/Kbd.js"
 import { RootPortal } from "@follow/components/ui/portal/index.js"
 import { useTypeScriptHappyCallback } from "@follow/hooks"
 import { cn } from "@follow/utils/utils"
@@ -116,12 +117,14 @@ const DropdownMenuItem = ({
   icon,
   active,
   highlightColor = "accent",
+  shortcut,
   ...props
 }: React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Item> & {
   inset?: boolean
   icon?: React.ReactNode | ((props?: { isActive?: boolean }) => React.ReactNode)
   active?: boolean
   highlightColor?: "accent" | "gray"
+  shortcut?: string
 } & { ref?: React.Ref<React.ElementRef<typeof DropdownMenuPrimitive.Item> | null> }) => (
   <DropdownMenuPrimitive.Item
     ref={ref}
@@ -144,8 +147,14 @@ const DropdownMenuItem = ({
       </span>
     )}
     {props.children}
+
     {/* Justify Fill */}
     {!!icon && <span className="ml-1.5 size-4" />}
+    {!!shortcut && (
+      <Kbd wrapButton={false} className="ml-auto">
+        {shortcut}
+      </Kbd>
+    )}
   </DropdownMenuPrimitive.Item>
 )
 DropdownMenuItem.displayName = DropdownMenuPrimitive.Item.displayName
 
@@ -55,17 +55,14 @@ const shortcutConfigs = {
       name: tShortcuts("keys.layout.toggleSidebar"),
       key: "$mod+B, [",
     },
-    showShortcuts: {
-      name: tShortcuts("keys.layout.showShortcuts"),
-      key: "?",
-    },
+
     toggleWideMode: {
       name: tShortcuts("keys.layout.toggleWideMode"),
       key: "$mod+[",
     },
-    zenMode: {
+    toggleZenMode: {
       name: tShortcuts("keys.layout.zenMode"),
-      key: "Ctrl+Shift+Z",
+      key: "$mod+Shift+Z",
     },
   },
   entries: {
@@ -149,6 +146,10 @@ const shortcutConfigs = {
       name: tShortcuts("keys.misc.quickSearch"),
       key: "$mod+K",
     },
+    showShortcuts: {
+      name: tShortcuts("keys.misc.showShortcuts"),
+      key: "?",
+    },
   },
 } as const
 
 
@@ -17,11 +17,11 @@ import {
 } from "~/atoms/readability"
 import { useShowSourceContent } from "~/atoms/source-content"
 import { useUserRole, whoami } from "~/atoms/user"
-import { shortcuts } from "~/constants/shortcuts"
 import { apiClient } from "~/lib/api-fetch"
 import { tipcClient } from "~/lib/client"
 import { COMMAND_ID } from "~/modules/command/commands/id"
 import { getCommand, useRunCommandFn } from "~/modules/command/hooks/use-command"
+import { useCommandShortcuts } from "~/modules/command/hooks/use-command-binding"
 import type { FollowCommandId } from "~/modules/command/types"
 import { useToolbarOrderMap } from "~/modules/customize-toolbar/hooks"
 import { useEntry } from "~/store/entry"
@@ -168,6 +168,8 @@ export const useEntryActions = ({
 
   const userRole = useUserRole()
 
+  const shortcuts = useCommandShortcuts()
+
   const actionConfigs: EntryActionItem[] = useMemo(() => {
     if (!hasEntry) return []
 
@@ -218,27 +220,28 @@ export const useEntryActions = ({
           { entryId, feedId: feed?.id, userId: feed?.ownerUserId },
         ]),
         hide: isInbox || feed?.ownerUserId === whoami()?.id,
-        shortcut: shortcuts.entry.tip.key,
+        // shortcut: shortcuts.entry.tip.key,
+        shortcut: shortcuts[COMMAND_ID.entry.tip],
         entryId,
       }),
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.star,
         onClick: runCmdFn(COMMAND_ID.entry.star, [{ entryId, view }]),
         active: !!entry?.collections,
-        shortcut: shortcuts.entry.toggleStarred.key,
+        shortcut: shortcuts[COMMAND_ID.entry.star],
         entryId,
       }),
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.copyTitle,
         onClick: runCmdFn(COMMAND_ID.entry.copyTitle, [{ entryId }]),
-        shortcut: shortcuts.entry.copyTitle.key,
+        shortcut: shortcuts[COMMAND_ID.entry.copyTitle],
         entryId,
       }),
       new EntryActionMenuItem({
         id: COMMAND_ID.entry.copyLink,
         onClick: runCmdFn(COMMAND_ID.entry.copyLink, [{ entryId }]),
         hide: !entry?.entries.url,
-        shortcut: shortcuts.entry.copyLink.key,
+        shortcut: shortcuts[COMMAND_ID.entry.copyLink],
         entryId,
       }),
       new EntryActionMenuItem({
@@ -295,7 +298,7 @@ export const useEntryActions = ({
         id: COMMAND_ID.entry.share,
         onClick: runCmdFn(COMMAND_ID.entry.share, [{ entryId }]),
         hide: !entry?.entries.url || !("share" in navigator || IN_ELECTRON),
-        shortcut: shortcuts.entry.share.key,
+        shortcut: shortcuts[COMMAND_ID.entry.share],
         entryId,
       }),
       new EntryActionMenuItem({
@@ -308,7 +311,7 @@ export const useEntryActions = ({
         onClick: runCmdFn(COMMAND_ID.entry.read, [{ entryId }]),
         hide: !hasEntry || !!entry.collections || !!inList,
         active: !!entry?.read,
-        shortcut: shortcuts.entry.toggleRead.key,
+        shortcut: shortcuts[COMMAND_ID.entry.read],
         entryId,
       }),
       new EntryActionMenuItem({
@@ -331,7 +334,7 @@ export const useEntryActions = ({
           { entryId, entryContent: entry?.entries.content! },
         ]),
         hide: !IN_ELECTRON || compact || !entry?.entries.content,
-        shortcut: shortcuts.entry.tts.key,
+        shortcut: shortcuts[COMMAND_ID.entry.tts],
         entryId,
       }),
       new EntryActionMenuItem({
@@ -364,32 +367,33 @@ export const useEntryActions = ({
 
     return configs
   }, [
-    compact,
-    entry?.collections,
-    entry?.entries.content,
-    entry?.entries.publishedAt,
-    entry?.entries.url,
-    entry?.read,
-    entry?.settings?.readability,
-    entry?.view,
+    hasEntry,
+    runCmdFn,
     entryId,
-    isEntryInReadability,
     feed?.id,
     feed?.ownerUserId,
     feed?.siteUrl,
-    hasEntry,
-    imageLength,
-    inList,
     isInbox,
+    shortcuts,
+    view,
+    entry?.collections,
+    entry?.entries.url,
+    entry?.entries.publishedAt,
+    entry?.entries.content,
+    entry?.view,
+    entry?.read,
+    entry?.settings?.readability,
+    imageLength,
+    isShowSourceContent,
     isShowAISummaryAuto,
     isShowAISummaryOnce,
+    userRole,
     isShowAITranslationAuto,
     isShowAITranslationOnce,
-    isShowSourceContent,
+    inList,
+    compact,
+    isEntryInReadability,
     isContentContainsHTMLTags,
-    runCmdFn,
-    userRole,
-    view,
   ])
 
   return actionConfigs
 
@@ -18,19 +18,12 @@ const parseAccelerator = (
 }
 
 export const registerAppGlobalShortcuts = () => {
-  // @see src/main/menu.ts
+  // @see layer/main/menu.ts
   const shortcuts: ShortcutDefinition[] = [
     {
       accelerator: "CmdOrCtrl+,",
       action: () => window.router.showSettings(),
     },
-    {
-      accelerator: "Ctrl+Shift+Z",
-      action: () => {
-        const caller = callWindowExposeRenderer()
-        caller.zenMode()
-      },
-    },
     {
       accelerator: "CmdOrCtrl+T",
       action: () => {
 
@@ -50,11 +50,14 @@ export const COMMAND_ID = {
     focusToTimeline: "layout:focus-to-timeline",
     focusToSubscription: "layout:focus-to-subscription",
     focusToEntryRender: "layout:focus-to-entry-render",
+    toggleWideMode: "layout:toggle-wide-mode",
+    toggleZenMode: "layout:toggle-zen-mode",
   },
   timeline: {
     switchToNext: "timeline:switch-to-next",
     switchToPrevious: "timeline:switch-to-previous",
     refetch: "timeline:refetch",
+    unreadOnly: "timeline:unread-only",
   },
   entryRender: {
     scrollDown: "entry-render:scroll-down",
 
@@ -1,5 +1,6 @@
 import { EventBus } from "@follow/utils/event-bus"
 
+import { getIsZenMode, getUISettings, setUISetting, setZenMode } from "~/atoms/settings/ui"
 import { setTimelineColumnShow } from "~/atoms/sidebar"
 
 import { useRegisterCommandEffect } from "../hooks/use-register-command"
@@ -44,6 +45,21 @@ export const useRegisterLayoutCommands = () => {
         EventBus.dispatch(COMMAND_ID.layout.focusToEntryRender)
       },
     },
+    {
+      id: COMMAND_ID.layout.toggleWideMode,
+      label: "Toggle wide mode",
+      run: () => {
+        const { wideMode } = getUISettings()
+        setUISetting("wideMode", !wideMode)
+      },
+    },
+    {
+      id: COMMAND_ID.layout.toggleZenMode,
+      label: "Toggle zen mode",
+      run: () => {
+        setZenMode(!getIsZenMode())
+      },
+    },
   ])
 }
 
@@ -65,8 +81,21 @@ export type FocusToEntryRenderCommand = Command<{
   id: typeof COMMAND_ID.layout.focusToEntryRender
   fn: () => void
 }>
+
+export type ToggleWideModeCommand = Command<{
+  id: typeof COMMAND_ID.layout.toggleWideMode
+  fn: () => void
+}>
+
+export type ToggleZenModeCommand = Command<{
+  id: typeof COMMAND_ID.layout.toggleZenMode
+  fn: () => void
+}>
+
 export type LayoutCommand =
   | ToggleTimelineColumnCommand
   | FocusToTimelineCommand
   | FocusToSubscriptionCommand
   | FocusToEntryRenderCommand
+  | ToggleWideModeCommand
+  | ToggleZenModeCommand
@@ -1,5 +1,7 @@
 import { EventBus } from "@follow/utils/event-bus"
 
+import { setGeneralSetting } from "~/atoms/settings/general"
+
 import { useRegisterCommandEffect } from "../hooks/use-register-command"
 import type { Command } from "../types"
 import { COMMAND_ID } from "./id"
@@ -36,6 +38,13 @@ export const useRegisterTimelineCommand = () => {
         EventBus.dispatch("timeline:refetch")
       },
     },
+    {
+      id: COMMAND_ID.timeline.unreadOnly,
+      label: "Unread Only",
+      run: (unreadOnly: boolean) => {
+        setGeneralSetting("unreadOnly", unreadOnly)
+      },
+    },
   ])
 }
 
@@ -54,7 +63,13 @@ export type RefetchTimelineCommand = Command<{
   fn: () => void
 }>
 
+export type UnreadOnlyTimelineCommand = Command<{
+  id: typeof COMMAND_ID.timeline.unreadOnly
+  fn: (unreadOnly: boolean) => void
+}>
+
 export type TimelineCommand =
   | SwitchToNextTimelineCommand
   | SwitchToPreviousTimelineCommand
   | RefetchTimelineCommand
+  | UnreadOnlyTimelineCommand