wip!: refactor

Author: EqualMa

Cargo.lock

@@ -1,6 +1,5 @@
 use frender::{
-    html::form_control::value::UncontrolledWithDefaultValue, prelude::*, Empty,
-    ScriptInnerTextWronglyEncoded,
+    form_control::UncontrolledWithDefaultValue, prelude::*, Empty, ScriptInnerTextWronglyEncoded,
 };
 use hooks::{IntoEq, ShareValue, ToOwnedShareValue};
 

examples/html-elements/src/main.rs

@@ -1,5 +1,6 @@
 use std::borrow::Borrow;
 
+// TODO: remove
 /// The non generic version of [`Borrow`].
 pub trait PrimarilyBorrow: Borrow<Self::Borrowed> {
     type Borrowed: ?Sized;

packages/frender-common/src/primary_borrow.rs

@@ -6,5 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-frender-html = { version = "0.1.0", path = "../frender-html", default-features = false }
+frender-csr = { version = "0.1.0", path = "../frender-csr", features = [
+    "experimental",
+] }
 pin-project-lite = "0.2.13"

packages/frender-csr-ext/Cargo.toml

@@ -1,29 +1,31 @@
 use std::{future::Future, pin::pin};
 
-use frender_html::{
-    dom::ProvideRenderContext,
-    experimental::{PinnedRenderStateKind, PinnedRenderStateKindPollRender, RenderInitPinned as _},
-    CsrElement as Element, RenderHtml, StateUnmount,
+use frender_csr::{
+    experimental::{
+        PinnedRenderStateKind, PinnedRenderStateKindPollRender, ProvideRenderContext,
+        RenderInitPinned as _,
+    },
+    CsrElement, RenderHtml, StateUnmount,
 };
 
 pub trait IntoRenderElementExt: ProvideRenderContext {
-    fn into_render_element<E: Element>(self, element: E) -> crate::RenderElement<Self, E>
+    fn into_render_element<E: CsrElement>(self, element: E) -> crate::RenderElement<Self, E>
     where
         Self: Sized,
         Self::Renderer: RenderHtml,
     {
         crate::RenderElement::new(self, element)
     }
 
-    fn render_element<E: Element>(&mut self, element: E) -> crate::RenderElement<&mut Self, E>
+    fn render_element<E: CsrElement>(&mut self, element: E) -> crate::RenderElement<&mut Self, E>
     where
         Self::Renderer: RenderHtml,
     {
         crate::RenderElement::new(self, element)
     }
 
     /// The caller could then unmount the ui handle or just drop it without unmounting.
-    fn into_render_element_until_non_reactive<E: Element>(
+    fn into_render_element_until_non_reactive<E: CsrElement>(
         mut self,
         element: E,
     ) -> impl Future<
@@ -58,7 +60,7 @@ pub trait IntoRenderElementExt: ProvideRenderContext {
         }
     }
 
-    fn render_element_until_non_reactive<E: Element>(
+    fn render_element_until_non_reactive<E: CsrElement>(
         &mut self,
         element: E,
     ) -> impl Future<

packages/frender-csr-ext/src/into_render_element_ext.rs

@@ -1,4 +1,3 @@
-pub use frender_html::{CsrComponent, CsrElement};
 pub use into_render_element_ext::IntoRenderElementExt;
 pub use render_element::RenderElement;
 

packages/frender-csr-ext/src/lib.rs

@@ -1,9 +1,10 @@
 use std::{future::Future, pin::Pin, task::Poll};
 
-use frender_html::{
-    dom::{ui_handle::UiHandle as _, ProvideRenderContext},
-    experimental::{PinnedRenderStateKind, PinnedRenderStateKindPollRender as _},
-    CsrElement, RenderHtml, StateUnmount as _,
+use frender_csr::{
+    experimental::{
+        PinnedRenderStateKind, PinnedRenderStateKindPollRender as _, ProvideRenderContext,
+    },
+    CsrElement, RenderHtml, StateUnmount as _, UiHandle as _,
 };
 
 pin_project_lite::pin_project!(
@@ -152,12 +153,12 @@ where
         let (mut state, ui_handle) = this.p.provide_render_context(|render_context| {
             this.element_or_state.as_mut().as_pin_mut_state_or_insert(
                 |element| {
-                    use frender_html::dom::render::RenderContext as _;
+                    use frender_csr::render::RenderContext as _;
                     let (state, init) = element.pinned_render_init(render_context.renderer_mut());
                     (state, (init, render_context))
                 },
                 |(init, render_context), state| {
-                    use frender_html::experimental::RenderInitPinned as _;
+                    use frender_csr::experimental::RenderInitPinned as _;
 
                     init.render_init_pinned(render_context, state)
                 },

packages/frender-csr-ext/src/render_element.rs

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 frender-common = { version = "0.1.0", path = "../frender-common" }
-frender-csr-ext = { version = "0.1.0", path = "../frender-csr-ext" }
+frender-csr-ext = { version = "0.1.0", path = "../frender-csr-ext", optional = true }
 frender-html = { version = "0.1.0", path = "../frender-html", features = [
     "web",
 ] }
@@ -33,3 +33,4 @@ features = [
 
 [features]
 spawn = ["dep:wasm-bindgen-futures"]
+csr = ["dep:frender-csr-ext"]

packages/frender-csr-web/Cargo.toml

@@ -1,5 +1,11 @@
-use frender_csr_ext::IntoRenderElementExt as _;
-use frender_html::CsrElement as Element;
+#[cfg(feature = "csr")]
+pub use self::csr::mount_to_dom_element;
+#[cfg(feature = "csr")]
+#[cfg(feature = "spawn")]
+pub use self::csr::spawn_mount_to_dom_element;
+
+#[cfg(feature = "csr")]
+mod csr;
 
 pub trait GetDomElement {
     fn get_dom_element(self, document: &web_sys::Document) -> web_sys::Element;
@@ -22,23 +28,3 @@ where
         self(document)
     }
 }
-
-pub fn mount_to_dom_element<'e, E: Element + 'e>(
-    element: E,
-    get_dom_element: impl GetDomElement,
-) -> impl std::future::Future<Output = ()> + 'e {
-    let window = web_sys::window().unwrap();
-
-    let document = window.document().unwrap();
-    let current_parent = get_dom_element.get_dom_element(&document);
-
-    crate::renderer::RendererWithRoot::new(document, current_parent).into_render_element(element)
-}
-
-#[cfg(feature = "spawn")]
-pub fn spawn_mount_to_dom_element<E: Element + 'static>(
-    get_element: E,
-    get_dom_element: impl GetDomElement,
-) {
-    wasm_bindgen_futures::spawn_local(mount_to_dom_element(get_element, get_dom_element))
-}

packages/frender-csr-web/src/mount.rs

@@ -0,0 +1,24 @@
+use frender_csr_ext::IntoRenderElementExt as _;
+use frender_html::CsrElement;
+
+use super::GetDomElement;
+
+pub fn mount_to_dom_element<'e, E: CsrElement + 'e>(
+    element: E,
+    get_dom_element: impl GetDomElement,
+) -> impl std::future::Future<Output = ()> + 'e {
+    let window = web_sys::window().unwrap();
+
+    let document = window.document().unwrap();
+    let current_parent = get_dom_element.get_dom_element(&document);
+
+    crate::renderer::RendererWithRoot::new(document, current_parent).into_render_element(element)
+}
+
+#[cfg(feature = "spawn")]
+pub fn spawn_mount_to_dom_element<E: CsrElement + 'static>(
+    get_element: E,
+    get_dom_element: impl GetDomElement,
+) {
+    wasm_bindgen_futures::spawn_local(mount_to_dom_element(get_element, get_dom_element))
+}