PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

add onBeforeClose option to Modal

Browse source 
so we can throw up another "are you sure" dialog
in the cases we want to do so. This also
passes a reason so we can only do so for ways of
dismissing (like backgroundClick)
that are easy to do by accident.
This commit is contained in:
Bruno Windels 2020-02-06 13:10:06 +01:00
parent 7e07a42dc1
commit c44ebef06f
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Modal.js
View file

@ -106,7 +106,7 @@ class ModalManager {
return this.appendDialogAsync(...rest); return this.appendDialogAsync(...rest);
} }
_buildModal(prom, props, className) { _buildModal(prom, props, className, options) {
const modal = {}; const modal = {};
// never call this from onFinished() otherwise it will loop // never call this from onFinished() otherwise it will loop
@ -124,14 +124,27 @@ class ModalManager {
); );
modal.onFinished = props ? props.onFinished : null; modal.onFinished = props ? props.onFinished : null;
modal.className = className; modal.className = className;
modal.onBeforeClose = options.onBeforeClose;
modal.beforeClosePromise = null;
modal.close = closeDialog; modal.close = closeDialog;
modal.closeReason = null;
return {modal, closeDialog, onFinishedProm}; return {modal, closeDialog, onFinishedProm};
} }
_getCloseFn(modal, props) { _getCloseFn(modal, props) {
const deferred = defer(); const deferred = defer();
return [(...args) => { return [async (...args) => {
if (modal.beforeClosePromise) {
await modal.beforeClosePromise;
} else if (modal.onBeforeClose) {
modal.beforeClosePromise = modal.onBeforeClose(modal.closeReason);
const shouldClose = await modal.beforeClosePromise;
modal.beforeClosePromise = null;
if (!shouldClose) {
return;
}
}
deferred.resolve(args); deferred.resolve(args);
if (props && props.onFinished) props.onFinished.apply(null, args); if (props && props.onFinished) props.onFinished.apply(null, args);
const i = this._modals.indexOf(modal); const i = this._modals.indexOf(modal);
@ -186,9 +199,9 @@ class ModalManager {
* static at a time. * static at a time.
* @returns {object} Object with 'close' parameter being a function that will close the dialog * @returns {object} Object with 'close' parameter being a function that will close the dialog
*/ */
createDialogAsync(prom, props, className, isPriorityModal, isStaticModal) { createDialogAsync(prom, props, className, isPriorityModal, isStaticModal, options = {}) {
const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className); const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, options);
modal.close = closeDialog;
if (isPriorityModal) { if (isPriorityModal) {
// XXX: This is destructive // XXX: This is destructive
this._priorityModal = modal; this._priorityModal = modal;
@ -207,7 +220,7 @@ class ModalManager {
} }
appendDialogAsync(prom, props, className) { appendDialogAsync(prom, props, className) {
const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className); const {modal, closeDialog, onFinishedProm} = this._buildModal(prom, props, className, {});
this._modals.push(modal); this._modals.push(modal);
this._reRender(); this._reRender();
@ -222,7 +235,13 @@ class ModalManager {
if (!modal) { if (!modal) {
return; return;
} }
// we want to pass a reason to the onBeforeClose
// callback, but close is currently defined to
// pass all number of arguments to the onFinished callback
// so, pass the reason to close through a member variable
modal.closeReason = "backgroundClick";
modal.close(); modal.close();
modal.closeReason = null;
} }
_getCurrentModal() { _getCurrentModal() {