3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-11 16:01:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problem with rotated shapes and auto-width/auto-height

Browse source
This commit is contained in:
alonso.torres 2022-05-09 17:30:56 +02:00
parent 40a38cbd38
commit 94d3f66ef1
1 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/app/main/ui/workspace/shapes/text/viewport_texts.cljs
View file

@ -25,6 +25,9 @@
[app.util.timers :as ts] [app.util.timers :as ts]
[rumext.alpha :as mf])) [rumext.alpha :as mf]))
(defn strip-position-data [shape]
(dissoc shape :position-data :transform :transform-inverse))
(defn- update-with-editor-state (defn- update-with-editor-state
"Updates the shape with the current state in the editor" "Updates the shape with the current state in the editor"
[shape editor-state] [shape editor-state]
@ -78,26 +81,13 @@
[props] [props]
(let [shape (obj/get props "shape") (let [shape (obj/get props "shape")
on-update (obj/get props "on-update") on-update (obj/get props "on-update")
watch-edits (obj/get props "watch-edits")
handle-update handle-update
(mf/use-callback (mf/use-callback
(mf/deps shape on-update) (mf/deps shape on-update)
(fn [node] (fn [node]
(when (some? node) (when (some? node)
(on-update shape node)))) (on-update shape node))))]
text-modifier-ref
(mf/use-memo
(mf/deps (:id shape))
#(refs/workspace-text-modifier-by-id (:id shape)))
text-modifier
(when watch-edits (mf/deref text-modifier-ref))
shape (cond-> shape
(some? text-modifier)
(dwt/apply-text-modifier text-modifier))]
[:& fo/text-shape {:key (str "shape-" (:id shape)) [:& fo/text-shape {:key (str "shape-" (:id shape))
:ref handle-update :ref handle-update
@ -134,11 +124,6 @@
:on-update handle-update-shape :on-update handle-update-shape
:key (str (dm/str "text-container-" id))}])])) :key (str (dm/str "text-container-" id))}])]))
(defn strip-position-data [[id shape]]
(let [shape (dissoc shape :position-data :transform :transform-inverse)]
[id shape]))
(mf/defc viewport-text-editing (mf/defc viewport-text-editing
{::mf/wrap-props false} {::mf/wrap-props false}
[props] [props]
@ -162,7 +147,6 @@
#(st/emit! (dwt/remove-text-modifier (:id shape))))) #(st/emit! (dwt/remove-text-modifier (:id shape)))))
[:& text-container {:shape shape [:& text-container {:shape shape
:watch-edits true
:on-update handle-update-shape}])) :on-update handle-update-shape}]))
(defn check-props (defn check-props
@ -178,7 +162,8 @@
edition (obj/get props "edition") edition (obj/get props "edition")
xf-texts (comp (filter (comp cph/text-shape? second)) xf-texts (comp (filter (comp cph/text-shape? second))
(map strip-position-data)) (map (fn [[id shape]]
[id (strip-position-data shape)])))
text-shapes text-shapes
(mf/use-memo (mf/use-memo
@ -198,4 +183,4 @@
[:* [:*
(when editing-shape (when editing-shape
[:& viewport-text-editing {:shape editing-shape}]) [:& viewport-text-editing {:shape editing-shape}])
[:& viewport-texts-wrapper {:text-shapes text-shapes}]])) [:& viewport-texts-wrapper {:text-shapes (dissoc text-shapes edition)}]]))