@effindomv2/fui-rs 0.1.21 → 0.1.22

package/Cargo.toml

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

package/README.md

@@ -7,27 +7,35 @@ macros for browser-hosted Rust WASM apps.
 
 ## Quickstart
 
+Create a FUI-RS application with the published scaffolder:
+
 ```bash
-# Prerequisites: Rust + wasm32-unknown-unknown target + Binaryen
+# Install Rust and the WebAssembly target once
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+source "$HOME/.cargo/env"
 rustup target add wasm32-unknown-unknown
-brew install binaryen
-
-# Clone and build
-git clone https://github.com/zion-sati/fui-rs.git
-cd fui-rs
-npm ci
-npm run build
-npm run serve
+
+# Create and run an app
+npx @effindomv2/create-fui-rs-app my-app
+cd my-app
+npm install
+npm run dev
 ```
 
-Open:
+For a routed application with one independently built WASM module per route:
 
-```text
-http://127.0.0.1:8080/v2/fui-rs/demo/index.html
+```bash
+npx @effindomv2/create-fui-rs-app my-routed-app -- --template routed
+cd my-routed-app
+npm install
+npm run dev
 ```
 
-Full quickstart: [docs/v2/fui-rs/QUICKSTART.md](../../docs/v2/fui-rs/QUICKSTART.md)
+Install [Binaryen](https://github.com/WebAssembly/binaryen) to make release
+builds run `wasm-opt`. Development builds do not require it.
+
+Application setup, retained-mode guidance, and entrypoint examples are covered
+in the [FUI-RS developer quickstart](../../docs/v2/fui-rs/QUICKSTART.md).
 
 ## Minimal app
 
@@ -46,6 +54,23 @@ fn build_page() -> FlexBox {
 fui_app!(FlexBox, build_page);
 ```
 
+## Rich text
+
+Use `rich_text!` to create retained rich text without manually constructing a
+span vector. String literals become spans, braced expressions provide dynamic
+text, and `span => expression` accepts an existing `RichTextSpan`:
+
+```rust
+let value = 42;
+let suffix = span("!").underline();
+let label = rich_text![
+    "Current value: ".italic(),
+    { format!("{value}") }.bold().text_color(rgb(0x3a, 0xc5, 0x6c)),
+    span => suffix,
+]
+.font_size(18.0);
+```
+
 ## SDK docs
 
 - [SDK docs index](../../docs/v2/fui-rs/SDK_INDEX.md)
@@ -56,6 +81,14 @@ fui_app!(FlexBox, build_page);
 - [Forms and autofill](../../docs/v2/fui-rs/FORMS_AND_AUTOFILL.md)
 - [Theming and style matrix](../../docs/v2/fui-rs/THEMING_STYLE_MATRIX.md)
 
+## Contributing to FUI-RS
+
+The commands above are for developers building applications with the published
+FUI-RS SDK. Contributors working on the SDK, EffinDom runtime, browser bridge,
+or repository demos should follow the
+[FUI-RS contributor quickstart](../../docs/v2/fui-rs/CONTRIBUTOR_QUICKSTART.md).
+It covers the standalone repository toolchain, SDK build, lint, and test lanes.
+
 ## What is included
 
 | Area | Status |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/fui-rs",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "private": false,
   "license": "AGPL-3.0-only OR LicenseRef-EffinDom-Commercial",
   "description": "EffinDom v2 Rust frontend framework SDK and host generators",

package/src/app.rs

@@ -3,7 +3,7 @@ use crate::context_menu_manager;
 use crate::ffi::HandleValue;
 use crate::frame_scheduler;
 use crate::mobile_text_selection_toolbar;
-use crate::node::{flex_box, FlexBox, Node, NodeRef};
+use crate::node::{flex_box, FlexBox, Node, NodeRef, ThemeBindable};
 use crate::panic_hook;
 use crate::selection_handle_adorner;
 use crate::theme;
@@ -95,6 +95,9 @@ fn application_shell<T: Node>(root: &T) -> FlexBox {
         .child(&focus_adorner::create_default_host())
         .child(&tool_tip_manager::ToolTipManager::create_default_host())
         .child(&context_menu_manager::create_default_menu());
+    shell.bind_theme(|shell, theme| {
+        shell.bg_color(theme.colors.background);
+    });
     shell
 }
 

package/src/lib.rs

@@ -63,6 +63,45 @@ macro_rules! children {
     };
 }
 
+#[doc(hidden)]
+#[macro_export]
+macro_rules! __fui_rs_rich_text_spans {
+    (@collect [$($span:expr,)*]) => {
+        vec![$($span,)*]
+    };
+    (@collect [$($span:expr,)*] , $($rest:tt)*) => {
+        $crate::__fui_rs_rich_text_spans!(@collect [$($span,)*] $($rest)*)
+    };
+    (@collect [$($span:expr,)*] span => $value:expr, $($rest:tt)*) => {
+        $crate::__fui_rs_rich_text_spans!(@collect [$($span,)* $value,] $($rest)*)
+    };
+    (@collect [$($span:expr,)*] { $text:expr } $(.$method:ident($($argument:expr),* $(,)?))* , $($rest:tt)*) => {
+        $crate::__fui_rs_rich_text_spans!(@collect [
+            $($span,)*
+            $crate::text::span($text)$(.$method($($argument),*))*,
+        ] $($rest)*)
+    };
+    (@collect [$($span:expr,)*] $text:literal $(.$method:ident($($argument:expr),* $(,)?))* , $($rest:tt)*) => {
+        $crate::__fui_rs_rich_text_spans!(@collect [
+            $($span,)*
+            $crate::text::span($text)$(.$method($($argument),*))*,
+        ] $($rest)*)
+    };
+}
+
+/// Builds retained rich text with fluent span styling.
+///
+/// String literals become spans automatically. Wrap a dynamic text expression
+/// in braces, or use `span => expression` to provide a prebuilt span.
+#[macro_export]
+macro_rules! rich_text {
+    ($($span:tt)*) => {
+        $crate::text::RichText::new(
+            $crate::__fui_rs_rich_text_spans!(@collect [] $($span)* ,)
+        )
+    };
+}
+
 pub trait Configure: Sized {
     fn configure(self, configure: impl FnOnce(&Self)) -> Self {
         configure(&self);
@@ -525,7 +564,7 @@ pub mod prelude {
     pub use crate::worker_job::{WorkerJob, WorkerJobState};
     #[cfg(feature = "worker-runtime")]
     pub use crate::worker_runtime::{file_read_chunk, file_worker_write_chunk, WorkerRuntime};
-    pub use crate::{children, fui_app, fui_managed_app, ui, Configure};
+    pub use crate::{children, fui_app, fui_managed_app, rich_text, ui, Configure};
 }
 
 pub use animation::{