3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-21 17:37:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Change order of contraints options panel

Browse source
This commit is contained in:
alonso.torres 2024-01-31 17:55:53 +01:00
parent 188f5c6167
commit 334d1fd9b3
10 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/app/main/ui/workspace/sidebar/options/shapes/bool.cljs
View file

@ -56,10 +56,6 @@
:values measure-values :values measure-values
:shape shape}] :shape shape}]
(when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?)
[:& constraints-menu {:ids ids
:values constraint-values}])
[:& layout-container-menu [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -81,6 +77,10 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:shape shape}]) :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 [:& fill-menu {:ids ids
:type type :type type
:values (select-keys shape fill-attrs)}] :values (select-keys shape fill-attrs)}]

8
frontend/src/app/main/ui/workspace/sidebar/options/shapes/circle.cljs
View file

@ -58,10 +58,6 @@
:values measure-values :values measure-values
:shape shape}] :shape shape}]
(when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?)
[:& constraints-menu {:ids ids
:values constraint-values}])
[:& layout-container-menu [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -83,6 +79,10 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:shape shape}]) :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 [:& fill-menu {:ids ids
:type type :type type
:values (select-keys shape fill-attrs)}] :values (select-keys shape fill-attrs)}]

7
frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs
View file

@ -65,10 +65,6 @@
[:& component-menu {:shapes [shape]}] [:& 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 [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -91,6 +87,9 @@
:is-layout-container? is-layout-container? :is-layout-container? is-layout-container?
:shape shape}]) :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 [:& fill-menu {:ids ids
:type type :type type

6
frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs
View file

@ -72,9 +72,6 @@
[:& measures-menu {:type type :ids measure-ids :values measure-values :shape shape}] [:& measures-menu {:type type :ids measure-ids :values measure-values :shape shape}]
[:& component-menu {:shapes [shape]}] ;;remove this in components-v2 [:& 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 [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -96,6 +93,9 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:values layout-item-values}]) :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) (when-not (empty? fill-ids)
[:& fill-menu {:type type :ids fill-ids :values fill-values}]) [:& fill-menu {:type type :ids fill-ids :values fill-values}])

8
frontend/src/app/main/ui/workspace/sidebar/options/shapes/image.cljs
View file

@ -58,10 +58,6 @@
:values measure-values :values measure-values
:shape shape}] :shape shape}]
(when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?)
[:& constraints-menu {:ids ids
:values constraint-values}])
[:& layout-container-menu [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -83,6 +79,10 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:shape shape}]) :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 [:& fill-menu {:ids ids
:type type :type type
:values fill-values}] :values fill-values}]

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

@ -364,9 +364,6 @@
(when-not (empty? components) (when-not (empty? components)
[:& component-menu {:shapes 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 [:& layout-container-menu
{:type type {:type type
:ids layout-container-ids :ids layout-container-ids
@ -383,6 +380,9 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:values layout-item-values}]) :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) (when-not (empty? text-ids)
[:& ot/text-menu {:type type :ids text-ids :values text-values}]) [:& ot/text-menu {:type type :ids text-ids :values text-values}])

8
frontend/src/app/main/ui/workspace/sidebar/options/shapes/path.cljs
View file

@ -57,10 +57,6 @@
:values measure-values :values measure-values
:shape shape}] :shape shape}]
(when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?)
[:& constraints-menu {:ids ids
:values constraint-values}])
[:& layout-container-menu [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -82,6 +78,10 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:shape shape}]) :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 [:& fill-menu {:ids ids
:type type :type type
:values (select-keys shape fill-attrs)}] :values (select-keys shape fill-attrs)}]

8
frontend/src/app/main/ui/workspace/sidebar/options/shapes/rect.cljs
View file

@ -60,10 +60,6 @@
:values measure-values :values measure-values
:shape shape}] :shape shape}]
(when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?)
[:& constraints-menu {:ids ids
:values constraint-values}])
[:& layout-container-menu [:& layout-container-menu
{:type type {:type type
:ids ids :ids ids
@ -85,6 +81,10 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:shape shape}]) :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 [:& fill-menu {:ids ids
:type type :type type
:values fill-values}] :values fill-values}]

8
frontend/src/app/main/ui/workspace/sidebar/options/shapes/svg_raw.cljs
View file

@ -129,10 +129,6 @@
:values measure-values :values measure-values
:shape shape}] :shape shape}]
(when (or (not ^boolean is-layout-child?) ^boolean is-layout-child-absolute?)
[:& constraints-menu {:ids ids
:values constraint-values}])
[:& layout-container-menu [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -154,6 +150,10 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:shape shape}]) :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 [:& fill-menu {:ids ids
:type type :type type
:values fill-values}] :values fill-values}]

10
frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs
View file

@ -93,11 +93,6 @@
:values (select-keys shape measure-attrs) :values (select-keys shape measure-attrs)
:shape shape}] :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 [:& layout-container-menu
{:type type {:type type
:ids [(:id shape)] :ids [(:id shape)]
@ -119,6 +114,11 @@
:is-grid-parent? is-grid-parent? :is-grid-parent? is-grid-parent?
:shape shape}]) :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 [:& text-menu
{:ids ids {:ids ids
:type type :type type