Fix issue with view posts shortcut going to new post page

aureliushq · Aug 29, 2024 · fc1b796 · fc1b796
1 parent 5f7d183
commit fc1b796
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/app/lib/hooks/useKeyboardShortcuts.tsx b/app/lib/hooks/useKeyboardShortcuts.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from 'react'
+import { useCallback, useEffect, useMemo } from 'react'
 
 import {
 	AllShortcuts,
@@ -10,7 +10,6 @@ import {
 
 // Centralized record of all shortcuts
 const allShortcuts: AllShortcuts = {
-	// TODO: add all local shortcuts here
 	[EditorShortcuts.BLUR]: {
 		description: 'Blur',
 		key: 'Escape',
@@ -35,13 +34,11 @@ const allShortcuts: AllShortcuts = {
 		key: '?',
 		modifiers: {},
 	},
-	// TODO: this is a global shortcut
 	[EditorShortcuts.MAIN_MENU]: {
 		description: 'Main Menu',
 		key: 'm',
 		modifiers: {},
 	},
-	// TODO: this is a global shortcut
 	[EditorShortcuts.NEW_POST]: {
 		description: 'New Post',
 		key: 'p',
@@ -58,7 +55,6 @@ const allShortcuts: AllShortcuts = {
 		key: 'r',
 		modifiers: {},
 	},
-	// TODO: this is a global shortcut
 	[EditorShortcuts.SPLASH_DIALOG]: {
 		description: 'Quick Start',
 		key: 'q',
@@ -96,6 +92,14 @@ export const setGlobalShortcutAction = (
 }
 
 const useKeyboardShortcuts = (shortcuts: ShortcutActions) => {
+	const sortedShortcuts = useMemo(() => {
+		return Object.entries(allShortcuts).sort(([, a], [, b]) => {
+			const aModifiers = Object.values(a.modifiers).filter(Boolean).length
+			const bModifiers = Object.values(b.modifiers).filter(Boolean).length
+			return bModifiers - aModifiers
+		})
+	}, [])
+
 	const handleKeyDown = useCallback(
 		(event: KeyboardEvent) => {
 			const isInputField =
@@ -112,8 +116,7 @@ const useKeyboardShortcuts = (shortcuts: ShortcutActions) => {
 				meta: event.metaKey,
 			}
 
-			for (const shortcutName in allShortcuts) {
-				const shortcutConfig = allShortcuts[shortcutName]
+			for (const [shortcutName, shortcutConfig] of sortedShortcuts) {
 				const {
 					global,
 					key: shortcutKey,

diff --git a/app/lib/providers/aurelius.tsx b/app/lib/providers/aurelius.tsx
@@ -158,7 +158,7 @@ const AureliusProvider = ({ children }: AureliusProviderProps) => {
 
 	const handleSplashOpen = (open: boolean) => {
 		startTransition(() => {
-			setSplashOpen(open)
+			setSplashOpen(() => open)
 		})
 	}
 
@@ -168,13 +168,15 @@ const AureliusProvider = ({ children }: AureliusProviderProps) => {
 
 	const viewAllPosts = () => {
 		setMainMenuOpen(() => false)
+		handleSplashOpen(false)
 		startTransition(() => {
 			navigate(ROUTES.VIEW.POSTS)
 		})
 	}
 
 	const viewAllWritingSessions = () => {
 		setMainMenuOpen(() => false)
+		handleSplashOpen(false)
 		startTransition(() => {
 			navigate(ROUTES.VIEW.WRITING_SESSIONS)
 		})