Skip to content
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

storage: Scroll dialog fields into view as needed #20060

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

storage: Scroll dialog fields into view as needed #20060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions pkg/storaged/block/format-dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,9 @@ function format_dialog_internal(client, path, start, size, enable_dos_extended,
}
if (vals.type == "efi" && !vals.mount_point)
dlg.set_values({ mount_point: "/boot/efi" });
} else if (trigger == "crypto") {
if (vals.crypto != "none" && vals.crypto != " keep")
dlg.show_field("crypto_options");
}
},
Action: {
Expand Down
25 changes: 24 additions & 1 deletion pkg/storaged/dialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,14 +513,35 @@ export const dialog_open = (def) => {
return null;
})).then(results => {
const errors = { };
fields.forEach((f, i) => { if (results[i]) errors[f.tag] = results[i]; });
let scrolled = false;
fields.forEach((f, i) => {
if (results[i]) {
if (!scrolled) {
show_field(f.tag);
scrolled = true;
}
errors[f.tag] = results[i];
}
});
if (Object.keys(errors).length > 0)
return Promise.reject(errors);
});
};

const dlg = show_modal_dialog(props(), footer_props(null, null));

function show_field(tag) {
function scroll() {
const field_element = document.querySelector('#dialog [data-field="' + tag + '"]');
if (field_element)
field_element.scrollIntoView({ behavior: "smooth", block: "nearest" });
}
// By the time show_field is called from the "update"
// callback, newly visible fields don't exist yet in the
// DOM, so delay the scrolling a bit.
window.setTimeout(scroll, 10);
}

const self = {
run: (title, promise) => {
update_footer(title, promise);
Expand Down Expand Up @@ -593,6 +614,8 @@ export const dialog_open = (def) => {
update_footer();
},

show_field,

close: () => {
dlg.footerProps.dialog_done();
}
Expand Down
Loading