revert tree event handling changes

Author: sprocketc

src/renderer/tree/events.cljs

@@ -1,11 +1,9 @@
 (ns renderer.tree.events
   (:require
-   [re-frame.core :as rf]
-   [renderer.document.events :as-alias document.e]
-   [renderer.element.events :as-alias element.e]))
+   [re-frame.core :as rf]))
 
 (rf/reg-fx
- ::focus-item
+ ::focus
  (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) "']")))
@@ -18,22 +16,11 @@
      (.focus element))))
 
 (rf/reg-event-fx
- ::key-down
- (fn [_ [_ key el-k multi?]]
-   (case key
-     "ArrowUp"
-     {::focus-item [el-k :up]}
+ ::focus-up
+ (fn [_ [_ k]]
+   {::focus [k :up]}))
 
-     "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)))
+(rf/reg-event-fx
+ ::focus-down
+ (fn [_ [_ k]]
+   {::focus [k :down]}))

src/renderer/tree/views.cljs

@@ -74,6 +74,31 @@
     (- (* depth collapse-button-width)
        (if children? collapse-button-width 0))))
 
+(defn key-down-handler
+  [e el-k]
+  (case (.-key e)
+    "ArrowUp"
+    (do (.stopPropagation e)
+        (rf/dispatch [::e/focus-up el-k]))
+
+    "ArrowDown"
+    (do (.stopPropagation e)
+        (rf/dispatch [::e/focus-down el-k]))
+
+    "ArrowLeft"
+    (do (.stopPropagation e)
+        (rf/dispatch [::document.e/collapse-el el-k]))
+
+    "ArrowRight"
+    (do (.stopPropagation e)
+        (rf/dispatch [::document.e/expand-el el-k]))
+
+    "Enter"
+    (do (.stopPropagation e)
+        (rf/dispatch [::element.e/select el-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?])]
@@ -88,8 +113,7 @@
       :ref (fn [this]
              (when (and this selected? hovered? (not multiple-selected?))
                (dom/scroll-into-view! this)))
-      :on-key-down #(do (.stopPropagation %)
-                        (rf/dispatch [::e/key-down (.-key %) key (.-ctrlKey %)]))
+      :on-key-down #(key-down-handler % key)
       :draggable true
       :on-drag-start #(-> (.-dataTransfer %)
                           (.setData "key" (name key)))