Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-12 07:41:43 -05:00
Code Issues Activity

Implement using rx observables instead of side-effects

Browse source
This commit is contained in:
Florian Schroedl 2024-07-03 11:09:50 +02:00
parent 97db3c29ca
commit 1e70a4d714
1 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
frontend/src/app/main/ui/workspace/tokens/core.cljs
View file

@ -60,29 +60,59 @@
shapes)] shapes)]
(and (empty? with-token) (seq without-token)))) (and (empty? with-token) (seq without-token))))
(defn apply-token
"Applies `attributes` to `token` for `shapes-ids`.
When a `on-shape-update` function is passed, use this to update the shape attributes as well."
[{:keys [attributes token shape-ids on-update-shape] :as _props}]
(ptk/reify ::apply-token
ptk/WatchEvent
(watch [_ _ _]
(->> (rx/from (sd/resolve-workspace-tokens+))
(rx/mapcat
(fn [sd-tokens]
(let [resolved-value (-> (get sd-tokens (:id token))
(resolve-token-value))
tokenized-attributes (->> (map (fn [attr] {attr (:id token)}) attributes)
(into {}))]
(rx/of
(dch/update-shapes shape-ids (fn [shape] (update shape :applied-tokens merge tokenized-attributes)))
(when on-update-shape
(on-update-shape resolved-value shape-ids attributes))))))))))
(def remove-keys #(apply dissoc %1 %2))
(defn unapply-token
"Removes `attributes` that match `token` for `shape-ids`.
Doesn't update shape attributes."
(defn on-add-token [{:keys [token-type-props token shape-ids] :as _props}] [{:keys [attributes shape-ids] :as _props}]
(ptk/reify ::on-add-token (ptk/reify ::unapply-token
ptk/WatchEvent ptk/WatchEvent
(watch [_ _ _] (watch [_ _ _]
(rx/of (rx/of
(p/resolved 1) (dch/update-shapes
(dch/update-shapes shape-ids (fn [shape] (assoc shape :applied-tokens {:rx (:id token)}))))))) shape-ids
(fn [shape]
(update shape :applied-tokens remove-keys attributes)))))))
(defn on-toggle-token (defn on-toggle-token
[{:keys [token-type-props token shapes] :as props}] [{:keys [token-type-props token shapes] :as _props}]
(ptk/reify ::on-toggle-token (ptk/reify ::on-toggle-token
ptk/WatchEvent ptk/WatchEvent
(watch [it state _] (watch [_ _ _]
(let [remove-tokens? (wtt/shapes-token-applied? token shapes (:attributes token-type-props)) (let [{:keys [attributes on-update-shape]} token-type-props
remove-tokens? (wtt/shapes-token-applied? token shapes (:attributes token-type-props))
shape-ids (map :id shapes)] shape-ids (map :id shapes)]
(if remove-tokens? (if remove-tokens?
(rx/of (dch/update-shapes shape-ids (fn [shape] (assoc shape :applied-tokens {})))) (rx/of
(rx/of (on-add-token (assoc props :shape-ids shape-ids)))))))) (unapply-token {:attributes attributes
:shape-ids shape-ids}))
(rx/of
(apply-token {:attributes attributes
:token token
:shape-ids shape-ids
:on-update-shape on-update-shape})))))))
(defn on-apply-token [{:keys [token token-type-props selected-shapes] :as _props}] (defn on-apply-token [{:keys [token token-type-props selected-shapes] :as _props}]
(let [{:keys [attributes on-apply on-update-shape] (let [{:keys [attributes on-apply on-update-shape]