Browse Source

fix: non-mac users will use Ctrl instead of Alt for selecting blocks

Tienson Qin 3 years ago
parent
commit
1418bfb205

+ 2 - 2
src/main/frontend/components/block.cljs

@@ -1907,7 +1907,7 @@
   (let [target (gobj/get e "target")
         button (gobj/get e "buttons")
         shift? (gobj/get e "shiftKey")
-        meta? (gobj/get e "metaKey")]
+        meta? (util/meta-key? e)]
     (if (and meta? (not (state/get-edit-input-id)))
       (do
         (util/stop e)
@@ -2013,7 +2013,7 @@
                                     (state/in-selection-mode?)
                                     (not (string/includes? content "```"))
                                     (not (gobj/get e "shiftKey"))
-                                    (not (gobj/get e "metaKey")))
+                                    (not (util/meta-key? e)))
                                ;; clear highlighted text
                                (util/clear-selection!)))}
        (not slide?)

+ 1 - 1
src/main/frontend/components/sidebar.cljs

@@ -459,7 +459,7 @@
   [e]
   (state/hide-custom-context-menu!)
   (when (and (not (gobj/get e "shiftKey"))
-             (not (gobj/get e "metaKey")))
+             (not (util/meta-key? e)))
     (editor-handler/clear-selection!)))
 
 (rum/defcs ^:large-vars/cleanup-todo sidebar <

+ 6 - 0
src/main/frontend/util.cljc

@@ -1193,6 +1193,12 @@
    (defn meta-key-name []
      (if mac? "Cmd" "Ctrl")))
 
+#?(:cljs
+   (defn meta-key? [e]
+     (if mac?
+       (gobj/get e "metaKey")
+       (gobj/get e "ctrlKey"))))
+
 #?(:cljs
    (defn right-click?
      [e]