@effindomv2/fui-rs 0.1.16 → 0.1.17

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fui-rs"
-version = "0.1.16"
+version = "0.1.17"
 edition = "2021"
 license = "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-rs",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 Rust frontend framework SDK and host generators",
@@ -27,9 +27,10 @@
     "generate:host-events:workbench": "mkdir -p build && esbuild scripts/generate-host-events.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-host-events.mjs && node build/generate-host-events.mjs demo/src/host-events.ts demoHostEvents crates/demo-workbench/src/generated/host_events.rs",
     "generate:host-events:stage4": "mkdir -p build && esbuild scripts/generate-host-events.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-host-events.mjs && node build/generate-host-events.mjs demo/src/host-events.ts demoHostEvents crates/demo-stage4/src/generated/host_events.rs",
     "generate:host-events:stage5": "mkdir -p build && esbuild scripts/generate-host-events.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-host-events.mjs && node build/generate-host-events.mjs demo/src/host-events.ts demoHostEvents crates/demo-stage5/src/generated/host_events.rs",
+    "generate:host-events:immediate-drawing": "mkdir -p build && esbuild scripts/generate-host-events.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-host-events.mjs && node build/generate-host-events.mjs demo/src/host-events.ts demoHostEvents crates/demo-immediate-drawing/src/generated/host_events.rs",
     "generate:worker-host-services": "mkdir -p build && esbuild scripts/generate-host-services.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-host-services.mjs && node build/generate-host-services.mjs demo/src/worker-host-services.ts demoWorkerHostServices crates/demo-shared/src/generated/worker_host_services.rs fui::host_services fui_host_service",
     "generate:framework-host-services": "mkdir -p build && esbuild scripts/generate-host-services.ts --bundle --format=esm --platform=node --target=node20 --packages=external --outfile=build/generate-host-services.mjs && node build/generate-host-services.mjs scripts/framework-host-services.ts frameworkHostServices src/generated/framework_host_services.rs crate::host_services fui_host",
-    "generate:host": "npm run generate:host-services && npm run generate:host-events:home && npm run generate:host-events:workbench && npm run generate:host-events:stage4 && npm run generate:host-events:stage5 && npm run generate:worker-host-services && npm run generate:framework-host-services",
+    "generate:host": "npm run generate:host-services && npm run generate:host-events:home && npm run generate:host-events:workbench && npm run generate:host-events:stage4 && npm run generate:host-events:stage5 && npm run generate:host-events:immediate-drawing && npm run generate:worker-host-services && npm run generate:framework-host-services",
     "guard:runtime-dependency": "bash scripts/check-runtime-dependency.sh",
     "lint": "cd ../.. && npm run lint:v2",
     "build": "npm run guard:runtime-dependency && npm run check:abi && bash scripts/build.sh",

package/scripts/build.sh

@@ -15,7 +15,7 @@ HOST_EVENT_GENERATOR_BUILD="${PACKAGE_DIR}/build/generate-host-events.mjs"
 WORKER_BOOTSTRAP_BUILD="${PACKAGE_DIR}/build/worker-bootstrap.js"
 WORKER_BOOTSTRAP_MAP_BUILD="${PACKAGE_DIR}/build/worker-bootstrap.js.map"
 
-mkdir -p "${PACKAGE_DIR}/build" "${OUT_DIR}" "${DEMO_OUT_DIR}" "${DEMO_OUT_DIR}/workbench" "${DEMO_OUT_DIR}/stage4" "${DEMO_OUT_DIR}/stage5"
+mkdir -p "${PACKAGE_DIR}/build" "${OUT_DIR}" "${DEMO_OUT_DIR}" "${DEMO_OUT_DIR}/workbench" "${DEMO_OUT_DIR}/stage4" "${DEMO_OUT_DIR}/stage5" "${DEMO_OUT_DIR}/immediate-drawing"
 
 cd "${PACKAGE_DIR}"
 if ! command -v cargo >/dev/null 2>&1 && [ -f "${HOME}/.cargo/env" ]; then
@@ -127,6 +127,7 @@ generate_host_events "demo/src/host-events.ts" "demoHostEvents" "crates/demo-hom
 generate_host_events "demo/src/host-events.ts" "demoHostEvents" "crates/demo-workbench/src/generated/host_events.rs"
 generate_host_events "demo/src/host-events.ts" "demoHostEvents" "crates/demo-stage4/src/generated/host_events.rs"
 generate_host_events "demo/src/host-events.ts" "demoHostEvents" "crates/demo-stage5/src/generated/host_events.rs"
