Skip to content

Commit d85bfe0

Browse files
sprocketcsprocketc
committed
eliminate dom utils
1 parent 9fff03b commit d85bfe0

File tree

13 files changed

+29
-48
lines changed

13 files changed

+29
-48
lines changed

‎src/renderer/attribute/views.cljs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
[renderer.ui :as ui]
1616
[renderer.utils.attribute :as attr]
1717
[renderer.utils.bcd :as bcd]
18-
[renderer.utils.dom :as dom]
1918
[renderer.utils.keyboard :as keyb]
2019
[renderer.window.events :as-alias window.e]))
2120

@@ -134,7 +133,7 @@
134133
[:> Select/Portal
135134
[:> Select/Content
136135
{:class "menu-content rounded select-content"
137-
:on-key-down dom/stop-propagation!}
136+
:on-key-down #(.stopPropagation %)}
138137
[:> Select/ScrollUpButton
139138
{:class "select-scroll-button"}
140139
[ui/icon "chevron-up"]]

‎src/renderer/dialog/views.cljs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
[renderer.document.subs :as-alias document.s]
1313
[renderer.menubar.views :as menubar]
1414
[renderer.ui :as ui]
15-
[renderer.utils.dom :as dom]
1615
[renderer.utils.i18n :refer [t]]
1716
[renderer.utils.system :as system]))
1817

@@ -89,7 +88,7 @@
8988
[]
9089
[:> Command/Command
9190
{:label "Command Menu"
92-
:on-key-down dom/stop-propagation!}
91+
:on-key-down #(.stopPropagation %)}
9392
[:> Command/CommandInput
9493
{:class "p-3 bg-secondary text-sm border-b border-default"
9594
:placeholder (t [:cmdk/search-command "Search for a command"])}]
@@ -112,7 +111,7 @@
112111
[:> Dialog/Overlay {:class "backdrop"}]
113112
[:> Dialog/Content
114113
(merge {:class "dialog-content"
115-
:on-key-down dom/stop-propagation!}
114+
:on-key-down #(.stopPropagation %)}
116115
(:attrs (last dialogs)))
117116
(when-let [title (:title (last dialogs))]
118117
[:> Dialog/Title

‎src/renderer/document/events.cljs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
[renderer.notification.views :as notification.v]
2020
[renderer.snap.handlers :as snap.h]
2121
[renderer.utils.compatibility :as compatibility]
22-
[renderer.utils.dom :as dom]
2322
[renderer.utils.math :refer [Vec2D]]
2423
[renderer.utils.system :as system]
2524
[renderer.utils.vec :as vec]
@@ -95,7 +94,7 @@
9594
(dialog.h/create {:title "Do you want to save your changes?"
9695
:close-button true
9796
:content (dialog.v/save (get-in db [:documents id]))
98-
:attrs {:onOpenAutoFocus dom/prevent-default!}})))))
97+
:attrs {:onOpenAutoFocus #(.preventDefault %)}})))))
9998

10099
(rf/reg-event-fx
101100
::close-active

‎src/renderer/document/views.cljs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
[renderer.history.subs :as-alias history.s]
1111
[renderer.history.views :as history.v]
1212
[renderer.ui :as ui]
13-
[renderer.utils.dom :as dom]
1413
[renderer.utils.system :as system]))
1514

1615
(defn actions
@@ -58,7 +57,7 @@
5857
[:button.close.small
5958
{:key id
6059
:title "Close document"
61-
:on-pointer-down dom/stop-propagation!
60+
:on-pointer-down #(.stopPropagation %)
6261
:on-pointer-up (fn [e]
6362
(.stopPropagation e)
6463
(rf/dispatch [::e/close id true]))}
@@ -102,7 +101,7 @@
102101
nil)
103102
:draggable true
104103
:on-drag-start #(.setData (.-dataTransfer %) "id" (str id))
105-
:on-drag-over dom/prevent-default!
104+
:on-drag-over #(.preventDefault %)
106105
:on-drag-enter #(reset! dragged-over? true)
107106
:on-drag-leave #(reset! dragged-over? false)
108107
:on-drop (fn [evt]

‎src/renderer/element/impl/container/canvas.cljs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
[renderer.tool.events :as-alias tool.e]
1515
[renderer.tool.hierarchy :as tool.hierarchy]
1616
[renderer.tool.subs :as-alias tool.s]
17-
[renderer.utils.dom :as dom]
1817
[renderer.utils.keyboard :as keyb]
1918
[renderer.utils.overlay :as overlay]
2019
[renderer.utils.pointer :as pointer]))
@@ -62,7 +61,7 @@
6261
:tab-index 0 ; Enable keyboard events
6362
:viewBox viewbox-attr
6463
:on-drop drop-handler!
65-
:on-drag-over dom/prevent-default!
64+
:on-drag-over #(.preventDefault %)
6665
:width width
6766
:height height
6867
:transform (str "rotate(" rotate ")")

