Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-15 19:48:22 -05:00
Code Issues Activity

🐛 Fix incorrect vertical align handling.

Browse source
This commit is contained in:
Andrey Antukh 2021-04-09 09:12:14 +02:00
parent faff32203c
commit 09aa28a943
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/app/main/data/workspace/texts.cljs
View file

@ -105,6 +105,10 @@
%)))] %)))]
(attrs/get-attrs-multi nodes attrs))) (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 (defn current-paragraph-values
[{:keys [editor-state attrs shape]}] [{:keys [editor-state attrs shape]}]
(if editor-state (if editor-state

3
frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs
View file

@ -67,8 +67,7 @@
(def shape-attrs (def shape-attrs
[:grow-type]) [:grow-type])
(def root-attrs (def root-attrs text-valign-attrs)
(d/concat text-valign-attrs text-align-attrs))
(def paragraph-attrs (def paragraph-attrs
(d/concat text-align-attrs (d/concat text-align-attrs

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

@ -42,11 +42,10 @@
(:fill fill-values) (assoc :fill-color (:fill fill-values)) (:fill fill-values) (assoc :fill-color (:fill fill-values))
(:opacity fill-values) (assoc :fill-opacity (:fill fill-values))) (:opacity fill-values) (assoc :fill-opacity (:fill fill-values)))
text-values (merge text-values (d/merge
(select-keys shape [:grow-type :vertical-align :text-align]) (select-keys shape [:grow-type])
#_(dwt/current-root-values (dwt/current-root-values
{:editor-state editor-state {:shape shape
:shape shape
:attrs root-attrs}) :attrs root-attrs})
(dwt/current-paragraph-values (dwt/current-paragraph-values
{:editor-state editor-state {:editor-state editor-state