From e17f6bcb01a332cfc0dee3fd98e5e231dad58a14 Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 14:45:08 +0530
Subject: [PATCH 1/8] Save global join to update view and use it to determine
 if view changed

---
 src/components/mex/TaskViewModal.tsx    |  3 ++-
 src/components/mex/Tasks/TaskHeader.tsx | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/mex/TaskViewModal.tsx b/src/components/mex/TaskViewModal.tsx
index 7ff4aaecd..1b0e4c1cc 100644
--- a/src/components/mex/TaskViewModal.tsx
+++ b/src/components/mex/TaskViewModal.tsx
@@ -129,13 +129,14 @@ const TaskViewModal = () => {
   }, [cloneViewId, updateViewId])
 
   const onSubmit = async (data: TaskViewModalFormData) => {
-    mog('onSubmit', { data, filters, cloneViewId })
+    // mog('onSubmit', { data, filters, cloneViewId })
     if (updateViewId) {
       const oldview = { ...getView(updateViewId) }
       const newView = {
         ...oldview,
         title: data.title ?? oldview.title,
         description: data.description ?? oldview.description,
+        globalJoin,
         filters
       }
       await updateView(newView)
diff --git a/src/components/mex/Tasks/TaskHeader.tsx b/src/components/mex/Tasks/TaskHeader.tsx
index ed5ffcaef..641a6c74d 100644
--- a/src/components/mex/Tasks/TaskHeader.tsx
+++ b/src/components/mex/Tasks/TaskHeader.tsx
@@ -52,9 +52,11 @@ const TaskHeader = ({ currentView, currentFilters, cardSelected, globalJoin }: T
   const [source, target] = useSingleton()
   const [deleting, setDeleting] = useState(false)
 
-  const isCurrentFiltersUnchanged = useMemo(() => {
-    return JSON.stringify(currentFilters) === JSON.stringify(currentView?.filters)
-  }, [currentFilters, currentView])
+  const isCurrentViewChanged = useMemo(() => {
+    return !(
+      JSON.stringify(currentFilters) === JSON.stringify(currentView?.filters) && globalJoin === currentView?.globalJoin
+    )
+  }, [currentFilters, currentView, globalJoin])
 
   const onDeleteView = async () => {
     if (currentView) {
@@ -79,7 +81,7 @@ const TaskHeader = ({ currentView, currentFilters, cardSelected, globalJoin }: T
               <TaskViewTitle>
                 <Icon icon={stackLine} />
                 {currentView?.title}
-                {!isCurrentFiltersUnchanged && '*'}
+                {isCurrentViewChanged && '*'}
               </TaskViewTitle>
               <TaskViewControls>
                 <Button
@@ -91,7 +93,7 @@ const TaskHeader = ({ currentView, currentFilters, cardSelected, globalJoin }: T
                     })
                   }
                   disabled={currentFilters.length === 0}
-                  primary={!isCurrentFiltersUnchanged && currentFilters.length > 0}
+                  primary={isCurrentViewChanged && currentFilters.length > 0}
                 >
                   <Icon icon={edit2Line} />
                   Update View

From 657b4c92a31eebf20adb6de1963d9104592b68f8 Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 14:49:48 +0530
Subject: [PATCH 2/8] F to add filter, Shift+F to remove last filter

---
 src/components/mex/Search/SearchFilters.tsx |  8 +++++++-
 src/ui/components/Filters/NewFilterMenu.tsx | 20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/mex/Search/SearchFilters.tsx b/src/components/mex/Search/SearchFilters.tsx
index 8fe9e7b1e..9150586b9 100644
--- a/src/components/mex/Search/SearchFilters.tsx
+++ b/src/components/mex/Search/SearchFilters.tsx
@@ -38,6 +38,12 @@ const SearchFilters = ({
   const randomId = useMemo(() => nanoid(), [filters, currentFilters])
 
   // mog('SearchFilters', { filters, currentFilters, filtersByKey })
+  const removeLastFilter = () => {
+    if (currentFilters.length > 0) {
+      const lastFilter = currentFilters[currentFilters.length - 1]
+      removeCurrentFilter(lastFilter)
+    }
+  }
 
   return (
     <SearchFilterWrapper>
@@ -54,7 +60,7 @@ const SearchFilters = ({
         <Infobox text={SearchFiltersHelp} />
       </SearchFilterLabel>
       <SearchFiltersWrapper key={`Filters_${randomId}`}>
-        <NewFilterMenu filters={filters} addFilter={(f) => addCurrentFilter(f)} />
+        <NewFilterMenu filters={filters} addFilter={(f) => addCurrentFilter(f)} removeLastFilter={removeLastFilter} />
         {currentFilters.map((filter) => (
           <FilterRender
             key={filter.id}
diff --git a/src/ui/components/Filters/NewFilterMenu.tsx b/src/ui/components/Filters/NewFilterMenu.tsx
index 01e611e65..b27291ccd 100644
--- a/src/ui/components/Filters/NewFilterMenu.tsx
+++ b/src/ui/components/Filters/NewFilterMenu.tsx
@@ -15,11 +15,12 @@ import { DisplayShortcut } from '@workduck-io/mex-components'
 interface NewFilterMenuProps {
   filters: Filters
   addFilter: (filter: Filter) => void
+  removeLastFilter: () => void
 }
 
 const NewFilterClassName = 'new-filter-menu'
 
-const NewFilterMenu = ({ addFilter, filters }: NewFilterMenuProps) => {
+const NewFilterMenu = ({ addFilter, filters, removeLastFilter }: NewFilterMenuProps) => {
   const { getFilterValueIcon } = useFilterIcons()
   const { enableShortcutHandler } = useEnableShortcutHandler()
   const onAddNewFilter = (type: FilterType, value: FilterValue) => {
@@ -39,7 +40,7 @@ const NewFilterMenu = ({ addFilter, filters }: NewFilterMenuProps) => {
 
   useEffect(() => {
     const unsubscribe = tinykeys(window, {
-      'Shift+F': (event) => {
+      F: (event) => {
         enableShortcutHandler(
           () => {
             event.preventDefault()
@@ -56,6 +57,19 @@ const NewFilterMenu = ({ addFilter, filters }: NewFilterMenuProps) => {
             ignoreClasses: 'input'
           }
         )
+      },
+      'Shift+F': (event) => {
+        enableShortcutHandler(
+          () => {
+            event.preventDefault()
+            event.stopPropagation()
+            removeLastFilter()
+          },
+          {
+            skipLocal: false,
+            ignoreClasses: 'input'
+          }
+        )
       }
     })
     return () => {
@@ -70,7 +84,7 @@ const NewFilterMenu = ({ addFilter, filters }: NewFilterMenuProps) => {
         <FilterMenuDiv>
           <Icon icon={filter2Line} />
           Filter
-          <DisplayShortcut shortcut={'Shift+F'} />
+          <DisplayShortcut shortcut={'F'} />
         </FilterMenuDiv>
       }
     >

From c2d75b1c6e5b7201d791095d2f8c94fb21d468c4 Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 17:06:57 +0530
Subject: [PATCH 3/8] Fix esc key behavior in tasks

---
 src/components/FloatingElements/Dropdown.tsx |  4 ++-
 src/components/mex/Tasks/TaskHeader.tsx      | 14 +++++++---
 src/hooks/useShortcutListener.ts             | 13 ++++++---
 src/style/Todo.tsx                           |  5 ++--
 src/views/mex/Tasks.tsx                      | 29 ++++++++------------
 5 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/components/FloatingElements/Dropdown.tsx b/src/components/FloatingElements/Dropdown.tsx
index d20f1b33e..6f36ca9d5 100644
--- a/src/components/FloatingElements/Dropdown.tsx
+++ b/src/components/FloatingElements/Dropdown.tsx
@@ -148,7 +148,9 @@ export const MenuComponent = forwardRef<any, Props & React.HTMLProps<HTMLButtonE
         ignoreMouse: nested
       }),
       useRole(context, { role: 'menu' }),
-      useDismiss(context),
+      useDismiss(context, {
+        escapeKey: true,
+      }),
       useListNavigation(context, {
         listRef: listItemsRef,
         activeIndex,
diff --git a/src/components/mex/Tasks/TaskHeader.tsx b/src/components/mex/Tasks/TaskHeader.tsx
index 641a6c74d..eeb6c76a0 100644
--- a/src/components/mex/Tasks/TaskHeader.tsx
+++ b/src/components/mex/Tasks/TaskHeader.tsx
@@ -155,7 +155,7 @@ const TaskHeader = ({ currentView, currentFilters, cardSelected, globalJoin }: T
         {cardSelected && (
           <>
             <ShortcutToken>
-              Navigate:
+              Open:
               <DisplayShortcut shortcut="$mod+Enter" />
             </ShortcutToken>
             <ShortcutToken>
@@ -164,15 +164,21 @@ const TaskHeader = ({ currentView, currentFilters, cardSelected, globalJoin }: T
               <Icon icon={arrowLeftRightLine} />
             </ShortcutToken>
             <ShortcutToken>
-              Change Priority:
+              Priority:
               <DisplayShortcut shortcut="$mod+0-3" />
             </ShortcutToken>
           </>
         )}
-        <ShortcutToken>
+        {currentFilters.length > 0 && (
+          <ShortcutToken>
+            Remove Filter:
+            <DisplayShortcut shortcut="Shift+F" />
+          </ShortcutToken>
+        )}
+        {/*<ShortcutToken>
           {cardSelected || currentFilters.length > 0 ? 'Clear Filters:' : 'Navigate to Editor:'}
           <DisplayShortcut shortcut="Esc" />
-        </ShortcutToken>
+        </ShortcutToken> */}
       </ShortcutTokens>
       {/*<Button onClick={onClearClick}>
    <Icon icon={trashIcon} height={24} />
diff --git a/src/hooks/useShortcutListener.ts b/src/hooks/useShortcutListener.ts
index 1b4161378..c8ad17458 100644
--- a/src/hooks/useShortcutListener.ts
+++ b/src/hooks/useShortcutListener.ts
@@ -150,7 +150,7 @@ interface LocalSkipOptions {
 export const useEnableShortcutHandler = () => {
   const isEditingPreview = useMultipleEditors((store) => store.isEditingAnyPreview)
 
-  const isOnSearchFilter = (ignoreClasses?: IgnoreClasses) => {
+  const isOnElementClass = (ignoreClasses?: IgnoreClasses) => {
     const allIgnore: IgnoreClasses = ignoreClasses ?? 'all'
     const classesToIgnore = MEX_KEYBOARD_IGNORE_CLASSES[allIgnore]
     const fElement = document.activeElement as HTMLElement
@@ -159,8 +159,12 @@ export const useEnableShortcutHandler = () => {
     //   cl: fElement.classList,
     //   tagName: fElement.tagName
     // })
-    return fElement && (fElement.tagName === 'INPUT' || fElement.tagName === 'TEXTAREA'
-      || classesToIgnore.some((c) => fElement.classList.contains(c)))
+    return (
+      fElement &&
+      (fElement.tagName === 'INPUT' ||
+        fElement.tagName === 'TEXTAREA' ||
+        classesToIgnore.some((c) => fElement.classList.contains(c)))
+    )
   }
 
   const enableShortcutHandler = (callback: () => void, options?: LocalSkipOptions) => {
@@ -168,9 +172,10 @@ export const useEnableShortcutHandler = () => {
       ignoreClasses: 'all',
       skipLocal: false
     }
+    // mog('enableShortcutHandler', { allOp, isEditingPreview, isOnSearchFilter: isOnElementClass(allOp.ignoreClasses) })
     if (isEditingPreview() || !useMultipleEditors.getState().editors) return
 
-    if (!allOp.skipLocal && isOnSearchFilter(allOp.ignoreClasses)) return
+    if (!allOp.skipLocal && isOnElementClass(allOp.ignoreClasses)) return
 
     callback()
   }
diff --git a/src/style/Todo.tsx b/src/style/Todo.tsx
index a24de02f7..1b09c87e5 100644
--- a/src/style/Todo.tsx
+++ b/src/style/Todo.tsx
@@ -112,7 +112,7 @@ export const ShortcutTokens = styled.div`
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  gap: ${({ theme }) => `${theme.spacing.small} ${theme.spacing.large}`};
+  gap: ${({ theme }) => `${theme.spacing.tiny} ${theme.spacing.small}`};
   max-width: 600px;
   justify-content: end;
 `
@@ -125,7 +125,8 @@ export const ShortcutToken = styled.div`
   padding: ${({ theme }) => `${theme.spacing.tiny} ${theme.spacing.small}`};
   background: ${({ theme }) => theme.colors.gray[9]};
   border-radius: ${({ theme }) => theme.borderRadius.small};
-  font-size: 0.9rem;
+  font-size: 10px;
+  font-weight: 500;
 
   svg {
     width: 1.3rem;
diff --git a/src/views/mex/Tasks.tsx b/src/views/mex/Tasks.tsx
index ed35df9b2..850d6301b 100644
--- a/src/views/mex/Tasks.tsx
+++ b/src/views/mex/Tasks.tsx
@@ -1,29 +1,25 @@
 import Board from '@asseinfo/react-kanban'
 import TaskHeader from '@components/mex/Tasks/TaskHeader'
+import { useEnableShortcutHandler } from '@hooks/useShortcutListener'
 import { useSyncTaskViews, useViewStore } from '@hooks/useTaskViews'
 import { useLayoutStore } from '@store/useLayoutStore'
 import { OverlaySidebarWindowWidth } from '@style/responsive'
+import { mog } from '@workduck-io/mex-utils'
+import { tinykeys } from '@workduck-io/tinykeys'
 import React, { useEffect, useMemo, useRef } from 'react'
 import { useMediaQuery } from 'react-responsive'
 import { useMatch } from 'react-router-dom'
-import { tinykeys } from '@workduck-io/tinykeys'
 import SearchFilters from '../../components/mex/Search/SearchFilters'
 import { Heading } from '../../components/spotlight/SearchResults/styled'
 import { getNextStatus, getPrevStatus, PriorityType, TodoType } from '../../editor/Components/Todo/types'
 import EditorPreviewRenderer from '../../editor/EditorPreviewRenderer'
-import useLoad from '../../hooks/useLoad'
 import { useNavigation } from '../../hooks/useNavigation'
 import { KanbanBoardColumn, TodoKanbanCard, useTodoKanban } from '../../hooks/useTodoKanban'
-import useDataStore from '../../store/useDataStore'
-import { useEditorStore } from '../../store/useEditorStore'
-import { useRecentsStore } from '../../store/useRecentsStore'
 import useTodoStore from '../../store/useTodoStore'
 import { PageContainer } from '../../style/Layouts'
 import { StyledTasksKanban, TaskCard, TaskColumnHeader } from '../../style/Todo'
 import Todo from '../../ui/components/Todo'
-import { mog } from '../../utils/lib/helper'
 import { NavigationType, ROUTE_PATHS, useRouting } from '../routes/urls'
-import { useEnableShortcutHandler } from '@hooks/useShortcutListener'
 
 const Tasks = () => {
   const [selectedCard, setSelectedCard] = React.useState<TodoKanbanCard | null>(null)
@@ -35,13 +31,8 @@ const Tasks = () => {
   const setCurrentView = useViewStore((store) => store.setCurrentView)
   const { enableShortcutHandler } = useEnableShortcutHandler()
 
-  const { loadNode } = useLoad()
   const { goTo } = useRouting()
 
-  const lastOpened = useRecentsStore((store) => store.lastOpened)
-  const nodeUID = useEditorStore((store) => store.node.nodeid)
-  const baseNodeId = useDataStore((store) => store.baseNodeId)
-
   const { push } = useNavigation()
 
   const todos = useMemo(() => Object.entries(nodesTodo), [nodesTodo])
@@ -221,14 +212,15 @@ const Tasks = () => {
       Escape: (event) => {
         enableShortcutHandler(() => {
           event.preventDefault()
-          if (selectedCard || currentFilters.length > 0) {
+          if (selectedCard) {
             setSelectedCard(null)
-            resetCurrentFilters()
-          } else {
-            const nodeid = nodeUID ?? lastOpened[0] ?? baseNodeId
-            loadNode(nodeid)
-            goTo(ROUTE_PATHS.node, NavigationType.push, nodeid)
           }
+          // else {
+          // mog('LOAD NODE')
+          // // const nodeid = nodeUID ?? lastOpened[0] ?? baseNodeId
+          // // loadNode(nodeid)
+          // // goTo(ROUTE_PATHS.node, NavigationType.push, nodeid)
+          // }
         })
       },
       'Shift+ArrowRight': (event) => {
@@ -257,6 +249,7 @@ const Tasks = () => {
         })
       },
       ArrowDown: (event) => {
+        mog('ArrowDown')
         enableShortcutHandler(() => {
           event.preventDefault()
           selectNewCard('down')

From f6d5feb54848b8023078702e8b5d6616c1c913a7 Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 18:46:08 +0530
Subject: [PATCH 4/8] Don't remove filters on esc in search

---
 src/components/mex/Search/SearchView.tsx |  1 -
 src/views/mex/Tasks.tsx                  | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/mex/Search/SearchView.tsx b/src/components/mex/Search/SearchView.tsx
index 1c92a87a6..0ade535ce 100644
--- a/src/components/mex/Search/SearchView.tsx
+++ b/src/components/mex/Search/SearchView.tsx
@@ -323,7 +323,6 @@ const SearchView = <Item,>({
         enableShortcutHandler(() => {
           event.preventDefault()
           event.stopPropagation()
-          resetCurrentFilters()
           if (inpRef.current) {
             if (inpRef.current.value !== '') {
               inpRef.current.value = ''
diff --git a/src/views/mex/Tasks.tsx b/src/views/mex/Tasks.tsx
index 850d6301b..6f1186be0 100644
--- a/src/views/mex/Tasks.tsx
+++ b/src/views/mex/Tasks.tsx
@@ -121,6 +121,7 @@ const Tasks = () => {
       selectFirst()
       return
     }
+
     const selectedColumn = board.columns.find(
       (column) => column.id === selectedCard.todo.metadata.status
     ) as KanbanBoardColumn
@@ -140,6 +141,7 @@ const Tasks = () => {
         }
         break
       }
+
       case 'down': {
         const nextCard = selectedColumn.cards[(selectedIndex + 1) % selectedColumnLength]
         // mog('nextCard', { nextCard, selectedColumn, selectedColumnLength, selectedIndex })
@@ -149,6 +151,7 @@ const Tasks = () => {
         }
         break
       }
+
       case 'left': {
         let selectedColumnStatus = selectedColumn.id
         let prevCard = undefined
@@ -166,6 +169,7 @@ const Tasks = () => {
         }
         break
       }
+
       case 'right': {
         let selectedColumnStatus = selectedColumn.id
         let nextCard = undefined
@@ -223,18 +227,21 @@ const Tasks = () => {
           // }
         })
       },
+
       'Shift+ArrowRight': (event) => {
         enableShortcutHandler(() => {
           event.preventDefault()
           handleCardMoveNext()
         })
       },
+
       'Shift+ArrowLeft': (event) => {
         enableShortcutHandler(() => {
           event.preventDefault()
           handleCardMovePrev()
         })
       },
+
       ArrowRight: (event) => {
         enableShortcutHandler(() => {
           event.preventDefault()
@@ -248,6 +255,7 @@ const Tasks = () => {
           selectNewCard('left')
         })
       },
+
       ArrowDown: (event) => {
         mog('ArrowDown')
         enableShortcutHandler(() => {
@@ -267,14 +275,17 @@ const Tasks = () => {
         event.preventDefault()
         changeSelectedPriority(PriorityType.low)
       },
+
       '$mod+2': (event) => {
         event.preventDefault()
         changeSelectedPriority(PriorityType.medium)
       },
+
       '$mod+3': (event) => {
         event.preventDefault()
         changeSelectedPriority(PriorityType.high)
       },
+
       '$mod+0': (event) => {
         event.preventDefault()
         changeSelectedPriority(PriorityType.noPriority)

From 33a2f0299c86c6b128ae8ce8dce63dacf6b04c43 Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 19:18:04 +0530
Subject: [PATCH 5/8] Fix keyboard shortcuts and remove highlight

---
 src/components/mex/Search/Search.tsx     |  5 ++--
 src/components/mex/Search/SearchView.tsx | 33 ++++++++++++++----------
 src/editor/Editor.tsx                    |  6 ++---
 src/hooks/useShortcutListener.ts         | 12 ++++-----
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/components/mex/Search/Search.tsx b/src/components/mex/Search/Search.tsx
index 3913a5b52..51324b8ff 100644
--- a/src/components/mex/Search/Search.tsx
+++ b/src/components/mex/Search/Search.tsx
@@ -127,10 +127,11 @@ const Search = () => {
   const lastOpened = useRecentsStore((store) => store.lastOpened)
   const nodeUID = useEditorStore((store) => store.node.nodeid)
   const baseNodeId = useDataStore((store) => store.baseNodeId)
+  const isHighlightBlock = (item: GenericSearchResult) => item.matchField?.includes('text')
 
   const onOpenItem = (item: GenericSearchResult) => {
     if (item.index === 'node') {
-      loadNode(item.id, { highlightBlockId: item.blockId })
+      loadNode(item.id, { highlightBlockId: isHighlightBlock(item) ? item.blockId : undefined })
       goTo(ROUTE_PATHS.node, NavigationType.push, item.id)
     } else if (item.index === 'snippet' || item.index === 'template') {
       loadSnippet(item.id)
@@ -357,7 +358,7 @@ const Search = () => {
           </Title>
           <EditorPreviewRenderer
             content={content}
-            blockId={item.blockId}
+            blockId={isHighlightBlock(item) ? item.blockId : undefined}
             onDoubleClick={(e) => onDoubleClick(e, item)}
             editorId={`SearchPreview_editor_${item.id}`}
           />
diff --git a/src/components/mex/Search/SearchView.tsx b/src/components/mex/Search/SearchView.tsx
index 0ade535ce..c946ebd6e 100644
--- a/src/components/mex/Search/SearchView.tsx
+++ b/src/components/mex/Search/SearchView.tsx
@@ -352,29 +352,36 @@ const SearchView = <Item,>({
       // },
       ArrowDown: (event) => {
         // event.preventDefault()
-        enableShortcutHandler(selectNext)
+        enableShortcutHandler(selectNext, { ignoreClasses: 'dropdown', skipLocal: false })
       },
 
       ArrowUp: (event) => {
-        enableShortcutHandler(selectPrev)
+        enableShortcutHandler(selectPrev, { ignoreClasses: 'dropdown', skipLocal: false })
       },
 
       Enter: (event) => {
         // Only when the selected index is -1
-        enableShortcutHandler(() => {
-          if (selected > -1) {
-            onSelect(result[selected] as Item)
-          }
-        })
+        enableShortcutHandler(
+          () => {
+            if (selected > -1) {
+              onSelect(result[selected] as Item)
+            }
+          },
+          { ignoreClasses: 'dropdown', skipLocal: false }
+        )
       },
+
       Delete: (event) => {
         // Only when the selected index is -1
-        enableShortcutHandler(() => {
-          if (selected > -1) {
-            onDelete(result[selected] as Item)
-            setSelected(-1)
-          }
-        })
+        enableShortcutHandler(
+          () => {
+            if (selected > -1) {
+              onDelete(result[selected] as Item)
+              setSelected(-1)
+            }
+          },
+          { ignoreClasses: 'dropdown', skipLocal: false }
+        )
       }
     })
     return () => {
diff --git a/src/editor/Editor.tsx b/src/editor/Editor.tsx
index 15068d591..c43d98ccc 100644
--- a/src/editor/Editor.tsx
+++ b/src/editor/Editor.tsx
@@ -88,11 +88,11 @@ export const Editor = ({
   }, [editorRef, editorId, focusAtBeginning]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
-    const tempRef = editorRef || getPlateEditorRef(editorId)
-
-    if (tempRef && hightlightedBlockIds.length > 0) {
+    // Clear highlights when highlightedBlockIds present
+    if (hightlightedBlockIds.length > 0) {
       focusBlock(hightlightedBlockIds[hightlightedBlockIds.length - 1], editorId)
       const clearHighlightTimeoutId = setTimeout(() => {
+        // mog('clearing highlights')
         if (!readOnly) clearHighlights()
       }, 2000)
       return () => clearTimeout(clearHighlightTimeoutId)
diff --git a/src/hooks/useShortcutListener.ts b/src/hooks/useShortcutListener.ts
index c8ad17458..a13db9400 100644
--- a/src/hooks/useShortcutListener.ts
+++ b/src/hooks/useShortcutListener.ts
@@ -159,12 +159,12 @@ export const useEnableShortcutHandler = () => {
     //   cl: fElement.classList,
     //   tagName: fElement.tagName
     // })
-    return (
-      fElement &&
-      (fElement.tagName === 'INPUT' ||
-        fElement.tagName === 'TEXTAREA' ||
-        classesToIgnore.some((c) => fElement.classList.contains(c)))
-    )
+    const ignoredInputTags =
+      ignoreClasses === 'input' || ignoreClasses === 'all'
+        ? fElement.tagName === 'INPUT' || fElement.tagName === 'TEXTAREA'
+        : false
+
+    return fElement && ignoredInputTags && classesToIgnore.some((c) => fElement.classList.contains(c))
   }
 
   const enableShortcutHandler = (callback: () => void, options?: LocalSkipOptions) => {

From 591ae7b27d390b412195cb44184d65d4d13b1a97 Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 19:29:30 +0530
Subject: [PATCH 6/8] Don't Animate when not changing from switcher

---
 src/hooks/useNavigation.tsx      |  2 +-
 src/ui/sidebar/Sidebar.notes.tsx | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useNavigation.tsx b/src/hooks/useNavigation.tsx
index b323ed2ec..c861a77a9 100644
--- a/src/hooks/useNavigation.tsx
+++ b/src/hooks/useNavigation.tsx
@@ -49,7 +49,7 @@ export const withNavigation = (Component: any) => {
     const { goTo } = useRouting()
 
     const onPush = useCallback((nodeid: string, options?: LoadNodeOptions) => {
-      console.log('onPush', { nodeid, options })
+      // console.log('onPush', { nodeid, options })
       goTo(ROUTE_PATHS.node, NavigationType.push, nodeid)
       push(nodeid, options)
     }, [])
diff --git a/src/ui/sidebar/Sidebar.notes.tsx b/src/ui/sidebar/Sidebar.notes.tsx
index 52875881a..f1a4df5ef 100644
--- a/src/ui/sidebar/Sidebar.notes.tsx
+++ b/src/ui/sidebar/Sidebar.notes.tsx
@@ -2,7 +2,7 @@ import { SharedNodeIconify } from '@components/icons/Icons'
 import StarredNotes from '@components/mex/Sidebar/StarredNotes'
 import SharedNotes from '@components/mex/Sidebar/SharedNotes'
 import useDataStore from '@store/useDataStore'
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useEffect, useMemo, useRef, useState } from 'react'
 import { SidebarSpaceComponent } from './space'
 import { SidebarSpaceSwitcher } from './Sidebar.spaceSwitcher'
 import { SpaceContentWrapper, SpaceWrapper } from './Sidebar.style'
@@ -25,6 +25,7 @@ export const NoteSidebar = () => {
   const tags = useDataStore((s) => s.tags)
   const replaceAndAddActionToPoll = useApiStore((store) => store.replaceAndAddActionToPoll)
   const { getNodesByNamespaces } = useNamespaces()
+  const isAnimate = useRef(false)
 
   const mostUsedTags = useMemo(() => {
     const topUsedTags = getMostUsedTags()
@@ -80,10 +81,13 @@ export const NoteSidebar = () => {
   const changeIndex = (newIndex: number, updateStores = true) => {
     if (newIndex === index.current) return
     const nextSpaceId = spaces[newIndex]?.id
-    mog('Changing index', { newIndex, index })
+    // mog('Changing index', { newIndex, index })
     if (nextSpaceId) {
       if (updateStores) {
         changeSidebarSpace(nextSpaceId)
+        isAnimate.current = true
+      } else {
+        isAnimate.current = false
       }
       setIndex({ current: newIndex, prev: index.current })
     }
@@ -100,12 +104,14 @@ export const NoteSidebar = () => {
 
   const transRef = useSpringRef()
   const defaultStyles = { opacity: 1, transform: 'translate3d(0%,0,0)' }
+  const fadeStyles = { opacity: 1, transform: 'translate3d(0%,0,0)' }
   const transitions = useTransition(index, {
     ref: transRef,
     keys: null,
     from: () => {
       // Skip if there is no previous index
       if (index.prev === -1) return defaultStyles
+      if (!isAnimate.current) return fadeStyles
       const direction = index.prev > -1 ? Math.sign(index.current - index.prev) : 1
       // mog('from', { index, direction })
       return { opacity: 0, transform: `translate3d(${direction * 100}%,0,0)` }
@@ -114,6 +120,7 @@ export const NoteSidebar = () => {
     leave: () => {
       // Skip if there is no previous index
       if (index.prev === -1) return defaultStyles
+      if (!isAnimate.current) return fadeStyles
       const direction = index.prev > -1 ? -Math.sign(index.current - index.prev) : -1
       // mog('leave', { index, direction })
       return { opacity: 0, transform: `translate3d(${direction * 100}%,0,0)` }

From 58abe35c07a03fe63900953cb8887a21f183744b Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 19:35:43 +0530
Subject: [PATCH 7/8] Remove unused comment

---
 src/views/mex/Tasks.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/mex/Tasks.tsx b/src/views/mex/Tasks.tsx
index 6f1186be0..96edf2411 100644
--- a/src/views/mex/Tasks.tsx
+++ b/src/views/mex/Tasks.tsx
@@ -257,7 +257,6 @@ const Tasks = () => {
       },
 
       ArrowDown: (event) => {
-        mog('ArrowDown')
         enableShortcutHandler(() => {
           event.preventDefault()
           selectNewCard('down')

From ad216395d5bf0fc78816c0077b0c3432f9bacea2 Mon Sep 17 00:00:00 2001
From: xypnox <xypnox@gmail.com>
Date: Mon, 26 Sep 2022 20:05:55 +0530
Subject: [PATCH 8/8] Remove active focus el

---
 src/style/Todo.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/style/Todo.tsx b/src/style/Todo.tsx
index 1b09c87e5..bf7af4060 100644
--- a/src/style/Todo.tsx
+++ b/src/style/Todo.tsx
@@ -50,6 +50,13 @@ export const StyledBoard = styled.div<{ sidebarExpanded?: boolean }>`
     padding: ${({ theme }) => theme.spacing.small};
     margin: ${({ theme }) => theme.spacing.small};
     border-radius: ${({ theme }) => theme.borderRadius.small};
+
+    div:focus-visible {
+      outline: none;
+      border-color: none;
+      -webkit-box-shadow: none;
+      box-shadow: none;
+    }
   }
 `