github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-02 14:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Update frontend rendering and UI for :path-data

Browse Source 
Update the WASM render bridge and UI shape components to read :path-data
instead of :content for path and bool shapes. The render_wasm/shape.cljs
case dispatch now handles :path-data separately from :content (which
remains for text and svg-raw shapes).

Affected namespaces:
- app.render-wasm.{shape,api}
- app.main.ui.shapes.{path,bool}
- app.main.ui.workspace.shapes.{path,bool}
- app.main.ui.workspace.shapes.path.editor

Signed-off-by: Andrey Antukh <niwi@niwi.nz>
This commit is contained in:
Andrey Antukh 2026-03-30 10:53:26 +00:00
parent dc11d19909
commit 4df3f085d8
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/main/ui/shapes/bool.cljs
View File

@ -25,7 +25,7 @@
metadata? (mf/use-ctx use/include-metadata-ctx)
content (mf/with-memo [shape child-objs]
(let [content (:content shape)]
(let [content (:path-data shape)]
(cond
(some? content)
content
@ -34,7 +34,7 @@
(path/calc-bool-content shape child-objs))))
shape (mf/with-memo [shape content]
(assoc shape :content content))]
(assoc shape :path-data content))]
[:*
(when (some? content)

2
frontend/src/app/main/ui/shapes/path.cljs
View File

@ -27,7 +27,7 @@
(mf/defc path-shape
{::mf/props :obj}
[{:keys [shape]}]
(let [content (get shape :content)
(let [content (get shape :path-data)
pdata (mf/with-memo [content]
(try
(content->string content)

2
frontend/src/app/main/ui/workspace/shapes/bool.cljs
View File

@ -35,7 +35,7 @@
shape (cond-> shape
^boolean child-sel?
(dissoc :content))]
(dissoc :path-data))]
[:> shape-container {:shape shape}
[:& bool-shape {:shape shape

2
frontend/src/app/main/ui/workspace/shapes/path.cljs
View File

@ -23,7 +23,7 @@
(defn- apply-content-modifiers
[shape content-modifiers]
(let [shape (update shape :content types.path/apply-content-modifiers content-modifiers)]
(let [shape (update shape :path-data types.path/apply-content-modifiers content-modifiers)]
(types.path/update-geometry shape)))
(mf/defc path-wrapper

2
frontend/src/app/main/ui/workspace/shapes/path/editor.cljs
View File

@ -283,7 +283,7 @@
(or selected-points #{})
base-content
(get shape :content)
(get shape :path-data)
base-points
(mf/with-memo [base-content]

5
frontend/src/app/render_wasm/api.cljs
View File

@ -1028,6 +1028,7 @@
(if (= type :text)
(ensure-text-content content)
content))
path-data (get shape :path-data)
bool-type (get shape :bool-type)
grow-type (get shape :grow-type)
blur (get shape :blur)
@ -1043,10 +1044,10 @@
(set-masked (boolean masked)))
(when (= type :bool)
(set-shape-bool-type bool-type))
(when (and (some? content)
(when (and (some? path-data)
(or (= type :path)
(= type :bool)))
(set-shape-path-content content))
(set-shape-path-content path-data))
(when (some? svg-attrs)
(set-shape-svg-attrs svg-attrs))
(when (and (some? content) (= type :svg-raw))

11
frontend/src/app/render_wasm/shape.cljs
View File

@ -144,7 +144,7 @@
(do
(api/set-shape-type v)
(when (or (= v :path) (= v :bool))
(api/set-shape-path-content (:content shape))))
(api/set-shape-path-content (:path-data shape))))
:bool-type
(api/set-shape-bool-type v)
@ -236,12 +236,13 @@
(when (cfh/group-shape? shape)
(api/set-masked (boolean (:masked-group shape))))
:path-data
(when (or (cfh/path-shape? shape)
(cfh/bool-shape? shape))
(api/set-shape-path-content v))
:content
(cond
(or (cfh/path-shape? shape)
(cfh/bool-shape? shape))
(api/set-shape-path-content v)
(cfh/svg-raw-shape? shape)
(api/set-shape-svg-raw-content (api/get-static-markup shape))