feat!: features

Author: EqualMa

Cargo.lock

@@ -1,12 +1,12 @@
 use std::borrow::Cow;
 
-use frender_html::{
-    csr::experimental::RenderHtml,
-    dom::csr::{
-        render::{Render, RenderWithContext},
-        web::{CursorPlaceholder, Node, RenderContext},
-        ProvideRenderContext,
+use frender_html::csr::{
+    experimental::{
+        render::Render,
+        web::{self, CursorPlaceholder, Node, RenderContext},
+        ProvideRenderContext, RenderHtml,
     },
+    render::RenderWithContext,
 };
 
 use super::{Renderer, RendererWithRoot};
@@ -22,9 +22,7 @@ impl ProvideRenderContext for RendererWithRoot {
     ) -> Res {
         let mut ctx = RenderContext {
             renderer: &mut self.renderer,
-            cursor: &mut frender_html::dom::csr::web::Cursor::first_child_of(Cow::Borrowed(
-                &self.root,
-            )),
+            cursor: &mut web::Cursor::first_child_of(Cow::Borrowed(&self.root)),
         };
         f(&mut ctx)
     }
@@ -178,7 +176,7 @@ impl RenderHtml for Renderer {
     );
 }
 
-impl frender_html::dom::csr::web::Renderer for Renderer {
+impl web::Renderer for Renderer {
     fn document(&self) -> Cow<web_sys::Document> {
         Cow::Borrowed(&self.document)
     }

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

@@ -1,4 +1,7 @@
-use frender_html::dom::csr::{render::RenderTextFrom, web::Node};
+use frender_html::csr::experimental::{
+    render::RenderTextFrom,
+    web::{self, Node},
+};
 
 use super::Renderer;
 
@@ -72,11 +75,11 @@ mod into_js_string {
 mod into_text_node {
     use std::{borrow::Cow, rc::Rc, sync::Arc};
 
+    use frender_html::values::StringElement;
     use frender_reactive_value::{static_or_temp_ref::StaticOrTempRef, temp_ref::TempRef};
     use wasm_bindgen::JsCast as _;
 
     use frender_common::impl_many;
-    use frender_html::dom::string_element::StringElement;
 
     use super::Renderer;
 
@@ -168,7 +171,7 @@ impl<V: into_text_node::IntoTextNode> RenderTextFrom<V> for Renderer {
 
     fn render_text_from(render_context: &mut Self::RenderContext<'_>, v: V) -> Self::Text {
         let text = v.into_text_node(render_context.renderer);
-        <Self as frender_html::dom::csr::web::Renderer>::mount_node(render_context, &text);
+        <Self as web::Renderer>::mount_node(render_context, &text);
         Node(text)
     }
 

packages/frender-csr-web/src/renderer/csr/text.rs

@@ -9,6 +9,7 @@ frender-dom = { version = "0.1.0", path = "../frender-dom" }
 frender-dom-tokens = { version = "0.1.0", path = "../frender-dom-tokens" }
 frender-form-control = { version = "0.1.0", path = "../frender-form-control" }
 frender-style = { version = "0.1.0", path = "../frender-style" }
+frender-events = { version = "0.1.0", path = "../frender-events" }
 
 [features]
 csr = [

packages/frender-dom-values/Cargo.toml

@@ -66,7 +66,7 @@ pub mod attr_value {
 pub use self::macros::style;
 pub mod style {
     pub use frender_style::{
-        css_style_declaration, impl_has_const_declaration_list_for,
+        impl_has_const_declaration_list_for,
         style::{comma_separated, one, r#const},
         styles::{constness::ConstDeclarationList, Chain, EitherStyle, Never},
         IntoStyle, Style,
@@ -87,9 +87,7 @@ pub mod dom_tokens {
         dom_tokens::{comma_separated, one, r#const},
         impl_dom_tokens_for,
         impl_has_const_dom_tokens_for,
-        Chain,
-        EitherDomTokens,
-        EraseConstKnownPossibleDomTokens,
+        values::{Chain, EitherDomTokens, EraseConstKnownPossibleDomTokens},
         {ChainableDomTokens, DomTokens, IntoDomTokens},
     };
 }
@@ -98,3 +96,11 @@ pub mod macros {
     pub use frender_dom_tokens::dom_tokens::comma_separated as dom_tokens;
     pub use frender_style::style::comma_separated as style;
 }
+
+pub mod event {
+    pub use frender_events::event::{
+        AnimationEvent, CompositionEvent, Event, FocusEvent, InputEvent, KeyboardEvent, MouseEvent,
+        PointerEvent, SecurityPolicyViolationEvent, TouchEvent, TransitionEvent, UiEvent,
+        WheelEvent,
+    };
+}

packages/frender-dom-values/src/lib.rs

@@ -10,7 +10,9 @@ frender-events = { version = "0.1.0", path = "../frender-events" }
 frender-common = { version = "0.1.0", path = "../frender-common" }
 
 frender-style = { version = "0.1.0", path = "../frender-style" }
-frender-dom-tokens = { version = "0.1.0", path = "../frender-dom-tokens" }
+frender-dom-tokens = { version = "0.1.0", path = "../frender-dom-tokens", features = [
+    "experimental",
+] }
 frender-attr-value = { version = "0.1.0", path = "../frender-attr-value" }
 
 # ssr
@@ -74,3 +76,4 @@ either = [
     "frender-dom-tokens/either",
     "frender-style/either",
 ]
+experimental = []

packages/frender-dom/Cargo.toml

@@ -1,3 +1,4 @@
+use frender_dom_tokens::experimental::csr::DomTokenList;
 use frender_style::css_style_declaration::CssStyleDeclaration;
 
 use crate::csr::{render::RenderWithContext, render_from::str::ValueForStr};
@@ -71,15 +72,15 @@ pub trait HtmlElement<Renderer: ?Sized>: Element<Renderer> + SetInnerTextFromStr
 }
 
 pub trait ElementWithClassList<Renderer: ?Sized>: Element<Renderer> {
-    type ClassList<'a>: frender_dom_tokens::DomTokenList
+    type ClassList<'a>: DomTokenList
     where
         Self: 'a,
         Renderer: 'a;
     fn class_list<'a>(&'a mut self, renderer: &'a mut Renderer) -> Self::ClassList<'a>;
 }
 
 pub trait ElementWithRelList<Renderer: ?Sized>: Element<Renderer> {
-    type RelList<'a>: frender_dom_tokens::DomTokenList
+    type RelList<'a>: DomTokenList
     where
         Self: 'a,
         Renderer: 'a;

packages/frender-dom/src/csr/behaviors.rs

@@ -19,3 +19,7 @@ pub mod behaviors;
 
 mod ui_handle;
 pub use ui_handle::{ProvideMutMounted, UiHandle, UnmountedUiHandle};
+
+pub mod experimental {
+    pub use frender_dom_tokens::experimental::csr::DomTokenList;
+}

packages/frender-dom/src/csr/mod.rs

@@ -10,10 +10,6 @@ pub mod style {
     }
 }
 
-pub mod dom_tokens {
-    pub use frender_dom_tokens::{DomToken, DomTokenList, DomTokens};
-}
-
 mod tag;
 
 #[cfg(feature = "csr")]

packages/frender-dom/src/lib.rs

@@ -4,3 +4,7 @@ pub use self::component::{
 };
 
 mod component;
+
+pub mod experimental {
+    pub use frender_dom_tokens::experimental::ssr::SsrDomTokens;
+}