WIP

frontend/src/app/main/data/event.cljs

@@ -531,7 +531,7 @@
   "Install perf observers in dev builds. Safe to call multiple times.
   Perf logs are disabled by default. Enable them with the :perf-logs flag in config."
   []
-  (when ^boolean js/goog.DEBUG
+  #_(when ^boolean js/goog.DEBUG
     (install-long-task-observer!)
     (start-event-loop-stall-logger! 50 100)
     ;; Expose simple API on window for manual control in devtools

frontend/src/app/main/data/workspace/modifiers.cljs

@@ -616,7 +616,7 @@
   [modif-tree & {:keys [ignore-constraints ignore-snap-pixel snap-ignore-axis undo-transation?]
                  :or {ignore-constraints false ignore-snap-pixel false snap-ignore-axis nil undo-transation? true}
                  :as params}]
-  (ptk/reify ::apply-wasm-modifiesr
+  (ptk/reify ::apply-wasm-modifiers
     ptk/WatchEvent
     (watch [_ state _]
       (wasm.api/clean-modifiers)

frontend/src/app/main/data/workspace/pages.cljs

@@ -105,9 +105,15 @@
       (if (dsh/lookup-page state file-id page-id)
         (rx/concat
          (rx/of (initialize-page* file-id page-id)
-                (fdf/fix-deleted-fonts-for-page file-id page-id)
-                (dwth/watch-state-changes file-id page-id)
-                (dwl/watch-component-changes))
+                (fdf/fix-deleted-fonts-for-page file-id page-id))
+
+         ;; Disable thumbnail generation in wasm renderer
+         (if (features/active-feature? state "render-wasm/v1")
+           (rx/empty)
+           (rx/of (dwth/watch-state-changes file-id page-id)))
+
+         (rx/of (dwl/watch-component-changes))
+
          (let [profile (:profile state)
                props   (get profile :props)]
            (when (not (:workspace-visited props))

frontend/src/app/main/data/workspace/texts.cljs

@@ -794,6 +794,7 @@
 
 (defn update-attrs
   [id attrs]
+  (prn "update-attrs" id attrs)
   (ptk/reify ::update-attrs
     ptk/WatchEvent
     (watch [_ state _]
@@ -820,7 +821,7 @@
            (when (features/active-feature? state "text-editor/v2")
              (rx/of (v2-update-text-editor-styles id attrs)))
 
-           (when (features/active-feature? state "render-wasm/v1")
+           #_(when (features/active-feature? state "render-wasm/v1")
              ;; This delay is to give time for the font to be correctly rendered
              ;; in wasm.
              (cond->> (rx/of (resize-wasm-text id))

frontend/src/app/main/data/workspace/thumbnails.cljs

@@ -191,59 +191,63 @@
   [page-id [event [old-data new-data]]]
 
   (let [changes (:changes event)
-        lookup-data-objects
-        (fn [data page-id]
-          (dm/get-in data [:pages-index page-id :objects]))
+        ;; cache for the get-frame-ids function
+        frame-id-cache (atom {})]
 
+    (letfn [(lookup-data-objects [data page-id]
+              (dm/get-in data [:pages-index page-id :objects]))
 
-        extract-ids
-        (fn [{:keys [page-id type] :as change}]
-          (case type
-            :add-obj [[page-id (:id change)]]
-            :mod-obj [[page-id (:id change)]]
-            :del-obj [[page-id (:id change)]]
-            :mov-objects (->> (:shapes change) (map #(vector page-id %)))
-            []))
+            (extract-ids [{:keys [page-id type] :as change}]
+              (case type
+                :add-obj [[page-id (:id change)]]
+                :mod-obj [[page-id (:id change)]]
+                :del-obj [[page-id (:id change)]]
+                :mov-objects (->> (:shapes change) (map #(vector page-id %)))
+                []))
 
-        get-frame-ids
-        (fn get-frame-ids [id]
-          (let [old-objects     (lookup-data-objects old-data page-id)
-                new-objects     (lookup-data-objects new-data page-id)
+            (get-frame-ids [id]
+              (let [old-objects     (lookup-data-objects old-data page-id)
+                    new-objects     (lookup-data-objects new-data page-id)
 
-                new-shape       (get new-objects id)
-                old-shape       (get old-objects id)
+                    new-shape       (get new-objects id)
+                    old-shape       (get old-objects id)
 
-                old-frame-id    (if (cfh/frame-shape? old-shape) id (:frame-id old-shape))
-                new-frame-id    (if (cfh/frame-shape? new-shape) id (:frame-id new-shape))
+                    old-frame-id    (if (cfh/frame-shape? old-shape) id (:frame-id old-shape))
+                    new-frame-id    (if (cfh/frame-shape? new-shape) id (:frame-id new-shape))
 
-                root-frame-old? (cfh/root-frame? old-objects old-frame-id)
-                root-frame-new? (cfh/root-frame? new-objects new-frame-id)
-                instance-root?  (ctc/instance-root? new-shape)]
+                    root-frame-old? (cfh/root-frame? old-objects old-frame-id)
+                    root-frame-new? (cfh/root-frame? new-objects new-frame-id)
+                    instance-root?  (ctc/instance-root? new-shape)]
 
-            (cond-> #{}
-              root-frame-old?
-              (conj ["frame" old-frame-id])
+                (cond-> #{}
+                  root-frame-old?
+                  (conj ["frame" old-frame-id])
 
-              root-frame-new?
-              (conj ["frame" new-frame-id])
+                  root-frame-new?
+                  (conj ["frame" new-frame-id])
 
-              instance-root?
-              (conj ["component" id])
+                  instance-root?
+                  (conj ["component" id])
 
-              (and (uuid? (:frame-id old-shape))
-                   (not= uuid/zero (:frame-id old-shape)))
-              (into (get-frame-ids (:frame-id old-shape)))
+                  (and (uuid? (:frame-id old-shape))
+                       (not= uuid/zero (:frame-id old-shape)))
+                  (into (get-frame-ids (:frame-id old-shape)))
 
-              (and (uuid? (:frame-id new-shape))
-                   (not= uuid/zero (:frame-id new-shape)))
-              (into (get-frame-ids (:frame-id new-shape))))))]
+                  (and (uuid? (:frame-id new-shape))
+                       (not= uuid/zero (:frame-id new-shape)))
+                  (into (get-frame-ids (:frame-id new-shape))))))
 
-    (into #{}
-          (comp (mapcat extract-ids)
-                (filter (fn [[page-id']] (= page-id page-id')))
-                (map (fn [[_ id]] id))
-                (mapcat get-frame-ids))
-          changes)))
+            (get-frame-ids-cached [id]
+              (or (get @frame-id-cache id)
+                  (let [result (get-frame-ids id)]
+                    (swap! frame-id-cache assoc id result)
+                    result)))]
+      (into #{}
+            (comp (mapcat extract-ids)
+                  (filter (fn [[page-id']] (= page-id page-id')))
+                  (map (fn [[_ id]] id))
+                  (mapcat get-frame-ids-cached))
+            changes))))
 
 (defn watch-state-changes
   "Watch the state for changes inside frames. If a change is detected will force a rendering

frontend/src/app/plugins/shape.cljs

@@ -805,7 +805,8 @@
                (u/display-not-valid :resize "Plugin doesn't have 'content:write' permission")
 
                :else
-               (st/emit! (dw/update-dimensions [id] :width width)
+               (prn "resize" width height)
+               #_(st/emit! (dw/update-dimensions [id] :width width)
                          (dw/update-dimensions [id] :height height))))
 
            :rotate

frontend/src/app/render_wasm/api.cljs

@@ -190,11 +190,14 @@
 (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)})))
+    (let [dimensions (get-text-dimensions id)
+          page-id (:current-page-id @st/state)]
+      ;;(prn ">update-text-rect!" id dimensions)
+      (mw/emit!
+       {:cmd :index/update-text-rect
+        :page-id page-id
+        :shape-id id
+        :dimensions dimensions}))))
 
 
 (defn- ensure-text-content

frontend/src/app/render_wasm/api/fonts.cljs

@@ -124,19 +124,25 @@
 
     true))
 
+(def fetching (atom #{}))
+
 (defn- fetch-font
   [shape-id font-data font-url emoji? fallback?]
-  {:key font-url
-   :callback #(->> (http/send! {:method :get
-                                :uri font-url
-                                :response-type :buffer})
-                   (rx/map (fn [{:keys [body]}]
-                             (store-font-buffer shape-id font-data body emoji? fallback?)))
-                   (rx/catch (fn [cause]
-                               (log/error :hint "Could not fetch font"
-                                          :font-url font-url
-                                          :cause cause)
-                               (rx/empty))))})
+  (when-not (contains? @fetching font-url)
+    (swap! fetching conj font-url)
+    {:key font-url
+     :callback #(->> (http/send! {:method :get
+                                  :uri font-url
+                                  :response-type :buffer})
+                     (rx/map (fn [{:keys [body]}]
+                               (swap! fetching disj font-url)
+                               (store-font-buffer shape-id font-data body emoji? fallback?)))
+                     (rx/catch (fn [cause]
+                                 (swap! fetching disj font-url)
+                                 (log/error :hint "Could not fetch font"
+                                            :font-url font-url
+                                            :cause cause)
+                                 (rx/empty))))}))
 
 (defn- google-font-ttf-url
   [font-id font-variant-id font-weight font-style]