Feat: overall API updates

packages/core/examples/contextapi.rs

@@ -19,12 +19,10 @@ static Example: FC<Props> = |ctx, props| {
     ctx.view(move |bump| {
         button(bump)
             .on("click", move |_| {
-                // //
                 println!("Value is {}", props.name);
                 println!("Value is {}", value.as_str());
                 println!("Value is {}", *value);
             })
-            //
             .on("click", move |_| {
                 println!("Value is {}", props.name);
             })

packages/core/examples/listener.rs

@@ -4,131 +4,21 @@ use dioxus_core::prelude::*;
 
 fn main() {}
 
+/*
+Our flagship demo :)
+
+*/
 static Example: FC<()> = |ctx, props| {
-    todo!()
-    // let (val1, set_val1) = use_state(&ctx, || "b1");
+    let (val1, set_val1) = use_state(&ctx, || "b1");
 
-    // ctx.view(|bump| {
-    //     builder::button(bump)
-    //         .on("click", move |c| {
-    //             //
-    //             println!("Value is {}", val1);
-    //         })
-    //         .finish()
-    // })
-    // ctx.view(html! {
-    //     <div>
-    //         <button onclick={move |_| set_val1("b1")}> "Set value to b1" </button>
-    //         <button onclick={move |_| set_val1("b2")}> "Set value to b2" </button>
-    //         <button onclick={move |_| set_val1("b3")}> "Set value to b3" </button>
-    //         <div>
-    //             <p> "Value is: {val1}" </p>
-    //         </div>
-    //     </div>
-    // })
+    ctx.view(html! {
+        <div>
+            <button onclick={move |_| set_val1("b1")}> "Set value to b1" </button>
+            <button onclick={move |_| set_val1("b2")}> "Set value to b2" </button>
+            <button onclick={move |_| set_val1("b3")}> "Set value to b3" </button>
+            <div>
+                <p> "Value is: {val1}" </p>
+            </div>
+        </div>
+    })
 };
-
-use use_state_def::use_state;
-mod use_state_def {
-    use dioxus_core::prelude::*;
-    use std::{borrow::BorrowMut, cell::RefCell, ops::DerefMut, rc::Rc};
-
-    struct UseState<T: 'static> {
-        new_val: Rc<RefCell<Option<T>>>,
-        current_val: T,
-        caller: Box<dyn Fn(T) + 'static>,
-    }
-
-    /// Store state between component renders!
-    /// When called, this hook retrives a stored value and provides a setter to update that value.
-    /// When the setter is called, the component is re-ran with the new value.
-    ///
-    /// This is behaves almost exactly the same way as React's "use_state".
-    ///
-    /// Usage:
-    /// ```ignore
-    /// static Example: FC<()> = |ctx| {
-    ///     let (counter, set_counter) = use_state(ctx, || 0);
-    ///     let increment = || set_couter(counter + 1);
-    ///     let decrement = || set_couter(counter + 1);
-    ///
-    ///     html! {
-    ///         <div>
-    ///             <h1>"Counter: {counter}" </h1>
-    ///             <button onclick={increment}> "Increment" </button>
-    ///             <button onclick={decrement}> "Decrement" </button>
-    ///         </div>  
-    ///     }
-    /// }
-    /// ```
-    pub fn use_state<'b, 'a, T: 'static, F: FnOnce() -> T + 'static>(
-        ctx: &'b Context<'a>,
-        initial_state_fn: F,
-    ) -> (&'a T, &'a impl Fn(T)) {
-        ctx.use_hook(
-            move || UseState {
-                new_val: Rc::new(RefCell::new(None)),
-                current_val: initial_state_fn(),
-                caller: Box::new(|_| println!("setter called!")),
-            },
-            move |hook| {
-                let inner = hook.new_val.clone();
-                let scheduled_update = ctx.schedule_update();
-
-                // get ownership of the new val and replace the current with the new
-                // -> as_ref -> borrow_mut -> deref_mut -> take
-                // -> rc     -> &RefCell   -> RefMut    -> &Option<T> -> T
-                if let Some(new_val) = hook.new_val.as_ref().borrow_mut().deref_mut().take() {
-                    hook.current_val = new_val;
-                }
-
-                // todo: swap out the caller with a subscription call and an internal update
-                hook.caller = Box::new(move |new_val| {
-                    // update the setter with the new value
-                    let mut new_inner = inner.as_ref().borrow_mut();
-                    *new_inner = Some(new_val);
-
-                    // Ensure the component gets updated
-                    scheduled_update();
-                });
-
-                // box gets derefed into a ref which is then taken as ref with the hook
-                (&hook.current_val, &hook.caller)
-            },
-            |_| {},
-        )
-    }
-}
-
-mod use_ref_def {
-    use dioxus_core::prelude::*;
-    use std::{borrow::BorrowMut, cell::RefCell, ops::DerefMut, rc::Rc};
-
-    pub struct UseRef<T: 'static> {
-        current: RefCell<T>,
-    }
-    impl<T: 'static> UseRef<T> {
-        fn new(val: T) -> Self {
-            Self {
-                current: RefCell::new(val),
-            }
-        }
-
-        fn modify(&self, modifier: impl FnOnce(&mut T)) {
-            let mut val = self.current.borrow_mut();
-            let val_as_ref = val.deref_mut();
-            modifier(val_as_ref);
-        }
-    }
-
-    /// Store a mutable value between renders!
-    /// To read the value, borrow the ref.
-    /// To change it, use modify.
-    /// Modifications to this value do not cause updates to the component
-    pub fn use_ref<'a, T: 'static>(
-        ctx: &'a Context<'a>,
-        initial_state_fn: impl FnOnce() -> T + 'static,
-    ) -> &'a UseRef<T> {
-        ctx.use_hook(|| UseRef::new(initial_state_fn()), |state| &*state, |_| {})
-    }
-}

packages/core/examples/nested.rs

@@ -0,0 +1,40 @@
+#![allow(unused)]
+//! Example of components in
+
+use std::borrow::Borrow;
+
+use dioxus_core::prelude::*;
+
+fn main() {}
+
+static Header: FC<()> = |ctx, props| {
+    let inner = use_ref(&ctx, || 0);
+
+    let handler1 = move || println!("Value is {}", inner.current());
+
+    ctx.view(html! {
+        <div>
+            <h1> "This is the header bar" </h1>
+            <h1> "Idnt it awesome" </h1>
+            <button onclick={move |_| handler1()}> "Click me" </button>
+        </div>
+    })
+};
+
+static Bottom: FC<()> = |ctx, props| {
+    ctx.view(html! {
+        <div>
+            <h1> "bruh 1" </h1>
+            <h1> "bruh 2" </h1>
+        </div>
+    })
+};
+
+static Example: FC<()> = |ctx, props| {
+    ctx.view(html! {
+        <div>
+            <h1> "BROSKI!" </h1>
+            <h1> "DRO!" </h1>
+        </div>
+    })
+};

packages/core/examples/step.rs

@@ -20,15 +20,20 @@ struct Props {
     name: String,
 }
 impl Properties for Props {
-    fn new() -> Self {
-        todo!()
-    }
+    fn call(&self, ptr: *const ()) {}
+
+    // fn new() -> Self {
+    //     todo!()
+    // }
 }
 
 static Example: FC<Props> = |ctx, props| {
     ctx.view(html! {
         <div>
-            <h1> </h1>
+            <h1> "hello world!" </h1>
+            <h1> "hello world!" </h1>
+            <h1> "hello world!" </h1>
+            <h1> "hello world!" </h1>
         </div>
     })
 };