From 79e1c29306f246c1b902fb97eefd8ad4ae736d35 Mon Sep 17 00:00:00 2001 From: Elena Torro Date: Fri, 6 Jun 2025 09:37:54 +0200 Subject: [PATCH] :bug: Fix emoji detection and load --- frontend/src/app/render_wasm/api.cljs | 5 ++--- frontend/src/app/render_wasm/api/texts.cljs | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/render_wasm/api.cljs b/frontend/src/app/render_wasm/api.cljs index dbaac9252e..c3356ef841 100644 --- a/frontend/src/app/render_wasm/api.cljs +++ b/frontend/src/app/render_wasm/api.cljs @@ -640,9 +640,10 @@ (swap! languages into (t/get-languages text)) (t/write-shape-text leaves paragraph text)) (recur (inc index)))))) + (let [updated-fonts (-> fonts - (cond-> emoji? (f/add-emoji-font)) + (cond-> @emoji? (f/add-emoji-font)) (f/add-noto-fonts @languages))] (f/store-fonts updated-fonts)))) @@ -742,8 +743,6 @@ (set-shape-svg-raw-content (get-static-markup shape))) (when (some? corners) (set-shape-corners corners)) (when (some? shadows) (set-shape-shadows shadows)) - (when (and (= type :text) (some? content)) - (set-shape-text content)) (when (= type :text) (set-shape-grow-type grow-type)) (when (or (ctl/any-layout? shape) diff --git a/frontend/src/app/render_wasm/api/texts.cljs b/frontend/src/app/render_wasm/api/texts.cljs index 8e56eca513..70418f0099 100644 --- a/frontend/src/app/render_wasm/api/texts.cljs +++ b/frontend/src/app/render_wasm/api/texts.cljs @@ -148,7 +148,7 @@ (h/call wasm/internal-module "_set_shape_text_content")) -(def ^:private emoji-pattern #"[\uD83C-\uDBFF][\uDC00-\uDFFF]") +(def ^:private emoji-pattern #"[\uD83C-\uDBFF][\uDC00-\uDFFF]|[\u2600-\u27BF]") (def ^:private unicode-ranges {:japanese #"[\u3040-\u30FF\u31F0-\u31FF\uFF66-\uFF9F]" @@ -198,7 +198,7 @@ (defn contains-emoji? [text] - (boolean (re-find emoji-pattern text))) + (boolean (some #(re-find emoji-pattern %) (seq text)))) (defn get-languages [text] (reduce-kv (fn [result lang pattern]