move window cofx

Author: sprocketc

src/renderer/window/effects.cljs

@@ -2,8 +2,21 @@
   (:require
    [re-frame.core :as rf]
    [renderer.notification.events :as-alias notification.e]
+   [renderer.utils.dom :as dom]
    [renderer.utils.system :as system]))
 
+(rf/reg-cofx
+ ::focused
+ (fn [coeffects _]
+   (assoc coeffects :focused (or (.hasFocus js/document)
+                                 (and (dom/frame-document!)
+                                      (.hasFocus (dom/frame-document!)))))))
+
+(rf/reg-cofx
+ ::fullscreen
+ (fn [coeffects _]
+   (assoc coeffects :fullscreen (boolean (.-fullscreenElement js/document)))))
+
 (rf/reg-fx
  ::close
  (fn [_]
@@ -27,12 +40,12 @@
    (.open js/window url)))
 
 (rf/reg-fx
- ::add-window-listener
+ ::add-event-listener
  (fn [[channel listener formatter]]
    (.addEventListener js/window channel #(rf/dispatch-sync (conj listener (cond-> % formatter formatter))))))
 
 (rf/reg-fx
- ::add-document-listener
+ ::add-document-event-listener
  (fn [[channel listener formatter]]
    (.addEventListener js/document channel #(rf/dispatch (conj listener (cond-> % formatter formatter))))))
 

src/renderer/window/events.cljs

@@ -5,23 +5,10 @@
    [renderer.document.events :as-alias document.e]
    [renderer.document.handlers :as document.h]
    [renderer.tool.events :as-alias tool.e]
-   [renderer.utils.dom :as dom]
    [renderer.utils.keyboard :as keyboard]
    [renderer.utils.system :as system]
    [renderer.window.effects :as fx]))
 
-(rf/reg-cofx
- ::focused
- (fn [coeffects _]
-   (assoc coeffects :focused (or (.hasFocus js/document)
-                                 (and (dom/frame-document!)
-                                      (.hasFocus (dom/frame-document!)))))))
-
-(rf/reg-cofx
- ::fullscreen
- (fn [coeffects _]
-   (assoc coeffects :fullscreen (boolean (.-fullscreenElement js/document)))))
-
 (rf/reg-event-db
  ::set-maximized
  (fn [db [_ state]]
@@ -46,15 +33,15 @@
 
 (rf/reg-event-fx
  ::update-focused
- [(rf/inject-cofx ::focused)]
+ [(rf/inject-cofx ::fx/focused)]
  (fn [{:keys [db focused]} _]
    {:db (cond-> (assoc-in db [:window :focused] focused)
           focused
           document.h/center)}))
 
 (rf/reg-event-fx
  ::update-fullscreen
- [(rf/inject-cofx ::fullscreen)]
+ [(rf/inject-cofx ::fx/fullscreen)]
  (fn [{:keys [db fullscreen]} _]
    {:db (assoc-in db [:window :focused] fullscreen)}))
 
@@ -103,12 +90,12 @@
 (rf/reg-event-fx
  ::add-listeners
  (fn [_ _]
-   {:fx [[::fx/add-document-listener ["keydown" [::tool.e/keyboard-event] keyboard/event-formatter]]
-         [::fx/add-document-listener ["keyup" [::tool.e/keyboard-event] keyboard/event-formatter]]
-         [::fx/add-document-listener ["fullscreenchange" [::update-fullscreen]]]
-         [::fx/add-window-listener ["load" [::update-focused]]]
-         [::fx/add-window-listener ["focus" [::update-focused]]]
-         [::fx/add-window-listener ["blur" [::update-focused]]]
+   {:fx [[::fx/add-document-event-listener ["keydown" [::tool.e/keyboard-event] keyboard/event-formatter]]
+         [::fx/add-document-event-listener ["keyup" [::tool.e/keyboard-event] keyboard/event-formatter]]
+         [::fx/add-document-event-listener ["fullscreenchange" [::update-fullscreen]]]
+         [::fx/add-event-listener ["load" [::update-focused]]]
+         [::fx/add-event-listener ["focus" [::update-focused]]]
+         [::fx/add-event-listener ["blur" [::update-focused]]]
          [:dispatch [::document.e/center]]]}))
 
 (rf/reg-event-fx