feat: support shortcut to toggle wide mode

Signed-off-by: Innei <i@innei.in>
quantdaye · Oct 9, 2024 · b7a054f · b7a054f
1 parent 190a18e
commit b7a054f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/apps/renderer/src/components/errors/index.ts b/apps/renderer/src/components/errors/index.ts
@@ -4,7 +4,7 @@ import { FeedNotFoundErrorFallback } from "./FeedNotFound"
 import { ModalErrorFallback } from "./ModalError"
 import { PageErrorFallback } from "./PageError"
 
-export const ErrorFallbackMap = {
+const ErrorFallbackMap = {
   [ErrorComponentType.Modal]: ModalErrorFallback,
   [ErrorComponentType.Page]: PageErrorFallback,
   [ErrorComponentType.FeedFoundCanBeFollow]: FeedFoundCanBeFollowErrorFallback,

diff --git a/apps/renderer/src/constants/shortcuts.ts b/apps/renderer/src/constants/shortcuts.ts
@@ -24,6 +24,10 @@ export const shortcuts = {
       name: "keys.layout.showShortcuts",
       key: "H",
     },
+    toggleWideMode: {
+      name: "keys.layout.toggleWideMode",
+      key: "Meta+[",
+    },
   },
   entries: {
     refetch: {

diff --git a/apps/renderer/src/lib/utils.ts b/apps/renderer/src/lib/utils.ts
@@ -83,7 +83,7 @@ export const getOS = memoize((): OS => {
     iosPlatforms = ["iPhone", "iPad", "iPod"]
   // @ts-expect-error
   const platform = window.navigator.userAgentData?.platform || window.navigator.platform
-  let os = ""
+  let os = platform
 
   if (macosPlatforms.includes(platform)) {
     os = "macOS"

diff --git a/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx b/apps/renderer/src/modules/entry-column/layouts/EntryListHeader.tsx
@@ -245,6 +245,7 @@ const WideModeButton = () => {
       }}
     >
       <ActionButton
+        shortcut={shortcuts.layout.toggleWideMode.key}
         onClick={() => {
           setUISetting("wideMode", !isWideMode)
           window.posthog?.capture("Switch to Wide Mode", {

diff --git a/apps/renderer/src/router.tsx b/apps/renderer/src/router.tsx
@@ -2,6 +2,7 @@ import { IN_ELECTRON } from "@follow/shared/constants"
 import { wrapCreateBrowserRouter } from "@sentry/react"
 import { createBrowserRouter, createHashRouter } from "react-router-dom"
 
+import { Component as App } from "./App"
 import { ErrorElement } from "./components/common/ErrorElement"
 import { NotFound } from "./components/common/NotFound"
 import { buildGlobRoutes } from "./lib/route-builder"
@@ -18,7 +19,7 @@ if (window.SENTRY_RELEASE) {
 export const router = routerCreator([
   {
     path: "/",
-    lazy: () => import("./App"),
+    Component: App,
     children: tree,
     errorElement: <ErrorElement />,
   },

diff --git a/locales/shortcuts/en.json b/locales/shortcuts/en.json
@@ -20,6 +20,7 @@
   "keys.feeds.switchToView": "Switch to View",
   "keys.layout.showShortcuts": "Show/Hide Shortcuts",
   "keys.layout.toggleSidebar": "Show/Hide Feed Sidebar",
+  "keys.layout.toggleWideMode": "Toggle Wide Mode",
   "keys.type.audio": "audio",
   "keys.type.entries": "entries",
   "keys.type.entry": "entry",