Remove View::children and View::children_mut

src/context.rs

@@ -284,9 +284,10 @@
 
     /// This removes a view from the app state.
     pub fn remove_view(&mut self, view: &mut dyn View) {
-        for child in view.children_mut() {
+        view.for_each_child_mut(&mut |child| {
             self.remove_view(child);
-        }
+            false
+        });
         let id = view.id();
         let view_state = self.view_state(id);
         if let Some(action) = view_state.cleanup_listener.as_ref() {
@@ -1120,11 +1121,12 @@
         // Propagate style requests to children if needed.
         if view_state.request_style_recursive {
             view_state.request_style_recursive = false;
-            for child in view.children() {
+            view.for_each_child(&mut |child| {
                 let state = self.app_state_mut().view_state(child.id());
                 state.request_style_recursive = true;
                 state.request_style = true;
-            }
+                false
+            });
         }
 
         self.app_state

src/inspector.rs

@@ -3,7 +3,7 @@
 use crate::event::{Event, EventListener};
 use crate::id::Id;
 use crate::style::{Style, StyleMapValue};
-use crate::view::View;
+use crate::view::{view_children, View};
 use crate::views::{
     dyn_container, empty, img_dynamic, scroll, stack, static_list, text, v_stack, Decorators, Label,
 };
@@ -54,8 +54,7 @@
             direct_style: computed_style,
             request_style: state.request_style,
             request_layout: state.request_layout,
-            children: view
-                .children()
+            children: view_children(view)
                 .into_iter()
                 .map(|view| Rc::new(CapturedView::capture(view, app_state, clipped)))
                 .collect(),

src/view.rs

@@ -153,25 +153,6 @@
         result
     }
 
-    fn children(&self) -> Vec<&dyn View> {
-        let mut result = Vec::new();
-        self.for_each_child(&mut |view| {
-            result.push(view);
-            false
-        });
-        result
-    }
-
-    /// At the moment, this is used only to build the debug tree.
-    fn children_mut(&mut self) -> Vec<&mut dyn View> {
-        let mut result = Vec::new();
-        self.for_each_child_mut(&mut |view| {
-            result.push(view);
-            false
-        });
-        result
-    }
-
     fn debug_name(&self) -> std::borrow::Cow<'static, str> {
         core::any::type_name::<Self>().into()
     }
@@ -191,9 +172,10 @@
 
     /// Use this method to style the view's children.
     fn style(&mut self, cx: &mut StyleCx<'_>) {
-        for child in self.children_mut() {
-            cx.style_view(child)
-        }
+        self.for_each_child_mut(&mut |child| {
+            cx.style_view(child);
+            false
+        });
     }
 
     /// Use this method to layout the view's children.
@@ -371,6 +353,15 @@
     }
 }
 
+pub(crate) fn view_children(view: &dyn View) -> Vec<&dyn View> {
+    let mut result = Vec::new();
+    view.for_each_child(&mut |view| {
+        result.push(view);
+        false
+    });
+    result
+}
+
 /// Tab navigation finds the next or previous view with the `keyboard_navigatable` status in the tree.
 #[allow(dead_code)]
 pub(crate) fn view_tab_navigation(root_view: &dyn View, app_state: &mut AppState, backwards: bool) {
@@ -399,15 +390,15 @@
     println!("Tab to {new_focus:?}");
 }
 
-fn view_children<'a>(view: &'a dyn View, id_path: &[Id]) -> Vec<&'a dyn View> {
+fn view_filtered_children<'a>(view: &'a dyn View, id_path: &[Id]) -> Vec<&'a dyn View> {
     let id = id_path[0];
     let id_path = &id_path[1..];
 
     if id == view.id() {
         if id_path.is_empty() {
-            view.children()
+            view_children(view)
         } else if let Some(child) = view.child(id_path[0]) {
-            view_children(child, id_path)
+            view_filtered_children(child, id_path)
         } else {
             Vec::new()
         }
@@ -423,7 +414,7 @@
     println!("id is {id:?}");
     println!("id path is {:?}", id_path.0);
 
-    let children = view_children(root_view, &id_path.0);
+    let children = view_filtered_children(root_view, &id_path.0);
 
     println!(
         "children is {:?}",
@@ -469,7 +460,7 @@
         if id_path.len() == 1 {
             println!("id is {id:?} id_path is {:?}", id_path);
             let child_id = id_path[0];
-            let children = view.children();
+            let children = view_children(view);
             let pos = children.iter().position(|v| v.id() == child_id);
             if let Some(pos) = pos {
                 if children.len() > 1 && pos < children.len() - 1 {
@@ -514,7 +505,7 @@
 
         if id_path.len() == 1 {
             let child_id = id_path[0];
-            let children = view.children();
+            let children = view_children(view);
             let pos = children.iter().position(|v| v.id() == child_id);
             if let Some(pos) = pos {
                 if pos > 0 {
@@ -533,15 +524,16 @@
 
 pub(crate) fn view_children_set_parent_id(view: &dyn View) {
     let parent_id = view.id();
-    for child in view.children() {
+    view.for_each_child(&mut |child| {
         child.id().set_parent(parent_id);
         view_children_set_parent_id(child);
-    }
+        false
+    });
 }
 
 fn view_nested_last_child(view: &dyn View) -> &dyn View {
     let mut last_child = view;
-    while let Some(new_last_child) = last_child.children().pop() {
+    while let Some(new_last_child) = view_children(last_child).pop() {
         last_child = new_last_child;
     }
     last_child
@@ -561,7 +553,7 @@
         }
         println!("{:?} {}", current_view.id(), &current_view.debug_name());
 
-        let mut children = current_view.children();
+        let mut children = view_children(current_view);
         if let Some(last_child) = children.pop() {
             views.push((last_child, [active_lines.as_slice(), &[false]].concat()));
         }
@@ -596,14 +588,6 @@
         (**self).child_mut(id)
     }
 
-    fn children(&self) -> Vec<&dyn View> {
-        (**self).children()
-    }
-
-    fn children_mut(&mut self) -> Vec<&mut dyn View> {
-        (**self).children_mut()
-    }
-
     fn debug_name(&self) -> std::borrow::Cow<'static, str> {
         (**self).debug_name()
     }