diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs index c1ffae67e..dba5c2ace 100644 --- a/frontend/src/app/main/data/workspace/texts.cljs +++ b/frontend/src/app/main/data/workspace/texts.cljs @@ -105,6 +105,10 @@ %)))] (attrs/get-attrs-multi nodes attrs))) +(defn current-root-values + [{:keys [attrs shape]}] + (shape-current-values shape txt/is-root-node? attrs)) + (defn current-paragraph-values [{:keys [editor-state attrs shape]}] (if editor-state diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs index 25d77fd2a..0ff2b3d38 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs @@ -67,8 +67,7 @@ (def shape-attrs [:grow-type]) -(def root-attrs - (d/concat text-valign-attrs text-align-attrs)) +(def root-attrs text-valign-attrs) (def paragraph-attrs (d/concat text-align-attrs 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 8b93268b2..1565c6834 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 @@ -42,12 +42,11 @@ (:fill fill-values) (assoc :fill-color (:fill fill-values)) (:opacity fill-values) (assoc :fill-opacity (:fill fill-values))) - text-values (merge - (select-keys shape [:grow-type :vertical-align :text-align]) - #_(dwt/current-root-values - {:editor-state editor-state - :shape shape - :attrs root-attrs}) + text-values (d/merge + (select-keys shape [:grow-type]) + (dwt/current-root-values + {:shape shape + :attrs root-attrs}) (dwt/current-paragraph-values {:editor-state editor-state :shape shape