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

🐛 Fix multiple selection in layout container and items

Browse source
This commit is contained in:
alonso.torres 2022-11-30 11:49:08 +01:00
parent c98635bca1
commit a439fb65ce
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
View file

@ -38,10 +38,9 @@
margins (if (nil? (:layout-item-margin values)) margins (if (nil? (:layout-item-margin values))
{:m1 0 :m2 0 :m3 0 :m4 0} {:m1 0 :m2 0 :m3 0 :m4 0}
(:layout-item-margin values)) (:layout-item-margin values))
rx (if (and (not (= :multiple (:layout-item-margin-type values))) rx (if (or (= :multiple margins) (not (apply = (vals margins))))
(apply = (vals margins))) "--"
(:m1 margins) (:m1 margins))]
"--")]
[:div.margin-row [:div.margin-row
[:div.margin-icons [:div.margin-icons

3
frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
View file

@ -288,6 +288,7 @@
stroke-ids stroke-values stroke-ids stroke-values
text-ids text-values text-ids text-values
exports-ids exports-values exports-ids exports-values
layout-container-ids layout-container-values
layout-item-ids layout-item-values] layout-item-ids layout-item-values]
(mf/use-memo (mf/use-memo
(mf/deps objects-no-measures) (mf/deps objects-no-measures)
@ -311,7 +312,7 @@
(when-not (empty? measure-ids) (when-not (empty? measure-ids)
[:& measures-menu {:type type :all-types all-types :ids measure-ids :values measure-values :shape shapes}]) [:& measures-menu {:type type :all-types all-types :ids measure-ids :values measure-values :shape shapes}])
[:& layout-container-menu {:type type :ids [] :values []}] [:& layout-container-menu {:type type :ids layout-container-ids :values layout-container-values}]
(when is-layout-child? (when is-layout-child?
[:& layout-item-menu [:& layout-item-menu