swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: omg what a dumb mistake

Browse Source
This commit is contained in:
Jonathan Kelley committed 2021-07-27 00:27:07 -04:00
1 parent 4a0068f099
commit f782e14211
15 files changed
+262 -131
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/core/src/bumpframe.rs
+9 -1
View File
@@ -12,7 +12,7 @@ pub struct ActiveFrame {
pub struct BumpFrame {
pub bump: Bump,
pub head_node: VNode<'static>,
pub(crate) head_node: VNode<'static>,
// used internally for debugging
name: &'static str,
@@ -36,6 +36,14 @@ impl ActiveFrame {
}
}
pub unsafe fn reset_wip_frame(&mut self) {
self.wip_frame_mut().bump.reset()
}
pub fn update_head_node<'a>(&mut self, node: VNode<'a>) {
self.wip_frame_mut().head_node = unsafe { std::mem::transmute(node) };
}
/// The "work in progress frame" represents the frame that is currently being worked on.
pub fn wip_frame(&self) -> &BumpFrame {
match self.generation.get() & 1 == 0 {
packages/core/src/context.rs
+4 -7
View File
@@ -148,10 +148,10 @@ impl<'src, P> Context<'src, P> {
lazy_nodes: LazyNodes<'src, F>,
) -> DomTree<'src> {
let scope_ref = self.scope;
let listener_id = &scope_ref.listener_idx;
// let listener_id = &scope_ref.listener_idx;
Some(lazy_nodes.into_vnode(NodeFactory {
scope: scope_ref,
listener_id,
// listener_id,
}))
}
@@ -505,10 +505,7 @@ impl<'src> SuspendedContext<'src> {
lazy_nodes: LazyNodes<'src, F>,
) -> DomTree<'src> {
let scope_ref = self.inner.scope;
let listener_id = &scope_ref.listener_idx;
Some(lazy_nodes.into_vnode(NodeFactory {
scope: scope_ref,
listener_id,
}))
Some(lazy_nodes.into_vnode(NodeFactory { scope: scope_ref }))
}
}
packages/core/src/diff.rs
+30 -63
View File
@@ -55,7 +55,7 @@ use crate::{arena::SharedResources, innerlude::*};
use fxhash::{FxHashMap, FxHashSet};
use smallvec::{smallvec, SmallVec};
use std::{any::Any, borrow::Borrow};
use std::{any::Any, borrow::Borrow, cmp::Ordering};
/// Instead of having handles directly over nodes, Dioxus uses simple u32 as node IDs.
/// The expectation is that the underlying renderer will mainain their Nodes in vec where the ids are the index. This allows
@@ -206,13 +206,12 @@ impl<'real, 'bump> DiffMachine<'real, 'bump> {
scope.update_children(ScopeChildren(new.children));
// React doesn't automatically memoize, but we do.
let should_render = true;
// let should_render = match old.comparator {
// Some(comparator) => comparator(new),
// None => true,
// };
let are_the_same = match old.comparator {
Some(comparator) => comparator(new),
None => false,
};
if should_render {
if !are_the_same {
scope.run_scope().unwrap();
self.diff_node(scope.frames.wip_head(), scope.frames.fin_head());
} else {
@@ -915,7 +914,7 @@ impl<'a, 'bump> DiffMachine<'a, 'bump> {
// [... parent]
//
// When this function returns, the change list stack is in the same state.
pub fn remove_all_children(&mut self, old: &'bump [VNode<'bump>]) {
fn remove_all_children(&mut self, old: &'bump [VNode<'bump>]) {
// debug_assert!(self.edits.traversal_is_committed());
log::debug!("REMOVING CHILDREN");
for _child in old {
@@ -1208,67 +1207,35 @@ impl<'a, 'bump> DiffMachine<'a, 'bump> {
// the change list stack is in the same state when this function returns.
fn diff_non_keyed_children(&mut self, old: &'bump [VNode<'bump>], new: &'bump [VNode<'bump>]) {
// Handled these cases in `diff_children` before calling this function.
//
// debug_assert!(!new.is_empty());
// debug_assert!(!old.is_empty());
// [... parent]
// self.edits.go_down();
// self.edits.push_root()
// [... parent child]
// todo!()
for (_i, (new_child, old_child)) in new.iter().zip(old.iter()).enumerate() {
// [... parent prev_child]
// self.edits.go_to_sibling(i);
// [... parent this_child]
// let did = old_child.get_mounted_id(self.components).unwrap();
// if did.0 == 0 {
// log::debug!("Root is bad: {:#?}", old_child);
// }
// self.edits.push_root(did);
// dbg!("dffing child", new_child, old_child);
self.diff_node(old_child, new_child);
// let old_id = old_child.get_mounted_id(self.components).unwrap();
// let new_id = new_child.get_mounted_id(self.components).unwrap();
// log::debug!(
// "pushed root. {:?}, {:?}",
// old_child.get_mounted_id(self.components).unwrap(),
// new_child.get_mounted_id(self.components).unwrap()
// );
// if old_id != new_id {
// log::debug!("Mismatch: {:?}", new_child);
// }
}
// match old.len().cmp(&new.len()) {
// // old.len > new.len -> removing some nodes
// Ordering::Greater => {
// // [... parent prev_child]
// self.edits.go_to_sibling(new.len());
// // [... parent first_child_to_remove]
// // self.edits.commit_traversal();
// // support::remove_self_and_next_siblings(state, &old[new.len()..]);
// self.remove_self_and_next_siblings(&old[new.len()..]);
// // [... parent]
// }
// // old.len < new.len -> adding some nodes
// Ordering::Less => {
// // [... parent last_child]
// self.edits.go_up();
// // [... parent]
// // self.edits.commit_traversal();
// self.create_and_append_children(&new[old.len()..]);
// }
// // old.len == new.len -> no nodes added/removed, but πerhaps changed
// Ordering::Equal => {
// // [... parent child]
// self.edits.go_up();
// // [... parent]
// }
// }
match old.len().cmp(&new.len()) {
// old.len > new.len -> removing some nodes
Ordering::Greater => {
for item in &old[new.len()..] {
for i in RealChildIterator::new(item, self.vdom) {
self.edits.push_root(i.element_id().unwrap());
self.edits.remove();
}
}
}
// old.len < new.len -> adding some nodes
Ordering::Less => {
// [... parent last_child]
// self.edits.go_up();
// [... parent]
// self.edits.commit_traversal();
self.create_and_append_children(&new[old.len()..]);
}
// old.len == new.len -> no nodes added/removed, but πerhaps changed
Ordering::Equal => {}
}
}
// ======================
@@ -1284,7 +1251,7 @@ impl<'a, 'bump> DiffMachine<'a, 'bump> {
// After the function returns, the child is no longer on the change list stack:
//
// [... parent]
pub fn remove_self_and_next_siblings(&self, old: &[VNode<'bump>]) {
fn remove_self_and_next_siblings(&self, old: &[VNode<'bump>]) {
// debug_assert!(self.edits.traversal_is_committed());
for child in old {
if let VNodeKind::Component(_vcomp) = child.kind {
packages/core/src/nodes.rs
+4 -34
View File
@@ -144,14 +144,12 @@ pub struct VComponent<'src> {
#[derive(Copy, Clone)]
pub struct NodeFactory<'a> {
pub scope: &'a Scope,
pub listener_id: &'a Cell<usize>,
}
impl<'a> NodeFactory<'a> {
#[inline]
pub fn bump(&self) -> &'a bumpalo::Bump {
&self.scope.frames.wip_frame().bump
// &self.scope.cur_frame().bump
}
pub fn unstable_place_holder() -> VNode<'static> {
@@ -346,6 +344,9 @@ impl<'a> NodeFactory<'a> {
if user_fc == other.user_fc {
let real_other = unsafe { &*(other.raw_props as *const _ as *const P) };
let props_memoized = unsafe { props.memoize(&real_other) };
// It's only okay to memoize if there are no children and the props can be memoized
// Implementing memoize is unsafe and done automatically with the props trait
match (props_memoized, children.len() == 0) {
(true, true) => true,
_ => false,
@@ -395,7 +396,7 @@ impl<'a> NodeFactory<'a> {
unsafe { std::mem::transmute::<_, Captured<'static>>(caller) }
}
pub fn fragment_from_iter(self, node_iter: impl IntoVNodeList<'a> + 'a) -> VNode<'a> {
pub fn fragment_from_iter(self, node_iter: impl IntoVNodeList<'a>) -> VNode<'a> {
let children = node_iter.into_vnode_list(self);
VNode {
@@ -501,37 +502,6 @@ impl<'a> IntoVNode<'a> for VNode<'a> {
}
}
// For the case where a rendered VNode is by reference passed into the rsx! macro through curly braces
// This behavior is designed for the cx.children method where child nodes are passed by reference.
//
// Designed to support indexing
impl<'a> IntoVNode<'a> for &VNode<'a> {
fn into_vnode(self, _: NodeFactory<'a>) -> VNode<'a> {
todo!()
// let kind = match &self.kind {
// VNodeKind::Element(element) => VNodeKind::Element(element),
// VNodeKind::Text(old) => VNodeKind::Text(VText {
// text: old.text,
// is_static: old.is_static,
// }),
// VNodeKind::Fragment(fragment) => VNodeKind::Fragment(VFragment {
// children: fragment.children,
// is_static: fragment.is_static,
// }),
// VNodeKind::Component(component) => VNodeKind::Component(component),
// // todo: it doesn't make much sense to pass in suspended nodes
// // I think this is right but I'm not too sure.
// VNodeKind::Suspended { node } => VNodeKind::Suspended { node: node.clone() },
// };
// VNode {
// kind,
// dom_id: self.dom_id.clone(),
// key: self.key.clone(),
// }
}
}
/// A concrete type provider for closures that build VNode structures.
///
/// This struct wraps lazy structs that build VNode trees Normally, we cannot perform a blanket implementation over
packages/core/src/scope.rs
+17 -18
View File
@@ -34,7 +34,6 @@ pub struct Scope {
// Listeners
pub(crate) listeners: RefCell<Vec<*const Listener<'static>>>,
pub(crate) listener_idx: Cell<usize>,
// State
pub(crate) hooks: HookList,
@@ -72,9 +71,7 @@ impl Scope {
vdom: SharedResources,
) -> Self {
let child_nodes = unsafe { child_nodes.extend_lifetime() };
// let child_nodes = unsafe { std::mem::transmute(child_nodes) };
// dbg!(child_nodes);
Self {
child_nodes,
caller,
@@ -82,7 +79,6 @@ impl Scope {
our_arena_idx: arena_idx,
height,
vdom,
listener_idx: Default::default(),
frames: ActiveFrame::new(),
hooks: Default::default(),
shared_contexts: Default::default(),
@@ -114,24 +110,27 @@ impl Scope {
// make sure we call the drop implementation on all the listeners
// this is important to not leak memory
for li in self.listeners.borrow_mut().drain(..) {
log::debug!("dropping listener");
let d = unsafe { &*li };
let mut r = d.callback.borrow_mut();
let p = r.take().unwrap();
std::mem::drop(p);
// d.callback.borrow_mut();
for listener in self
.listeners
.borrow_mut()
.drain(..)
.map(|li| unsafe { &*li })
{
let mut cb = listener.callback.borrow_mut();
match cb.take() {
Some(val) => std::mem::drop(val),
None => log::info!("no callback to drop. component must be broken"),
};
}
// self.listeners.borrow_mut().clear();
// Safety:
// - We dropped the listeners, so no more &mut T can be used while these are held
// - All children nodes that rely on &mut T are replaced with a new reference
unsafe { self.hooks.reset() };
self.listener_idx.set(0);
// This is a very dangerous operation
let next_frame = self.frames.wip_frame_mut();
next_frame.bump.reset();
// Safety:
// - We've dropped all references to the wip bump frame
unsafe { self.frames.reset_wip_frame() };
// Cast the caller ptr from static to one with our own reference
let c3: &WrappedCaller = self.caller.as_ref();
packages/desktop/Cargo.toml
+1 -1
View File
@@ -11,7 +11,7 @@ license = "MIT/Apache-2.0"
[dependencies]
# web-view = { git = "https://github.com/Boscop/web-view" }
dioxus-core = { path = "../core", version = "0.1.2", features = ["serialize"] }
anyhow = "1.0.38"
anyhow = "1.0"
argh = "0.1.4"
serde = "1.0.120"
serde_json = "1.0.61"
packages/hooks/src/usestate.rs
+1 -1
View File
@@ -52,7 +52,7 @@ use std::{
pub fn use_state<'a, 'c, T: 'static, F: FnOnce() -> T, P>(
cx: Context<'a, P>,
initial_state_fn: F,
) -> UseState<T> {
) -> UseState<'a, T> {
cx.use_hook(
move |_| UseStateInner {
current_val: initial_state_fn(),
packages/mobile/Cargo.toml
+1 -1
View File
@@ -7,7 +7,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
anyhow = "1.0.42"
anyhow = "1.0"
# cacao = { git = "https://github.com/ryanmcgrath/cacao" }
dioxus-core = { path = "../core", version = "0.1.2" }
log = "0.4.14"
packages/mobile/src/lib.rs
+1
View File
@@ -185,6 +185,7 @@ impl<T: Properties + 'static> WebviewRenderer<T> {
});
}
}
// brad johnson go chat
fn main() {
init_logging();
packages/ssr/Cargo.toml
+1 -1
View File
@@ -17,7 +17,7 @@ tide-websockets = "*"
thiserror = "1.0.23"
log = "0.4.13"
fern = { version = "0.6.0", features = ["colored"] }
anyhow = "1.0.38"
anyhow = "1.0"
argh = "0.1.4"
serde = "1.0.120"
serde_json = "1.0.61"
packages/web/Cargo.toml
+1 -1
View File
@@ -22,7 +22,7 @@ generational-arena = "0.2.8"
wasm-bindgen-test = "0.3.21"
once_cell = "1.8"
async-channel = "1.6.1"
anyhow = "1.0.41"
anyhow = "1.0"
futures-util = "0.3.15"