mirror of
https://github.com/gristlabs/grist-core.git
synced 2026-03-02 04:09:24 +00:00
(core) Updating flow and UI for shortcut warnings
Summary: - Popup looks different (better shadow, order and alignment) - Warnings need to be dismissed by checking "Don't show again" button, pressing Esc/Enter or clicking away just hides the popup, but it will be opened once again. - Dismissing one warning popup (about zoom keys), dismisses them all Test Plan: Updated Reviewers: georgegevoian Reviewed By: georgegevoian Differential Revision: https://phab.getgrist.com/D3683
This commit is contained in:
@@ -35,16 +35,16 @@ export function buildConfirmDelete(
|
||||
dom('div', `Are you sure you want to delete ${single ? 'this' : 'these'} record${single ? '' : 's'}?`,
|
||||
dom.style('margin-bottom', '10px'),
|
||||
),
|
||||
dom('div',
|
||||
labeledSquareCheckbox(remember, "Don't ask again.", testId('confirm-remember')),
|
||||
dom.style('margin-bottom', '10px'),
|
||||
),
|
||||
cssButtons(
|
||||
dom.style('margin-bottom', '12px'),
|
||||
primaryButton('Delete', testId('confirm-save'), dom.on('click', () => {
|
||||
onSave(remember.get());
|
||||
ctl.close();
|
||||
})),
|
||||
basicButton('Cancel', testId('confirm-cancel'), dom.on('click', () => ctl.close()))
|
||||
),
|
||||
dom('div',
|
||||
labeledSquareCheckbox(remember, "Don't ask again.", testId('confirm-remember')),
|
||||
)
|
||||
), {}
|
||||
);
|
||||
@@ -60,21 +60,29 @@ export function buildConfirmDelete(
|
||||
|
||||
export function showDeprecatedWarning(
|
||||
refElement: Element,
|
||||
content: DomContents
|
||||
content: DomContents,
|
||||
onClose: (checked: boolean) => void,
|
||||
) {
|
||||
const remember = observable(false);
|
||||
const tooltip = modalTooltip(refElement, (ctl) =>
|
||||
cssWideContainer(
|
||||
testId('popup-warning-deprecated'),
|
||||
elem => { FocusLayer.create(ctl, {defaultFocusElem: elem, pauseMousetrap: true}); },
|
||||
dom.onKeyDown({
|
||||
Escape: () => ctl.close(),
|
||||
Enter: () => ctl.close(),
|
||||
Escape: () => { ctl.close(); onClose(remember.get()); },
|
||||
Enter: () => { ctl.close(); onClose(remember.get()); },
|
||||
}),
|
||||
content,
|
||||
cssButtons(
|
||||
dom.style('margin-top', '12px'),
|
||||
dom.style('justify-content', 'right'),
|
||||
basicButton('Close', testId('confirm-cancel'), dom.on('click', () => ctl.close()))
|
||||
dom.style('justify-content', 'space-between'),
|
||||
dom.style('align-items', 'center'),
|
||||
dom('div',
|
||||
labeledSquareCheckbox(remember, "Don't show again.", testId('confirm-remember')),
|
||||
),
|
||||
basicButton('Dismiss', testId('confirm-save'),
|
||||
dom.on('click', () => { ctl.close(); onClose(remember.get()); })
|
||||
)
|
||||
),
|
||||
)
|
||||
);
|
||||
@@ -133,7 +141,7 @@ const cssButtons = styled('div', `
|
||||
`);
|
||||
|
||||
const cssContainer = styled(cssTheme, `
|
||||
max-width: 210px;
|
||||
max-width: 270px;
|
||||
`);
|
||||
|
||||
const cssWideContainer = styled(cssTheme, `
|
||||
|
||||
Reference in New Issue
Block a user