From 67f88795512b6215abf50ba76bd6036426946885 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 20 Jan 2023 16:31:09 +0530
Subject: [PATCH 1/4] incr: add mods to shortcut class

---
 src/App.vue                  |   5 +-
 src/components/SearchBar.vue |  19 ++++---
 src/pages/QuickEditForm.vue  |   1 +
 src/utils/vueUtils.ts        | 104 ++++++++++++++++++++++++++++-------
 4 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 01361390..daa81054 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -55,7 +55,7 @@ import { checkForUpdates } from './utils/ipcCalls';
 import { updateConfigFiles } from './utils/misc';
 import { Search } from './utils/search';
 import { routeTo, systemLanguage } from './utils/ui';
-import { Shortcuts, useKeys } from './utils/vueUtils';
+import { getModKeyCode, Shortcuts, useKeys } from './utils/vueUtils';
 
 export default {
   name: 'App',
@@ -69,6 +69,7 @@ export default {
       companyName: '',
       searcher: null,
       shortcuts: null,
+      modKey: '',
     };
   },
   provide() {
@@ -76,6 +77,7 @@ export default {
       languageDirection: computed(() => this.languageDirection),
       searcher: computed(() => this.searcher),
       shortcuts: computed(() => this.shortcuts),
+      modKey: computed(() => this.modKey),
       keys: computed(() => this.keys),
     };
   },
