javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(modal): swipe to close on content blocks scroll in ion-nav (#25300)

Browse Source 
resolves #25298
This commit is contained in:
Liam DeBeasi
2022-05-18 15:16:18 -04:00
committed by GitHub
parent 7111370dd7
commit fdc55c0727
52 changed files with 148 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/components/modal/modal.tsx
View File

@ -15,7 +15,7 @@ import type {
OverlayEventDetail,
OverlayInterface,
} from '../../interface';
import { getScrollElement, findIonContent, printIonContentErrorMsg } from '../../utils/content';
import { findIonContent, printIonContentErrorMsg } from '../../utils/content';
import { CoreDelegate, attachComponent, detachComponent } from '../../utils/framework-delegate';
import { raf } from '../../utils/helpers';
import { KEYBOARD_DID_OPEN } from '../../utils/keyboard/keyboard';
@ -511,7 +511,7 @@ export class Modal implements ComponentInterface, OverlayInterface {
this.currentTransition = undefined;
}
private async initSwipeToClose() {
private initSwipeToClose() {
if (getIonMode(this) !== 'ios') {
return;
}
@ -529,9 +529,8 @@ export class Modal implements ComponentInterface, OverlayInterface {
printIonContentErrorMsg(el);
return;
}
const scrollEl = await getScrollElement(contentEl);
this.gesture = createSwipeToCloseGesture(el, contentEl, scrollEl, ani, () => {
this.gesture = createSwipeToCloseGesture(el, ani, () => {
/**
* While the gesture animation is finishing
* it is possible for a user to tap the backdrop.