blitz-pdf 0.1.7 → 0.1.8

package/vendor/blitz-dom/src/layout/replaced.rs

@@ -141,10 +141,8 @@ pub fn compute_replaced_layout(
     // element get no preferred aspect ratio at all.
     let is_usable_ratio = |ratio: &f32| ratio.is_finite() && *ratio > 0.0;
     let intrinsic = context.intrinsic_sizes;
-    let aspect_ratio: Option<f32> = style
-        .aspect_ratio()
-        .filter(is_usable_ratio)
-        .or(intrinsic.ratio.filter(is_usable_ratio));
+    let style_aspect_ratio = style.aspect_ratio().filter(is_usable_ratio);
+    let aspect_ratio: Option<f32> = style_aspect_ratio.or(intrinsic.ratio.filter(is_usable_ratio));
 
     // Concrete object size per the CSS default sizing algorithm with no
     // specified size (https://drafts.csswg.org/css-images/#default-sizing):
@@ -200,6 +198,17 @@ pub fn compute_replaced_layout(
             None => default_size,
         },
     };
+    // The `aspect-ratio` property coerces the natural height to match the natural width, in the
+    // box-sizing box (https://github.com/w3c/csswg-drafts/issues/11236).
+    let inherent_size = match style_aspect_ratio {
+        Some(ratio) => Size {
+            width: inherent_size.width,
+            height: ((inherent_size.width + box_sizing_adjustment.width) / ratio
+                - box_sizing_adjustment.height)
+                .max(0.0),
+        },
+        None => inherent_size,
+    };
 
     // Percentages are only resolved against zero in the inline axis.
     // See https://www.w3.org/TR/css-sizing-3/#replaced-percentage-min-contribution

package/vendor/blitz-dom/src/mutator.rs

@@ -15,6 +15,7 @@ use blitz_traits::shell::Viewport;
 use style::Atom;
 use style::invalidation::element::restyle_hints::RestyleHint;
 use style::stylesheets::OriginSet;
+use style_dom::ElementState;
 use thin_vec::ThinVec;
 
 macro_rules! tag_and_attr {
@@ -347,6 +348,10 @@ impl DocumentMutator<'_> {
             element.id = Some(Atom::from(value))
         }
 
+        if *attr == local_name!("class") {
+            element.classes = crate::node::parse_classes(value);
+        }
+
         if *attr == local_name!("value") {
             if let Some(input_data) = element.text_input_data_mut() {
                 // Update text input value
@@ -452,6 +457,10 @@ impl DocumentMutator<'_> {
             element.id = None;
         }
 
+        if name.local == local_name!("class") {
+            element.classes.clear();
+        }
+
         // As in `set_attribute`: taking one of these away can make the element
         // unfocusable again.
         if name.local == local_name!("tabindex")
@@ -670,6 +679,12 @@ impl DocumentMutator<'_> {
     ) {
         let new_parent_is_in_document = self.doc.nodes[parent_id].flags.is_in_document();
         self.mutations_occurred |= new_parent_is_in_document && !child_ids.is_empty();
+
+        // If one of the moved subtrees contains the focused node, the ancestors it is
+        // detached from stop matching :focus-within. Record them while the parent links
+        // are still intact; the state is transferred after the children are reattached.
+        let mut focus_within_old_chain: Option<Vec<NodeId>> = None;
+
         // Detach the children from their old parents *before* inserting them into
         // the new parent (matching DOM `insertBefore` semantics). If a child is
         // being moved within the same parent then detaching it after insertion
@@ -677,6 +692,11 @@ impl DocumentMutator<'_> {
         // parent's child list, and anchor indices would be computed against a
         // child list that still contains the moved nodes.
         for child_id in child_ids.iter().copied() {
+            let child = &self.doc.nodes[child_id];
+            if child.contains_focus() {
+                focus_within_old_chain = Some(self.doc.maybe_node_element_ancestors(child.parent));
+            }
+
             let child = &mut self.doc.nodes[child_id];
             let child_was_in_doc = child.flags.is_in_document();
             self.mutations_occurred |= child_was_in_doc;
@@ -732,6 +752,33 @@ impl DocumentMutator<'_> {
             }
         }
 
