github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-06 12:58:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix multiple shape selection

Browse Source
This commit is contained in:
Elena Torro 2026-04-30 16:00:34 +02:00
parent 27d854ed5b
commit dca02f20da
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_item.cljs
View File

@ -515,30 +515,46 @@
:id "align-self-end"}]]) :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 (def ^:private schema:layout-item-props-schema
[:map [:map
[:layout-item-margin [:layout-item-margin
{:optional true} {:optional true}
[:map [:maybe
[:m1 {:optional true} [:or :float :int]] [:or
[:m2 {:optional true} [:or :float :int]] [:= :multiple]
[:m3 {:optional true} [:or :float :int]] [:map
[:m4 {:optional true} [:or :float :int]]]] [: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-h-sizing {:optional true} [:maybe :keyword]]
[:layout-item-v-sizing {:optional true} :keyword] [:layout-item-v-sizing {:optional true} [:maybe :keyword]]
[:layout-item-min-w {:optional true} [:or :float :int]] [:layout-item-min-w {:optional true} schema:numeric-or-multiple]
[:layout-item-max-w {:optional true} [:or :float :int]] [:layout-item-max-w {:optional true} schema:numeric-or-multiple]
[:layout-item-min-h {:optional true} [:or :float :int]] [:layout-item-min-h {:optional true} schema:numeric-or-multiple]
[:layout-item-max-h {:optional true} [:or :float :int]]]) [:layout-item-max-h {:optional true} schema:numeric-or-multiple]])
(def ^:private schema:layout-size-constraints (def ^:private schema:layout-size-constraints
[:map [:map
[:values schema:layout-item-props-schema] [: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]]]) [:ids [::sm/vec ::sm/uuid]]])
(mf/defc layout-size-constraints* (mf/defc layout-size-constraints*