refactor(settings): generic type signature for simpletextsetting

BrewingWeasel · Nov 14, 2023 · b41deab · b41deab
1 parent 51467fa
commit b41deab
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 28 deletions.
diff --git a/src-ui/src/settings/shared_ui.rs b/src-ui/src/settings/shared_ui.rs
@@ -2,12 +2,16 @@
 use leptos::*;
 
 #[component]
-pub fn SimpleTextSetting(
-    readsig: ReadSignal<String>,
-    writesig: WriteSignal<String>,
+pub fn SimpleTextSetting<Read, Write>(
+    readsig: Read,
+    mut writesig: Write,
     name: &'static str,
     desc: &'static str,
-) -> impl IntoView {
+) -> impl IntoView
+where
+    Read: Fn() -> String + 'static + Copy,
+    Write: FnMut(String) + 'static + Copy,
+{
     view! {
         <div class="labeledinput">
             <label for=name>{desc}</label>

diff --git a/src-ui/src/settings/wordknowledge_settings.rs b/src-ui/src/settings/wordknowledge_settings.rs
@@ -31,6 +31,24 @@ pub fn WordKnowledgeList(
             .update(move |templs| templs.push((next_templ_id, create_signal(new_template))));
         next_templ_id += 1;
     };
+    let each_template = move |(id, (rtempl, wtempl))| {
+        view! {
+            <div class="deck_templates">
+                <button
+                    class="remove"
+                    on:click=move |_| {
+                        set_templates
+                            .update(|templ| { templ.retain(|(templ_id, _)| templ_id != &id) });
+                    }
+                >
+
+                    "x"
+                </button>
+                <IndividualDeckRepresentation rtempl=rtempl wtempl=wtempl info=info/>
+                <hr/>
+            </div>
+        }
+    };
     view! {
         <div class="dicts">
             <h2 class="dicts_title">Word Knowledge</h2>
@@ -39,30 +57,7 @@ pub fn WordKnowledgeList(
             </button>
         </div>
         <div class="all_templates">
-            <For
-                each=templates
-                key=|templ| templ.0
-                children=move |(id, (rtempl, wtempl))| {
-                    view! {
-                        <div class="deck_templates">
-                            <button
-                                class="remove"
-                                on:click=move |_| {
-                                    set_templates
-                                        .update(|templ| {
-                                            templ.retain(|(templ_id, _)| templ_id != &id)
-                                        });
-                                }
-                            >
-
-                                "x"
-                            </button>
-                            <IndividualDeckRepresentation rtempl=rtempl wtempl=wtempl info=info/>
-                            <hr/>
-                        </div>
-                    }
-                }
-            />
+            <For each=templates key=|templ| templ.0 children=each_template/>
 
         </div>
     }