kitsunecafe/bevy_dioxus
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Ensure changes to UI root components are picked up

Browse source
This commit is contained in:
JMS55 2023-12-16 12:54:01 -08:00
parent d58710e8ac
commit b43503a93b
3 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/demo.rs
View file

@ -16,7 +16,7 @@ fn main() {
.add_plugins((DefaultPlugins, DioxusUiPlugin, DefaultPickingPlugins)) .add_plugins((DefaultPlugins, DioxusUiPlugin, DefaultPickingPlugins))
.add_systems(Startup, |mut commands: Commands| { .add_systems(Startup, |mut commands: Commands| {
commands.spawn(DioxusUiBundle { commands.spawn(DioxusUiBundle {
dioxus_ui_root: DioxusUiRoot::new(Editor), dioxus_ui_root: DioxusUiRoot(Editor),
node_bundle: NodeBundle::default(), node_bundle: NodeBundle::default(),
}); });
commands.spawn(Camera2dBundle::default()); commands.spawn(Camera2dBundle::default());

16
src/lib.rs
View file

@ -39,17 +39,11 @@ pub struct DioxusUiBundle {
pub node_bundle: NodeBundle, pub node_bundle: NodeBundle,
} }
#[derive(Component, Deref, Clone, Copy)] #[derive(Component, Deref, Hash, PartialEq, Eq, Clone, Copy)]
pub struct DioxusUiRoot(fn(Scope) -> Element); pub struct DioxusUiRoot(pub fn(Scope) -> Element);
impl DioxusUiRoot {
pub fn new(root_component: fn(Scope) -> Element) -> Self {
Self(root_component)
}
}
#[derive(Deref, DerefMut, Default)] #[derive(Deref, DerefMut, Default)]
struct UiRoots(EntityHashMap<Entity, UiRoot>); struct UiRoots(HashMap<(Entity, DioxusUiRoot), UiRoot>);
struct UiRoot { struct UiRoot {
virtual_dom: VirtualDom, virtual_dom: VirtualDom,
@ -60,9 +54,9 @@ struct UiRoot {
} }
impl UiRoot { impl UiRoot {
fn new(root_component: fn(Scope) -> Element) -> Self { fn new(root_component: DioxusUiRoot) -> Self {
Self { Self {
virtual_dom: VirtualDom::new(root_component), virtual_dom: VirtualDom::new(root_component.0),
element_id_to_bevy_ui_entity: HashMap::new(), element_id_to_bevy_ui_entity: HashMap::new(),
bevy_ui_entity_to_element_id: EntityHashMap::default(), bevy_ui_entity_to_element_id: EntityHashMap::default(),
templates: HashMap::new(), templates: HashMap::new(),

16
src/tick.rs
View file

@ -27,16 +27,12 @@ pub fn tick_dioxus_ui(world: &mut World) {
.iter(world) .iter(world)
.map(|(entity, ui_root)| (entity, *ui_root)) .map(|(entity, ui_root)| (entity, *ui_root))
.collect(); .collect();
let mut ui_roots = mem::take(&mut world.non_send_resource_mut::<UiRoots>().0);
world for (root_entity, dioxus_ui_root) in root_entities {
.non_send_resource_mut::<UiRoots>() let mut ui_root = ui_roots
.retain(|root_entity, _| root_entities.contains_key(root_entity)); .remove(&(root_entity, dioxus_ui_root))
.unwrap_or_else(|| UiRoot::new(dioxus_ui_root));
for (root_entity, ui_root) in root_entities {
let mut ui_root = world
.non_send_resource_mut::<UiRoots>()
.remove(&root_entity)
.unwrap_or_else(|| UiRoot::new(*ui_root));
dispatch_ui_events(&ui_events, &mut ui_root, world); dispatch_ui_events(&ui_events, &mut ui_root, world);
@ -46,7 +42,7 @@ pub fn tick_dioxus_ui(world: &mut World) {
world world
.non_send_resource_mut::<UiRoots>() .non_send_resource_mut::<UiRoots>()
.insert(root_entity, ui_root); .insert((root_entity, dioxus_ui_root), ui_root);
} }
} }