feat: use CodeMirror's save hotkey in storage->key

Xia0xia0Xia0 · Jul 7, 2024 · cef7d72 · cef7d72
1 parent db4ce8f
commit cef7d72
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/src/options/utils/index.js b/src/options/utils/index.js
@@ -34,6 +34,16 @@ export const kOrigMatch = 'origMatch';
 export const kStorageSize = 'storageSize';
 export const kUpdateURL = 'updateURL';
 
+export let K_SAVE; // deduced from the current CodeMirror keymap
+
+export function inferSaveHotKey(hotkeys) {
+  K_SAVE = hotkeys.find(([, cmd]) => cmd === 'save')?.[0];
+  if (!K_SAVE) {
+    K_SAVE = 'Ctrl-S';
+    hotkeys.unshift([K_SAVE, 'save']);
+  }
+}
+
 export function markRemove(script, removed) {
   return sendCmdDirectly('MarkRemoved', {
     id: script.props.id,

diff --git a/src/options/views/edit/index.vue b/src/options/views/edit/index.vue
@@ -101,8 +101,8 @@ import { keyboardService } from '@/common/keyboard';
 import options from '@/common/options';
 import { getUnloadSentry } from '@/common/router';
 import {
-  kDownloadURL, kExclude, kExcludeMatch, kHomepageURL, kIcon, kInclude, kMatch, kName, kOrigExclude,
-  kOrigExcludeMatch, kOrigInclude, kOrigMatch, kUpdateURL,
+  kDownloadURL, kExclude, kExcludeMatch, kHomepageURL, kIcon, kInclude, kMatch, kName, kOrigExclude, kOrigExcludeMatch,
+  kOrigInclude, kOrigMatch, kUpdateURL,
 } from '../../utils';
 
 const urlMatching = 'https://violentmonkey.github.io/api/matching/';
@@ -157,7 +157,7 @@ import { computed, nextTick, onActivated, onDeactivated, onMounted, ref, watch }
 import VmCode from '@/common/ui/code';
 import VmExternals from '@/common/ui/externals';
 import LocaleGroup from '@/common/ui/locale-group';
-import { kStorageSize, store } from '../../utils';
+import { inferSaveHotKey, K_SAVE, kStorageSize, store } from '../../utils';
 import VmSettings from './settings';
 import VMSettingsUpdate from './settings-update';
 import VmValues from './values';
@@ -166,7 +166,6 @@ import VmHelp from './help';
 let CM;
 let $codeComp;
 let disposeList;
-let K_SAVE; // deduced from the current CodeMirror keymap
 let savedCopy;
 let shouldSavePositionOnSave;
 let toggleUnloadSentry;
@@ -269,11 +268,7 @@ onMounted(() => {
     ...Object.entries($codeComp.expandKeyMap())
     .sort((a, b) => compareString(a[1], b[1]) || compareString(a[0], b[0])),
   ];
-  K_SAVE = hk.find(([, cmd]) => cmd === 'save')?.[0];
-  if (!K_SAVE) {
-    K_SAVE = 'Ctrl-S';
-    hk.unshift([K_SAVE, 'save']);
-  }
+  if (!K_SAVE) inferSaveHotKey(hk);
 });
 
 onActivated(() => {

diff --git a/src/options/views/edit/values.vue b/src/options/views/edit/values.vue
@@ -92,6 +92,7 @@
         <input type="text" v-model="current.key" :readOnly="!current.isNew || readOnly"
                ref="$key"
                spellcheck="false"
+               @keydown="onKeyDownInKeyInput"
                @keydown.esc.exact.stop="onCancel">
       </label>
       <label>
@@ -120,12 +121,13 @@ import { handleTabNavigation, keyboardService } from '@/common/keyboard';
 import { deepCopy, deepEqual, forEachEntry, mapEntry } from '@/common/object';
 import { WATCH_STORAGE } from '@/common/consts';
 import hookSetting from '@/common/hook-setting';
+import CodeMirror from 'codemirror';
 import Dropdown from 'vueleton/lib/dropdown';
 import VmCode from '@/common/ui/code';
 import Icon from '@/common/ui/icon';
 import { getActiveElement, showMessage } from '@/common/ui';
 import SettingText from '@/common/ui/setting-text';
-import { kStorageSize, toggleBoolean } from '../../utils';
+import { K_SAVE, kStorageSize, toggleBoolean } from '../../utils';
 
 const props = defineProps({
   /** @type {VMScript} */
@@ -446,6 +448,11 @@ function onChange(isChanged) {
   }
   cur.jsonPaused = performance.now() - t0 > MAX_JSON_DURATION;
 }
+function onKeyDownInKeyInput(evt) {
+  if (CodeMirror.keyName(evt) === K_SAVE) {
+    onSave();
+  }
+}
 function onStorageChanged(changes) {
   const data = Object.values(changes)[0].newValue;
   if (data) {