From 334d1fd9b3f8aa66ced59773e5836aeb5b844812 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 31 Jan 2024 17:55:53 +0100 Subject: [PATCH] :bug: Change order of contraints options panel --- .../main/ui/workspace/sidebar/options/shapes/bool.cljs | 8 ++++---- .../ui/workspace/sidebar/options/shapes/circle.cljs | 8 ++++---- .../ui/workspace/sidebar/options/shapes/frame.cljs | 7 +++---- .../ui/workspace/sidebar/options/shapes/group.cljs | 6 +++--- .../ui/workspace/sidebar/options/shapes/image.cljs | 8 ++++---- .../ui/workspace/sidebar/options/shapes/multiple.cljs | 6 +++--- .../main/ui/workspace/sidebar/options/shapes/path.cljs | 8 ++++---- .../main/ui/workspace/sidebar/options/shapes/rect.cljs | 8 ++++---- .../ui/workspace/sidebar/options/shapes/svg_raw.cljs | 8 ++++---- .../main/ui/workspace/sidebar/options/shapes/text.cljs | 10 +++++----- 10 files changed, 38 insertions(+), 39 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs index 4b5e52846..4cf2ef29f 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs @@ -56,10 +56,6 @@ :values measure-values :shape shape}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -81,6 +77,10 @@ :is-grid-parent? is-grid-parent? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids ids + :values constraint-values}]) + [:& fill-menu {:ids ids :type type :values (select-keys shape fill-attrs)}] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs index d37d6a4de..6bc6394b4 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs @@ -58,10 +58,6 @@ :values measure-values :shape shape}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -83,6 +79,10 @@ :is-grid-parent? is-grid-parent? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids ids + :values constraint-values}]) + [:& fill-menu {:ids ids :type type :values (select-keys shape fill-attrs)}] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs index e792751a2..1332faede 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs @@ -65,10 +65,6 @@ [:& component-menu {:shapes [shape]}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -91,6 +87,9 @@ :is-layout-container? is-layout-container? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids ids + :values constraint-values}]) [:& fill-menu {:ids ids :type type diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs index 558e86b41..a892a87e0 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs @@ -72,9 +72,6 @@ [:& measures-menu {:type type :ids measure-ids :values measure-values :shape shape}] [:& component-menu {:shapes [shape]}] ;;remove this in components-v2 - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids constraint-ids :values constraint-values}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -96,6 +93,9 @@ :is-grid-parent? is-grid-parent? :values layout-item-values}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids constraint-ids :values constraint-values}]) + (when-not (empty? fill-ids) [:& fill-menu {:type type :ids fill-ids :values fill-values}]) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/image.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/image.cljs index 6ae27dc02..a05e46575 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/image.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/image.cljs @@ -58,10 +58,6 @@ :values measure-values :shape shape}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -83,6 +79,10 @@ :is-grid-parent? is-grid-parent? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids ids + :values constraint-values}]) + [:& fill-menu {:ids ids :type type :values fill-values}] 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 f669bc4d9..af81ea652 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 @@ -364,9 +364,6 @@ (when-not (empty? components) [:& component-menu {:shapes components}]) - (when-not (or (empty? constraint-ids) ^boolean is-layout-child?) - [:& constraints-menu {:ids constraint-ids :values constraint-values}]) - [:& layout-container-menu {:type type :ids layout-container-ids @@ -383,6 +380,9 @@ :is-grid-parent? is-grid-parent? :values layout-item-values}]) + (when-not (or (empty? constraint-ids) ^boolean is-layout-child?) + [:& constraints-menu {:ids constraint-ids :values constraint-values}]) + (when-not (empty? text-ids) [:& ot/text-menu {:type type :ids text-ids :values text-values}]) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs index b803916be..db0aba009 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs @@ -57,10 +57,6 @@ :values measure-values :shape shape}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -82,6 +78,10 @@ :is-grid-parent? is-grid-parent? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids ids + :values constraint-values}]) + [:& fill-menu {:ids ids :type type :values (select-keys shape fill-attrs)}] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs index aed851d0f..b7406ddca 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs @@ -60,10 +60,6 @@ :values measure-values :shape shape}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) - [:& layout-container-menu {:type type :ids ids @@ -85,6 +81,10 @@ :is-grid-parent? is-grid-parent? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids ids + :values constraint-values}]) + [:& fill-menu {:ids ids :type type :values fill-values}] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs index 87a2620e2..bf13cf76c 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs @@ -129,10 +129,6 @@ :values measure-values :shape shape}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu {:ids ids - :values constraint-values}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -154,6 +150,10 @@ :is-grid-parent? is-grid-parent? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu {:ids ids + :values constraint-values}]) + [:& fill-menu {:ids ids :type type :values fill-values}] diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs index 955db7652..a3b9f3c4e 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs @@ -93,11 +93,6 @@ :values (select-keys shape measure-attrs) :shape shape}] - (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) - [:& constraints-menu - {:ids ids - :values (select-keys shape constraint-attrs)}]) - [:& layout-container-menu {:type type :ids [(:id shape)] @@ -119,6 +114,11 @@ :is-grid-parent? is-grid-parent? :shape shape}]) + (when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?) + [:& constraints-menu + {:ids ids + :values (select-keys shape constraint-attrs)}]) + [:& text-menu {:ids ids :type type