@@ -86,6 +88,7 @@ export default {
     WindowsTitleBar,
   },
   async mounted() {
+    this.modKey = getModKeyCode(this.platform);
     this.shortcuts = new Shortcuts(this.keys);
     const lastSelectedFilePath = fyo.config.get(
       ConfigKeys.LastSelectedFilePath,
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index a4e02cae..62842358 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -5,7 +5,7 @@
       <feather-icon name="search" class="w-4 h-4 me-1 text-gray-800" />
       <p>{{ t`Search` }}</p>
       <div class="text-gray-500 px-1 ms-4 text-sm">
-        {{ modKey('k') }}
+        {{ modKeyText('k') }}
       </div>
     </Button>
   </div>
@@ -195,7 +195,6 @@ import { getBgTextColorClass } from 'src/utils/colors';
 import { openLink } from 'src/utils/ipcCalls';
 import { docsPathMap } from 'src/utils/misc';
 import { getGroupLabelMap, searchGroups } from 'src/utils/search';
-import { getModKeyCode } from 'src/utils/vueUtils';
 import { nextTick } from 'vue';
 import Button from './Button.vue';
 import Modal from './Modal.vue';
@@ -212,7 +211,7 @@ export default {
       allowedLimits: [50, 100, 500, -1],
     };
   },
-  inject: ['searcher', 'shortcuts'],
+  inject: ['searcher', 'shortcuts', 'modKey'],
   components: { Modal, Button },
   async mounted() {
     if (fyo.store.isDevelopment) {
@@ -233,18 +232,20 @@ export default {
       openLink('https://docs.frappebooks.com/' + docsPathMap.Search);
     },
     getShortcuts() {
-      const modKey = getModKeyCode(this.platform);
       const ifOpen = (cb) => () => this.openModal && cb();
       const ifClose = (cb) => () => !this.openModal && cb();
 
       const shortcuts = [
-        { shortcut: ['KeyK', modKey], callback: ifClose(() => this.open()) },
+        {
+          shortcut: ['KeyK', this.modKey],
+          callback: ifClose(() => this.open()),
+        },
         { shortcut: ['Escape'], callback: ifOpen(() => this.close()) },
       ];
 
       for (const i in searchGroups) {
         shortcuts.push({
-          shortcut: [modKey, `Digit${Number(i) + 1}`],
+          shortcut: [this.modKey, `Digit${Number(i) + 1}`],
           callback: ifOpen(() => {
             const group = searchGroups[i];
             const value = this.searcher.filters.groupFilters[group];
@@ -261,15 +262,15 @@ export default {
     },
     setShortcuts() {
       for (const { shortcut, callback } of this.getShortcuts()) {
-        this.shortcuts.set(shortcut, callback);
+        this.shortcuts.meta.set(shortcut, callback);
       }
     },
     deleteShortcuts() {
       for (const { shortcut } of this.getShortcuts()) {
-        this.shortcuts.delete(shortcut);
+        this.shortcuts.meta.delete(shortcut);
       }
     },
-    modKey(key) {
+    modKeyText(key) {
       key = key.toUpperCase();
       if (this.platform === 'Mac') {
         return `⌘ ${key}`;
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 4eae317b..80b386d2 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -131,6 +131,7 @@ export default {
     DropdownWithActions,
   },
   emits: ['close'],
+  inject: ['shortcuts'],
   provide() {
     return {
       schemaName: this.schemaName,
diff --git a/src/utils/vueUtils.ts b/src/utils/vueUtils.ts
index 4a266ddd..2ad3281f 100644
--- a/src/utils/vueUtils.ts
+++ b/src/utils/vueUtils.ts
@@ -1,7 +1,6 @@
-import { onMounted, onUnmounted, Ref, ref, watch } from 'vue';
+import { onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue';
 
-interface Keys {
-  pressed: Set<string>;
+interface ModMap {
   alt: boolean;
   ctrl: boolean;
   meta: boolean;
@@ -9,11 +8,23 @@ interface Keys {
   repeat: boolean;
 }
 
-export class Shortcuts {
-  keys: Ref<Keys>;
-  shortcuts: Map<string, Function>;
+type Mod = keyof ModMap;
 
-  constructor(keys?: Ref<Keys>) {
+interface Keys extends ModMap {
+  pressed: Set<string>;
+}
+
+type ShortcutFunction = () => void;
+
+const mods: Readonly<Mod[]> = ['alt', 'ctrl', 'meta', 'repeat', 'shift'];
+
+export class Shortcuts {
+  keys: Keys;
+  shortcuts: Map<string, ShortcutFunction>;
+  modMap: Partial<Record<Mod, boolean>>;
+
+  constructor(keys?: Keys) {
+    this.modMap = {};
     this.keys = keys ?? useKeys();
     this.shortcuts = new Map();
 
@@ -23,17 +34,22 @@ export class Shortcuts {
   }
 
   #trigger(keys: Keys) {
-    const key = Array.from(keys.pressed).sort().join('+');
+    const key = this.getKey(Array.from(keys.pressed), keys);
     this.shortcuts.get(key)?.();
   }
 
   has(shortcut: string[]) {
-    const key = shortcut.sort().join('+');
+    const key = this.getKey(shortcut);
     return this.shortcuts.has(key);
   }
 
-  set(shortcut: string[], callback: Function, removeIfSet: boolean = true) {
-    const key = shortcut.sort().join('+');
+  set(
+    shortcut: string[],
+    callback: ShortcutFunction,
+    removeIfSet: boolean = true
+  ) {
+    const key = this.getKey(shortcut);
+
     if (removeIfSet) {
       this.shortcuts.delete(key);
     }
@@ -46,13 +62,59 @@ export class Shortcuts {
   }
 
   delete(shortcut: string[]) {
-    const key = shortcut.sort().join('+');
+    const key = this.getKey(shortcut);
     this.shortcuts.delete(key);
   }
+
+  getKey(shortcut: string[], modMap?: Partial<ModMap>): string {
+    const _modMap = modMap || this.modMap;
+    this.modMap = {};
+
+    const shortcutString = shortcut.sort().join('+');
+    const modString = mods.filter((k) => _modMap[k]).join('+');
+    if (shortcutString && modString) {
+      return modString + '+' + shortcutString;
+    }
+
+    if (!modString) {
+      return shortcutString;
+    }
+
+    if (!shortcutString) {
+      return modString;
+    }
+
+    return '';
+  }
+
+  get alt() {
+    this.modMap['alt'] = true;
+    return this;
+  }
+
+  get ctrl() {
+    this.modMap['ctrl'] = true;
+    return this;
+  }
+
+  get meta() {
+    this.modMap['meta'] = true;
+    return this;
+  }
+
+  get shift() {
+    this.modMap['shift'] = true;
+    return this;
+  }
+
+  get repeat() {
+    this.modMap['repeat'] = true;
+    return this;
+  }
 }
 
 export function useKeys() {
-  const keys: Ref<Keys> = ref({
+  const keys: Keys = reactive({
     pressed: new Set<string>(),
     alt: false,
     ctrl: false,
@@ -62,20 +124,20 @@ export function useKeys() {
   });
 
   const keydownListener = (e: KeyboardEvent) => {
-    keys.value.pressed.add(e.code);
-    keys.value.alt = e.altKey;
-    keys.value.ctrl = e.ctrlKey;
-    keys.value.meta = e.metaKey;
-    keys.value.shift = e.shiftKey;
-    keys.value.repeat = e.repeat;
+    keys.pressed.add(e.code);
+    keys.alt = e.altKey;
+    keys.ctrl = e.ctrlKey;
+    keys.meta = e.metaKey;
+    keys.shift = e.shiftKey;
+    keys.repeat = e.repeat;
   };
 
   const keyupListener = (e: KeyboardEvent) => {
-    keys.value.pressed.delete(e.code);
+    keys.pressed.delete(e.code);
 
     // Key up won't trigger on macOS for other keys.
     if (e.code === 'MetaLeft') {
-      keys.value.pressed.clear();
+      keys.pressed.clear();
     }
   };
 

From e4fbecc91480794a79986f7efacc8924a9056320 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 30 Jan 2023 12:27:21 +0530
Subject: [PATCH 2/4] incr: mods not added to pressed

---
 src/components/SearchBar.vue | 19 +++++++++++++------
 src/utils/vueUtils.ts        | 26 +++++++++++++++++++-------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 62842358..d54f3181 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -237,15 +237,14 @@ export default {
 
       const shortcuts = [
         {
-          shortcut: ['KeyK', this.modKey],
+          shortcut: 'KeyK',
           callback: ifClose(() => this.open()),
         },
-        { shortcut: ['Escape'], callback: ifOpen(() => this.close()) },
       ];
 
       for (const i in searchGroups) {
         shortcuts.push({
-          shortcut: [this.modKey, `Digit${Number(i) + 1}`],
+          shortcut: `Digit${Number(i) + 1}`,
           callback: ifOpen(() => {
             const group = searchGroups[i];
             const value = this.searcher.filters.groupFilters[group];
@@ -262,12 +261,20 @@ export default {
     },
     setShortcuts() {
       for (const { shortcut, callback } of this.getShortcuts()) {
-        this.shortcuts.meta.set(shortcut, callback);
+        if (this.platform === 'Mac') {
+          this.shortcuts.meta.set([shortcut], callback);
+        } else {
+          this.shortcuts.ctrl.set([shortcut], callback);
+        }
       }
     },
     deleteShortcuts() {
       for (const { shortcut } of this.getShortcuts()) {
-        this.shortcuts.meta.delete(shortcut);
+        if (this.platform === 'Mac') {
+          this.shortcuts.meta.delete([shortcut]);
+        } else {
+          this.shortcuts.ctrl.delete([shortcut]);
+        }
       }
     },
     modKeyText(key) {
@@ -305,7 +312,7 @@ export default {
     },
     select(idx) {
       this.idx = idx ?? this.idx;
-      this.suggestions[this.idx]?.action();
+      this.suggestionsthis.idx?.action();
       this.close();
     },
     scrollToHighlighted() {
diff --git a/src/utils/vueUtils.ts b/src/utils/vueUtils.ts
index 2ad3281f..cdeca992 100644
--- a/src/utils/vueUtils.ts
+++ b/src/utils/vueUtils.ts
@@ -1,4 +1,4 @@
-import { onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue';
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 
 interface ModMap {
   alt: boolean;
@@ -114,6 +114,7 @@ export class Shortcuts {
 }
 
 export function useKeys() {
+  const isMac = navigator.userAgent.indexOf('Mac') !== -1;
   const keys: Keys = reactive({
     pressed: new Set<string>(),
     alt: false,
@@ -124,21 +125,32 @@ export function useKeys() {
   });
 
   const keydownListener = (e: KeyboardEvent) => {
-    keys.pressed.add(e.code);
     keys.alt = e.altKey;
     keys.ctrl = e.ctrlKey;
     keys.meta = e.metaKey;
     keys.shift = e.shiftKey;
     keys.repeat = e.repeat;
+
+    const { code } = e;
+    if (
+      code.startsWith('Alt') ||
+      code.startsWith('Ctrl') ||
+      code.startsWith('Meta') ||
+      code.startsWith('Shift')
+    ) {
+      return;
+    }
+
+    keys.pressed.add(code);
   };
 
   const keyupListener = (e: KeyboardEvent) => {
-    keys.pressed.delete(e.code);
-
-    // Key up won't trigger on macOS for other keys.
-    if (e.code === 'MetaLeft') {
-      keys.pressed.clear();
+    const { code } = e;
+    if (code.startsWith('Meta') && isMac) {
+      return keys.pressed.clear();
     }
+
+    keys.pressed.delete(code);
   };
 
   onMounted(() => {

From 974c95aafc3b55735e7eb5844c9768c1f2f62650 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 30 Jan 2023 16:20:40 +0530
Subject: [PATCH 3/4] incr: add shortcuts to go back and - save, submit, cancel
 and delete a focused doc - fix search filter issue

---
 src/App.vue                       |  16 +-
 src/components/FormContainer.vue  |   2 +-
 src/components/Modal.vue          |   9 +-
 src/components/SearchBar.vue      | 335 +++++++++++++++---------------
 src/components/Sidebar.vue        |   5 +-
 src/pages/ChartOfAccounts.vue     |   7 +-
 src/pages/Dashboard/Dashboard.vue |   6 +-
 src/pages/DataImport.vue          |   7 +-
 src/pages/GeneralForm.vue         |  10 +-
 src/pages/InvoiceForm.vue         |  11 +-
 src/pages/JournalEntryForm.vue    |   9 +-
 src/pages/ListView/ListView.vue   |   7 +-
 src/pages/QuickEditForm.vue       |  16 +-
 src/pages/Report.vue              |   6 +-
 src/pages/Settings/Settings.vue   |   7 +-
 src/styles/index.css              |   1 +
 src/utils/language.ts             |   5 +-
 src/utils/misc.ts                 |  43 ++++
 src/utils/refs.ts                 |   8 +
 src/utils/search.ts               |   5 +-
 src/utils/shortcuts.ts            |  78 +++++++
 src/utils/ui.ts                   |   5 +-
 src/utils/vueUtils.ts             |  20 +-
 23 files changed, 384 insertions(+), 234 deletions(-)
 create mode 100644 src/utils/refs.ts
 create mode 100644 src/utils/shortcuts.ts

diff --git a/src/App.vue b/src/App.vue
index daa81054..f3312327 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,6 +41,7 @@
 import { ConfigKeys } from 'fyo/core/types';
 import { RTL_LANGUAGES } from 'fyo/utils/consts';
 import { ModelNameEnum } from 'models/types';
+import { systemLanguageRef } from 'src/utils/refs';
 import { computed } from 'vue';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
 import { handleErrorWithDialog } from './errorHandling';
@@ -54,8 +55,9 @@ import { initializeInstance } from './utils/initialization';
 import { checkForUpdates } from './utils/ipcCalls';
 import { updateConfigFiles } from './utils/misc';
 import { Search } from './utils/search';
-import { routeTo, systemLanguage } from './utils/ui';
-import { getModKeyCode, Shortcuts, useKeys } from './utils/vueUtils';
+import { setGlobalShortcuts } from './utils/shortcuts';
+import { routeTo } from './utils/ui';
+import { Shortcuts, useKeys } from './utils/vueUtils';
 
 export default {
   name: 'App',
@@ -69,7 +71,6 @@ export default {
       companyName: '',
       searcher: null,
       shortcuts: null,
-      modKey: '',
     };
   },
   provide() {
@@ -77,7 +78,6 @@ export default {
       languageDirection: computed(() => this.languageDirection),
       searcher: computed(() => this.searcher),
       shortcuts: computed(() => this.shortcuts),
-      modKey: computed(() => this.modKey),
       keys: computed(() => this.keys),
     };
   },
@@ -88,8 +88,8 @@ export default {
     WindowsTitleBar,
   },
   async mounted() {
-    this.modKey = getModKeyCode(this.platform);
-    this.shortcuts = new Shortcuts(this.keys);
+    const shortcuts = new Shortcuts(this.keys);
+    this.shortcuts = shortcuts;
     const lastSelectedFilePath = fyo.config.get(
       ConfigKeys.LastSelectedFilePath,
       null
@@ -105,10 +105,12 @@ export default {
       await handleErrorWithDialog(err, undefined, true, true);
       await this.showDbSelector();
     }
+
+    setGlobalShortcuts(shortcuts);
   },
   computed: {
     language() {
-      return systemLanguage.value;
+      return systemLanguageRef.value;
     },
     languageDirection() {
       return RTL_LANGUAGES.includes(this.language) ? 'rtl' : 'ltr';
diff --git a/src/components/FormContainer.vue b/src/components/FormContainer.vue
index dddc9cb2..2ad11f78 100644
--- a/src/components/FormContainer.vue
+++ b/src/components/FormContainer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex bg-gray-25">
+  <div class="flex bg-gray-25 overflow-x-auto">
     <div class="flex flex-1 flex-col">
       <!-- Page Header (Title, Buttons, etc) -->
       <PageHeader :title="title" :border="false" :searchborder="searchborder">
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index d423279a..7bd6941a 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -17,14 +17,7 @@
       v-if="openModal"
     >
       <div
-        class="
-          bg-white
-          rounded-lg
-          shadow-2xl
-          border
-          overflow-hidden
-          inner
-        "
+        class="bg-white rounded-lg shadow-2xl border overflow-hidden inner"
         v-bind="$attrs"
         @click.stop
       >
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index d54f3181..df5583f3 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -4,7 +4,7 @@
     <Button @click="open" class="px-2" :padding="false">
       <feather-icon name="search" class="w-4 h-4 me-1 text-gray-800" />
       <p>{{ t`Search` }}</p>
-      <div class="text-gray-500 px-1 ms-4 text-sm">
+      <div class="text-gray-500 px-1 ms-4 text-sm whitespace-nowrap">
         {{ modKeyText('k') }}
       </div>
     </Button>
@@ -16,174 +16,183 @@
     @closemodal="close"
     :set-close-listener="false"
   >
-    <!-- Search Input -->
-    <div class="p-1 w-form">
-      <input
-        ref="input"
-        type="search"
-        autocomplete="off"
-        spellcheck="false"
-        :placeholder="t`Type to search...`"
-        v-model="inputValue"
-        @focus="search"
-        @input="search"
-        @keydown.up="up"
-        @keydown.down="down"
-        @keydown.enter="() => select()"
-        @keydown.esc="close"
-        class="
-          bg-gray-100
-          text-2xl
-          focus:outline-none
-          w-full
-          placeholder-gray-500
-          text-gray-900
-          rounded-md
-          p-3
-        "
-      />
-    </div>
-    <hr v-if="suggestions.length" />
+    <div class="w-form">
+      <!-- Search Input -->
+      <div class="p-1">
+        <input
+          ref="input"
+          type="search"
+          autocomplete="off"
+          spellcheck="false"
+          :placeholder="t`Type to search...`"
+          v-model="inputValue"
+          @focus="search"
+          @input="search"
+          @keydown.up="up"
+          @keydown.down="down"
+          @keydown.enter="() => select()"
+          @keydown.esc="close"
+          class="
+            bg-gray-100
+            text-2xl
+            focus:outline-none
+            w-full
+            placeholder-gray-500
+            text-gray-900
+            rounded-md
+            p-3
+          "
+        />
+      </div>
+      <hr v-if="suggestions.length" />
 
-    <!-- Search List -->
-    <div :style="`max-height: ${49 * 6 - 1}px`" class="overflow-auto">
-      <div
-        v-for="(si, i) in suggestions"
-        :key="`${i}-${si.key}`"
-        ref="suggestions"
-        class="hover:bg-gray-50 cursor-pointer"
-        :class="idx === i ? 'border-blue-500 bg-gray-50 border-s-4' : ''"
-        @click="select(i)"
-      >
-        <!-- Search List Item -->
+      <!-- Search List -->
+      <div :style="`max-height: ${49 * 6 - 1}px`" class="overflow-auto">
         <div
-          class="flex w-full justify-between px-3 items-center"
-          style="height: var(--h-row-mid)"
+          v-for="(si, i) in suggestions"
+          :key="`${i}-${si.key}`"
+          ref="suggestions"
+          class="hover:bg-gray-50 cursor-pointer"
+          :class="idx === i ? 'border-blue-500 bg-gray-50 border-s-4' : ''"
+          @click="select(i)"
         >
-          <div class="flex items-center">
+          <!-- Search List Item -->
+          <div
+            class="flex w-full justify-between px-3 items-center"
+            style="height: var(--h-row-mid)"
+          >
+            <div class="flex items-center">
+              <p
+                :class="idx === i ? 'text-blue-600' : 'text-gray-900'"
+                :style="idx === i ? 'margin-left: -4px' : ''"
+              >
+                {{ si.label }}
+              </p>
+              <p class="text-gray-600 text-sm ms-3" v-if="si.group === 'Docs'">
+                {{ si.more.filter(Boolean).join(', ') }}
+              </p>
+            </div>
             <p
-              :class="idx === i ? 'text-blue-600' : 'text-gray-900'"
-              :style="idx === i ? 'margin-left: -4px' : ''"
+              class="text-sm text-end justify-self-end"
+              :class="`text-${groupColorMap[si.group]}-500`"
             >
-              {{ si.label }}
-            </p>
-            <p class="text-gray-600 text-sm ms-3" v-if="si.group === 'Docs'">
-              {{ si.more.filter(Boolean).join(', ') }}
+              {{
+                si.group === 'Docs' ? si.schemaLabel : groupLabelMap[si.group]
+              }}
             </p>
           </div>
-          <p
-            class="text-sm text-end justify-self-end"
-            :class="`text-${groupColorMap[si.group]}-500`"
-          >
-            {{ si.group === 'Docs' ? si.schemaLabel : groupLabelMap[si.group] }}
-          </p>
-        </div>
 
-        <hr v-if="i !== suggestions.length - 1" />
-      </div>
-    </div>
-
-    <!-- Footer -->
-    <hr />
-    <div class="m-1 flex justify-between flex-col gap-2 text-sm select-none">
-      <!-- Group Filters -->
-      <div class="flex justify-between">
-        <div class="flex gap-1">
-          <button
-            v-for="g in searchGroups"
-            :key="g"
-            class="border px-1 py-0.5 rounded-lg"
-            :class="getGroupFilterButtonClass(g)"
-            @click="searcher.set(g, !searcher.filters.groupFilters[g])"
-          >
-            {{ groupLabelMap[g] }}
-          </button>
-        </div>
-        <button
-          class="hover:text-gray-900 py-0.5 rounded text-gray-700"
-          @click="showMore = !showMore"
-        >
-          {{ showMore ? t`Less Filters` : t`More Filters` }}
-        </button>
-      </div>
-
-      <!-- Additional Filters -->
-      <div v-if="showMore" class="-mt-1">
-        <!-- Group Skip Filters -->
-        <div class="flex gap-1 text-gray-800">
-          <button
-            v-for="s in ['skipTables', 'skipTransactions']"
-            :key="s"
-            class="border px-1 py-0.5 rounded-lg"
-            :class="{ 'bg-gray-200': searcher.filters[s] }"
-            @click="searcher.set(s, !searcher.filters[s])"
-          >
-            {{
-              s === 'skipTables' ? t`Skip Child Tables` : t`Skip Transactions`
-            }}
-          </button>
-        </div>
-
-        <!-- Schema Name Filters -->
-        <div class="flex mt-1 gap-1 text-blue-500 flex-wrap">
-          <button
-            v-for="sf in schemaFilters"
-            :key="sf.value"
-            class="
-              border
-              px-1
-              py-0.5
-              rounded-lg
-              border-blue-100
-              whitespace-nowrap
-            "
-            :class="{ 'bg-blue-100': searcher.filters.schemaFilters[sf.value] }"
-            @click="
-              searcher.set(sf.value, !searcher.filters.schemaFilters[sf.value])
-            "
-          >
-            {{ sf.label }}
-          </button>
+          <hr v-if="i !== suggestions.length - 1" />
         </div>
       </div>
 
-      <!-- Keybindings Help -->
-      <div class="flex text-sm text-gray-500 justify-between items-baseline">
-        <div class="flex gap-4">
-          <p>↑↓ {{ t`Navigate` }}</p>
-          <p>↩ {{ t`Select` }}</p>
-          <p><span class="tracking-tighter">esc</span> {{ t`Close` }}</p>
-          <button
-            class="flex items-center hover:text-gray-800"
-            @click="openDocs"
-          >
-            <feather-icon name="help-circle" class="w-4 h-4 me-1" />
-            {{ t`Help` }}
-          </button>
-        </div>
-
-        <p v-if="searcher?.numSearches" class="ms-auto">
-          {{ t`${suggestions.length} out of ${searcher.numSearches}` }}
-        </p>
-
-        <div
-          class="border border-gray-100 rounded flex justify-self-end ms-2"
-          v-if="(searcher?.numSearches ?? 0) > 50"
-        >
-          <template
-            v-for="c in allowedLimits.filter(
-              (c) => c < searcher.numSearches || c === -1
-            )"
-            :key="c + '-count'"
-          >
+      <!-- Footer -->
+      <hr />
+      <div class="m-1 flex justify-between flex-col gap-2 text-sm select-none">
+        <!-- Group Filters -->
+        <div class="flex justify-between">
+          <div class="flex gap-1">
             <button
-              @click="limit = parseInt(c)"
-              class="w-9"
-              :class="limit === c ? 'bg-gray-100' : ''"
+              v-for="g in searchGroups"
+              :key="g"
+              class="border px-1 py-0.5 rounded-lg"
+              :class="getGroupFilterButtonClass(g)"
+              @click="searcher.set(g, !searcher.filters.groupFilters[g])"
             >
-              {{ c === -1 ? t`All` : c }}
+              {{ groupLabelMap[g] }}
             </button>
-          </template>
+          </div>
+          <button
+            class="hover:text-gray-900 py-0.5 rounded text-gray-700"
+            @click="showMore = !showMore"
+          >
+            {{ showMore ? t`Less Filters` : t`More Filters` }}
+          </button>
+        </div>
+
+        <!-- Additional Filters -->
+        <div v-if="showMore" class="-mt-1">
+          <!-- Group Skip Filters -->
+          <div class="flex gap-1 text-gray-800">
+            <button
+              v-for="s in ['skipTables', 'skipTransactions']"
+              :key="s"
+              class="border px-1 py-0.5 rounded-lg"
+              :class="{ 'bg-gray-200': searcher.filters[s] }"
+              @click="searcher.set(s, !searcher.filters[s])"
+            >
+              {{
+                s === 'skipTables' ? t`Skip Child Tables` : t`Skip Transactions`
+              }}
+            </button>
+          </div>
+
+          <!-- Schema Name Filters -->
+          <div class="flex mt-1 gap-1 text-blue-500 flex-wrap">
+            <button
+              v-for="sf in schemaFilters"
+              :key="sf.value"
+              class="
+                border
+                px-1
+                py-0.5
+                rounded-lg
+                border-blue-100
+                whitespace-nowrap
+              "
+              :class="{
+                'bg-blue-100': searcher.filters.schemaFilters[sf.value],
+              }"
+              @click="
+                searcher.set(
+                  sf.value,
+                  !searcher.filters.schemaFilters[sf.value]
+                )
+              "
+            >
+              {{ sf.label }}
+            </button>
+          </div>
+        </div>
+
+        <!-- Keybindings Help -->
+        <div class="flex text-sm text-gray-500 justify-between items-baseline">
+          <div class="flex gap-4">
+            <p>↑↓ {{ t`Navigate` }}</p>
+            <p>↩ {{ t`Select` }}</p>
+            <p><span class="tracking-tighter">esc</span> {{ t`Close` }}</p>
+            <button
+              class="flex items-center hover:text-gray-800"
+              @click="openDocs"
+            >
+              <feather-icon name="help-circle" class="w-4 h-4 me-1" />
+              {{ t`Help` }}
+            </button>
+          </div>
+
+          <p v-if="searcher?.numSearches" class="ms-auto">
+            {{ t`${suggestions.length} out of ${searcher.numSearches}` }}
+          </p>
+
+          <div
+            class="border border-gray-100 rounded flex justify-self-end ms-2"
+            v-if="(searcher?.numSearches ?? 0) > 50"
+          >
+            <template
+              v-for="c in allowedLimits.filter(
+                (c) => c < searcher.numSearches || c === -1
+              )"
+              :key="c + '-count'"
+            >
+              <button
+                @click="limit = parseInt(c)"
+                class="w-9"
+                :class="limit === c ? 'bg-gray-100' : ''"
+              >
+                {{ c === -1 ? t`All` : c }}
+              </button>
+            </template>
+          </div>
         </div>
       </div>
     </div>
@@ -211,7 +220,7 @@ export default {
       allowedLimits: [50, 100, 500, -1],
     };
   },
-  inject: ['searcher', 'shortcuts', 'modKey'],
+  inject: ['searcher', 'shortcuts'],
   components: { Modal, Button },
   async mounted() {
     if (fyo.store.isDevelopment) {
@@ -261,20 +270,12 @@ export default {
     },
     setShortcuts() {
       for (const { shortcut, callback } of this.getShortcuts()) {
-        if (this.platform === 'Mac') {
-          this.shortcuts.meta.set([shortcut], callback);
-        } else {
-          this.shortcuts.ctrl.set([shortcut], callback);
-        }
+        this.shortcuts.pmod.set([shortcut], callback);
       }
     },
     deleteShortcuts() {
       for (const { shortcut } of this.getShortcuts()) {
-        if (this.platform === 'Mac') {
-          this.shortcuts.meta.delete([shortcut]);
-        } else {
-          this.shortcuts.ctrl.delete([shortcut]);
-        }
+        this.shortcuts.pmod.delete([shortcut]);
       }
     },
     modKeyText(key) {
@@ -312,7 +313,7 @@ export default {
     },
     select(idx) {
       this.idx = idx ?? this.idx;
-      this.suggestionsthis.idx?.action();
+      this.suggestions[this.idx]?.action();
       this.close();
     },
     scrollToHighlighted() {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index a11ea9c9..d908e0a4 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -162,8 +162,9 @@ import Button from 'src/components/Button.vue';
 import { reportIssue } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
 import { openLink } from 'src/utils/ipcCalls';
+import { docsPathRef } from 'src/utils/refs';
 import { getSidebarConfig } from 'src/utils/sidebarConfig';
-import { docsPath, routeTo } from 'src/utils/ui';
+import { routeTo } from 'src/utils/ui';
 import router from '../router';
 import Icon from './Icon.vue';
 
@@ -200,7 +201,7 @@ export default {
     routeTo,
     reportIssue,
     openDocumentation() {
-      openLink('https://docs.frappebooks.com/' + docsPath.value);
+      openLink('https://docs.frappebooks.com/' + docsPathRef.value);
     },
     setActiveGroup() {
       const { fullPath } = this.$router.currentRoute.value;
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index a03cf9c9..67d4e661 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -147,7 +147,8 @@ import { ModelNameEnum } from 'models/types';
 import PageHeader from 'src/components/PageHeader.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
-import { docsPath, openQuickEdit } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
+import { openQuickEdit } from 'src/utils/ui';
 import { getMapFromList, removeAtIndex } from 'utils/index';
 import { nextTick } from 'vue';
 import Button from '../components/Button.vue';
@@ -184,7 +185,7 @@ export default {
       window.coa = this;
     }
 
-    docsPath.value = docsPathMap.ChartOfAccounts;
+    docsPathRef.value = docsPathMap.ChartOfAccounts;
 
     if (this.refetchTotals) {
       await this.setTotalDebitAndCredit();
@@ -192,7 +193,7 @@ export default {
     }
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   methods: {
     async expand() {
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index 427f6186..fd084cc5 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -65,12 +65,12 @@
 
 <script>
 import PageHeader from 'src/components/PageHeader.vue';
-import { docsPath } from 'src/utils/ui';
 import UnpaidInvoices from './UnpaidInvoices.vue';
 import Cashflow from './Cashflow.vue';
 import Expenses from './Expenses.vue';
 import PeriodSelector from './PeriodSelector.vue';
 import ProfitAndLoss from './ProfitAndLoss.vue';
+import { docsPathRef } from 'src/utils/refs';
 
 export default {
   name: 'Dashboard',
@@ -86,10 +86,10 @@ export default {
     return { period: 'This Year' };
   },
   activated() {
-    docsPath.value = 'analytics/dashboard';
+    docsPathRef.value = 'analytics/dashboard';
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   methods: {
     handlePeriodChange(period) {
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index a6c44a43..2a2e1036 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -355,7 +355,8 @@ import { importable, Importer } from 'src/dataImport';
 import { fyo } from 'src/initFyo';
 import { getSavePath, saveData, selectFile } from 'src/utils/ipcCalls';
 import { docsPathMap } from 'src/utils/misc';
-import { docsPath, showMessageDialog } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
+import { showMessageDialog } from 'src/utils/ui';
 import Loading from '../components/Loading.vue';
 
 export default {
@@ -484,10 +485,10 @@ export default {
     },
   },
   activated() {
-    docsPath.value = docsPathMap.DataImport;
+    docsPathRef.value = docsPathMap.DataImport;
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
     if (!this.complete) {
       return;
     }
diff --git a/src/pages/GeneralForm.vue b/src/pages/GeneralForm.vue
index 4d178983..ed92a0b1 100644
--- a/src/pages/GeneralForm.vue
+++ b/src/pages/GeneralForm.vue
@@ -130,7 +130,6 @@
 
     <template #quickedit v-if="quickEditDoc">
       <QuickEditForm
-        class="w-quick-edit"
         :name="quickEditDoc.name"
         :show-name="false"
         :show-save="false"
@@ -160,8 +159,8 @@ import FormHeader from 'src/components/FormHeader.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef, focusedDocsRef } from 'src/utils/refs';
 import {
-  docsPath,
   getGroupedActionsForDoc,
   routeTo,
   showMessageDialog,
@@ -232,14 +231,17 @@ export default {
     },
   },
   activated() {
-    docsPath.value = docsPathMap[this.schemaName];
+    docsPathRef.value = docsPathMap[this.schemaName];
+    focusedDocsRef.add(this.doc);
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
+    focusedDocsRef.delete(this.doc);
   },
   async mounted() {
     try {
       this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+      focusedDocsRef.add(this.doc);
     } catch (error) {
       if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.schemaName}`);
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index dddb41ef..fc71686d 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -273,7 +273,6 @@
       <Transition name="quickedit">
         <QuickEditForm
           v-if="quickEditDoc && !linked"
-          class="w-quick-edit"
           :name="quickEditDoc.name"
           :show-name="false"
           :show-save="false"
@@ -313,8 +312,8 @@ import StatusBadge from 'src/components/StatusBadge.vue';
 import LinkedEntryWidget from 'src/components/Widgets/LinkedEntryWidget.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef, focusedDocsRef } from 'src/utils/refs';
 import {
-  docsPath,
   getGroupedActionsForDoc,
   routeTo,
   showMessageDialog,
@@ -339,6 +338,7 @@ export default {
     LinkedEntryWidget,
     Barcode,
   },
+  inject: ['shortcuts'],
   provide() {
     return {
       schemaName: this.schemaName,
@@ -455,14 +455,17 @@ export default {
     },
   },
   activated() {
-    docsPath.value = docsPathMap[this.schemaName];
+    docsPathRef.value = docsPathMap[this.schemaName];
+    focusedDocsRef.add(this.doc);
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
+    focusedDocsRef.delete(this.doc);
   },
   async mounted() {
     try {
       this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+      focusedDocsRef.add(this.doc);
     } catch (error) {
       if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.schemaName}`);
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index c346e603..bc884acb 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -148,8 +148,8 @@ import FormHeader from 'src/components/FormHeader.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
+import { docsPathRef, focusedDocsRef } from 'src/utils/refs';
 import {
-  docsPath,
   getGroupedActionsForDoc,
   routeTo,
   showMessageDialog,
@@ -182,14 +182,17 @@ export default {
     };
   },
   activated() {
-    docsPath.value = docsPathMap.JournalEntry;
+    docsPathRef.value = docsPathMap.JournalEntry;
+    focusedDocsRef.add(this.doc);
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
+    focusedDocsRef.delete(this.doc);
   },
   async mounted() {
     try {
       this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+      focusedDocsRef.add(this.doc);
     } catch (error) {
       if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.schemaName}`);
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 58006d1f..7e4fb100 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -51,7 +51,8 @@ import {
   docsPathMap,
   getCreateFiltersFromListViewFilters,
 } from 'src/utils/misc';
-import { docsPath, openQuickEdit, routeTo } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
+import { openQuickEdit, routeTo } from 'src/utils/ui';
 import List from './List.vue';
 
 export default {
@@ -82,14 +83,14 @@ export default {
     }
 
     this.listConfig = getListConfig(this.schemaName);
-    docsPath.value = docsPathMap[this.schemaName] ?? docsPathMap.Entries;
+    docsPathRef.value = docsPathMap[this.schemaName] ?? docsPathMap.Entries;
 
     if (this.fyo.store.isDevelopment) {
       window.lv = this;
     }
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   methods: {
     updatedData(listFilters) {
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 80b386d2..9dc1b461 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -105,6 +105,7 @@ import StatusBadge from 'src/components/StatusBadge.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm.vue';
 import { fyo } from 'src/initFyo';
 import { getQuickEditWidget } from 'src/utils/quickEditWidgets';
+import { focusedDocsRef } from 'src/utils/refs';
 import { getActionsForDoc, openQuickEdit } from 'src/utils/ui';
 
 export default {
@@ -148,17 +149,26 @@ export default {
       statusText: null,
     };
   },
-  mounted() {
+  async mounted() {
     if (this.defaults) {
       this.values = JSON.parse(this.defaults);
     }
 
+    await this.fetchFieldsAndDoc();
+    focusedDocsRef.add(this.doc);
+
     if (fyo.store.isDevelopment) {
       window.qef = this;
     }
   },
-  async created() {
-    await this.fetchFieldsAndDoc();
+  activated() {
+    focusedDocsRef.add(this.doc);
+  },
+  deactivated() {
+    focusedDocsRef.delete(this.doc);
+  },
+  unmounted() {
+    focusedDocsRef.delete(this.doc);
   },
   computed: {
     isChild() {
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 8f226c96..608bda2b 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -46,7 +46,7 @@ import PageHeader from 'src/components/PageHeader.vue';
 import ListReport from 'src/components/Report/ListReport.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
-import { docsPath } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
@@ -70,7 +70,7 @@ export default defineComponent({
   },
   components: { PageHeader, FormControl, ListReport, DropdownWithActions },
   async activated() {
-    docsPath.value = docsPathMap[this.reportClassName] ?? docsPathMap.Reports;
+    docsPathRef.value = docsPathMap[this.reportClassName] ?? docsPathMap.Reports;
     await this.setReportData();
 
     const filters = JSON.parse(this.defaultFilters);
@@ -88,7 +88,7 @@ export default defineComponent({
     }
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
   },
   computed: {
     title() {
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index ac814296..2d0c2db7 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -49,7 +49,8 @@ import Row from 'src/components/Row.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import { docsPathMap } from 'src/utils/misc';
-import { docsPath, showToast } from 'src/utils/ui';
+import { docsPathRef } from 'src/utils/refs';
+import { showToast } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h, markRaw } from 'vue';
 import TabBase from './TabBase.vue';
@@ -112,10 +113,10 @@ export default {
   },
   activated() {
     this.setActiveTab();
-    docsPath.value = docsPathMap.Settings;
+    docsPathRef.value = docsPathMap.Settings;
   },
   deactivated() {
-    docsPath.value = '';
+    docsPathRef.value = '';
     if (this.fieldsChanged.length === 0) {
       return;
     }
diff --git a/src/styles/index.css b/src/styles/index.css
index 680d4048..3d1b724a 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -82,6 +82,7 @@ input[type='number']::-webkit-inner-spin-button {
 
 .w-quick-edit {
   width: var(--w-quick-edit);
+  flex-shrink: 0;
 }
 
 .h-form {
diff --git a/src/utils/language.ts b/src/utils/language.ts
index 483a3997..901a0a88 100644
--- a/src/utils/language.ts
+++ b/src/utils/language.ts
@@ -3,7 +3,8 @@ import { DEFAULT_LANGUAGE } from 'fyo/utils/consts';
 import { setLanguageMapOnTranslationString } from 'fyo/utils/translation';
 import { fyo } from 'src/initFyo';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
-import { showToast, systemLanguage } from './ui';
+import { systemLanguageRef } from './refs';
+import { showToast } from './ui';
 
 // Language: Language Code in books/translations
 export const languageCodeMap: Record<string, string> = {
@@ -42,7 +43,7 @@ export async function setLanguageMap(
 
   if (success && !usingDefault) {
     fyo.config.set('language', language);
-    systemLanguage.value = language;
+    systemLanguageRef.value = language;
   }
 
   if (!dontReload && success && initLanguage !== oldLanguage) {
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 4e06b252..7c407a55 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -1,5 +1,6 @@
 import { Fyo } from 'fyo';
 import { ConfigFile, ConfigKeys } from 'fyo/core/types';
+import { Doc } from 'fyo/model/doc';
 import { DateTime } from 'luxon';
 import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
 import { ModelNameEnum } from 'models/types';
@@ -160,3 +161,45 @@ export function getCreateFiltersFromListViewFilters(filters: QueryFilter) {
 
   return createFilters;
 }
+
+export class FocusedDocContextSet {
+  set: Doc[];
+  constructor() {
+    this.set = [];
+  }
+
+  add(doc: unknown) {
+    if (!(doc instanceof Doc)) {
+      return;
+    }
+
+    const index = this.findIndex(doc);
+    if (index !== -1) {
+      this.delete(index);
+    }
+
+    return this.set.push(doc);
+  }
+
+  delete(index: Doc | number) {
+    if (typeof index !== 'number') {
+      index = this.findIndex(index);
+    }
+
+    if (index === -1) {
+      return;
+    }
+
+    this.set = this.set.filter((_, i) => i !== index);
+  }
+
+  last() {
+    return this.set.at(-1);
+  }
+
+  findIndex(doc: Doc) {
+    return this.set.findIndex(
+      (d) => d.name === doc.name && d.schemaName === doc.schemaName
+    );
+  }
+}
diff --git a/src/utils/refs.ts b/src/utils/refs.ts
new file mode 100644
index 00000000..c2f06744
--- /dev/null
+++ b/src/utils/refs.ts
@@ -0,0 +1,8 @@
+import { reactive, ref } from 'vue';
+import { FocusedDocContextSet } from './misc';
+
+export const docsPathRef = ref<string>('');
+export const systemLanguageRef = ref<string>('');
+export const focusedDocsRef = reactive<FocusedDocContextSet>(
+  new FocusedDocContextSet()
+);
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 71c76c7b..4de847dc 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -594,10 +594,7 @@ export class Search {
     keys.sort((a, b) => safeParseFloat(b) - safeParseFloat(a));
     const array: SearchItems = [];
     for (const key of keys) {
-      const keywords = groupedKeywords[key];
-      if (!keywords?.length) {
-        continue;
-      }
+      const keywords = groupedKeywords[key] ?? [];
 
       this._pushDocSearchItems(keywords, array, input);
       if (key === '0') {
diff --git a/src/utils/shortcuts.ts b/src/utils/shortcuts.ts
new file mode 100644
index 00000000..89f6f622
--- /dev/null
+++ b/src/utils/shortcuts.ts
@@ -0,0 +1,78 @@
+import { t } from 'fyo';
+import type { Doc } from 'fyo/model/doc';
+import { fyo } from 'src/initFyo';
+import router from 'src/router';
+import { focusedDocsRef } from './refs';
+import { showMessageDialog } from './ui';
+import { Shortcuts } from './vueUtils';
+
+export function setGlobalShortcuts(shortcuts: Shortcuts) {
+  /**
+   * PMod              : if macOS then Meta (⌘) else Ctrl, both Left and Right
+   *
+   * Backspace         : Go to the previous page
+   * PMod + S          : Save or Submit focused doc if possible
+   * PMod + Backspace  : Cancel or Delete  focused doc if possible
+   */
+  shortcuts.set(['Backspace'], async () => {
+    if (document.body !== document.activeElement) {
+      return;
+    }
+
+    router.back();
+  });
+
+  shortcuts.pmod.set(['KeyS'], async () => {
+    const doc = focusedDocsRef.last();
+    if (!doc) {
+      return;
+    }
+
+    if (doc.canSave) {
+      await showDocStateChangeMessageDialog(doc, 'sync');
+    } else if (doc.canSubmit) {
+      await showDocStateChangeMessageDialog(doc, 'submit');
+    }
+  });
+
+  shortcuts.pmod.set(['Backspace'], async () => {
+    const doc = focusedDocsRef.last();
+    if (!doc) {
+      return;
+    }
+
+    if (doc.canCancel) {
+      await showDocStateChangeMessageDialog(doc, 'cancel');
+    } else if (doc.canDelete) {
+      await showDocStateChangeMessageDialog(doc, 'delete');
+    }
+  });
+}
+
+async function showDocStateChangeMessageDialog(
+  doc: Doc,
+  state: 'sync' | 'submit' | 'cancel' | 'delete'
+) {
+  const label = fyo.schemaMap[doc.schemaName]?.label ?? t`Doc`;
+  const name = doc.name ?? '';
+  const message =
+    { sync: t`Save`, submit: t`Submit`, cancel: t`Cancel`, delete: t`Delete` }[
+      state
+    ] + ` ${label} ${name}`;
+
+  await showMessageDialog({
+    message,
+    buttons: [
+      {
+        label: t`Yes`,
+        async action() {
+          await doc[state]();
+        },
+      },
+      {
+        label: t`No`,
+        action() {},
+      },
+    ],
+  });
+}
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index aa61f4f6..38a59c55 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -4,7 +4,7 @@
  */
 import { ipcRenderer } from 'electron';
 import { t } from 'fyo';
-import { Doc } from 'fyo/model/doc';
+import type { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { getActions } from 'fyo/utils';
 import { getDbError, LinkValidationError, ValueError } from 'fyo/utils/errors';
@@ -23,9 +23,6 @@ import {
   ToastOptions,
 } from './types';
 
-export const docsPath = ref('');
-export const systemLanguage = ref('');
-
 export async function openQuickEdit({
   doc,
   schemaName,
diff --git a/src/utils/vueUtils.ts b/src/utils/vueUtils.ts
index cdeca992..0d706b0a 100644
--- a/src/utils/vueUtils.ts
+++ b/src/utils/vueUtils.ts
@@ -20,6 +20,7 @@ const mods: Readonly<Mod[]> = ['alt', 'ctrl', 'meta', 'repeat', 'shift'];
 
 export class Shortcuts {
   keys: Keys;
+  isMac: boolean;
   shortcuts: Map<string, ShortcutFunction>;
   modMap: Partial<Record<Mod, boolean>>;
 
@@ -27,6 +28,7 @@ export class Shortcuts {
     this.modMap = {};
     this.keys = keys ?? useKeys();
     this.shortcuts = new Map();
+    this.isMac = getIsMac();
 
     watch(this.keys, (keys) => {
       this.#trigger(keys);
@@ -111,10 +113,18 @@ export class Shortcuts {
     this.modMap['repeat'] = true;
     return this;
   }
+
+  get pmod() {
+    if (this.isMac) {
+      return this.meta;
+    } else {
+      return this.ctrl;
+    }
+  }
 }
 
 export function useKeys() {
-  const isMac = navigator.userAgent.indexOf('Mac') !== -1;
+  const isMac = getIsMac();
   const keys: Keys = reactive({
     pressed: new Set<string>(),
     alt: false,
@@ -184,10 +194,6 @@ export function useMouseLocation() {
   return loc;
 }
 
-export function getModKeyCode(platform: 'Windows' | 'Linux' | 'Mac') {
-  if (platform === 'Mac') {
-    return 'MetaLeft';
-  }
-
-  return 'CtrlLeft';
+function getIsMac() {
+  return navigator.userAgent.indexOf('Mac') !== -1;
 }

From 765f9f76ce1ddfb6938085cd0a422577411bf06c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 30 Jan 2023 20:08:37 +0530
Subject: [PATCH 4/4] incr: add a few more shortcuts - fix control issue - add
 a shortcut helper

---
 fyo/model/doc.ts                   |  13 +-
 src/components/ShortcutsHelper.vue | 199 +++++++++++++++++++++++++++++
 src/components/Sidebar.vue         |  36 +++++-
 src/utils/vueUtils.ts              |   2 +-
 4 files changed, 247 insertions(+), 3 deletions(-)
 create mode 100644 src/components/ShortcutsHelper.vue

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index c78d9aba..18128bfd 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -5,7 +5,6 @@ import { Verb } from 'fyo/telemetry/types';
 import { DEFAULT_USER } from 'fyo/utils/consts';
 import { ConflictError, MandatoryError, NotFoundError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
-import { Money } from 'pesa';
 import {
   DynamicLinkField,
   Field,
@@ -142,6 +141,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
       return false;
     }
 
+    if (this.schema.isChild) {
+      return false;
+    }
+
     if (!this.schema.isSubmittable) {
       return true;
     }
@@ -186,6 +189,14 @@ export class Doc extends Observable<DocValue | Doc[]> {
       return false;
     }
 
+    if (this.schema.isSingle) {
+      return false;
+    }
+
+    if (this.schema.isChild) {
+      return false;
+    }
+
     return true;
   }
 
diff --git a/src/components/ShortcutsHelper.vue b/src/components/ShortcutsHelper.vue
new file mode 100644
index 00000000..0c8321e6
--- /dev/null
+++ b/src/components/ShortcutsHelper.vue
@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <FormHeader :form-title="t`Shortcuts`" />
+    <hr />
+    <div class="h-96 overflow-y-auto text-gray-900">
+      <template v-for="g in groups" :key="g.label">
+        <div class="p-4 w-full">
+          <!-- Shortcut Group Header -->
+          <div @click="g.collapsed = !g.collapsed" class="cursor-pointer mb-4">
+            <div class="font-semibold">
+              {{ g.label }}
+            </div>
+            <div class="text-base">
+              {{ g.description }}
+            </div>
+          </div>
+          <!-- Shortcuts -->
+          <div v-if="!g.collapsed" class="flex flex-col gap-4">
+            <div
+              v-for="(s, i) in g.shortcuts"
+              :key="g.label + ' ' + i"
+              class="grid gap-4 items-start"
+              style="grid-template-columns: 6rem auto"
+            >
+              <!-- <div class="w-2 text-base">{{ i + 1 }}.</div> -->
+              <div
+                class="
+                  text-base
+                  font-medium
+                  flex-shrink-0 flex
+                  items-center
+                  gap-1
+                  bg-gray-200
+                  text-gray-700
+                  px-1.5
+                  py-0.5
+                  rounded
+                "
+                style="width: fit-content"
+              >
+                <span
+                  v-for="k in s.shortcut"
+                  :key="k"
+                  class="tracking-tighter"
+                  >{{ k }}</span
+                >
+              </div>
+              <div class="whitespace-normal text-base">{{ s.description }}</div>
+            </div>
+          </div>
+          <!-- Shortcut count if collapsed -->
+          <div v-else class="text-base text-gray-600">
+            {{ t`${g.shortcuts.length} shortcuts` }}
+          </div>
+        </div>
+        <hr />
+      </template>
+      <div class="p-4 text-base text-gray-600">
+        {{ t`More shortcuts will be added soon.` }}
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+import { t } from 'fyo';
+import { defineComponent } from 'vue';
+import FormHeader from './FormHeader.vue';
+
+type Group = {
+  label: string;
+  description: string;
+  collapsed: boolean;
+  shortcuts: { shortcut: string[]; description: string }[];
+};
+
+export default defineComponent({
+  data() {
+    return { groups: [] } as { groups: Group[] };
+  },
+  mounted() {
+    this.groups = [
+      {
+        label: t`Global`,
+        description: t`Applicable anywhere in Frappe Books`,
+        collapsed: false,
+        shortcuts: [
+          {
+            shortcut: [this.pmod, 'K'],
+            description: t`Open Quick Search`,
+          },
+          {
+            shortcut: [this.del],
+            description: t`Go back to the previous page`,
+          },
+          {
+            shortcut: [this.shift, 'H'],
+            description: t`Toggle sidebar`,
+          },
+          {
+            shortcut: ['F1'],
+            description: t`Open Documentation`,
+          },
+        ],
+      },
+      {
+        label: t`Doc`,
+        description: t`Applicable when a Doc is open in the Form view or Quick Edit view`,
+        collapsed: false,
+        shortcuts: [
+          {
+            shortcut: [this.pmod, 'S'],
+            description: [
+              t`Save or Submit a doc.`,
+              t`A doc is submitted only if it is submittable and is in the saved state.`,
+            ].join(' '),
+          },
+          {
+            shortcut: [this.pmod, this.del],
+            description: [
+              t`Cancel or Delete a doc.`,
+              t`A doc is cancelled only if it is in the submitted state.`,
+              t`A submittable doc is deleted only if it is in the cancelled state.`,
+            ].join(' '),
+          },
+        ],
+      },
+      {
+        label: t`Quick Search`,
+        description: t`Applicable when Quick Search is open`,
+        collapsed: false,
+        shortcuts: [
+          { shortcut: [this.esc], description: t`Close Quick Search` },
+          {
+            shortcut: [this.pmod, '1'],
+            description: t`Toggle the Docs filter`,
+          },
+          {
+            shortcut: [this.pmod, '2'],
+            description: t`Toggle the List filter`,
+          },
+          {
+            shortcut: [this.pmod, '3'],
+            description: t`Toggle the Create filter`,
+          },
+          {
+            shortcut: [this.pmod, '4'],
+            description: t`Toggle the Report filter`,
+          },
+          {
+            shortcut: [this.pmod, '5'],
+            description: t`Toggle the Page filter`,
+          },
+        ],
+      },
+    ];
+  },
+  computed: {
+    pmod() {
+      if (this.isMac) {
+        return '⌘';
+      }
+
+      return 'Ctrl';
+    },
+    shift() {
+      if (this.isMac) {
+        return 'shift';
+      }
+
+      return '⇧';
+    },
+    alt() {
+      if (this.isMac) {
+        return '⌥';
+      }
+
+      return 'Alt';
+    },
+    del() {
+      if (this.isMac) {
+        return 'delete';
+      }
+
+      return 'Backspace';
+    },
+    esc() {
+      if (this.isMac) {
+        return 'esc';
+      }
+
+      return 'Esc';
+    },
+    isMac() {
+      return this.platform === 'Mac';
+    },
+  },
+  components: { FormHeader },
+});
+</script>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index d908e0a4..e4cf08d3 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -100,6 +100,20 @@
         </p>
       </button>
 
+      <button
+        class="
+          flex
+          text-sm text-gray-600
+          hover:text-gray-800
+          gap-1
+          items-center
+        "
+        @click="viewShortcuts = true"
+      >
+        <feather-icon name="command" class="h-4 w-4 flex-shrink-0" />
+        <p>{{ t`Shortcuts` }}</p>
+      </button>
+
       <button
         class="
           flex
@@ -155,6 +169,10 @@
     >
       <feather-icon name="chevrons-left" class="w-4 h-4" />
     </button>
+
+    <Modal :open-modal="viewShortcuts" @closemodal="viewShortcuts = false">
+      <ShortcutsHelper class="w-form" />
+    </Modal>
   </div>
 </template>
 <script>
@@ -167,15 +185,18 @@ import { getSidebarConfig } from 'src/utils/sidebarConfig';
 import { routeTo } from 'src/utils/ui';
 import router from '../router';
 import Icon from './Icon.vue';
+import Modal from './Modal.vue';
+import ShortcutsHelper from './ShortcutsHelper.vue';
 
 export default {
   components: [Button],
-  inject: ['languageDirection'],
+  inject: ['languageDirection', 'shortcuts'],
   emits: ['change-db-file', 'toggle-sidebar'],
   data() {
     return {
       companyName: '',
       groups: [],
+      viewShortcuts: false,
       activeGroup: null,
     };
   },
@@ -186,6 +207,8 @@ export default {
   },
   components: {
     Icon,
+    Modal,
+    ShortcutsHelper,
   },
   async mounted() {
     const { companyName } = await fyo.doc.getDoc('AccountingSettings');
@@ -196,6 +219,17 @@ export default {
     router.afterEach(() => {
       this.setActiveGroup();
     });
+
+    this.shortcuts.shift.set(['KeyH'], () => {
+      if (document.body === document.activeElement) {
+        this.$emit('toggle-sidebar');
+      }
+    });
+    this.shortcuts.set(['F1'], () => this.openDocumentation());
+  },
+  unmounted() {
+    this.shortcuts.alt.delete(['KeyH']);
+    this.shortcuts.delete(['F1']);
   },
   methods: {
     routeTo,
diff --git a/src/utils/vueUtils.ts b/src/utils/vueUtils.ts
index 0d706b0a..222e36ef 100644
--- a/src/utils/vueUtils.ts
+++ b/src/utils/vueUtils.ts
@@ -144,7 +144,7 @@ export function useKeys() {
     const { code } = e;
     if (
       code.startsWith('Alt') ||
-      code.startsWith('Ctrl') ||
+      code.startsWith('Control') ||
       code.startsWith('Meta') ||
       code.startsWith('Shift')
     ) {