Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-24 23:49:45 -05:00
Code Issues Activity

🐛 Fix text alignment undefined after paste text

Browse source
This commit is contained in:
Alejandro Alonso 2022-08-19 07:23:44 +02:00 • committed by Andrés Moya
parent a5975864fb
commit 7325322ebf
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frontend/src/app/main/ui/workspace/shapes/text/editor.cljs
View file

@ -152,12 +152,9 @@
(fn [state]
(let [old-state (mf/ref-val prev-value)]
(if (and (some? state) (some? old-state))
(let [block-changes (ted/get-content-changes old-state state)
prev-data (-> (ted/get-editor-current-inline-styles old-state)
(dissoc :text-align :text-direction))
block-to-setup (get-blocks-to-setup block-changes)
(let [block-changes (ted/get-content-changes old-state state)
prev-data (ted/get-editor-current-inline-styles old-state)
block-to-setup (get-blocks-to-setup block-changes)
block-to-add-styles (get-blocks-to-add-styles block-changes)]
(-> state
(ted/setup-block-styles block-to-setup prev-data)
@ -211,11 +208,12 @@
handle-pasted-text
(fn [text _ _]
(let [style (ted/get-editor-current-inline-styles state)
state (-> (ted/insert-text state text style)
(handle-change))]
(let [current-block-styles (ted/get-editor-current-block-data state)
inline-styles (ted/get-editor-current-inline-styles state)
style (merge current-block-styles inline-styles)
state (-> (ted/insert-text state text style)
(handle-change))]
(st/emit! (dwt/update-editor-state shape state)))
"handled")]
(mf/use-layout-effect on-mount)

9
frontend/src/app/util/text_editor.cljs
View file

@ -72,10 +72,10 @@
(defn get-editor-current-inline-styles
[state]
(if (impl/isCurrentEmpty state)
(let [block (impl/getCurrentBlock state)]
(get-editor-block-data block))
(get-editor-current-block-data state)
(-> (.getCurrentInlineStyle ^js state)
(txt/styles-to-attrs))))
(txt/styles-to-attrs)
(dissoc :text-align :text-direction))))
(defn update-editor-current-block-data
[state attrs]
@ -89,7 +89,8 @@
(impl/updateBlockData state block-key (clj->js attrs))
(let [attrs (-> (impl/getInlineStyle state block-key 0)
(txt/styles-to-attrs))]
(txt/styles-to-attrs)
(dissoc :text-align :text-direction))]
(impl/updateBlockData state block-key (clj->js attrs)))))
state (impl/applyInlineStyle state (txt/attrs-to-styles attrs))