+generate_host_events "demo/src/host-events.ts" "demoHostEvents" "crates/demo-immediate-drawing/src/generated/host_events.rs"
 generate_host_services "demo/src/worker-host-services.ts" "demoWorkerHostServices" "crates/demo-shared/src/generated/worker_host_services.rs" "fui::host_services" "fui_host_service"
 generate_host_services "demo/src/worker-host-services.ts" "demoWorkerHostServices" "crates/demo-worker/src/generated/worker_host_services.rs" "" "fui_host_service"
 generate_host_services "scripts/framework-host-services.ts" "frameworkHostServices" "src/generated/framework_host_services.rs" "crate::host_services" "fui_host"
@@ -147,10 +148,12 @@ build_demo_route "fui-rs-demo-home" "fui_rs_demo_home" "${DEMO_OUT_DIR}/home.was
 build_demo_route "fui-rs-demo-workbench" "fui_rs_demo_workbench" "${DEMO_OUT_DIR}/workbench.wasm"
 build_demo_route "fui-rs-demo-stage4" "fui_rs_demo_stage4" "${DEMO_OUT_DIR}/stage4.wasm"
 build_demo_route "fui-rs-demo-stage5" "fui_rs_demo_stage5" "${DEMO_OUT_DIR}/stage5.wasm"
+build_demo_route "fui-rs-demo-immediate-drawing" "fui_rs_demo_immediate_drawing" "${DEMO_OUT_DIR}/immediate-drawing.wasm"
 build_demo_route "fui-rs-demo-worker" "fui_rs_demo_worker" "${DEMO_OUT_DIR}/workers.wasm"
 cp "${DEMO_OUT_DIR}/workers.wasm" "${DEMO_OUT_DIR}/workbench/workers.wasm"
 cp "${DEMO_OUT_DIR}/workers.wasm" "${DEMO_OUT_DIR}/stage4/workers.wasm"
 cp "${DEMO_OUT_DIR}/workers.wasm" "${DEMO_OUT_DIR}/stage5/workers.wasm"
+cp "${DEMO_OUT_DIR}/workers.wasm" "${DEMO_OUT_DIR}/immediate-drawing/workers.wasm"
 
 npx esbuild "${PACKAGE_DIR}/demo/harness.ts" \
   --bundle \
@@ -187,6 +190,7 @@ cp "${PACKAGE_DIR}/demo/index.html" "${DEMO_OUT_DIR}/index.html"
 cp "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/workbench/index.html"
 cp "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/stage4/index.html"
 cp "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/stage5/index.html"
+cp "${PACKAGE_DIR}/demo/route-shell.html" "${DEMO_OUT_DIR}/immediate-drawing/index.html"
 cp "${PACKAGE_DIR}/demo/routes.json" "${DEMO_OUT_DIR}/routes.json"
 rm -f "${DEMO_OUT_DIR}/worker-manifest.json"
 if [ -f "${SHARED_DEMO_TEXTURE}" ]; then
@@ -195,6 +199,7 @@ if [ -f "${SHARED_DEMO_TEXTURE}" ]; then
   cp "${SHARED_DEMO_TEXTURE}" "${DEMO_OUT_DIR}/workbench/demo-texture.png"
   cp "${SHARED_DEMO_TEXTURE}" "${DEMO_OUT_DIR}/stage4/demo-texture.png"
   cp "${SHARED_DEMO_TEXTURE}" "${DEMO_OUT_DIR}/stage5/demo-texture.png"
+  cp "${SHARED_DEMO_TEXTURE}" "${DEMO_OUT_DIR}/immediate-drawing/demo-texture.png"
 fi
 RUNTIME_SET_HASH="$(node -e 'const fs=require("fs"); const value=JSON.parse(fs.readFileSync(process.argv[1], "utf8")).runtime_set_hash; if (typeof value !== "string" || value.length === 0) process.exit(1); process.stdout.write(value);' "${RUNTIME_DIST_DIR}/effindom.v2.manifest.json")"
 cat > "${OUT_DIR}/effindom-runtime-config.js" << RUNTIMECFG

package/src/bitmap.rs

@@ -5,6 +5,7 @@ use crate::frame_scheduler::on_loaded;
 use crate::logger::error;
 use crate::node::Node;
 use crate::text::TextLayout;
+use crate::typography::FontFace;
 use std::cell::RefCell;
 use std::rc::Rc;
 
@@ -136,6 +137,7 @@ impl Bitmap {
     }
 
     pub fn prepare_text<T: Node>(node: &T) {
+        node.build();
         crate::bindings::ui::prepare_node(node.handle().raw());
     }
 
