🎉 Refactor caret blinking to reduce CPU usage

🎉 Update skia version
2026-02-24 10:47:49 -05:00 · 2026-02-24 13:48:14 +01:00 · 2026-02-24 09:49:12 +01:00
29 changed files with 437 additions and 539 deletions
--- a/frontend/src/app/main/ui/workspace/viewport/actions.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
@@ -19,6 +19,7 @@
   [app.main.data.workspace.media :as dwm]
   [app.main.data.workspace.path :as dwdp]
   [app.main.data.workspace.specialized-panel :as-alias dwsp]
+   [app.main.data.workspace.texts :as dwt]
   [app.main.features :as features]
   [app.main.refs :as refs]
   [app.main.store :as st]
@@ -49,42 +50,41 @@
   (mf/deps id blocked hidden type selected edition drawing-tool text-editing?
            node-editing? grid-editing? drawing-path? create-comment? @z? @space?
            panning read-only?)
-   (fn [event]
+   (fn [bevent]
     ;; We need to handle editor related stuff here because
     ;; handling on editor dom node does not works properly.
-     (let [target  (dom/get-target event)
+     (let [target  (dom/get-target bevent)
           editor  (txu/closest-text-editor-content target)]
       ;; Capture mouse pointer to detect the movements even if cursor
       ;; leaves the viewport or the browser itself
       ;; https://developer.mozilla.org/en-US/docs/Web/API/Element/setPointerCapture
       (if editor
-         (.setPointerCapture editor (.-pointerId event))
-         (.setPointerCapture target (.-pointerId event))))
+         (.setPointerCapture editor (.-pointerId bevent))
+         (.setPointerCapture target (.-pointerId bevent))))

-     (when (or (dom/class? (dom/get-target event) "viewport-controls")
-               (dom/class? (dom/get-target event) "viewport-selrect")
-               (dom/child? (dom/get-target event) (dom/query ".grid-layout-editor")))
+     (when (or (dom/class? (dom/get-target bevent) "viewport-controls")
+               (dom/class? (dom/get-target bevent) "viewport-selrect")
+               (dom/child? (dom/get-target bevent) (dom/query ".grid-layout-editor")))

-       (dom/stop-propagation event)
+       (dom/stop-propagation bevent)

       (when-not @z?
-         (let [native-event  (dom/event->native-event event)
-               ctrl?  (kbd/ctrl? native-event)
-               meta?  (kbd/meta? native-event)
-               shift? (kbd/shift? native-event)
-               alt?   (kbd/alt? native-event)
-               mod?   (kbd/mod? native-event)
-               off-pt (dom/get-offset-position native-event)
+         (let [event  (dom/event->native-event bevent)
+               ctrl?  (kbd/ctrl? event)
+               meta?  (kbd/meta? event)
+               shift? (kbd/shift? event)
+               alt?   (kbd/alt? event)
+               mod?   (kbd/mod? event)

-               left-click?   (and (not panning) (dom/left-mouse? event))
-               middle-click? (and (not panning) (dom/middle-mouse? event))]
+               left-click?   (and (not panning) (dom/left-mouse? bevent))
+               middle-click? (and (not panning) (dom/middle-mouse? bevent))]

           (cond
             (or middle-click? (and left-click? @space?))
             (do
-               (dom/prevent-default event)
+               (dom/prevent-default bevent)
               (if mod?
-                 (let [raw-pt   (dom/get-client-position native-event)
+                 (let [raw-pt   (dom/get-client-position event)
                       pt       (uwvv/point->viewport raw-pt)]
                   (st/emit! (dw/start-zooming pt)))
                 (st/emit! (dw/start-panning))))
@@ -94,23 +94,18 @@
               (st/emit! (mse/->MouseEvent :down ctrl? shift? alt? meta?)
                         ::dwsp/interrupt)

-               (when (wasm.api/text-editor-is-active?)
-                 (wasm.api/text-editor-pointer-down (.-x off-pt) (.-y off-pt)))
-
               (when (and (not= edition id) (or text-editing? grid-editing?))
                 (st/emit! (dw/clear-edition-mode))
-                 ;; FIXME: I think this is not completely correct because this
-                 ;; is going to happen even when clicking or selecting text.
                 ;; Sync and stop WASM text editor when exiting edit mode
-                 #_(when (and text-editing?
-                              (features/active-feature? @st/state "render-wasm/v1")
-                              wasm.wasm/context-initialized?)
-                     (when-let [{:keys [shape-id content]} (wasm.api/text-editor-sync-content)]
-                       (st/emit! (dwt/v2-update-text-shape-content
-                                  shape-id content
-                                  :update-name? true
-                                  :finalize? true)))
-                     (wasm.api/text-editor-stop)))
+                 (when (and text-editing?
+                            (features/active-feature? @st/state "render-wasm/v1")
+                            wasm.wasm/context-initialized?)
+                   (when-let [{:keys [shape-id content]} (wasm.api/text-editor-sync-content)]
+                     (st/emit! (dwt/v2-update-text-shape-content
+                                shape-id content
+                                :update-name? true
+                                :finalize? true)))
+                   (wasm.api/text-editor-stop)))

               (when (and (not text-editing?)
                          (not blocked)
@@ -192,14 +187,10 @@
             alt? (kbd/alt? event)
             meta? (kbd/meta? event)
             hovering? (some? @hover)
-             native-event (dom/event->native-event event)
-             off-pt (dom/get-offset-position native-event)
             raw-pt (dom/get-client-position event)
             pt     (uwvv/point->viewport raw-pt)]
         (st/emit! (mse/->MouseEvent :click ctrl? shift? alt? meta?))

-         ;; FIXME: Maybe we can transform this into a cond instead
-         ;; of multiple (when)s.
         (when (and hovering?
                    (not @space?)
                    (not edition)
@@ -207,8 +198,6 @@
                    (not drawing-tool))
           (st/emit! (dw/select-shape (:id @hover) shift?)))

-         ;; FIXME: Maybe we can move into a function of the kind
-         ;; "text-editor-on-click"
         ;; If clicking on a text shape and wasm render is enabled, forward cursor position
         (when (and hovering?
                    (not @space?)
@@ -219,7 +208,9 @@
             (when (and (= :text (:type hover-shape))
                        (features/active-feature? @st/state "text-editor-wasm/v1")
                        wasm.wasm/context-initialized?)
-               (wasm.api/text-editor-set-cursor-from-point (.-x off-pt) (.-y off-pt)))))
+               (let [raw-pt (dom/get-client-position event)]
+                 ;; FIXME
+                 (wasm.api/text-editor-set-cursor-from-point (.-x raw-pt) (.-y raw-pt))))))

         (when (and @z?
                    (not @space?)
@@ -270,12 +261,6 @@
                             wasm.wasm/context-initialized?)
                    (wasm.api/text-editor-start id)))

-                (and editable? (= id edition) (not read-only?)
-                     (= type :text)
-                     (features/active-feature? @st/state "text-editor-wasm/v1")
-                     wasm.wasm/context-initialized?)
-                (wasm.api/text-editor-select-all)
-
                (some? selected-shape)
                (do
                  (reset! hover selected-shape)
@@ -325,24 +310,20 @@
       ;; Release pointer on mouse up
       (.releasePointerCapture target (.-pointerId event)))

-     (let [native-event (dom/event->native-event event)
-           off-pt (dom/get-offset-position native-event)
-           ctrl? (kbd/ctrl? native-event)
-           shift? (kbd/shift? native-event)
-           alt? (kbd/alt? native-event)
-           meta? (kbd/meta? native-event)
+     (let [event (dom/event->native-event event)
+           ctrl? (kbd/ctrl? event)
+           shift? (kbd/shift? event)
+           alt? (kbd/alt? event)
+           meta? (kbd/meta? event)

-           left-click? (= 1 (.-which native-event))
-           middle-click? (= 2 (.-which native-event))]
+           left-click? (= 1 (.-which event))
+           middle-click? (= 2 (.-which event))]

       (when left-click?
-         (st/emit! (mse/->MouseEvent :up ctrl? shift? alt? meta?))
-
-         (when (wasm.api/text-editor-is-active?)
-           (wasm.api/text-editor-pointer-up (.-x off-pt) (.-y off-pt))))
+         (st/emit! (mse/->MouseEvent :up ctrl? shift? alt? meta?)))

       (when middle-click?
-         (dom/prevent-default native-event)
+         (dom/prevent-default event)

         ;; We store this so in Firefox the middle button won't do a paste of the content
         (mf/set-ref-val! disable-paste-ref true)
@@ -400,9 +381,7 @@
  (let [last-position (mf/use-var nil)]
    (mf/use-fn
     (fn [event]
-       (let [native-event (unchecked-get event "nativeEvent")
-             off-pt   (dom/get-offset-position native-event)
-             raw-pt   (dom/get-client-position event)
+       (let [raw-pt   (dom/get-client-position event)
             pt       (uwvv/point->viewport raw-pt)

             ;; We calculate the delta because Safari's MouseEvent.movementX/Y drop
@@ -411,12 +390,6 @@
                     (gpt/subtract raw-pt @last-position)
                     (gpt/point 0 0))]

-         ;; IMPORTANT! This function, right now it's called on EVERY pointermove. I think
-         ;; in the future (when we handle the UI in the render) should be better to
-         ;; have a "wasm.api/pointer-move" function that works as an entry point for
-         ;; all the pointer-move events.
-         (wasm.api/text-editor-pointer-move (.-x off-pt) (.-y off-pt))
-
         (rx/push! move-stream pt)
         (reset! last-position raw-pt)
         (st/emit! (mse/->PointerEvent :delta delta
--- a/frontend/src/app/render_wasm/api.cljs
+++ b/frontend/src/app/render_wasm/api.cljs
@@ -87,11 +87,7 @@
 (def text-editor-start text-editor/text-editor-start)
 (def text-editor-stop text-editor/text-editor-stop)
 (def text-editor-set-cursor-from-point text-editor/text-editor-set-cursor-from-point)
-(def text-editor-pointer-down text-editor/text-editor-pointer-down)
-(def text-editor-pointer-move text-editor/text-editor-pointer-move)
-(def text-editor-pointer-up text-editor/text-editor-pointer-up)
 (def text-editor-is-active? text-editor/text-editor-is-active?)
-(def text-editor-select-all text-editor/text-editor-select-all)
 (def text-editor-sync-content text-editor/text-editor-sync-content)

 (def dpr
@@ -267,6 +263,22 @@
  [attrs]
  (text-editor/apply-style-to-selection attrs use-shape set-shape-text-content))

+(defn update-text-rect!
+  [id]
+  (when wasm/context-initialized?
+    (mw/emit!
+     {:cmd :index/update-text-rect
+      :page-id (:current-page-id @st/state)
+      :shape-id id
+      :dimensions (get-text-dimensions id)})))
+
+(defn- ensure-text-content
+  "Guarantee that the shape always sends a valid text tree to WASM. When the
+  content is nil (freshly created text) we fall back to
+  tc/default-text-content so the renderer receives typography information."
+  [content]
+  (or content (tc/v2-default-text-content)))
+
 (defn set-parent-id
  [id]
  (let [buffer (uuid/get-u32 id)]
@@ -984,22 +996,6 @@
          (render-finish)
          (perf/end-measure "set-view-box::zoom")))))

-(defn update-text-rect!
-  [id]
-  (when wasm/context-initialized?
-    (mw/emit!
-     {:cmd :index/update-text-rect
-      :page-id (:current-page-id @st/state)
-      :shape-id id
-      :dimensions (get-text-dimensions id)})))
-
-(defn- ensure-text-content
-  "Guarantee that the shape always sends a valid text tree to WASM. When the
-  content is nil (freshly created text) we fall back to
-  tc/default-text-content so the renderer receives typography information."
-  [content]
-  (or content (tc/v2-default-text-content)))
-
 (defn set-object
  [shape]
  (perf/begin-measure "set-object")
--- a/frontend/src/app/render_wasm/text_editor.cljs
+++ b/frontend/src/app/render_wasm/text_editor.cljs
@@ -27,21 +27,6 @@
  (when wasm/context-initialized?
    (h/call wasm/internal-module "_text_editor_set_cursor_from_point" x y)))

-(defn text-editor-pointer-down
-  [x y]
-  (when wasm/context-initialized?
-    (h/call wasm/internal-module "_text_editor_pointer_down" x y)))
-
-(defn text-editor-pointer-move
-  [x y]
-  (when wasm/context-initialized?
-    (h/call wasm/internal-module "_text_editor_pointer_move" x y)))
-
-(defn text-editor-pointer-up
-  [x y]
-  (when wasm/context-initialized?
-    (h/call wasm/internal-module "_text_editor_pointer_up" x y)))
-
 (defn text-editor-update-blink
  [timestamp-ms]
  (when wasm/context-initialized?
@@ -98,12 +83,9 @@
    (h/call wasm/internal-module "_text_editor_stop")))

 (defn text-editor-is-active?
-  ([id]
-   (when wasm/context-initialized?
-     (not (zero? (h/call wasm/internal-module "_text_editor_is_active_with_id" id)))))
-  ([]
-   (when wasm/context-initialized?
-     (not (zero? (h/call wasm/internal-module "_text_editor_is_active"))))))
+  []
+  (when wasm/context-initialized?
+    (not (zero? (h/call wasm/internal-module "_text_editor_is_active")))))

 (defn text-editor-export-content
  []
--- a/frontend/src/app/render_wasm/text_editor_input.cljs
+++ b/frontend/src/app/render_wasm/text_editor_input.cljs
@@ -19,6 +19,8 @@
   [rumext.v2 :as mf])
  (:import goog.events.EventType))

+(def caret-blink-interval-ms 250)
+
 (defn- sync-wasm-text-editor-content!
  "Sync WASM text editor content back to the shape via the standard
  commit pipeline. Called after every text-modifying input."
@@ -54,18 +56,17 @@
         (.focus node))
       js/undefined))

-    ;; Animation loop for cursor blink
    (mf/use-effect
     (fn []
-       (let [raf-id (atom nil)
-             animate (fn animate []
-                       (when (text-editor/text-editor-is-active?)
-                         (wasm.api/request-render "cursor-blink")
-                         (reset! raf-id (js/requestAnimationFrame animate))))]
-         (animate)
+       (let [timeout-id (atom nil)
+             schedule-blink (fn schedule-blink []
+                             (when (text-editor/text-editor-is-active?)
+                               (wasm.api/request-render "cursor-blink"))
+                             (reset! timeout-id (js/setTimeout schedule-blink caret-blink-interval-ms)))]
+         (schedule-blink)
         (fn []
-           (when @raf-id
-             (js/cancelAnimationFrame @raf-id))))))
+           (when @timeout-id
+             (js/clearTimeout @timeout-id))))))

    ;; Document-level keydown handler for control keys
    (mf/use-effect
--- a/frontend/text-editor/src/editor/content/dom/Color.js
+++ b/frontend/text-editor/src/editor/content/dom/Color.js
@@ -76,4 +76,3 @@ export function getFills(fillStyle) {
  const [color, opacity] = getColor(fillStyle);
  return `[["^ ","~:fill-color","${color}","~:fill-opacity",${opacity}]]`;
 }
-
--- a/frontend/text-editor/src/playground.js
+++ b/frontend/text-editor/src/playground.js
@@ -162,15 +162,12 @@ class TextEditorPlayground {
    }

    this.#module.call("use_shape", ...textShape.id);
-    // FIXME: This function doesn't exists anymore.
-    /*
    const caretPosition = this.#module.call(
      "get_caret_position_at",
      e.offsetX,
      e.offsetY,
    );
    console.log("caretPosition", caretPosition);
-    */
  };

  #onResize = (_entries) => {
--- a/render-wasm/Cargo.lock
+++ b/render-wasm/Cargo.lock
@@ -202,9 +202,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"

 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"

 [[package]]
 name = "heck"
@@ -214,9 +214,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
 "equivalent",
 "hashbrown",
@@ -253,12 +253,6 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"

-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
 [[package]]
 name = "libc"
 version = "0.2.161"
@@ -468,18 +462,27 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"

 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -500,11 +503,11 @@ dependencies = [

 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
 dependencies = [
- "serde",
+ "serde_core",
 ]

 [[package]]
@@ -515,9 +518,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "skia-bindings"
-version = "0.87.0"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704242769235d2ffe66a2a0a3002661262fc4af08d32807c362d7b0160ee703c"
+checksum = "2359f7e30c9da3f322f8ca3d4ec0abbc12a40035ce758309db0cdab07b5d4476"
 dependencies = [
 "bindgen",
 "cc",
@@ -532,13 +535,12 @@ dependencies = [

 [[package]]
 name = "skia-safe"
-version = "0.87.0"
+version = "0.93.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7d94f3e7537c71ad4cf132eb26e3be8c8a886ed3649c4525c089041fc312b2"
+checksum = "7f9e837ea9d531c9efee8f980bfcdb7226b21db0285b0c3171d8be745829f940"
 dependencies = [
 "base64",
 "bitflags",
- "lazy_static",
 "percent-encoding",
 "skia-bindings",
 "skia-svg-macros",
@@ -579,38 +581,43 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "1.0.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "c7614eaf19ad818347db24addfa201729cf2a9b6fdfd9eb0ab870fcacc606c0c"
 dependencies = [
- "serde",
+ "indexmap",
+ "serde_core",
 "serde_spanned",
 "toml_datetime",
- "toml_edit",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
 ]

 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "1.0.0+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e"
 dependencies = [
- "serde",
+ "serde_core",
 ]

 [[package]]
-name = "toml_edit"
-version = "0.22.22"
+name = "toml_parser"
+version = "1.0.9+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
 dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
 "winnow",
 ]

+[[package]]
+name = "toml_writer"
+version = "1.0.6+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
@@ -775,12 +782,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
-dependencies = [
- "memchr",
-]
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"

 [[package]]
 name = "xattr"
--- a/render-wasm/Cargo.toml
+++ b/render-wasm/Cargo.toml
@@ -25,7 +25,7 @@ gl = "0.14.0"
 glam = "0.24.2"
 indexmap = "2.7.1"
 macros = { path = "macros" }
-skia-safe = { version = "0.87.0", default-features = false, features = [
+skia-safe = { version = "0.93.1", default-features = false, features = [
  "gl",
  "svg",
  "textlayout",
--- a/render-wasm/_build_env
+++ b/render-wasm/_build_env
@@ -10,7 +10,7 @@ fi

 export BUILD_NAME="${BUILD_NAME:-render-wasm}"
 export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
-export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}
+export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.93.1/skia-binaries-319323662b1685a112f5-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}

 # 256 MB of initial heap to perform less
 # initial calls to memory grow.
--- a/render-wasm/lint
+++ b/render-wasm/lint
@@ -11,7 +11,7 @@ fi
 . ./_build_env

 export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
-export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}
+export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.93.1/skia-binaries-319323662b1685a112f5-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache-webp.tar.gz"}


 ALLOWED_RULES="-D static_mut_refs"
--- a/render-wasm/pnpm-workspace.yaml
+++ b/render-wasm/pnpm-workspace.yaml
@@ -1,2 +0,0 @@
-onlyBuiltDependencies:
-  - esbuild
--- a/render-wasm/src/math.rs
+++ b/render-wasm/src/math.rs
@@ -356,7 +356,7 @@ impl Bounds {
    }

    pub fn from_rect(r: &Rect) -> Self {
-        let [nw, ne, se, sw] = r.to_quad();
+        let [nw, ne, se, sw] = r.to_quad(None);
        Self::new(nw, ne, se, sw)
    }

--- a/render-wasm/src/math/bools.rs
+++ b/render-wasm/src/math/bools.rs
@@ -477,30 +477,32 @@ pub fn debug_render_bool_paths(
                paint.set_alpha_f(1.0);
                paint.set_style(skia::PaintStyle::Stroke);

-                let mut path = skia::Path::default();
-                path.move_to((b.1.start.x as f32, b.1.start.y as f32));
-
-                match b.1.handles {
-                    BezierHandles::Linear => {
-                        path.line_to((b.1.end.x as f32, b.1.end.y as f32));
+                let path = {
+                    let mut pb = skia::PathBuilder::new();
+                    pb.move_to((b.1.start.x as f32, b.1.start.y as f32));
+                    match b.1.handles {
+                        BezierHandles::Linear => {
+                            pb.line_to((b.1.end.x as f32, b.1.end.y as f32));
+                        }
+                        BezierHandles::Quadratic { handle } => {
+                            pb.quad_to(
+                                (handle.x as f32, handle.y as f32),
+                                (b.1.end.x as f32, b.1.end.y as f32),
+                            );
+                        }
+                        BezierHandles::Cubic {
+                            handle_start,
+                            handle_end,
+                        } => {
+                            pb.cubic_to(
+                                (handle_start.x as f32, handle_start.y as f32),
+                                (handle_end.x as f32, handle_end.y as f32),
+                                (b.1.end.x as f32, b.1.end.y as f32),
+                            );
+                        }
                    }
-                    BezierHandles::Quadratic { handle } => {
-                        path.quad_to(
-                            (handle.x as f32, handle.y as f32),
-                            (b.1.end.x as f32, b.1.end.y as f32),
-                        );
-                    }
-                    BezierHandles::Cubic {
-                        handle_start,
-                        handle_end,
-                    } => {
-                        path.cubic_to(
-                            (handle_start.x as f32, handle_start.y as f32),
-                            (handle_end.x as f32, handle_end.y as f32),
-                            (b.1.end.x as f32, b.1.end.y as f32),
-                        );
-                    }
-                }
+                    pb.detach()
+                };
                canvas.draw_path(&path, &paint);

                let mut v1 = b.1.normal(TValue::Parametric(1.0));
--- a/render-wasm/src/render/fills.rs
+++ b/render-wasm/src/render/fills.rs
@@ -51,15 +51,18 @@ fn draw_image_fill(
            canvas.clip_rect(container, skia::ClipOp::Intersect, antialias);
        }
        Type::Circle => {
-            let mut oval_path = skia::Path::new();
-            oval_path.add_oval(container, None);
+            let oval_path = {
+                let mut pb = skia::PathBuilder::new();
+                pb.add_oval(container, None, None);
+                pb.detach()
+            };
            canvas.clip_path(&oval_path, skia::ClipOp::Intersect, antialias);
        }
        shape_type @ (Type::Path(_) | Type::Bool(_)) => {
            if let Some(path) = shape_type.path() {
                if let Some(path_transform) = path_transform {
                    canvas.clip_path(
-                        path.to_skia_path().transform(&path_transform),
+                        &path.to_skia_path().make_transform(&path_transform),
                        skia::ClipOp::Intersect,
                        antialias,
                    );
--- a/render-wasm/src/render/grid_layout.rs
+++ b/render-wasm/src/render/grid_layout.rs
@@ -24,7 +24,11 @@ pub fn render_overlay(zoom: f32, canvas: &skia::Canvas, shape: &Shape, shapes: S
            cell.anchor + hv + vv,
            cell.anchor + vv,
        ];
-        let polygon = skia::Path::polygon(&points, true, None, None);
+        let polygon = {
+            let mut pb = skia::PathBuilder::new();
+            pb.add_polygon(&points, true);
+            pb.detach()
+        };
        canvas.draw_path(&polygon, &paint);
    }
 }
--- a/render-wasm/src/render/strokes.rs
+++ b/render-wasm/src/render/strokes.rs
@@ -83,8 +83,11 @@ fn draw_stroke_on_circle(
    if let Some(clip_op) = stroke.clip_op() {
        let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
        canvas.save_layer(&layer_rec);
-        let mut clip_path = skia::Path::new();
-        clip_path.add_oval(rect, None);
+        let clip_path = {
+            let mut pb = skia::PathBuilder::new();
+            pb.add_oval(rect, None, None);
+            pb.detach()
+        };
        canvas.clip_path(&clip_path, clip_op, antialias);
        canvas.draw_oval(stroke_rect, &paint);
        canvas.restore();
@@ -153,8 +156,9 @@ fn draw_stroke_on_path(
    blur: Option<&ImageFilter>,
    antialias: bool,
 ) {
-    let mut skia_path = path.to_skia_path();
-    skia_path.transform(path_transform.unwrap_or(&Matrix::default()));
+    let skia_path = path
+        .to_skia_path()
+        .make_transform(path_transform.unwrap_or(&Matrix::default()));

    let is_open = path.is_open();

@@ -174,15 +178,7 @@ fn draw_stroke_on_path(
        }
    }

-    handle_stroke_caps(
-        &mut skia_path,
-        stroke,
-        canvas,
-        is_open,
-        paint,
-        blur,
-        antialias,
-    );
+    handle_stroke_caps(&skia_path, stroke, canvas, is_open, paint, blur, antialias);
 }

 fn handle_stroke_cap(
@@ -224,7 +220,7 @@ fn handle_stroke_cap(

 #[allow(clippy::too_many_arguments)]
 fn handle_stroke_caps(
-    path: &mut skia::Path,
+    path: &skia::Path,
    stroke: &Stroke,
    canvas: &skia::Canvas,
    is_open: bool,
@@ -232,8 +228,7 @@ fn handle_stroke_caps(
    blur: Option<&ImageFilter>,
    _antialias: bool,
 ) {
-    let mut points = vec![Point::default(); path.count_points()];
-    path.get_points(&mut points);
+    let mut points = path.points().to_vec();
    // Curves can have duplicated points, so let's remove consecutive duplicated points
    points.dedup();
    let c_points = points.len();
@@ -304,13 +299,16 @@ fn draw_square_cap(
    let mut transformed_points = points;
    matrix.map_points(&mut transformed_points, &points);

-    let mut path = skia::Path::new();
-    path.move_to(Point::new(center.x, center.y));
-    path.move_to(transformed_points[0]);
-    path.line_to(transformed_points[1]);
-    path.line_to(transformed_points[2]);
-    path.line_to(transformed_points[3]);
-    path.close();
+    let path = {
+        let mut pb = skia::PathBuilder::new();
+        pb.move_to(Point::new(center.x, center.y));
+        pb.move_to(transformed_points[0]);
+        pb.line_to(transformed_points[1]);
+        pb.line_to(transformed_points[2]);
+        pb.line_to(transformed_points[3]);
+        pb.close();
+        pb.detach()
+    };
    canvas.draw_path(&path, paint);
 }

@@ -338,13 +336,15 @@ fn draw_arrow_cap(
    let mut transformed_points = points;
    matrix.map_points(&mut transformed_points, &points);

-    let mut path = skia::Path::new();
-    path.move_to(transformed_points[1]);
-    path.line_to(transformed_points[0]);
-    path.line_to(transformed_points[2]);
-    path.move_to(Point::new(center.x, center.y));
-    path.line_to(transformed_points[0]);
-
+    let path = {
+        let mut pb = skia::PathBuilder::new();
+        pb.move_to(transformed_points[1]);
+        pb.line_to(transformed_points[0]);
+        pb.line_to(transformed_points[2]);
+        pb.move_to(Point::new(center.x, center.y));
+        pb.line_to(transformed_points[0]);
+        pb.detach()
+    };
    canvas.draw_path(&path, paint);
 }

@@ -372,12 +372,14 @@ fn draw_triangle_cap(
    let mut transformed_points = points;
    matrix.map_points(&mut transformed_points, &points);

-    let mut path = skia::Path::new();
-    path.move_to(transformed_points[0]);
-    path.line_to(transformed_points[1]);
-    path.line_to(transformed_points[2]);
-    path.close();
-
+    let path = {
+        let mut pb = skia::PathBuilder::new();
+        pb.move_to(transformed_points[0]);
+        pb.line_to(transformed_points[1]);
+        pb.line_to(transformed_points[2]);
+        pb.close();
+        pb.detach()
+    };
    canvas.draw_path(&path, paint);
 }

@@ -441,8 +443,7 @@ fn draw_image_stroke_in_container(
        shape_type @ (Type::Path(_) | Type::Bool(_)) => {
            if let Some(p) = shape_type.path() {
                canvas.save();
-                let mut path = p.to_skia_path();
-                path.transform(&path_transform.unwrap());
+                let path = p.to_skia_path().make_transform(&path_transform.unwrap());
                let stroke_kind = stroke.render_kind(p.is_open());
                match stroke_kind {
                    StrokeKind::Inner => {
@@ -464,7 +465,7 @@ fn draw_image_stroke_in_container(
                    canvas.draw_path(&path, &thin_paint);
                }
                handle_stroke_caps(
-                    &mut path,
+                    &path,
                    stroke,
                    canvas,
                    is_open,
@@ -504,8 +505,7 @@ fn draw_image_stroke_in_container(
    // Clear outer stroke for paths if necessary. When adding an outer stroke we need to empty the stroke added too in the inner area.
    if let Type::Path(p) = &shape.shape_type {
        if stroke.render_kind(p.is_open()) == StrokeKind::Outer {
-            let mut path = p.to_skia_path();
-            path.transform(&path_transform.unwrap());
+            let path = p.to_skia_path().make_transform(&path_transform.unwrap());
            let mut clear_paint = skia::Paint::default();
            clear_paint.set_blend_mode(skia::BlendMode::Clear);
            clear_paint.set_anti_alias(antialias);
--- a/render-wasm/src/render/surfaces.rs
+++ b/render-wasm/src/render/surfaces.rs
@@ -457,9 +457,9 @@ impl Surfaces {
        );

        let snapshot = self.current.image_snapshot();
-        let mut direct_context = self.current.direct_context();
+        let props = skia::image::RequiredProperties::default();
        let tile_image_opt = snapshot
-            .make_subset(direct_context.as_mut(), rect)
+            .make_subset(None, rect, props)
            .or_else(|| self.current.image_snapshot_with_bounds(rect));

        if let Some(tile_image) = tile_image_opt {
--- a/render-wasm/src/render/text_editor.rs
+++ b/render-wasm/src/render/text_editor.rs
@@ -45,11 +45,7 @@ fn render_cursor(
    paint.set_color(editor_state.theme.cursor_color);
    paint.set_anti_alias(true);

-    let shape_matrix = shape.get_matrix();
-    canvas.save();
-    canvas.concat(&shape_matrix);
    canvas.draw_rect(rect, &paint);
-    canvas.restore();
 }

 fn render_selection(
@@ -69,14 +65,9 @@ fn render_selection(
    paint.set_blend_mode(BlendMode::Multiply);
    paint.set_color(editor_state.theme.selection_color);
    paint.set_anti_alias(true);
-
-    let shape_matrix = shape.get_matrix();
-    canvas.save();
-    canvas.concat(&shape_matrix);
    for rect in rects {
        canvas.draw_rect(rect, &paint);
    }
-    canvas.restore();
 }

 fn vertical_align_offset(
@@ -108,6 +99,8 @@ fn calculate_cursor_rect(
        return None;
    }

+    let selrect = shape.selrect();
+
    let mut y_offset = vertical_align_offset(shape, &layout_paragraphs);
    for (idx, laid_out_para) in layout_paragraphs.iter().enumerate() {
        if idx == cursor.paragraph {
@@ -164,8 +157,8 @@ fn calculate_cursor_rect(
            };

            return Some(Rect::from_xywh(
-                cursor_x,
-                y_offset,
+                selrect.x() + cursor_x,
+                selrect.y() + y_offset,
                editor_state.theme.cursor_width,
                cursor_height,
            ));
@@ -189,6 +182,7 @@ fn calculate_selection_rects(
    let paragraphs = text_content.paragraphs();
    let layout_paragraphs: Vec<_> = text_content.layout.paragraphs.iter().flatten().collect();

+    let selrect = shape.selrect();
    let mut y_offset = vertical_align_offset(shape, &layout_paragraphs);

    for (para_idx, laid_out_para) in layout_paragraphs.iter().enumerate() {
@@ -231,8 +225,8 @@ fn calculate_selection_rects(
            for text_box in text_boxes {
                let r = text_box.rect;
                rects.push(Rect::from_xywh(
-                    r.left(),
-                    y_offset + r.top(),
+                    selrect.x() + r.left(),
+                    selrect.y() + y_offset + r.top(),
                    r.width(),
                    r.height(),
                ));
--- a/render-wasm/src/shapes.rs
+++ b/render-wasm/src/shapes.rs
@@ -258,18 +258,6 @@ pub fn all_with_ancestors(
 }

 impl Shape {
-    pub fn get_relative_point(
-        point: &Point,
-        view_matrix: &Matrix,
-        shape_matrix: &Matrix,
-    ) -> Option<Point> {
-        let inv_view_matrix = view_matrix.invert()?;
-        let inv_shape_matrix = shape_matrix.invert()?;
-        let transform_matrix: Matrix = Matrix::concat(&inv_shape_matrix, &inv_view_matrix);
-        let shape_relative_point = transform_matrix.map_point(*point);
-        Some(shape_relative_point)
-    }
-
    pub fn new(id: Uuid) -> Self {
        Self {
            id,
@@ -1348,7 +1336,7 @@ impl Shape {
        if let Some(path) = self.shape_type.path() {
            let mut skia_path = path.to_skia_path();
            if let Some(path_transform) = self.to_path_transform() {
-                skia_path.transform(&path_transform);
+                skia_path = skia_path.make_transform(&path_transform);
            }
            if let Some(svg_attrs) = &self.svg_attrs {
                if svg_attrs.fill_rule == FillRule::Evenodd {
--- a/render-wasm/src/shapes/fills.rs
+++ b/render-wasm/src/shapes/fills.rs
@@ -51,10 +51,10 @@ impl Gradient {
            rect.left + self.end.0 * rect.width(),
            rect.top + self.end.1 * rect.height(),
        );
-        skia::shader::Shader::linear_gradient(
+        skia::gradient_shader::linear(
            (start, end),
            self.colors.as_slice(),
-            self.offsets.as_slice(),
+            Some(self.offsets.as_slice()),
            skia::TileMode::Clamp,
            None,
            None,
@@ -83,11 +83,11 @@ impl Gradient {
        transform.pre_scale((self.width * rect.width() / rect.height(), 1.), None);
        transform.pre_translate((-center.x, -center.y));

-        skia::shader::Shader::radial_gradient(
+        skia::gradient_shader::radial(
            center,
            distance,
            self.colors.as_slice(),
-            self.offsets.as_slice(),
+            Some(self.offsets.as_slice()),
            skia::TileMode::Clamp,
            None,
            Some(&transform),
--- a/render-wasm/src/shapes/paths.rs
+++ b/render-wasm/src/shapes/paths.rs
@@ -29,40 +29,28 @@ impl Default for Path {
    }
 }

-fn to_verb(v: u8) -> skia::path::Verb {
-    match v {
-        0 => skia::path::Verb::Move,
-        1 => skia::path::Verb::Line,
-        2 => skia::path::Verb::Quad,
-        3 => skia::path::Verb::Conic,
-        4 => skia::path::Verb::Cubic,
-        5 => skia::path::Verb::Close,
-        _ => skia::path::Verb::Done,
-    }
-}
-
 impl Path {
    pub fn new(segments: Vec<Segment>) -> Self {
-        let mut skia_path = skia::Path::new();
+        let mut pb = skia::PathBuilder::new();
        let mut start = None;

        for segment in segments.iter() {
            let destination = match *segment {
                Segment::MoveTo(xy) => {
                    start = Some(xy);
-                    skia_path.move_to(xy);
+                    pb.move_to(xy);
                    None
                }
                Segment::LineTo(xy) => {
-                    skia_path.line_to(xy);
+                    pb.line_to(xy);
                    Some(xy)
                }
                Segment::CurveTo((c1, c2, xy)) => {
-                    skia_path.cubic_to(c1, c2, xy);
+                    pb.cubic_to(c1, c2, xy);
                    Some(xy)
                }
                Segment::Close => {
-                    skia_path.close();
+                    pb.close();
                    None
                }
            };
@@ -71,11 +59,12 @@ impl Path {
                if math::is_close_to(destination.0, start.0)
                    && math::is_close_to(destination.1, start.1)
                {
-                    skia_path.close();
+                    pb.close();
                }
            }
        }

+        let skia_path = pb.detach();
        let open = subpaths::is_open_path(&segments);

        Self {
@@ -86,38 +75,31 @@ impl Path {
    }

    pub fn from_skia_path(path: skia::Path) -> Self {
-        let nv = path.count_verbs();
-        let mut verbs = vec![0; nv];
-        path.get_verbs(&mut verbs);
-
-        let np = path.count_points();
-        let mut points = Vec::with_capacity(np);
-        points.resize(np, skia::Point::default());
-        path.get_points(&mut points);
+        let verbs = path.verbs();
+        let points = path.points();

        let mut segments = Vec::new();

        let mut current_point = 0;
        for verb in verbs {
-            let verb = to_verb(verb);
            match verb {
-                skia::path::Verb::Move => {
+                skia::PathVerb::Move => {
                    let p = points[current_point];
                    segments.push(Segment::MoveTo((p.x, p.y)));
                    current_point += 1;
                }
-                skia::path::Verb::Line => {
+                skia::PathVerb::Line => {
                    let p = points[current_point];
                    segments.push(Segment::LineTo((p.x, p.y)));
                    current_point += 1;
                }
-                skia::path::Verb::Quad => {
+                skia::PathVerb::Quad => {
                    let p1 = points[current_point];
                    let p2 = points[current_point + 1];
                    segments.push(Segment::CurveTo(((p1.x, p1.y), (p1.x, p1.y), (p2.x, p2.y))));
                    current_point += 2;
                }
-                skia::path::Verb::Conic => {
+                skia::PathVerb::Conic => {
                    // TODO: There is no way currently to access the conic weight
                    // to transform this correctly
                    let p1 = points[current_point];
@@ -125,17 +107,14 @@ impl Path {
                    segments.push(Segment::CurveTo(((p1.x, p1.y), (p1.x, p1.y), (p2.x, p2.y))));
                    current_point += 2;
                }
-                skia::path::Verb::Cubic => {
+                skia::PathVerb::Cubic => {
                    let p1 = points[current_point];
                    let p2 = points[current_point + 1];
                    let p3 = points[current_point + 2];
                    segments.push(Segment::CurveTo(((p1.x, p1.y), (p2.x, p2.y), (p3.x, p3.y))));
                    current_point += 3;
                }
-                skia::path::Verb::Close => {
-                    segments.push(Segment::Close);
-                }
-                skia::path::Verb::Done => {
+                skia::PathVerb::Close => {
                    segments.push(Segment::Close);
                }
            }
@@ -184,7 +163,7 @@ impl Path {
            _ => {}
        });

-        self.skia_path.transform(mtx);
+        self.skia_path = self.skia_path.make_transform(mtx);
    }

    pub fn segments(&self) -> &Vec<Segment> {
--- a/render-wasm/src/shapes/strokes.rs
+++ b/render-wasm/src/shapes/strokes.rs
@@ -225,13 +225,16 @@ impl Stroke {
        if self.style != StrokeStyle::Solid {
            let path_effect = match self.style {
                StrokeStyle::Dotted => {
-                    let mut circle_path = skia::Path::new();
                    let width = match self.kind {
                        StrokeKind::Inner => self.width,
                        StrokeKind::Center => self.width / 2.0,
                        StrokeKind::Outer => self.width,
                    };
-                    circle_path.add_circle((0.0, 0.0), width, None);
+                    let circle_path = {
+                        let mut pb = skia::PathBuilder::new();
+                        pb.add_circle((0.0, 0.0), width, None);
+                        pb.detach()
+                    };
                    let advance = self.width + 5.0;
                    skia::PathEffect::path_1d(
                        &circle_path,
--- a/render-wasm/src/shapes/text.rs
+++ b/render-wasm/src/shapes/text.rs
@@ -112,15 +112,12 @@ impl TextContentSize {
    }
 }

-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct TextPositionWithAffinity {
-    #[allow(dead_code)]
    pub position_with_affinity: PositionWithAffinity,
    pub paragraph: i32,
    #[allow(dead_code)]
    pub span: i32,
-    #[allow(dead_code)]
-    pub span_relative_offset: i32,
    pub offset: i32,
 }

@@ -129,14 +126,12 @@ impl TextPositionWithAffinity {
        position_with_affinity: PositionWithAffinity,
        paragraph: i32,
        span: i32,
-        span_relative_offset: i32,
        offset: i32,
    ) -> Self {
        Self {
            position_with_affinity,
            paragraph,
            span,
-            span_relative_offset,
            offset,
        }
    }
@@ -426,10 +421,7 @@ impl TextContent {
        self.bounds = Rect::from_ltrb(p1.x, p1.y, p2.x, p2.y);
    }

-    pub fn get_caret_position_from_shape_coords(
-        &self,
-        point: &Point,
-    ) -> Option<TextPositionWithAffinity> {
+    pub fn get_caret_position_at(&self, point: &Point) -> Option<TextPositionWithAffinity> {
        let mut offset_y = 0.0;
        let layout_paragraphs = self.layout.paragraphs.iter().flatten();

@@ -495,7 +487,6 @@ impl TextContent {
                        paragraph_index,
                        span_index,
                        span_offset,
-                        position_with_affinity.position,
                    ));
                }
            }
@@ -518,23 +509,12 @@ impl TextContent {
                0, // paragraph 0
                0, // span 0
                0, // offset 0
-                0,
            ));
        }

        None
    }

-    pub fn get_caret_position_from_screen_coords(
-        &self,
-        point: &Point,
-        view_matrix: &Matrix,
-        shape_matrix: &Matrix,
-    ) -> Option<TextPositionWithAffinity> {
-        let shape_rel_point = Shape::get_relative_point(point, view_matrix, shape_matrix)?;
-        self.get_caret_position_from_shape_coords(&shape_rel_point)
-    }
-
    /// Builds the ParagraphBuilders necessary to render
    /// this text.
    pub fn paragraph_builder_group_from_text(
--- a/render-wasm/src/shapes/text_paths.rs
+++ b/render-wasm/src/shapes/text_paths.rs
@@ -101,7 +101,6 @@ impl TextPaths {
        if let Some((text_blob_path, text_blob_bounds)) =
            Self::get_text_blob_path(span_text, font, blob_offset_x, blob_offset_y)
        {
-            let mut text_path = text_blob_path.clone();
            let text_width = font.measure_text(span_text, None).0;

            let decoration = style_metric.text_style.decoration();
@@ -111,16 +110,20 @@ impl TextPaths {
            let blob_top = blob_offset_y;
            let blob_height = text_blob_bounds.height();

-            if let Some(decoration_rect) = self.calculate_text_decoration_rect(
-                decoration.ty,
-                font_metrics,
-                blob_left,
-                blob_top,
-                text_width,
-                blob_height,
-            ) {
-                text_path.add_rect(decoration_rect, None);
-            }
+            let text_path = {
+                let mut pb = skia::PathBuilder::new_path(&text_blob_path);
+                if let Some(decoration_rect) = self.calculate_text_decoration_rect(
+                    decoration.ty,
+                    font_metrics,
+                    blob_left,
+                    blob_top,
+                    text_width,
+                    blob_height,
+                ) {
+                    pb.add_rect(decoration_rect, None, None);
+                }
+                pb.detach()
+            };

            let mut paint = style_metric.text_style.foreground();
            paint.set_anti_alias(antialias);
--- a/render-wasm/src/state/text_editor.rs
+++ b/render-wasm/src/state/text_editor.rs
@@ -1,11 +1,8 @@
 #![allow(dead_code)]

-use crate::shapes::{TextContent, TextPositionWithAffinity};
+use crate::shapes::TextPositionWithAffinity;
 use crate::uuid::Uuid;
-use skia_safe::{
-    textlayout::{Affinity, PositionWithAffinity},
-    Color,
-};
+use skia_safe::Color;

 /// Cursor position within text content.
 /// Uses character offsets for precise positioning.
@@ -125,9 +122,6 @@ pub struct TextEditorState {
    pub theme: TextEditorTheme,
    pub selection: TextSelection,
    pub is_active: bool,
-    // This property indicates that we've started
-    // selecting something with the pointer.
-    pub is_pointer_selection_active: bool,
    pub active_shape_id: Option<Uuid>,
    pub cursor_visible: bool,
    pub last_blink_time: f64,
@@ -144,7 +138,6 @@ impl TextEditorState {
            },
            selection: TextSelection::new(),
            is_active: false,
-            is_pointer_selection_active: false,
            active_shape_id: None,
            cursor_visible: true,
            last_blink_time: 0.0,
@@ -158,7 +151,6 @@ impl TextEditorState {
        self.cursor_visible = true;
        self.last_blink_time = 0.0;
        self.selection = TextSelection::new();
-        self.is_pointer_selection_active = false;
        self.pending_events.clear();
    }

@@ -166,65 +158,7 @@ impl TextEditorState {
        self.is_active = false;
        self.active_shape_id = None;
        self.cursor_visible = false;
-        self.is_pointer_selection_active = false;
        self.pending_events.clear();
-        self.reset_blink();
-    }
-
-    pub fn start_pointer_selection(&mut self) -> bool {
-        if self.is_pointer_selection_active {
-            return false;
-        }
-        self.is_pointer_selection_active = true;
-        true
-    }
-
-    pub fn stop_pointer_selection(&mut self) -> bool {
-        if !self.is_pointer_selection_active {
-            return false;
-        }
-        self.is_pointer_selection_active = false;
-        true
-    }
-
-    pub fn select_all(&mut self, content: &TextContent) -> bool {
-        self.is_pointer_selection_active = false;
-        self.set_caret_from_position(TextPositionWithAffinity::new(
-            PositionWithAffinity {
-                position: 0,
-                affinity: Affinity::Downstream,
-            },
-            0,
-            0,
-            0,
-            0,
-        ));
-        let num_paragraphs = (content.paragraphs().len() - 1) as i32;
-        let Some(last_paragraph) = content.paragraphs().last() else {
-            return false;
-        };
-        let num_spans = (last_paragraph.children().len() - 1) as i32;
-        let Some(last_text_span) = last_paragraph.children().last() else {
-            return false;
-        };
-        let mut offset = 0;
-        for span in last_paragraph.children() {
-            offset += span.text.len();
-        }
-        self.extend_selection_from_position(TextPositionWithAffinity::new(
-            PositionWithAffinity {
-                position: offset as i32,
-                affinity: Affinity::Upstream,
-            },
-            num_paragraphs,
-            num_spans,
-            last_text_span.text.len() as i32,
-            offset as i32,
-        ));
-        self.reset_blink();
-        self.push_event(crate::state::EditorEvent::SelectionChanged);
-
-        true
    }

    pub fn set_caret_from_position(&mut self, position: TextPositionWithAffinity) {
--- a/render-wasm/src/wasm/text.rs
+++ b/render-wasm/src/wasm/text.rs
@@ -1,13 +1,16 @@
 use macros::ToJs;

 use super::{fills::RawFillData, fonts::RawFontStyle};
-
+use crate::math::{Matrix, Point};
 use crate::mem::{self, SerializableResult};
 use crate::shapes::{
    self, GrowType, Shape, TextAlign, TextDecoration, TextDirection, TextTransform, Type,
 };
 use crate::utils::{uuid_from_u32, uuid_from_u32_quartet};
-use crate::{with_current_shape, with_current_shape_mut, with_state, with_state_mut, STATE};
+use crate::{
+    with_current_shape, with_current_shape_mut, with_state, with_state_mut,
+    with_state_mut_current_shape, STATE,
+};

 const RAW_SPAN_DATA_SIZE: usize = std::mem::size_of::<RawTextSpan>();
 const RAW_PARAGRAPH_DATA_SIZE: usize = std::mem::size_of::<RawParagraphData>();
@@ -385,6 +388,32 @@ pub extern "C" fn update_shape_text_layout_for(a: u32, b: u32, c: u32, d: u32) {
    });
 }

+#[no_mangle]
+pub extern "C" fn get_caret_position_at(x: f32, y: f32) -> i32 {
+    with_state_mut_current_shape!(state, |shape: &Shape| {
+        if let Type::Text(text_content) = &shape.shape_type {
+            let mut matrix = Matrix::new_identity();
+            let shape_matrix = shape.get_concatenated_matrix(&state.shapes);
+            let view_matrix = state.render_state.viewbox.get_matrix();
+            if let Some(inv_view_matrix) = view_matrix.invert() {
+                matrix.post_concat(&inv_view_matrix);
+                matrix.post_concat(&shape_matrix);
+
+                let mapped_point = matrix.map_point(Point::new(x, y));
+
+                if let Some(position_with_affinity) =
+                    text_content.get_caret_position_at(&mapped_point)
+                {
+                    return position_with_affinity.position_with_affinity.position;
+                }
+            }
+        } else {
+            panic!("Trying to get caret position of a shape that it's not a text shape");
+        }
+    });
+    -1
+}
+
 const RAW_POSITION_DATA_SIZE: usize = size_of::<shapes::PositionData>();

 impl From<[u8; RAW_POSITION_DATA_SIZE]> for shapes::PositionData {
--- a/render-wasm/src/wasm/text_editor.rs
+++ b/render-wasm/src/wasm/text_editor.rs
@@ -1,3 +1,5 @@
+use macros::ToJs;
+
 use crate::math::{Matrix, Point, Rect};
 use crate::mem;
 use crate::shapes::{Paragraph, Shape, TextContent, Type, VerticalAlign};
@@ -5,7 +7,6 @@ use crate::state::{TextCursor, TextSelection};
 use crate::utils::uuid_from_u32_quartet;
 use crate::utils::uuid_to_u32_quartet;
 use crate::{with_state, with_state_mut, STATE};
-use macros::ToJs;

 #[derive(PartialEq, ToJs)]
 #[repr(u8)]
@@ -53,17 +54,6 @@ pub extern "C" fn text_editor_is_active() -> bool {
    with_state!(state, { state.text_editor_state.is_active })
 }

-#[no_mangle]
-pub extern "C" fn text_editor_is_active_with_id(a: u32, b: u32, c: u32, d: u32) -> bool {
-    with_state!(state, {
-        let shape_id = uuid_from_u32_quartet(a, b, c, d);
-        let Some(active_shape_id) = state.text_editor_state.active_shape_id else {
-            return false;
-        };
-        state.text_editor_state.is_active && active_shape_id == shape_id
-    })
-}
-
 #[no_mangle]
 pub extern "C" fn text_editor_get_active_shape_id(buffer_ptr: *mut u32) {
    with_state!(state, {
@@ -80,25 +70,45 @@ pub extern "C" fn text_editor_get_active_shape_id(buffer_ptr: *mut u32) {
 }

 #[no_mangle]
-pub extern "C" fn text_editor_select_all() -> bool {
+pub extern "C" fn text_editor_select_all() {
    with_state_mut!(state, {
        if !state.text_editor_state.is_active {
-            return false;
+            return;
        }

        let Some(shape_id) = state.text_editor_state.active_shape_id else {
-            return false;
+            return;
        };

        let Some(shape) = state.shapes.get(&shape_id) else {
-            return false;
+            return;
        };

        let Type::Text(text_content) = &shape.shape_type else {
-            return false;
+            return;
        };
-        state.text_editor_state.select_all(text_content)
-    })
+
+        let paragraphs = text_content.paragraphs();
+        if paragraphs.is_empty() {
+            return;
+        }
+
+        let last_para_idx = paragraphs.len() - 1;
+        let last_para = &paragraphs[last_para_idx];
+        let total_chars: usize = last_para
+            .children()
+            .iter()
+            .map(|span| span.text.chars().count())
+            .sum();
+
+        use crate::state::TextCursor;
+        state.text_editor_state.selection.anchor = TextCursor::new(0, 0);
+        state.text_editor_state.selection.focus = TextCursor::new(last_para_idx, total_chars);
+        state.text_editor_state.reset_blink();
+        state
+            .text_editor_state
+            .push_event(crate::state::EditorEvent::SelectionChanged);
+    });
 }

 #[no_mangle]
@@ -110,105 +120,6 @@ pub extern "C" fn text_editor_poll_event() -> u8 {
 // SELECTION MANAGEMENT
 // ============================================================================

-#[no_mangle]
-pub extern "C" fn text_editor_pointer_down(x: f32, y: f32) {
-    with_state_mut!(state, {
-        if !state.text_editor_state.is_active {
-            return;
-        }
-        let Some(shape_id) = state.text_editor_state.active_shape_id else {
-            return;
-        };
-        let Some(shape) = state.shapes.get(&shape_id) else {
-            return;
-        };
-        let Type::Text(text_content) = &shape.shape_type else {
-            return;
-        };
-        let point = Point::new(x, y);
-        let view_matrix: Matrix = state.render_state.viewbox.get_matrix();
-        let shape_matrix = shape.get_matrix();
-        state.text_editor_state.start_pointer_selection();
-        if let Some(position) =
-            text_content.get_caret_position_from_screen_coords(&point, &view_matrix, &shape_matrix)
-        {
-            state.text_editor_state.set_caret_from_position(position);
-        }
-    });
-}
-
-#[no_mangle]
-pub extern "C" fn text_editor_pointer_move(x: f32, y: f32) {
-    with_state_mut!(state, {
-        if !state.text_editor_state.is_active {
-            return;
-        }
-        let view_matrix: Matrix = state.render_state.viewbox.get_matrix();
-        let point = Point::new(x, y);
-        let Some(shape_id) = state.text_editor_state.active_shape_id else {
-            return;
-        };
-        let Some(shape) = state.shapes.get(&shape_id) else {
-            return;
-        };
-        let shape_matrix = shape.get_matrix();
-        let Some(_shape_rel_point) = Shape::get_relative_point(&point, &view_matrix, &shape_matrix)
-        else {
-            return;
-        };
-        if !state.text_editor_state.is_pointer_selection_active {
-            return;
-        }
-        let Type::Text(text_content) = &shape.shape_type else {
-            return;
-        };
-
-        if let Some(position) =
-            text_content.get_caret_position_from_screen_coords(&point, &view_matrix, &shape_matrix)
-        {
-            state
-                .text_editor_state
-                .extend_selection_from_position(position);
-        }
-    });
-}
-
-#[no_mangle]
-pub extern "C" fn text_editor_pointer_up(x: f32, y: f32) {
-    with_state_mut!(state, {
-        if !state.text_editor_state.is_active {
-            return;
-        }
-        let view_matrix: Matrix = state.render_state.viewbox.get_matrix();
-        let point = Point::new(x, y);
-        let Some(shape_id) = state.text_editor_state.active_shape_id else {
-            return;
-        };
-        let Some(shape) = state.shapes.get(&shape_id) else {
-            return;
-        };
-        let shape_matrix = shape.get_matrix();
-        let Some(_shape_rel_point) = Shape::get_relative_point(&point, &view_matrix, &shape_matrix)
-        else {
-            return;
-        };
-        if !state.text_editor_state.is_pointer_selection_active {
-            return;
-        }
-        let Type::Text(text_content) = &shape.shape_type else {
-            return;
-        };
-        if let Some(position) =
-            text_content.get_caret_position_from_screen_coords(&point, &view_matrix, &shape_matrix)
-        {
-            state
-                .text_editor_state
-                .extend_selection_from_position(position);
-        }
-        state.text_editor_state.stop_pointer_selection();
-    });
-}
-
 #[no_mangle]
 pub extern "C" fn text_editor_set_cursor_from_point(x: f32, y: f32) {
    with_state_mut!(state, {
@@ -216,26 +127,144 @@ pub extern "C" fn text_editor_set_cursor_from_point(x: f32, y: f32) {
            return;
        }

-        let view_matrix: Matrix = state.render_state.viewbox.get_matrix();
-        let point = Point::new(x, y);
        let Some(shape_id) = state.text_editor_state.active_shape_id else {
            return;
        };
-        let Some(shape) = state.shapes.get(&shape_id) else {
+
+        let (shape_matrix, view_matrix, selrect, vertical_align) = {
+            let Some(shape) = state.shapes.get(&shape_id) else {
+                return;
+            };
+            (
+                shape.get_concatenated_matrix(&state.shapes),
+                state.render_state.viewbox.get_matrix(),
+                shape.selrect(),
+                shape.vertical_align(),
+            )
+        };
+
+        let Some(inv_view_matrix) = view_matrix.invert() else {
            return;
        };
-        let shape_matrix = shape.get_matrix();
-        let Type::Text(text_content) = &shape.shape_type else {
+
+        let Some(inv_shape_matrix) = shape_matrix.invert() else {
            return;
        };
-        if let Some(position) =
-            text_content.get_caret_position_from_screen_coords(&point, &view_matrix, &shape_matrix)
-        {
+
+        let mut matrix = Matrix::new_identity();
+        matrix.post_concat(&inv_view_matrix);
+        matrix.post_concat(&inv_shape_matrix);
+
+        let mapped_point = matrix.map_point(Point::new(x, y));
+
+        let Some(shape) = state.shapes.get_mut(&shape_id) else {
+            return;
+        };
+
+        let Type::Text(text_content) = &mut shape.shape_type else {
+            return;
+        };
+
+        if text_content.layout.paragraphs.is_empty() && !text_content.paragraphs().is_empty() {
+            let bounds = text_content.bounds;
+            text_content.update_layout(bounds);
+        }
+
+        // Calculate vertical alignment offset (same as in render/text_editor.rs)
+        let layout_paragraphs: Vec<_> = text_content.layout.paragraphs.iter().flatten().collect();
+        let total_height: f32 = layout_paragraphs.iter().map(|p| p.height()).sum();
+        let vertical_offset = match vertical_align {
+            crate::shapes::VerticalAlign::Center => (selrect.height() - total_height) / 2.0,
+            crate::shapes::VerticalAlign::Bottom => selrect.height() - total_height,
+            _ => 0.0,
+        };
+
+        // Adjust point: subtract selrect offset and vertical alignment
+        // The text layout expects coordinates where (0, 0) is the top-left of the text content
+        let adjusted_point = Point::new(
+            mapped_point.x - selrect.x(),
+            mapped_point.y - selrect.y() - vertical_offset,
+        );
+
+        if let Some(position) = text_content.get_caret_position_at(&adjusted_point) {
            state.text_editor_state.set_caret_from_position(position);
        }
    });
 }

+#[no_mangle]
+pub extern "C" fn text_editor_extend_selection_to_point(x: f32, y: f32) {
+    with_state_mut!(state, {
+        if !state.text_editor_state.is_active {
+            return;
+        }
+
+        let Some(shape_id) = state.text_editor_state.active_shape_id else {
+            return;
+        };
+
+        let (shape_matrix, view_matrix, selrect, vertical_align) = {
+            let Some(shape) = state.shapes.get(&shape_id) else {
+                return;
+            };
+            (
+                shape.get_concatenated_matrix(&state.shapes),
+                state.render_state.viewbox.get_matrix(),
+                shape.selrect(),
+                shape.vertical_align(),
+            )
+        };
+
+        let Some(inv_view_matrix) = view_matrix.invert() else {
+            return;
+        };
+
+        let Some(inv_shape_matrix) = shape_matrix.invert() else {
+            return;
+        };
+
+        let mut matrix = Matrix::new_identity();
+        matrix.post_concat(&inv_view_matrix);
+        matrix.post_concat(&inv_shape_matrix);
+
+        let mapped_point = matrix.map_point(Point::new(x, y));
+
+        let Some(shape) = state.shapes.get_mut(&shape_id) else {
+            return;
+        };
+
+        let Type::Text(text_content) = &mut shape.shape_type else {
+            return;
+        };
+
+        if text_content.layout.paragraphs.is_empty() && !text_content.paragraphs().is_empty() {
+            let bounds = text_content.bounds;
+            text_content.update_layout(bounds);
+        }
+
+        // Calculate vertical alignment offset (same as in render/text_editor.rs)
+        let layout_paragraphs: Vec<_> = text_content.layout.paragraphs.iter().flatten().collect();
+        let total_height: f32 = layout_paragraphs.iter().map(|p| p.height()).sum();
+        let vertical_offset = match vertical_align {
+            crate::shapes::VerticalAlign::Center => (selrect.height() - total_height) / 2.0,
+            crate::shapes::VerticalAlign::Bottom => selrect.height() - total_height,
+            _ => 0.0,
+        };
+
+        // Adjust point: subtract selrect offset and vertical alignment
+        let adjusted_point = Point::new(
+            mapped_point.x - selrect.x(),
+            mapped_point.y - selrect.y() - vertical_offset,
+        );
+
+        if let Some(position) = text_content.get_caret_position_at(&adjusted_point) {
+            state
+                .text_editor_state
+                .extend_selection_from_position(position);
+        }
+    });
+}
+
 // ============================================================================
 // TEXT OPERATIONS
 // ============================================================================
--- a/render-wasm/test
+++ b/render-wasm/test
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -x

-export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache-webp.tar.gz"}
+export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.93.1/skia-binaries-319323662b1685a112f5-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache-webp.tar.gz"}
 export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"};

 _SCRIPT_DIR=$(dirname $0);
--- a/render-wasm/watch_test
+++ b/render-wasm/watch_test
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 _SCRIPT_DIR=$(dirname $0);

-export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.87.0/skia-binaries-e551f334ad5cbdf43abf-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache-webp.tar.gz"
+export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.93.1/skia-binaries-319323662b1685a112f5-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache-webp.tar.gz"

 pushd $_SCRIPT_DIR;
 cargo watch -x "test --bin render_wasm -- --show-output"
Author	SHA1	Message	Date
Alejandro Alonso	fbb5c91acd	🎉 Refactor caret blinking to reduce CPU usage	2026-02-24 13:48:14 +01:00
Alejandro Alonso	5eba070a2c	🎉 Update skia version	2026-02-24 09:49:12 +01:00