dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

popover: Fix #1545 incorrect to sync on_open_change to state. (#1557)

Browse source
This commit is contained in:
Jason Lee 2025-11-11 18:41:23 +08:00 committed by GitHub
parent fbc3a6e4f4
commit eef8abaa15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/ui/src/popover.rs
View file

@ -278,19 +278,20 @@ impl RenderOnce for Popover {
fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
let force_open = self.open;
let default_open = self.default_open;
let tracked_focus_handle = self.tracked_focus_handle.clone();
let state = window.use_keyed_state(self.id.clone(), cx, |_, cx| {
PopoverState::new(default_open, cx)
});
if let Some(tracked_focus_handle) = self.tracked_focus_handle.clone() {
state.update(cx, |state, _| {
state.tracked_focus_handle = Some(tracked_focus_handle);
state.on_open_change = self.on_open_change.clone();
if let Some(force_open) = force_open {
state.open = force_open;
}
})
}
state.update(cx, |state, _| {
if let Some(tracked_focus_handle) = tracked_focus_handle {
state.tracked_focus_handle = Some(tracked_focus_handle);
}
state.on_open_change = self.on_open_change.clone();
if let Some(force_open) = force_open {
state.open = force_open;
}
});
let open = state.read(cx).open;
let focus_handle = state.read(cx).focus_handle.clone();