feat!: frender_with_attrs

Author: EqualMa

Cargo.lock

@@ -16,7 +16,7 @@ frender-ssr-html = { version = "0.1.0", path = "../frender-ssr-html", optional =
 async-str-iter = { version = "0.1.0", path = "../async-str-iter", optional = true }
 
 [features]
-default = ["csr", "ssr", "either"]                   # TODO: remove
 csr = []
 ssr = ["dep:frender-ssr-html", "dep:async-str-iter"]
 either = ["dep:either"]
+experimental = []

packages/frender-attrs/Cargo.toml

@@ -0,0 +1,9 @@
+#[cfg(feature = "csr")]
+pub mod csr {
+    pub use crate::csr::{CsrAttributes, RenderAttributes};
+}
+
+#[cfg(feature = "ssr")]
+pub mod ssr {
+    pub use crate::ssr::SsrAttributes;
+}

packages/frender-attrs/src/experimental.rs

@@ -1,9 +1,9 @@
 pub mod values;
 
 #[cfg(feature = "csr")]
-pub mod csr;
+mod csr;
 #[cfg(feature = "ssr")]
-pub mod ssr;
+mod ssr;
 
 pub mod attrs;
 
@@ -38,3 +38,6 @@ mod sealed {
     #[cfg(not(feature = "ssr"))]
     pub trait Attributes {}
 }
+
+#[cfg(feature = "experimental")]
+pub mod experimental;

packages/frender-attrs/src/lib.rs

@@ -24,6 +24,9 @@ frender-attr-value = { version = "0.1.0", path = "../frender-attr-value", featur
     "html",
     "experimental",
 ] }
+frender-attrs = { version = "0.1.0", path = "../frender-attrs", features = [
+    "experimental",
+] }
 frender-form-control = { version = "0.1.0", path = "../frender-form-control", features = [
     "ssr",
 ] }
