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

🐛 Fix problem with text not growing the hug container

Browse source
This commit is contained in:
alonso.torres 2022-12-07 07:52:58 +01:00
parent 7dbe39b1b5
commit 4b55c7a8e0
3 changed files with 129 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
(:require
[app.common.attrs :as attrs]
[app.common.data :as d]
[app.common.data.macros :as dm]
[app.common.geom.point :as gpt]
[app.common.geom.shapes :as gsh]
[app.common.math :as mth]
@ -380,23 +381,36 @@
new-shape))
(defn update-text-modifier-state
[id props]
(ptk/reify ::update-text-modifier-state
ptk/UpdateEvent
(update [_ state]
(update-in state [:workspace-text-modifier id] (fnil merge {}) props))))
(defn update-text-modifier
[id props]
(ptk/reify ::update-text-modifier
ptk/UpdateEvent
(update [_ state]
(update-in state [:workspace-text-modifier id] (fnil merge {}) props))
ptk/WatchEvent
(watch [_ state _]
(let [shape (wsh/lookup-shape state id)]
(when (or (and (some? (:width props))
(not (mth/close? (:width props) (:width shape))))
(and (some? (:height props))
(not (mth/close? (:height props) (:height shape)))))
(let [shape (wsh/lookup-shape state id)
(let [modif-tree (dwm/create-modif-tree [id] (ctm/reflow-modifiers))]
(rx/of (dwm/set-modifiers modif-tree))))))))
text-modifier (dm/get-in state [:workspace-text-modifier id])
current-width (or (:width text-modifier) (:width shape))
current-height (or (:height text-modifier) (:height shape))]
(rx/concat
(rx/of (update-text-modifier-state id props))
(if (or (and (some? (:width props))
(not (mth/close? (:width props) current-width)))
(and (some? (:height props))
(not (mth/close? (:height props) current-height))))
(let [modif-tree (dwm/create-modif-tree [id] (ctm/reflow-modifiers))]
(->> (rx/of (dwm/set-modifiers modif-tree))
(rx/observe-on :async)))
(rx/empty)))))))
(defn clean-text-modifier
[id]