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

🎉 Render text while typing

Browse source
This commit is contained in:
Elena Torro 2025-04-03 15:44:34 +02:00
parent 5937ed57ce
commit 4ceaedcbe8
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/app/main/fonts.cljs
View file

@ -253,7 +253,6 @@
(defn get-variant (defn get-variant
[{:keys [variants] :as font} font-variant-id] [{:keys [variants] :as font} font-variant-id]
(prn "get-variant" font-variant-id fonts)
(or (d/seek #(= (:id %) font-variant-id) variants) (or (d/seek #(= (:id %) font-variant-id) variants)
(get-default-variant font))) (get-default-variant font)))

20
frontend/src/app/main/ui/workspace/viewport_wasm.cljs
View file

@ -50,6 +50,7 @@
[app.main.ui.workspace.viewport.widgets :as widgets] [app.main.ui.workspace.viewport.widgets :as widgets]
[app.render-wasm.api :as wasm.api] [app.render-wasm.api :as wasm.api]
[app.util.debug :as dbg] [app.util.debug :as dbg]
[app.util.text-editor :as ted]
[beicon.v2.core :as rx] [beicon.v2.core :as rx]
[promesa.core :as p] [promesa.core :as p]
[rumext.v2 :as mf])) [rumext.v2 :as mf]))
@ -101,6 +102,9 @@
drawing (mf/deref refs/workspace-drawing) drawing (mf/deref refs/workspace-drawing)
focus (mf/deref refs/workspace-focus-selected) focus (mf/deref refs/workspace-focus-selected)
workspace-editor-state (mf/deref refs/workspace-editor-state)
workspace-v2-editor-state (mf/deref refs/workspace-v2-editor-state)
objects (get page :objects) objects (get page :objects)
page-id (get page :id) page-id (get page :id)
background (get page :background clr/canvas) background (get page :background clr/canvas)
@ -138,6 +142,7 @@
on-viewport-ref] (create-viewport-ref) on-viewport-ref] (create-viewport-ref)
canvas-ref (mf/use-ref nil) canvas-ref (mf/use-ref nil)
text-editor-ref (mf/use-ref nil)
;; VARS ;; VARS
disable-paste (mf/use-var false) disable-paste (mf/use-var false)
@ -287,6 +292,18 @@
(fn [] (fn []
(wasm.api/clear-canvas)))) (wasm.api/clear-canvas))))
(mf/with-effect [show-text-editor? workspace-editor-state workspace-v2-editor-state edition]
(let [editor-state (get workspace-editor-state edition)
v2-editor-state (get workspace-v2-editor-state edition)
active-editor-state (or v2-editor-state editor-state)]
(when (and show-text-editor? active-editor-state)
(let [content (-> active-editor-state
(ted/get-editor-current-content)
(ted/export-content))]
(wasm.api/set-shape-text-content content)
(wasm.api/clear-drawing-cache)
(wasm.api/request-render "content")))))
(mf/with-effect [vport] (mf/with-effect [vport]
(when @canvas-init? (when @canvas-init?
(wasm.api/resize-viewbox (:width vport) (:height vport)))) (wasm.api/resize-viewbox (:width vport) (:height vport))))
@ -352,7 +369,6 @@
:class (dm/str @cursor (when drawing-tool " drawing") " " (stl/css :viewport-controls)) :class (dm/str @cursor (when drawing-tool " drawing") " " (stl/css :viewport-controls))
:style {:touch-action "none"} :style {:touch-action "none"}
:fill "none" :fill "none"
:on-click on-click :on-click on-click
:on-context-menu on-context-menu :on-context-menu on-context-menu
:on-double-click on-double-click :on-double-click on-double-click
@ -378,8 +394,10 @@
(when show-text-editor? (when show-text-editor?
(if (features/active-feature? @st/state "text-editor/v2") (if (features/active-feature? @st/state "text-editor/v2")
[:& editor-v2/text-editor {:shape editing-shape [:& editor-v2/text-editor {:shape editing-shape
:ref text-editor-ref
:modifiers modifiers}] :modifiers modifiers}]
[:& editor-v1/text-editor-svg {:shape editing-shape [:& editor-v1/text-editor-svg {:shape editing-shape
:ref text-editor-ref
:modifiers modifiers}])) :modifiers modifiers}]))
(when show-frame-outline? (when show-frame-outline?