Optimize view scopes

crates/concoct/Cargo.toml

@@ -11,6 +11,7 @@ full = ["tracing"]
 
 [dependencies]
 futures = "0.3.30"
+im = "15.1.0"
 rustc-hash = "1.1.0"
 slotmap = "1.0.7"
 tracing = { version = "0.1.40", optional = true }

crates/concoct/src/hook/use_ref.rs

@@ -10,11 +10,18 @@ pub fn use_ref<T, A, R: 'static>(cx: &Scope<T, A>, make_initial: impl FnOnce() -
  let idx = node.hook_idx;
  node.hook_idx += 1;
 
- let cell = if let Some(cell) = node.hooks.get(idx) {
+ let hooks = if let Some(hooks) = node.hooks.as_mut() {
+ hooks
+ } else {
+ node.hooks = Some(Vec::new());
+ node.hooks.as_mut().unwrap()
+ };
+
+ let cell = if let Some(cell) = hooks.get(idx) {
  cell
  } else {
- node.hooks.push(UnsafeCell::new(Box::new(make_initial())));
- node.hooks.last().unwrap()
+ hooks.push(UnsafeCell::new(Box::new(make_initial())));
+ hooks.last().unwrap()
  };
 
  // Safety: All references to scope are dropped before `hook_idx` is reset.

crates/concoct/src/lib.rs

@@ -7,12 +7,12 @@
 //! ```ignore
 //! use concoct::{Scope, View};
 //! use concoct_web::html;
-//! 
+//!
 //! #[derive(Default)]
 //! struct Counter {
 //! count: i32,
 //! }
-//! 
+//!
 //! impl View<Self> for Counter {
 //! fn body(&mut self, _cx: &Scope<Self>) -> impl View<Self> {
 //! (
@@ -22,12 +22,12 @@
 //! )
 //! }
 //! }
-//! 
+//!
 //! fn main() {
 //! concoct_web::launch(Counter::default())
 //! }
 //! ```
-//! 
+//!
 
 #![deny(missing_docs)]
 

crates/concoct/src/scope.rs

@@ -1,9 +1,11 @@
 use crate::{vdom::Node, Handle, View};
-use rustc_hash::FxHashMap;
+use im::HashMap;
+use rustc_hash::FxHasher;
 use slotmap::{DefaultKey, SlotMap};
 use std::{
  any::{Any, TypeId},
  cell::{Cell, RefCell},
+ hash::BuildHasherDefault,
  mem,
  rc::Rc,
 };
@@ -16,7 +18,7 @@ pub struct Scope<T, A = ()> {
  pub(crate) update: Rc<dyn Fn(Rc<dyn Fn(&Handle<T, A>, &mut T) -> Option<A>>)>,
  pub(crate) is_empty: Cell<bool>,
  pub(crate) nodes: Rc<RefCell<SlotMap<DefaultKey, Node>>>,
- pub(crate) contexts: RefCell<FxHashMap<TypeId, Rc<dyn Any>>>,
+ pub(crate) contexts: RefCell<HashMap<TypeId, Rc<dyn Any>, BuildHasherDefault<FxHasher>>>,
 }
 
 impl<T, A> Scope<T, A> {

crates/concoct/src/vdom.rs

@@ -10,7 +10,7 @@ use std::{
 
 #[derive(Default)]
 pub(crate) struct NodeInner {
- pub(crate) hooks: Vec<UnsafeCell<Box<dyn Any>>>,
+ pub(crate) hooks: Option<Vec<UnsafeCell<Box<dyn Any>>>>,
  pub(crate) hook_idx: usize,
  pub(crate) children: Vec<DefaultKey>,
 }