From f759cc50232c785ee827f1b4c19fd97a084f10a0 Mon Sep 17 00:00:00 2001 From: Floyd Wang Date: Mon, 24 Mar 2025 20:01:29 +0800 Subject: [PATCH] calendar: Fix duplicate IDs cause click events not respond (#732) --- crates/ui/src/time/calendar.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/crates/ui/src/time/calendar.rs b/crates/ui/src/time/calendar.rs index 6200441b..83920c57 100644 --- a/crates/ui/src/time/calendar.rs +++ b/crates/ui/src/time/calendar.rs @@ -510,7 +510,6 @@ impl Calendar { fn render_day( &self, - ix: usize, d: &NaiveDate, offset_month: usize, window: &mut Window, @@ -530,7 +529,7 @@ impl Calendar { .map_or(false, |disabled| disabled.matched(&date)); self.item_button( - ix, + d.ordinal() as usize, day.to_string(), is_active, is_in_range, @@ -732,9 +731,8 @@ impl Calendar { ) .children(days.iter().map(|week| { h_flex().gap_0p5().justify_between().children( - week.iter().enumerate().map(|(ix, d)| { - self.render_day(ix, d, offset_month, window, cx) - }), + week.iter() + .map(|d| self.render_day(d, offset_month, window, cx)), ) })) }),