add spair::set_arm!()

aclueless · Jul 24, 2021 · 7cb4cb8 · 7cb4cb8
1 parent 85662d6
commit 7cb4cb8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/examples/components/src/lib.rs b/examples/components/src/lib.rs
@@ -47,12 +47,9 @@ impl spair::Component for State {
             .nodes()
             .p(|p| {
                 p.r#static("The value that read from the child-component: ")
-                    .match_if(|arm| match self.value_read_from_child {
-                        Some(value) => arm.render_on_arm_index(line!()).render(value).done(),
-                        None => arm
-                            .render_on_arm_index(line!())
-                            .render("[Not read yet]")
-                            .done(),
+                    .match_if(|mi| match self.value_read_from_child {
+                        Some(value) => spair::set_arm!(mi).render(value).done(),
+                        None => spair::set_arm!(mi).render("[Not read yet]").done(),
                     });
             })
             .r#static(Button("-", comp.handler_mut(State::decrement)))

diff --git a/examples/fetch/src/lib.rs b/examples/fetch/src/lib.rs
@@ -70,9 +70,8 @@ impl spair::Component for State {
     fn render(&self, element: spair::Element<Self>) {
         let comp = element.comp();
         element
-            .match_if(|arm| match self.branch.as_ref() {
-                Some(branch) => arm
-                    .render_on_arm_index(line!())
+            .match_if(|mi| match self.branch.as_ref() {
+                Some(branch) => spair::set_arm!(mi)
                     .render(branch)
                     .button(|b| {
                         b.static_attributes()
@@ -81,8 +80,7 @@ impl spair::Component for State {
                             .r#static("Reset");
                     })
                     .done(),
-                None => arm
-                    .render_on_arm_index(line!())
+                None => spair::set_arm!(mi)
                     .button(|b| {
                         b.static_attributes()
                             .on_click(comp.handler_mut(State::start_fetching))

diff --git a/examples/todomvc/src/lib.rs b/examples/todomvc/src/lib.rs
@@ -365,12 +365,9 @@ impl spair::ListItemRender<App> for &TodoItem {
                             .class("destroy");
                     });
             })
-            .match_if(|arm| match is_editing_me {
-                true => arm
-                    .render_on_arm_index(line!())
-                    .render(EditingInput(&self.title))
-                    .done(),
-                false => arm.render_on_arm_index(line!()).done(),
+            .match_if(|mi| match is_editing_me {
+                true => spair::set_arm!(mi).render(EditingInput(&self.title)).done(),
+                false => spair::set_arm!(mi).done(),
             });
     }
 }

diff --git a/src/lib.rs b/src/lib.rs
@@ -6,6 +6,7 @@ mod component;
 mod dom;
 mod events;
 mod fetch;
+mod macros;
 mod routing;
 mod utils;
 

diff --git a/src/macros.rs b/src/macros.rs
@@ -0,0 +1,6 @@
+#[macro_export]
+macro_rules! set_arm {
+    ( $match_if:ident ) => {
+        $match_if.render_on_arm_index(line!())
+    };
+}