3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-06 19:51:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Always update all layout-gap on token pill click

Browse source
This commit is contained in:
Florian Schroedl 2024-07-29 17:43:32 +02:00
parent 70904dbc64
commit b423a9c782
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
frontend/src/app/main/ui/workspace/tokens/changes.cljs
View file

@ -123,21 +123,6 @@
(when (seq (:strokes shape)) (when (seq (:strokes shape))
(assoc-in shape [:strokes 0 :stroke-width] value))))) (assoc-in shape [:strokes 0 :stroke-width] value)))))
(defn update-layout-spacing [value shape-ids attributes]
(ptk/reify ::update-layout-spacing
ptk/WatchEvent
(watch [_ state _]
(let [layout-shape-ids (->> (wsh/lookup-shapes state shape-ids)
(eduction
(filter :layout)
(map :id)))]
(rx/of
(if-let [layout-gap (cond
(:row-gap attributes) {:row-gap value}
(:column-gap attributes) {:column-gap value})]
(dwsl/update-layout layout-shape-ids {:layout-gap layout-gap})
(dwsl/update-layout layout-shape-ids {:layout-padding (zipmap attributes (repeat value))})))))))
(defn update-shape-dimensions [value shape-ids attributes] (defn update-shape-dimensions [value shape-ids attributes]
(ptk/reify ::update-shape-dimensions (ptk/reify ::update-shape-dimensions
ptk/WatchEvent ptk/WatchEvent
@ -146,17 +131,30 @@
(when (:width attributes) (dwt/update-dimensions shape-ids :width value)) (when (:width attributes) (dwt/update-dimensions shape-ids :width value))
(when (:height attributes) (dwt/update-dimensions shape-ids :height value)))))) (when (:height attributes) (dwt/update-dimensions shape-ids :height value))))))
(defn- attributes->layout-gap [attributes value]
(let [layout-gap (-> (set/intersection attributes #{:column-gap :row-gap})
(zipmap (repeat value)))]
{:layout-gap layout-gap}))
(defn update-layout-spacing [value shape-ids attributes]
(ptk/reify ::update-layout-spacing
ptk/WatchEvent
(watch [_ state _]
(let [layout-shape-ids (->> (wsh/lookup-shapes state shape-ids)
(eduction
(filter :layout)
(map :id)))
layout-attributes (attributes->layout-gap attributes value)]
(rx/of
(dwsl/update-layout layout-shape-ids layout-attributes))))))
(defn update-layout-spacing-column [value shape-ids] (defn update-layout-spacing-column [value shape-ids]
(ptk/reify ::update-layout-spacing-column (ptk/reify ::update-layout-spacing-column
ptk/WatchEvent ptk/WatchEvent
(watch [_ state _] (watch [_ _ _]
(rx/concat (rx/concat
(for [shape-id shape-ids] (for [shape-id shape-ids]
(let [shape (dt/get-shape-from-state shape-id state) (let [layout-update {:layout-gap {:column-gap value :row-gap value}}]
layout-direction (:layout-flex-dir shape)
layout-update (if (or (= layout-direction :row-reverse) (= layout-direction :row))
{:layout-gap {:column-gap value}}
{:layout-gap {:row-gap value}})]
(dwsl/update-layout [shape-id] layout-update))))))) (dwsl/update-layout [shape-id] layout-update)))))))
(defn update-shape-position [value shape-ids attributes] (defn update-shape-position [value shape-ids attributes]

2
frontend/src/app/main/ui/workspace/tokens/token_types.cljs
View file

@ -61,7 +61,7 @@
[:spacing [:spacing
{:title "Spacing" {:title "Spacing"
:attributes ctt/spacing-keys :attributes ctt/spacing-keys
:on-update-shape wtch/update-layout-spacing-column :on-update-shape wtch/update-layout-spacing
:modal {:key :tokens/spacing :modal {:key :tokens/spacing
:fields [{:label "Spacing" :fields [{:label "Spacing"
:key :spacing}]}}] :key :spacing}]}}]