+        // Transfer :focus-within from the old ancestor chain to the new one (the
+        // shared prefix stays). If the subtree left the document, the focus was
+        // cleared with it and only the old chain needs the state removed.
+        if let Some(old_chain) = focus_within_old_chain {
+            let new_chain = match self.doc.focus_node_id {
+                Some(_) => self.doc.node_element_ancestors(parent_id),
+                None => Vec::new(),
+            };
+            let same_count = old_chain
+                .iter()
+                .zip(&new_chain)
+                .take_while(|(o, n)| o == n)
+                .count();
+            for &id in old_chain.iter().skip(same_count) {
+                self.doc
+                    .snapshot_node_and(id, ElementState::FOCUS_WITHIN, |node| {
+                        node.remove_focus_within()
+                    });
+            }
+            for &id in new_chain.iter().skip(same_count) {
+                self.doc
+                    .snapshot_node_and(id, ElementState::FOCUS_WITHIN, |node| {
+                        node.add_focus_within()
+                    });
+            }
+        }
+
         self.maybe_record_node(parent_id);
     }
 

package/vendor/blitz-dom/src/node/element.rs

@@ -42,6 +42,10 @@ macro_rules! local_names {
     };
 }
 
+pub(crate) fn parse_classes(value: &str) -> ThinVec<Atom> {
+    value.split_ascii_whitespace().map(Atom::from).collect()
+}
+
 pub struct ElementData {
     /// The elements tag name, namespace and prefix
     pub name: QualName,
@@ -49,6 +53,12 @@ pub struct ElementData {
     /// The elements id attribute parsed as an atom (if it has one)
     pub id: Option<Atom>,
 
+    /// The elements class attribute split into atoms (empty if it has none).
+    /// Kept in sync with `attrs` by `ElementData::new` and the mutator's
+    /// `set_attribute`/`remove_attribute`, so selector matching can compare
+    /// atoms instead of re-splitting and re-interning the attribute string.
+    pub classes: ThinVec<Atom>,
+
     /// The element's attributes
     pub attrs: Attributes,
 
@@ -300,6 +310,7 @@ impl Clone for ElementData {
         Self {
             name: self.name.clone(),
             id: self.id.clone(),
+            classes: self.classes.clone(),
             attrs: self.attrs.clone(),
             is_focussable: self.is_focussable,
             style_attribute: self.style_attribute.clone(),
@@ -404,10 +415,16 @@ impl ElementData {
             .find(|attr| &attr.name.local == "id")
             .map(|attr| attr.value.as_ref())
             .map(|value: &str| Atom::from(value));
+        let classes = attrs
+            .iter()
+            .find(|attr| &attr.name.local == "class")
+            .map(|attr| parse_classes(&attr.value))
+            .unwrap_or_default();
 
         let mut data = ElementData {
             name,
             id: id_attr_atom,
+            classes,
             attrs: Attributes::new(attrs),
             is_focussable: false,
             style_attribute: Default::default(),

package/vendor/blitz-dom/src/node/mod.rs

@@ -17,6 +17,7 @@ pub use attributes::{Attribute, Attributes};
 pub use custom_widget::{
     ComputedStyles, CustomWidgetData, CustomWidgetStatus, ProxyRenderContext, Widget,
 };
+pub(crate) use element::parse_classes;
 pub use element::{
     CanvasData, DocumentData, ElementData, ImageData, ImageResourceData, LayoutData,
     ListItemLayout, ListItemLayoutPosition, Marker, RasterImageData, SpecialElementData,

package/vendor/blitz-dom/src/node/node.rs

@@ -122,6 +122,10 @@ pub struct Node {
 
     // Flags
     pub flags: NodeFlags,
+    /// Whether the node's box is out of flow (absolutely positioned and not `display: none`).
+    /// Written by the style traversal from the node's new primary style, so that layout
+    /// passes can test it without reading styles.
+    pub out_of_flow: AtomicBool,
 
     /// Node type (Element, TextNode, etc) specific data.
     ///
@@ -418,6 +422,7 @@ impl Node {
             sc_contribution_cache: RefCell::new(ThinVec::new()),
 
             flags: NodeFlags::empty(),
+            out_of_flow: AtomicBool::new(false),
             data,
         }
     }
@@ -715,6 +720,29 @@ impl Node {
             .is_some_and(|data| data.element_state.contains(ElementState::HOVER))
     }
 
+    /// Mark this node as containing focus (`:focus-within`). Set on the
+    /// focused element and all of its DOM ancestors.
+    pub fn add_focus_within(&mut self) {
+        if let Some(data) = self.element_data_mut() {
+            data.element_state.insert(ElementState::FOCUS_WITHIN);
+        }
+        self.mark_ancestors_dirty();
+    }
+
+    /// Mark this node as no longer containing focus (`:focus-within`).
+    pub fn remove_focus_within(&mut self) {
+        if let Some(data) = self.element_data_mut() {
+            data.element_state.remove(ElementState::FOCUS_WITHIN);
+        }
+        self.mark_ancestors_dirty();
+    }
+
+    /// Whether this node is the focused node or one of its DOM ancestors (`:focus-within`).
+    pub fn contains_focus(&self) -> bool {
+        self.element_data()
+            .is_some_and(|data| data.element_state.contains(ElementState::FOCUS_WITHIN))
+    }
+
     pub fn focus(&mut self, shell_provider: Arc<dyn ShellProvider>) {
         if let Some(data) = self.element_data_mut() {
             data.element_state
@@ -1222,11 +1250,15 @@ impl Node {
     /// block's hoisted child list rather than from its parent (`display: none` boxes
     /// generate no box and are never hoisted).
     pub fn is_out_of_flow(&self) -> bool {
-        self.primary_styles().is_some_and(|s| {
-            let box_style = s.get_box();
-            stylo_taffy::convert::position(box_style.position).is_out_of_flow()
-                && stylo_taffy::convert::display(box_style.display) != taffy::Display::None
-        })
+        self.primary_styles()
+            .is_some_and(|s| style_is_out_of_flow(&s))
+    }
+
+    /// Record in [`Node::out_of_flow`] whether `style` (the node's new primary style)
+    /// makes its box out of flow.
+    pub(crate) fn record_out_of_flow(&self, style: &ComputedValues) {
+        self.out_of_flow
+            .store(style_is_out_of_flow(style), Ordering::Relaxed);
     }
 
     pub fn text_content(&self) -> String {
@@ -1947,6 +1979,15 @@ impl std::fmt::Debug for Node {
     }
 }
 
+/// Whether a box with `style` is out of flow: Taffy positions it from its containing
+/// block's hoisted child list rather than from its parent (`display: none` boxes generate
+/// no box and are never hoisted).
+pub(crate) fn style_is_out_of_flow(style: &ComputedValues) -> bool {
+    let box_style = style.get_box();
+    matches!(box_style.position, Position::Absolute | Position::Fixed)
+        && !box_style.display.is_none()
+}
+
 #[cfg(test)]
 mod test {
     use style_dom::ElementState;

package/vendor/blitz-dom/src/node/text.rs

@@ -3,7 +3,7 @@ use blitz_traits::{
     node_id::NodeId,
     shell::ShellProvider,
 };
-use keyboard_types::{Key, Modifiers};
+use keyboard_types::{Key, Modifiers, NamedKey};
 use parley::{ContentWidths, FontContext, LayoutContext};
 
 use crate::util::ACTION_MOD;
@@ -249,7 +249,7 @@ impl TextInputData {
                 }
                 return Some(GeneratedTextInputEvent::Select);
             }
-            Key::ArrowLeft => {
+            Key::Named(NamedKey::ArrowLeft) => {
                 if action_mod {
                     if shift {
                         driver.select_word_left()
@@ -263,7 +263,7 @@ impl TextInputData {
                 }
                 return Some(GeneratedTextInputEvent::Select);
             }
-            Key::ArrowRight => {
+            Key::Named(NamedKey::ArrowRight) => {
                 if action_mod {
                     if shift {
                         driver.select_word_right()
@@ -277,7 +277,7 @@ impl TextInputData {
                 }
                 return Some(GeneratedTextInputEvent::Select);
             }
-            Key::ArrowUp => {
+            Key::Named(NamedKey::ArrowUp) => {
                 if shift {
                     driver.select_up()
                 } else {
@@ -285,7 +285,7 @@ impl TextInputData {
                 }
                 return Some(GeneratedTextInputEvent::Select);
             }
-            Key::ArrowDown => {
+            Key::Named(NamedKey::ArrowDown) => {
                 if shift {
                     driver.select_down()
                 } else {
@@ -293,7 +293,7 @@ impl TextInputData {
                 }
                 return Some(GeneratedTextInputEvent::Select);
             }
-            Key::Home => {
+            Key::Named(NamedKey::Home) => {
                 if action_mod {
                     if shift {
                         driver.select_to_text_start()
@@ -307,7 +307,7 @@ impl TextInputData {
                 }
                 return Some(GeneratedTextInputEvent::Select);
             }
-            Key::End => {
+            Key::Named(NamedKey::End) => {
                 if action_mod {
                     if shift {
                         driver.select_to_text_end()
@@ -321,7 +321,7 @@ impl TextInputData {
                 }
                 return Some(GeneratedTextInputEvent::Select);
             }
-            Key::Delete => {
+            Key::Named(NamedKey::Delete) => {
                 if action_mod {
                     driver.delete_word()
                 } else {
@@ -332,7 +332,7 @@ impl TextInputData {
 
             // On macOS this is handled by the apple standard keybindings
             #[cfg(not(target_os = "macos"))]
-            Key::Backspace => {
+            Key::Named(NamedKey::Backspace) => {
                 if action_mod {
                     driver.backdelete_word()
                 } else {
@@ -349,7 +349,7 @@ impl TextInputData {
                     return Some(GeneratedTextInputEvent::Submit);
                 }
             }
-            Key::Enter => {
+            Key::Named(NamedKey::Enter) => {
                 if is_multiline {
                     driver.insert_or_replace_selection("\n");
                     return Some(GeneratedTextInputEvent::Input);
@@ -358,7 +358,7 @@ impl TextInputData {
                 }
             }
             Key::Character(s)
-                if !mods.contains(Modifiers::CONTROL) && !mods.contains(Modifiers::SUPER) =>
+                if !mods.contains(Modifiers::CONTROL) && !mods.contains(Modifiers::META) =>
             {
                 driver.insert_or_replace_selection(&s);
                 return Some(GeneratedTextInputEvent::Input);

package/vendor/blitz-dom/src/resolve.rs

@@ -26,10 +26,10 @@ use crate::{
         LayoutPassState,
         construct::{
             ConstructionTask, ConstructionTaskData, ConstructionTaskResult,
-            ConstructionTaskResultData, LayoutChildren, build_inline_layout_into,
-            collect_layout_children,
+            ConstructionTaskResultData, LayoutChildren, collect_layout_children,
         },
         damage::{ALL_DAMAGE, CONSTRUCT_BOX, CONSTRUCT_DESCENDENT, CONSTRUCT_FC},
+        inline::build_inline_layout_into,
     },
     node::TextBrush,
 };

package/vendor/blitz-dom/src/stylo.rs

@@ -26,6 +26,13 @@ use style::bloom::each_relevant_element_hash;
 use style::color::AbsoluteColor;
 use style::data::{ElementDataMut, ElementDataRef};
 use style::global_style_data::STYLE_THREAD_POOL;
+
+/// Serialises `Parallel` style traversals across documents. Stylo's per-worker
+/// caches (`StyleSharingCache`, `StyleBloom`) live in native thread-locals that
+/// a traversal borrows mutably for its whole duration, so two traversals in
+/// flight on the shared pool at once panic with `already mutably borrowed`
+/// (<https://github.com/DioxusLabs/blitz/issues/430>).
+static PARALLEL_TRAVERSAL_LOCK: Mutex<()> = Mutex::new(());
 use style::invalidation::element::restyle_hints::RestyleHint;
 use style::properties::ComputedValues;
 use style::properties::{Importance, PropertyDeclaration};
@@ -147,8 +154,13 @@ impl crate::document::BaseDocument {
             // Style the elements, resolving their data
             let mut traverser = RecalcStyle::new(context);
             // `Sequential` bypasses Stylo's global pool. See `StyleThreading`.
-            let pool_guard = matches!(self.style_threading, StyleThreading::Parallel)
-                .then(|| STYLE_THREAD_POOL.pool());
+            let parallel = matches!(self.style_threading, StyleThreading::Parallel);
+            let _traversal_lock = parallel.then(|| {
+                PARALLEL_TRAVERSAL_LOCK
+                    .lock()
+                    .unwrap_or_else(|e| e.into_inner())
+            });
+            let pool_guard = parallel.then(|| STYLE_THREAD_POOL.pool());
             let rayon_pool = pool_guard.as_ref().and_then(|g| g.as_ref());
             style::driver::traverse_dom(&traverser, token, rayon_pool);
             nodes_needing_style_image_flush =
@@ -474,7 +486,9 @@ impl selectors::Element for BlitzNode<'_> {
             NonTSPseudoClass::Disabled => self.element_state().contains(ElementState::DISABLED),
             NonTSPseudoClass::Enabled => self.element_state().contains(ElementState::ENABLED),
             NonTSPseudoClass::Focus => self.element_state().contains(ElementState::FOCUS),
-            NonTSPseudoClass::FocusWithin => false,
+            NonTSPseudoClass::FocusWithin => {
+                self.element_state().contains(ElementState::FOCUS_WITHIN)
+            }
             NonTSPseudoClass::FocusVisible => false,
             NonTSPseudoClass::Fullscreen => false,
             NonTSPseudoClass::Hover => self.element_state().contains(ElementState::HOVER),
@@ -569,18 +583,11 @@ impl selectors::Element for BlitzNode<'_> {
         search_name: &<Self::Impl as selectors::SelectorImpl>::Identifier,
         case_sensitivity: selectors::attr::CaseSensitivity,
     ) -> bool {
-        let class_attr = self.data.attr(local_name!("class"));
-        if let Some(class_attr) = class_attr {
-            // split the class attribute
-            for pheme in class_attr.split_ascii_whitespace() {
-                let atom = Atom::from(pheme);
-                if case_sensitivity.eq_atom(&atom, search_name) {
-                    return true;
-                }
-            }
-        }
-
-        false
+        self.element_data().is_some_and(|data| {
+            data.classes
+                .iter()
+                .any(|class| case_sensitivity.eq_atom(class, search_name))
+        })
     }
 
     fn imported_part(
@@ -687,12 +694,9 @@ impl<'a> TElement for BlitzNode<'a> {
     where
         F: FnMut(&style::values::AtomIdent),
     {
-        let class_attr = self.data.attr(local_name!("class"));
-        if let Some(class_attr) = class_attr {
-            // split the class attribute
-            for pheme in class_attr.split_ascii_whitespace() {
-                let atom = Atom::from(pheme); // interns the string
-                callback(AtomIdent::cast(&atom));
+        if let Some(data) = self.element_data() {
+            for class in &data.classes {
+                callback(AtomIdent::cast(class));
             }
         }
     }
@@ -703,7 +707,7 @@ impl<'a> TElement for BlitzNode<'a> {
     {
         if let Some(attrs) = self.data.attrs() {
             for attr in attrs.iter() {
-                callback(&GenericAtomIdent(attr.name.local.clone()));
+                callback(GenericAtomIdent::cast(&attr.name.local));
             }
         }
     }
@@ -1335,6 +1339,9 @@ impl<'dom> DomTraversal<BlitzNode<'dom>> for RecalcStyle<'_> {
             recalc_style_at(self, context, el, &mut data, note_child);
 
             sync_pseudo_element_styles(el, &data, &self.nodes_needing_style_image_flush);
+            if let Some(style) = data.styles.get_primary() {
+                el.record_out_of_flow(style);
+            }
 
             if !data.damage.is_empty() {
                 // Mark the ancestor chain so that the damage propagation pass
@@ -1449,6 +1456,7 @@ fn sync_pseudo_element_styles(
                     .push(pe_node_id);
             }
         }
+        pe_node.record_out_of_flow(&pe_style);
         pe_data.styles.primary = Some(pe_style);
         pe_data.set_restyled();
     }

package/vendor/blitz-dom/src/util.rs

@@ -5,7 +5,7 @@ use std::borrow::Cow;
 use style::color::AbsoluteColor;
 
 #[cfg(target_os = "macos")]
-pub(crate) const ACTION_MOD: Modifiers = Modifiers::SUPER;
+pub(crate) const ACTION_MOD: Modifiers = Modifiers::META;
 #[cfg(not(target_os = "macos"))]
 pub(crate) const ACTION_MOD: Modifiers = Modifiers::CONTROL;
 

package/vendor/blitz-paint/Cargo.toml

@@ -2,7 +2,7 @@
 name = "blitz-paint"
 description = "Paint a Blitz Document using anyrender"
 documentation = "https://docs.rs/blitz-paint"
-version = "0.3.0-beta.3"
+version = "0.3.0-beta.4"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/dioxuslabs/blitz"
 repository = "https://github.com/dioxuslabs/blitz"
@@ -26,15 +26,15 @@ scrollbars = ["blitz-dom/scrollbars"]
 # Blitz dependencies
 anyrender = { version = "0.14.0" }
 anyrender_svg = { version = "0.15.0", optional = true }
-blitz-traits = { version = "=0.3.0-beta.3", default-features = false, git = "https://github.com/DioxusLabs/blitz", rev = "e72650a6e67941852fddf025295cfee30c39ea32" }
-blitz-dom = { version = "=0.3.0-beta.3", default-features = false, git = "https://github.com/DioxusLabs/blitz", rev = "e72650a6e67941852fddf025295cfee30c39ea32" }
+blitz-traits = { version = "=0.3.0-beta.4", default-features = false, git = "https://github.com/DioxusLabs/blitz", rev = "f8723f495c7c6bfb611a923a21ed5c8e0fe95d55" }
+blitz-dom = { version = "=0.3.0-beta.4", default-features = false, git = "https://github.com/DioxusLabs/blitz", rev = "f8723f495c7c6bfb611a923a21ed5c8e0fe95d55" }
 
 # Servo dependencies
 style = { version = "0.22.0", package = "stylo" }
 euclid = { version = "0.22" }
 
 # DioxusLabs dependencies
-taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "6c2106e3df79493d304f954dc2cd4a4a382981d3", default-features = false, features = ["std", "flexbox", "flexbox_balance", "grid", "block_layout", "content_size", "calc", "detailed_layout_info"] }
+taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "4e59968eda29ceeb0bbaeb3993c8cd38baa3d0a6", default-features = false, features = ["std", "flexbox", "flexbox_balance", "grid", "block_layout", "content_size", "calc", "detailed_layout_info"] }
 
 # Linebender + WGPU dependencies
 parley = { version = "0.12", default-features = false, features = ["std", "bytemuck"] }

package/wasm/blitz_pdf_bg.wasm

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/wasm/blitz_pdf_bg.wasm
-size: 39720639 bytes
-sha256: 3be4532b454d4d2ca811c12eb0c047f65b18eddc07dd925eabf210d529b00318
+size: 72552047 bytes
+sha256: 50255e9cc08a644ef1e7d8935e4288a6fda60b15a508f601694063f449af6586