zenithsiz/dynatos
1
0
Fork 0
mirror of https://github.com/Zenithsiz/dynatos.git synced 2026-02-11 14:01:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extracted ObjectDynProp::with_* to a new trait.

Browse Source
This commit is contained in:
Filipe Rodrigues
2024-02-19 04:35:35 +00:00
parent c4d52a8023
commit c26348426a
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dynatos/src/lib.rs
View File

@@ -18,5 +18,5 @@ pub use self::{
node_dyn_text::{NodeDynText, NodeWithDynText, WithDynText},
object_attach_context::{ObjectAttachContext, ObjectWithContext},
object_attach_effect::{ObjectAttachEffect, ObjectWithEffect},
object_dyn_prop::ObjectDynProp,
object_dyn_prop::{ObjectDynProp, ObjectWithDynProp},
};

44
dynatos/src/object_dyn_prop.rs
View File

@@ -10,10 +10,7 @@ use {
/// Extension trait to add reactive prop to an object
#[extend::ext(name = ObjectDynProp)]
pub impl<T> T
where
T: AsRef<js_sys::Object>,
{
pub impl js_sys::Object {
/// Adds a dynamic property to this object
fn add_dyn_prop<F, K, V>(&self, f: F)
where
@@ -25,7 +22,7 @@ where
// Note: It's important that we only keep a `WeakRef` to the object.
// Otherwise, the object will be keeping us alive, while we keep
// the object alive, causing a leak.
let object = WeakRef::new(self.as_ref());
let object = WeakRef::new(self);
let prop_effect = Effect::try_new(move || {
// Try to get the object
let object = object.get().or_return()?;
@@ -45,20 +42,7 @@ where
.or_return()?;
// Then set it
self.as_ref().attach_effect(prop_effect);
}
/// Adds a dynamic property to this object.
///
/// Returns the object, for chaining
fn with_dyn_prop<F, K, V>(self, f: F) -> Self
where
F: Fn() -> (K, Option<V>) + 'static,
K: AsRef<str>,
V: Into<JsValue>,
{
self.add_dyn_prop(f);
self
self.attach_effect(prop_effect);
}
/// Adds a dynamic property to this object, where only the value is dynamic.
@@ -70,6 +54,26 @@ where
{
self.add_dyn_prop(move || (key, f()));
}
}
/// Extension trait to add reactive prop to an object
#[extend::ext(name = ObjectWithDynProp)]
pub impl<O> O
where
O: AsRef<js_sys::Object>,
{
/// Adds a dynamic property to this object.
///
/// Returns the object, for chaining
fn with_dyn_prop<F, K, V>(self, f: F) -> Self
where
F: Fn() -> (K, Option<V>) + 'static,
K: AsRef<str>,
V: Into<JsValue>,
{
self.as_ref().add_dyn_prop(f);
self
}
/// Adds a dynamic property to this object, where only the value is dynamic.
///
@@ -80,7 +84,7 @@ where
K: AsRef<str> + Copy + 'static,
V: Into<JsValue>,
{
self.add_dyn_prop_value(key, f);
self.as_ref().add_dyn_prop_value(key, f);
self
}
}