Skip to content

Commit 3eaa0a6

Browse files
committed
refactor
1 parent e9f3b21 commit 3eaa0a6

36 files changed

+404
-506
lines changed

src/renderer/animations.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,21 @@
7474
transform:rotate(360deg);
7575
}
7676
}
77+
78+
@keyframes rotationBreak {
79+
0% {
80+
transform: rotate(0);
81+
}
82+
25% {
83+
transform: rotate(90deg);
84+
}
85+
50% {
86+
transform: rotate(180deg);
87+
}
88+
75% {
89+
transform: rotate(270deg);
90+
}
91+
100% {
92+
transform: rotate(360deg);
93+
}
94+
}

src/renderer/app/effects.cljs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,11 @@
134134
::scroll-to-bottom
135135
(fn [el]
136136
(set! (.-scrollTop el) (.-scrollHeight el))))
137+
138+
(rf/reg-fx
139+
::eye-dropper
140+
(fn [{:keys [on-success on-error]}]
141+
(-> (js/EyeDropper.)
142+
(.open)
143+
(.then (fn [color] (when on-success (rf/dispatch (conj on-success color)))))
144+
(.catch (fn [error] (when on-error (rf/dispatch (conj on-error error))))))))

src/renderer/app/views.cljs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
[re-frame.core :as rf]
1010
[renderer.app.events :as e]
1111
[renderer.app.subs :as-alias app.s]
12-
[renderer.codemirror.views :as cm.v]
1312
[renderer.dialog.events :as-alias dialog.e]
1413
[renderer.dialog.views :as dialog.v]
1514
[renderer.document.events :as-alias document.e]
@@ -145,7 +144,7 @@
145144
[:div.h-full.bg-primary.flex
146145
[ui/scroll-area
147146
[:div.p-1
148-
[cm.v/editor xml
147+
[ui/cm-editor xml
149148
{:options {:mode "text/xml"
150149
:readOnly true}}]]]]]]))]]])
151150

@@ -205,7 +204,7 @@
205204
[ui/icon "file"]
206205
[:button.button-link.text-lg
207206
{:on-click #(rf/dispatch [::document.e/new])} "New"]
208-
[ui/shortcuts [::document.e/new]]
207+
[ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts [::document.e/new]])]
209208

210209
[:span "or"]
211210

@@ -241,7 +240,7 @@
241240
[:button.button-link.text-lg
242241
{:on-click #(rf/dispatch [::document.e/open nil])}
243242
"Open"]
244-
[ui/shortcuts [::document.e/open nil]]]
243+
[ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts [::document.e/open nil]])]]
245244

246245
(when (seq recent-documents)
247246
[:<> [:h2.mb-3.mt-8.text-2xl "Recent"]
@@ -263,7 +262,7 @@
263262
[:button.button-link.text-lg
264263
{:on-click #(rf/dispatch [::dialog.e/cmdk])}
265264
"Command panel"]
266-
[ui/shortcuts [::dialog.e/cmdk]]]]
265+
[ui/shortcuts @(rf/subscribe [::app.s/event-shortcuts [::dialog.e/cmdk]])]]]
267266
[:div.flex.items-center.gap-2
268267
[ui/icon "earth"]
269268
[:button.button-link.text-lg

src/renderer/attribute/impl/style.cljs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
(:require
33
[re-frame.core :as rf]
44
[renderer.attribute.hierarchy :as hierarchy]
5-
[renderer.codemirror.views :as cm]
6-
[renderer.element.events :as-alias element.e]))
5+
[renderer.element.events :as-alias element.e]
6+
[renderer.ui :as ui]))
77

88
(defmethod hierarchy/form-element [:default :style]
99
[_ k v {:keys [disabled]}]
1010
[:div.w-full.bg-primary.p-1
11-
[cm/editor v {:options {:readOnly disabled}
12-
:on-blur #(rf/dispatch [::element.e/set-attr k %])}]])
11+
[ui/cm-editor v {:options {:readOnly disabled}
12+
:on-blur #(rf/dispatch [::element.e/set-attr k %])}]])

src/renderer/attribute/views.cljs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
(defn caniusethis
5959
[{:keys [tag attr]}]
60-
(let [data (if attr (bcd/conmpatibility tag attr) (bcd/conmpatibility tag))
60+
(let [data (if attr (bcd/compatibility tag attr) (bcd/compatibility tag))
6161
support-data (:support data)
6262
property (when attr (attr/property-data attr))
6363
spec-url (or (:spec_url data) (:href property))
@@ -185,7 +185,7 @@
185185
[:h2.mb-4.text-lg k]
186186
(when (get-method hierarchy/description [dispatch-tag k])
187187
[:p (hierarchy/description dispatch-tag k)])
188-
(when (bcd/conmpatibility tag k)
188+
(when (bcd/compatibility tag k)
189189
[:<>
190190
(when property [property-list property])
191191
[caniusethis {:tag tag :attr k}]])]

src/renderer/codemirror/styles.css

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/renderer/codemirror/views.cljs

Lines changed: 0 additions & 67 deletions
This file was deleted.

src/renderer/color/db.cljs

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/renderer/color/effects.cljs

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/renderer/color/events.cljs

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)