diff --git a/packages/core/src/nodes.rs b/packages/core/src/nodes.rs index fede5096e..b0d3bc634 100644 --- a/packages/core/src/nodes.rs +++ b/packages/core/src/nodes.rs @@ -568,51 +568,6 @@ pub enum TemplateAttribute { }, } -/// An attribute with information about its position in the DOM and the element it was mounted to -#[derive(Debug)] -pub struct MountedAttribute<'a> { - pub(crate) ty: AttributeType<'a>, - - /// The element in the DOM that this attribute belongs to - pub(crate) mounted_element: Cell, -} - -impl<'a> From> for MountedAttribute<'a> { - fn from(attr: Attribute<'a>) -> Self { - Self { - ty: AttributeType::Single(attr), - mounted_element: Default::default(), - } - } -} - -impl<'a> From<&'a [Attribute<'a>]> for MountedAttribute<'a> { - fn from(attr: &'a [Attribute<'a>]) -> Self { - Self { - ty: AttributeType::Many(attr), - mounted_element: Default::default(), - } - } -} - -impl<'a> From<&'a Vec>> for MountedAttribute<'a> { - fn from(attr: &'a Vec>) -> Self { - attr.as_slice().into() - } -} - -impl<'a> MountedAttribute<'a> { - /// Get the type of this attribute - pub fn attribute_type(&self) -> &AttributeType<'a> { - &self.ty - } - - /// Get the element that this attribute is mounted to - pub fn mounted_element(&self) -> ElementId { - self.mounted_element.get() - } -} - /// An attribute on a DOM node, such as `id="my-thing"` or `href="https://example.com"` #[derive(Debug)] pub struct Attribute { @@ -928,7 +883,7 @@ pub trait HasAttributes<'a> { self, name: &'a str, ns: Option<&'static str>, - attr: impl IntoAttributeValue<'a>, + attr: impl IntoAttributeValue, volatile: bool, ) -> Self; } diff --git a/packages/core/src/scope_context.rs b/packages/core/src/scope_context.rs index 47199c3dc..ad2472e4f 100644 --- a/packages/core/src/scope_context.rs +++ b/packages/core/src/scope_context.rs @@ -391,13 +391,13 @@ impl ScopeId { } /// Spawn a future on a component given its [`ScopeId`]. -pub fn spawn_at(fut: impl Future + 'static, scope_id: ScopeId) -> Option { +pub fn spawn_at(fut: impl Future + 'static, scope_id: ScopeId) -> Option { with_runtime(|rt| rt.get_context(scope_id).unwrap().push_future(fut)) } /// Spawn a future that Dioxus won't clean up when this component is unmounted /// /// This is good for tasks that need to be run after the component has been dropped. -pub fn spawn_forever(fut: impl Future + 'static) -> Option { +pub fn spawn_forever(fut: impl Future + 'static) -> Option { spawn_at(fut, ScopeId(0)) } diff --git a/packages/core/src/scopes.rs b/packages/core/src/scopes.rs index 6177cd8c9..d88fe1f47 100644 --- a/packages/core/src/scopes.rs +++ b/packages/core/src/scopes.rs @@ -41,7 +41,6 @@ pub struct ScopeState { impl Drop for ScopeState { fn drop(&mut self) { - self.drop_listeners(); self.runtime.remove_context(self.context_id); } } diff --git a/packages/core/src/virtual_dom.rs b/packages/core/src/virtual_dom.rs index 89c0ab4a3..e7bacc5e0 100644 --- a/packages/core/src/virtual_dom.rs +++ b/packages/core/src/virtual_dom.rs @@ -338,6 +338,7 @@ impl VirtualDom { /// It is up to the listeners themselves to mark nodes as dirty. /// /// If you have multiple events, you can call this method multiple times before calling "render_with_deadline" + pub fn handle_event( &mut self, name: &str, @@ -394,14 +395,17 @@ impl VirtualDom { let this_path = node_template.attr_paths[idx]; // Remove the "on" prefix if it exists, TODO, we should remove this and settle on one - if target_path.is_decendant(&this_path) { - attr.ty.for_each(|attribute| { - if attribute.name.trim_start_matches("on") == name { - if let AttributeValue::Listener(listener) = &attribute.value { - listeners.push(listener); - } - } - }); + if attr.name.trim_start_matches("on") == name + && target_path.is_decendant(&this_path) + { + listeners.push(&attr.value); + + // Break if this is the exact target element. + // This means we won't call two listeners with the same name on the same element. This should be + // documented, or be rejected from the rsx! macro outright + if target_path == this_path { + break; + } } } @@ -413,67 +417,38 @@ impl VirtualDom { listener.call(uievent.clone()); self.runtime.rendering.set(true); - // let origin: ScopeId = path.scope; - // self.runtime.scope_stack.borrow_mut().push(origin); - // self.runtime.rendering.set(false); - // if let Some(cb) = listener.borrow_mut().as_deref_mut() { - // cb(uievent.clone()); - // } - // self.runtime.scope_stack.borrow_mut().pop(); - // self.runtime.rendering.set(true); - if !uievent.propagates.get() { return; } } + } - let mount = el_ref.mount.get().as_usize(); - parent_node = mount.and_then(|id| self.mounts.get(id).and_then(|el| el.parent)); + let mount = el_ref.mount.get().as_usize(); + parent_node = mount.and_then(|id| self.mounts.get(id).and_then(|el| el.parent)); + } + } else { + // Otherwise, we just call the listener on the target element + if let Some(path) = parent_node { + let el_ref = &self.mounts[path.mount.0].node; + let node_template = el_ref.template.get(); + let target_path = path.path; + + for (idx, attr) in el_ref.dynamic_attrs.iter().enumerate() { + let this_path = node_template.attr_paths[idx]; + + // Remove the "on" prefix if it exists, TODO, we should remove this and settle on one + // Only call the listener if this is the exact target element. + if attr.name.trim_start_matches("on") == name && target_path == this_path { + if let AttributeValue::Listener(listener) = &attr.value { + self.runtime.rendering.set(false); + listener.call(uievent.clone()); + self.runtime.rendering.set(true); + + break; + } + } } } - - // else { - // // Otherwise, we just call the listener on the target element - // if let Some(path) = parent_node { - // let el_ref = &self.mounts[path.mount.0].node; - // let node_template = el_ref.template.get(); - // let target_path = path.path; - - // for (idx, attr) in el_ref.dynamic_attrs.iter().enumerate() { - // let this_path = node_template.attr_paths[idx]; - - // // Remove the "on" prefix if it exists, TODO, we should remove this and settle on one - // // Only call the listener if this is the exact target element. - // if attr.name.trim_start_matches("on") == name && target_path == this_path { - // if let AttributeValue::Listener(listener) = &attr.value { - // self.runtime.rendering.set(false); - // listener.call(uievent.clone()); - // self.runtime.rendering.set(true); - - // // if target_path == this_path { - // // let mut should_stop = false; - // // attr.ty.for_each(|attribute| { - // // if attribute.name.trim_start_matches("on") == name { - // // if let AttributeValue::Listener(listener) = &attribute.value { - // // let origin = path.scope; - // // self.runtime.scope_stack.borrow_mut().push(origin); - // // self.runtime.rendering.set(false); - // // if let Some(cb) = listener.borrow_mut().as_deref_mut() { - // // cb(uievent.clone()); - // // } - // // self.runtime.scope_stack.borrow_mut().pop(); - // // self.runtime.rendering.set(true); - - // should_stop = true; - // } - // } - // // }); - // if should_stop { - // return; - // } - // } - // } - // } } } diff --git a/packages/desktop/src/app.rs b/packages/desktop/src/app.rs index 6e1c75c24..9504207df 100644 --- a/packages/desktop/src/app.rs +++ b/packages/desktop/src/app.rs @@ -59,7 +59,7 @@ pub struct SharedContext { pub(crate) target: EventLoopWindowTarget, } -impl App