@@ -145,9 +147,17 @@ impl Bitmap {
         callback: impl FnOnce(BitmapTextReadyEventArgs) + 'static,
     ) -> &Self {
         let node = node.clone();
-        on_loaded(move |_| {
-            Self::prepare_text(&node);
-            callback(BitmapTextReadyEventArgs::EMPTY);
+        let required_font_ids = node.required_font_ids_for_preparation();
+        let callback = Rc::new(RefCell::new(Some(callback)));
+        FontFace::when_fonts_loaded(&required_font_ids, move |_| {
+            let node = node.clone();
+            let callback = callback.clone();
+            on_loaded(move |_| {
+                Self::prepare_text(&node);
+                if let Some(callback) = callback.borrow_mut().take() {
+                    callback(BitmapTextReadyEventArgs::EMPTY);
+                }
+            });
         });
         self
     }
@@ -255,6 +265,10 @@ mod tests {
     use super::Bitmap;
     use crate::drawing::Paint;
     use crate::ffi::{self, Call};
+    use crate::frame_scheduler;
+    use crate::node::{Node, TextNode};
+    use std::cell::Cell;
+    use std::rc::Rc;
 
     #[test]
     fn bitmap_canvas_commit_flushes_offscreen_and_marks_asset_ready() {
@@ -314,4 +328,26 @@ mod tests {
             }
         )));
     }
+
+    #[test]
+    fn bitmap_text_ready_builds_detached_text_before_preparing_it() {
+        ffi::test::reset();
+        frame_scheduler::reset_commit_state();
+        let bitmap = Bitmap::new(64, 32);
+        let text = TextNode::new("Detached bitmap text");
+        let fired = Rc::new(Cell::new(false));
+        bitmap.on_text_ready(&text, {
+            let fired = fired.clone();
+            move |_| fired.set(true)
+        });
+
+        frame_scheduler::fire_loaded_callbacks();
+
+        assert!(fired.get());
+        assert!(text.has_built_handle());
+        let calls = ffi::test::take_calls();
+        assert!(calls
+            .iter()
+            .any(|call| matches!(call, Call::PrepareNode { .. })));
+    }
 }

package/src/drawing.rs

@@ -2,7 +2,7 @@ use crate::ffi;
 use crate::image_sampling::ImageSampling;
 use crate::logger::error;
 use crate::node::Node;
-use crate::text::TextLayout;
+use crate::text::{DynamicTextLayout, TextLayout};
 use std::cell::RefCell;
 use std::rc::Rc;
 
@@ -317,6 +317,18 @@ impl DrawContext {
         self.draw_text_node(&node, x, y);
     }
 
+    pub fn draw_dynamic_text_layout(&self, layout: &DynamicTextLayout, x: f32, y: f32) {
+        if !layout.is_ready() {
+            error(
+                "DynamicTextLayout",
+                "DrawContext.draw_dynamic_text_layout() called before the DynamicTextLayout was ready; register on_ready and draw after the callback.",
+            );
+            return;
+        }
+        let node = layout.draw_node();
+        self.draw_text_node(&node, x, y);
+    }
+
     pub fn draw_image(&self, texture_id: u32, x: f32, y: f32, w: f32, h: f32) {
         self.draw_image_sampling(texture_id, x, y, w, h, ImageSampling::linear());
     }
@@ -355,8 +367,13 @@ impl DrawContext {
 #[cfg(test)]
 mod tests {
     use super::{DrawContext, Paint, Path};
+    use crate::assets;
     use crate::ffi::{self, Call};
+    use crate::frame_scheduler;
     use crate::image_sampling::ImageSampling;
+    use crate::text::DynamicTextLayout;
+    use crate::typography::FontStack;
+    use crate::Unit;
 
     #[test]
     fn path_and_draw_context_emit_batched_host_calls() {
@@ -386,4 +403,33 @@ mod tests {
             Call::CanvasDrawBatch { canvas_ptr: 77, words } if !words.is_empty()
         )));
     }
+
+    #[test]
+    fn draw_dynamic_text_layout_emits_text_command_without_exposing_draw_node() {
+        ffi::test::reset();
+        frame_scheduler::reset_commit_state();
+        assets::test_reset();
+
+        let layout = DynamicTextLayout::fixed_charset("0123456789");
+        layout
+            .font_stack(FontStack::from_id(1), 14.0)
+            .width(72.0, Unit::Pixel)
+            .height(20.0, Unit::Pixel)
+            .set_text("42");
+        layout.on_ready(|_| {});
+        frame_scheduler::fire_loaded_callbacks();
+        assert!(layout.is_ready());
+        ffi::test::take_calls();
+
+        let ctx = DrawContext::new(88);
+        ctx.draw_dynamic_text_layout(&layout, 5.0, 7.0);
+        ctx.flush();
+
+        let calls = ffi::test::take_calls();
+        assert!(calls.iter().any(|call| matches!(
+            call,
+            Call::CanvasDrawBatch { canvas_ptr: 88, words }
+                if words.first() == Some(&super::OP_DRAW_TEXT_NODE)
+        )));
+    }
 }

package/src/node/core.rs

