Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-22 14:39:45 -05:00
Code Issues Activity

🐛 Fix problem with paste order

Browse source
This commit is contained in:
alonso.torres 2024-04-10 10:27:46 +02:00 • committed by Andrey Antukh
parent 420178e620
commit 0935390761
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -495,9 +495,11 @@
(= layout-align-items :stretch)) (= layout-align-items :stretch))
(defn reverse? (defn reverse?
[{:keys [layout-flex-dir]}] ([objects id]
(or (= :row-reverse layout-flex-dir) (reverse? (get objects id)))
(= :column-reverse layout-flex-dir))) ([{:keys [layout-flex-dir]}]
(or (= :row-reverse layout-flex-dir)
(= :column-reverse layout-flex-dir))))
(defn space-between? (defn space-between?
[{:keys [layout-justify-content]}] [{:keys [layout-justify-content]}]

5
frontend/src/app/main/data/workspace.cljs
View file

@ -2013,6 +2013,7 @@
(d/index-by :prev-id)) (d/index-by :prev-id))
selected (:selected pdata) selected (:selected pdata)
objects (:objects pdata) objects (:objects pdata)
position (deref ms/mouse-position) position (deref ms/mouse-position)
@ -2036,6 +2037,10 @@
index index
0) 0)
selected (if (and (ctl/flex-layout? page-objects parent-id) (not (ctl/reverse? page-objects parent-id)))
(into (d/ordered-set) (reverse selected))
selected)
objects (update-vals objects (partial process-shape file-id frame-id parent-id)) objects (update-vals objects (partial process-shape file-id frame-id parent-id))
all-objects (merge page-objects objects) all-objects (merge page-objects objects)