@nativescript/core 9.0.0-preview.2 → 9.0.0
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/application/application-common.d.ts +40 -14
- package/application/application-common.js +109 -5
- package/application/application-common.js.map +1 -1
- package/application/application-interfaces.d.ts +31 -0
- package/application/application-shims.d.ts +27 -0
- package/application/application-shims.js +27 -0
- package/application/application-shims.js.map +1 -1
- package/application/application.android.d.ts +12 -2
- package/application/application.android.js +380 -343
- package/application/application.android.js.map +1 -1
- package/application/application.d.ts +74 -1
- package/application/application.ios.d.ts +68 -1
- package/application/application.ios.js +642 -16
- package/application/application.ios.js.map +1 -1
- package/application/helpers.android.d.ts +0 -9
- package/application/helpers.android.js +0 -54
- package/application/helpers.android.js.map +1 -1
- package/application/helpers.d.ts +0 -10
- package/application/helpers.ios.d.ts +0 -19
- package/application/helpers.ios.js +0 -38
- package/application/helpers.ios.js.map +1 -1
- package/cli-hooks/{before-checkForChanges.js → before-checkForChanges.mjs} +6 -6
- package/cli-hooks/postinstall.mjs +7 -0
- package/cli-hooks/preuninstall.mjs +7 -0
- package/config/config.interface.d.ts +21 -0
- package/connectivity/index.android.js +25 -25
- package/connectivity/index.android.js.map +1 -1
- package/core-types/index.d.ts +78 -63
- package/core-types/index.js +11 -1
- package/core-types/index.js.map +1 -1
- package/core-types/validators.js +14 -5
- package/core-types/validators.js.map +1 -1
- package/data/observable/index.d.ts +2 -1
- package/data/observable/index.js +31 -19
- package/data/observable/index.js.map +1 -1
- package/fps-meter/fps-native.ios.js +1 -1
- package/fps-meter/fps-native.ios.js.map +1 -1
- package/globals/index.js +1 -2
- package/globals/index.js.map +1 -1
- package/http/http-request/index.ios.js +1 -1
- package/http/http-request/index.ios.js.map +1 -1
- package/image-asset/image-asset-common.js +31 -3
- package/image-asset/image-asset-common.js.map +1 -1
- package/image-source/index.android.js +4 -3
- package/image-source/index.android.js.map +1 -1
- package/image-source/index.d.ts +2 -2
- package/index.d.ts +1 -0
- package/index.js +0 -1
- package/index.js.map +1 -1
- package/inspector_modules.d.ts +0 -5
- package/inspector_modules.js +223 -103
- package/inspector_modules.js.map +1 -1
- package/package.json +15 -13
- package/platform/screen/index.d.ts +5 -0
- package/platforms/android/widgets-release.aar +0 -0
- package/references.d.ts +1 -1
- package/timer/index.android.js +15 -7
- package/timer/index.android.js.map +1 -1
- package/timer/index.ios.js +1 -1
- package/timer/index.ios.js.map +1 -1
- package/ui/action-bar/index.android.js +16 -18
- package/ui/action-bar/index.android.js.map +1 -1
- package/ui/action-bar/index.ios.d.ts +1 -0
- package/ui/action-bar/index.ios.js +28 -4
- package/ui/action-bar/index.ios.js.map +1 -1
- package/ui/animation/index.d.ts +14 -1
- package/ui/animation/index.ios.js +2 -3
- package/ui/animation/index.ios.js.map +1 -1
- package/ui/button/index.android.js +20 -20
- package/ui/button/index.android.js.map +1 -1
- package/ui/button/index.d.ts +1 -1
- package/ui/button/index.ios.d.ts +2 -1
- package/ui/button/index.ios.js +28 -10
- package/ui/button/index.ios.js.map +1 -1
- package/ui/core/control-state-change/index.ios.js +1 -1
- package/ui/core/control-state-change/index.ios.js.map +1 -1
- package/ui/core/properties/index.js +64 -52
- package/ui/core/properties/index.js.map +1 -1
- package/ui/core/view/index.android.d.ts +19 -2
- package/ui/core/view/index.android.js +544 -200
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.d.ts +55 -4
- package/ui/core/view/index.ios.d.ts +19 -2
- package/ui/core/view/index.ios.js +148 -10
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.d.ts +70 -10
- package/ui/core/view/view-common.js +66 -1
- package/ui/core/view/view-common.js.map +1 -1
- package/ui/core/view/view-helper/index.d.ts +5 -0
- package/ui/core/view/view-helper/index.ios.d.ts +6 -4
- package/ui/core/view/view-helper/index.ios.js +37 -20
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/core/view/view-helper/view-helper-common.js +7 -0
- package/ui/core/view/view-helper/view-helper-common.js.map +1 -1
- package/ui/core/view/view-interfaces.d.ts +22 -0
- package/ui/core/view-base/index.d.ts +4 -0
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/date-picker/index.android.js +36 -38
- package/ui/date-picker/index.android.js.map +1 -1
- package/ui/date-picker/index.ios.js +1 -1
- package/ui/date-picker/index.ios.js.map +1 -1
- package/ui/dialogs/index.ios.js +4 -2
- package/ui/dialogs/index.ios.js.map +1 -1
- package/ui/editable-text-base/editable-text-base-common.js +1 -1
- package/ui/editable-text-base/editable-text-base-common.js.map +1 -1
- package/ui/editable-text-base/index.android.d.ts +1 -1
- package/ui/editable-text-base/index.android.js +35 -34
- package/ui/editable-text-base/index.android.js.map +1 -1
- package/ui/editable-text-base/index.ios.d.ts +1 -1
- package/ui/editable-text-base/index.ios.js +3 -0
- package/ui/editable-text-base/index.ios.js.map +1 -1
- package/ui/frame/activity.android.js +3 -0
- package/ui/frame/activity.android.js.map +1 -1
- package/ui/frame/fragment.transitions.android.d.ts +2 -1
- package/ui/frame/fragment.transitions.android.js +103 -104
- package/ui/frame/fragment.transitions.android.js.map +1 -1
- package/ui/frame/fragment.transitions.d.ts +3 -2
- package/ui/frame/frame-interfaces.d.ts +18 -8
- package/ui/frame/index.android.d.ts +2 -0
- package/ui/frame/index.android.js +57 -2
- package/ui/frame/index.android.js.map +1 -1
- package/ui/frame/index.d.ts +1 -1
- package/ui/frame/index.ios.d.ts +3 -1
- package/ui/frame/index.ios.js +94 -59
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/gestures/index.android.js +129 -130
- package/ui/gestures/index.android.js.map +1 -1
- package/ui/gestures/index.ios.js +3 -5
- package/ui/gestures/index.ios.js.map +1 -1
- package/ui/gestures/touch-manager.js +32 -32
- package/ui/gestures/touch-manager.js.map +1 -1
- package/ui/image/index.android.js +17 -19
- package/ui/image/index.android.js.map +1 -1
- package/ui/image-cache/index.android.js +12 -14
- package/ui/image-cache/index.android.js.map +1 -1
- package/ui/image-cache/index.ios.js +6 -6
- package/ui/image-cache/index.ios.js.map +1 -1
- package/ui/index.d.ts +10 -4
- package/ui/index.js +4 -1
- package/ui/index.js.map +1 -1
- package/ui/label/index.android.js +4 -1
- package/ui/label/index.android.js.map +1 -1
- package/ui/label/index.ios.d.ts +2 -1
- package/ui/label/index.ios.js +12 -2
- package/ui/label/index.ios.js.map +1 -1
- package/ui/layouts/flexbox-layout/index.ios.js +3 -6
- package/ui/layouts/flexbox-layout/index.ios.js.map +1 -1
- package/ui/layouts/index.d.ts +5 -1
- package/ui/layouts/index.js +2 -0
- package/ui/layouts/index.js.map +1 -1
- package/ui/layouts/liquid-glass/index.android.d.ts +5 -0
- package/ui/layouts/liquid-glass/index.android.js +8 -0
- package/ui/layouts/liquid-glass/index.android.js.map +1 -0
- package/ui/layouts/liquid-glass/index.d.ts +10 -0
- package/ui/layouts/liquid-glass/index.ios.d.ts +10 -0
- package/ui/layouts/liquid-glass/index.ios.js +59 -0
- package/ui/layouts/liquid-glass/index.ios.js.map +1 -0
- package/ui/layouts/liquid-glass/liquid-glass-common.d.ts +3 -0
- package/ui/layouts/liquid-glass/liquid-glass-common.js +4 -0
- package/ui/layouts/liquid-glass/liquid-glass-common.js.map +1 -0
- package/ui/layouts/liquid-glass-container/index.android.d.ts +3 -0
- package/ui/layouts/liquid-glass-container/index.android.js +4 -0
- package/ui/layouts/liquid-glass-container/index.android.js.map +1 -0
- package/ui/layouts/liquid-glass-container/index.d.ts +3 -0
- package/ui/layouts/liquid-glass-container/index.ios.d.ts +14 -0
- package/ui/layouts/liquid-glass-container/index.ios.js +121 -0
- package/ui/layouts/liquid-glass-container/index.ios.js.map +1 -0
- package/ui/layouts/liquid-glass-container/liquid-glass-container-common.d.ts +4 -0
- package/ui/layouts/liquid-glass-container/liquid-glass-container-common.js +5 -0
- package/ui/layouts/liquid-glass-container/liquid-glass-container-common.js.map +1 -0
- package/ui/layouts/stack-layout/index.ios.js +6 -0
- package/ui/layouts/stack-layout/index.ios.js.map +1 -1
- package/ui/list-picker/index.android.js +31 -35
- package/ui/list-picker/index.android.js.map +1 -1
- package/ui/list-picker/index.ios.js +2 -2
- package/ui/list-picker/index.ios.js.map +1 -1
- package/ui/list-view/index.android.js +320 -321
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.d.ts +7 -2
- package/ui/list-view/index.ios.d.ts +1 -1
- package/ui/list-view/index.ios.js +30 -45
- package/ui/list-view/index.ios.js.map +1 -1
- package/ui/page/index.android.d.ts +1 -10
- package/ui/page/index.android.js +1 -45
- package/ui/page/index.android.js.map +1 -1
- package/ui/page/index.d.ts +0 -8
- package/ui/page/index.ios.d.ts +1 -3
- package/ui/page/index.ios.js +33 -91
- package/ui/page/index.ios.js.map +1 -1
- package/ui/page/page-common.d.ts +0 -6
- package/ui/page/page-common.js +0 -14
- package/ui/page/page-common.js.map +1 -1
- package/ui/scroll-view/index.d.ts +1 -1
- package/ui/scroll-view/index.ios.d.ts +2 -0
- package/ui/scroll-view/index.ios.js +31 -12
- package/ui/scroll-view/index.ios.js.map +1 -1
- package/ui/scroll-view/scroll-view-common.d.ts +3 -8
- package/ui/scroll-view/scroll-view-common.js +4 -4
- package/ui/scroll-view/scroll-view-common.js.map +1 -1
- package/ui/search-bar/index.android.d.ts +2 -1
- package/ui/search-bar/index.android.js +64 -53
- package/ui/search-bar/index.android.js.map +1 -1
- package/ui/search-bar/index.d.ts +7 -0
- package/ui/search-bar/index.ios.d.ts +2 -1
- package/ui/search-bar/index.ios.js +14 -7
- package/ui/search-bar/index.ios.js.map +1 -1
- package/ui/search-bar/search-bar-common.d.ts +2 -0
- package/ui/search-bar/search-bar-common.js +7 -0
- package/ui/search-bar/search-bar-common.js.map +1 -1
- package/ui/segmented-bar/index.android.js +52 -58
- package/ui/segmented-bar/index.android.js.map +1 -1
- package/ui/segmented-bar/index.ios.js +1 -1
- package/ui/segmented-bar/index.ios.js.map +1 -1
- package/ui/slider/index.android.js +22 -25
- package/ui/slider/index.android.js.map +1 -1
- package/ui/slider/index.d.ts +1 -1
- package/ui/slider/index.ios.js +2 -2
- package/ui/slider/index.ios.js.map +1 -1
- package/ui/split-view/index.android.d.ts +4 -0
- package/ui/split-view/index.android.js +4 -0
- package/ui/split-view/index.android.js.map +1 -0
- package/ui/split-view/index.d.ts +11 -0
- package/ui/split-view/index.ios.d.ts +39 -0
- package/ui/split-view/index.ios.js +368 -0
- package/ui/split-view/index.ios.js.map +1 -0
- package/ui/split-view/split-view-common.d.ts +51 -0
- package/ui/split-view/split-view-common.js +111 -0
- package/ui/split-view/split-view-common.js.map +1 -0
- package/ui/styling/background-common.d.ts +4 -4
- package/ui/styling/background-common.js +8 -8
- package/ui/styling/background-common.js.map +1 -1
- package/ui/styling/background.d.ts +0 -3
- package/ui/styling/background.ios.d.ts +2 -1
- package/ui/styling/background.ios.js +47 -38
- package/ui/styling/background.ios.js.map +1 -1
- package/ui/styling/css-stroke.js.map +1 -1
- package/ui/styling/css-utils.d.ts +1 -0
- package/ui/styling/css-utils.js +15 -4
- package/ui/styling/css-utils.js.map +1 -1
- package/ui/styling/style/index.d.ts +3 -1
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.d.ts +1 -0
- package/ui/styling/style-properties.js +30 -11
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/switch/index.android.js +16 -18
- package/ui/switch/index.android.js.map +1 -1
- package/ui/switch/index.ios.d.ts +1 -1
- package/ui/switch/index.ios.js +62 -25
- package/ui/switch/index.ios.js.map +1 -1
- package/ui/tab-view/index.android.js +185 -187
- package/ui/tab-view/index.android.js.map +1 -1
- package/ui/tab-view/index.d.ts +17 -1
- package/ui/tab-view/index.ios.d.ts +13 -5
- package/ui/tab-view/index.ios.js +255 -57
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/tab-view/tab-view-common.d.ts +14 -0
- package/ui/tab-view/tab-view-common.js +15 -0
- package/ui/tab-view/tab-view-common.js.map +1 -1
- package/ui/text-base/index.android.d.ts +2 -1
- package/ui/text-base/index.android.js +134 -101
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-base/index.d.ts +5 -0
- package/ui/text-base/index.ios.js +12 -18
- package/ui/text-base/index.ios.js.map +1 -1
- package/ui/text-base/text-base-common.d.ts +2 -1
- package/ui/text-base/text-base-common.js +1 -0
- package/ui/text-base/text-base-common.js.map +1 -1
- package/ui/text-field/index.android.js +3 -0
- package/ui/text-field/index.android.js.map +1 -1
- package/ui/text-field/index.ios.d.ts +2 -1
- package/ui/text-field/index.ios.js +9 -5
- package/ui/text-field/index.ios.js.map +1 -1
- package/ui/text-view/index.ios.d.ts +2 -1
- package/ui/text-view/index.ios.js +12 -7
- package/ui/text-view/index.ios.js.map +1 -1
- package/ui/time-picker/index.android.js +19 -21
- package/ui/time-picker/index.android.js.map +1 -1
- package/ui/time-picker/index.ios.js +1 -1
- package/ui/time-picker/index.ios.js.map +1 -1
- package/ui/transition/fade-transition.ios.js +5 -6
- package/ui/transition/fade-transition.ios.js.map +1 -1
- package/ui/transition/modal-transition.ios.js +19 -26
- package/ui/transition/modal-transition.ios.js.map +1 -1
- package/ui/transition/page-transition.android.js +18 -13
- package/ui/transition/page-transition.android.js.map +1 -1
- package/ui/transition/page-transition.ios.js +19 -25
- package/ui/transition/page-transition.ios.js.map +1 -1
- package/ui/transition/slide-transition.ios.js +5 -6
- package/ui/transition/slide-transition.ios.js.map +1 -1
- package/ui/web-view/index.android.js +58 -62
- package/ui/web-view/index.android.js.map +1 -1
- package/ui/web-view/index.ios.js +18 -18
- package/ui/web-view/index.ios.js.map +1 -1
- package/utils/common.d.ts +3 -1
- package/utils/common.js +9 -3
- package/utils/common.js.map +1 -1
- package/utils/constants.android.d.ts +1 -0
- package/utils/constants.android.js +3 -0
- package/utils/constants.android.js.map +1 -1
- package/utils/constants.d.ts +1 -0
- package/utils/constants.ios.d.ts +1 -0
- package/utils/constants.ios.js +3 -0
- package/utils/constants.ios.js.map +1 -1
- package/utils/index.d.ts +6 -0
- package/utils/layout-helper/index.android.d.ts +1 -0
- package/utils/layout-helper/index.android.js +9 -0
- package/utils/layout-helper/index.android.js.map +1 -1
- package/utils/layout-helper/index.d.ts +5 -0
- package/utils/layout-helper/index.ios.d.ts +1 -0
- package/utils/layout-helper/index.ios.js +4 -0
- package/utils/layout-helper/index.ios.js.map +1 -1
- package/utils/native-helper-for-android.d.ts +22 -0
- package/utils/native-helper-for-android.js +103 -0
- package/utils/native-helper-for-android.js.map +1 -1
- package/utils/native-helper.android.d.ts +9 -1
- package/utils/native-helper.android.js +5 -1
- package/utils/native-helper.android.js.map +1 -1
- package/utils/native-helper.d.ts +30 -0
- package/utils/native-helper.ios.js +20 -20
- package/utils/native-helper.ios.js.map +1 -1
- package/cli-hooks/postinstall.js +0 -2
- package/cli-hooks/preuninstall.js +0 -2
|
@@ -77,7 +77,7 @@ export class ModalTransition extends Transition {
|
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
-
var PercentInteractiveController =
|
|
80
|
+
var PercentInteractiveController = (function (_super) {
|
|
81
81
|
__extends(PercentInteractiveController, _super);
|
|
82
82
|
function PercentInteractiveController() {
|
|
83
83
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -89,7 +89,6 @@ var PercentInteractiveController = /** @class */ (function (_super) {
|
|
|
89
89
|
};
|
|
90
90
|
PercentInteractiveController.prototype.startInteractiveTransition = function (transitionContext) {
|
|
91
91
|
var _a;
|
|
92
|
-
// console.log('startInteractiveTransition');
|
|
93
92
|
if (!this.interactiveState) {
|
|
94
93
|
this.interactiveState = {
|
|
95
94
|
transitionContext: transitionContext,
|
|
@@ -97,7 +96,7 @@ var PercentInteractiveController = /** @class */ (function (_super) {
|
|
|
97
96
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
98
97
|
if (owner) {
|
|
99
98
|
var state = SharedTransition.getState(owner.id);
|
|
100
|
-
SharedTransitionHelper.interactiveStart(state, this.interactiveState,
|
|
99
|
+
SharedTransitionHelper.interactiveStart(state, this.interactiveState, "modal");
|
|
101
100
|
}
|
|
102
101
|
}
|
|
103
102
|
};
|
|
@@ -106,31 +105,29 @@ var PercentInteractiveController = /** @class */ (function (_super) {
|
|
|
106
105
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
107
106
|
if (owner) {
|
|
108
107
|
var state = SharedTransition.getState(owner.id);
|
|
109
|
-
SharedTransitionHelper.interactiveUpdate(state, this.interactiveState,
|
|
108
|
+
SharedTransitionHelper.interactiveUpdate(state, this.interactiveState, "modal", percentComplete);
|
|
110
109
|
}
|
|
111
110
|
};
|
|
112
111
|
PercentInteractiveController.prototype.cancelInteractiveTransition = function () {
|
|
113
112
|
var _a;
|
|
114
|
-
// console.log('cancelInteractiveTransition');
|
|
115
113
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
116
114
|
if (owner) {
|
|
117
115
|
var state = SharedTransition.getState(owner.id);
|
|
118
|
-
SharedTransitionHelper.interactiveCancel(state, this.interactiveState,
|
|
116
|
+
SharedTransitionHelper.interactiveCancel(state, this.interactiveState, "modal");
|
|
119
117
|
}
|
|
120
118
|
};
|
|
121
119
|
PercentInteractiveController.prototype.finishInteractiveTransition = function () {
|
|
122
120
|
var _a;
|
|
123
|
-
// console.log('finishInteractiveTransition');
|
|
124
121
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
125
122
|
if (owner) {
|
|
126
123
|
var state = SharedTransition.getState(owner.id);
|
|
127
|
-
SharedTransitionHelper.interactiveFinish(state, this.interactiveState,
|
|
124
|
+
SharedTransitionHelper.interactiveFinish(state, this.interactiveState, "modal");
|
|
128
125
|
}
|
|
129
126
|
};
|
|
130
127
|
PercentInteractiveController.ObjCProtocols = [UIViewControllerInteractiveTransitioning];
|
|
131
128
|
return PercentInteractiveController;
|
|
132
129
|
}(UIPercentDrivenInteractiveTransition));
|
|
133
|
-
var ModalTransitionController =
|
|
130
|
+
var ModalTransitionController = (function (_super) {
|
|
134
131
|
__extends(ModalTransitionController, _super);
|
|
135
132
|
function ModalTransitionController() {
|
|
136
133
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -146,34 +143,30 @@ var ModalTransitionController = /** @class */ (function (_super) {
|
|
|
146
143
|
if (owner) {
|
|
147
144
|
var state = SharedTransition.getState(owner.id);
|
|
148
145
|
switch (state === null || state === void 0 ? void 0 : state.activeType) {
|
|
149
|
-
case SharedTransitionAnimationType.present:
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
return getDurationWithDampingFromSpring((_f = state.pageReturn) === null || _f === void 0 ? void 0 : _f.spring).duration;
|
|
162
|
-
}
|
|
146
|
+
case SharedTransitionAnimationType.present: if (isNumber((_a = state === null || state === void 0 ? void 0 : state.pageEnd) === null || _a === void 0 ? void 0 : _a.duration)) {
|
|
147
|
+
return ((_b = state.pageEnd) === null || _b === void 0 ? void 0 : _b.duration) / 1000;
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
return getDurationWithDampingFromSpring((_c = state.pageEnd) === null || _c === void 0 ? void 0 : _c.spring).duration;
|
|
151
|
+
}
|
|
152
|
+
case SharedTransitionAnimationType.dismiss: if (isNumber((_d = state === null || state === void 0 ? void 0 : state.pageReturn) === null || _d === void 0 ? void 0 : _d.duration)) {
|
|
153
|
+
return ((_e = state.pageReturn) === null || _e === void 0 ? void 0 : _e.duration) / 1000;
|
|
154
|
+
}
|
|
155
|
+
else {
|
|
156
|
+
return getDurationWithDampingFromSpring((_f = state.pageReturn) === null || _f === void 0 ? void 0 : _f.spring).duration;
|
|
157
|
+
}
|
|
163
158
|
}
|
|
164
159
|
}
|
|
165
160
|
return CORE_ANIMATION_DEFAULTS.duration;
|
|
166
161
|
};
|
|
167
162
|
ModalTransitionController.prototype.animateTransition = function (transitionContext) {
|
|
168
|
-
// console.log('ModalTransitionController animateTransition');
|
|
169
163
|
var owner = this.owner.deref();
|
|
170
164
|
if (owner) {
|
|
171
|
-
// console.log('owner.id:', owner.id);
|
|
172
165
|
var state = SharedTransition.getState(owner.id);
|
|
173
166
|
if (!state) {
|
|
174
167
|
return;
|
|
175
168
|
}
|
|
176
|
-
SharedTransitionHelper.animate(state, transitionContext,
|
|
169
|
+
SharedTransitionHelper.animate(state, transitionContext, "modal");
|
|
177
170
|
}
|
|
178
171
|
};
|
|
179
172
|
ModalTransitionController.ObjCProtocols = [UIViewControllerAnimatedTransitioning];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modal-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/modal-transition.ios.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AAC1G,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAqD,MAAM,GAAG,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAuB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAe9C,sBAAsB,CAAC,SAA2B,EAAE,UAA4B,EAAE,MAAwB;QACzG,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,yCAAyC;QACzC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,sBAAsB,CAAC,SAA2B;QACjD,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,qBAAqB,CAAC,QAA+C;QACpE,8CAA8C;QAC9C,IAAI,CAAC,qBAAqB,GAAG,4BAA4B,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,uBAAuB,CAAC,QAA+C;QACtE,gDAAgD;QAChD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,uBAAuB,CAAC,aAAyB,EAAE,IAAU;QAC5D,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC;QAC/C,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAChD,sGAAsG;QACtG,yHAAyH;QACzH,2CAA2C;QAC3C,wDAAwD;IACzD,CAAC;IAEO,iCAAiC,CAAC,IAAyB;QAClE,IAAI,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnK,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC;YACD,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,iBAAiB,CAAC,KAAK;oBAC3B,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE;wBACrC,gBAAgB,EAAE,IAAI;wBACtB,oBAAoB,EAAE,KAAK;qBAC3B,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;wBACpC,IAAI,CAAC,yBAAyB,EAAE,CAAC;oBAClC,CAAC;oBACD,MAAM;gBACP,KAAK,iBAAiB,CAAC,OAAO;oBAC7B,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;wBACjB,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;4BAChC,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;wBACjE,CAAC;oBACF,CAAC;oBACD,MAAM;gBACP,KAAK,iBAAiB,CAAC,SAAS,CAAC;gBACjC,KAAK,iBAAiB,CAAC,KAAK;oBAC3B,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;wBAChC,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC;wBAChI,IAAI,OAAO,GAAG,eAAe,EAAE,CAAC;4BAC/B,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,EAAE,CAAC;wBAC1D,CAAC;6BAAM,CAAC;4BACP,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE;gCACrC,oBAAoB,EAAE,IAAI;6BAC1B,CAAC,CAAC;4BACH,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,EAAE,CAAC;wBAC1D,CAAC;oBACF,CAAC;oBACD,MAAM;YACR,CAAC;QACF,CAAC;IACF,CAAC;CACD"}
|
|
1
|
+
{"version":3,"file":"modal-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/modal-transition.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { ContentView } from '../content-view';
|
|
|
6
6
|
import { GridLayout } from '../layouts/grid-layout';
|
|
7
7
|
import { Screen } from '../../platform/screen';
|
|
8
8
|
import { android as androidUtils } from '../../utils/native-helper';
|
|
9
|
-
var SnapshotViewGroup =
|
|
9
|
+
var SnapshotViewGroup = (function (_super) {
|
|
10
10
|
__extends(SnapshotViewGroup, _super);
|
|
11
11
|
function SnapshotViewGroup(context) {
|
|
12
12
|
var _this = _super.call(this, context) || this;
|
|
@@ -16,7 +16,6 @@ var SnapshotViewGroup = /** @class */ (function (_super) {
|
|
|
16
16
|
this.setMeasuredDimension(0, 0);
|
|
17
17
|
};
|
|
18
18
|
SnapshotViewGroup.prototype.onLayout = function () {
|
|
19
|
-
//
|
|
20
19
|
};
|
|
21
20
|
return SnapshotViewGroup;
|
|
22
21
|
}(android.view.ViewGroup));
|
|
@@ -25,16 +24,12 @@ class ContentViewSnapshot extends ContentView {
|
|
|
25
24
|
return new SnapshotViewGroup(this._context);
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
|
-
var CustomSpringInterpolator =
|
|
27
|
+
var CustomSpringInterpolator = (function (_super) {
|
|
29
28
|
__extends(CustomSpringInterpolator, _super);
|
|
30
29
|
function CustomSpringInterpolator() {
|
|
31
30
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
32
31
|
}
|
|
33
32
|
CustomSpringInterpolator.prototype.getInterpolation = function (input) {
|
|
34
|
-
// Note: we speed up the interpolation by 10% to fix the issue with the transition not being finished
|
|
35
|
-
// and the views shifting from their intended final position...
|
|
36
|
-
// this is really just a workaround and should be fixed properly once we
|
|
37
|
-
// can figure out the root cause of the issue.
|
|
38
33
|
var res = _super.prototype.getInterpolation.call(this, input) * 1.1;
|
|
39
34
|
if (res > 1) {
|
|
40
35
|
return float(1);
|
|
@@ -43,16 +38,12 @@ var CustomSpringInterpolator = /** @class */ (function (_super) {
|
|
|
43
38
|
};
|
|
44
39
|
return CustomSpringInterpolator;
|
|
45
40
|
}(android.view.animation.AnticipateOvershootInterpolator));
|
|
46
|
-
var CustomLinearInterpolator =
|
|
41
|
+
var CustomLinearInterpolator = (function (_super) {
|
|
47
42
|
__extends(CustomLinearInterpolator, _super);
|
|
48
43
|
function CustomLinearInterpolator() {
|
|
49
44
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
50
45
|
}
|
|
51
46
|
CustomLinearInterpolator.prototype.getInterpolation = function (input) {
|
|
52
|
-
// Note: we speed up the interpolation by 10% to fix the issue with the transition not being finished
|
|
53
|
-
// and the views shifting from their intended final position...
|
|
54
|
-
// this is really just a workaround and should be fixed properly once we
|
|
55
|
-
// can figure out the root cause of the issue.
|
|
56
47
|
var res = _super.prototype.getInterpolation.call(this, input) * 1.1;
|
|
57
48
|
if (res > 1) {
|
|
58
49
|
return float(1);
|
|
@@ -242,9 +233,23 @@ export class PageTransition extends Transition {
|
|
|
242
233
|
newFragment.postponeEnterTransition();
|
|
243
234
|
newFragment.setSharedElementEnterTransition(transitionSet);
|
|
244
235
|
newFragment.setSharedElementReturnTransition(transitionSet);
|
|
236
|
+
// Guard against duplicate shared element names being added to the same transaction
|
|
237
|
+
const addedSharedElementNames = new Set();
|
|
245
238
|
presenting.forEach((v) => {
|
|
239
|
+
const name = v?.sharedTransitionTag;
|
|
240
|
+
const nativeView = v?.nativeView;
|
|
241
|
+
if (!name || !nativeView || addedSharedElementNames.has(name)) {
|
|
242
|
+
// prevent duplicates or invalid items
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
246
245
|
setTransitionName(v);
|
|
247
|
-
|
|
246
|
+
try {
|
|
247
|
+
fragmentTransaction.addSharedElement(nativeView, name);
|
|
248
|
+
addedSharedElementNames.add(name);
|
|
249
|
+
}
|
|
250
|
+
catch (err) {
|
|
251
|
+
// ignore duplicates or issues adding shared element to avoid crashing
|
|
252
|
+
}
|
|
248
253
|
});
|
|
249
254
|
if (toPage.isLoaded) {
|
|
250
255
|
onPageLoaded();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-transition.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.android.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,6BAA6B,EAA6B,MAAM,qBAAqB,CAAC;AACnI,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,2BAA2B,CAAC
|
|
1
|
+
{"version":3,"file":"page-transition.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.android.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,7 +95,7 @@ export class PageTransition extends Transition {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
|
-
var PercentInteractiveController =
|
|
98
|
+
var PercentInteractiveController = (function (_super) {
|
|
99
99
|
__extends(PercentInteractiveController, _super);
|
|
100
100
|
function PercentInteractiveController() {
|
|
101
101
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -107,7 +107,6 @@ var PercentInteractiveController = /** @class */ (function (_super) {
|
|
|
107
107
|
};
|
|
108
108
|
PercentInteractiveController.prototype.startInteractiveTransition = function (transitionContext) {
|
|
109
109
|
var _a;
|
|
110
|
-
// console.log('startInteractiveTransition');
|
|
111
110
|
if (!this.interactiveState) {
|
|
112
111
|
this.interactiveState = {
|
|
113
112
|
transitionContext: transitionContext,
|
|
@@ -115,7 +114,7 @@ var PercentInteractiveController = /** @class */ (function (_super) {
|
|
|
115
114
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
116
115
|
if (owner) {
|
|
117
116
|
var state = SharedTransition.getState(owner.id);
|
|
118
|
-
SharedTransitionHelper.interactiveStart(state, this.interactiveState,
|
|
117
|
+
SharedTransitionHelper.interactiveStart(state, this.interactiveState, "page");
|
|
119
118
|
}
|
|
120
119
|
}
|
|
121
120
|
};
|
|
@@ -124,31 +123,29 @@ var PercentInteractiveController = /** @class */ (function (_super) {
|
|
|
124
123
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
125
124
|
if (owner) {
|
|
126
125
|
var state = SharedTransition.getState(owner.id);
|
|
127
|
-
SharedTransitionHelper.interactiveUpdate(state, this.interactiveState,
|
|
126
|
+
SharedTransitionHelper.interactiveUpdate(state, this.interactiveState, "page", percentComplete);
|
|
128
127
|
}
|
|
129
128
|
};
|
|
130
129
|
PercentInteractiveController.prototype.cancelInteractiveTransition = function () {
|
|
131
130
|
var _a;
|
|
132
|
-
// console.log('cancelInteractiveTransition');
|
|
133
131
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
134
132
|
if (owner) {
|
|
135
133
|
var state = SharedTransition.getState(owner.id);
|
|
136
|
-
SharedTransitionHelper.interactiveCancel(state, this.interactiveState,
|
|
134
|
+
SharedTransitionHelper.interactiveCancel(state, this.interactiveState, "page");
|
|
137
135
|
}
|
|
138
136
|
};
|
|
139
137
|
PercentInteractiveController.prototype.finishInteractiveTransition = function () {
|
|
140
138
|
var _a;
|
|
141
|
-
// console.log('finishInteractiveTransition');
|
|
142
139
|
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
143
140
|
if (owner) {
|
|
144
141
|
var state = SharedTransition.getState(owner.id);
|
|
145
|
-
SharedTransitionHelper.interactiveFinish(state, this.interactiveState,
|
|
142
|
+
SharedTransitionHelper.interactiveFinish(state, this.interactiveState, "page");
|
|
146
143
|
}
|
|
147
144
|
};
|
|
148
145
|
PercentInteractiveController.ObjCProtocols = [UIViewControllerInteractiveTransitioning];
|
|
149
146
|
return PercentInteractiveController;
|
|
150
147
|
}(UIPercentDrivenInteractiveTransition));
|
|
151
|
-
var PageTransitionController =
|
|
148
|
+
var PageTransitionController = (function (_super) {
|
|
152
149
|
__extends(PageTransitionController, _super);
|
|
153
150
|
function PageTransitionController() {
|
|
154
151
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -164,20 +161,18 @@ var PageTransitionController = /** @class */ (function (_super) {
|
|
|
164
161
|
if (owner) {
|
|
165
162
|
var state = SharedTransition.getState(owner.id);
|
|
166
163
|
switch (state === null || state === void 0 ? void 0 : state.activeType) {
|
|
167
|
-
case SharedTransitionAnimationType.present:
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
return getDurationWithDampingFromSpring((_f = state.pageReturn) === null || _f === void 0 ? void 0 : _f.spring).duration;
|
|
180
|
-
}
|
|
164
|
+
case SharedTransitionAnimationType.present: if (isNumber((_a = state === null || state === void 0 ? void 0 : state.pageEnd) === null || _a === void 0 ? void 0 : _a.duration)) {
|
|
165
|
+
return ((_b = state.pageEnd) === null || _b === void 0 ? void 0 : _b.duration) / 1000;
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
return getDurationWithDampingFromSpring((_c = state.pageEnd) === null || _c === void 0 ? void 0 : _c.spring).duration;
|
|
169
|
+
}
|
|
170
|
+
case SharedTransitionAnimationType.dismiss: if (isNumber((_d = state === null || state === void 0 ? void 0 : state.pageReturn) === null || _d === void 0 ? void 0 : _d.duration)) {
|
|
171
|
+
return ((_e = state.pageReturn) === null || _e === void 0 ? void 0 : _e.duration) / 1000;
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
return getDurationWithDampingFromSpring((_f = state.pageReturn) === null || _f === void 0 ? void 0 : _f.spring).duration;
|
|
175
|
+
}
|
|
181
176
|
}
|
|
182
177
|
}
|
|
183
178
|
return CORE_ANIMATION_DEFAULTS.duration;
|
|
@@ -185,12 +180,11 @@ var PageTransitionController = /** @class */ (function (_super) {
|
|
|
185
180
|
PageTransitionController.prototype.animateTransition = function (transitionContext) {
|
|
186
181
|
var owner = this.owner.deref();
|
|
187
182
|
if (owner) {
|
|
188
|
-
// console.log('--- PageTransitionController animateTransition');
|
|
189
183
|
var state = SharedTransition.getState(owner.id);
|
|
190
184
|
if (!state) {
|
|
191
185
|
return;
|
|
192
186
|
}
|
|
193
|
-
SharedTransitionHelper.animate(state, transitionContext,
|
|
187
|
+
SharedTransitionHelper.animate(state, transitionContext, "page");
|
|
194
188
|
}
|
|
195
189
|
};
|
|
196
190
|
PageTransitionController.ObjCProtocols = [UIViewControllerAnimatedTransitioning];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"AACA,OAAO,EAAqD,UAAU,EAAE,MAAM,GAAG,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AAC1G,OAAO,EAAuB,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,MAAM,OAAO,cAAe,SAAQ,UAAU;IAiB7C,sBAAsB,CAAC,oBAA4C,EAAE,SAAiB,EAAE,MAAwB,EAAE,IAAsB;QACvI,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,oBAAoB,GAAG,wBAAwB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtF,sEAAsE;QAEtE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;IAED,qBAAqB,CAAC,QAA+C;QACpE,8CAA8C;QAC9C,IAAI,CAAC,qBAAqB,GAAG,4BAA4B,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,uBAAuB,CAAC,aAAyB,EAAE,IAAU;QAC5D,iDAAiD;QACjD,IAAI,CAAC,yBAAyB,GAAG,aAAa,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;YACtC,gDAAgD;YAChD,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACjD,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrF,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEhD,IAAI,CAAC,2BAA2B,GAAG,GAAG,EAAE;YACvC,yDAAyD;YACzD,IAAI,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAClD,CAAC;YACD,IAAI,CAAC,0BAA0B,GAAG,IAAI,CAAC;QACxC,CAAC,CAAC;QACF,OAAO,IAAI,CAAC,2BAA2B,CAAC;IACzC,CAAC;IAEO,iCAAiC,CAAC,IAAyB;QAClE,IAAI,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;YACrB,oCAAoC;YACpC,MAAM,KAAK,GAAG,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,qCAAqC;gBACrC,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,OAAO;YACR,CAAC;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YAClK,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC;YACD,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,KAAK,iBAAiB,CAAC,KAAK;oBAC3B,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE;wBACrC,gBAAgB,EAAE,IAAI;wBACtB,oBAAoB,EAAE,KAAK;qBAC3B,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;wBACpC,IAAI,CAAC,yBAAyB,EAAE,CAAC;oBAClC,CAAC;oBACD,MAAM;gBACP,KAAK,iBAAiB,CAAC,OAAO;oBAC7B,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;wBACjB,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;4BAChC,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;wBACjE,CAAC;oBACF,CAAC;oBACD,MAAM;gBACP,KAAK,iBAAiB,CAAC,SAAS,CAAC;gBACjC,KAAK,iBAAiB,CAAC,KAAK;oBAC3B,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;wBAChC,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC;wBAChI,IAAI,OAAO,GAAG,eAAe,EAAE,CAAC;4BAC/B,IAAI,CAAC,gBAAgB,EAAE,CAAC;4BACxB,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,EAAE,CAAC;wBAC1D,CAAC;6BAAM,CAAC;4BACP,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE;gCACrC,oBAAoB,EAAE,IAAI;6BAC1B,CAAC,CAAC;4BACH,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,EAAE,CAAC;wBAC1D,CAAC;oBACF,CAAC;oBACD,MAAM;YACR,CAAC;QACF,CAAC;IACF,CAAC;IAEO,gBAAgB;QACvB,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACtC,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACnC,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC;QACzC,CAAC;IACF,CAAC;CACD"}
|
|
1
|
+
{"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export class SlideTransition extends Transition {
|
|
|
15
15
|
return this.transitionController;
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
|
-
var SlideTransitionController =
|
|
18
|
+
var SlideTransitionController = (function (_super) {
|
|
19
19
|
__extends(SlideTransitionController, _super);
|
|
20
20
|
function SlideTransitionController() {
|
|
21
21
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -33,7 +33,6 @@ var SlideTransitionController = /** @class */ (function (_super) {
|
|
|
33
33
|
return CORE_ANIMATION_DEFAULTS.duration;
|
|
34
34
|
};
|
|
35
35
|
SlideTransitionController.prototype.animateTransition = function (transitionContext) {
|
|
36
|
-
// console.log('SlideTransitionController animateTransition');
|
|
37
36
|
var owner = this.owner.deref();
|
|
38
37
|
if (owner) {
|
|
39
38
|
var toView_1 = owner.presented.view;
|
|
@@ -48,19 +47,19 @@ var SlideTransitionController = /** @class */ (function (_super) {
|
|
|
48
47
|
var topEdge = CGAffineTransformMakeTranslation(0, -Screen.mainScreen.heightDIPs);
|
|
49
48
|
var bottomEdge = CGAffineTransformMakeTranslation(0, Screen.mainScreen.heightDIPs);
|
|
50
49
|
switch (owner.direction) {
|
|
51
|
-
case
|
|
50
|
+
case "left":
|
|
52
51
|
toViewBeginTransform = push ? rightEdge : leftEdge;
|
|
53
52
|
fromViewEndTransform_1 = push ? leftEdge : rightEdge;
|
|
54
53
|
break;
|
|
55
|
-
case
|
|
54
|
+
case "right":
|
|
56
55
|
toViewBeginTransform = push ? leftEdge : rightEdge;
|
|
57
56
|
fromViewEndTransform_1 = push ? rightEdge : leftEdge;
|
|
58
57
|
break;
|
|
59
|
-
case
|
|
58
|
+
case "top":
|
|
60
59
|
toViewBeginTransform = push ? bottomEdge : topEdge;
|
|
61
60
|
fromViewEndTransform_1 = push ? topEdge : bottomEdge;
|
|
62
61
|
break;
|
|
63
|
-
case
|
|
62
|
+
case "bottom":
|
|
64
63
|
toViewBeginTransform = push ? topEdge : bottomEdge;
|
|
65
64
|
fromViewEndTransform_1 = push ? bottomEdge : topEdge;
|
|
66
65
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slide-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/slide-transition.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAO9C,YAAY,SAAiB,EAAE,QAAgB,EAAE,KAAU;QAC1D,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,sBAAsB,CAAC,oBAA4C,EAAE,SAAiB,EAAE,MAAwB,EAAE,IAAsB;QACvI,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,yCAAyC;QACzC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;CACD"}
|
|
1
|
+
{"version":3,"file":"slide-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/slide-transition.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAO9C,YAAY,SAAiB,EAAE,QAAgB,EAAE,KAAU;QAC1D,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,sBAAsB,CAAC,oBAA4C,EAAE,SAAiB,EAAE,MAAwB,EAAE,IAAsB;QACvI,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,yCAAyC;QACzC,OAAO,IAAI,CAAC,oBAAoB,CAAC;IAClC,CAAC;CACD;;;;;IAnB2B,CAAC;;;;;IAMmB,CAAC;;;;;QAK2E,CAAC;;IAC1H,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAgDoB,CAAC;;;;;;;;;;YAiBrB,CAAC;;;;;;;YAQqD,CAAC;;;;YAUtD,CAAC;QAAU,CAAC;IAAS,CAAC;;;AAIH,CAAC"}
|
|
@@ -8,81 +8,77 @@ function initializeWebViewClient() {
|
|
|
8
8
|
if (WebViewClient) {
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
|
-
var WebViewClientImpl =
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (Trace.isEnabled()) {
|
|
21
|
-
Trace.write('WebViewClientClass.shouldOverrideUrlLoading(' + url + ')', Trace.categories.Debug);
|
|
22
|
-
}
|
|
23
|
-
// Handle schemes like mailto, tel, etc
|
|
24
|
-
if (!android.webkit.URLUtil.isNetworkUrl(url)) {
|
|
25
|
-
return openUrl(url);
|
|
26
|
-
}
|
|
27
|
-
return false;
|
|
28
|
-
};
|
|
29
|
-
WebViewClientImpl.prototype.onPageStarted = function (view, url, favicon) {
|
|
30
|
-
_super.prototype.onPageStarted.call(this, view, url, favicon);
|
|
31
|
-
var owner = this.owner;
|
|
32
|
-
if (owner) {
|
|
11
|
+
var WebViewClientImpl = (function (_super) {
|
|
12
|
+
__extends(WebViewClientImpl, _super);
|
|
13
|
+
function WebViewClientImpl(owner) {
|
|
14
|
+
var _this = _super.call(this) || this;
|
|
15
|
+
_this.owner = owner;
|
|
16
|
+
return global.__native(_this);
|
|
17
|
+
}
|
|
18
|
+
WebViewClientImpl.prototype.shouldOverrideUrlLoading = function (view, target) {
|
|
19
|
+
var url = target instanceof android.webkit.WebResourceRequest ? target.getUrl().toString() : target;
|
|
33
20
|
if (Trace.isEnabled()) {
|
|
34
|
-
Trace.write(
|
|
21
|
+
Trace.write("WebViewClientClass.shouldOverrideUrlLoading(" + url + ")", Trace.categories.Debug);
|
|
35
22
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
};
|
|
39
|
-
WebViewClientImpl.prototype.onPageFinished = function (view, url) {
|
|
40
|
-
_super.prototype.onPageFinished.call(this, view, url);
|
|
41
|
-
var owner = this.owner;
|
|
42
|
-
if (owner) {
|
|
43
|
-
if (Trace.isEnabled()) {
|
|
44
|
-
Trace.write('WebViewClientClass.onPageFinished(' + url + ')', Trace.categories.Debug);
|
|
23
|
+
if (!android.webkit.URLUtil.isNetworkUrl(url)) {
|
|
24
|
+
return openUrl(url);
|
|
45
25
|
}
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
var args = [];
|
|
51
|
-
for (var _i = 0; _i < arguments.length; _i++) {
|
|
52
|
-
args[_i] = arguments[_i];
|
|
53
|
-
}
|
|
54
|
-
var view = args[0];
|
|
55
|
-
if (arguments.length === 4) {
|
|
56
|
-
var errorCode = args[1];
|
|
57
|
-
var description = args[2];
|
|
58
|
-
var failingUrl = args[3];
|
|
59
|
-
_super.prototype.onReceivedError.call(this, view, errorCode, description, failingUrl);
|
|
26
|
+
return false;
|
|
27
|
+
};
|
|
28
|
+
WebViewClientImpl.prototype.onPageStarted = function (view, url, favicon) {
|
|
29
|
+
_super.prototype.onPageStarted.call(this, view, url, favicon);
|
|
60
30
|
var owner = this.owner;
|
|
61
31
|
if (owner) {
|
|
62
32
|
if (Trace.isEnabled()) {
|
|
63
|
-
Trace.write(
|
|
33
|
+
Trace.write("WebViewClientClass.onPageStarted(" + url + ", " + favicon + ")", Trace.categories.Debug);
|
|
64
34
|
}
|
|
65
|
-
owner.
|
|
35
|
+
owner._onLoadStarted(url, undefined);
|
|
66
36
|
}
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
var error = args[2];
|
|
71
|
-
// before API version 23 there's no onReceiveError with 3 parameters, so it shouldn't come here
|
|
72
|
-
// but we don't have the onReceivedError with 3 parameters there and that's why we are ignorint tye typescript error
|
|
73
|
-
// @ts-ignore TS2554
|
|
74
|
-
_super.prototype.onReceivedError.call(this, view, request, error);
|
|
37
|
+
};
|
|
38
|
+
WebViewClientImpl.prototype.onPageFinished = function (view, url) {
|
|
39
|
+
_super.prototype.onPageFinished.call(this, view, url);
|
|
75
40
|
var owner = this.owner;
|
|
76
41
|
if (owner) {
|
|
77
42
|
if (Trace.isEnabled()) {
|
|
78
|
-
Trace.write(
|
|
43
|
+
Trace.write("WebViewClientClass.onPageFinished(" + url + ")", Trace.categories.Debug);
|
|
79
44
|
}
|
|
80
|
-
owner._onLoadFinished(
|
|
45
|
+
owner._onLoadFinished(url, undefined);
|
|
81
46
|
}
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
47
|
+
};
|
|
48
|
+
WebViewClientImpl.prototype.onReceivedError = function () {
|
|
49
|
+
var args = [];
|
|
50
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
51
|
+
args[_i] = arguments[_i];
|
|
52
|
+
}
|
|
53
|
+
var view = args[0];
|
|
54
|
+
if (arguments.length === 4) {
|
|
55
|
+
var errorCode = args[1];
|
|
56
|
+
var description = args[2];
|
|
57
|
+
var failingUrl = args[3];
|
|
58
|
+
_super.prototype.onReceivedError.call(this, view, errorCode, description, failingUrl);
|
|
59
|
+
var owner = this.owner;
|
|
60
|
+
if (owner) {
|
|
61
|
+
if (Trace.isEnabled()) {
|
|
62
|
+
Trace.write("WebViewClientClass.onReceivedError(" + errorCode + ", " + description + ", " + failingUrl + ")", Trace.categories.Debug);
|
|
63
|
+
}
|
|
64
|
+
owner._onLoadFinished(failingUrl, description + "(" + errorCode + ")");
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
var request = args[1];
|
|
69
|
+
var error = args[2];
|
|
70
|
+
_super.prototype.onReceivedError.call(this, view, request, error);
|
|
71
|
+
var owner = this.owner;
|
|
72
|
+
if (owner) {
|
|
73
|
+
if (Trace.isEnabled()) {
|
|
74
|
+
Trace.write("WebViewClientClass.onReceivedError(" + error.getErrorCode() + ", " + error.getDescription() + ", " + (error.getUrl && error.getUrl()) + ")", Trace.categories.Debug);
|
|
75
|
+
}
|
|
76
|
+
owner._onLoadFinished(error.getUrl && error.getUrl(), error.getDescription() + "(" + error.getErrorCode() + ")");
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
return WebViewClientImpl;
|
|
81
|
+
}(android.webkit.WebViewClient));
|
|
86
82
|
WebViewClient = WebViewClientImpl;
|
|
87
83
|
}
|
|
88
84
|
export class WebView extends WebViewBase {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/web-view/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,cAAc,mBAAmB,CAAC;AAElC,IAAI,aAA4B,CAAC;AAEjC,SAAS,uBAAuB;IAC/B,IAAI,aAAa,EAAE,CAAC;QACnB,OAAO;IACR,CAAC
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/web-view/index.android.ts"],"names":[],"mappings":"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"}
|