Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-16 03:58:20 -05:00
Code Issues Activity

🐛 Fix propagation of auto/fix sizing on components

Browse source
This commit is contained in:
alonso.torres 2024-03-11 16:01:53 +01:00
parent 338b6cdbd6
commit 112e71a259
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
frontend/src/app/main/data/workspace/libraries_helpers.cljs
View file

@ -1521,11 +1521,26 @@
(defn- update-flex-child-copy-attrs (defn- update-flex-child-copy-attrs
"Synchronizes the attributes inside the flex-child items (main->copy)" "Synchronizes the attributes inside the flex-child items (main->copy)"
[changes _shape-main shape-copy main-container main-component copy-container omit-touched?] [changes shape-main shape-copy main-container main-component copy-container omit-touched?]
(let [new-changes (let [new-changes
(-> (pcb/empty-changes) (-> (pcb/empty-changes)
(pcb/with-container copy-container) (pcb/with-container copy-container)
(pcb/with-objects (:objects copy-container)) (pcb/with-objects (:objects copy-container))
;; The layout-item-sizing needs to be update when the parent is auto or fix
(pcb/update-shapes
[(:id shape-copy)]
(fn [shape-copy]
(cond-> shape-copy
(contains? #{:auto :fix} (:layout-item-h-sizing shape-main))
(propagate-attrs shape-main #{:layout-item-h-sizing} omit-touched?)
(contains? #{:auto :fix} (:layout-item-h-sizing shape-main))
(propagate-attrs shape-main #{:layout-item-v-sizing} omit-touched?)))
{:ignore-touched true})
;; Update the child flex properties from the parent
(pcb/update-shapes (pcb/update-shapes
(:shapes shape-copy) (:shapes shape-copy)
(fn [child-copy] (fn [child-copy]
@ -1542,6 +1557,20 @@
(-> (pcb/empty-changes) (-> (pcb/empty-changes)
(pcb/with-page main-container) (pcb/with-page main-container)
(pcb/with-objects (:objects main-container)) (pcb/with-objects (:objects main-container))
;; The layout-item-sizing needs to be update when the parent is auto or fix
(pcb/update-shapes
[(:id shape-main)]
(fn [shape-main]
(cond-> shape-main
(contains? #{:auto :fix} (:layout-item-h-sizing shape-copy))
(propagate-attrs shape-copy #{:layout-item-h-sizing} omit-touched?)
(contains? #{:auto :fix} (:layout-item-h-sizing shape-copy))
(propagate-attrs shape-copy #{:layout-item-v-sizing} omit-touched?)))
{:ignore-touched true})
;; Updates the children properties from the parent
(pcb/update-shapes (pcb/update-shapes
(:shapes shape-main) (:shapes shape-main)
(fn [child-main] (fn [child-main]
@ -1620,4 +1649,3 @@
(if (cfh/page? container) (if (cfh/page? container)
(assoc change :page-id (:id container)) (assoc change :page-id (:id container))
(assoc change :component-id (:id container)))) (assoc change :component-id (:id container))))