feat: add shift for instant search

Closes crimx#232
woden234 · Nov 1, 2018 · 20a942a · 20a942a
1 parent a0470af
commit 20a942a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
@@ -103,7 +103,7 @@ export interface AppConfigMutable {
     /** cursor instant capture */
     instant: {
       enable: boolean
-      key: 'direct' | 'ctrl' | 'alt'
+      key: 'direct' | 'ctrl' | 'alt' | 'shift'
       delay: number
     }
   },
@@ -123,7 +123,7 @@ export interface AppConfigMutable {
     /** cursor instant capture */
     instant: {
       enable: boolean
-      key: 'direct' | 'ctrl' | 'alt'
+      key: 'direct' | 'ctrl' | 'alt' | 'shift'
       delay: number
     }
   },
@@ -143,7 +143,7 @@ export interface AppConfigMutable {
     /** cursor instant capture */
     instant: {
       enable: boolean
-      key: 'direct' | 'ctrl' | 'alt'
+      key: 'direct' | 'ctrl' | 'alt' | 'shift'
       delay: number
     }
   },
@@ -163,7 +163,7 @@ export interface AppConfigMutable {
     /** cursor instant capture */
     instant: {
       enable: boolean
-      key: 'direct' | 'ctrl' | 'alt'
+      key: 'direct' | 'ctrl' | 'alt' | 'shift'
       delay: number
     }
   },

diff --git a/src/app-config/merge-config.ts b/src/app-config/merge-config.ts
@@ -49,7 +49,7 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
   mergeBoolean('mode.holding.ctrl')
   mergeBoolean('mode.holding.meta')
   mergeBoolean('mode.instant.enable')
-  merge('mode.instant.key', val => val === 'direct' || val === 'ctrl' || val === 'alt')
+  merge('mode.instant.key', val => /^(direct|ctrl|alt|shift)$/.test(val))
   mergeNumber('mode.instant.delay')
 
   mergeBoolean('pinMode.direct')
@@ -58,7 +58,7 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
   mergeBoolean('pinMode.holding.ctrl')
   mergeBoolean('pinMode.holding.meta')
   mergeBoolean('pinMode.instant.enable')
-  merge('pinMode.instant.key', val => val === 'direct' || val === 'ctrl' || val === 'alt')
+  merge('pinMode.instant.key', val => /^(direct|ctrl|alt|shift)$/.test(val))
   mergeNumber('pinMode.instant.delay')
 
   mergeBoolean('panelMode.direct')
@@ -67,7 +67,7 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
   mergeBoolean('panelMode.holding.ctrl')
   mergeBoolean('panelMode.holding.meta')
   mergeBoolean('panelMode.instant.enable')
-  merge('panelMode.instant.key', val => val === 'direct' || val === 'ctrl' || val === 'alt')
+  merge('panelMode.instant.key', val => /^(direct|ctrl|alt|shift)$/.test(val))
   mergeNumber('panelMode.instant.delay')
 
   mergeBoolean('qsPanelMode.direct')
@@ -76,7 +76,7 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
   mergeBoolean('qsPanelMode.holding.ctrl')
   mergeBoolean('qsPanelMode.holding.meta')
   mergeBoolean('qsPanelMode.instant.enable')
-  merge('qsPanelMode.instant.key', val => val === 'direct' || val === 'ctrl' || val === 'alt')
+  merge('qsPanelMode.instant.key', val => /^(direct|ctrl|alt|shift)$/.test(val))
   mergeNumber('qsPanelMode.instant.delay')
 
   mergeNumber('doubleClickDelay')

diff --git a/src/options/OptMode.vue b/src/options/OptMode.vue
@@ -44,6 +44,7 @@
           <select class="form-control" v-model="mode.instant.key">
             <option value="alt">{{ $t('opt:mode_instant_alt') }}</option>
             <option value="ctrl">{{ $t('opt:mode_instant_ctrl') }}</option>
+            <option value="shift">Shift</option>
             <option value="direct">{{ $t('opt:mode_instant_direct') }}</option>
           </select>
         </label>

diff --git a/src/options/OptPanelMode.vue b/src/options/OptPanelMode.vue
@@ -41,6 +41,7 @@
           <select class="form-control" v-model="panelMode.instant.key">
             <option value="alt">{{ $t('opt:mode_instant_alt') }}</option>
             <option value="ctrl">{{ $t('opt:mode_instant_ctrl') }}</option>
+            <option value="shift">Shift</option>
             <option value="direct">{{ $t('opt:mode_instant_direct') }}</option>
           </select>
         </label>

diff --git a/src/options/OptPinMode.vue b/src/options/OptPinMode.vue
@@ -41,6 +41,7 @@
           <select class="form-control" v-model="pinMode.instant.key">
             <option value="alt">{{ $t('opt:mode_instant_alt') }}</option>
             <option value="ctrl">{{ $t('opt:mode_instant_ctrl') }}</option>
+            <option value="shift">Shift</option>
             <option value="direct">{{ $t('opt:mode_instant_direct') }}</option>
           </select>
         </label>

diff --git a/src/options/OptTripleCtrl.vue b/src/options/OptTripleCtrl.vue
@@ -78,6 +78,7 @@
             <select class="form-control" v-model="qsPanelMode.instant.key">
               <option value="alt">{{ $t('opt:mode_instant_alt') }}</option>
               <option value="ctrl">{{ $t('opt:mode_instant_ctrl') }}</option>
+              <option value="shift">Shift</option>
               <option value="direct">{{ $t('opt:mode_instant_direct') }}</option>
             </select>
           </label>

diff --git a/src/selection/index.ts b/src/selection/index.ts
@@ -263,6 +263,7 @@ combineLatest(
       fromEvent<MouseEvent>(window, 'mousemove', { capture: true }).pipe(map(e => {
         if ((instant === 'direct' && !(e.ctrlKey || e.metaKey || e.altKey)) ||
             (instant === 'alt' && e.altKey) ||
+            (instant === 'shift' && e.shiftKey) ||
             (instant === 'ctrl' && (e.ctrlKey || e.metaKey))
         ) {
           // harmless side effects