fix(selection): better ctrl detection

Closes #168
crimx · Jul 26, 2018 · 9f0c6b6 · 9f0c6b6
1 parent 0fd0dba
commit 9f0c6b6
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/src/selection/index.ts b/src/selection/index.ts
@@ -94,13 +94,13 @@ if (!window.name.startsWith('saladict-') && !isSaladictOptionsPage) {
    * Pressing ctrl/command key more than three times within 500ms
    * trigers TripleCtrl
    */
-  const validCtrlPressed$$ = isKeyPressed(isCtrlKey).pipe(
-    filter(Boolean),
-    share(),
-  )
+  const ctrlPressed$$ = share<true>()(isKeyPressed(isCtrlKey))
 
-  validCtrlPressed$$.pipe(
-    buffer(debounceTime(500)(validCtrlPressed$$)),
+  ctrlPressed$$.pipe(
+    buffer(merge(
+      debounceTime(500)(ctrlPressed$$), // collect after 0.5s
+      isKeyPressed(e => !isCtrlKey(e)), // other key pressed
+    )),
     filter(group => group.length >= 3),
   ).subscribe(() => {
     message.self.send({ type: MsgType.TripleCtrl })
@@ -167,11 +167,7 @@ merge(
 /**
  * Escape key pressed
  */
-isKeyPressed(isEscapeKey).subscribe(flag => {
-  if (flag) {
-    message.self.send({ type: MsgType.EscapeKey })
-  }
-})
+isKeyPressed(isEscapeKey).subscribe(() => message.self.send({ type: MsgType.EscapeKey }))
 
 let lastText: string
 let lastContext: string
@@ -360,14 +356,15 @@ function isEscapeKey (evt: KeyboardEvent): boolean {
   return evt.key === 'Escape'
 }
 
-function isKeyPressed (keySelectior: (e: KeyboardEvent) => boolean): Observable<boolean> {
-  return distinctUntilChanged<boolean>()(
-    merge(
-      map(keySelectior)(fromEvent<KeyboardEvent>(window, 'keydown', { capture: true })),
-      mapTo(false)(fromEvent(window, 'keyup', { capture: true })),
-      mapTo(false)(fromEvent(window, 'blur', { capture: true })),
-      of(false)
-    )
+function isKeyPressed (keySelectior: (e: KeyboardEvent) => boolean): Observable<true> {
+  return merge(
+    map(keySelectior)(fromEvent<KeyboardEvent>(window, 'keydown', { capture: true })),
+    mapTo(false)(fromEvent(window, 'keyup', { capture: true })),
+    mapTo(false)(fromEvent(window, 'blur', { capture: true })),
+    of(false),
+  ).pipe(
+    distinctUntilChanged(), // ignore long press
+    filter((x): x is true => x),
   )
 }