move focus event

repath-project · Jun 12, 2024 · 3f61fc1 · 3f61fc1
1 parent 3938901
commit 3f61fc1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/src/renderer/core.cljs b/src/renderer/core.cljs
@@ -20,7 +20,6 @@
    [renderer.events]
    [renderer.frame.core]
    [renderer.history.core]
-   [renderer.menubar.core]
    [renderer.notification.core]
    [renderer.panel.core]
    [renderer.reepl.core]
@@ -48,7 +47,7 @@
 ██╔══██╗██╔══╝░░██╔═══╝░██╔══██║░░░██║░░░██╔══██║
 ██║░░██║███████╗██║░░░░░██║░░██║░░░██║░░░██║░░██║
 ╚═╝░░╚═╝╚══════╝╚═╝░░░░░╚═╝░░╚═╝░░░╚═╝░░░╚═╝░░╚═╝
- 
+
 ░██████╗████████╗██╗░░░██╗██████╗░██╗░█████╗░
 ██╔════╝╚══██╔══╝██║░░░██║██╔══██╗██║██╔══██╗
 ╚█████╗░░░░██║░░░██║░░░██║██║░░██║██║██║░░██║

diff --git a/src/renderer/events.cljs b/src/renderer/events.cljs
@@ -218,3 +218,8 @@
  (fn [id]
    (when-let [element (if id (.getElementById js/document id) (dom/canvas-element))]
      (js/setTimeout #(.focus element)))))
+
+(rf/reg-event-fx
+ :focus
+ (fn [_ [_ id]]
+   {:focus id}))
diff --git a/src/renderer/menubar/core.cljs b/src/renderer/menubar/core.cljs
diff --git a/src/renderer/menubar/events.cljs b/src/renderer/menubar/events.cljs
diff --git a/src/renderer/menubar/views.cljs b/src/renderer/menubar/views.cljs
@@ -528,7 +528,7 @@
   [:> Menubar/Item
    {:class "menu-item"
     :onSelect #(do (rf/dispatch action)
-                   (rf/dispatch [:menubar/focus nil]))
+                   (rf/dispatch [:focus nil]))
     :disabled (when disabled? @(rf/subscribe disabled?))}
    label
    [:div.right-slot

diff --git a/src/renderer/utils/keyboard.cljs b/src/renderer/utils/keyboard.cljs
@@ -33,11 +33,11 @@
                                    (.-shiftKey e) (conj :shift))}]))
 
 (defn input-key-down-handler
-  "Generic on-key-down handler for input elements that dispatches an event `f` 
-   in order to update a db value on keyboard enter, or reset to the initial 
+  "Generic on-key-down handler for input elements that dispatches an event `f`
+   in order to update a db value on keyboard enter, or reset to the initial
    value `v` on escape.
 
-   We need this to avoid updating the canvas with incomplete values while the 
+   We need this to avoid updating the canvas with incomplete values while the
    user is typing, and also avoid polluting the history stack.
 
    The `default-value` attribute should be used to update the value reactively."
@@ -161,19 +161,19 @@
                 [[:element/select-all]
                  [{:keyCode (key-codes "A")
                    :ctrlKey true}]]
-                [[:menubar/focus "file"]
+                [[:focus "file"]
                  [{:keyCode (key-codes "F")
                    :altKey true}]]
-                [[:menubar/focus "edit"]
+                [[:focus "edit"]
                  [{:keyCode (key-codes "E")
                    :altKey true}]]
-                [[:menubar/focus "object"]
+                [[:focus "object"]
                  [{:keyCode (key-codes "O")
                    :altKey true}]]
-                [[:menubar/focus "view"]
+                [[:focus "view"]
                  [{:keyCode (key-codes "V")
                    :altKey true}]]
-                [[:menubar/focus "help"]
+                [[:focus "help"]
                  [{:keyCode (key-codes "H")
                    :altKey true}]]
                 [[:element/move-up]