From a439fb65ce044b9d933b8d01428e5fee24ffa936 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 30 Nov 2022 11:49:08 +0100
Subject: [PATCH] :bug: Fix multiple selection in layout container and items
---
.../ui/workspace/sidebar/options/menus/layout_item.cljs | 7 +++----
.../main/ui/workspace/sidebar/options/shapes/multiple.cljs | 3 ++-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
index 48474df03..82d3ae506 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
@@ -38,10 +38,9 @@
margins (if (nil? (:layout-item-margin values))
{:m1 0 :m2 0 :m3 0 :m4 0}
(:layout-item-margin values))
- rx (if (and (not (= :multiple (:layout-item-margin-type values)))
- (apply = (vals margins)))
- (:m1 margins)
- "--")]
+ rx (if (or (= :multiple margins) (not (apply = (vals margins))))
+ "--"
+ (:m1 margins))]
[:div.margin-row
[:div.margin-icons
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
index fd7281e32..fe9365274 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
@@ -288,6 +288,7 @@
stroke-ids stroke-values
text-ids text-values
exports-ids exports-values
+ layout-container-ids layout-container-values
layout-item-ids layout-item-values]
(mf/use-memo
(mf/deps objects-no-measures)
@@ -311,7 +312,7 @@
(when-not (empty? measure-ids)
[:& 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?
[:& layout-item-menu