{ +impl App

{ pub fn new(cfg: Config, props: P, root: Component

) -> (EventLoop, Self) { let event_loop = EventLoopBuilder::::with_user_event().build(); @@ -196,8 +196,16 @@ impl App

{ } pub fn handle_initialize_msg(&mut self, id: WindowId) { + // view.dom + // .rebuild(&mut *view.desktop_context.mutation_state.borrow_mut()); + // send_edits(&view.desktop_context); + + println!("initialize message received, sending edits to {id:?}"); + let view = self.webviews.get_mut(&id).unwrap(); - view.desktop_context.send_edits(view.dom.rebuild()); + view.dom + .render_immediate(&mut *view.desktop_context.mutation_state.borrow_mut()); + view.desktop_context.send_edits(); view.desktop_context .window .set_visible(self.is_visible_before_start); @@ -249,7 +257,9 @@ impl App

{ }; view.dom.handle_event(&name, as_any, element, bubbles); - view.desktop_context.send_edits(view.dom.render_immediate()); + view.dom + .render_immediate(&mut *view.desktop_context.mutation_state.borrow_mut()); + view.desktop_context.send_edits(); } #[cfg(all(feature = "hot-reload", debug_assertions))] @@ -306,7 +316,9 @@ impl App

{ view.dom.handle_event(event_name, data, id, event_bubbles); } - view.desktop_context.send_edits(view.dom.render_immediate()); + view.dom + .render_immediate(&mut *view.desktop_context.mutation_state.borrow_mut()); + view.desktop_context.send_edits(); } /// Poll the virtualdom until it's pending diff --git a/packages/desktop/src/config.rs b/packages/desktop/src/config.rs index 2b4f5d0d6..659704f7b 100644 --- a/packages/desktop/src/config.rs +++ b/packages/desktop/src/config.rs @@ -82,7 +82,7 @@ impl Config { /// Launch a Dioxus app using the given component, config, and props /// /// See the [`crate::launch::launch_with_props`] function for more details. - pub fn launch_with_props(self, root: Component

, props: P) { + pub fn launch_with_props(self, root: Component

, props: P) { crate::launch::launch_with_props(root, props, self) } diff --git a/packages/desktop/src/desktop_context.rs b/packages/desktop/src/desktop_context.rs index 5e0a7039c..d3ec7407d 100644 --- a/packages/desktop/src/desktop_context.rs +++ b/packages/desktop/src/desktop_context.rs @@ -9,8 +9,9 @@ use crate::{ AssetRequest, Config, }; use dioxus_core::{ + once, prelude::{current_scope_id, ScopeId}, - Mutations, VirtualDom, + VirtualDom, }; use dioxus_interpreter_js::binary_protocol::Channel; use dioxus_interpreter_js::MutationState; @@ -64,10 +65,6 @@ pub struct DesktopService { pub(super) query: QueryEngine, pub(crate) edit_queue: EditQueue, pub(crate) mutation_state: RefCell, - - pub(crate) templates: RefCell>, - pub(crate) max_template_count: AtomicU16, - pub(crate) channel: RefCell, pub(crate) asset_handlers: AssetHandlerRegistry, #[cfg(target_os = "ios")] @@ -99,24 +96,17 @@ impl DesktopService { mutation_state: Default::default(), asset_handlers, query: Default::default(), - templates: Default::default(), - max_template_count: Default::default(), - channel: Default::default(), #[cfg(target_os = "ios")] views: Default::default(), } } /// Send a list of mutations to the webview - pub(crate) fn send_edits(&self, edits: Mutations) { - if let Some(bytes) = crate::edits::apply_edits( - edits, - &mut self.channel.borrow_mut(), - &mut self.templates.borrow_mut(), - &self.max_template_count, - ) { - self.edit_queue.add_edits(bytes) - } + pub(crate) fn send_edits(&self) { + let mut mutations = self.mutation_state.borrow_mut(); + let serialized_edits = mutations.export_memory(); + dbg!(serialized_edits.len()); + self.edit_queue.add_edits(serialized_edits); } /// Create a new window using the props and window builder @@ -402,7 +392,7 @@ pub fn use_wry_event_handler( let id = desktop.create_wry_event_handler(handler); WryEventHandler { - handlers: desktop.event_handlers.clone(), + handlers: desktop.shared.event_handlers.clone(), id, } }) diff --git a/packages/desktop/src/edits.rs b/packages/desktop/src/edits.rs index 4562f2ebf..c8ff9be63 100644 --- a/packages/desktop/src/edits.rs +++ b/packages/desktop/src/edits.rs @@ -1,4 +1,4 @@ -use dioxus_core::{BorrowedAttributeValue, Mutations, Template, TemplateAttribute, TemplateNode}; +use dioxus_core::{AttributeValue, Template, TemplateAttribute, TemplateNode}; use dioxus_html::event_bubbles; use dioxus_interpreter_js::binary_protocol::Channel; use rustc_hash::FxHashMap; @@ -8,22 +8,30 @@ use std::{ sync::{atomic::Ordering, Mutex}, }; +use std::fmt::{Debug, Formatter}; use wry::RequestAsyncResponder; -/// This handles communication between the requests that the webview makes and the interpreter. The interpreter -/// constantly makes long running requests to the webview to get any edits that should be made to the DOM almost like -/// server side events. -/// -/// It will hold onto the requests until the interpreter is ready to handle them and hold onto any pending edits until -/// a new request is made. +/// This handles communication between the requests that the webview makes and the interpreter. The interpreter constantly makes long running requests to the webview to get any edits that should be made to the DOM almost like server side events. +/// It will hold onto the requests until the interpreter is ready to handle them and hold onto any pending edits until a new request is made. #[derive(Default, Clone)] pub(crate) struct EditQueue { queue: Arc>>>, - responder: Arc>>, + responder: Arc>>, +} + +impl Debug for EditQueue { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + f.debug_struct("EditQueue") + .field("queue", &self.queue) + .field("responder", { + &self.responder.lock().unwrap().as_ref().map(|_| ()) + }) + .finish() + } } impl EditQueue { - pub fn handle_request(&self, responder: RequestAsyncResponder) { + pub fn handle_request(&self, responder: wry::RequestAsyncResponder) { let mut queue = self.queue.lock().unwrap(); if let Some(bytes) = queue.pop() { responder.respond(wry::http::Response::new(bytes)); @@ -42,131 +50,131 @@ impl EditQueue { } } -pub(crate) fn apply_edits( - mutations: Mutations, - channel: &mut Channel, - templates: &mut FxHashMap, - max_template_count: &AtomicU16, -) -> Option> { - if mutations.templates.is_empty() && mutations.edits.is_empty() { - return None; - } +// pub(crate) fn apply_edits( +// mutations: Mutations, +// channel: &mut Channel, +// templates: &mut FxHashMap, +// max_template_count: &AtomicU16, +// ) -> Option> { +// if mutations.templates.is_empty() && mutations.edits.is_empty() { +// return None; +// } - for template in mutations.templates { - add_template(&template, channel, templates, max_template_count); - } +// for template in mutations.templates { +// add_template(&template, channel, templates, max_template_count); +// } - use dioxus_core::Mutation::*; - for edit in mutations.edits { - match edit { - AppendChildren { id, m } => channel.append_children(id.0 as u32, m as u16), - AssignId { path, id } => channel.assign_id(path, id.0 as u32), - CreatePlaceholder { id } => channel.create_placeholder(id.0 as u32), - CreateTextNode { value, id } => channel.create_text_node(value, id.0 as u32), - HydrateText { path, value, id } => channel.hydrate_text(path, value, id.0 as u32), - LoadTemplate { name, index, id } => { - if let Some(tmpl_id) = templates.get(name) { - channel.load_template(*tmpl_id, index as u16, id.0 as u32) - } - } - ReplaceWith { id, m } => channel.replace_with(id.0 as u32, m as u16), - ReplacePlaceholder { path, m } => channel.replace_placeholder(path, m as u16), - InsertAfter { id, m } => channel.insert_after(id.0 as u32, m as u16), - InsertBefore { id, m } => channel.insert_before(id.0 as u32, m as u16), - SetAttribute { - name, - value, - id, - ns, - } => match value { - BorrowedAttributeValue::Text(txt) => { - channel.set_attribute(id.0 as u32, name, txt, ns.unwrap_or_default()) - } - BorrowedAttributeValue::Float(f) => { - channel.set_attribute(id.0 as u32, name, &f.to_string(), ns.unwrap_or_default()) - } - BorrowedAttributeValue::Int(n) => { - channel.set_attribute(id.0 as u32, name, &n.to_string(), ns.unwrap_or_default()) - } - BorrowedAttributeValue::Bool(b) => channel.set_attribute( - id.0 as u32, - name, - if b { "true" } else { "false" }, - ns.unwrap_or_default(), - ), - BorrowedAttributeValue::None => { - channel.remove_attribute(id.0 as u32, name, ns.unwrap_or_default()) - } - _ => unreachable!(), - }, - SetText { value, id } => channel.set_text(id.0 as u32, value), - NewEventListener { name, id, .. } => { - channel.new_event_listener(name, id.0 as u32, event_bubbles(name) as u8) - } - RemoveEventListener { name, id } => { - channel.remove_event_listener(name, id.0 as u32, event_bubbles(name) as u8) - } - Remove { id } => channel.remove(id.0 as u32), - PushRoot { id } => channel.push_root(id.0 as u32), - } - } +// use dioxus_core::Mutation::*; +// for edit in mutations.edits { +// match edit { +// AppendChildren { id, m } => channel.append_children(id.0 as u32, m as u16), +// AssignId { path, id } => channel.assign_id(path, id.0 as u32), +// CreatePlaceholder { id } => channel.create_placeholder(id.0 as u32), +// CreateTextNode { value, id } => channel.create_text_node(value, id.0 as u32), +// HydrateText { path, value, id } => channel.hydrate_text(path, value, id.0 as u32), +// LoadTemplate { name, index, id } => { +// if let Some(tmpl_id) = templates.get(name) { +// channel.load_template(*tmpl_id, index as u16, id.0 as u32) +// } +// } +// ReplaceWith { id, m } => channel.replace_with(id.0 as u32, m as u16), +// ReplacePlaceholder { path, m } => channel.replace_placeholder(path, m as u16), +// InsertAfter { id, m } => channel.insert_after(id.0 as u32, m as u16), +// InsertBefore { id, m } => channel.insert_before(id.0 as u32, m as u16), +// SetAttribute { +// name, +// value, +// id, +// ns, +// } => match value { +// AttributeValue::Text(txt) => { +// channel.set_attribute(id.0 as u32, name, txt, ns.unwrap_or_default()) +// } +// AttributeValue::Float(f) => { +// channel.set_attribute(id.0 as u32, name, &f.to_string(), ns.unwrap_or_default()) +// } +// AttributeValue::Int(n) => { +// channel.set_attribute(id.0 as u32, name, &n.to_string(), ns.unwrap_or_default()) +// } +// AttributeValue::Bool(b) => channel.set_attribute( +// id.0 as u32, +// name, +// if b { "true" } else { "false" }, +// ns.unwrap_or_default(), +// ), +// AttributeValue::None => { +// channel.remove_attribute(id.0 as u32, name, ns.unwrap_or_default()) +// } +// _ => unreachable!(), +// }, +// SetText { value, id } => channel.set_text(id.0 as u32, value), +// NewEventListener { name, id, .. } => { +// channel.new_event_listener(name, id.0 as u32, event_bubbles(name) as u8) +// } +// RemoveEventListener { name, id } => { +// channel.remove_event_listener(name, id.0 as u32, event_bubbles(name) as u8) +// } +// Remove { id } => channel.remove(id.0 as u32), +// PushRoot { id } => channel.push_root(id.0 as u32), +// } +// } - let bytes: Vec<_> = channel.export_memory().collect(); - channel.reset(); - Some(bytes) -} +// let bytes: Vec<_> = channel.export_memory().collect(); +// channel.reset(); +// Some(bytes) +// } -pub fn add_template( - template: &Template<'static>, - channel: &mut Channel, - templates: &mut FxHashMap, - max_template_count: &AtomicU16, -) { - let current_max_template_count = max_template_count.load(Ordering::Relaxed); - for root in template.roots.iter() { - create_template_node(channel, root); - templates.insert(template.name.to_owned(), current_max_template_count); - } - channel.add_templates(current_max_template_count, template.roots.len() as u16); +// pub fn add_template( +// template: &Template<'static>, +// channel: &mut Channel, +// templates: &mut FxHashMap, +// max_template_count: &AtomicU16, +// ) { +// let current_max_template_count = max_template_count.load(Ordering::Relaxed); +// for root in template.roots.iter() { +// create_template_node(channel, root); +// templates.insert(template.name.to_owned(), current_max_template_count); +// } +// channel.add_templates(current_max_template_count, template.roots.len() as u16); - max_template_count.fetch_add(1, Ordering::Relaxed); -} +// max_template_count.fetch_add(1, Ordering::Relaxed); +// } -pub fn create_template_node(channel: &mut Channel, node: &'static TemplateNode<'static>) { - use TemplateNode::*; - match node { - Element { - tag, - namespace, - attrs, - children, - .. - } => { - // Push the current node onto the stack - match namespace { - Some(ns) => channel.create_element_ns(tag, ns), - None => channel.create_element(tag), - } - // Set attributes on the current node - for attr in *attrs { - if let TemplateAttribute::Static { - name, - value, - namespace, - } = attr - { - channel.set_top_attribute(name, value, namespace.unwrap_or_default()) - } - } - // Add each child to the stack - for child in *children { - create_template_node(channel, child); - } - // Add all children to the parent - channel.append_children_to_top(children.len() as u16); - } - Text { text } => channel.create_raw_text(text), - DynamicText { .. } => channel.create_raw_text("p"), - Dynamic { .. } => channel.add_placeholder(), - } -} +// pub fn create_template_node(channel: &mut Channel, node: &'static TemplateNode<'static>) { +// use TemplateNode::*; +// match node { +// Element { +// tag, +// namespace, +// attrs, +// children, +// .. +// } => { +// // Push the current node onto the stack +// match namespace { +// Some(ns) => channel.create_element_ns(tag, ns), +// None => channel.create_element(tag), +// } +// // Set attributes on the current node +// for attr in *attrs { +// if let TemplateAttribute::Static { +// name, +// value, +// namespace, +// } = attr +// { +// channel.set_top_attribute(name, value, namespace.unwrap_or_default()) +// } +// } +// // Add each child to the stack +// for child in *children { +// create_template_node(channel, child); +// } +// // Add all children to the parent +// channel.append_children_to_top(children.len() as u16); +// } +// Text { text } => channel.create_raw_text(text), +// DynamicText { .. } => channel.create_raw_text("p"), +// Dynamic { .. } => channel.add_placeholder(), +// } +// } diff --git a/packages/desktop/src/hooks.rs b/packages/desktop/src/hooks.rs index 85d1a170b..b6ca11d9b 100644 --- a/packages/desktop/src/hooks.rs +++ b/packages/desktop/src/hooks.rs @@ -2,76 +2,75 @@ use crate::{ assets::*, ipc::UserWindowEvent, shortcut::IntoAccelerator, window, DesktopContext, ShortcutHandle, ShortcutRegistryError, WryEventHandler, }; -use dioxus_core::ScopeState; use tao::{event::Event, event_loop::EventLoopWindowTarget}; use wry::RequestAsyncResponder; -/// Get an imperative handle to the current window -pub fn use_window(cx: &ScopeState) -> &DesktopContext { - cx.use_hook(|| cx.consume_context::()) - .as_ref() - .unwrap() -} +// /// Get an imperative handle to the current window +// pub fn use_window(cx: &ScopeState) -> &DesktopContext { +// cx.use_hook(|| cx.consume_context::()) +// .as_ref() +// .unwrap() +// } -/// Get a closure that executes any JavaScript in the WebView context. -pub fn use_wry_event_handler( - cx: &ScopeState, - handler: impl FnMut(&Event, &EventLoopWindowTarget) + 'static, -) -> &WryEventHandler { - cx.use_hook(move || { - let desktop = window(); +// /// Get a closure that executes any JavaScript in the WebView context. +// pub fn use_wry_event_handler( +// cx: &ScopeState, +// handler: impl FnMut(&Event, &EventLoopWindowTarget) + 'static, +// ) -> &WryEventHandler { +// cx.use_hook(move || { +// let desktop = window(); - let id = desktop.create_wry_event_handler(handler); +// let id = desktop.create_wry_event_handler(handler); - WryEventHandler { - handlers: desktop.shared.event_handlers.clone(), - id, - } - }) -} +// WryEventHandler { +// handlers: desktop.shared.event_handlers.clone(), +// id, +// } +// }) +// } -/// Provide a callback to handle asset loading yourself. -/// -/// The callback takes a path as requested by the web view, and it should return `Some(response)` -/// if you want to load the asset, and `None` if you want to fallback on the default behavior. -pub fn use_asset_handler( - cx: &ScopeState, - name: &str, - handler: impl Fn(AssetRequest, RequestAsyncResponder) + 'static, -) { - cx.use_hook(|| { - crate::window().asset_handlers.register_handler( - name.to_string(), - Box::new(handler), - cx.scope_id(), - ); +// /// Provide a callback to handle asset loading yourself. +// /// +// /// The callback takes a path as requested by the web view, and it should return `Some(response)` +// /// if you want to load the asset, and `None` if you want to fallback on the default behavior. +// pub fn use_asset_handler( +// cx: &ScopeState, +// name: &str, +// handler: impl Fn(AssetRequest, RequestAsyncResponder) + 'static, +// ) { +// cx.use_hook(|| { +// crate::window().asset_handlers.register_handler( +// name.to_string(), +// Box::new(handler), +// cx.scope_id(), +// ); - Handler(name.to_string()) - }); +// Handler(name.to_string()) +// }); - // todo: can we just put ondrop in core? - struct Handler(String); - impl Drop for Handler { - fn drop(&mut self) { - _ = crate::window().asset_handlers.remove_handler(&self.0); - } - } -} +// // todo: can we just put ondrop in core? +// struct Handler(String); +// impl Drop for Handler { +// fn drop(&mut self) { +// _ = crate::window().asset_handlers.remove_handler(&self.0); +// } +// } +// } -/// Get a closure that executes any JavaScript in the WebView context. -pub fn use_global_shortcut( - cx: &ScopeState, - accelerator: impl IntoAccelerator, - handler: impl FnMut() + 'static, -) -> &Result { - cx.use_hook(move || { - let desktop = window(); +// /// Get a closure that executes any JavaScript in the WebView context. +// pub fn use_global_shortcut( +// cx: &ScopeState, +// accelerator: impl IntoAccelerator, +// handler: impl FnMut() + 'static, +// ) -> &Result { +// cx.use_hook(move || { +// let desktop = window(); - let id = desktop.create_shortcut(accelerator.accelerator(), handler); +// let id = desktop.create_shortcut(accelerator.accelerator(), handler); - Ok(ShortcutHandle { - desktop, - shortcut_id: id?, - }) - }) -} +// Ok(ShortcutHandle { +// desktop, +// shortcut_id: id?, +// }) +// }) +// } diff --git a/packages/desktop/src/launch.rs b/packages/desktop/src/launch.rs index 080dcd13e..51cc84459 100644 --- a/packages/desktop/src/launch.rs +++ b/packages/desktop/src/launch.rs @@ -76,7 +76,7 @@ pub fn launch_cfg(root: Component, config_builder: Config) { /// }) /// } /// ``` -pub fn launch_with_props(root: Component

, props: P, cfg: Config) { +pub fn launch_with_props(root: Component

, props: P, cfg: Config) { #[cfg(feature = "tokio")] tokio::runtime::Builder::new_multi_thread() .enable_all() @@ -94,7 +94,7 @@ pub fn launch_with_props(root: Component

, props: P, cfg: Config) /// /// This will block the main thread, and *must* be spawned on the main thread. This function does not assume any runtime /// and is equivalent to calling launch_with_props with the tokio feature disabled. -pub fn launch_with_props_blocking(root: Component

, props: P, cfg: Config) { +pub fn launch_with_props_blocking(root: Component

, props: P, cfg: Config) { let (event_loop, mut app) = App::new(cfg, props, root); event_loop.run(move |window_event, _, control_flow| { diff --git a/packages/desktop/src/lib.rs b/packages/desktop/src/lib.rs index 2b673f729..d6b648876 100644 --- a/packages/desktop/src/lib.rs +++ b/packages/desktop/src/lib.rs @@ -43,6 +43,6 @@ pub use config::{Config, WindowCloseBehaviour}; pub use desktop_context::{ window, DesktopContext, DesktopService, WryEventHandler, WryEventHandlerId, }; -pub use hooks::{use_asset_handler, use_global_shortcut, use_window, use_wry_event_handler}; +// pub use hooks::{use_asset_handler, use_global_shortcut, use_window, use_wry_event_handler}; pub use shortcut::{ShortcutHandle, ShortcutId, ShortcutRegistryError}; pub use wry::RequestAsyncResponder; diff --git a/packages/desktop/src/protocol.rs b/packages/desktop/src/protocol.rs index 82570b1bc..606696410 100644 --- a/packages/desktop/src/protocol.rs +++ b/packages/desktop/src/protocol.rs @@ -53,6 +53,47 @@ pub(super) fn index_request( .ok() } +// let assets_head = { +// #[cfg(all( +// debug_assertions, +// any( +// target_os = "windows", +// target_os = "macos", +// target_os = "linux", +// target_os = "dragonfly", +// target_os = "freebsd", +// target_os = "netbsd", +// target_os = "openbsd" +// ) +// ))] +// { +// None +// } +// #[cfg(not(all( +// debug_assertions, +// any( +// target_os = "windows", +// target_os = "macos", +// target_os = "linux", +// target_os = "dragonfly", +// target_os = "freebsd", +// target_os = "netbsd", +// target_os = "openbsd" +// ) +// )))] +// { +// let head = crate::protocol::get_asset_root_or_default(); +// let head = head.join("dist/__assets_head.html"); +// match std::fs::read_to_string(&head) { +// Ok(s) => Some(s), +// Err(err) => { +// tracing::error!("Failed to read {head:?}: {err}"); +// None +// } +// } +// } +// }; + /// Handle a request from the webview /// /// - Tries to stream edits if they're requested. @@ -66,6 +107,7 @@ pub(super) fn desktop_handler( ) { // If the request is asking for edits (ie binary protocol streaming, do that) if request.uri().path().trim_matches('/') == "edits" { + println!("Handling edits from handler"); return edit_queue.handle_request(responder); } diff --git a/packages/desktop/src/shortcut.rs b/packages/desktop/src/shortcut.rs index 34e7e7013..1fee28e34 100644 --- a/packages/desktop/src/shortcut.rs +++ b/packages/desktop/src/shortcut.rs @@ -1,4 +1,4 @@ -use std::{cell::RefCell, collections::HashMap, str::FromStr}; +use std::{cell::RefCell, collections::HashMap, rc::Rc, str::FromStr}; use dioxus_html::input_data::keyboard_types::Modifiers; use slab::Slab; @@ -84,7 +84,7 @@ impl ShortcutRegistry { HotkeyError::HotKeyParseError(shortcut) => { ShortcutRegistryError::InvalidShortcut(shortcut) } - err => ShortcutRegistryError::Other(Box::new(err)), + err => ShortcutRegistryError::Other(Rc::new(err)), })?; let mut shortcut = Shortcut { diff --git a/packages/desktop/src/webview.rs b/packages/desktop/src/webview.rs index ecfb68cfe..06a6a16c2 100644 --- a/packages/desktop/src/webview.rs +++ b/packages/desktop/src/webview.rs @@ -145,7 +145,7 @@ impl WebviewInstance { )); // Provide the desktop context to the virtualdom - dom.base_scope().provide_context(desktop_context.clone()); + // dom.base_scope().provide_context(desktop_context.clone()); // let query = dom.in_runtime(|| { // let query = ScopeId::ROOT.provide_context(desktop_context.clone()); @@ -163,7 +163,7 @@ impl WebviewInstance { // a different TypeId. let provider: Rc = Rc::new(DesktopEvalProvider::new(desktop_context.clone())); - dom.base_scope().provide_context(provider); + // dom.base_scope().provide_context(provider); WebviewInstance { waker: tao_waker(shared.proxy.clone(), desktop_context.window.id()), @@ -190,7 +190,11 @@ impl WebviewInstance { } } - self.desktop_context.send_edits(self.dom.render_immediate()); + // self.desktop_context.send_edits(self.dom.render_immediate()); + + self.dom + .render_immediate(&mut *self.desktop_context.mutation_state.borrow_mut()); + self.desktop_context.send_edits(); } } } diff --git a/packages/html/src/elements.rs b/packages/html/src/elements.rs index 37e6bb682..530f17e54 100644 --- a/packages/html/src/elements.rs +++ b/packages/html/src/elements.rs @@ -1,7 +1,6 @@ #![allow(non_upper_case_globals)] use dioxus_core::prelude::IntoAttributeValue; -use dioxus_core::HasAttributes; use dioxus_html_internal_macro::impl_extension_attributes; #[cfg(feature = "hot-reload-context")] use dioxus_rsx::HotReloadingContext; @@ -386,9 +385,9 @@ macro_rules! builder_constructors { pub(crate) mod extensions { use super::*; - $( - impl_extension_attributes![ELEMENT $name { $($fil,)* }]; - )* + // $( + // impl_extension_attributes![ELEMENT $name { $($fil,)* }]; + // )* } }; } diff --git a/packages/html/src/global_attributes.rs b/packages/html/src/global_attributes.rs index b9f06a754..a5a8a3f87 100644 --- a/packages/html/src/global_attributes.rs +++ b/packages/html/src/global_attributes.rs @@ -1,7 +1,6 @@ #![allow(non_upper_case_globals)] use dioxus_core::prelude::IntoAttributeValue; -use dioxus_core::HasAttributes; use dioxus_html_internal_macro::impl_extension_attributes; use crate::AttributeDiscription; @@ -111,7 +110,7 @@ macro_rules! trait_methods { None } - impl_extension_attributes![GLOBAL $trait { $($name,)* }]; + // impl_extension_attributes![GLOBAL $trait { $($name,)* }]; }; // Rename the incoming ident and apply a custom namespace diff --git a/packages/html/src/lib.rs b/packages/html/src/lib.rs index 17ca25aef..a8be3f45c 100644 --- a/packages/html/src/lib.rs +++ b/packages/html/src/lib.rs @@ -50,7 +50,7 @@ pub mod eval; pub mod extensions { pub use crate::elements::extensions::*; - pub use crate::global_attributes::{GlobalAttributesExtension, SvgAttributesExtension}; + // pub use crate::global_attributes::{GlobalAttributesExtension, SvgAttributesExtension}; } pub mod prelude { @@ -58,7 +58,7 @@ pub mod prelude { #[cfg(feature = "eval")] pub use crate::eval::*; pub use crate::events::*; - pub use crate::global_attributes::{GlobalAttributesExtension, SvgAttributesExtension}; + // pub use crate::global_attributes::{GlobalAttributesExtension, SvgAttributesExtension}; pub use crate::point_interaction::*; pub use keyboard_types::{self, Code, Key, Location, Modifiers}; } diff --git a/packages/rsx/src/lib.rs b/packages/rsx/src/lib.rs index 74578b59b..d56f0871b 100644 --- a/packages/rsx/src/lib.rs +++ b/packages/rsx/src/lib.rs @@ -253,8 +253,7 @@ impl<'a> ToTokens for TemplateRenderer<'a> { attr_paths: &[ #(#attr_paths),* ], }; - __cx.vnode( - None.into(), + ::dioxus::core::VNode::new( #key_tokens, TEMPLATE, Box::new([ #( #node_printer ),* ]),