From 20889d979150536fbae27c0b5642fcac233f3e0e Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 29 Jul 2022 12:26:07 +0200 Subject: [PATCH] correction de la suppression des queues --- src/main.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 815d91b..3dbc8d1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -109,7 +109,7 @@ fn validate_queue<'a>(mut queue: ÉtatQueue<'a>) -> impl FnMut(web_sys::Event) + fn ConfigQueue<'a, G: Html>(cx: Scope<'a>, q: QueueProp<'a>) -> View { let queue: ÉtatQueue = q.q; let prio_str = create_signal(cx, String::new()); - let est_aléatoire = create_signal(cx, true); //*queue.q.mode.get() == ModeQueue::Aléatoire); + let est_aléatoire = create_signal(cx, true); let nom = queue.nom; let suffix = rand::thread_rng() .sample_iter(&Alphanumeric) @@ -173,7 +173,7 @@ fn Queue<'a, G: Html>(cx: Scope<'a>, queue: QueueProp<'a>) -> View { view! { cx, div { section(class="queue") { - h3 {(format!("{} ({} - {})", queue.q.nom, queue.q.crédit_parole.get(), queue.q.priorité.get()))} + h3 {(format!("{}", queue.q.nom))} input(type="text", bind:value = queue.q.nouvelleau, on:keypress=ok_queue) {} ul { Keyed { @@ -195,9 +195,13 @@ fn main() { cx, vec![ÉtatQueue::new(cx, "Gauche"), ÉtatQueue::new(cx, "Droite")], ); - let supprime_queue = - create_effect(cx, || queues.modify().retain(|q| !(*q.à_détruire.get()))); - let queues_suppression = queues.clone(); + let supprime_queue = create_effect(cx, || { + for q in queues.get().iter() { + q.à_détruire.track() + } + queues.modify().retain(|q| !(*q.à_détruire.get())); + }); + let index_queues = create_memo(cx, { || (0..queues.get().len()).into_iter().collect::>() });