@@ -120,6 +123,7 @@ macros_not_expanded = []
 components = []
 csr = [
     "frender-attr-value/csr",
+    "frender-attrs/csr",
     "frender-dom/csr",
     "frender-form-control/csr",
     "frender-style/csr",
@@ -129,6 +133,7 @@ csr = [
 ssr = [
     "dep:frender-ssr",
     "frender-attr-value/ssr",
+    "frender-attrs/ssr",
     "frender-dom/ssr",
     "frender-form-control/ssr",
     "frender-style/ssr",
@@ -147,6 +152,8 @@ web = [
 # Also requires csr
 either = [
     "dep:either",
+    "frender-attr-value/either",
+    "frender-attrs/either",
     "frender-ssr/either",
     "frender-dom/either",
     "frender-form-control/either",

packages/frender-html/Cargo.toml

@@ -0,0 +1,8 @@
+use frender_attrs::IntoAttributes;
+
+pub struct Attrs<A: IntoAttributes>(pub A);
+
+#[cfg(feature = "csr")]
+mod csr;
+#[cfg(feature = "ssr")]
+mod ssr;

packages/frender-html/src/attrs.rs

@@ -0,0 +1,74 @@
+use std::marker::PhantomData;
+
+use frender_attrs::{
+    experimental::csr::{CsrAttributes, RenderAttributes},
+    IntoAttributes,
+};
+use frender_common::convert::FromMut as _;
+use frender_dom::csr::behaviors;
+
+use crate::{
+    csr::behavior_type::{BehaviorType, UnpinnedNonReactiveRenderStateKind, UnpinnedRenderWithBehavior},
+    html::{behavior_type_traits, RenderHtml},
+};
+
+use super::Attrs;
+
+enum Never {}
+pub struct StateKind<S>(Never, PhantomData<S>);
+
+impl<S> UnpinnedNonReactiveRenderStateKind for StateKind<S> {
+    type UnpinnedNonReactiveState<R: ?Sized + RenderHtml> = S;
+}
+
+impl<
+        //
+        BT: behavior_type_traits::Element,
+        T: IntoAttributes,
+    > UnpinnedRenderWithBehavior<BT> for Attrs<T>
+{
+    type UnpinnedRenderStateKind = StateKind<<T::IntoAttributes as CsrAttributes>::State>;
+
+    fn unpinned_render_init_with_behavior<R: ?Sized + RenderHtml>(
+        //
+        this: Self,
+        renderer: &mut R,
+        b: &mut <BT as BehaviorType>::OfBehaviorType<R>,
+    ) -> <Self::UnpinnedRenderStateKind as crate::csr::behavior_type::UnpinnedNonReactiveRenderStateKind>::UnpinnedNonReactiveState<R> {
+        T::into_attributes(this.0).render_init(&mut Render {
+            renderer,
+            element: BT::Element::from_mut(b),
+        })
+    }
+
+    fn unpinned_render_update_with_behavior<R: ?Sized + RenderHtml>(
+        //
+        this: Self,
+        renderer: &mut R,
+        b: &mut <BT as BehaviorType>::OfBehaviorType<R>,
+        state: &mut <Self::UnpinnedRenderStateKind as crate::csr::behavior_type::UnpinnedNonReactiveRenderStateKind>::UnpinnedNonReactiveState<R>,
+    ) {
+        T::into_attributes(this.0).render_update(
+            &mut Render {
+                renderer,
+                element: BT::Element::from_mut(b),
+            },
+            state,
+        )
+    }
+}
+
+struct Render<'a, R: ?Sized, E: ?Sized> {
+    renderer: &'a mut R,
+    element: &'a mut E,
+}
+
+impl<R: ?Sized, E: ?Sized + behaviors::Element<R>> RenderAttributes for Render<'_, R, E> {
+    fn set_attribute(&mut self, name: &str, value: &str) {
+        self.element.set_attribute(self.renderer, name, value)
+    }
+
+    fn remove_attribute(&mut self, name: &str) {
+        self.element.remove_attribute(self.renderer, name)
+    }
+}

packages/frender-html/src/attrs/csr.rs

@@ -0,0 +1,12 @@
+use frender_attrs::{experimental::ssr::SsrAttributes, IntoAttributes};
+use frender_dom::ssr::IntoSpaceAndHtmlAttributesOrEmpty;
+
+use super::Attrs;
+
+impl<T: IntoAttributes> IntoSpaceAndHtmlAttributesOrEmpty for Attrs<T> {
+    type SpaceAndHtmlAttributesOrEmpty = <T::IntoAttributes as SsrAttributes>::IntoSsrAttributes;
+
+    fn into_space_and_html_attributes_or_empty(self) -> Self::SpaceAndHtmlAttributesOrEmpty {
+        T::into_attributes(self.0).into_ssr_attributes()
+    }
+}

packages/frender-html/src/attrs/ssr.rs

@@ -1,8 +1,11 @@
+use frender_attrs::IntoAttributes;
 use frender_common::Empty;
 
 #[cfg(feature = "csr")]
 pub(crate) use csr_attr_state::AttributeState;
 
+use crate::values::Attrs;
+
 #[cfg(feature = "csr")]
 mod csr_attr_state;
 
@@ -197,4 +200,14 @@ impl<M, C, A, P> Intrinsic<M, C, A, P> {
     {
         Self::with_any_attribute_with_pinned_state_appended(this, attr_with_pinned_state)
     }
+
+    /// This method is prefixed with `frender_` so that it probably won't conflict with html attribute names.
+    pub fn frender_with_attrs<IntoAttrs: IntoAttributes>(self, attrs: IntoAttrs) -> Intrinsic<M, C, (A, Attrs<IntoAttrs>), P> {
+        Intrinsic {
+            type_marker: self.type_marker,
+            attributes: (self.attributes, Attrs(attrs)),
+            attributes_with_pinned_state: self.attributes_with_pinned_state,
+            children: self.children,
+        }
+    }
 }

packages/frender-html/src/intrinsic.rs

@@ -38,6 +38,7 @@ pub mod __private {
 mod special;
 
 mod attr_value;
+mod attrs;
 mod dom_tokens;
 mod event_listener;
 mod style;