@@ -1577,6 +1577,11 @@ pub trait Node: Clone {
     #[doc(hidden)]
     fn build_self(&self);
 
+    #[doc(hidden)]
+    fn required_font_ids_for_preparation(&self) -> Vec<u32> {
+        Vec::new()
+    }
+
     fn node_id(&self, node_id: impl Into<String>) -> &Self
     where
         Self: Sized,

package/src/node/text_node.rs

@@ -655,6 +655,10 @@ impl Node for TextNode {
             self.core.borrow().behavior.clone(),
         );
     }
+
+    fn required_font_ids_for_preparation(&self) -> Vec<u32> {
+        self.required_font_ids()
+    }
 }
 
 impl super::ThemeBindable for TextNode {

package/src/text.rs

@@ -255,6 +255,10 @@ impl Node for RichText {
     fn build_self(&self) {
         self.node.build_self();
     }
+
+    fn required_font_ids_for_preparation(&self) -> Vec<u32> {
+        self.node.required_font_ids()
+    }
 }
 
 fn compile_rich_text_state(state: &RichTextState) -> CompiledRichText {
@@ -781,6 +785,8 @@ impl DynamicTextLayout {
         layout.set_text(value);
         if was_ready {
             layout.prepare_or_wait();
+        } else {
+            layout.schedule_ready();
         }
         true
     }
@@ -853,12 +859,15 @@ impl DynamicTextLayout {
         value.chars().all(|ch| charset.contains(ch))
     }
 
-    fn include_in_charset(state: &mut DynamicTextLayoutState, value: &str) {
+    fn include_in_charset(state: &mut DynamicTextLayoutState, value: &str) -> bool {
+        let mut changed = false;
         for ch in value.chars() {
             if !state.charset.contains(ch) {
                 state.charset.push(ch);
+                changed = true;
             }
         }
+        changed
     }
 
     fn refresh_numeric_text(&self) {
@@ -880,12 +889,14 @@ impl DynamicTextLayout {
         let mut state = self.inner.borrow_mut();
         let prefix = state.numeric_prefix.clone();
         let suffix = state.numeric_suffix.clone();
-        Self::include_in_charset(&mut state, &prefix);
-        Self::include_in_charset(&mut state, &suffix);
+        let charset_changed = Self::include_in_charset(&mut state, &prefix)
+            | Self::include_in_charset(&mut state, &suffix);
         let charset = state.charset.clone();
         let layout = state.layout.clone();
         drop(state);
-        layout.set_dynamic_charset_internal(charset);
+        if charset_changed {
+            layout.set_dynamic_charset_internal(charset);
+        }
         format!("{prefix}{}{suffix}", self.format_numeric_value(value))
     }
 
@@ -1077,4 +1088,30 @@ mod tests {
             .iter()
             .any(|call| matches!(call, Call::SetDynamicTextCharset { charset, .. } if charset == "0123456789")));
     }
+
+    #[test]
+    fn numeric_dynamic_text_layout_stays_ready_across_value_updates() {
+        ffi::test::reset();
+        frame_scheduler::reset_commit_state();
+        assets::test_reset();
+
+        let layout = DynamicTextLayout::numeric();
+        layout
+            .precision(0)
+            .font_stack(crate::typography::FontStack::from_id(1), 16.0)
+            .width(120.0, Unit::Pixel)
+            .height(24.0, Unit::Pixel)
+            .on_ready(|_| {});
+        frame_scheduler::fire_loaded_callbacks();
+        assert!(layout.is_ready());
+        ffi::test::take_calls();
+
+        assert!(layout.set_value(42.0));
+        assert!(layout.is_ready());
+        assert_eq!(layout.current_text(), "42");
+        let calls = ffi::test::take_calls();
+        assert!(calls
+            .iter()
+            .any(|call| matches!(call, Call::PrepareNode { .. })));
+    }
 }

package/src/typography.rs

@@ -158,7 +158,7 @@ impl FontFace {
     }
 
     pub(crate) fn is_font_loaded(font_id: u32) -> bool {
-        font_id == 0 || assets::is_font_loaded(font_id)
+        font_id == 0 || (1..=6).contains(&font_id) || assets::is_font_loaded(font_id)
     }
 
     pub fn on_loaded(&self, callback: impl Fn(FontFaceLoadedEventArgs) + 'static) -> Self {
@@ -502,6 +502,14 @@ mod tests {
         assert_eq!(fired.get(), 1);
     }
 
+    #[test]
+    fn built_in_font_faces_are_preloaded_like_fui_as() {
+        assets::test_reset();
+        for font_id in 1..=6 {
+            assert!(FontFace::new(font_id).is_loaded());
+        }
+    }
+
     #[test]
     fn font_stack_reports_required_font_ids() {
         let stack = FontStack::from_id(1)