‎src/renderer/element/impl/text.cljs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
[renderer.history.handlers :as history.h]
1212
[renderer.tool.handlers :as h]
1313
[renderer.utils.bounds :as bounds]
14-
[renderer.utils.dom :as dom]
1514
[renderer.utils.element :as element]
1615
[renderer.utils.length :as length]
1716
[renderer.utils.system :as system]))
@@ -89,8 +88,8 @@
8988
:default-value content
9089
:auto-focus true
9190
:on-focus #(.. % -target select)
92-
:on-pointer-down dom/stop-propagation!
93-
:on-pointer-up dom/stop-propagation!
91+
:on-pointer-down #(.stopPropagation %)
92+
:on-pointer-up #(.stopPropagation %)
9493
:on-blur #(rf/dispatch [::set-text id (get-text! %)])
9594
:on-key-down #(key-down-handler! % id)
9695
:style {:color "transparent"

‎src/renderer/frame/views.cljs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
[renderer.element.views :as element.v]
1414
[renderer.frame.events :as-alias frame.e]
1515
[renderer.ui :as ui]
16-
[renderer.utils.dom :as dom]
1716
[renderer.utils.pointer :as pointer]
1817
[renderer.utils.wheel :as wheel]))
1918

@@ -110,7 +109,7 @@
110109
[:> ContextMenu/Portal
111110
(into [:> ContextMenu/Content
112111
{:class "menu-content context-menu-content"
113-
:on-close-auto-focus dom/prevent-default!
112+
:on-close-auto-focus #(.preventDefault %)
114113
:style {:margin-left (str x "px")
115114
:margin-top (str y "px")}}]
116115
(map ui/context-menu-item element.v/context-menu))]]]))})))

‎src/renderer/menubar/views.cljs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
[renderer.ruler.events :as-alias ruler.e]
1818
[renderer.ruler.subs :as-alias ruler.s]
1919
[renderer.ui :as ui]
20-
[renderer.utils.dom :as dom]
2120
[renderer.window.events :as-alias window.e]
2221
[renderer.window.subs :as-alias window.s]))
2322

@@ -617,6 +616,6 @@
617616
[]
618617
(into [:> Menubar/Root
619618
{:class "menubar-root"
620-
:on-key-down dom/stop-propagation! ; FIXME: Esc global action also triggered.
619+
:on-key-down #(.stopPropagation %) ; FIXME: Esc global action also triggered.
621620
:on-value-change #(rf/dispatch [::app.e/set-backdrop (boolean (seq %))])}]
622621
(map menu-item (root-menu))))

‎src/renderer/snap/views.cljs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
[renderer.snap.events :as-alias snap.e]
1010
[renderer.snap.subs :as-alias snap.s]
1111
[renderer.ui :as ui]
12-
[renderer.utils.dom :as dom]
1312
[renderer.utils.overlay :as overlay]))
1413

1514
(defn options-dropdown
@@ -33,7 +32,7 @@
3332
^{:key option}
3433
[:> DropdownMenu/CheckboxItem
3534
{:class "menu-checkbox-item inset"
36-
:on-click dom/stop-propagation!
35+
:on-click #(.stopPropagation %)
3736
:onSelect #(do (.preventDefault %)
3837
(rf/dispatch [::snap.e/toggle-option option]))
3938
:checked (contains? options option)}

‎src/renderer/timeline/effects.cljs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
[re-frame.core :as rf]
44
[renderer.utils.dom :as dom]))
55

6+
(defn svg-elements!
7+
[]
8+
(when-let [document (dom/frame-document!)]
9+
(.querySelectorAll document "svg")))
10+
611
(rf/reg-fx
712
::set-current-time
813
(fn [t]
9-
(doall (map #(.setCurrentTime % t) (dom/svg-elements!)))))
14+
(doall (map #(.setCurrentTime % t) (svg-elements!)))))
1015

1116
(rf/reg-fx
1217
::pause-animations
1318
(fn []
14-
(doall (map #(.pauseAnimations %) (dom/svg-elements!)))))
19+
(doall (map #(.pauseAnimations %) (svg-elements!)))))

0 commit comments

Comments
 (0)