vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Save Settings text inputs on blur (#53036)

Browse source 
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
This commit is contained in:
Chris Biscardi 2026-04-07 09:14:47 -07:00 committed by GitHub
parent c5845ec04c
commit 0de9b553b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 54 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
crates/settings_ui/src/components/input_field.rs
View file

@ -109,16 +109,37 @@ impl RenderOnce for SettingsInputField {
..Default::default()
};
let first_render_initial_text = window.use_state(cx, |_, _| self.initial_text.clone());
let editor = if let Some(id) = self.id {
window.use_keyed_state(id, cx, {
let initial_text = self.initial_text.clone();
let placeholder = self.placeholder;
let mut confirm = self.confirm.clone();
move |window, cx| {
let mut editor = Editor::single_line(window, cx);
let editor_focus_handle = editor.focus_handle(cx);
if let Some(text) = initial_text {
editor.set_text(text, window, cx);
}
if let Some(confirm) = confirm.take()
&& !self.display_confirm_button
&& !self.display_clear_button
&& !self.clear_on_confirm
{
cx.on_focus_out(
&editor_focus_handle,
window,
move |editor, _, window, cx| {
let text = Some(editor.text(cx));
confirm(text, window, cx);
},
)
.detach();
}
if let Some(placeholder) = placeholder {
editor.set_placeholder_text(placeholder, window, cx);
}
@ -130,12 +151,31 @@ impl RenderOnce for SettingsInputField {
window.use_state(cx, {
let initial_text = self.initial_text.clone();
let placeholder = self.placeholder;
let mut confirm = self.confirm.clone();
move |window, cx| {
let mut editor = Editor::single_line(window, cx);
let editor_focus_handle = editor.focus_handle(cx);
if let Some(text) = initial_text {
editor.set_text(text, window, cx);
}
if let Some(confirm) = confirm.take()
&& !self.display_confirm_button
&& !self.display_clear_button
&& !self.clear_on_confirm
{
cx.on_focus_out(
&editor_focus_handle,
window,
move |editor, _, window, cx| {
let text = Some(editor.text(cx));
confirm(text, window, cx);
},
)
.detach();
}
if let Some(placeholder) = placeholder {
editor.set_placeholder_text(placeholder, window, cx);
}
@ -149,11 +189,20 @@ impl RenderOnce for SettingsInputField {
// re-renders but use_keyed_state returns the cached editor with stale text.
// Reconcile with the expected initial_text when the editor is not focused,
// so we don't clobber what the user is actively typing.
if let Some(initial_text) = &self.initial_text {
let current_text = editor.read(cx).text(cx);
if current_text != *initial_text && !editor.read(cx).is_focused(window) {
editor.update(cx, |editor, cx| {
editor.set_text(initial_text.clone(), window, cx);
if let Some(initial_text) = &self.initial_text
&& let Some(first_initial) = first_render_initial_text.read(cx)
{
if initial_text != first_initial && !editor.read(cx).is_focused(window) {
*first_render_initial_text.as_mut(cx) = self.initial_text.clone();
let weak_editor = editor.downgrade();
let initial_text = initial_text.clone();
window.defer(cx, move |window, cx| {
weak_editor
.update(cx, |editor, cx| {
editor.set_text(initial_text, window, cx);
})
.ok();
});
}
}