3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-31 03:16:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4721 from penpot/alotor-bugfix

Browse source 
🐛 Fix problem moving layout to frame
This commit is contained in:
Belén Albeza 2024-06-11 15:06:08 +02:00 • committed by GitHub
commit c6da42ee35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 492 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
common/src/app/common/types/shape/layout.cljc
View file

@ -604,18 +604,23 @@
(defn remove-layout-item-data
[shape]
(dissoc shape
:layout-item-margin
:layout-item-margin-type
:layout-item-h-sizing
:layout-item-v-sizing
:layout-item-max-h
:layout-item-min-h
:layout-item-max-w
:layout-item-min-w
:layout-item-align-self
:layout-item-absolute
:layout-item-z-index))
(-> shape
(dissoc :layout-item-margin
:layout-item-margin-type
:layout-item-max-h
:layout-item-min-h
:layout-item-max-w
:layout-item-min-w
:layout-item-align-self
:layout-item-absolute
:layout-item-z-index)
(cond-> (or (not (any-layout? shape))
(= :fill (:layout-item-h-sizing shape)))
(dissoc :layout-item-h-sizing)
(or (not (any-layout? shape))
(= :fill (:layout-item-v-sizing shape)))
(dissoc :layout-item-v-sizing))))
(defn update-flex-scale
[shape scale]