3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-02 22:28:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2023-05-22 11:01:47 +02:00
commit 68c1d9afaf
6 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/src/app/common/file_builder.cljc
View file

@ -233,7 +233,7 @@
(update :parent-stack conjv (:id obj)))))
(defn close-artboard [file]
(let [parent-id (-> file :parent-id peek)
(let [parent-id (-> file :parent-stack peek)
parent (lookup-shape file parent-id)
current-frame-id (or (:frame-id parent)
(when (nil? (:current-component-id file))

4
common/src/app/common/geom/shapes/flex_layout/lines.cljc
View file

@ -162,7 +162,6 @@
(defn add-lines-positions
[parent layout-bounds layout-lines]
(let [row? (ctl/row? parent)
col? (ctl/col? parent)
auto-width? (ctl/auto-width? parent)
@ -410,6 +409,9 @@
reverse? (ctl/reverse? shape)
children (cond->> children (not reverse?) reverse)
;; Don't take into account absolute children
children (->> children (remove (comp ctl/layout-absolute? second)))
;; Creates the layout lines information
layout-lines
(->> (init-layout-lines shape children layout-bounds)