@nativescript/core 8.5.0-dom.2 → 8.5.0-rc.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/abortcontroller/abortsignal.js +1 -1
- package/abortcontroller/abortsignal.js.map +1 -1
- package/accessibility/accessibility-properties.js +5 -13
- package/accessibility/accessibility-properties.js.map +1 -1
- package/accessibility/index.android.js +11 -10
- package/accessibility/index.android.js.map +1 -1
- package/accessibility/index.ios.js.map +1 -1
- package/animation-frame/animation-native.ios.d.ts +1 -1
- package/application/application-common.d.ts +5 -4
- package/application/application-common.js.map +1 -1
- package/application/index.android.d.ts +12 -12
- package/application/index.d.ts +30 -32
- package/application/index.ios.d.ts +1 -0
- package/application/index.ios.js +24 -29
- package/application/index.ios.js.map +1 -1
- package/core-types/index.d.ts +277 -752
- package/core-types/index.js +3 -0
- package/core-types/index.js.map +1 -1
- package/css/CSS3Parser.d.ts +3 -3
- package/css/parser.d.ts +17 -17
- package/css/parser.js +1 -0
- package/css/parser.js.map +1 -1
- package/data/observable/index.d.ts +47 -102
- package/data/observable/index.js +178 -151
- package/data/observable/index.js.map +1 -1
- package/data/observable-array/index.d.ts +2 -3
- package/data/observable-array/index.js +1 -1
- package/data/observable-array/index.js.map +1 -1
- package/data/virtual-array/index.d.ts +3 -4
- package/file-system/file-system-access.android.d.ts +13 -0
- package/file-system/file-system-access.android.js +149 -1
- package/file-system/file-system-access.android.js.map +1 -1
- package/file-system/file-system-access.d.ts +12 -0
- package/file-system/file-system-access.ios.d.ts +7 -0
- package/file-system/file-system-access.ios.js +56 -0
- package/file-system/file-system-access.ios.js.map +1 -1
- package/fps-meter/fps-native.android.js.map +1 -1
- package/global-types.d.ts +94 -94
- package/globals/index.js.map +1 -1
- package/image-source/index.android.js +5 -5
- package/image-source/index.android.js.map +1 -1
- package/image-source/index.ios.js +5 -5
- package/image-source/index.ios.js.map +1 -1
- package/index.d.ts +4 -2
- package/index.js +5 -3
- package/index.js.map +1 -1
- package/package.json +2 -1
- package/platform/index.android.d.ts +2 -2
- package/platform/index.ios.d.ts +2 -2
- package/platforms/android/widgets-release.aar +0 -0
- package/platforms/ios/src/NativeScriptUtils.m +3 -0
- package/profiling/index.js +1 -1
- package/profiling/index.js.map +1 -1
- package/ui/action-bar/action-bar-common.d.ts +1 -1
- package/ui/action-bar/action-bar-common.js +7 -7
- package/ui/action-bar/action-bar-common.js.map +1 -1
- package/ui/action-bar/index.android.js +3 -1
- package/ui/action-bar/index.android.js.map +1 -1
- package/ui/action-bar/index.d.ts +2 -3
- package/ui/animation/animation-interfaces.d.ts +4 -4
- package/ui/builder/component-builder/index.js.map +1 -1
- package/ui/builder/xml2ui.js +3 -3
- package/ui/builder/xml2ui.js.map +1 -1
- package/ui/button/index.android.js +1 -1
- package/ui/button/index.android.js.map +1 -1
- package/ui/button/index.d.ts +2 -3
- package/ui/button/index.ios.js +1 -2
- package/ui/button/index.ios.js.map +1 -1
- package/ui/core/bindable/bindable-expressions.js +9 -9
- package/ui/core/bindable/bindable-expressions.js.map +1 -1
- package/ui/core/bindable/index.js +1 -1
- package/ui/core/bindable/index.js.map +1 -1
- package/ui/core/properties/index.js +6 -6
- package/ui/core/properties/index.js.map +1 -1
- package/ui/core/view/index.android.d.ts +3 -6
- package/ui/core/view/index.android.js +28 -51
- package/ui/core/view/index.android.js.map +1 -1
- package/ui/core/view/index.d.ts +14 -28
- package/ui/core/view/index.ios.d.ts +1 -1
- package/ui/core/view/index.ios.js +95 -13
- package/ui/core/view/index.ios.js.map +1 -1
- package/ui/core/view/view-common.d.ts +13 -11
- package/ui/core/view/view-common.js +95 -97
- package/ui/core/view/view-common.js.map +1 -1
- package/ui/core/view/view-helper/index.ios.d.ts +10 -0
- package/ui/core/view/view-helper/index.ios.js +99 -40
- package/ui/core/view/view-helper/index.ios.js.map +1 -1
- package/ui/core/view-base/index.d.ts +454 -519
- package/ui/core/view-base/index.js +170 -5
- package/ui/core/view-base/index.js.map +1 -1
- package/ui/core/weak-event-listener/index.d.ts +2 -4
- package/ui/core/weak-event-listener/index.js +4 -4
- package/ui/core/weak-event-listener/index.js.map +1 -1
- package/ui/date-picker/index.android.js +3 -1
- package/ui/date-picker/index.android.js.map +1 -1
- package/ui/dialogs/dialogs-common.js +1 -0
- package/ui/dialogs/dialogs-common.js.map +1 -1
- package/ui/dialogs/index.android.js +7 -9
- package/ui/dialogs/index.android.js.map +1 -1
- package/ui/editable-text-base/editable-text-base-common.js +1 -2
- package/ui/editable-text-base/editable-text-base-common.js.map +1 -1
- package/ui/editable-text-base/index.android.js +13 -9
- package/ui/editable-text-base/index.android.js.map +1 -1
- package/ui/editable-text-base/index.ios.js +13 -3
- package/ui/editable-text-base/index.ios.js.map +1 -1
- package/ui/frame/fragment.transitions.d.ts +0 -4
- package/ui/frame/frame-common.d.ts +9 -3
- package/ui/frame/frame-common.js +11 -2
- package/ui/frame/frame-common.js.map +1 -1
- package/ui/frame/index.android.d.ts +2 -1
- package/ui/frame/index.android.js +27 -11
- package/ui/frame/index.android.js.map +1 -1
- package/ui/frame/index.d.ts +3 -4
- package/ui/frame/index.ios.js +77 -14
- package/ui/frame/index.ios.js.map +1 -1
- package/ui/gestures/gestures-common.d.ts +2 -9
- package/ui/gestures/gestures-common.js +19 -11
- package/ui/gestures/gestures-common.js.map +1 -1
- package/ui/gestures/index.android.d.ts +3 -0
- package/ui/gestures/index.android.js +66 -63
- package/ui/gestures/index.android.js.map +1 -1
- package/ui/gestures/index.d.ts +10 -1
- package/ui/gestures/index.ios.d.ts +3 -1
- package/ui/gestures/index.ios.js +150 -99
- package/ui/gestures/index.ios.js.map +1 -1
- package/ui/gestures/touch-manager.d.ts +2 -2
- package/ui/image/index.android.js +3 -1
- package/ui/image/index.android.js.map +1 -1
- package/ui/image/index.ios.js +1 -1
- package/ui/image/index.ios.js.map +1 -1
- package/ui/image-cache/image-cache-common.d.ts +3 -3
- package/ui/image-cache/index.d.ts +3 -4
- package/ui/index.d.ts +7 -1
- package/ui/index.js +6 -1
- package/ui/index.js.map +1 -1
- package/ui/label/index.android.js +1 -0
- package/ui/label/index.android.js.map +1 -1
- package/ui/layouts/flexbox-layout/flexbox-layout-common.d.ts +12 -12
- package/ui/layouts/grid-layout/grid-layout-common.d.ts +5 -5
- package/ui/layouts/grid-layout/grid-layout-common.js +4 -4
- package/ui/layouts/grid-layout/grid-layout-common.js.map +1 -1
- package/ui/layouts/root-layout/index.android.js +9 -7
- package/ui/layouts/root-layout/index.android.js.map +1 -1
- package/ui/layouts/root-layout/root-layout-common.js +45 -36
- package/ui/layouts/root-layout/root-layout-common.js.map +1 -1
- package/ui/list-picker/index.android.js +6 -2
- package/ui/list-picker/index.android.js.map +1 -1
- package/ui/list-picker/index.ios.d.ts +0 -2
- package/ui/list-picker/index.ios.js +2 -17
- package/ui/list-picker/index.ios.js.map +1 -1
- package/ui/list-view/index.android.js +6 -2
- package/ui/list-view/index.android.js.map +1 -1
- package/ui/list-view/index.d.ts +6 -7
- package/ui/list-view/list-view-common.d.ts +4 -4
- package/ui/list-view/list-view-common.js +8 -2
- package/ui/list-view/list-view-common.js.map +1 -1
- package/ui/page/index.d.ts +5 -6
- package/ui/page/index.ios.d.ts +4 -0
- package/ui/page/index.ios.js +89 -56
- package/ui/page/index.ios.js.map +1 -1
- package/ui/page/page-common.d.ts +72 -39
- package/ui/placeholder/index.android.d.ts +2 -2
- package/ui/placeholder/index.d.ts +2 -3
- package/ui/repeater/index.js +2 -1
- package/ui/repeater/index.js.map +1 -1
- package/ui/scroll-view/index.android.js +5 -27
- package/ui/scroll-view/index.android.js.map +1 -1
- package/ui/scroll-view/index.d.ts +2 -3
- package/ui/scroll-view/index.ios.d.ts +1 -0
- package/ui/scroll-view/index.ios.js +21 -8
- package/ui/scroll-view/index.ios.js.map +1 -1
- package/ui/scroll-view/scroll-view-common.d.ts +5 -5
- package/ui/scroll-view/scroll-view-common.js +6 -6
- package/ui/scroll-view/scroll-view-common.js.map +1 -1
- package/ui/search-bar/index.android.js +6 -2
- package/ui/search-bar/index.android.js.map +1 -1
- package/ui/search-bar/index.d.ts +3 -4
- package/ui/search-bar/index.ios.d.ts +0 -2
- package/ui/search-bar/index.ios.js +1 -8
- package/ui/search-bar/index.ios.js.map +1 -1
- package/ui/segmented-bar/index.android.js +3 -1
- package/ui/segmented-bar/index.android.js.map +1 -1
- package/ui/segmented-bar/index.d.ts +2 -3
- package/ui/segmented-bar/segmented-bar-common.d.ts +2 -2
- package/ui/styling/background.ios.js +15 -4
- package/ui/styling/background.ios.js.map +1 -1
- package/ui/styling/css-animation-parser.d.ts +12 -7
- package/ui/styling/css-animation-parser.js +90 -36
- package/ui/styling/css-animation-parser.js.map +1 -1
- package/ui/styling/css-selector.d.ts +1 -1
- package/ui/styling/css-utils.d.ts +1 -0
- package/ui/styling/css-utils.js +12 -0
- package/ui/styling/css-utils.js.map +1 -0
- package/ui/styling/font-common.js +6 -6
- package/ui/styling/font-common.js.map +1 -1
- package/ui/styling/font-interfaces.d.ts +3 -3
- package/ui/styling/font.ios.js +2 -1
- package/ui/styling/font.ios.js.map +1 -1
- package/ui/styling/style/index.d.ts +3 -0
- package/ui/styling/style/index.js.map +1 -1
- package/ui/styling/style-properties.js +6 -13
- package/ui/styling/style-properties.js.map +1 -1
- package/ui/styling/style-scope.js +7 -5
- package/ui/styling/style-scope.js.map +1 -1
- package/ui/switch/index.android.js +3 -1
- package/ui/switch/index.android.js.map +1 -1
- package/ui/tab-view/index.android.js +1 -1
- package/ui/tab-view/index.android.js.map +1 -1
- package/ui/tab-view/index.d.ts +2 -3
- package/ui/tab-view/tab-view-common.d.ts +2 -2
- package/ui/text-base/index.ios.js +21 -4
- package/ui/text-base/index.ios.js.map +1 -1
- package/ui/text-base/span.js +4 -4
- package/ui/text-base/span.js.map +1 -1
- package/ui/text-field/index.ios.d.ts +0 -2
- package/ui/text-field/index.ios.js +6 -17
- package/ui/text-field/index.ios.js.map +1 -1
- package/ui/text-view/index.ios.d.ts +0 -2
- package/ui/text-view/index.ios.js +1 -15
- package/ui/text-view/index.ios.js.map +1 -1
- package/ui/transition/fade-transition.d.ts +1 -3
- package/ui/transition/fade-transition.ios.d.ts +14 -1
- package/ui/transition/fade-transition.ios.js +60 -24
- package/ui/transition/fade-transition.ios.js.map +1 -1
- package/ui/transition/index.android.d.ts +6 -4
- package/ui/transition/index.android.js +8 -5
- package/ui/transition/index.android.js.map +1 -1
- package/ui/transition/index.d.ts +44 -8
- package/ui/transition/index.ios.d.ts +6 -4
- package/ui/transition/index.ios.js +9 -5
- package/ui/transition/index.ios.js.map +1 -1
- package/ui/transition/modal-transition.android.d.ts +5 -0
- package/ui/transition/modal-transition.android.js +7 -0
- package/ui/transition/modal-transition.android.js.map +1 -0
- package/ui/transition/modal-transition.d.ts +2 -0
- package/ui/transition/modal-transition.ios.d.ts +34 -0
- package/ui/transition/modal-transition.ios.js +160 -0
- package/ui/transition/modal-transition.ios.js.map +1 -0
- package/ui/transition/page-transition.android.d.ts +6 -0
- package/ui/transition/page-transition.android.js +182 -0
- package/ui/transition/page-transition.android.js.map +1 -0
- package/ui/transition/page-transition.d.ts +2 -0
- package/ui/transition/page-transition.ios.d.ts +34 -0
- package/ui/transition/page-transition.ios.js +181 -0
- package/ui/transition/page-transition.ios.js.map +1 -0
- package/ui/transition/shared-transition-helper.android.d.ts +5 -0
- package/ui/transition/shared-transition-helper.android.js +6 -0
- package/ui/transition/shared-transition-helper.android.js.map +1 -0
- package/ui/transition/shared-transition-helper.d.ts +10 -0
- package/ui/transition/shared-transition-helper.ios.d.ts +14 -0
- package/ui/transition/shared-transition-helper.ios.js +471 -0
- package/ui/transition/shared-transition-helper.ios.js.map +1 -0
- package/ui/transition/shared-transition.d.ts +230 -0
- package/ui/transition/shared-transition.js +192 -0
- package/ui/transition/shared-transition.js.map +1 -0
- package/ui/transition/slide-transition.android.d.ts +1 -1
- package/ui/transition/slide-transition.android.js +1 -1
- package/ui/transition/slide-transition.android.js.map +1 -1
- package/ui/transition/slide-transition.d.ts +1 -1
- package/ui/transition/slide-transition.ios.d.ts +15 -2
- package/ui/transition/slide-transition.ios.js +86 -50
- package/ui/transition/slide-transition.ios.js.map +1 -1
- package/ui/web-view/index.android.js +4 -3
- package/ui/web-view/index.android.js.map +1 -1
- package/ui/web-view/index.d.ts +3 -4
- package/ui/web-view/index.ios.d.ts +1 -2
- package/ui/web-view/index.ios.js +21 -28
- package/ui/web-view/index.ios.js.map +1 -1
- package/ui/web-view/web-view-common.d.ts +3 -3
- package/ui/web-view/web-view-interfaces.d.ts +1 -1
- package/utils/common.d.ts +2 -1
- package/utils/common.js +8 -2
- package/utils/common.js.map +1 -1
- package/utils/index.android.js +2 -2
- package/utils/index.android.js.map +1 -1
- package/utils/index.d.ts +0 -82
- package/utils/mainthread-helper.android.js +2 -2
- package/utils/mainthread-helper.android.js.map +1 -1
- package/utils/native-helper.android.js +3 -2
- package/utils/native-helper.android.js.map +1 -1
- package/utils/native-helper.d.ts +35 -0
- package/utils/native-helper.ios.d.ts +13 -0
- package/utils/native-helper.ios.js +79 -4
- package/utils/native-helper.ios.js.map +1 -1
- package/utils/number-utils.d.ts +10 -0
- package/utils/number-utils.js +12 -0
- package/utils/number-utils.js.map +1 -1
- package/utils/typescript-utils.d.ts +6 -0
- package/xhr/index.js +28 -28
- package/xhr/index.js.map +1 -1
- package/xml/index.js.map +1 -1
- package/data/dom-events/dom-event.d.ts +0 -141
- package/data/dom-events/dom-event.js +0 -342
- package/data/dom-events/dom-event.js.map +0 -1
- package/profiling/jamie.d.ts +0 -9
- package/profiling/jamie.js +0 -32
- package/profiling/jamie.js.map +0 -1
- package/ui/frame/fragment.transitions.ios.d.ts +0 -2
- package/ui/frame/fragment.transitions.ios.js +0 -85
- package/ui/frame/fragment.transitions.ios.js.map +0 -1
package/ui/list-view/index.d.ts
CHANGED
|
@@ -107,9 +107,8 @@ export class ListView extends View {
|
|
|
107
107
|
* @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change").
|
|
108
108
|
* @param callback - Callback function which will be executed when event is raised.
|
|
109
109
|
* @param thisArg - An optional parameter which will be used as `this` context for callback execution.
|
|
110
|
-
* @param options An optional parameter. If passed as a boolean, configures the useCapture value. Otherwise, specifies options.
|
|
111
110
|
*/
|
|
112
|
-
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any
|
|
111
|
+
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void;
|
|
113
112
|
|
|
114
113
|
/**
|
|
115
114
|
* Raised when a View for the data at the specified index should be created.
|
|
@@ -117,17 +116,17 @@ export class ListView extends View {
|
|
|
117
116
|
* Note, that the view property of the event data can be pre-initialized with
|
|
118
117
|
* an old instance of a view, so that it can be reused.
|
|
119
118
|
*/
|
|
120
|
-
on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any
|
|
119
|
+
on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void;
|
|
121
120
|
|
|
122
121
|
/**
|
|
123
122
|
* Raised when an item inside the ListView is tapped.
|
|
124
123
|
*/
|
|
125
|
-
on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any
|
|
124
|
+
on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any): void;
|
|
126
125
|
|
|
127
126
|
/**
|
|
128
127
|
* Raised when the ListView is scrolled so that its last item is visible.
|
|
129
128
|
*/
|
|
130
|
-
on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any
|
|
129
|
+
on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any): void;
|
|
131
130
|
}
|
|
132
131
|
|
|
133
132
|
/**
|
|
@@ -165,8 +164,8 @@ export interface TemplatedItemsView {
|
|
|
165
164
|
itemTemplate: string | Template;
|
|
166
165
|
itemTemplates?: string | Array<KeyedTemplate>;
|
|
167
166
|
refresh(): void;
|
|
168
|
-
on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any
|
|
169
|
-
off(event: 'itemLoading', callback: (args: EventData) => void, thisArg?: any
|
|
167
|
+
on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void;
|
|
168
|
+
off(event: 'itemLoading', callback: (args: EventData) => void, thisArg?: any): void;
|
|
170
169
|
}
|
|
171
170
|
|
|
172
171
|
/**
|
|
@@ -41,10 +41,10 @@ export declare abstract class ListViewBase extends ContainerView implements List
|
|
|
41
41
|
protected updateEffectiveRowHeight(): void;
|
|
42
42
|
}
|
|
43
43
|
export interface ListViewBase {
|
|
44
|
-
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any
|
|
45
|
-
on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any
|
|
46
|
-
on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any
|
|
47
|
-
on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any
|
|
44
|
+
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void;
|
|
45
|
+
on(event: 'itemLoading', callback: (args: ItemEventData) => void, thisArg?: any): void;
|
|
46
|
+
on(event: 'itemTap', callback: (args: ItemEventData) => void, thisArg?: any): void;
|
|
47
|
+
on(event: 'loadMoreItems', callback: (args: EventData) => void, thisArg?: any): void;
|
|
48
48
|
}
|
|
49
49
|
/**
|
|
50
50
|
* Represents the property backing the items property of each ListView instance.
|
|
@@ -8,6 +8,7 @@ import { Label } from '../label';
|
|
|
8
8
|
import { Observable } from '../../data/observable';
|
|
9
9
|
import { ObservableArray } from '../../data/observable-array';
|
|
10
10
|
import { addWeakEventListener, removeWeakEventListener } from '../core/weak-event-listener';
|
|
11
|
+
import { isFunction } from '../../utils/types';
|
|
11
12
|
const autoEffectiveRowHeight = -1;
|
|
12
13
|
let ListViewBase = class ListViewBase extends ContainerView {
|
|
13
14
|
constructor() {
|
|
@@ -18,9 +19,14 @@ let ListViewBase = class ListViewBase extends ContainerView {
|
|
|
18
19
|
key: 'default',
|
|
19
20
|
createView: () => {
|
|
20
21
|
if (__UI_USE_EXTERNAL_RENDERER__) {
|
|
22
|
+
if (isFunction(this.itemTemplate)) {
|
|
23
|
+
return this.itemTemplate();
|
|
24
|
+
}
|
|
21
25
|
}
|
|
22
|
-
else
|
|
23
|
-
|
|
26
|
+
else {
|
|
27
|
+
if (this.itemTemplate) {
|
|
28
|
+
return Builder.parse(this.itemTemplate, this);
|
|
29
|
+
}
|
|
24
30
|
}
|
|
25
31
|
return undefined;
|
|
26
32
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/list-view/list-view-common.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,aAAa,EAA2B,OAAO,EAAE,MAAM,cAAc,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAa,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAe,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"list-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/list-view/list-view-common.ts"],"names":[],"mappings":"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"}
|
package/ui/page/index.d.ts
CHANGED
|
@@ -115,29 +115,28 @@ export declare class Page extends PageBase {
|
|
|
115
115
|
* @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change").
|
|
116
116
|
* @param callback - Callback function which will be executed when event is raised.
|
|
117
117
|
* @param thisArg - An optional parameter which will be used as `this` context for callback execution.
|
|
118
|
-
* @param options An optional parameter. If passed as a boolean, configures the useCapture value. Otherwise, specifies options.
|
|
119
118
|
*/
|
|
120
|
-
public on(eventNames: string, callback: (data: EventData) => void, thisArg?: any
|
|
119
|
+
public on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void;
|
|
121
120
|
|
|
122
121
|
/**
|
|
123
122
|
* Raised when navigation to the page has started.
|
|
124
123
|
*/
|
|
125
|
-
public on(event: 'navigatingTo', callback: (args: NavigatedData) => void, thisArg?: any
|
|
124
|
+
public on(event: 'navigatingTo', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
126
125
|
|
|
127
126
|
/**
|
|
128
127
|
* Raised when navigation to the page has finished.
|
|
129
128
|
*/
|
|
130
|
-
public on(event: 'navigatedTo', callback: (args: NavigatedData) => void, thisArg?: any
|
|
129
|
+
public on(event: 'navigatedTo', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
131
130
|
|
|
132
131
|
/**
|
|
133
132
|
* Raised when navigation from the page has started.
|
|
134
133
|
*/
|
|
135
|
-
public on(event: 'navigatingFrom', callback: (args: NavigatedData) => void, thisArg?: any
|
|
134
|
+
public on(event: 'navigatingFrom', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
136
135
|
|
|
137
136
|
/**
|
|
138
137
|
* Raised when navigation from the page has finished.
|
|
139
138
|
*/
|
|
140
|
-
public on(event: 'navigatedFrom', callback: (args: NavigatedData) => void, thisArg?: any
|
|
139
|
+
public on(event: 'navigatedFrom', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
141
140
|
//@private
|
|
142
141
|
|
|
143
142
|
/**
|
package/ui/page/index.ios.d.ts
CHANGED
|
@@ -11,6 +11,9 @@ declare class UIViewControllerImpl extends UIViewController {
|
|
|
11
11
|
private startRunningLayout;
|
|
12
12
|
private finishRunningLayout;
|
|
13
13
|
private runLayout;
|
|
14
|
+
layoutTimer: number;
|
|
15
|
+
private clearScheduledLayout;
|
|
16
|
+
private scheduleLayout;
|
|
14
17
|
static initWithOwner(owner: WeakRef<Page>): UIViewControllerImpl;
|
|
15
18
|
viewDidLoad(): void;
|
|
16
19
|
viewWillAppear(animated: boolean): void;
|
|
@@ -20,6 +23,7 @@ declare class UIViewControllerImpl extends UIViewController {
|
|
|
20
23
|
viewWillLayoutSubviews(): void;
|
|
21
24
|
viewSafeAreaInsetsDidChange(): void;
|
|
22
25
|
viewDidLayoutSubviews(): void;
|
|
26
|
+
layoutOwner(force?: boolean): void;
|
|
23
27
|
traitCollectionDidChange(previousTraitCollection: UITraitCollection): void;
|
|
24
28
|
get preferredStatusBarStyle(): UIStatusBarStyle;
|
|
25
29
|
}
|
package/ui/page/index.ios.js
CHANGED
|
@@ -6,6 +6,7 @@ import { PageBase, actionBarHiddenProperty, statusBarStyleProperty } from './pag
|
|
|
6
6
|
import { profile } from '../../profiling';
|
|
7
7
|
import { iOSNativeHelper, layout } from '../../utils';
|
|
8
8
|
import { getLastFocusedViewOnPage, isAccessibilityServiceEnabled } from '../../accessibility';
|
|
9
|
+
import { SharedTransition } from '../transition/shared-transition';
|
|
9
10
|
export * from './page-common';
|
|
10
11
|
const ENTRY = '_entry';
|
|
11
12
|
const DELEGATE = '_delegate';
|
|
@@ -66,6 +67,7 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
66
67
|
};
|
|
67
68
|
UIViewControllerImpl.prototype.finishRunningLayout = function () {
|
|
68
69
|
this._isRunningLayout--;
|
|
70
|
+
this.clearScheduledLayout();
|
|
69
71
|
};
|
|
70
72
|
UIViewControllerImpl.prototype.runLayout = function (cb) {
|
|
71
73
|
try {
|
|
@@ -76,6 +78,24 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
76
78
|
this.finishRunningLayout();
|
|
77
79
|
}
|
|
78
80
|
};
|
|
81
|
+
UIViewControllerImpl.prototype.clearScheduledLayout = function () {
|
|
82
|
+
if (this.layoutTimer) {
|
|
83
|
+
clearTimeout(this.layoutTimer);
|
|
84
|
+
this.layoutTimer = null;
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
UIViewControllerImpl.prototype.scheduleLayout = function () {
|
|
88
|
+
var _this = this;
|
|
89
|
+
if (this.layoutTimer) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
setTimeout(function () {
|
|
93
|
+
_this.layoutTimer = null;
|
|
94
|
+
if (!_this.isRunningLayout) {
|
|
95
|
+
_this.runLayout(function () { return _this.layoutOwner(); });
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
};
|
|
79
99
|
UIViewControllerImpl.initWithOwner = function (owner) {
|
|
80
100
|
var controller = UIViewControllerImpl.new();
|
|
81
101
|
controller._owner = owner;
|
|
@@ -96,7 +116,14 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
96
116
|
return;
|
|
97
117
|
}
|
|
98
118
|
var frame = this.navigationController ? this.navigationController.owner : null;
|
|
119
|
+
var newEntry = this[ENTRY];
|
|
120
|
+
// Don't raise event if currentPage was showing modal page.
|
|
121
|
+
if (!owner._presentedViewController && newEntry && (!frame || frame.currentPage !== owner)) {
|
|
122
|
+
var isBack = isBackNavigationTo(owner, newEntry);
|
|
123
|
+
owner.onNavigatingTo(newEntry.entry.context, isBack, newEntry.entry.bindingContext);
|
|
124
|
+
}
|
|
99
125
|
if (frame) {
|
|
126
|
+
frame._resolvedPage = owner;
|
|
100
127
|
if (!owner.parent) {
|
|
101
128
|
owner._frame = frame;
|
|
102
129
|
if (!frame._styleScope) {
|
|
@@ -166,8 +193,12 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
166
193
|
// _processNavigationQueue will shift navigationQueue. Check canGoBack after that.
|
|
167
194
|
// Workaround for disabled backswipe on second custom native transition
|
|
168
195
|
if (frame.canGoBack()) {
|
|
169
|
-
|
|
170
|
-
|
|
196
|
+
var transitionState = SharedTransition.getState(owner.transitionId);
|
|
197
|
+
if (!(transitionState === null || transitionState === void 0 ? void 0 : transitionState.interactive)) {
|
|
198
|
+
// only consider when interactive transitions are not enabled
|
|
199
|
+
navigationController.interactivePopGestureRecognizer.delegate = navigationController;
|
|
200
|
+
navigationController.interactivePopGestureRecognizer.enabled = owner.enableSwipeBackNavigation;
|
|
201
|
+
}
|
|
171
202
|
}
|
|
172
203
|
else {
|
|
173
204
|
navigationController.interactivePopGestureRecognizer.enabled = false;
|
|
@@ -228,68 +259,71 @@ var UIViewControllerImpl = /** @class */ (function (_super) {
|
|
|
228
259
|
}
|
|
229
260
|
};
|
|
230
261
|
UIViewControllerImpl.prototype.viewSafeAreaInsetsDidChange = function () {
|
|
231
|
-
var _this = this;
|
|
232
|
-
var _a;
|
|
233
262
|
_super.prototype.viewSafeAreaInsetsDidChange.call(this);
|
|
234
|
-
|
|
235
|
-
return;
|
|
236
|
-
}
|
|
237
|
-
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
238
|
-
if (owner) {
|
|
239
|
-
this.runLayout(function () { return IOSHelper.layoutView(_this, owner); });
|
|
240
|
-
}
|
|
263
|
+
this.scheduleLayout();
|
|
241
264
|
};
|
|
242
265
|
UIViewControllerImpl.prototype.viewDidLayoutSubviews = function () {
|
|
243
|
-
var _a;
|
|
244
266
|
this.startRunningLayout();
|
|
245
267
|
_super.prototype.viewDidLayoutSubviews.call(this);
|
|
268
|
+
this.layoutOwner();
|
|
269
|
+
this.finishRunningLayout();
|
|
270
|
+
};
|
|
271
|
+
UIViewControllerImpl.prototype.layoutOwner = function (force) {
|
|
272
|
+
var _a, _b, _c, _d;
|
|
273
|
+
if (force === void 0) { force = false; }
|
|
246
274
|
var owner = (_a = this._owner) === null || _a === void 0 ? void 0 : _a.deref();
|
|
247
|
-
if (owner) {
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
275
|
+
if (!owner) {
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
if (!force && owner.isLayoutValid && !((_d = (_b = owner.nativeViewProtected) === null || _b === void 0 ? void 0 : (_c = _b.layer).needsLayout) === null || _d === void 0 ? void 0 : _d.call(_c))) {
|
|
279
|
+
// we skip layout if the view is not yet laid out yet
|
|
280
|
+
// this usually means that viewDidLayoutSubviews will be called again
|
|
281
|
+
// so doing a layout pass now will layout with the wrong parameters
|
|
282
|
+
return;
|
|
283
|
+
}
|
|
284
|
+
// layout(owner.actionBar)
|
|
285
|
+
// layout(owner.content)
|
|
286
|
+
if (majorVersion >= 11) {
|
|
287
|
+
// Handle nested Page safe area insets application.
|
|
288
|
+
// A Page is nested if its Frame has a parent.
|
|
289
|
+
// If the Page is nested, cross check safe area insets on top and bottom with Frame parent.
|
|
290
|
+
var frame = owner.parent;
|
|
291
|
+
// There is a legacy scenario where Page is not in a Frame - the root of a Modal View, so it has no parent.
|
|
292
|
+
var frameParent = frame && frame.parent;
|
|
293
|
+
// Handle Angular scenario where TabView is in a ProxyViewContainer
|
|
294
|
+
// It is possible to wrap components in ProxyViewContainers indefinitely
|
|
295
|
+
// Not using instanceof ProxyViewContainer to avoid circular dependency
|
|
296
|
+
// TODO: Try moving UIViewControllerImpl out of page module
|
|
297
|
+
while (frameParent && !frameParent.nativeViewProtected) {
|
|
298
|
+
frameParent = frameParent.parent;
|
|
299
|
+
}
|
|
300
|
+
if (frameParent) {
|
|
301
|
+
var parentPageInsetsTop = frameParent.nativeViewProtected.safeAreaInsets.top;
|
|
302
|
+
var parentPageInsetsBottom = frameParent.nativeViewProtected.safeAreaInsets.bottom;
|
|
303
|
+
var currentInsetsTop = this.view.safeAreaInsets.top;
|
|
304
|
+
var currentInsetsBottom = this.view.safeAreaInsets.bottom;
|
|
305
|
+
// Safe area insets include additional safe area insets too, so subtract old values
|
|
306
|
+
if (this.additionalSafeAreaInsets) {
|
|
307
|
+
currentInsetsTop -= this.additionalSafeAreaInsets.top;
|
|
308
|
+
currentInsetsBottom -= this.additionalSafeAreaInsets.bottom;
|
|
263
309
|
}
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
var
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
var additionalInsets = new UIEdgeInsets({
|
|
278
|
-
top: additionalInsetsTop,
|
|
279
|
-
left: 0,
|
|
280
|
-
bottom: additionalInsetsBottom,
|
|
281
|
-
right: 0,
|
|
282
|
-
});
|
|
283
|
-
this.additionalSafeAreaInsets = additionalInsets;
|
|
284
|
-
}
|
|
285
|
-
else {
|
|
286
|
-
this.additionalSafeAreaInsets = null;
|
|
287
|
-
}
|
|
310
|
+
var additionalInsetsTop = Math.max(parentPageInsetsTop - currentInsetsTop, 0);
|
|
311
|
+
var additionalInsetsBottom = Math.max(parentPageInsetsBottom - currentInsetsBottom, 0);
|
|
312
|
+
if (additionalInsetsTop > 0 || additionalInsetsBottom > 0) {
|
|
313
|
+
var additionalInsets = new UIEdgeInsets({
|
|
314
|
+
top: additionalInsetsTop,
|
|
315
|
+
left: 0,
|
|
316
|
+
bottom: additionalInsetsBottom,
|
|
317
|
+
right: 0,
|
|
318
|
+
});
|
|
319
|
+
this.additionalSafeAreaInsets = additionalInsets;
|
|
320
|
+
}
|
|
321
|
+
else {
|
|
322
|
+
this.additionalSafeAreaInsets = null;
|
|
288
323
|
}
|
|
289
324
|
}
|
|
290
|
-
IOSHelper.layoutView(this, owner);
|
|
291
325
|
}
|
|
292
|
-
|
|
326
|
+
IOSHelper.layoutView(this, owner);
|
|
293
327
|
};
|
|
294
328
|
// Mind implementation for other controllerss
|
|
295
329
|
UIViewControllerImpl.prototype.traitCollectionDidChange = function (previousTraitCollection) {
|
|
@@ -350,9 +384,8 @@ export class Page extends PageBase {
|
|
|
350
384
|
super();
|
|
351
385
|
this._backgroundColor = majorVersion <= 12 && !UIColor.systemBackgroundColor ? UIColor.whiteColor : UIColor.systemBackgroundColor;
|
|
352
386
|
const controller = UIViewControllerImpl.initWithOwner(new WeakRef(this));
|
|
353
|
-
this.viewController = this._ios = controller;
|
|
354
|
-
// Make transitions look good
|
|
355
387
|
controller.view.backgroundColor = this._backgroundColor;
|
|
388
|
+
this.viewController = this._ios = controller;
|
|
356
389
|
}
|
|
357
390
|
createNativeView() {
|
|
358
391
|
return this.viewController.view;
|
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,eAAe;AACf,OAAO,EAAyB,cAAc,EAAE,MAAM,UAAU,CAAC;AAEjE,SAAS;AACT,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAE1F,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/page/index.ios.ts"],"names":[],"mappings":"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"}
|
package/ui/page/page-common.d.ts
CHANGED
|
@@ -1,45 +1,78 @@
|
|
|
1
1
|
import { Page as PageDefinition } from '.';
|
|
2
2
|
import { ContentView } from '../content-view';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
3
|
+
import { View, ShownModallyData } from '../core/view';
|
|
4
|
+
import { Property, CssProperty } from '../core/properties';
|
|
5
|
+
import { Style } from '../styling/style';
|
|
6
6
|
import { Color } from '../../color';
|
|
7
|
+
import { EventData } from '../../data/observable';
|
|
8
|
+
import type { Frame } from '../frame';
|
|
7
9
|
import { ActionBar } from '../action-bar';
|
|
8
|
-
import {
|
|
10
|
+
import { KeyframeAnimationInfo } from '../animation/keyframe-animation';
|
|
11
|
+
interface NavigatedData extends EventData {
|
|
12
|
+
context: any;
|
|
13
|
+
isBackNavigation: boolean;
|
|
14
|
+
}
|
|
9
15
|
export declare class PageBase extends ContentView {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
16
|
+
static navigatingToEvent: string;
|
|
17
|
+
static navigatedToEvent: string;
|
|
18
|
+
static navigatingFromEvent: string;
|
|
19
|
+
static navigatedFromEvent: string;
|
|
20
|
+
private _navigationContext;
|
|
21
|
+
private _actionBar;
|
|
22
|
+
_frame: Frame;
|
|
23
|
+
actionBarHidden: boolean;
|
|
24
|
+
enableSwipeBackNavigation: boolean;
|
|
25
|
+
backgroundSpanUnderStatusBar: boolean;
|
|
26
|
+
hasActionBar: boolean;
|
|
27
|
+
accessibilityAnnouncePageEnabled: boolean;
|
|
28
|
+
get navigationContext(): any;
|
|
29
|
+
get actionBar(): ActionBar;
|
|
30
|
+
set actionBar(value: ActionBar);
|
|
31
|
+
get statusBarStyle(): 'light' | 'dark';
|
|
32
|
+
set statusBarStyle(value: 'light' | 'dark');
|
|
33
|
+
get androidStatusBarBackground(): Color;
|
|
34
|
+
set androidStatusBarBackground(value: Color);
|
|
35
|
+
get page(): PageDefinition;
|
|
36
|
+
_addChildFromBuilder(name: string, value: any): void;
|
|
37
|
+
getKeyframeAnimationWithName(animationName: string): KeyframeAnimationInfo;
|
|
38
|
+
get frame(): Frame;
|
|
39
|
+
private createNavigatedData;
|
|
40
|
+
onNavigatingTo(context: any, isBackNavigation: boolean, bindingContext?: any): void;
|
|
41
|
+
onNavigatedTo(isBackNavigation: boolean): void;
|
|
42
|
+
onNavigatingFrom(isBackNavigation: boolean): void;
|
|
43
|
+
onNavigatedFrom(isBackNavigation: boolean): void;
|
|
44
|
+
eachChildView(callback: (child: View) => boolean): void;
|
|
45
|
+
get _childrenCount(): number;
|
|
46
|
+
accessibilityScreenChanged(refocus?: boolean): void;
|
|
47
|
+
}
|
|
48
|
+
export interface PageBase {
|
|
49
|
+
on(eventNames: string, callback: (data: EventData) => void, thisArg?: any): void;
|
|
50
|
+
on(event: 'navigatingTo', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
51
|
+
on(event: 'navigatedTo', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
52
|
+
on(event: 'navigatingFrom', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
53
|
+
on(event: 'navigatedFrom', callback: (args: NavigatedData) => void, thisArg?: any): void;
|
|
54
|
+
on(event: 'showingModally', callback: (args: ShownModallyData) => void, thisArg?: any): void;
|
|
55
|
+
on(event: 'shownModally', callback: (args: ShownModallyData) => void, thisArg?: any): void;
|
|
45
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* Dependency property used to hide the Navigation Bar in iOS and the Action Bar in Android.
|
|
59
|
+
*/
|
|
60
|
+
export declare const actionBarHiddenProperty: Property<PageBase, boolean>;
|
|
61
|
+
/**
|
|
62
|
+
* Dependency property that specify if page background should span under status bar.
|
|
63
|
+
*/
|
|
64
|
+
export declare const backgroundSpanUnderStatusBarProperty: Property<PageBase, boolean>;
|
|
65
|
+
/**
|
|
66
|
+
* Dependency property used to control if swipe back navigation in iOS is enabled.
|
|
67
|
+
* This property is iOS specific. Default value: true
|
|
68
|
+
*/
|
|
69
|
+
export declare const enableSwipeBackNavigationProperty: Property<PageBase, boolean>;
|
|
70
|
+
/**
|
|
71
|
+
* Property backing statusBarStyle.
|
|
72
|
+
*/
|
|
73
|
+
export declare const statusBarStyleProperty: CssProperty<Style, "light" | "dark">;
|
|
74
|
+
/**
|
|
75
|
+
* Property backing androidStatusBarBackground.
|
|
76
|
+
*/
|
|
77
|
+
export declare const androidStatusBarBackgroundProperty: CssProperty<Style, Color>;
|
|
78
|
+
export {};
|
|
@@ -7,6 +7,6 @@ export declare class Placeholder extends View {
|
|
|
7
7
|
createNativeView(): globalAndroid.view.View;
|
|
8
8
|
}
|
|
9
9
|
export interface Placeholder {
|
|
10
|
-
on(eventNames: string, callback: (args: EventData) => void, thisArg?: any
|
|
11
|
-
on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any
|
|
10
|
+
on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void;
|
|
11
|
+
on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void;
|
|
12
12
|
}
|
|
@@ -17,14 +17,13 @@ export class Placeholder extends View {
|
|
|
17
17
|
* @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change").
|
|
18
18
|
* @param callback - Callback function which will be executed when event is raised.
|
|
19
19
|
* @param thisArg - An optional parameter which will be used as `this` context for callback execution.
|
|
20
|
-
* @param options An optional parameter. If passed as a boolean, configures the useCapture value. Otherwise, specifies options.
|
|
21
20
|
*/
|
|
22
|
-
on(eventNames: string, callback: (args: EventData) => void, thisArg?: any
|
|
21
|
+
on(eventNames: string, callback: (args: EventData) => void, thisArg?: any): void;
|
|
23
22
|
|
|
24
23
|
/**
|
|
25
24
|
* Raised when a creatingView event occurs.
|
|
26
25
|
*/
|
|
27
|
-
on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any
|
|
26
|
+
on(event: 'creatingView', callback: (args: CreateViewEventData) => void, thisArg?: any): void;
|
|
28
27
|
}
|
|
29
28
|
|
|
30
29
|
/**
|
package/ui/repeater/index.js
CHANGED
|
@@ -7,6 +7,7 @@ import { ObservableArray } from '../../data/observable-array';
|
|
|
7
7
|
import { addWeakEventListener, removeWeakEventListener } from '../core/weak-event-listener';
|
|
8
8
|
import { Builder } from '../builder';
|
|
9
9
|
import { profile } from '../../profiling';
|
|
10
|
+
import { isFunction } from '../../utils/types';
|
|
10
11
|
/**
|
|
11
12
|
* Represents a UI Repeater component.
|
|
12
13
|
*/
|
|
@@ -82,7 +83,7 @@ let Repeater = class Repeater extends CustomLayoutView {
|
|
|
82
83
|
}
|
|
83
84
|
if (!viewToAdd) {
|
|
84
85
|
if (__UI_USE_EXTERNAL_RENDERER__) {
|
|
85
|
-
viewToAdd = this._getDefaultItemContent(i);
|
|
86
|
+
viewToAdd = isFunction(this.itemTemplate) ? this.itemTemplate() : this._getDefaultItemContent(i);
|
|
86
87
|
}
|
|
87
88
|
else {
|
|
88
89
|
viewToAdd = this.itemTemplate ? Builder.parse(this.itemTemplate, this) : this._getDefaultItemContent(i);
|
package/ui/repeater/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/core/ui/repeater/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAA2B,MAAM,cAAc,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAe,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/core/ui/repeater/index.ts"],"names":[],"mappings":"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"}
|