github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-06-09 08:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into staging

Browse Source
This commit is contained in:
Andrey Antukh 2026-06-04 19:01:25 +02:00
commit 6d77ca3fc1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/main/features.cljs
View File

@ -63,7 +63,7 @@
;; Ensure it's always enabled whenever render-wasm/v1 is active.
(if (contains? features "render-wasm/v1")
(conj features "text-editor/v2")
(disj features "text-editor/v2"))))
(disj features "text-editor/v2" "text-editor-wasm/v1"))))
(defn get-enabled-features
"An explicit lookup of enabled features for the current team"

3
frontend/src/app/util/text/content.cljs
View File

@ -14,7 +14,8 @@
(defn dom->cljs
"Gets the editor content from a DOM structure"
[root]
(fd/create-root root))
(when (some? root)
(fd/create-root root)))
(defn cljs->dom
"Sets the editor content from a CLJS structure"