Bring back shortcuts help

atorpos · Dec 22, 2019 · 2d20530 · 2d20530
1 parent e0ac3da
commit 2d20530
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/Blink/SpaceController.swift b/Blink/SpaceController.swift
@@ -457,10 +457,14 @@ extension SpaceController {
   }
 
   public override var keyCommands: [UIKeyCommand]? {
+    let input = SmarterTermInput.shared
     guard foregroundActive else {
-      return []
+      return input.noOpKeyCommands
     }
-    return SmarterTermInput.shared.blinkKeyCommands
+    return input.blinkKeyCommands
+  }
+
+  @objc func _onNoOpCommand(_ cmd: BlinkCommand) {
   }
 
   @objc func _onBlinkCommand(_ cmd: BlinkCommand) {

diff --git a/KB/Native/Views/KBWebView.swift b/KB/Native/Views/KBWebView.swift
@@ -41,6 +41,7 @@ class KBWebView: KBWebViewBase {
   private var _loaded = false
   private(set) var webViewReady = false
   private(set) var blinkKeyCommands: [BlinkCommand] = []
+  private(set) var noOpKeyCommands: [BlinkCommand] = []
 
   func configure(_ cfg: KBConfig) {
     _buildCommands(cfg)
@@ -66,6 +67,19 @@ class KBWebView: KBWebViewBase {
       cmd.bindingAction = shortcut.action
       return cmd
     }
+
+    noOpKeyCommands = cfg.shortcuts.map { shortcut in
+      let cmd = BlinkCommand(
+        title: shortcut.action.isCommand ? shortcut.title : "", // Show only commands in cmd help view
+        image: nil,
+        action: #selector(SpaceController._onNoOpCommand(_:)),
+        input: shortcut.input,
+        modifierFlags: shortcut.modifiers,
+        propertyList: nil
+      )
+      cmd.bindingAction = shortcut.action
+      return cmd
+    }
   }
 
   func matchCommand(input: String, flags: UIKeyModifierFlags) -> (UIKeyCommand, UIResponder)? {