javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): sync with master

Browse Source
This commit is contained in:
Liam DeBeasi
2021-04-05 16:40:39 -04:00
parent 073883a098 6df1215ee2
commit 4fb81b7450
81 changed files with 47583 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
angular/package-lock.json generated
View File

@@ -1,15 +1,15 @@
{
"name": "@ionic/angular",
"version": "5.6.0",
"version": "5.6.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/angular",
"version": "5.6.0",
"version": "5.6.3",
"license": "MIT",
"dependencies": {
"@ionic/core": "5.5.5",
"@ionic/core": "5.6.2",
"tslib": "^1.9.3"
},
"devDependencies": {
@@ -204,11 +204,12 @@
}
},
"node_modules/@ionic/core": {
"version": "5.5.5",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.5.tgz",
"integrity": "sha512-i5KTiRuGa9PTUULy8rTQDDDw3FbxzYiOoSdKGNC0v7UOpMv9ReRixMWd5J0cfY17VRrua2aqNsqZXYwuInVnRQ==",
"version": "5.6.2",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.2.tgz",
"integrity": "sha512-hnwd6ln0IZUVfFu2ilZK03b6EdQFqEWiTkL5kayq2gjB3BK/u1IEtV3C9fdwc8NJKopGwdbdQnujj6VhYPzV3Q==",
"dependencies": {
"ionicons": "^5.1.2",
"@stencil/core": "^2.4.0",
"ionicons": "^5.5.1",
"tslib": "^1.10.0"
}
},
@@ -291,9 +292,9 @@
}
},
"node_modules/@stencil/core": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.4.0.tgz",
"integrity": "sha512-gU6+Yyd6O0KrCSS/O6j8KKqmRo+/Dcs2fI0+APCpbAWK+nqhwDISpdnSEfGDCLMoAC08XOZCycBRk2K1VGnEcg==",
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.0.tgz",
"integrity": "sha512-gpoYJEYzu5LV2hr7uPZklug3zXhEbYGKyNodPfmOOYZtO9q42l7RQ3cAnC8MzEoF4jFrfemgtevGik8sqn9ClQ==",
"bin": {
"stencil": "bin/stencil"
},
@@ -2027,11 +2028,11 @@
}
},
"node_modules/ionicons": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.0.tgz",
"integrity": "sha512-0DUHTeoIrGSY+KNyNDaQW7v5+mDstjSkjx8dzT925kXKYBDrN3sGs8kUcSSQbTK132U4CbgDEZkn7FDUa9x8Qw==",
"version": "5.5.1",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
"integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
"dependencies": {
"@stencil/core": "^2.4.0"
"@stencil/core": "^2.5.0"
}
},
"node_modules/is-accessor-descriptor": {
@@ -5150,11 +5151,12 @@
}
},
"@ionic/core": {
"version": "5.5.5",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.5.5.tgz",
"integrity": "sha512-i5KTiRuGa9PTUULy8rTQDDDw3FbxzYiOoSdKGNC0v7UOpMv9ReRixMWd5J0cfY17VRrua2aqNsqZXYwuInVnRQ==",
"version": "5.6.2",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.2.tgz",
"integrity": "sha512-hnwd6ln0IZUVfFu2ilZK03b6EdQFqEWiTkL5kayq2gjB3BK/u1IEtV3C9fdwc8NJKopGwdbdQnujj6VhYPzV3Q==",
"requires": {
"ionicons": "^5.1.2",
"@stencil/core": "^2.4.0",
"ionicons": "^5.5.1",
"tslib": "^1.10.0"
}
},
@@ -5229,9 +5231,9 @@
"dev": true
},
"@stencil/core": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.4.0.tgz",
"integrity": "sha512-gU6+Yyd6O0KrCSS/O6j8KKqmRo+/Dcs2fI0+APCpbAWK+nqhwDISpdnSEfGDCLMoAC08XOZCycBRk2K1VGnEcg=="
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.0.tgz",
"integrity": "sha512-gpoYJEYzu5LV2hr7uPZklug3zXhEbYGKyNodPfmOOYZtO9q42l7RQ3cAnC8MzEoF4jFrfemgtevGik8sqn9ClQ=="
},
"@szmarczak/http-timer": {
"version": "1.1.2",
@@ -6648,11 +6650,11 @@
"dev": true
},
"ionicons": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.0.tgz",
"integrity": "sha512-0DUHTeoIrGSY+KNyNDaQW7v5+mDstjSkjx8dzT925kXKYBDrN3sGs8kUcSSQbTK132U4CbgDEZkn7FDUa9x8Qw==",
"version": "5.5.1",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.1.tgz",
"integrity": "sha512-1auVisfaXmkmxINer8Q3kJGHP1vSxk86hf7By95eJ+Av9+oBcNuAEBfSe3jaMaGRVxVw8U/2j23MFq7R3c0HPg==",
"requires": {
"@stencil/core": "^2.4.0"
"@stencil/core": "^2.5.0"
}
},
"is-accessor-descriptor": {

4
angular/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@ionic/angular",
"version": "5.6.0",
"version": "5.6.3",
"description": "Angular specific wrappers for @ionic/core",
"keywords": [
"ionic",
@@ -42,7 +42,7 @@
"validate": "npm i && npm run lint && npm run test && npm run build"
},
"dependencies": {
"@ionic/core": "5.6.0",
"@ionic/core": "5.6.3",
"tslib": "^1.9.3"
},
"peerDependencies": {

2
angular/src/directives/navigation/ion-router-outlet.ts
View File

@@ -52,7 +52,7 @@ export class IonRouterOutlet implements OnDestroy, OnInit {
this._swipeGesture = swipe;
this.nativeEl.swipeHandler = swipe ? {
canStart: () => this.stackCtrl.canGoBack(1),
canStart: () => this.stackCtrl.canGoBack(1) && !this.stackCtrl.hasRunningTask(),
onStart: () => this.stackCtrl.startBackTransition(),
onEnd: shouldContinue => this.stackCtrl.endBackTransition(shouldContinue)
} : undefined;

5
angular/src/directives/navigation/stack-controller.ts
View File

@@ -232,6 +232,10 @@ export class StackController {
return this.activeView ? this.activeView.stackId : undefined;
}
hasRunningTask(): boolean {
return this.runningTask !== undefined;
}
destroy() {
this.containerEl = undefined!;
this.views.forEach(destroyView);
@@ -294,6 +298,7 @@ export class StackController {
this.runningTask = undefined;
}
const promise = this.runningTask = task();
promise.finally(() => this.runningTask = undefined);
return promise;
}
}

2
angular/src/directives/virtual-scroll/virtual-scroll.ts
View File

@@ -71,7 +71,7 @@ export declare interface IonVirtualScroll {
* entire virtual scroll is reset, which is an expensive operation and
* should be avoided if possible.
*/
items?: any[];
items?: any[] | null;
/**
* An optional function that maps each item within their height.