(core) Polish tutorial popups

Summary:
Includes the following changes:
 *  Adds "Click to expand" hover tooltip to all images
 *  Adds support for minimize/maximize by double clicking tutorial popup header
 *  Add New menu (and all other popups) should now persist when user moves tutorial popup
 *  Preserves scrollbar position when minimizing and maximizing tutorial popup
 *  Formula cell editor (and other elements) should now be stacked under tutorial

Test Plan: Browser and manual tests.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D3864
This commit is contained in:
George Gevoian
2023-04-20 09:07:45 -04:00
parent f9f212d328
commit 3aac027a13
18 changed files with 199 additions and 61 deletions

View File

@@ -134,6 +134,18 @@ export const vars = {
logoBg: new CustomProp('logo-bg', '#040404'),
logoSize: new CustomProp('logo-size', '22px 22px'),
toastBg: new CustomProp('toast-bg', '#040404'),
/* Z indexes */
menuZIndex: new CustomProp('menu-z-index', '999'),
modalZIndex: new CustomProp('modal-z-index', '999'),
onboardingBackdropZIndex: new CustomProp('onboarding-backdrop-z-index', '999'),
onboardingPopupZIndex: new CustomProp('onboarding-popup-z-index', '1000'),
floatingPopupZIndex: new CustomProp('floating-popup-z-index', '1002'),
tutorialModalZIndex: new CustomProp('tutorial-modal-z-index', '1003'),
notificationZIndex: new CustomProp('notification-z-index', '1100'),
browserCheckZIndex: new CustomProp('browser-check-z-index', '5000'),
tooltipZIndex: new CustomProp('tooltip-z-index', '5000'),
// TODO: Add properties for remaining hard-coded z-indexes.
};
/**

View File

@@ -65,7 +65,7 @@ export const cssMenuElem = styled('div', `
padding: 8px 0px 16px 0px;
box-shadow: 0 2px 20px 0 ${theme.menuShadow};
min-width: 160px;
z-index: 999;
z-index: ${vars.menuZIndex};
--weaseljs-selected-background-color: ${theme.menuItemSelectedBg};
--weaseljs-menu-item-padding: 8px 24px;
background-color: ${theme.menuBg};

View File

@@ -137,6 +137,8 @@ export interface IModalOptions {
noEscapeKey?: boolean;
// If set, clicking into background does not close dialog.
noClickAway?: boolean;
// DOM arguments to pass to the modal backer.
backerDomArgs?: DomElementArg[];
// If given, call and wait for this before closing the dialog. If it returns false, don't close.
// Error also prevents closing, and is reported as an unexpected error.
beforeClose?: () => Promise<boolean>;
@@ -174,7 +176,13 @@ export function modal(
createFn: (ctl: IModalControl, owner: MultiHolder) => DomElementArg,
options: IModalOptions = {}
): void {
const {noEscapeKey, noClickAway, refElement = document.body, variant = 'fade-in'} = options;
const {
noEscapeKey,
noClickAway,
refElement = document.body,
variant = 'fade-in',
backerDomArgs = [],
} = options;
function doClose() {
if (!modalDom.isConnected) { return; }
@@ -242,6 +250,7 @@ export function modal(
return dialogDom;
}),
noClickAway ? null : dom.on('click', () => close()),
...backerDomArgs,
);
document.body.appendChild(modalDom);
@@ -293,7 +302,10 @@ export interface ISaveModalOptions {
* 3. saveFunc: () => doSomething().catch((e) => { alert("BOOM"); throw new StayOpen(); })
* If doSomething fails, an alert is shown, and the dialog stays open.
*/
export function saveModal(createFunc: (ctl: IModalControl, owner: MultiHolder) => ISaveModalOptions) {
export function saveModal(
createFunc: (ctl: IModalControl, owner: MultiHolder) => ISaveModalOptions,
modalOptions?: IModalOptions
) {
return modal((ctl, owner) => {
const options = createFunc(ctl, owner);
@@ -321,7 +333,14 @@ export function saveModal(createFunc: (ctl: IModalControl, owner: MultiHolder) =
options.width && cssModalWidth(options.width),
options.modalArgs,
];
});
}, modalOptions);
}
export interface ConfirmModalOptions {
explanation?: DomElementArg,
hideCancel?: boolean;
extraButtons?: DomContents;
modalOptions?: IModalOptions;
}
/**
@@ -333,8 +352,7 @@ export function confirmModal(
title: DomElementArg,
btnText: DomElementArg,
onConfirm: () => Promise<void>,
explanation?: DomElementArg,
{hideCancel, extraButtons}: {hideCancel?: boolean, extraButtons?: DomContents} = {},
{explanation, hideCancel, extraButtons, modalOptions}: ConfirmModalOptions = {},
): void {
return saveModal((ctl, owner): ISaveModalOptions => ({
title,
@@ -344,7 +362,7 @@ export function confirmModal(
hideCancel,
width: 'normal',
extraButtons,
}));
}), modalOptions);
}
@@ -592,7 +610,7 @@ const cssModalBacker = styled('div', `
top: 0;
left: 0;
padding: 16px;
z-index: 999;
z-index: ${vars.modalZIndex};
background-color: ${theme.modalBackdrop};
overflow-y: auto;
animation-name: ${cssFadeIn};