Get component from static storage

Changed files (2)

• modified src/lib.rs
• modified src/prelude.rs

Diff

diff --git a/src/lib.rs b/src/lib.rsindex e14fb77..bb9e1a3 100644--- a/src/lib.rs+++ b/src/lib.rs@@ -9,6 +9,8 @@ use web_sys::{Element, HtmlDocument, HtmlElement, HtmlInputElement, NodeList};  pub mod prelude; +use prelude::*;+ pub struct InitFn(pub fn()); inventory::collect!(InitFn); @@ -320,15 +322,15 @@ pub fn get_callback(name: &str) -> Option<js_sys::Function> {  /// HTML Component. See kaja-web-component. pub trait Component {-    fn connected(&mut self, element: HtmlElement) {}-    fn disconnected(&mut self, element: HtmlElement) {}+    fn connected(&mut self, parent: HtmlElement) {}+    fn disconnected(&mut self, parent: HtmlElement) {}     fn observed_attributes() -> &'static [&'static str] {         &[]     }      fn attribute_changed(         &mut self,-        element: HtmlElement,+        parent: HtmlElement,         name: &str,         old_value: &JsValue,         new_value: &JsValue,@@ -342,3 +344,30 @@ pub fn get_component_element(id: &str) -> Option<HtmlElement> {     let element = get_element(selector.as_str());     element }++pub trait ComponentStorage: Sized {+    fn storage() -> &'static RwLock<Option<HashMap<String, std::sync::Arc<std::sync::Mutex<Self>>>>>;+}++/// Returns a cloned Arc pointing to the stored component. The component itself is+/// protected by a `Mutex` so callers can lock it for mutable access when needed.+pub fn get_component<T: ComponentStorage + 'static>(+    id: &str,+) -> Option<std::sync::Arc<std::sync::Mutex<T>>> {+    let map_lock = T::storage().read();++    if map_lock.is_err() {+        error!("Failed to take storage lock");+        return None;+    }++    let store_opt = map_lock.unwrap();++    if store_opt.is_none() {+        error!("Store not initialized");+        return None;+    }++    let map = store_opt.as_ref().unwrap();+    map.get(id).cloned()+}diff --git a/src/prelude.rs b/src/prelude.rsindex d5d10fd..7918ce2 100644--- a/src/prelude.rs+++ b/src/prelude.rs@@ -1,13 +1,17 @@ pub use crate::{-    CallbackRegistration, Component, Error, InitComponentFn, InitFn, Result, get_callback,-    get_component_element, get_cookie_value, get_element, get_elements, get_value, init_callbacks,-    inner_html, inner_text, try_get_value, try_inner_html, try_inner_text,+    CallbackRegistration, Component, ComponentStorage, Error, InitComponentFn, InitFn, Result,+    get_callback, get_component, get_component_element, get_cookie_value, get_element,+    get_elements, get_value, init_callbacks, inner_html, inner_text, try_get_value, try_inner_html,+    try_inner_text, };  pub use gloo::console::error; pub use gloo::console::log; pub use serde_wasm_bindgen; +pub use std::collections::HashMap;+pub use std::sync::{Mutex, RwLock};+ pub use wasm_bindgen::JsCast; pub use wasm_bindgen::JsValue; pub use wasm_bindgen::prelude::wasm_bindgen;