Shortcut.isActive: Convert getState to state.

cybersemics · Oct 18, 2024 · 8c1a33b · 8c1a33b
1 parent c136d31
commit 8c1a33b
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 27 deletions.
diff --git a/src/@types/Shortcut.ts b/src/@types/Shortcut.ts
@@ -51,7 +51,7 @@ interface Shortcut {
   id: ShortcutId
 
   /** A function that returns true if the shortcut should be highlighted in the Toolbar. */
-  isActive?: (getState: () => State) => boolean
+  isActive?: (state: State) => boolean
 
   /** When true, a small open dropdown indicator will be rendered beneath the icon. */
   isDropdownOpen?: (getState: () => State) => boolean

diff --git a/src/components/CommandPalette.tsx b/src/components/CommandPalette.tsx
@@ -131,7 +131,7 @@ const CommandRow: FC<{
   const store = useStore()
   const ref = React.useRef<HTMLDivElement>(null)
   const colors = useSelector(themeColors)
-  const isActive = shortcut.isActive?.(store.getState)
+  const isActive = shortcut.isActive?.(store.getState())
   const label = shortcut.labelInverse && isActive ? shortcut.labelInverse! : shortcut.label
   const disabled = useSelector(state => !isExecutable(state, shortcut))
 

diff --git a/src/components/ToolbarButton.tsx b/src/components/ToolbarButton.tsx
@@ -54,7 +54,7 @@ const ToolbarButton: FC<ToolbarButtonProps> = ({
   const commandState = commandStateStore.useSelector(
     state => state[shortcutId as keyof typeof state] as boolean | undefined,
   )
-  const isShortcutActive = useSelector(state => !isActive || isActive(() => state))
+  const isShortcutActive = useSelector(state => !isActive || isActive(state))
   const isButtonActive = customize ? selected : commandState !== undefined ? commandState : isShortcutActive
 
   const dragShortcutZone = useSelector(state => state.dragShortcutZone)

diff --git a/src/hooks/useFilteredCommands.ts b/src/hooks/useFilteredCommands.ts
@@ -51,7 +51,7 @@ const useFilteredCommands = (
         if (!search) return true
 
         const label = (
-          sortActiveCommandsFirst && shortcut.labelInverse && shortcut.isActive?.(store.getState)
+          sortActiveCommandsFirst && shortcut.labelInverse && shortcut.isActive?.(store.getState())
             ? shortcut.labelInverse!
             : shortcut.label
         ).toLowerCase()
@@ -69,7 +69,7 @@ const useFilteredCommands = (
     // sorted shortcuts
     const sorted = _.sortBy(possibleShortcuts, shortcut => {
       const label = (
-        shortcut.labelInverse && shortcut.isActive?.(store.getState) ? shortcut.labelInverse : shortcut.label
+        shortcut.labelInverse && shortcut.isActive?.(store.getState()) ? shortcut.labelInverse : shortcut.label
       ).toLowerCase()
 
       // always sort exact match to top

diff --git a/src/shortcuts/favorite.ts b/src/shortcuts/favorite.ts
@@ -36,8 +36,7 @@ const favorite: Shortcut = {
   canExecute: state => {
     return isDocumentEditable() && (!!state.cursor || hasMulticursor(state))
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     const cursor = state.cursor
     if (!cursor) return false
     const id = head(cursor)

diff --git a/src/shortcuts/note.ts b/src/shortcuts/note.ts
@@ -30,8 +30,7 @@ const noteShortcut: Shortcut = {
     asyncFocus()
     dispatch(toggleNote())
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     const { cursor } = state
     const path = cursor ? simplifyPath(state, cursor) : HOME_PATH
     return attribute(state, head(path), '=note') !== null

diff --git a/src/shortcuts/pin.ts b/src/shortcuts/pin.ts
@@ -53,8 +53,7 @@ const pinShortcut: Shortcut = {
       }),
     )
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     const { cursor } = state
     const path = cursor ? simplifyPath(state, cursor) : HOME_PATH
     return isPinned(state, head(path)) ?? false

diff --git a/src/shortcuts/pinAll.ts b/src/shortcuts/pinAll.ts
@@ -85,8 +85,7 @@ const pinAllShortcut: Shortcut = {
       },
     ])
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     const { cursor } = state
     const path = cursor ? simplifyPath(state, cursor) : HOME_PATH
     const childrenAttributeId = findDescendant(state, head(path), '=children')

diff --git a/src/shortcuts/proseView.tsx b/src/shortcuts/proseView.tsx
@@ -33,8 +33,7 @@ const proseViewShortcut: Shortcut = {
       }),
     )
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     const { cursor } = state
     const path = cursor ? simplifyPath(state, cursor) : HOME_PATH
     return attributeEquals(state, head(path), '=view', 'Prose')

diff --git a/src/shortcuts/textColor.ts b/src/shortcuts/textColor.ts
@@ -20,7 +20,7 @@ const textColor: Shortcut = {
       path: state.cursor,
     })
   },
-  isActive: getState => !!getState().cursor,
+  isActive: state => !!state.cursor,
   isDropdownOpen: getState => !!getState().showColorPicker,
 }
 

diff --git a/src/shortcuts/toggleContextView.tsx b/src/shortcuts/toggleContextView.tsx
@@ -15,9 +15,8 @@ const toggleContextViewShortcut: Shortcut = {
   multicursor: true,
   svg: ContextViewIcon,
   canExecute: state => !!state.cursor,
-  isActive: getState => {
-    const state = getState()
-    return !!state.cursor && isContextViewActive(getState(), state.cursor)
+  isActive: state => {
+    return !!state.cursor && isContextViewActive(state, state.cursor)
   },
   exec: dispatch => dispatch(toggleContextView()),
 }

diff --git a/src/shortcuts/toggleDone.ts b/src/shortcuts/toggleDone.ts
@@ -18,8 +18,7 @@ const toggleDone: Shortcut = {
   canExecute: state => {
     return isDocumentEditable() && (!!state.cursor || hasMulticursor(state))
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     const cursor = state.cursor
     return !!cursor && !!findDescendant(state, head(cursor), ['=done'])
   },

diff --git a/src/shortcuts/toggleHiddenThoughts.tsx b/src/shortcuts/toggleHiddenThoughts.tsx
@@ -12,7 +12,7 @@ const toggleHiddenThoughtsShortcut: Shortcut = {
   multicursor: 'ignore',
   svg: HiddenThoughtsIcon,
   exec: dispatch => dispatch(toggleHiddenThoughts()),
-  isActive: getState => getState().showHiddenThoughts,
+  isActive: state => state.showHiddenThoughts,
 }
 
 export default toggleHiddenThoughtsShortcut
diff --git a/src/shortcuts/toggleSort.ts b/src/shortcuts/toggleSort.ts
@@ -43,8 +43,7 @@ const toggleSortShortcut: Shortcut = {
       )
     }
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     if (!state.cursor || isRoot(state.cursor)) return false
 
     const path = simplifyPath(state, rootedParentOf(state, state.cursor))

diff --git a/src/shortcuts/toggleSplitView.tsx b/src/shortcuts/toggleSplitView.tsx
@@ -26,7 +26,7 @@ const toggleSplitViewShortcut: Shortcut = {
     const state = getState()
     dispatch(toggleSplitView({ value: !state.showSplitView }))
   },
-  isActive: getState => getState().showSplitView,
+  isActive: state => state.showSplitView,
 }
 
 export default toggleSplitViewShortcut
diff --git a/src/shortcuts/toggleTableView.tsx b/src/shortcuts/toggleTableView.tsx
@@ -32,8 +32,7 @@ const toggleTableViewShortcut: Shortcut = {
       }),
     )
   },
-  isActive: getState => {
-    const state = getState()
+  isActive: state => {
     const { cursor } = state
     const path = cursor ? simplifyPath(state, cursor) : HOME_PATH
     return attributeEquals(state, head(path), '=view', 'Table')