remove context

Author: birkskyum

frameworks/keyed/dioxus/src/main.rs

@@ -14,25 +14,25 @@ fn main() {
 #[derive(Clone, PartialEq)]
 struct Label {
     key: usize,
-    label: Tracked<String>,
+    label: Signal<String>,
 }
 
 impl Label {
-    fn new(cx: &ScopeState, num: usize, label: String) -> Self {
+    fn new( num: usize, label: String) -> Self {
         Label {
             key: num,
-            label: Tracked::new(cx, label),
+            label: use_signal(|| label),
         }
     }
 
-    fn new_list(cx: &ScopeState, num: usize, key_from: usize) -> Vec<Self> {
+    fn new_list( num: usize, key_from: usize) -> Vec<Self> {
         let mut labels = Vec::with_capacity(num);
-        append(cx, &mut labels, num, key_from);
+        append(&mut labels, num, key_from);
         labels
     }
 }
 
-fn append(cx: &ScopeState,list: &mut Vec<Label>, num: usize, key_from: usize) {
+fn append( list: &mut Vec<Label>, num: usize, key_from: usize) {
     list.reserve_exact(num);
     for x in 0..num {
         let adjective = ADJECTIVES[random(ADJECTIVES.len())];
@@ -44,7 +44,7 @@ fn append(cx: &ScopeState,list: &mut Vec<Label>, num: usize, key_from: usize) {
         label.push_str(colour);
         label.push(' ');
         label.push_str(noun);
-        list.push(Label::new(cx, x + key_from, label));
+        list.push(Label::new(x + key_from, label));
     }
 }
 
@@ -55,23 +55,23 @@ struct LabelsContainer {
 }
 
 impl LabelsContainer {
-    fn new(cx: &ScopeState,num: usize, last_key: usize) -> LabelsContainer {
-        let labels = Label::new_list(cx, num, last_key + 1);
+    fn new(num: usize, last_key: usize) -> LabelsContainer {
+        let labels = Label::new_list(num, last_key + 1);
         LabelsContainer {
             labels,
             last_key: last_key + num,
         }
     }
 
-    fn append(&mut self, cx: &ScopeState,num: usize) {
+    fn append(&mut self, num: usize) {
         self.labels.reserve(num);
-        append(cx, &mut self.labels, num, self.last_key + 1);
+        append(&mut self.labels, num, self.last_key + 1);
         self.last_key += num;
     }
 
-    fn overwrite(&mut self,cx: &ScopeState,  num: usize) {
+    fn overwrite(&mut self, num: usize) {
         self.labels.clear();
-        append(cx, &mut self.labels, num, self.last_key + 1);
+        append(&mut self.labels, num, self.last_key + 1);
         self.last_key += num;
     }
 
@@ -88,11 +88,9 @@ impl LabelsContainer {
     }
 }
 
-fn app(cx: Scope) -> Element {
-    let labels_container = use_ref(&cx, || LabelsContainer::new(cx, 0, 0));
-    let selected: &Tracked<Option<usize>> = cx.use_hook(||{
-        Tracked::new(&cx, None)
-    });
+fn app() -> Element {
+    let labels_container = use_signal(|| LabelsContainer::new(0, 0));
+    let selected: &Signal<Option<usize>> = use_signal(|| use_signal(|| None));
 
     rsx! {
         div { class: "container",
@@ -102,13 +100,13 @@ fn app(cx: Scope) -> Element {
                     div { class: "col-md-6",
                         div { class: "row",
                             ActionButton { name: "Create 1,000 rows", id: "run",
-                                onclick: move |_| labels_container.write().overwrite(cx, 1_000),
+                                onclick: move |_| labels_container.write().overwrite( 1_000),
                             }
                             ActionButton { name: "Create 10,000 rows", id: "runlots",
-                                onclick: move |_| labels_container.write().overwrite(cx, 10_000),
+                                onclick: move |_| labels_container.write().overwrite( 10_000),
                             }
                             ActionButton { name: "Append 1,000 rows", id: "add",
-                                onclick: move |_| labels_container.write().append(cx, 1_000),
+                                onclick: move |_| labels_container.write().append( 1_000),
                             }
                             ActionButton { name: "Update every 10th row", id: "update",
                                 onclick: move |_| {
@@ -119,7 +117,7 @@ fn app(cx: Scope) -> Element {
                                 },
                             }
                             ActionButton { name: "Clear", id: "clear",
-                                onclick: move |_| labels_container.write().overwrite(cx, 0),
+                                onclick: move |_| labels_container.write().overwrite( 0),
                             }
                             ActionButton { name: "Swap rows", id: "swaprows",
                                 onclick: move |_| labels_container.write().swap(1, 998),
@@ -162,15 +160,16 @@ impl PartialEq for RowProps {
     }
 }
 
-fn Row(cx: Scope<RowProps>) -> Element {
+fn Row(props: RowProps) -> Element {
     let RowProps {
         label,
         labels,
         selected_row,
-    } = &cx.props;
-    let label_text = use_selector(&cx, &label.label, |label| label.clone());
+    } = &props;
+    
+    let label_text = use_selector(&label.label, |label| label.clone());
     let key = label.key;
-    let is_in_danger = use_selector(&cx, selected_row, move |selected_row: &Option<usize>| {
+    let is_in_danger = use_selector(selected_row, move |selected_row: &Option<usize>| {
         let result = match selected_row {
             Some(selected_row) => {
                 if *selected_row == key {
@@ -202,13 +201,8 @@ fn Row(cx: Scope<RowProps>) -> Element {
     }
 }
 
-#[inline_props]
-fn ActionButton<'a>(
-    cx: Scope<'a, ActionButtonProps>,
-    name: &'static str,
-    id: &'static str,
-    onclick: EventHandler<'a>,
-) -> Element {
+#[component]
+fn ActionButton(name: &str, id: &str, onclick: EventHandler) -> Element {
     rsx! {
         div {
             class: "col-sm-6 smallpad",
@@ -260,4 +254,3 @@ static NOUNS: &[&str] = &[
     "table", "chair", "house", "bbq", "desk", "car", "pony", "cookie", "sandwich", "burger",
     "pizza", "mouse", "keyboard",
 ];
-