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

Fix unsoundness in tick_dioxus_ui

Browse source
This commit is contained in:
JMS55 2023-12-07 12:57:34 -08:00
parent b5856e77f7
commit aa06f3805b
2 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/apply_mutations.rs
View file

@ -1,8 +1,7 @@
use crate::bsn::Bsn;
use bevy::{
ecs::{entity::Entity, world::World},
hierarchy::{BuildWorldChildren, DespawnRecursiveExt},
text::Text,
ecs::{entity::Entity, system::Commands},
hierarchy::{BuildChildren, DespawnRecursiveExt},
ui::node_bundles::TextBundle,
utils::HashMap,
};
@ -13,7 +12,7 @@ pub fn apply_mutations(
element_id_to_bevy_ui_entity: &mut HashMap<ElementId, Entity>,
templates: &mut HashMap<String, Bsn>,
root_entity: Entity,
world: &mut World,
commands: &mut Commands,
) {
for new_template in mutations.templates {
templates.insert(new_template.name.to_owned(), todo!());
@ -26,17 +25,17 @@ pub fn apply_mutations(
for edit in mutations.edits {
match edit {
Mutation::AppendChildren { id, m } => {
let mut parent = world.entity_mut(map[&id]);
let mut parent = commands.entity(map[&id]);
for _ in 0..m {
parent.add_child(stack.pop().unwrap());
}
}
Mutation::AssignId { path, id } => todo!(),
Mutation::CreatePlaceholder { id } => {
map.insert(id, world.spawn(()).id());
map.insert(id, commands.spawn(()).id());
}
Mutation::CreateTextNode { value, id } => {
map.insert(id, world.spawn(TextBundle::from(value)).id());
map.insert(id, commands.spawn(TextBundle::from(value)).id());
}
Mutation::HydrateText { path, value, id } => todo!(),
Mutation::LoadTemplate { name, index, id } => todo!(),
@ -50,19 +49,12 @@ pub fn apply_mutations(
id,
ns,
} => todo!(),
Mutation::SetText { value, id } => {
world
.entity_mut(map[&id])
.get_mut::<Text>()
.unwrap()
.sections[0]
.value = value.to_owned();
}
Mutation::SetText { value, id } => todo!(),
Mutation::NewEventListener { name, id } => todo!(),
Mutation::RemoveEventListener { name, id } => todo!(),
Mutation::Remove { id } => {
world
.entity_mut(map.remove(&id).unwrap())
commands
.entity(map.remove(&id).unwrap())
.despawn_recursive();
}
Mutation::PushRoot { id } => stack.push(map[&id]),

16
src/tick.rs
View file

@ -4,6 +4,7 @@ use crate::{
use bevy::{
ecs::{
entity::Entity,
system::{CommandQueue, Commands},
world::{Mut, World},
},
prelude::{Deref, DerefMut},
@ -12,10 +13,11 @@ use bevy::{
use dioxus_core::{Element, Scope, ScopeState, VirtualDom};
use std::{mem, sync::Arc};
// TODO: This is not sound. Can't borrow the world while iterating over DioxusUiRoots.
pub fn tick_dioxus_ui(world: &mut World) {
let world_ptr: *mut World = world;
let world_cell = world.as_unsafe_world_cell();
let mut command_queue = CommandQueue::default();
let mut commands = Commands::new_from_entities(&mut command_queue, world_cell.entities());
for (root_entity, mut dioxus_ui_root) in unsafe {
world_cell
@ -35,29 +37,31 @@ pub fn tick_dioxus_ui(world: &mut World) {
.base_scope()
.provide_context(EcsContext { world: world_ptr });
// TODO: Handle events from winit
// virtual_dom.handle_event(todo!(), todo!(), todo!(), todo!());
if *needs_rebuild {
apply_mutations(
virtual_dom.rebuild(),
element_id_to_bevy_ui_entity,
templates,
root_entity,
unsafe { world_cell.world_mut() },
&mut commands,
);
*needs_rebuild = false;
}
// TODO: Handle events from winit
// virtual_dom.handle_event(todo!(), todo!(), todo!(), todo!());
apply_mutations(
virtual_dom.render_immediate(),
element_id_to_bevy_ui_entity,
templates,
root_entity,
unsafe { world_cell.world_mut() },
&mut commands,
);
}
command_queue.apply(world);
for system_id in mem::take(&mut *world.resource_mut::<DeferredSystemRegistry>().run_queue) {
let _ = world.run_system(system_id);
}