@nativescript/core 9.0.0-alpha.25 → 9.0.0-alpha.26
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 +29 -10
- package/application/application-common.js +58 -5
- package/application/application-common.js.map +1 -1
- package/application/application-interfaces.d.ts +10 -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 +3 -0
- package/application/application.android.js +348 -349
- package/application/application.android.js.map +1 -1
- package/application/application.ios.d.ts +3 -0
- package/application/application.ios.js +30 -19
- package/application/application.ios.js.map +1 -1
- package/config/config.interface.d.ts +21 -0
- package/connectivity/index.android.js +22 -22
- package/connectivity/index.android.js.map +1 -1
- package/core-types/index.d.ts +10 -1
- package/core-types/index.js +10 -1
- package/core-types/index.js.map +1 -1
- package/core-types/validators.js +12 -6
- 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/http/http-request/index.ios.js +1 -1
- package/http/http-request/index.ios.js.map +1 -1
- package/package.json +1 -1
- package/platform/screen/index.d.ts +5 -0
- package/platforms/android/widgets-release.aar +0 -0
- package/timer/index.ios.js +1 -1
- package/timer/index.ios.js.map +1 -1
- package/ui/action-bar/index.android.js +18 -18
- package/ui/action-bar/index.android.js.map +1 -1
- package/ui/action-bar/index.ios.js +2 -4
- package/ui/action-bar/index.ios.js.map +1 -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.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/view/index.android.d.ts +2 -0
- package/ui/core/view/index.android.js +221 -194
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.d.ts +17 -4
- package/ui/core/view/index.ios.d.ts +3 -2
- package/ui/core/view/index.ios.js +25 -11
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.d.ts +10 -8
- package/ui/core/view/view-common.js +7 -0
- 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 +5 -4
- package/ui/core/view/view-helper/index.ios.js +20 -23
- 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-base/index.d.ts +4 -0
- package/ui/core/view-base/index.js +4 -0
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/date-picker/index.android.js +38 -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/editable-text-base/index.android.js +34 -34
- package/ui/editable-text-base/index.android.js.map +1 -1
- package/ui/frame/fragment.transitions.android.d.ts +2 -1
- package/ui/frame/fragment.transitions.android.js +106 -104
- package/ui/frame/fragment.transitions.android.js.map +1 -1
- package/ui/frame/fragment.transitions.d.ts +3 -2
- package/ui/frame/index.android.js +2 -2
- package/ui/frame/index.android.js.map +1 -1
- package/ui/frame/index.ios.d.ts +2 -1
- package/ui/frame/index.ios.js +83 -43
- 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 +19 -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 +1 -0
- package/ui/index.js +1 -0
- 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/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 +35 -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 +278 -320
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.d.ts +5 -0
- package/ui/list-view/index.ios.js +12 -27
- package/ui/list-view/index.ios.js.map +1 -1
- package/ui/page/index.ios.js +25 -64
- package/ui/page/index.ios.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.js +48 -52
- package/ui/search-bar/index.android.js.map +1 -1
- package/ui/search-bar/index.ios.js +3 -6
- package/ui/search-bar/index.ios.js.map +1 -1
- package/ui/segmented-bar/index.android.js +56 -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 +23 -25
- package/ui/slider/index.android.js.map +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/style/index.d.ts +1 -0
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.d.ts +1 -0
- package/ui/styling/style-properties.js +7 -0
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/switch/index.android.js +18 -18
- package/ui/switch/index.android.js.map +1 -1
- package/ui/switch/index.ios.d.ts +1 -0
- package/ui/switch/index.ios.js +62 -12
- package/ui/switch/index.ios.js.map +1 -1
- package/ui/tab-view/index.android.js +163 -179
- 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 +12 -4
- package/ui/tab-view/index.ios.js +225 -40
- package/ui/tab-view/index.ios.js.map +1 -1
- package/ui/tab-view/tab-view-common.d.ts +12 -0
- package/ui/tab-view/tab-view-common.js +10 -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 +133 -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.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 +21 -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 +3 -12
- 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/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.ios.js +20 -20
- package/utils/native-helper.ios.js.map +1 -1
package/ui/page/index.ios.js
CHANGED
|
@@ -12,7 +12,7 @@ const ENTRY = '_entry';
|
|
|
12
12
|
const DELEGATE = '_delegate';
|
|
13
13
|
const TRANSITION = '_transition';
|
|
14
14
|
const NON_ANIMATED_TRANSITION = 'non-animated';
|
|
15
|
-
var UIViewControllerImpl =
|
|
15
|
+
var UIViewControllerImpl = (function (_super) {
|
|
16
16
|
__extends(UIViewControllerImpl, _super);
|
|
17
17
|
function UIViewControllerImpl() {
|
|
18
18
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -49,8 +49,6 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
49
49
|
};
|
|
50
50
|
UIViewControllerImpl.prototype.viewDidLoad = function () {
|
|
51
51
|
_super.prototype.viewDidLoad.call(this);
|
|
52
|
-
// Unify translucent and opaque bars layout
|
|
53
|
-
// this.edgesForExtendedLayout = UIRectEdgeBottom;
|
|
54
52
|
this.extendedLayoutIncludesOpaqueBars = true;
|
|
55
53
|
};
|
|
56
54
|
UIViewControllerImpl.prototype.viewWillAppear = function (animated) {
|
|
@@ -64,7 +62,6 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
64
62
|
if (frame) {
|
|
65
63
|
var entry = this[ENTRY];
|
|
66
64
|
var currentPage = frame.currentPage;
|
|
67
|
-
// Don't raise event if currentPage was showing modal page.
|
|
68
65
|
if (!owner._presentedViewController && entry && currentPage !== owner && !frame._executingContext) {
|
|
69
66
|
var isBack = frame.backStack.includes(entry);
|
|
70
67
|
frame._executingContext = {
|
|
@@ -81,29 +78,21 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
81
78
|
else {
|
|
82
79
|
if (!owner.parent) {
|
|
83
80
|
if (!frame._styleScope) {
|
|
84
|
-
// Make sure page will have styleScope even if frame doesn't.
|
|
85
81
|
owner._updateStyleScope();
|
|
86
82
|
}
|
|
87
83
|
frame._addView(owner);
|
|
88
84
|
}
|
|
89
85
|
else {
|
|
90
|
-
throw new Error(
|
|
86
|
+
throw new Error("Page is already shown on another frame.");
|
|
91
87
|
}
|
|
92
88
|
}
|
|
93
89
|
frame._updateActionBar(owner);
|
|
94
90
|
}
|
|
95
|
-
// Set autoAdjustScrollInsets in will appear - as early as possible
|
|
96
91
|
IOSHelper.updateAutoAdjustScrollInsets(this, owner);
|
|
97
|
-
// Pages in backstack are unloaded so raise loaded here.
|
|
98
92
|
if (!owner.isLoaded) {
|
|
99
93
|
owner.callLoaded();
|
|
100
94
|
}
|
|
101
95
|
else {
|
|
102
|
-
// Note: Handle the case of canceled backstack navigation. (https://github.com/NativeScript/NativeScript/issues/7430)
|
|
103
|
-
// In this case viewWillAppear will be executed for the previous page and it will change the ActionBar
|
|
104
|
-
// because changes happen in an interactive transition - IOS will animate between the the states.
|
|
105
|
-
// If canceled - viewWillAppear will be called for the current page(which is already loaded) and we need to
|
|
106
|
-
// update the action bar explicitly, so that it is not left styles as the previous page.
|
|
107
96
|
owner.updateWithWillAppear(animated);
|
|
108
97
|
}
|
|
109
98
|
};
|
|
@@ -118,15 +107,11 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
118
107
|
var frame = navigationController ? navigationController.owner : null;
|
|
119
108
|
if (frame) {
|
|
120
109
|
var newEntry = this[ENTRY];
|
|
121
|
-
// There are cases like swipe back navigation that can be cancelled.
|
|
122
|
-
// When that's the case, stop here and unset executing context.
|
|
123
110
|
if (frame._executingContext && frame._executingContext.entry !== newEntry) {
|
|
124
111
|
frame._executingContext = null;
|
|
125
112
|
return;
|
|
126
113
|
}
|
|
127
|
-
// Skip navigation events if modal page is shown.
|
|
128
114
|
if (!owner._presentedViewController) {
|
|
129
|
-
// frame.setCurrent(...) will reset executing context so retrieve it here
|
|
130
115
|
var navigationType = (_c = (_b = frame._executingContext) === null || _b === void 0 ? void 0 : _b.navigationType) !== null && _c !== void 0 ? _c : NavigationType.back;
|
|
131
116
|
var isReplace = navigationType === NavigationType.replace;
|
|
132
117
|
frame.setCurrent(newEntry, navigationType);
|
|
@@ -144,18 +129,14 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
144
129
|
}
|
|
145
130
|
}
|
|
146
131
|
}
|
|
147
|
-
// If page was shown with custom animation - we need to set the navigationController.delegate to the animatedDelegate.
|
|
148
132
|
if ((_d = frame.ios) === null || _d === void 0 ? void 0 : _d.controller) {
|
|
149
133
|
frame.ios.controller.delegate = this[DELEGATE];
|
|
150
134
|
}
|
|
151
135
|
frame._processNavigationQueue(owner);
|
|
152
136
|
if (!__VISIONOS__) {
|
|
153
|
-
// _processNavigationQueue will shift navigationQueue. Check canGoBack after that.
|
|
154
|
-
// Workaround for disabled backswipe on second custom native transition
|
|
155
137
|
if (frame.canGoBack()) {
|
|
156
138
|
var transitionState = SharedTransition.getState(owner.transitionId);
|
|
157
139
|
if (!(transitionState === null || transitionState === void 0 ? void 0 : transitionState.interactive)) {
|
|
158
|
-
// only consider when interactive transitions are not enabled
|
|
159
140
|
navigationController.interactivePopGestureRecognizer.delegate = navigationController;
|
|
160
141
|
navigationController.interactivePopGestureRecognizer.enabled = owner.enableSwipeBackNavigation;
|
|
161
142
|
}
|
|
@@ -167,9 +148,6 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
167
148
|
}
|
|
168
149
|
}
|
|
169
150
|
if (!this.presentedViewController) {
|
|
170
|
-
// clear presented viewController here only if no presented controller.
|
|
171
|
-
// this is needed because in iOS9 the order of events could be - willAppear, willDisappear, didAppear.
|
|
172
|
-
// If we clean it when we have viewController then once presented VC is dismissed then
|
|
173
151
|
owner._presentedViewController = null;
|
|
174
152
|
}
|
|
175
153
|
};
|
|
@@ -180,8 +158,6 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
180
158
|
if (!owner) {
|
|
181
159
|
return;
|
|
182
160
|
}
|
|
183
|
-
// Cache presentedViewController if any. We don't want to raise
|
|
184
|
-
// navigation events in case of presenting view controller.
|
|
185
161
|
if (!owner._presentedViewController) {
|
|
186
162
|
owner._presentedViewController = this.presentedViewController;
|
|
187
163
|
}
|
|
@@ -191,11 +167,9 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
191
167
|
var _a;
|
|
192
168
|
_super.prototype.viewDidDisappear.call(this, animated);
|
|
193
169
|
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
194
|
-
// Exit if no page or page is hiding because it shows another page modally.
|
|
195
170
|
if (!owner || owner.modal || owner._presentedViewController) {
|
|
196
171
|
return;
|
|
197
172
|
}
|
|
198
|
-
// Forward navigation does not remove page from frame so we raise unloaded manually.
|
|
199
173
|
if (owner.isLoaded) {
|
|
200
174
|
owner.callUnloaded();
|
|
201
175
|
}
|
|
@@ -226,19 +200,9 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
226
200
|
_super.prototype.viewDidLayoutSubviews.call(this);
|
|
227
201
|
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
228
202
|
if (owner) {
|
|
229
|
-
// layout(owner.actionBar)
|
|
230
|
-
// layout(owner.content)
|
|
231
203
|
if (SDK_VERSION >= 11) {
|
|
232
|
-
// Handle nested Page safe area insets application.
|
|
233
|
-
// A Page is nested if its Frame has a parent.
|
|
234
|
-
// If the Page is nested, cross check safe area insets on top and bottom with Frame parent.
|
|
235
204
|
var frame = owner.parent;
|
|
236
|
-
// There is a legacy scenario where Page is not in a Frame - the root of a Modal View, so it has no parent.
|
|
237
205
|
var frameParent = frame && frame.parent;
|
|
238
|
-
// Handle Angular scenario where TabView is in a ProxyViewContainer
|
|
239
|
-
// It is possible to wrap components in ProxyViewContainers indefinitely
|
|
240
|
-
// Not using instanceof ProxyViewContainer to avoid circular dependency
|
|
241
|
-
// TODO: Try moving UIViewControllerImpl out of page module
|
|
242
206
|
while (frameParent && !frameParent.nativeViewProtected) {
|
|
243
207
|
frameParent = frameParent.parent;
|
|
244
208
|
}
|
|
@@ -247,7 +211,6 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
247
211
|
var parentPageInsetsBottom = frameParent.nativeViewProtected.safeAreaInsets.bottom;
|
|
248
212
|
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
249
213
|
var currentInsetsBottom = this.view.safeAreaInsets.bottom;
|
|
250
|
-
// Safe area insets include additional safe area insets too, so subtract old values
|
|
251
214
|
if (this.additionalSafeAreaInsets) {
|
|
252
215
|
currentInsetsTop -= this.additionalSafeAreaInsets.top;
|
|
253
216
|
currentInsetsBottom -= this.additionalSafeAreaInsets.bottom;
|
|
@@ -272,45 +235,37 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
272
235
|
}
|
|
273
236
|
this.finishRunningLayout();
|
|
274
237
|
};
|
|
275
|
-
// Mind implementation for other controllerss
|
|
276
238
|
UIViewControllerImpl.prototype.traitCollectionDidChange = function (previousTraitCollection) {
|
|
277
239
|
var _a;
|
|
278
240
|
_super.prototype.traitCollectionDidChange.call(this, previousTraitCollection);
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
if (
|
|
241
|
+
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
242
|
+
if (owner) {
|
|
243
|
+
if (SDK_VERSION >= 13) {
|
|
244
|
+
if (this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection && this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection(previousTraitCollection)) {
|
|
245
|
+
owner.notify({
|
|
246
|
+
eventName: IOSHelper.traitCollectionColorAppearanceChangedEvent,
|
|
247
|
+
object: owner,
|
|
248
|
+
});
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
if (this.traitCollection.layoutDirection !== previousTraitCollection.layoutDirection) {
|
|
282
252
|
owner.notify({
|
|
283
|
-
eventName: IOSHelper.
|
|
253
|
+
eventName: IOSHelper.traitCollectionLayoutDirectionChangedEvent,
|
|
284
254
|
object: owner,
|
|
285
255
|
});
|
|
286
256
|
}
|
|
287
257
|
}
|
|
288
258
|
};
|
|
289
259
|
Object.defineProperty(UIViewControllerImpl.prototype, "preferredStatusBarStyle", {
|
|
290
|
-
// TODO: a11y
|
|
291
|
-
// public accessibilityPerformEscape() {
|
|
292
|
-
// const owner = this._owner.get();
|
|
293
|
-
// if (!owner) {
|
|
294
|
-
// return false;
|
|
295
|
-
// }
|
|
296
|
-
// console.log('page accessibilityPerformEscape');
|
|
297
|
-
// if (owner.onAccessibilityPerformEscape) {
|
|
298
|
-
// const result = owner.onAccessibilityPerformEscape();
|
|
299
|
-
// return result;
|
|
300
|
-
// } else {
|
|
301
|
-
// return false;
|
|
302
|
-
// }
|
|
303
|
-
// }
|
|
304
|
-
// @ts-ignore
|
|
305
260
|
get: function () {
|
|
306
261
|
var _a;
|
|
307
262
|
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
308
263
|
if (owner) {
|
|
309
264
|
if (SDK_VERSION >= 13) {
|
|
310
|
-
return owner.statusBarStyle ===
|
|
265
|
+
return owner.statusBarStyle === "light" ? UIStatusBarStyle.LightContent : UIStatusBarStyle.DarkContent;
|
|
311
266
|
}
|
|
312
267
|
else {
|
|
313
|
-
return owner.statusBarStyle ===
|
|
268
|
+
return owner.statusBarStyle === "dark" ? UIStatusBarStyle.LightContent : UIStatusBarStyle.Default;
|
|
314
269
|
}
|
|
315
270
|
}
|
|
316
271
|
else {
|
|
@@ -349,7 +304,13 @@ export class Page extends PageBase {
|
|
|
349
304
|
this.viewController = this._ios = controller;
|
|
350
305
|
}
|
|
351
306
|
createNativeView() {
|
|
352
|
-
|
|
307
|
+
// View controller can be disposed during view disposal, so make sure to create a new one if not defined
|
|
308
|
+
if (!this._ios) {
|
|
309
|
+
const controller = UIViewControllerImpl.initWithOwner(new WeakRef(this));
|
|
310
|
+
controller.view.backgroundColor = this._backgroundColor;
|
|
311
|
+
this.viewController = this._ios = controller;
|
|
312
|
+
}
|
|
313
|
+
return this._ios.view;
|
|
353
314
|
}
|
|
354
315
|
disposeNativeView() {
|
|
355
316
|
this.viewController = null;
|
|
@@ -399,7 +360,7 @@ export class Page extends PageBase {
|
|
|
399
360
|
}
|
|
400
361
|
_updateStatusBarStyle(value) {
|
|
401
362
|
const frame = this.frame;
|
|
402
|
-
if (frame && value) {
|
|
363
|
+
if (frame?.ios && value) {
|
|
403
364
|
const navigationController = frame.ios.controller;
|
|
404
365
|
const navigationBar = navigationController.navigationBar;
|
|
405
366
|
navigationBar.barStyle = value === 'dark' ? 1 /* UIBarStyle.Black */ : 0 /* UIBarStyle.Default */;
|
|
@@ -437,7 +398,7 @@ export class Page extends PageBase {
|
|
|
437
398
|
View.layoutChild(this, this.actionBar, 0, 0, actionBarWidth, actionBarHeight);
|
|
438
399
|
}
|
|
439
400
|
const insets = this.getSafeAreaInsets();
|
|
440
|
-
if (!__VISIONOS__ && SDK_VERSION <= 10) {
|
|
401
|
+
if (!__VISIONOS__ && SDK_VERSION <= 10 && this.viewController) {
|
|
441
402
|
// iOS 10 and below don't have safe area insets API,
|
|
442
403
|
// there we need only the top inset on the Page
|
|
443
404
|
insets.top = layout.round(layout.toDevicePixels(this.viewController.view.safeAreaLayoutGuide.layoutFrame.origin.y));
|
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;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,cAAc,eAAe,CAAC;AAE9B,MAAM,KAAK,GAAG,QAAQ,CAAC;AACvB,MAAM,QAAQ,GAAG,WAAW,CAAC;AAC7B,MAAM,UAAU,GAAG,aAAa,CAAC;AACjC,MAAM,uBAAuB,GAAG,cAAc,CAAC
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,7 @@ export class ScrollView extends ContentView {
|
|
|
86
86
|
/**
|
|
87
87
|
* Raised when a scroll event occurs.
|
|
88
88
|
*/
|
|
89
|
-
on(
|
|
89
|
+
on(eventName: 'scroll', callback: (data: ScrollEventData) => void, thisArg?: any): void;
|
|
90
90
|
|
|
91
91
|
_onOrientationChanged(): void;
|
|
92
92
|
}
|
|
@@ -8,9 +8,11 @@ export declare class ScrollView extends ScrollViewBase {
|
|
|
8
8
|
nativeViewProtected: UIScrollView;
|
|
9
9
|
private _contentMeasuredWidth;
|
|
10
10
|
private _contentMeasuredHeight;
|
|
11
|
+
private _isFirstLayout;
|
|
11
12
|
private _delegate;
|
|
12
13
|
createNativeView(): UIScrollView;
|
|
13
14
|
initNativeView(): void;
|
|
15
|
+
disposeNativeView(): void;
|
|
14
16
|
_setNativeClipToBounds(): void;
|
|
15
17
|
protected attachNative(): void;
|
|
16
18
|
protected detachNative(): void;
|
|
@@ -2,8 +2,9 @@ import { ScrollViewBase, scrollBarIndicatorVisibleProperty, isScrollEnabledPrope
|
|
|
2
2
|
import { layout } from '../../utils';
|
|
3
3
|
import { SDK_VERSION } from '../../utils/constants';
|
|
4
4
|
import { View } from '../core/view';
|
|
5
|
+
import { CoreTypes } from '../enums';
|
|
5
6
|
export * from './scroll-view-common';
|
|
6
|
-
var UIScrollViewDelegateImpl =
|
|
7
|
+
var UIScrollViewDelegateImpl = (function (_super) {
|
|
7
8
|
__extends(UIScrollViewDelegateImpl, _super);
|
|
8
9
|
function UIScrollViewDelegateImpl() {
|
|
9
10
|
return _super !== null && _super.apply(this, arguments) || this;
|
|
@@ -19,7 +20,7 @@ var UIScrollViewDelegateImpl = /** @class */ (function (_super) {
|
|
|
19
20
|
if (owner) {
|
|
20
21
|
owner.notify({
|
|
21
22
|
object: owner,
|
|
22
|
-
eventName:
|
|
23
|
+
eventName: "scroll",
|
|
23
24
|
scrollX: owner.horizontalOffset,
|
|
24
25
|
scrollY: owner.verticalOffset,
|
|
25
26
|
});
|
|
@@ -33,6 +34,7 @@ export class ScrollView extends ScrollViewBase {
|
|
|
33
34
|
super(...arguments);
|
|
34
35
|
this._contentMeasuredWidth = 0;
|
|
35
36
|
this._contentMeasuredHeight = 0;
|
|
37
|
+
this._isFirstLayout = true;
|
|
36
38
|
}
|
|
37
39
|
createNativeView() {
|
|
38
40
|
return UIScrollView.new();
|
|
@@ -42,6 +44,10 @@ export class ScrollView extends ScrollViewBase {
|
|
|
42
44
|
this.updateScrollBarVisibility(this.scrollBarIndicatorVisible);
|
|
43
45
|
this._setNativeClipToBounds();
|
|
44
46
|
}
|
|
47
|
+
disposeNativeView() {
|
|
48
|
+
super.disposeNativeView();
|
|
49
|
+
this._isFirstLayout = true;
|
|
50
|
+
}
|
|
45
51
|
_setNativeClipToBounds() {
|
|
46
52
|
if (!this.nativeViewProtected) {
|
|
47
53
|
return;
|
|
@@ -145,28 +151,41 @@ export class ScrollView extends ScrollViewBase {
|
|
|
145
151
|
return;
|
|
146
152
|
}
|
|
147
153
|
const insets = this.getSafeAreaInsets();
|
|
148
|
-
let
|
|
149
|
-
let
|
|
154
|
+
let scrollWidth = right - left - insets.right - insets.left;
|
|
155
|
+
let scrollHeight = bottom - top - insets.bottom - insets.top;
|
|
150
156
|
if (SDK_VERSION > 10) {
|
|
151
157
|
// Disable automatic adjustment of scroll view insets
|
|
152
158
|
// Consider exposing this as property with all 4 modes
|
|
153
159
|
// https://developer.apple.com/documentation/uikit/uiscrollview/contentinsetadjustmentbehavior
|
|
154
160
|
this.nativeViewProtected.contentInsetAdjustmentBehavior = 2;
|
|
155
161
|
}
|
|
156
|
-
let
|
|
157
|
-
let
|
|
162
|
+
let scrollInsetWidth = scrollWidth + insets.left + insets.right;
|
|
163
|
+
let scrollInsetHeight = scrollHeight + insets.top + insets.bottom;
|
|
158
164
|
if (this.orientation === 'horizontal') {
|
|
159
|
-
|
|
160
|
-
|
|
165
|
+
scrollInsetWidth = Math.max(this._contentMeasuredWidth + insets.left + insets.right, scrollInsetWidth);
|
|
166
|
+
scrollWidth = Math.max(this._contentMeasuredWidth, scrollWidth);
|
|
161
167
|
}
|
|
162
168
|
else {
|
|
163
|
-
|
|
164
|
-
|
|
169
|
+
scrollInsetHeight = Math.max(this._contentMeasuredHeight + insets.top + insets.bottom, scrollInsetHeight);
|
|
170
|
+
scrollHeight = Math.max(this._contentMeasuredHeight, scrollHeight);
|
|
171
|
+
}
|
|
172
|
+
this.nativeViewProtected.contentSize = CGSizeMake(layout.toDeviceIndependentPixels(scrollInsetWidth), layout.toDeviceIndependentPixels(scrollInsetHeight));
|
|
173
|
+
// RTL handling
|
|
174
|
+
if (this.orientation === 'horizontal') {
|
|
175
|
+
if (this._isFirstLayout) {
|
|
176
|
+
this._isFirstLayout = false;
|
|
177
|
+
if (this.direction === CoreTypes.LayoutDirection.rtl) {
|
|
178
|
+
const scrollableWidth = scrollInsetWidth - this.getMeasuredWidth();
|
|
179
|
+
if (scrollableWidth > 0) {
|
|
180
|
+
this.nativeViewProtected.contentOffset = CGPointMake(layout.toDeviceIndependentPixels(scrollableWidth), this.verticalOffset);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
165
184
|
}
|
|
166
|
-
this.
|
|
167
|
-
View.layoutChild(this, this.layoutView, insets.left, insets.top, insets.left + width, insets.top + height);
|
|
185
|
+
View.layoutChild(this, this.layoutView, insets.left, insets.top, insets.left + scrollWidth, insets.top + scrollHeight);
|
|
168
186
|
}
|
|
169
187
|
_onOrientationChanged() {
|
|
188
|
+
this._isFirstLayout = true;
|
|
170
189
|
this.updateScrollBarVisibility(this.scrollBarIndicatorVisible);
|
|
171
190
|
}
|
|
172
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/index.ios.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,iCAAiC,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAClH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/index.ios.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
import { ScrollView as ScrollViewDefinition, ScrollEventData } from '.';
|
|
2
1
|
import { ContentView } from '../content-view';
|
|
3
2
|
import { Property } from '../core/properties';
|
|
4
3
|
import { EventData } from '../../data/observable';
|
|
5
4
|
import { CoreTypes } from '../../core-types';
|
|
6
|
-
export declare abstract class ScrollViewBase extends ContentView
|
|
5
|
+
export declare abstract class ScrollViewBase extends ContentView {
|
|
7
6
|
static scrollEvent: string;
|
|
8
7
|
orientation: CoreTypes.OrientationType;
|
|
9
8
|
scrollBarIndicatorVisible: boolean;
|
|
10
9
|
isScrollEnabled: boolean;
|
|
11
10
|
private _addedScrollEvent;
|
|
12
|
-
addEventListener(
|
|
13
|
-
removeEventListener(
|
|
11
|
+
addEventListener(eventName: string, callback: (data: EventData) => void, thisArg?: any, once?: boolean): void;
|
|
12
|
+
removeEventListener(eventName: string, callback?: (data: EventData) => void, thisArg?: any): void;
|
|
14
13
|
initNativeView(): void;
|
|
15
14
|
disposeNativeView(): void;
|
|
16
15
|
protected attachNative(): void;
|
|
@@ -23,10 +22,6 @@ export declare abstract class ScrollViewBase extends ContentView implements Scro
|
|
|
23
22
|
abstract scrollToHorizontalOffset(value: number, animated: boolean): any;
|
|
24
23
|
abstract _onOrientationChanged(): any;
|
|
25
24
|
}
|
|
26
|
-
export interface ScrollViewBase {
|
|
27
|
-
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void;
|
|
28
|
-
on(event: 'scroll', callback: (args: ScrollEventData) => void, thisArg?: any): void;
|
|
29
|
-
}
|
|
30
25
|
export declare const orientationProperty: Property<ScrollViewBase, CoreTypes.OrientationType>;
|
|
31
26
|
export declare const scrollBarIndicatorVisibleProperty: Property<ScrollViewBase, boolean>;
|
|
32
27
|
export declare const isScrollEnabledProperty: Property<ScrollViewBase, boolean>;
|
|
@@ -9,9 +9,9 @@ let ScrollViewBase = ScrollViewBase_1 = class ScrollViewBase extends ContentView
|
|
|
9
9
|
super(...arguments);
|
|
10
10
|
this._addedScrollEvent = false;
|
|
11
11
|
}
|
|
12
|
-
addEventListener(
|
|
12
|
+
addEventListener(eventName, callback, thisArg, once) {
|
|
13
13
|
const hasExistingScrollListeners = this.hasListeners(ScrollViewBase_1.scrollEvent);
|
|
14
|
-
super.addEventListener(
|
|
14
|
+
super.addEventListener(eventName, callback, thisArg, once);
|
|
15
15
|
// This indicates that a scroll listener was added for first time
|
|
16
16
|
if (!hasExistingScrollListeners && this.hasListeners(ScrollViewBase_1.scrollEvent)) {
|
|
17
17
|
this._addedScrollEvent = true;
|
|
@@ -20,9 +20,9 @@ let ScrollViewBase = ScrollViewBase_1 = class ScrollViewBase extends ContentView
|
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
-
removeEventListener(
|
|
23
|
+
removeEventListener(eventName, callback, thisArg) {
|
|
24
24
|
const hasExistingScrollListeners = this.hasListeners(ScrollViewBase_1.scrollEvent);
|
|
25
|
-
super.removeEventListener(
|
|
25
|
+
super.removeEventListener(eventName, callback, thisArg);
|
|
26
26
|
// This indicates that the final scroll listener was removed
|
|
27
27
|
if (hasExistingScrollListeners && !this.hasListeners(ScrollViewBase_1.scrollEvent)) {
|
|
28
28
|
this._addedScrollEvent = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/scroll-view-common.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"scroll-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/scroll-view-common.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGtC,IAAe,cAAc,sBAA7B,MAAe,cAAe,SAAQ,WAAW;IAAjD;;QAOE,sBAAiB,GAAG,KAAK,CAAC;IAyEnC,CAAC;IAvEO,gBAAgB,CAAC,SAAiB,EAAE,QAAmC,EAAE,OAAa,EAAE,IAAc;QAC5G,MAAM,0BAA0B,GAAY,IAAI,CAAC,YAAY,CAAC,gBAAc,CAAC,WAAW,CAAC,CAAC;QAE1F,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAE3D,iEAAiE;QACjE,IAAI,CAAC,0BAA0B,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAc,CAAC,WAAW,CAAC,EAAE,CAAC;YAClF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAE9B,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC9B,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC;QACF,CAAC;IACF,CAAC;IAEM,mBAAmB,CAAC,SAAiB,EAAE,QAAoC,EAAE,OAAa;QAChG,MAAM,0BAA0B,GAAY,IAAI,CAAC,YAAY,CAAC,gBAAc,CAAC,WAAW,CAAC,CAAC;QAE1F,KAAK,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAExD,4DAA4D;QAC5D,IAAI,0BAA0B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAc,CAAC,WAAW,CAAC,EAAE,CAAC;YAClF,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;YAE/B,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC9B,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC;QACF,CAAC;IACF,CAAC;IAED,cAAc;QACb,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,EAAE,CAAC;QACrB,CAAC;IACF,CAAC;IAEM,iBAAiB;QACvB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,EAAE,CAAC;QACrB,CAAC;QACD,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAES,YAAY;QACrB,EAAE;IACH,CAAC;IAES,YAAY;QACrB,EAAE;IACH,CAAC;IAED,IAAI,gBAAgB;QACnB,OAAO,CAAC,CAAC;IACV,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,CAAC,CAAC;IACV,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,CAAC,CAAC;IACV,CAAC;IAED,IAAI,gBAAgB;QACnB,OAAO,CAAC,CAAC;IACV,CAAC;;AA1Ea,0BAAW,GAAG,QAAQ,AAAX,CAAY;AADhB,cAAc;IADnC,OAAO,CAAC,YAAY,CAAC;GACA,cAAc,CAgFnC;;AAED,MAAM,SAAS,GAAG,UAAU,CAA4B,aAAa,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;AACzI,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,QAAQ,CAA4C;IAC1F,IAAI,EAAE,aAAa;IACnB,YAAY,EAAE,SAAS,CAAC,WAAW,CAAC,QAAQ;IAC5C,aAAa,EAAE,IAAI;IACnB,YAAY,EAAE,CAAC,MAAsB,EAAE,QAAmC,EAAE,QAAmC,EAAE,EAAE;QAClH,MAAM,CAAC,qBAAqB,EAAE,CAAC;IAChC,CAAC;IACD,cAAc,EAAE,SAAS;CACzB,CAAC,CAAC;AACH,mBAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,iCAAiC,GAAG,IAAI,QAAQ,CAA0B;IACtF,IAAI,EAAE,2BAA2B;IACjC,YAAY,EAAE,IAAI;IAClB,cAAc,EAAE,gBAAgB;CAChC,CAAC,CAAC;AACH,iCAAiC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,QAAQ,CAA0B;IAC5E,IAAI,EAAE,iBAAiB;IACvB,YAAY,EAAE,IAAI;IAClB,cAAc,EAAE,gBAAgB;CAChC,CAAC,CAAC;AACH,uBAAuB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC"}
|
|
@@ -13,60 +13,56 @@ function initializeNativeClasses() {
|
|
|
13
13
|
if (QueryTextListener) {
|
|
14
14
|
return;
|
|
15
15
|
}
|
|
16
|
-
var CompatQueryTextListenerImpl =
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
return global.__native(_this);
|
|
23
|
-
}
|
|
24
|
-
CompatQueryTextListenerImpl.prototype.onQueryTextChange = function (newText) {
|
|
25
|
-
var owner = this.owner;
|
|
26
|
-
textProperty.nativeValueChange(owner, newText);
|
|
27
|
-
// This code is needed since sometimes OnCloseListener is not called!
|
|
28
|
-
if (newText === '' && this[SEARCHTEXT] !== newText) {
|
|
29
|
-
owner._emit(SearchBarBase.clearEvent);
|
|
16
|
+
var CompatQueryTextListenerImpl = (function (_super) {
|
|
17
|
+
__extends(CompatQueryTextListenerImpl, _super);
|
|
18
|
+
function CompatQueryTextListenerImpl(owner) {
|
|
19
|
+
var _this = _super.call(this) || this;
|
|
20
|
+
_this.owner = owner;
|
|
21
|
+
return global.__native(_this);
|
|
30
22
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
23
|
+
CompatQueryTextListenerImpl.prototype.onQueryTextChange = function (newText) {
|
|
24
|
+
var owner = this.owner;
|
|
25
|
+
textProperty.nativeValueChange(owner, newText);
|
|
26
|
+
if (newText === "" && this[SEARCHTEXT] !== newText) {
|
|
27
|
+
owner._emit(SearchBarBase.clearEvent);
|
|
28
|
+
}
|
|
29
|
+
this[SEARCHTEXT] = newText;
|
|
30
|
+
this[QUERY] = undefined;
|
|
31
|
+
return true;
|
|
32
|
+
};
|
|
33
|
+
CompatQueryTextListenerImpl.prototype.onQueryTextSubmit = function (query) {
|
|
34
|
+
var owner = this.owner;
|
|
35
|
+
if (query !== "" && this[QUERY] !== query) {
|
|
36
|
+
owner._emit(SearchBarBase.submitEvent);
|
|
37
|
+
}
|
|
38
|
+
this[QUERY] = query;
|
|
39
|
+
return true;
|
|
40
|
+
};
|
|
41
|
+
var _a;
|
|
42
|
+
CompatQueryTextListenerImpl = __decorate([
|
|
43
|
+
Interfaces([androidx.appcompat.widget.SearchView.OnQueryTextListener]),
|
|
44
|
+
__metadata("design:paramtypes", [typeof (_a = typeof SearchBar !== "undefined" && SearchBar) === "function" ? _a : Object])
|
|
45
|
+
], CompatQueryTextListenerImpl);
|
|
46
|
+
return CompatQueryTextListenerImpl;
|
|
47
|
+
}(java.lang.Object));
|
|
48
|
+
var CompatCloseListenerImpl = (function (_super) {
|
|
49
|
+
__extends(CompatCloseListenerImpl, _super);
|
|
50
|
+
function CompatCloseListenerImpl(owner) {
|
|
51
|
+
var _this = _super.call(this) || this;
|
|
52
|
+
_this.owner = owner;
|
|
53
|
+
return global.__native(_this);
|
|
40
54
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
__extends(CompatCloseListenerImpl, _super);
|
|
53
|
-
function CompatCloseListenerImpl(owner) {
|
|
54
|
-
var _this = _super.call(this) || this;
|
|
55
|
-
_this.owner = owner;
|
|
56
|
-
// @ts-ignore
|
|
57
|
-
return global.__native(_this);
|
|
58
|
-
}
|
|
59
|
-
CompatCloseListenerImpl.prototype.onClose = function () {
|
|
60
|
-
this.owner._emit(SearchBarBase.clearEvent);
|
|
61
|
-
return true;
|
|
62
|
-
};
|
|
63
|
-
var _a;
|
|
64
|
-
CompatCloseListenerImpl = __decorate([
|
|
65
|
-
Interfaces([androidx.appcompat.widget.SearchView.OnCloseListener]),
|
|
66
|
-
__metadata("design:paramtypes", [typeof (_a = typeof SearchBar !== "undefined" && SearchBar) === "function" ? _a : Object])
|
|
67
|
-
], CompatCloseListenerImpl);
|
|
68
|
-
return CompatCloseListenerImpl;
|
|
69
|
-
}(java.lang.Object));
|
|
55
|
+
CompatCloseListenerImpl.prototype.onClose = function () {
|
|
56
|
+
this.owner._emit(SearchBarBase.clearEvent);
|
|
57
|
+
return true;
|
|
58
|
+
};
|
|
59
|
+
var _a;
|
|
60
|
+
CompatCloseListenerImpl = __decorate([
|
|
61
|
+
Interfaces([androidx.appcompat.widget.SearchView.OnCloseListener]),
|
|
62
|
+
__metadata("design:paramtypes", [typeof (_a = typeof SearchBar !== "undefined" && SearchBar) === "function" ? _a : Object])
|
|
63
|
+
], CompatCloseListenerImpl);
|
|
64
|
+
return CompatCloseListenerImpl;
|
|
65
|
+
}(java.lang.Object));
|
|
70
66
|
QueryTextListener = CompatQueryTextListenerImpl;
|
|
71
67
|
CloseListener = CompatCloseListenerImpl;
|
|
72
68
|
}
|