refactor tree module

Author: sprocketc

src/renderer/tree/events.cljs

@@ -1,9 +1,11 @@
 (ns renderer.tree.events
   (:require
-   [re-frame.core :as rf]))
+   [re-frame.core :as rf]
+   [renderer.document.events :as-alias document.e]
+   [renderer.element.events :as-alias element.e]))
 
 (rf/reg-fx
- ::focus
+ ::focus-item
  (fn [[k direction]]
    (let [list-elements (.from js/Array (.querySelectorAll js/document ".tree-sidebar .list-item-button"))
          current-el (first (.querySelectorAll js/document (str ".tree-sidebar [data-id='" (name k) "']")))
@@ -16,11 +18,22 @@
      (.focus element))))
 
 (rf/reg-event-fx
- ::focus-up
- (fn [_ [_ k]]
-   {::focus [k :up]}))
+ ::key-down
+ (fn [_ [_ key el-k multi?]]
+   (case key
+     "ArrowUp"
+     {::focus-item [el-k :up]}
 
-(rf/reg-event-fx
- ::focus-down
- (fn [_ [_ k]]
-   {::focus [k :down]}))
+     "ArrowDown"
+     {::focus-item [el-k :down]}
+
+     "ArrowLeft"
+     {:dispatch [::document.e/collapse-el el-k]}
+
+     "ArrowRight"
+     {:dispatch [::document.e/expand-el el-k]}
+
+     "Enter"
+     {:dispatch [::element.e/select el-k multi?]}
+
+     nil)))

src/renderer/tree/views.cljs

@@ -73,31 +73,6 @@
     (- (* depth collapse-button-width)
        (if children? collapse-button-width 0))))
 
-(defn key-down-handler
-  [e k]
-  (case (.-key e)
-    "ArrowUp"
-    (do (.stopPropagation e)
-        (rf/dispatch [::e/focus-up k]))
-
-    "ArrowDown"
-    (do (.stopPropagation e)
-        (rf/dispatch [::e/focus-down k]))
-
-    "ArrowLeft"
-    (do (.stopPropagation e)
-        (rf/dispatch [::document.e/collapse-el k]))
-
-    "ArrowRight"
-    (do (.stopPropagation e)
-        (rf/dispatch [::document.e/expand-el k]))
-
-    "Enter"
-    (do (.stopPropagation e)
-        (rf/dispatch [::element.e/select k (.-ctrlKey e)]))
-
-    nil))
-
 (defn list-item-button
   [{:keys [key selected? children] :as el} depth hovered? collapsed?]
   (let [multiple-selected? @(rf/subscribe [::element.s/multiple-selected?])]
@@ -112,16 +87,16 @@
       :ref (fn [this]
              (when (and this selected? hovered? (not multiple-selected?))
                (dom/scroll-into-view! this)))
-      :on-key-down #(key-down-handler % key)
+      :on-key-down #(do (.stopPropagation %)
+                        (rf/dispatch [::e/key-down (.-key %) key (.-ctrlKey %)]))
       :draggable true
       :on-drag-start #(-> (.-dataTransfer %)
                           (.setData "key" (name key)))
       :on-drag-enter #(rf/dispatch [::document.e/set-hovered-keys #{key}])
       :on-drag-over #(.preventDefault %)
       :on-drop #(drop-handler % key)
-      :on-pointer-down (fn [e]
-                         (when (= (.-button e) 2)
-                           (rf/dispatch [::element.e/select key (.-ctrlKey e)])))
+      :on-pointer-down #(when (= (.-button %) 2)
+                          (rf/dispatch [::element.e/select key (.-ctrlKey %)]))
       :on-pointer-up (fn [e]
                        (.stopPropagation e)
                        (rf/dispatch [::element.e/select key (.-ctrlKey e)]))