@nativescript/core 8.7.0-alpha.7 → 8.7.0-beta.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/accessibility/accessibility-properties.js +1 -0
- package/accessibility/accessibility-properties.js.map +1 -1
- package/accessibility/index.android.js +89 -88
- package/accessibility/index.android.js.map +1 -1
- package/application/application-interfaces.d.ts +1 -1
- package/application/application.android.js +174 -180
- package/application/application.android.js.map +1 -1
- package/application/application.ios.js +40 -49
- package/application/application.ios.js.map +1 -1
- package/connectivity/index.android.js +20 -22
- package/connectivity/index.android.js.map +1 -1
- package/fps-meter/fps-native.ios.js +15 -17
- package/fps-meter/fps-native.ios.js.map +1 -1
- package/http/http-request/index.ios.js +8 -10
- package/http/http-request/index.ios.js.map +1 -1
- package/package.json +1 -1
- package/platform/index.ios.js +1 -1
- package/platform/index.ios.js.map +1 -1
- package/platforms/ios/src/NativeScriptMainWindow.swift +74 -57
- package/timer/index.ios.js +17 -18
- package/timer/index.ios.js.map +1 -1
- package/ui/action-bar/index.android.js +12 -14
- package/ui/action-bar/index.android.js.map +1 -1
- package/ui/action-bar/index.ios.js +15 -17
- package/ui/action-bar/index.ios.js.map +1 -1
- package/ui/animation/index.ios.js +20 -21
- package/ui/animation/index.ios.js.map +1 -1
- package/ui/button/button-common.d.ts +0 -1
- package/ui/button/button-common.js +0 -1
- package/ui/button/button-common.js.map +1 -1
- package/ui/button/index.android.js +13 -15
- package/ui/button/index.android.js.map +1 -1
- package/ui/button/index.ios.js +15 -17
- package/ui/button/index.ios.js.map +1 -1
- package/ui/core/control-state-change/index.ios.js +7 -9
- package/ui/core/control-state-change/index.ios.js.map +1 -1
- package/ui/core/view/index.android.d.ts +1 -0
- package/ui/core/view/index.android.js +178 -169
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.d.ts +0 -5
- package/ui/core/view/index.ios.js +36 -34
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.js +4 -2
- package/ui/core/view/view-common.js.map +1 -1
- package/ui/core/view/view-helper/index.ios.js +60 -71
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/core/view-base/index.js +0 -2
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/date-picker/index.android.js +31 -33
- package/ui/date-picker/index.android.js.map +1 -1
- package/ui/date-picker/index.ios.js +17 -19
- package/ui/date-picker/index.ios.js.map +1 -1
- package/ui/editable-text-base/index.android.js +23 -30
- package/ui/editable-text-base/index.android.js.map +1 -1
- package/ui/frame/fragment.transitions.android.js +90 -95
- package/ui/frame/fragment.transitions.android.js.map +1 -1
- package/ui/frame/index.ios.js +147 -168
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/gestures/index.android.js +127 -121
- package/ui/gestures/index.android.js.map +1 -1
- package/ui/gestures/index.ios.js +47 -53
- package/ui/gestures/index.ios.js.map +1 -1
- package/ui/gestures/touch-manager.js +29 -32
- package/ui/gestures/touch-manager.js.map +1 -1
- package/ui/image/index.android.js +13 -15
- package/ui/image/index.android.js.map +1 -1
- package/ui/image-cache/index.android.js +15 -13
- package/ui/image-cache/index.android.js.map +1 -1
- package/ui/image-cache/index.ios.js +17 -19
- package/ui/image-cache/index.ios.js.map +1 -1
- package/ui/list-picker/index.android.js +23 -27
- package/ui/list-picker/index.android.js.map +1 -1
- package/ui/list-picker/index.ios.js +32 -39
- package/ui/list-picker/index.ios.js.map +1 -1
- package/ui/list-view/index.android.js +109 -110
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.ios.js +84 -103
- package/ui/list-view/index.ios.js.map +1 -1
- package/ui/page/index.ios.js +119 -137
- package/ui/page/index.ios.js.map +1 -1
- package/ui/scroll-view/index.ios.js +13 -15
- package/ui/scroll-view/index.ios.js.map +1 -1
- package/ui/search-bar/index.android.js +40 -44
- package/ui/search-bar/index.android.js.map +1 -1
- package/ui/search-bar/index.ios.js +27 -33
- package/ui/search-bar/index.ios.js.map +1 -1
- package/ui/segmented-bar/index.android.js +47 -49
- package/ui/segmented-bar/index.android.js.map +1 -1
- package/ui/segmented-bar/index.ios.js +15 -17
- package/ui/segmented-bar/index.ios.js.map +1 -1
- package/ui/slider/index.android.js +24 -25
- package/ui/slider/index.android.js.map +1 -1
- package/ui/slider/index.ios.js +31 -37
- package/ui/slider/index.ios.js.map +1 -1
- package/ui/slider/slider-common.d.ts +0 -1
- package/ui/slider/slider-common.js +0 -1
- package/ui/slider/slider-common.js.map +1 -1
- package/ui/switch/index.android.js +12 -14
- package/ui/switch/index.android.js.map +1 -1
- package/ui/switch/index.ios.js +15 -17
- package/ui/switch/index.ios.js.map +1 -1
- package/ui/tab-view/index.android.js +173 -168
- package/ui/tab-view/index.android.js.map +1 -1
- package/ui/tab-view/index.ios.js +74 -88
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/text-base/index.android.js +82 -82
- package/ui/text-base/index.android.js.map +1 -1
- package/ui/text-base/index.ios.js +32 -34
- package/ui/text-base/index.ios.js.map +1 -1
- package/ui/text-field/index.ios.js +48 -57
- package/ui/text-field/index.ios.js.map +1 -1
- package/ui/text-view/index.ios.js +35 -45
- package/ui/text-view/index.ios.js.map +1 -1
- package/ui/time-picker/index.android.js +15 -17
- package/ui/time-picker/index.android.js.map +1 -1
- package/ui/time-picker/index.ios.js +17 -19
- package/ui/time-picker/index.ios.js.map +1 -1
- package/ui/transition/fade-transition.ios.js +35 -36
- package/ui/transition/fade-transition.ios.js.map +1 -1
- package/ui/transition/modal-transition.ios.js +50 -58
- package/ui/transition/modal-transition.ios.js.map +1 -1
- package/ui/transition/page-transition.android.js +29 -30
- package/ui/transition/page-transition.android.js.map +1 -1
- package/ui/transition/page-transition.ios.js +50 -58
- package/ui/transition/page-transition.ios.js.map +1 -1
- package/ui/transition/slide-transition.ios.js +46 -47
- package/ui/transition/slide-transition.ios.js.map +1 -1
- package/ui/web-view/index.android.js +58 -60
- package/ui/web-view/index.android.js.map +1 -1
- package/ui/web-view/index.ios.js +64 -79
- package/ui/web-view/index.ios.js.map +1 -1
- package/utils/ios/index.js +17 -19
- package/utils/ios/index.js.map +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
var PercentInteractiveController_1, PageTransitionController_1;
|
|
1
2
|
import { Transition } from '.';
|
|
2
3
|
import { isNumber } from '../../utils/types';
|
|
3
4
|
import { CORE_ANIMATION_DEFAULTS, getDurationWithDampingFromSpring } from '../../utils/common';
|
|
@@ -95,105 +96,96 @@ export class PageTransition extends Transition {
|
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
102
|
-
}
|
|
103
|
-
PercentInteractiveController.initWithOwner = function (owner) {
|
|
104
|
-
var ctrl = PercentInteractiveController.new();
|
|
99
|
+
let PercentInteractiveController = PercentInteractiveController_1 = class PercentInteractiveController extends UIPercentDrivenInteractiveTransition {
|
|
100
|
+
static initWithOwner(owner) {
|
|
101
|
+
const ctrl = PercentInteractiveController_1.new();
|
|
105
102
|
ctrl.owner = owner;
|
|
106
103
|
return ctrl;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
var _a;
|
|
104
|
+
}
|
|
105
|
+
startInteractiveTransition(transitionContext) {
|
|
110
106
|
// console.log('startInteractiveTransition');
|
|
111
107
|
if (!this.interactiveState) {
|
|
112
108
|
this.interactiveState = {
|
|
113
|
-
transitionContext
|
|
109
|
+
transitionContext,
|
|
114
110
|
};
|
|
115
|
-
|
|
111
|
+
const owner = this.owner?.deref();
|
|
116
112
|
if (owner) {
|
|
117
|
-
|
|
113
|
+
const state = SharedTransition.getState(owner.id);
|
|
118
114
|
SharedTransitionHelper.interactiveStart(state, this.interactiveState, 'page');
|
|
119
115
|
}
|
|
120
116
|
}
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
var owner = (_a = this.owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
117
|
+
}
|
|
118
|
+
updateInteractiveTransition(percentComplete) {
|
|
119
|
+
const owner = this.owner?.deref();
|
|
125
120
|
if (owner) {
|
|
126
|
-
|
|
121
|
+
const state = SharedTransition.getState(owner.id);
|
|
127
122
|
SharedTransitionHelper.interactiveUpdate(state, this.interactiveState, 'page', percentComplete);
|
|
128
123
|
}
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
var _a;
|
|
124
|
+
}
|
|
125
|
+
cancelInteractiveTransition() {
|
|
132
126
|
// console.log('cancelInteractiveTransition');
|
|
133
|
-
|
|
127
|
+
const owner = this.owner?.deref();
|
|
134
128
|
if (owner) {
|
|
135
|
-
|
|
129
|
+
const state = SharedTransition.getState(owner.id);
|
|
136
130
|
SharedTransitionHelper.interactiveCancel(state, this.interactiveState, 'page');
|
|
137
131
|
}
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
var _a;
|
|
132
|
+
}
|
|
133
|
+
finishInteractiveTransition() {
|
|
141
134
|
// console.log('finishInteractiveTransition');
|
|
142
|
-
|
|
135
|
+
const owner = this.owner?.deref();
|
|
143
136
|
if (owner) {
|
|
144
|
-
|
|
137
|
+
const state = SharedTransition.getState(owner.id);
|
|
145
138
|
SharedTransitionHelper.interactiveFinish(state, this.interactiveState, 'page');
|
|
146
139
|
}
|
|
147
|
-
};
|
|
148
|
-
PercentInteractiveController.ObjCProtocols = [UIViewControllerInteractiveTransitioning];
|
|
149
|
-
return PercentInteractiveController;
|
|
150
|
-
}(UIPercentDrivenInteractiveTransition));
|
|
151
|
-
var PageTransitionController = /** @class */ (function (_super) {
|
|
152
|
-
__extends(PageTransitionController, _super);
|
|
153
|
-
function PageTransitionController() {
|
|
154
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
155
140
|
}
|
|
156
|
-
|
|
157
|
-
|
|
141
|
+
};
|
|
142
|
+
PercentInteractiveController.ObjCProtocols = [UIViewControllerInteractiveTransitioning];
|
|
143
|
+
PercentInteractiveController = PercentInteractiveController_1 = __decorate([
|
|
144
|
+
NativeClass()
|
|
145
|
+
], PercentInteractiveController);
|
|
146
|
+
let PageTransitionController = PageTransitionController_1 = class PageTransitionController extends NSObject {
|
|
147
|
+
static initWithOwner(owner) {
|
|
148
|
+
const ctrl = PageTransitionController_1.new();
|
|
158
149
|
ctrl.owner = owner;
|
|
159
150
|
return ctrl;
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
var owner = this.owner.deref();
|
|
151
|
+
}
|
|
152
|
+
transitionDuration(transitionContext) {
|
|
153
|
+
const owner = this.owner.deref();
|
|
164
154
|
if (owner) {
|
|
165
|
-
|
|
166
|
-
switch (state
|
|
155
|
+
const state = SharedTransition.getState(owner.id);
|
|
156
|
+
switch (state?.activeType) {
|
|
167
157
|
case SharedTransitionAnimationType.present:
|
|
168
|
-
if (isNumber(
|
|
169
|
-
return
|
|
158
|
+
if (isNumber(state?.pageEnd?.duration)) {
|
|
159
|
+
return state.pageEnd?.duration / 1000;
|
|
170
160
|
}
|
|
171
161
|
else {
|
|
172
|
-
return getDurationWithDampingFromSpring(
|
|
162
|
+
return getDurationWithDampingFromSpring(state.pageEnd?.spring).duration;
|
|
173
163
|
}
|
|
174
164
|
case SharedTransitionAnimationType.dismiss:
|
|
175
|
-
if (isNumber(
|
|
176
|
-
return
|
|
165
|
+
if (isNumber(state?.pageReturn?.duration)) {
|
|
166
|
+
return state.pageReturn?.duration / 1000;
|
|
177
167
|
}
|
|
178
168
|
else {
|
|
179
|
-
return getDurationWithDampingFromSpring(
|
|
169
|
+
return getDurationWithDampingFromSpring(state.pageReturn?.spring).duration;
|
|
180
170
|
}
|
|
181
171
|
}
|
|
182
172
|
}
|
|
183
173
|
return CORE_ANIMATION_DEFAULTS.duration;
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
|
|
174
|
+
}
|
|
175
|
+
animateTransition(transitionContext) {
|
|
176
|
+
const owner = this.owner.deref();
|
|
187
177
|
if (owner) {
|
|
188
178
|
// console.log('--- PageTransitionController animateTransition');
|
|
189
|
-
|
|
179
|
+
const state = SharedTransition.getState(owner.id);
|
|
190
180
|
if (!state) {
|
|
191
181
|
return;
|
|
192
182
|
}
|
|
193
183
|
SharedTransitionHelper.animate(state, transitionContext, 'page');
|
|
194
184
|
}
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
185
|
+
}
|
|
186
|
+
};
|
|
187
|
+
PageTransitionController.ObjCProtocols = [UIViewControllerAnimatedTransitioning];
|
|
188
|
+
PageTransitionController = PageTransitionController_1 = __decorate([
|
|
189
|
+
NativeClass()
|
|
190
|
+
], PageTransitionController);
|
|
199
191
|
//# sourceMappingURL=page-transition.ios.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"page-transition.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/transition/page-transition.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
var SlideTransitionController_1;
|
|
1
2
|
import { Transition } from '.';
|
|
2
3
|
import { Screen } from '../../platform';
|
|
3
4
|
import { CORE_ANIMATION_DEFAULTS } from '../../utils/common';
|
|
@@ -15,81 +16,79 @@ export class SlideTransition extends Transition {
|
|
|
15
16
|
return this.transitionController;
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
22
|
-
}
|
|
23
|
-
SlideTransitionController.initWithOwner = function (owner) {
|
|
24
|
-
var ctrl = SlideTransitionController.new();
|
|
19
|
+
let SlideTransitionController = SlideTransitionController_1 = class SlideTransitionController extends NSObject {
|
|
20
|
+
static initWithOwner(owner) {
|
|
21
|
+
const ctrl = SlideTransitionController_1.new();
|
|
25
22
|
ctrl.owner = owner;
|
|
26
23
|
return ctrl;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
}
|
|
25
|
+
transitionDuration(transitionContext) {
|
|
26
|
+
const owner = this.owner.deref();
|
|
30
27
|
if (owner) {
|
|
31
28
|
return owner.getDuration();
|
|
32
29
|
}
|
|
33
30
|
return CORE_ANIMATION_DEFAULTS.duration;
|
|
34
|
-
}
|
|
35
|
-
|
|
31
|
+
}
|
|
32
|
+
animateTransition(transitionContext) {
|
|
36
33
|
// console.log('SlideTransitionController animateTransition');
|
|
37
|
-
|
|
34
|
+
const owner = this.owner.deref();
|
|
38
35
|
if (owner) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
36
|
+
const toView = owner.presented.view;
|
|
37
|
+
const originalToViewTransform = toView.transform;
|
|
38
|
+
const fromView = owner.presenting.view;
|
|
39
|
+
const originalFromViewTransform = fromView.transform;
|
|
40
|
+
let fromViewEndTransform;
|
|
41
|
+
let toViewBeginTransform;
|
|
42
|
+
const push = owner.operation === 1 /* UINavigationControllerOperation.Push */;
|
|
43
|
+
const leftEdge = CGAffineTransformMakeTranslation(-Screen.mainScreen.widthDIPs, 0);
|
|
44
|
+
const rightEdge = CGAffineTransformMakeTranslation(Screen.mainScreen.widthDIPs, 0);
|
|
45
|
+
const topEdge = CGAffineTransformMakeTranslation(0, -Screen.mainScreen.heightDIPs);
|
|
46
|
+
const bottomEdge = CGAffineTransformMakeTranslation(0, Screen.mainScreen.heightDIPs);
|
|
50
47
|
switch (owner.direction) {
|
|
51
48
|
case 'left':
|
|
52
49
|
toViewBeginTransform = push ? rightEdge : leftEdge;
|
|
53
|
-
|
|
50
|
+
fromViewEndTransform = push ? leftEdge : rightEdge;
|
|
54
51
|
break;
|
|
55
52
|
case 'right':
|
|
56
53
|
toViewBeginTransform = push ? leftEdge : rightEdge;
|
|
57
|
-
|
|
54
|
+
fromViewEndTransform = push ? rightEdge : leftEdge;
|
|
58
55
|
break;
|
|
59
56
|
case 'top':
|
|
60
57
|
toViewBeginTransform = push ? bottomEdge : topEdge;
|
|
61
|
-
|
|
58
|
+
fromViewEndTransform = push ? topEdge : bottomEdge;
|
|
62
59
|
break;
|
|
63
60
|
case 'bottom':
|
|
64
61
|
toViewBeginTransform = push ? topEdge : bottomEdge;
|
|
65
|
-
|
|
62
|
+
fromViewEndTransform = push ? bottomEdge : topEdge;
|
|
66
63
|
break;
|
|
67
64
|
}
|
|
68
|
-
|
|
69
|
-
|
|
65
|
+
toView.transform = toViewBeginTransform;
|
|
66
|
+
fromView.transform = CGAffineTransformIdentity;
|
|
70
67
|
switch (owner.operation) {
|
|
71
|
-
case UINavigationControllerOperation.Push
|
|
72
|
-
transitionContext.containerView.insertSubviewAboveSubview(
|
|
68
|
+
case 1 /* UINavigationControllerOperation.Push */:
|
|
69
|
+
transitionContext.containerView.insertSubviewAboveSubview(toView, fromView);
|
|
73
70
|
break;
|
|
74
|
-
case UINavigationControllerOperation.Pop
|
|
75
|
-
transitionContext.containerView.insertSubviewBelowSubview(
|
|
71
|
+
case 2 /* UINavigationControllerOperation.Pop */:
|
|
72
|
+
transitionContext.containerView.insertSubviewBelowSubview(toView, fromView);
|
|
76
73
|
break;
|
|
77
74
|
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
UIView.animateWithDurationAnimationsCompletion(duration,
|
|
81
|
-
UIView.setAnimationCurve(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
},
|
|
85
|
-
|
|
86
|
-
|
|
75
|
+
const duration = owner.getDuration();
|
|
76
|
+
const curve = owner.getCurve();
|
|
77
|
+
UIView.animateWithDurationAnimationsCompletion(duration, () => {
|
|
78
|
+
UIView.setAnimationCurve(curve);
|
|
79
|
+
toView.transform = CGAffineTransformIdentity;
|
|
80
|
+
fromView.transform = fromViewEndTransform;
|
|
81
|
+
}, (finished) => {
|
|
82
|
+
toView.transform = originalToViewTransform;
|
|
83
|
+
fromView.transform = originalFromViewTransform;
|
|
87
84
|
transitionContext.completeTransition(finished);
|
|
88
85
|
});
|
|
89
86
|
}
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
SlideTransitionController.ObjCProtocols = [UIViewControllerAnimatedTransitioning];
|
|
90
|
+
SlideTransitionController = SlideTransitionController_1 = __decorate([
|
|
91
|
+
NativeClass()
|
|
92
|
+
], SlideTransitionController);
|
|
94
93
|
export { SlideTransitionController };
|
|
95
94
|
//# sourceMappingURL=slide-transition.ios.js.map
|
|
@@ -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,gBAAgB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,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":"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"}
|
|
@@ -8,81 +8,79 @@ function initializeWebViewClient() {
|
|
|
8
8
|
if (WebViewClient) {
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
var url = target instanceof android.webkit.WebResourceRequest ? target.getUrl().toString() : target;
|
|
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
|
+
let WebViewClientImpl = class WebViewClientImpl extends android.webkit.WebViewClient {
|
|
12
|
+
constructor(owner) {
|
|
13
|
+
super();
|
|
14
|
+
this.owner = owner;
|
|
15
|
+
return global.__native(this);
|
|
16
|
+
}
|
|
17
|
+
shouldOverrideUrlLoading(view, target) {
|
|
18
|
+
const url = target instanceof android.webkit.WebResourceRequest ? target.getUrl().toString() : target;
|
|
33
19
|
if (Trace.isEnabled()) {
|
|
34
|
-
Trace.write('WebViewClientClass.
|
|
20
|
+
Trace.write('WebViewClientClass.shouldOverrideUrlLoading(' + url + ')', Trace.categories.Debug);
|
|
35
21
|
}
|
|
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);
|
|
22
|
+
// Handle schemes like mailto, tel, etc
|
|
23
|
+
if (!android.webkit.URLUtil.isNetworkUrl(url)) {
|
|
24
|
+
return openUrl(url);
|
|
45
25
|
}
|
|
46
|
-
|
|
26
|
+
return false;
|
|
47
27
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
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);
|
|
60
|
-
var owner = this.owner;
|
|
28
|
+
onPageStarted(view, url, favicon) {
|
|
29
|
+
super.onPageStarted(view, url, favicon);
|
|
30
|
+
const owner = this.owner;
|
|
61
31
|
if (owner) {
|
|
62
32
|
if (Trace.isEnabled()) {
|
|
63
|
-
Trace.write('WebViewClientClass.
|
|
33
|
+
Trace.write('WebViewClientClass.onPageStarted(' + url + ', ' + favicon + ')', Trace.categories.Debug);
|
|
64
34
|
}
|
|
65
|
-
owner.
|
|
35
|
+
owner._onLoadStarted(url, undefined);
|
|
66
36
|
}
|
|
67
37
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
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);
|
|
75
|
-
var owner = this.owner;
|
|
38
|
+
onPageFinished(view, url) {
|
|
39
|
+
super.onPageFinished(view, url);
|
|
40
|
+
const owner = this.owner;
|
|
76
41
|
if (owner) {
|
|
77
42
|
if (Trace.isEnabled()) {
|
|
78
|
-
Trace.write('WebViewClientClass.
|
|
43
|
+
Trace.write('WebViewClientClass.onPageFinished(' + url + ')', Trace.categories.Debug);
|
|
44
|
+
}
|
|
45
|
+
owner._onLoadFinished(url, undefined);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
onReceivedError(...args) {
|
|
49
|
+
const view = args[0];
|
|
50
|
+
if (arguments.length === 4) {
|
|
51
|
+
const errorCode = args[1];
|
|
52
|
+
const description = args[2];
|
|
53
|
+
const failingUrl = args[3];
|
|
54
|
+
super.onReceivedError(view, errorCode, description, failingUrl);
|
|
55
|
+
const owner = this.owner;
|
|
56
|
+
if (owner) {
|
|
57
|
+
if (Trace.isEnabled()) {
|
|
58
|
+
Trace.write('WebViewClientClass.onReceivedError(' + errorCode + ', ' + description + ', ' + failingUrl + ')', Trace.categories.Debug);
|
|
59
|
+
}
|
|
60
|
+
owner._onLoadFinished(failingUrl, description + '(' + errorCode + ')');
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
const request = args[1];
|
|
65
|
+
const error = args[2];
|
|
66
|
+
// before API version 23 there's no onReceiveError with 3 parameters, so it shouldn't come here
|
|
67
|
+
// but we don't have the onReceivedError with 3 parameters there and that's why we are ignorint tye typescript error
|
|
68
|
+
// @ts-ignore TS2554
|
|
69
|
+
super.onReceivedError(view, request, error);
|
|
70
|
+
const owner = this.owner;
|
|
71
|
+
if (owner) {
|
|
72
|
+
if (Trace.isEnabled()) {
|
|
73
|
+
Trace.write('WebViewClientClass.onReceivedError(' + error.getErrorCode() + ', ' + error.getDescription() + ', ' + (error.getUrl && error.getUrl()) + ')', Trace.categories.Debug);
|
|
74
|
+
}
|
|
75
|
+
owner._onLoadFinished(error.getUrl && error.getUrl(), error.getDescription() + '(' + error.getErrorCode() + ')');
|
|
79
76
|
}
|
|
80
|
-
owner._onLoadFinished(error.getUrl && error.getUrl(), error.getDescription() + '(' + error.getErrorCode() + ')');
|
|
81
77
|
}
|
|
82
78
|
}
|
|
83
79
|
};
|
|
84
|
-
|
|
85
|
-
|
|
80
|
+
WebViewClientImpl = __decorate([
|
|
81
|
+
NativeClass,
|
|
82
|
+
__metadata("design:paramtypes", [WebViewBase])
|
|
83
|
+
], WebViewClientImpl);
|
|
86
84
|
WebViewClient = WebViewClientImpl;
|
|
87
85
|
}
|
|
88
86
|
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":"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;IAED,IACM,iBAAiB,GADvB,MACM,iBAAkB,SAAQ,OAAO,CAAC,MAAM,CAAC,aAAa;QAC3D,YAAmB,KAAkB;YACpC,KAAK,EAAE,CAAC;YADU,UAAK,GAAL,KAAK,CAAa;YAGpC,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QAEM,wBAAwB,CAAC,IAA4B,EAAE,MAAW;YACxE,MAAM,GAAG,GAAW,MAAM,YAAY,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAE9G,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;gBACvB,KAAK,CAAC,KAAK,CAAC,8CAA8C,GAAG,GAAG,GAAG,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACjG,CAAC;YAED,uCAAuC;YACvC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/C,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;YAED,OAAO,KAAK,CAAC;QACd,CAAC;QAEM,aAAa,CAAC,IAA4B,EAAE,GAAW,EAAE,OAAgC;YAC/F,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YACxC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACzB,IAAI,KAAK,EAAE,CAAC;gBACX,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;oBACvB,KAAK,CAAC,KAAK,CAAC,mCAAmC,GAAG,GAAG,GAAG,IAAI,GAAG,OAAO,GAAG,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACvG,CAAC;gBACD,KAAK,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACtC,CAAC;QACF,CAAC;QAEM,cAAc,CAAC,IAA4B,EAAE,GAAW;YAC9D,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACzB,IAAI,KAAK,EAAE,CAAC;gBACX,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;oBACvB,KAAK,CAAC,KAAK,CAAC,oCAAoC,GAAG,GAAG,GAAG,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACvF,CAAC;gBACD,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACvC,CAAC;QACF,CAAC;QAEM,eAAe,CAAC,GAAG,IAAI;YAC7B,MAAM,IAAI,GAA2B,IAAI,CAAC,CAAC,CAAC,CAAC;YAE7C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5B,MAAM,SAAS,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClC,MAAM,WAAW,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpC,MAAM,UAAU,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEnC,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;gBAEhE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBACzB,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;wBACvB,KAAK,CAAC,KAAK,CAAC,qCAAqC,GAAG,SAAS,GAAG,IAAI,GAAG,WAAW,GAAG,IAAI,GAAG,UAAU,GAAG,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;oBACvI,CAAC;oBACD,KAAK,CAAC,eAAe,CAAC,UAAU,EAAE,WAAW,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC;gBACxE,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,MAAM,OAAO,GAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,KAAK,GAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;gBAE3B,+FAA+F;gBAC/F,oHAAoH;gBACpH,oBAAoB;gBACpB,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBAE5C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBACzB,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC;wBACvB,KAAK,CAAC,KAAK,CAAC,qCAAqC,GAAG,KAAK,CAAC,YAAY,EAAE,GAAG,IAAI,GAAG,KAAK,CAAC,cAAc,EAAE,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;oBACnL,CAAC;oBACD,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,cAAc,EAAE,GAAG,GAAG,GAAG,KAAK,CAAC,YAAY,EAAE,GAAG,GAAG,CAAC,CAAC;gBAClH,CAAC;YACF,CAAC;QACF,CAAC;KACD,CAAA;IA/EK,iBAAiB;QADtB,WAAW;yCAEe,WAAW;OADhC,iBAAiB,CA+EtB;IAED,aAAa,GAAQ,iBAAiB,CAAC;AACxC,CAAC;AAED,MAAM,OAAO,OAAQ,SAAQ,WAAW;IAGhC,gBAAgB;QACtB,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;QAC1C,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACpC,QAAQ,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACtC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAElC,OAAO,UAAU,CAAC;IACnB,CAAC;IAEM,cAAc;QACpB,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,uBAAuB,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,aAAa,CAAM,IAAI,CAAC,CAAC;QAC5C,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC9B,UAAW,CAAC,MAAM,GAAG,MAAM,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAEM,iBAAiB;QACvB,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YAChB,IAAU,UAAW,CAAC,MAAM,EAAE,CAAC;gBACxB,UAAW,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;YACvC,CAAC;YACD,UAAU,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC;QAED,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEO,YAAY,CAAC,KAAc;QAClC,IAAI,IAAI,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAC/C,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;YACvC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC/B,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;IACF,CAAC;IAED,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,KAAc;QAC7C,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAEM,QAAQ,CAAC,GAAW;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO;QACR,CAAC;QAED,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAEM,SAAS,CAAC,GAAW;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO;QACR,CAAC;QAED,MAAM,OAAO,GAAG,WAAW,YAAY,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,CAAC;QAC7D,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC;IAC7C,CAAC;IAEM,WAAW;QACjB,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YAChB,UAAU,CAAC,WAAW,EAAE,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,IAAI,YAAY;QACf,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC,YAAY,EAAE,CAAC;QAClC,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,MAAM;QACZ,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC,MAAM,EAAE,CAAC;QAC5B,CAAC;IACF,CAAC;IAEM,SAAS;QACf,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;QAC/B,CAAC;IACF,CAAC;IAEM,MAAM;QACZ,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC,MAAM,EAAE,CAAC;QAC5B,CAAC;IACF,CAAC;CACD"}
|