From dca02f20daa34b3aa3d63058de06b9a2a03b8d26 Mon Sep 17 00:00:00 2001
From: Elena Torro <elenatorro@gmail.com>
Date: Thu, 30 Apr 2026 16:00:34 +0200
Subject: [PATCH] :bug: Fix multiple shape selection

---
 .../sidebar/options/menus/layout_item.cljs    | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 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 d239dbd1e3..b300f85d5d 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
@@ -515,30 +515,46 @@
                      :id    "align-self-end"}]])
 
 
+;; In multi-select, `app.common.attrs/get-attrs-multi` aggregates each
+;; attribute across the selected shapes:
+;;   - identical across all shapes  → the shared value
+;;   - differs across shapes        → the `:multiple` keyword sentinel
+;;   - unset on every shape         → `nil`
+;; Numeric inputs render `--` for non-numeric values, so the schema
+;; just needs to accept all three shapes of the merged value.
+(def ^:private schema:numeric-or-multiple
+  [:maybe [:or :float :int [:= :multiple]]])
+
+(def ^:private schema:string-or-multiple
+  [:maybe [:or :string [:= :multiple]]])
+
 (def ^:private schema:layout-item-props-schema
   [:map
    [:layout-item-margin
     {:optional true}
-    [:map
-     [:m1 {:optional true} [:or :float :int]]
-     [:m2 {:optional true} [:or :float :int]]
-     [:m3 {:optional true} [:or :float :int]]
-     [:m4 {:optional true} [:or :float :int]]]]
+    [:maybe
+     [:or
+      [:= :multiple]
+      [:map
+       [:m1 {:optional true} schema:numeric-or-multiple]
+       [:m2 {:optional true} schema:numeric-or-multiple]
+       [:m3 {:optional true} schema:numeric-or-multiple]
+       [:m4 {:optional true} schema:numeric-or-multiple]]]]]
 
-   [:layout-item-margin-type {:optional true} :keyword]
+   [:layout-item-margin-type {:optional true} [:maybe :keyword]]
 
-   [:layout-item-h-sizing {:optional true} :keyword]
-   [:layout-item-v-sizing {:optional true} :keyword]
+   [:layout-item-h-sizing {:optional true} [:maybe :keyword]]
+   [:layout-item-v-sizing {:optional true} [:maybe :keyword]]
 
-   [:layout-item-min-w {:optional true} [:or :float :int]]
-   [:layout-item-max-w {:optional true} [:or :float :int]]
-   [:layout-item-min-h {:optional true} [:or :float :int]]
-   [:layout-item-max-h {:optional true} [:or :float :int]]])
+   [:layout-item-min-w {:optional true} schema:numeric-or-multiple]
+   [:layout-item-max-w {:optional true} schema:numeric-or-multiple]
+   [:layout-item-min-h {:optional true} schema:numeric-or-multiple]
+   [:layout-item-max-h {:optional true} schema:numeric-or-multiple]])
 
 (def ^:private schema:layout-size-constraints
   [:map
    [:values schema:layout-item-props-schema]
-   [:applied-tokens [:maybe [:map-of :keyword :string]]]
+   [:applied-tokens [:maybe [:map-of :keyword schema:string-or-multiple]]]
    [:ids [::sm/vec ::sm/uuid]]])
 
 (mf/defc layout-size-constraints*