From 2e461b30706b773e23f45f50828c64e8bc7671dd Mon Sep 17 00:00:00 2001 From: Eva Date: Tue, 11 Jul 2023 08:55:49 +0200 Subject: [PATCH] :bug: Fix text menu order on design tab --- CHANGES.md | 1 + .../ui/workspace/sidebar/options/shapes/multiple.cljs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3e6827101..0cc1e8073 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -59,6 +59,7 @@ - Fix incorrect modified-at on project after import file [Taiga #5268](https://tree.taiga.io/project/penpot/issue/5268) - Fix incorrect message after sending invitation to already member [Taiga 5599](https://tree.taiga.io/project/penpot/issue/5599) - Fix text decoration on button [Taiga #5301](https://tree.taiga.io/project/penpot/issue/5301) +- Fix menu order on design tab [Taiga #5195](https://tree.taiga.io/project/penpot/issue/5195) ### :arrow_up: Deps updates 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 bdef18f32..e93eb9314 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 @@ -309,12 +309,12 @@ [measure-ids measure-values] (get-attrs shapes objects :measure) [layer-ids layer-values + text-ids text-values constraint-ids constraint-values fill-ids fill-values shadow-ids shadow-values blur-ids blur-values stroke-ids stroke-values - text-ids text-values exports-ids exports-values layout-container-ids layout-container-values layout-item-ids layout-item-values] @@ -325,12 +325,12 @@ [] (mapcat identity) [(get-attrs shapes objects-no-measures :layer) + (get-attrs shapes objects-no-measures :text) (get-attrs shapes objects-no-measures :constraint) (get-attrs shapes objects-no-measures :fill) (get-attrs shapes objects-no-measures :shadow) (get-attrs shapes objects-no-measures :blur) (get-attrs shapes objects-no-measures :stroke) - (get-attrs shapes objects-no-measures :text) (get-attrs shapes objects-no-measures :exports) (get-attrs shapes objects-no-measures :layout-container) (get-attrs shapes objects-no-measures :layout-item) @@ -356,6 +356,9 @@ (when-not (empty? layer-ids) [:& layer-menu {:type type :ids layer-ids :values layer-values}]) + (when-not (empty? text-ids) + [:& ot/text-menu {:type type :ids text-ids :values text-values}]) + (when-not (empty? fill-ids) [:& fill-menu {:type type :ids fill-ids :values fill-values}]) @@ -372,8 +375,5 @@ (when-not (empty? blur-ids) [:& blur-menu {:type type :ids blur-ids :values blur-values}]) - (when-not (empty? text-ids) - [:& ot/text-menu {:type type :ids text-ids :values text-values}]) - (when-not (empty? exports-ids) [:& exports-menu {:type type :ids exports-ids :values exports-values :page-id page-id :file-id file-id}])]))