mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-09 08:09:32 +08:00
fix(overlays): prevent overlays from getting stuck open (#28069)
Issue number: resolves #27200 --------- <!-- Please do not submit updates to dependencies unless it fixes an issue. --> <!-- Please try to limit your pull request to one type (bugfix, feature, etc). Submit multiple pull requests if needed. --> ## What is the current behavior? <!-- Please describe the current behavior that you are modifying. --> A bug occurs when you click twice quickly to open an overlay with a small timeout. In some cases, the overlay will present, dismiss, present, then not dismiss the second time, getting stuck open. You can reproduce manually this by grabbing the test HTML included in this PR and putting it in a branch that doesn't include a fix. ## What is the new behavior? <!-- Please describe the behavior or changes that are being added by this PR. --> - When an overlay with a short timeout is triggered twice quickly, it will open-close-open-close. - The behavior is the same for all overlay components ## Does this introduce a breaking change? - [ ] Yes - [x] No <!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. --> ## Other information <!-- Any other information that is important to this PR such as screenshots of how the component looks before and after the change. --> Relevant links: * https://github.com/ionic-team/ionic-framework/issues/27200 * https://ionic-cloud.atlassian.net/browse/FW-4374 * https://ionic-cloud.atlassian.net/browse/FW-4053 I'm not sure how to write an automated test for this bug due to the short timeout required. You can manually test the fix in [this Stackblitz](https://stackblitz.com/edit/g1kjci?file=package.json) by changing the Ionic version between 7.3.1 and 7.3.2-dev.11693262117.17edbf6d --------- Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
This commit is contained in:
@ -3,6 +3,7 @@ import { Watch, Component, Element, Event, Host, Method, Prop, h, readTask } fro
|
|||||||
import type { Gesture } from '@utils/gesture';
|
import type { Gesture } from '@utils/gesture';
|
||||||
import { createButtonActiveGesture } from '@utils/gesture/button-active';
|
import { createButtonActiveGesture } from '@utils/gesture/button-active';
|
||||||
import { raf } from '@utils/helpers';
|
import { raf } from '@utils/helpers';
|
||||||
|
import { createLockController } from '@utils/lock-controller';
|
||||||
import {
|
import {
|
||||||
BACKDROP,
|
BACKDROP,
|
||||||
createDelegateController,
|
createDelegateController,
|
||||||
@ -40,8 +41,8 @@ import { mdLeaveAnimation } from './animations/md.leave';
|
|||||||
})
|
})
|
||||||
export class ActionSheet implements ComponentInterface, OverlayInterface {
|
export class ActionSheet implements ComponentInterface, OverlayInterface {
|
||||||
private readonly delegateController = createDelegateController(this);
|
private readonly delegateController = createDelegateController(this);
|
||||||
|
private readonly lockController = createLockController();
|
||||||
private readonly triggerController = createTriggerController();
|
private readonly triggerController = createTriggerController();
|
||||||
private currentTransition?: Promise<any>;
|
|
||||||
private wrapperEl?: HTMLElement;
|
private wrapperEl?: HTMLElement;
|
||||||
private groupEl?: HTMLElement;
|
private groupEl?: HTMLElement;
|
||||||
private gesture?: Gesture;
|
private gesture?: Gesture;
|
||||||
@ -198,25 +199,13 @@ export class ActionSheet implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(): Promise<void> {
|
async present(): Promise<void> {
|
||||||
/**
|
const unlock = await this.lockController.lock();
|
||||||
* When using an inline action sheet
|
|
||||||
* and dismissing a action sheet it is possible to
|
|
||||||
* quickly present the action sheet while it is
|
|
||||||
* dismissing. We need to await any current
|
|
||||||
* transition to allow the dismiss to finish
|
|
||||||
* before presenting again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.delegateController.attachViewToDom();
|
await this.delegateController.attachViewToDom();
|
||||||
|
|
||||||
this.currentTransition = present(this, 'actionSheetEnter', iosEnterAnimation, mdEnterAnimation);
|
await present(this, 'actionSheetEnter', iosEnterAnimation, mdEnterAnimation);
|
||||||
|
|
||||||
await this.currentTransition;
|
unlock();
|
||||||
|
|
||||||
this.currentTransition = undefined;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -230,13 +219,16 @@ export class ActionSheet implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async dismiss(data?: any, role?: string): Promise<boolean> {
|
async dismiss(data?: any, role?: string): Promise<boolean> {
|
||||||
this.currentTransition = dismiss(this, data, role, 'actionSheetLeave', iosLeaveAnimation, mdLeaveAnimation);
|
const unlock = await this.lockController.lock();
|
||||||
const dismissed = await this.currentTransition;
|
|
||||||
|
const dismissed = await dismiss(this, data, role, 'actionSheetLeave', iosLeaveAnimation, mdLeaveAnimation);
|
||||||
|
|
||||||
if (dismissed) {
|
if (dismissed) {
|
||||||
this.delegateController.removeViewFromDom();
|
this.delegateController.removeViewFromDom();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
|
|
||||||
return dismissed;
|
return dismissed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config';
|
|||||||
import type { Gesture } from '@utils/gesture';
|
import type { Gesture } from '@utils/gesture';
|
||||||
import { createButtonActiveGesture } from '@utils/gesture/button-active';
|
import { createButtonActiveGesture } from '@utils/gesture/button-active';
|
||||||
import { raf } from '@utils/helpers';
|
import { raf } from '@utils/helpers';
|
||||||
|
import { createLockController } from '@utils/lock-controller';
|
||||||
import {
|
import {
|
||||||
createDelegateController,
|
createDelegateController,
|
||||||
createTriggerController,
|
createTriggerController,
|
||||||
@ -46,6 +47,7 @@ import { mdLeaveAnimation } from './animations/md.leave';
|
|||||||
})
|
})
|
||||||
export class Alert implements ComponentInterface, OverlayInterface {
|
export class Alert implements ComponentInterface, OverlayInterface {
|
||||||
private readonly delegateController = createDelegateController(this);
|
private readonly delegateController = createDelegateController(this);
|
||||||
|
private readonly lockController = createLockController();
|
||||||
private readonly triggerController = createTriggerController();
|
private readonly triggerController = createTriggerController();
|
||||||
private customHTMLEnabled = config.get('innerHTMLTemplatesEnabled', ENABLE_HTML_CONTENT_DEFAULT);
|
private customHTMLEnabled = config.get('innerHTMLTemplatesEnabled', ENABLE_HTML_CONTENT_DEFAULT);
|
||||||
private activeId?: string;
|
private activeId?: string;
|
||||||
@ -54,7 +56,6 @@ export class Alert implements ComponentInterface, OverlayInterface {
|
|||||||
private processedButtons: AlertButton[] = [];
|
private processedButtons: AlertButton[] = [];
|
||||||
private wrapperEl?: HTMLElement;
|
private wrapperEl?: HTMLElement;
|
||||||
private gesture?: Gesture;
|
private gesture?: Gesture;
|
||||||
private currentTransition?: Promise<any>;
|
|
||||||
|
|
||||||
presented = false;
|
presented = false;
|
||||||
lastFocus?: HTMLElement;
|
lastFocus?: HTMLElement;
|
||||||
@ -373,23 +374,13 @@ export class Alert implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(): Promise<void> {
|
async present(): Promise<void> {
|
||||||
/**
|
const unlock = await this.lockController.lock();
|
||||||
* When using an inline alert
|
|
||||||
* and dismissing an alert it is possible to
|
|
||||||
* quickly present the alert while it is
|
|
||||||
* dismissing. We need to await any current
|
|
||||||
* transition to allow the dismiss to finish
|
|
||||||
* before presenting again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.delegateController.attachViewToDom();
|
await this.delegateController.attachViewToDom();
|
||||||
|
|
||||||
this.currentTransition = present(this, 'alertEnter', iosEnterAnimation, mdEnterAnimation);
|
await present(this, 'alertEnter', iosEnterAnimation, mdEnterAnimation);
|
||||||
await this.currentTransition;
|
|
||||||
this.currentTransition = undefined;
|
unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -403,13 +394,16 @@ export class Alert implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async dismiss(data?: any, role?: string): Promise<boolean> {
|
async dismiss(data?: any, role?: string): Promise<boolean> {
|
||||||
this.currentTransition = dismiss(this, data, role, 'alertLeave', iosLeaveAnimation, mdLeaveAnimation);
|
const unlock = await this.lockController.lock();
|
||||||
const dismissed = await this.currentTransition;
|
|
||||||
|
const dismissed = await dismiss(this, data, role, 'alertLeave', iosLeaveAnimation, mdLeaveAnimation);
|
||||||
|
|
||||||
if (dismissed) {
|
if (dismissed) {
|
||||||
this.delegateController.removeViewFromDom();
|
this.delegateController.removeViewFromDom();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
|
|
||||||
return dismissed;
|
return dismissed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core';
|
|||||||
import { Watch, Component, Element, Event, Host, Method, Prop, h } from '@stencil/core';
|
import { Watch, Component, Element, Event, Host, Method, Prop, h } from '@stencil/core';
|
||||||
import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config';
|
import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config';
|
||||||
import { raf } from '@utils/helpers';
|
import { raf } from '@utils/helpers';
|
||||||
|
import { createLockController } from '@utils/lock-controller';
|
||||||
import {
|
import {
|
||||||
BACKDROP,
|
BACKDROP,
|
||||||
dismiss,
|
dismiss,
|
||||||
@ -42,10 +43,10 @@ import { mdLeaveAnimation } from './animations/md.leave';
|
|||||||
})
|
})
|
||||||
export class Loading implements ComponentInterface, OverlayInterface {
|
export class Loading implements ComponentInterface, OverlayInterface {
|
||||||
private readonly delegateController = createDelegateController(this);
|
private readonly delegateController = createDelegateController(this);
|
||||||
|
private readonly lockController = createLockController();
|
||||||
private readonly triggerController = createTriggerController();
|
private readonly triggerController = createTriggerController();
|
||||||
private customHTMLEnabled = config.get('innerHTMLTemplatesEnabled', ENABLE_HTML_CONTENT_DEFAULT);
|
private customHTMLEnabled = config.get('innerHTMLTemplatesEnabled', ENABLE_HTML_CONTENT_DEFAULT);
|
||||||
private durationTimeout?: ReturnType<typeof setTimeout>;
|
private durationTimeout?: ReturnType<typeof setTimeout>;
|
||||||
private currentTransition?: Promise<any>;
|
|
||||||
|
|
||||||
presented = false;
|
presented = false;
|
||||||
lastFocus?: HTMLElement;
|
lastFocus?: HTMLElement;
|
||||||
@ -235,29 +236,17 @@ export class Loading implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(): Promise<void> {
|
async present(): Promise<void> {
|
||||||
/**
|
const unlock = await this.lockController.lock();
|
||||||
* When using an inline loading indicator
|
|
||||||
* and dismissing a loading indicator it is possible to
|
|
||||||
* quickly present the loading indicator while it is
|
|
||||||
* dismissing. We need to await any current
|
|
||||||
* transition to allow the dismiss to finish
|
|
||||||
* before presenting again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.delegateController.attachViewToDom();
|
await this.delegateController.attachViewToDom();
|
||||||
|
|
||||||
this.currentTransition = present(this, 'loadingEnter', iosEnterAnimation, mdEnterAnimation);
|
await present(this, 'loadingEnter', iosEnterAnimation, mdEnterAnimation);
|
||||||
|
|
||||||
await this.currentTransition;
|
|
||||||
|
|
||||||
if (this.duration > 0) {
|
if (this.duration > 0) {
|
||||||
this.durationTimeout = setTimeout(() => this.dismiss(), this.duration + 10);
|
this.durationTimeout = setTimeout(() => this.dismiss(), this.duration + 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.currentTransition = undefined;
|
unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -271,17 +260,19 @@ export class Loading implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async dismiss(data?: any, role?: string): Promise<boolean> {
|
async dismiss(data?: any, role?: string): Promise<boolean> {
|
||||||
|
const unlock = await this.lockController.lock();
|
||||||
|
|
||||||
if (this.durationTimeout) {
|
if (this.durationTimeout) {
|
||||||
clearTimeout(this.durationTimeout);
|
clearTimeout(this.durationTimeout);
|
||||||
}
|
}
|
||||||
this.currentTransition = dismiss(this, data, role, 'loadingLeave', iosLeaveAnimation, mdLeaveAnimation);
|
const dismissed = await dismiss(this, data, role, 'loadingLeave', iosLeaveAnimation, mdLeaveAnimation);
|
||||||
|
|
||||||
const dismissed = await this.currentTransition;
|
|
||||||
|
|
||||||
if (dismissed) {
|
if (dismissed) {
|
||||||
this.delegateController.removeViewFromDom();
|
this.delegateController.removeViewFromDom();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
|
|
||||||
return dismissed;
|
return dismissed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import { findIonContent, printIonContentErrorMsg } from '@utils/content';
|
|||||||
import { CoreDelegate, attachComponent, detachComponent } from '@utils/framework-delegate';
|
import { CoreDelegate, attachComponent, detachComponent } from '@utils/framework-delegate';
|
||||||
import { raf, inheritAttributes, hasLazyBuild } from '@utils/helpers';
|
import { raf, inheritAttributes, hasLazyBuild } from '@utils/helpers';
|
||||||
import type { Attributes } from '@utils/helpers';
|
import type { Attributes } from '@utils/helpers';
|
||||||
|
import { createLockController } from '@utils/lock-controller';
|
||||||
import { printIonWarning } from '@utils/logging';
|
import { printIonWarning } from '@utils/logging';
|
||||||
import { Style as StatusBarStyle, StatusBar } from '@utils/native/status-bar';
|
import { Style as StatusBarStyle, StatusBar } from '@utils/native/status-bar';
|
||||||
import {
|
import {
|
||||||
@ -64,10 +65,10 @@ import { setCardStatusBarDark, setCardStatusBarDefault } from './utils';
|
|||||||
shadow: true,
|
shadow: true,
|
||||||
})
|
})
|
||||||
export class Modal implements ComponentInterface, OverlayInterface {
|
export class Modal implements ComponentInterface, OverlayInterface {
|
||||||
|
private readonly lockController = createLockController();
|
||||||
private readonly triggerController = createTriggerController();
|
private readonly triggerController = createTriggerController();
|
||||||
private gesture?: Gesture;
|
private gesture?: Gesture;
|
||||||
private coreDelegate: FrameworkDelegate = CoreDelegate();
|
private coreDelegate: FrameworkDelegate = CoreDelegate();
|
||||||
private currentTransition?: Promise<any>;
|
|
||||||
private sheetTransition?: Promise<any>;
|
private sheetTransition?: Promise<any>;
|
||||||
private isSheetModal = false;
|
private isSheetModal = false;
|
||||||
private currentBreakpoint?: number;
|
private currentBreakpoint?: number;
|
||||||
@ -422,24 +423,15 @@ export class Modal implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(): Promise<void> {
|
async present(): Promise<void> {
|
||||||
|
const unlock = await this.lockController.lock();
|
||||||
|
|
||||||
if (this.presented) {
|
if (this.presented) {
|
||||||
|
unlock();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { presentingElement, el } = this;
|
const { presentingElement, el } = this;
|
||||||
|
|
||||||
/**
|
|
||||||
* When using an inline modal
|
|
||||||
* and dismissing a modal it is possible to
|
|
||||||
* quickly present the modal while it is
|
|
||||||
* dismissing. We need to await any current
|
|
||||||
* transition to allow the dismiss to finish
|
|
||||||
* before presenting again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the modal is presented multiple times (inline modals), we
|
* If the modal is presented multiple times (inline modals), we
|
||||||
* need to reset the current breakpoint to the initial breakpoint.
|
* need to reset the current breakpoint to the initial breakpoint.
|
||||||
@ -481,7 +473,7 @@ export class Modal implements ComponentInterface, OverlayInterface {
|
|||||||
|
|
||||||
writeTask(() => this.el.classList.add('show-modal'));
|
writeTask(() => this.el.classList.add('show-modal'));
|
||||||
|
|
||||||
this.currentTransition = present<ModalPresentOptions>(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
|
await present<ModalPresentOptions>(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
|
||||||
presentingEl: presentingElement,
|
presentingEl: presentingElement,
|
||||||
currentBreakpoint: this.initialBreakpoint,
|
currentBreakpoint: this.initialBreakpoint,
|
||||||
backdropBreakpoint: this.backdropBreakpoint,
|
backdropBreakpoint: this.backdropBreakpoint,
|
||||||
@ -532,15 +524,13 @@ export class Modal implements ComponentInterface, OverlayInterface {
|
|||||||
setCardStatusBarDark();
|
setCardStatusBarDark();
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.currentTransition;
|
|
||||||
|
|
||||||
if (this.isSheetModal) {
|
if (this.isSheetModal) {
|
||||||
this.initSheetGesture();
|
this.initSheetGesture();
|
||||||
} else if (hasCardModal) {
|
} else if (hasCardModal) {
|
||||||
this.initSwipeToClose();
|
this.initSwipeToClose();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.currentTransition = undefined;
|
unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
private initSwipeToClose() {
|
private initSwipeToClose() {
|
||||||
@ -656,12 +646,20 @@ export class Modal implements ComponentInterface, OverlayInterface {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Because the canDismiss check below is async,
|
||||||
|
* we need to claim a lock before the check happens,
|
||||||
|
* in case the dismiss transition does run.
|
||||||
|
*/
|
||||||
|
const unlock = await this.lockController.lock();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If a canDismiss handler is responsible
|
* If a canDismiss handler is responsible
|
||||||
* for calling the dismiss method, we should
|
* for calling the dismiss method, we should
|
||||||
* not run the canDismiss check again.
|
* not run the canDismiss check again.
|
||||||
*/
|
*/
|
||||||
if (role !== 'handler' && !(await this.checkCanDismiss(data, role))) {
|
if (role !== 'handler' && !(await this.checkCanDismiss(data, role))) {
|
||||||
|
unlock();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -683,21 +681,9 @@ export class Modal implements ComponentInterface, OverlayInterface {
|
|||||||
this.keyboardOpenCallback = undefined;
|
this.keyboardOpenCallback = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* When using an inline modal
|
|
||||||
* and presenting a modal it is possible to
|
|
||||||
* quickly dismiss the modal while it is
|
|
||||||
* presenting. We need to await any current
|
|
||||||
* transition to allow the present to finish
|
|
||||||
* before dismissing again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
const enteringAnimation = activeAnimations.get(this) || [];
|
const enteringAnimation = activeAnimations.get(this) || [];
|
||||||
|
|
||||||
this.currentTransition = dismiss<ModalDismissOptions>(
|
const dismissed = await dismiss<ModalDismissOptions>(
|
||||||
this,
|
this,
|
||||||
data,
|
data,
|
||||||
role,
|
role,
|
||||||
@ -711,8 +697,6 @@ export class Modal implements ComponentInterface, OverlayInterface {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const dismissed = await this.currentTransition;
|
|
||||||
|
|
||||||
if (dismissed) {
|
if (dismissed) {
|
||||||
const { delegate } = this.getDelegate();
|
const { delegate } = this.getDelegate();
|
||||||
await detachComponent(delegate, this.usersElement);
|
await detachComponent(delegate, this.usersElement);
|
||||||
@ -729,8 +713,10 @@ export class Modal implements ComponentInterface, OverlayInterface {
|
|||||||
enteringAnimation.forEach((ani) => ani.destroy());
|
enteringAnimation.forEach((ani) => ani.destroy());
|
||||||
}
|
}
|
||||||
this.currentBreakpoint = undefined;
|
this.currentBreakpoint = undefined;
|
||||||
this.currentTransition = undefined;
|
|
||||||
this.animation = undefined;
|
this.animation = undefined;
|
||||||
|
|
||||||
|
unlock();
|
||||||
|
|
||||||
return dismissed;
|
return dismissed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import type { ComponentInterface, EventEmitter } from '@stencil/core';
|
import type { ComponentInterface, EventEmitter } from '@stencil/core';
|
||||||
import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core';
|
import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core';
|
||||||
import { raf } from '@utils/helpers';
|
import { raf } from '@utils/helpers';
|
||||||
|
import { createLockController } from '@utils/lock-controller';
|
||||||
import {
|
import {
|
||||||
createDelegateController,
|
createDelegateController,
|
||||||
createTriggerController,
|
createTriggerController,
|
||||||
@ -38,10 +39,10 @@ import type { PickerButton, PickerColumn } from './picker-interface';
|
|||||||
})
|
})
|
||||||
export class Picker implements ComponentInterface, OverlayInterface {
|
export class Picker implements ComponentInterface, OverlayInterface {
|
||||||
private readonly delegateController = createDelegateController(this);
|
private readonly delegateController = createDelegateController(this);
|
||||||
|
private readonly lockController = createLockController();
|
||||||
private readonly triggerController = createTriggerController();
|
private readonly triggerController = createTriggerController();
|
||||||
|
|
||||||
private durationTimeout?: ReturnType<typeof setTimeout>;
|
private durationTimeout?: ReturnType<typeof setTimeout>;
|
||||||
private currentTransition?: Promise<any>;
|
|
||||||
lastFocus?: HTMLElement;
|
lastFocus?: HTMLElement;
|
||||||
|
|
||||||
@Element() el!: HTMLIonPickerElement;
|
@Element() el!: HTMLIonPickerElement;
|
||||||
@ -215,29 +216,17 @@ export class Picker implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(): Promise<void> {
|
async present(): Promise<void> {
|
||||||
/**
|
const unlock = await this.lockController.lock();
|
||||||
* When using an inline picker
|
|
||||||
* and dismissing an picker it is possible to
|
|
||||||
* quickly present the picker while it is
|
|
||||||
* dismissing. We need to await any current
|
|
||||||
* transition to allow the dismiss to finish
|
|
||||||
* before presenting again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.delegateController.attachViewToDom();
|
await this.delegateController.attachViewToDom();
|
||||||
|
|
||||||
this.currentTransition = present(this, 'pickerEnter', iosEnterAnimation, iosEnterAnimation, undefined);
|
await present(this, 'pickerEnter', iosEnterAnimation, iosEnterAnimation, undefined);
|
||||||
|
|
||||||
await this.currentTransition;
|
|
||||||
|
|
||||||
this.currentTransition = undefined;
|
|
||||||
|
|
||||||
if (this.duration > 0) {
|
if (this.duration > 0) {
|
||||||
this.durationTimeout = setTimeout(() => this.dismiss(), this.duration);
|
this.durationTimeout = setTimeout(() => this.dismiss(), this.duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -251,16 +240,19 @@ export class Picker implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async dismiss(data?: any, role?: string): Promise<boolean> {
|
async dismiss(data?: any, role?: string): Promise<boolean> {
|
||||||
|
const unlock = await this.lockController.lock();
|
||||||
|
|
||||||
if (this.durationTimeout) {
|
if (this.durationTimeout) {
|
||||||
clearTimeout(this.durationTimeout);
|
clearTimeout(this.durationTimeout);
|
||||||
}
|
}
|
||||||
this.currentTransition = dismiss(this, data, role, 'pickerLeave', iosLeaveAnimation, iosLeaveAnimation);
|
const dismissed = await dismiss(this, data, role, 'pickerLeave', iosLeaveAnimation, iosLeaveAnimation);
|
||||||
const dismissed = await this.currentTransition;
|
|
||||||
|
|
||||||
if (dismissed) {
|
if (dismissed) {
|
||||||
this.delegateController.removeViewFromDom();
|
this.delegateController.removeViewFromDom();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
|
|
||||||
return dismissed;
|
return dismissed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core';
|
|||||||
import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core';
|
import { Component, Element, Event, Host, Method, Prop, State, Watch, h } from '@stencil/core';
|
||||||
import { CoreDelegate, attachComponent, detachComponent } from '@utils/framework-delegate';
|
import { CoreDelegate, attachComponent, detachComponent } from '@utils/framework-delegate';
|
||||||
import { addEventListener, raf, hasLazyBuild } from '@utils/helpers';
|
import { addEventListener, raf, hasLazyBuild } from '@utils/helpers';
|
||||||
|
import { createLockController } from '@utils/lock-controller';
|
||||||
import { printIonWarning } from '@utils/logging';
|
import { printIonWarning } from '@utils/logging';
|
||||||
import {
|
import {
|
||||||
BACKDROP,
|
BACKDROP,
|
||||||
@ -58,7 +59,7 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
private triggerEl?: HTMLElement | null;
|
private triggerEl?: HTMLElement | null;
|
||||||
private parentPopover: HTMLIonPopoverElement | null = null;
|
private parentPopover: HTMLIonPopoverElement | null = null;
|
||||||
private coreDelegate: FrameworkDelegate = CoreDelegate();
|
private coreDelegate: FrameworkDelegate = CoreDelegate();
|
||||||
private currentTransition?: Promise<any>;
|
private readonly lockController = createLockController();
|
||||||
private destroyTriggerInteraction?: () => void;
|
private destroyTriggerInteraction?: () => void;
|
||||||
private destroyKeyboardInteraction?: () => void;
|
private destroyKeyboardInteraction?: () => void;
|
||||||
private destroyDismissInteraction?: () => void;
|
private destroyDismissInteraction?: () => void;
|
||||||
@ -430,20 +431,11 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(event?: MouseEvent | TouchEvent | PointerEvent | CustomEvent): Promise<void> {
|
async present(event?: MouseEvent | TouchEvent | PointerEvent | CustomEvent): Promise<void> {
|
||||||
if (this.presented) {
|
const unlock = await this.lockController.lock();
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
if (this.presented) {
|
||||||
* When using an inline popover
|
unlock();
|
||||||
* and dismissing a popover it is possible to
|
return;
|
||||||
* quickly present the popover while it is
|
|
||||||
* dismissing. We need to await any current
|
|
||||||
* transition to allow the dismiss to finish
|
|
||||||
* before presenting again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const { el } = this;
|
const { el } = this;
|
||||||
@ -493,7 +485,7 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
await waitForMount();
|
await waitForMount();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.currentTransition = present<PopoverPresentOptions>(this, 'popoverEnter', iosEnterAnimation, mdEnterAnimation, {
|
await present<PopoverPresentOptions>(this, 'popoverEnter', iosEnterAnimation, mdEnterAnimation, {
|
||||||
event: event || this.event,
|
event: event || this.event,
|
||||||
size: this.size,
|
size: this.size,
|
||||||
trigger: this.triggerEl,
|
trigger: this.triggerEl,
|
||||||
@ -502,10 +494,6 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
align: this.alignment,
|
align: this.alignment,
|
||||||
});
|
});
|
||||||
|
|
||||||
await this.currentTransition;
|
|
||||||
|
|
||||||
this.currentTransition = undefined;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If popover is nested and was
|
* If popover is nested and was
|
||||||
* presented using the "Right" arrow key,
|
* presented using the "Right" arrow key,
|
||||||
@ -515,6 +503,8 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
if (this.focusDescendantOnPresent) {
|
if (this.focusDescendantOnPresent) {
|
||||||
focusFirstDescendant(this.el, this.el);
|
focusFirstDescendant(this.el, this.el);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -527,24 +517,14 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async dismiss(data?: any, role?: string, dismissParentPopover = true): Promise<boolean> {
|
async dismiss(data?: any, role?: string, dismissParentPopover = true): Promise<boolean> {
|
||||||
/**
|
const unlock = await this.lockController.lock();
|
||||||
* When using an inline popover
|
|
||||||
* and presenting a popover it is possible to
|
|
||||||
* quickly dismiss the popover while it is
|
|
||||||
* presenting. We need to await any current
|
|
||||||
* transition to allow the present to finish
|
|
||||||
* before dismissing again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
const { destroyKeyboardInteraction, destroyDismissInteraction } = this;
|
const { destroyKeyboardInteraction, destroyDismissInteraction } = this;
|
||||||
if (dismissParentPopover && this.parentPopover) {
|
if (dismissParentPopover && this.parentPopover) {
|
||||||
this.parentPopover.dismiss(data, role, dismissParentPopover);
|
this.parentPopover.dismiss(data, role, dismissParentPopover);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.currentTransition = dismiss<PopoverDismissOptions>(
|
const shouldDismiss = await dismiss<PopoverDismissOptions>(
|
||||||
this,
|
this,
|
||||||
data,
|
data,
|
||||||
role,
|
role,
|
||||||
@ -553,7 +533,7 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
mdLeaveAnimation,
|
mdLeaveAnimation,
|
||||||
this.event
|
this.event
|
||||||
);
|
);
|
||||||
const shouldDismiss = await this.currentTransition;
|
|
||||||
if (shouldDismiss) {
|
if (shouldDismiss) {
|
||||||
if (destroyKeyboardInteraction) {
|
if (destroyKeyboardInteraction) {
|
||||||
destroyKeyboardInteraction();
|
destroyKeyboardInteraction();
|
||||||
@ -573,7 +553,7 @@ export class Popover implements ComponentInterface, PopoverInterface {
|
|||||||
await detachComponent(delegate, this.usersElement);
|
await detachComponent(delegate, this.usersElement);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.currentTransition = undefined;
|
unlock();
|
||||||
|
|
||||||
return shouldDismiss;
|
return shouldDismiss;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -285,6 +285,7 @@ export class RouterOutlet implements ComponentInterface, NavOutlet {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: FW-5048 - Remove this code in favor of using lock controller from utils
|
||||||
private async lock() {
|
private async lock() {
|
||||||
const p = this.waitPromise;
|
const p = this.waitPromise;
|
||||||
let resolve!: () => void;
|
let resolve!: () => void;
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core';
|
|||||||
import { State, Watch, Component, Element, Event, h, Host, Method, Prop } from '@stencil/core';
|
import { State, Watch, Component, Element, Event, h, Host, Method, Prop } from '@stencil/core';
|
||||||
import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config';
|
import { ENABLE_HTML_CONTENT_DEFAULT } from '@utils/config';
|
||||||
import { raf } from '@utils/helpers';
|
import { raf } from '@utils/helpers';
|
||||||
|
import { createLockController } from '@utils/lock-controller';
|
||||||
import { printIonWarning } from '@utils/logging';
|
import { printIonWarning } from '@utils/logging';
|
||||||
import {
|
import {
|
||||||
createDelegateController,
|
createDelegateController,
|
||||||
@ -51,8 +52,8 @@ import type { ToastButton, ToastPosition, ToastLayout } from './toast-interface'
|
|||||||
})
|
})
|
||||||
export class Toast implements ComponentInterface, OverlayInterface {
|
export class Toast implements ComponentInterface, OverlayInterface {
|
||||||
private readonly delegateController = createDelegateController(this);
|
private readonly delegateController = createDelegateController(this);
|
||||||
|
private readonly lockController = createLockController();
|
||||||
private readonly triggerController = createTriggerController();
|
private readonly triggerController = createTriggerController();
|
||||||
private currentTransition?: Promise<any>;
|
|
||||||
private customHTMLEnabled = config.get('innerHTMLTemplatesEnabled', ENABLE_HTML_CONTENT_DEFAULT);
|
private customHTMLEnabled = config.get('innerHTMLTemplatesEnabled', ENABLE_HTML_CONTENT_DEFAULT);
|
||||||
private durationTimeout?: ReturnType<typeof setTimeout>;
|
private durationTimeout?: ReturnType<typeof setTimeout>;
|
||||||
|
|
||||||
@ -270,28 +271,11 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async present(): Promise<void> {
|
async present(): Promise<void> {
|
||||||
/**
|
const unlock = await this.lockController.lock();
|
||||||
* When using an inline toast
|
|
||||||
* and dismissing a toast it is possible to
|
|
||||||
* quickly present the toast while it is
|
|
||||||
* dismissing. We need to await any current
|
|
||||||
* transition to allow the dismiss to finish
|
|
||||||
* before presenting again.
|
|
||||||
*/
|
|
||||||
if (this.currentTransition !== undefined) {
|
|
||||||
await this.currentTransition;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.delegateController.attachViewToDom();
|
await this.delegateController.attachViewToDom();
|
||||||
|
|
||||||
this.currentTransition = present<ToastPresentOptions>(
|
await present<ToastPresentOptions>(this, 'toastEnter', iosEnterAnimation, mdEnterAnimation, this.position);
|
||||||
this,
|
|
||||||
'toastEnter',
|
|
||||||
iosEnterAnimation,
|
|
||||||
mdEnterAnimation,
|
|
||||||
this.position
|
|
||||||
);
|
|
||||||
await this.currentTransition;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Content is revealed to screen readers after
|
* Content is revealed to screen readers after
|
||||||
@ -300,11 +284,11 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
this.revealContentToScreenReader = true;
|
this.revealContentToScreenReader = true;
|
||||||
|
|
||||||
this.currentTransition = undefined;
|
|
||||||
|
|
||||||
if (this.duration > 0) {
|
if (this.duration > 0) {
|
||||||
this.durationTimeout = setTimeout(() => this.dismiss(undefined, 'timeout'), this.duration);
|
this.durationTimeout = setTimeout(() => this.dismiss(undefined, 'timeout'), this.duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -318,11 +302,13 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
*/
|
*/
|
||||||
@Method()
|
@Method()
|
||||||
async dismiss(data?: any, role?: string): Promise<boolean> {
|
async dismiss(data?: any, role?: string): Promise<boolean> {
|
||||||
|
const unlock = await this.lockController.lock();
|
||||||
|
|
||||||
if (this.durationTimeout) {
|
if (this.durationTimeout) {
|
||||||
clearTimeout(this.durationTimeout);
|
clearTimeout(this.durationTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.currentTransition = dismiss<ToastDismissOptions>(
|
const dismissed = await dismiss<ToastDismissOptions>(
|
||||||
this,
|
this,
|
||||||
data,
|
data,
|
||||||
role,
|
role,
|
||||||
@ -331,13 +317,14 @@ export class Toast implements ComponentInterface, OverlayInterface {
|
|||||||
mdLeaveAnimation,
|
mdLeaveAnimation,
|
||||||
this.position
|
this.position
|
||||||
);
|
);
|
||||||
const dismissed = await this.currentTransition;
|
|
||||||
|
|
||||||
if (dismissed) {
|
if (dismissed) {
|
||||||
this.delegateController.removeViewFromDom();
|
this.delegateController.removeViewFromDom();
|
||||||
this.revealContentToScreenReader = false;
|
this.revealContentToScreenReader = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unlock();
|
||||||
|
|
||||||
return dismissed;
|
return dismissed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
35
core/src/utils/lock-controller.ts
Normal file
35
core/src/utils/lock-controller.ts
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/**
|
||||||
|
* Creates a lock controller.
|
||||||
|
*
|
||||||
|
* Claiming a lock means that nothing else can acquire the lock until it is released.
|
||||||
|
* This can momentarily prevent execution of code that needs to wait for the earlier code to finish.
|
||||||
|
* For example, this can be used to prevent multiple transitions from occurring at the same time.
|
||||||
|
*/
|
||||||
|
export const createLockController = () => {
|
||||||
|
let waitPromise: Promise<void>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When lock() is called, the lock is claimed.
|
||||||
|
* Once a lock has been claimed, it cannot be claimed again until it is released.
|
||||||
|
* When this function gets resolved, the lock is released, allowing it to be claimed again.
|
||||||
|
*
|
||||||
|
* @example ```tsx
|
||||||
|
* const unlock = await this.lockController.lock();
|
||||||
|
* // do other stuff
|
||||||
|
* unlock();
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
const lock = async () => {
|
||||||
|
const p = waitPromise;
|
||||||
|
let resolve!: () => void;
|
||||||
|
waitPromise = new Promise((r) => (resolve = r));
|
||||||
|
if (p !== undefined) {
|
||||||
|
await p;
|
||||||
|
}
|
||||||
|
return resolve;
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
lock,
|
||||||
|
};
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user