Respect shift on software arrows

page66688 · Dec 13, 2019 · 796fd36 · 796fd36
1 parent 25cd367
commit 796fd36
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/Blink/SmarterKeys/KBView.swift b/Blink/SmarterKeys/KBView.swift
@@ -372,15 +372,23 @@ extension KBView: KBKeyViewDelegate {
 
     defer { turnOffUntracked() }
 
+    guard let keyInput = keyInput
+    else {
+      return
+    }
+
     let keyCode = value.keyCode
     var keyId = keyCode.id
     keyId += ":\(value.text)"
 
     var flags = traits.modifierFlags
+    if keyInput.trackingModifierFlags.contains(.shift) {
+      flags.insert(.shift)
+    }
 
     if let input = value.input,
       flags.rawValue > 0,
-      let (cmd, responder) = keyInput?.matchCommand(input: input, flags: flags),
+      let (cmd, responder) = keyInput.matchCommand(input: input, flags: flags),
       let action = cmd.action  {
       responder.perform(action, with: cmd)
       return
@@ -390,7 +398,7 @@ extension KBView: KBKeyViewDelegate {
       flags.remove(.command)
     }
 
-    keyInput?.reportToolbarPress(flags, keyId: keyId)
+    keyInput.reportToolbarPress(flags, keyId: keyId)
   }
 
   func keyViewCancelled(keyView: KBKeyView) {

diff --git a/KB/Native/Views/KBWebViewBase.h b/KB/Native/Views/KBWebViewBase.h
@@ -36,6 +36,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface KBWebViewBase : WKWebView
 
+@property (readonly) UIKeyModifierFlags trackingModifierFlags;
+
 - (void)reportStateReset;
 - (void)reportLang:(NSString *) lang;
 - (void)reportPress:(UIKeyModifierFlags)mods keyId:(NSString *)keyId;

diff --git a/KB/Native/Views/KBWebViewBase.m b/KB/Native/Views/KBWebViewBase.m
@@ -304,11 +304,11 @@ - (void)userContentController:(WKUserContentController *)userContentController
     });
   } else if ([@"mods" isEqual:op]) {
     NSNumber *mods = body[@"mods"];
-    UIKeyModifierFlags flags = (UIKeyModifierFlags)mods.integerValue;
-    if (flags == 0) {
+    _trackingModifierFlags = (UIKeyModifierFlags)mods.integerValue;
+    if (_trackingModifierFlags == 0) {
       _activeModsCommand = nil;
     } else {
-      _activeModsCommand = [self _modifiersCommand:flags];
+      _activeModsCommand = [self _modifiersCommand:_trackingModifierFlags];
     }
     [self _rebuildKeyCommands];
     [self onMods];