From 1418bfb20579fb3bece846f7a7c0965b8c631caf Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Sun, 22 May 2022 00:42:34 +0800
Subject: [PATCH] fix: non-mac users will use Ctrl instead of Alt for selecting
 blocks

---
 src/main/frontend/components/block.cljs   | 4 ++--
 src/main/frontend/components/sidebar.cljs | 2 +-
 src/main/frontend/util.cljc               | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index 398a177cfa..874f36ff07 100644
--- a/src/main/frontend/components/block.cljs
+++ b/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?)
diff --git a/src/main/frontend/components/sidebar.cljs b/src/main/frontend/components/sidebar.cljs
index 074afe8a4f..770404964a 100644
--- a/src/main/frontend/components/sidebar.cljs
+++ b/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 <
diff --git a/src/main/frontend/util.cljc b/src/main/frontend/util.cljc
index b599e6af39..60a00afa5c 100644
--- a/src/main/frontend/util.cljc
+++ b/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]