@nativescript/core 9.0.21-next.19 → 9.0.21-next.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/ui/page/index.ios.d.ts +2 -1
- package/ui/page/index.ios.js +11 -5
- package/ui/page/index.ios.js.map +1 -1
package/package.json
CHANGED
package/ui/page/index.ios.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { View } from '../core/view';
|
|
2
|
-
import { PageBase, actionBarHiddenProperty } from './page-common';
|
|
2
|
+
import { PageBase, actionBarHiddenProperty, enableSwipeBackNavigationProperty } from './page-common';
|
|
3
3
|
export * from './page-common';
|
|
4
4
|
declare class UIViewControllerImpl extends UIViewController {
|
|
5
5
|
private _owner;
|
|
@@ -25,6 +25,7 @@ declare class UIViewControllerImpl extends UIViewController {
|
|
|
25
25
|
}
|
|
26
26
|
export declare class Page extends PageBase {
|
|
27
27
|
[actionBarHiddenProperty.setNative]: (value: boolean) => void;
|
|
28
|
+
[enableSwipeBackNavigationProperty.setNative]: (value: boolean) => void;
|
|
28
29
|
nativeViewProtected: UIView;
|
|
29
30
|
viewController: UIViewControllerImpl;
|
|
30
31
|
onAccessibilityPerformEscape: () => boolean;
|
package/ui/page/index.ios.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { isAccessibilityServiceEnabled } from '../../application';
|
|
2
2
|
import { NavigationType } from '../frame/frame-interfaces';
|
|
3
3
|
import { View, IOSHelper } from '../core/view';
|
|
4
|
-
import { PageBase, actionBarHiddenProperty } from './page-common';
|
|
4
|
+
import { PageBase, actionBarHiddenProperty, enableSwipeBackNavigationProperty } from './page-common';
|
|
5
5
|
import { profile } from '../../profiling';
|
|
6
6
|
import { layout } from '../../utils/layout-helper';
|
|
7
7
|
import { SDK_VERSION } from '../../utils/constants';
|
|
@@ -140,14 +140,14 @@ var UIViewControllerImpl = (function (_super) {
|
|
|
140
140
|
if (!(transitionState === null || transitionState === void 0 ? void 0 : transitionState.interactive)) {
|
|
141
141
|
navigationController.interactivePopGestureRecognizer.delegate = navigationController;
|
|
142
142
|
navigationController.interactivePopGestureRecognizer.enabled = owner.enableSwipeBackNavigation;
|
|
143
|
-
if (SDK_VERSION >= 26) {
|
|
143
|
+
if (SDK_VERSION >= 26 && navigationController.interactiveContentPopGestureRecognizer) {
|
|
144
144
|
navigationController.interactiveContentPopGestureRecognizer.enabled = owner.enableSwipeBackNavigation;
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
148
|
else {
|
|
149
149
|
navigationController.interactivePopGestureRecognizer.enabled = false;
|
|
150
|
-
if (SDK_VERSION >= 26) {
|
|
150
|
+
if (SDK_VERSION >= 26 && navigationController.interactiveContentPopGestureRecognizer) {
|
|
151
151
|
navigationController.interactiveContentPopGestureRecognizer.enabled = false;
|
|
152
152
|
}
|
|
153
153
|
}
|
|
@@ -173,7 +173,11 @@ var UIViewControllerImpl = (function (_super) {
|
|
|
173
173
|
UIViewControllerImpl.prototype.viewDidDisappear = function (animated) {
|
|
174
174
|
var _a;
|
|
175
175
|
_super.prototype.viewDidDisappear.call(this, animated);
|
|
176
|
-
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref(
|
|
176
|
+
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref( // Handle Angular scenario where TabView is in a ProxyViewContainer
|
|
177
|
+
// It is possible to wrap components in ProxyViewContainers indefinitely
|
|
178
|
+
// Not using instanceof ProxyViewContainer to avoid circular dependency
|
|
179
|
+
// TODO: Try moving UIViewControllerImpl out of page module
|
|
180
|
+
);
|
|
177
181
|
if (!owner || owner.modal || owner._presentedViewController) {
|
|
178
182
|
return;
|
|
179
183
|
}
|
|
@@ -447,7 +451,6 @@ export class Page extends PageBase {
|
|
|
447
451
|
super._removeViewFromNativeVisualTree(child);
|
|
448
452
|
}
|
|
449
453
|
[actionBarHiddenProperty.setNative](value) {
|
|
450
|
-
this._updateEnableSwipeBackNavigation(value);
|
|
451
454
|
// Invalidate all inner controller.
|
|
452
455
|
invalidateTopmostController(this.viewController);
|
|
453
456
|
const frame = this.frame;
|
|
@@ -456,6 +459,9 @@ export class Page extends PageBase {
|
|
|
456
459
|
frame._updateActionBar(this, true);
|
|
457
460
|
}
|
|
458
461
|
}
|
|
462
|
+
[enableSwipeBackNavigationProperty.setNative](value) {
|
|
463
|
+
this._updateEnableSwipeBackNavigation(value);
|
|
464
|
+
}
|
|
459
465
|
accessibilityScreenChanged(refocus = false) {
|
|
460
466
|
if (!isAccessibilityServiceEnabled()) {
|
|
461
467
|
return;
|
package/ui/page/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAkB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"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"}
|