feat!: frender-test

Author: EqualMa

Cargo.lock

@@ -25,6 +25,7 @@ frender-form-control = { version = "0.1.0", path = "../frender-form-control", fe
     "ssr",
 ] }
 arrayvec = { version = "0.7.6", default-features = false }
+ref-cast = { version = "1.0.23", optional = true }
 
 [dependencies.web-sys]
 version = "0.3.60"
@@ -122,7 +123,7 @@ either = [
     "frender-dom/either",
     "frender-form-control/either",
 ]
-ElementProxyAttrs = []
+ElementProxyAttrs = ["dep:ref-cast"]
 components = []
 chrono = ["frender-form-control/chrono"]
 experimental = []

packages/frender-html/Cargo.toml

@@ -1,7 +1,17 @@
 pub use event_listener::EventListener;
+use ref_cast::{ref_cast_custom, RefCastCustom};
 
+#[derive(RefCastCustom)]
+#[repr(transparent)]
 pub struct ElementProxyAttrs<E: ?Sized>(pub E);
 
+impl<E: ?Sized> ElementProxyAttrs<E> {
+    #[ref_cast_custom]
+    fn ref_cast_mut(inner: &mut E) -> &mut Self;
+}
+
+mod ui_handle;
+
 pub(crate) mod proxy_attr {
     use frender_common::impl_many;
     use frender_dom::behaviors;

packages/frender-html/src/element_proxy_attrs.rs

@@ -0,0 +1,53 @@
+use frender_dom::ui_handle::{ProvideMutMounted, UiHandle, UnmountedUiHandle};
+
+use super::ElementProxyAttrs;
+
+impl<E: UnmountedUiHandle<R>, R: ?Sized> UnmountedUiHandle<R> for ElementProxyAttrs<E> {
+    type Mounted = ElementProxyAttrs<E::Mounted>;
+
+    fn mount(self, render_context: &mut <R>::RenderContext<'_>) -> Self::Mounted
+    where
+        R: frender_dom::render::RenderWithContext,
+    {
+        ElementProxyAttrs(self.0.mount(render_context))
+    }
+}
+
+impl<E: ProvideMutMounted<R>, R: ?Sized> ProvideMutMounted<R> for ElementProxyAttrs<E> {
+    fn provide_mut_mounted<Out>(&mut self, renderer: &mut R, f: impl FnOnce(&mut R, &mut Self::Mounted) -> Out) -> Out {
+        self.0.provide_mut_mounted(
+            //
+            renderer,
+            |renderer, e| f(renderer, ElementProxyAttrs::<E::Mounted>::ref_cast_mut(e)),
+        )
+    }
+}
+
+impl<E: UiHandle<R>, R: ?Sized> UiHandle<R> for ElementProxyAttrs<E> {
+    type Unmounted = ElementProxyAttrs<E::Unmounted>;
+
+    fn unmount(self, renderer: &mut R) -> Self::Unmounted {
+        ElementProxyAttrs(self.0.unmount(renderer))
+    }
+
+    fn reposition(&mut self, render_context: &mut <R>::RenderContext<'_>)
+    where
+        R: frender_dom::render::RenderWithContext,
+    {
+        self.0.reposition(render_context)
+    }
+
+    fn check_and_move_cursor(&self, render_context: &mut <R>::RenderContext<'_>)
+    where
+        R: frender_dom::render::RenderWithContext,
+    {
+        self.0.check_and_move_cursor(render_context)
+    }
+
+    fn assert_cursor_is_at_self(&self, render_context: &<R>::RenderContext<'_>)
+    where
+        R: frender_dom::render::RenderWithContext,
+    {
+        self.0.assert_cursor_is_at_self(render_context)
+    }
+}

packages/frender-html/src/element_proxy_attrs/ui_handle.rs

@@ -2,10 +2,10 @@
 
 use frender_html::cs;
 use frender_keyed_elements::{Keyed, KeyedElements};
-use frender_test::{element::Node, renderer::RendererWithRoot};
+use frender_test::{element::Node, renderer::Root};
 
-fn dom_nodes_div_i32(dom: &RendererWithRoot) -> Vec<i32> {
-    let nodes = dom.nodes();
+fn dom_nodes_div_i32(root: &Root) -> Vec<i32> {
+    let nodes = root.clone_nodes();
     let mut nodes = nodes.iter();
     assert!(nodes.next().unwrap().is_cursor_placeholder());
     assert!(nodes.next_back().unwrap().is_cursor_placeholder());
@@ -29,27 +29,25 @@ fn dom_nodes_div_i32(dom: &RendererWithRoot) -> Vec<i32> {
 #[cfg(feature = "csr")]
 #[test]
 fn prepend() {
-    let mut dom = RendererWithRoot::new();
-    let mut render_state = Default::default();
+    use frender_html::CsrElement;
+    use frender_test::renderer::unpinned_render_init;
 
-    assert!(dom.nodes().is_empty());
+    let (ref mut renderer, ref root, (ref mut state, ref mut ui_handle)) = unpinned_render_init(
+        KeyedElements((0..5).map(|n| Keyed(n, cs::div().children(n)))),
+    );
 
-    {
-        let elements = (0..5).map(|n| Keyed(n, cs::div().children(n)));
-        dom.unpinned_render_update(Elements(elements), &mut render_state);
-        assert_eq!(dom_nodes_div_i32(&dom), [0, 1, 2, 3, 4]);
-    }
+    assert_eq!(dom_nodes_div_i32(root), [0, 1, 2, 3, 4]);
 
     {
         let elements = [9, 0, 1, 2, 3, 4].map(|n| Keyed(n, cs::div().children(n)));
-        dom.unpinned_render_update(Elements(elements), &mut render_state);
-        assert_eq!(dom_nodes_div_i32(&dom), [9, 0, 1, 2, 3, 4]);
+        KeyedElements(elements).unpinned_render_update(renderer, state, ui_handle);
+        assert_eq!(dom_nodes_div_i32(root), [9, 0, 1, 2, 3, 4]);
     }
 
     {
         let elements = [10, 11, 12, 9, 0, 1, 2, 3, 4].map(|n| Keyed(n, cs::div().children(n)));
-        dom.unpinned_render_update(Elements(elements), &mut render_state);
+        KeyedElements(elements).unpinned_render_update(renderer, state, ui_handle);
 
-        assert_eq!(dom_nodes_div_i32(&dom), [10, 11, 12, 9, 0, 1, 2, 3, 4]);
+        assert_eq!(dom_nodes_div_i32(root), [10, 11, 12, 9, 0, 1, 2, 3, 4]);
     }
 }