Store UI render target info locally per node

crates/bevy_ui/src/experimental/ghost_hierarchy.rs

@@ -1,8 +1,9 @@
 //! This module contains [`GhostNode`] and utilities to flatten the UI hierarchy, traversing past ghost nodes.
 
+#[cfg(feature = "ghost_nodes")]
+use crate::ui_node::ComputedNodeTarget;
 use crate::Node;
 use bevy_ecs::{prelude::*, system::SystemParam};
-
 #[cfg(feature = "ghost_nodes")]
 use bevy_reflect::prelude::*;
 #[cfg(feature = "ghost_nodes")]
@@ -11,7 +12,6 @@ use bevy_render::view::Visibility;
 use bevy_transform::prelude::Transform;
 #[cfg(feature = "ghost_nodes")]
 use smallvec::SmallVec;
-
 /// Marker component for entities that should be ignored within UI hierarchies.
 ///
 /// The UI systems will traverse past these and treat their first non-ghost descendants as direct children of their first non-ghost ancestor.
@@ -21,7 +21,7 @@ use smallvec::SmallVec;
 #[derive(Component, Debug, Copy, Clone, Reflect)]
 #[cfg_attr(feature = "ghost_nodes", derive(Default))]
 #[reflect(Component, Debug)]
-#[require(Visibility, Transform)]
+#[require(Visibility, Transform, ComputedNodeTarget)]
 pub struct GhostNode;
 
 #[cfg(feature = "ghost_nodes")]

crates/bevy_ui/src/focus.rs

@@ -1,6 +1,4 @@
-use crate::{
-    CalculatedClip, ComputedNode, DefaultUiCamera, ResolvedBorderRadius, UiStack, UiTargetCamera,
-};
+use crate::{CalculatedClip, ComputedNode, ComputedNodeTarget, ResolvedBorderRadius, UiStack};
 use bevy_ecs::{
     change_detection::DetectChangesMut,
     entity::{Entity, EntityBorrow},
@@ -141,7 +139,7 @@ pub struct NodeQuery {
     focus_policy: Option<&'static FocusPolicy>,
     calculated_clip: Option<&'static CalculatedClip>,
     inherited_visibility: Option<&'static InheritedVisibility>,
-    target_camera: Option<&'static UiTargetCamera>,
+    target_camera: &'static ComputedNodeTarget,
 }
 
 /// The system that sets Interaction for all UI elements based on the mouse cursor activity
@@ -150,7 +148,6 @@ pub struct NodeQuery {
 pub fn ui_focus_system(
     mut state: Local<State>,
     camera_query: Query<(Entity, &Camera)>,
-    default_ui_camera: DefaultUiCamera,
     primary_window: Query<Entity, With<PrimaryWindow>>,
     windows: Query<&Window>,
     mouse_button_input: Res<ButtonInput<MouseButton>>,
@@ -212,8 +209,6 @@ pub fn ui_focus_system(
         })
         .collect();
 
-    let default_camera_entity = default_ui_camera.get();
-
     // prepare an iterator that contains all the nodes that have the cursor in their rect,
     // from the top node to the bottom one. this will also reset the interaction to `None`
     // for all nodes encountered that are no longer hovered.
@@ -237,10 +232,7 @@ pub fn ui_focus_system(
                 }
                 return None;
             }
-            let camera_entity = node
-                .target_camera
-                .map(UiTargetCamera::entity)
-                .or(default_camera_entity)?;
+            let camera_entity = node.target_camera.camera()?;
 
             let node_rect = Rect::from_center_size(
                 node.global_transform.translation().truncate(),

crates/bevy_ui/src/layout/debug.rs

@@ -14,19 +14,18 @@ pub fn print_ui_layout_tree(ui_surface: &UiSurface) {
         .iter()
         .map(|(entity, node)| (node.id, *entity))
         .collect();
-    for (&entity, roots) in &ui_surface.camera_roots {
+    for (&entity, &viewport_node) in &ui_surface.root_entity_to_viewport_node {
         let mut out = String::new();
-        for root in roots {
-            print_node(
-                ui_surface,
-                &taffy_to_entity,
-                entity,
-                root.implicit_viewport_node,
-                false,
-                String::new(),
-                &mut out,
-            );
-        }
+        print_node(
+            ui_surface,
+            &taffy_to_entity,
+            entity,
+            viewport_node,
+            false,
+            String::new(),
+            &mut out,
+        );
+
         tracing::info!("Layout tree for camera entity: {entity}\n{out}");
     }
 }