fix style schedule (#965)

Author: jrmoulton

src/context.rs

@@ -669,14 +669,23 @@ impl<'a> StyleCx<'a> {
 
         let view_interact_state = self.get_interact_state(&view_id);
         self.disabled = view_interact_state.is_disabled;
-        let mut new_frame = view_id.state().borrow_mut().compute_combined(
+        let (mut new_frame, classes_applied) = view_id.state().borrow_mut().compute_combined(
             view_style,
             view_interact_state,
             self.window_state.screen_size_bp,
             view_class,
             &self.current,
             self.hidden,
         );
+        if classes_applied {
+            let children = view_id.children();
+            for child in children {
+                let view_state = child.state();
+                let mut state = view_state.borrow_mut();
+                state.request_style_recursive = true;
+                state.requested_changes.insert(ChangeFlags::STYLE);
+            }
+        }
 
         self.direct = view_state.borrow().combined_style.clone();
         Style::apply_only_inherited(&mut self.current, &self.direct);
@@ -708,6 +717,10 @@ impl<'a> StyleCx<'a> {
                 &self.now,
                 &mut new_frame,
             );
+            if new_frame {
+                // if any transitioning layout props, shedule layout
+                self.window_state.schedule_layout(view_id);
+            }
 
             view_state.view_style_props.read_explicit(
                 &self.direct,
@@ -724,7 +737,7 @@ impl<'a> StyleCx<'a> {
         let taffy_style = self.direct.clone().apply(layout_style).to_taffy_style();
         if taffy_style != view_state.borrow().taffy_style {
             view_state.borrow_mut().taffy_style = taffy_style;
-            view_id.request_layout();
+            self.window_state.schedule_layout(view_id);
         }
 
         view.borrow_mut().style_pass(self);
@@ -961,6 +974,9 @@ impl<'a> ComputeLayoutCx<'a> {
             layout_rect
         };
 
+        let transform = view_state.borrow().transform;
+        let layout_rect = transform.transform_rect_bbox(layout_rect);
+
         view_state.borrow_mut().layout_rect = layout_rect;
 
         self.restore();

src/style.rs

@@ -2011,13 +2011,14 @@ pub(crate) fn screen_size_bp_to_key(breakpoint: ScreenSizeBp) -> StyleKey {
     }
 }
 
+/// the bool in the return is a classes_applied flag. if a new class has been applied, we need to do a request_style_recursive
 pub(crate) fn resolve_nested_maps(
     style: Style,
     interact_state: &InteractionState,
     screen_size_bp: ScreenSizeBp,
     classes: &[StyleClassRef],
     context: &mut Style,
-) -> Style {
+) -> (Style, bool) {
     // Start with depth 0 for the initial call
     resolve_nested_maps_internal(style, interact_state, screen_size_bp, context, classes, 0)
 }
@@ -2029,13 +2030,14 @@ fn resolve_nested_maps_internal(
     context: &mut Style,
     classes: &[StyleClassRef],
     depth: u32,
-) -> Style {
+) -> (Style, bool) {
     const MAX_DEPTH: u32 = 6;
     if depth >= MAX_DEPTH {
-        return style;
+        return (style, false);
     }
 
     let mut changed = false;
+    let mut classes_applied = false;
 
     let old_style = style.clone();
     style = style.apply_classes_from_context(classes, context);
@@ -2044,6 +2046,7 @@ fn resolve_nested_maps_internal(
             context.remove_nested_map(class.key);
         }
         changed = true;
+        classes_applied = true;
     }
 
     // Apply context mappings first
@@ -2153,17 +2156,19 @@ fn resolve_nested_maps_internal(
 
     // Recurse once at the end if anything changed
     if changed && depth + 1 < MAX_DEPTH {
-        style = resolve_nested_maps_internal(
+        let (new_style, recursive_classes_applied) = resolve_nested_maps_internal(
             style,
             interact_state,
             screen_size_bp,
             context,
             classes,
             depth + 1,
         );
+        style = new_style;
+        classes_applied |= recursive_classes_applied;
     }
 
-    style
+    (style, classes_applied)
 }
 
 #[derive(Default, Clone)]

src/view_state.rs

@@ -236,6 +236,7 @@ impl ViewState {
         }
     }
 
+    /// the first returned bool is new_frame. the second is classes_applied
     /// Returns `true` if a new frame is requested.
     ///
     // The context has the nested maps of classes and inherited properties
@@ -248,7 +249,7 @@ impl ViewState {
         view_class: Option<StyleClassRef>,
         context: &Style,
         cx_hidden: bool,
-    ) -> bool {
+    ) -> (bool, bool) {
         let mut new_frame = false;
 
         // Build the initial combined style
@@ -266,14 +267,17 @@ impl ViewState {
         }
 
         let mut new_context = context.clone();
+        let mut new_classes = false;
 
-        combined_style = resolve_nested_maps(
+        let (resolved_style, classes_applied) = resolve_nested_maps(
             combined_style,
             &interact_state,
             screen_size_bp,
             &classes,
             &mut new_context,
         );
+        combined_style = resolved_style;
+        new_classes |= classes_applied;
 
         if let Some(view_style) = &view_style {
             combined_style.apply_mut(view_style.clone());
@@ -283,13 +287,15 @@ impl ViewState {
 
         combined_style.apply_mut(self_style.clone());
 
-        combined_style = resolve_nested_maps(
+        let (resolved_style, classes_applied) = resolve_nested_maps(
             combined_style,
             &interact_state,
             screen_size_bp,
             &classes,
             &mut new_context,
         );
+        combined_style = resolved_style;
+        new_classes |= classes_applied;
 
         // Track if this style has selectors for optimization purposes
         self.has_style_selectors = combined_style.selectors();
@@ -317,7 +323,7 @@ impl ViewState {
         }
 
         self.combined_style = combined_style;
-        new_frame
+        (new_frame, new_classes)
     }
 
     pub(crate) fn has_active_animation(&self) -> bool {