From 1b29e9a50f6999a54505ad5d135eaa82f5ce0bb4 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 2 Dec 2025 17:41:51 +0100 Subject: [PATCH] :bug: Fix race condition with fix fonts patch --- frontend/src/app/main/data/changes.cljs | 9 +++++---- .../src/app/main/data/workspace/fix_deleted_fonts.cljs | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/data/changes.cljs b/frontend/src/app/main/data/changes.cljs index 6839adc96b..7cae1add0f 100644 --- a/frontend/src/app/main/data/changes.cljs +++ b/frontend/src/app/main/data/changes.cljs @@ -76,7 +76,7 @@ (map :page-id)) (defn- apply-changes-localy - [{:keys [file-id redo-changes] :as commit} pending] + [{:keys [file-id redo-changes ignore-wasm?] :as commit} pending] (ptk/reify ::apply-changes-localy ptk/UpdateEvent (update [_ state] @@ -103,7 +103,7 @@ pids (into #{} xf:map-page-id redo-changes)] (reduce #(ctst/update-object-indices %1 %2) fdata pids)))] - (if (features/active-feature? state "render-wasm/v1") + (if (and (not ignore-wasm?) (features/active-feature? state "render-wasm/v1")) ;; Update the wasm model (let [shape-changes (volatile! {}) @@ -122,7 +122,7 @@ (defn commit "Create a commit event instance" [{:keys [commit-id redo-changes undo-changes origin save-undo? features - file-id file-revn file-vern undo-group tags stack-undo? source]}] + file-id file-revn file-vern undo-group tags stack-undo? source ignore-wasm?]}] (assert (cpc/check-changes redo-changes) "expect valid vector of changes for redo-changes") @@ -147,7 +147,8 @@ :save-undo? save-undo? :undo-group undo-group :tags tags - :stack-undo? stack-undo?}] + :stack-undo? stack-undo? + :ignore-wasm? ignore-wasm?}] (ptk/reify ::commit cljs.core/IDeref diff --git a/frontend/src/app/main/data/workspace/fix_deleted_fonts.cljs b/frontend/src/app/main/data/workspace/fix_deleted_fonts.cljs index fb33a74dc7..626c4653e2 100644 --- a/frontend/src/app/main/data/workspace/fix_deleted_fonts.cljs +++ b/frontend/src/app/main/data/workspace/fix_deleted_fonts.cljs @@ -102,7 +102,8 @@ {:origin it :redo-changes changes :undo-changes [] - :save-undo? false}))))))) + :save-undo? false + :ignore-wasm? true}))))))) ;; FIXME: would be nice to not execute this code twice per page in the ;; same working session, maybe some local memoization can improve that @@ -119,4 +120,5 @@ {:origin it :redo-changes changes :undo-changes [] - :save-undo? false}))))))) + :save-undo? false + :ignore-wasm? true})))))))