Skip to content

Fix: prevent calendar popup from closing on dropdown change #7409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 4, 2025
Merged

Fix: prevent calendar popup from closing on dropdown change #7409

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33b61af
DatePickerButton calendar no longer auto-closes when year/month/date …
AStrizh Aug 3, 2025
9d184cb
Merge branch 'main' into fix/datepicker-dropdown-does-not-confirm
AStrizh Aug 28, 2025
235301e
Merge branch 'main' into fix/datepicker-dropdown-does-not-confirm
lucasmerlin Sep 4, 2025
d945ec8
Revert "DatePickerButton calendar no longer auto-closes when year/mon…
lucasmerlin Sep 4, 2025
e99e457
Don't close the DatePickerButton if any popup is open
lucasmerlin Sep 4, 2025
a996e34
Add comment
lucasmerlin Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions crates/egui_extras/src/datepicker/button.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,16 @@ impl Widget for DatePickerButton<'_> {
button = button.fill(visuals.weak_bg_fill).stroke(visuals.bg_stroke);
}
let mut button_response = ui.add(button);
if button_response.clicked() {
let just_opened = if button_response.clicked() {
button_state.picker_visible = true;
ui.data_mut(|data| data.insert_persisted(id, button_state.clone()));
}
true
} else {
false
};

if button_state.picker_visible {
let ctx = ui.ctx();
let width = 333.0;
let mut pos = button_response.rect.left_bottom();
let width_with_padding = width
Expand All @@ -154,19 +158,17 @@ impl Widget for DatePickerButton<'_> {
pos.x = button_response.rect.right() - width_with_padding;
}

// Check to make sure the calendar never is displayed out of window
pos.x = pos.x.max(ui.style().spacing.window_margin.leftf());

//TODO(elwerene): Better positioning

let popup_id = ui.make_persistent_id(self.id_salt);
let InnerResponse {
inner: saved,
response: area_response,
} = Area::new(ui.make_persistent_id(self.id_salt))
} = Area::new(popup_id)
.kind(egui::UiKind::Picker)
.order(Order::Foreground)
.fixed_pos(pos)
.show(ui.ctx(), |ui| {
.show(ctx, |ui| {
let frame = Frame::popup(ui.style());
frame
.show(ui, |ui| {
Expand All @@ -183,7 +185,7 @@ impl Widget for DatePickerButton<'_> {
highlight_weekends: self.highlight_weekends,
start_end_years: self.start_end_years,
}
.draw(ui)
.draw(ui)
})
.inner
});
Expand All @@ -192,8 +194,10 @@ impl Widget for DatePickerButton<'_> {
button_response.mark_changed();
}

if !button_response.clicked()
&& (ui.input(|i| i.key_pressed(Key::Escape)) || area_response.clicked_elsewhere())
let escape_pressed = ctx.input(|i| i.key_pressed(Key::Escape));
let pointer_over_popup = ctx.is_pointer_over_area();

if !just_opened && !pointer_over_popup && (escape_pressed || area_response.clicked_elsewhere())
{
button_state.picker_visible = false;
ui.data_mut(|data| data.insert_persisted(id, button_state));
Expand Down
Loading