@nativescript/core 8.4.5 → 8.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/ui/scroll-view/index.android.d.ts +2 -3
- package/ui/scroll-view/index.android.js +16 -48
- package/ui/scroll-view/index.android.js.map +1 -1
- package/ui/scroll-view/index.ios.d.ts +2 -2
- package/ui/scroll-view/index.ios.js +11 -13
- package/ui/scroll-view/index.ios.js.map +1 -1
- package/ui/scroll-view/scroll-view-common.d.ts +7 -3
- package/ui/scroll-view/scroll-view-common.js +36 -11
- package/ui/scroll-view/scroll-view-common.js.map +1 -1
package/package.json
CHANGED
|
@@ -13,11 +13,10 @@ export declare class ScrollView extends ScrollViewBase {
|
|
|
13
13
|
scrollToHorizontalOffset(value: number, animated: boolean): void;
|
|
14
14
|
createNativeView(): org.nativescript.widgets.VerticalScrollView | org.nativescript.widgets.HorizontalScrollView;
|
|
15
15
|
initNativeView(): void;
|
|
16
|
-
protected addNativeListener(): void;
|
|
17
|
-
protected removeNativeListener(): void;
|
|
18
|
-
disposeNativeView(): void;
|
|
19
16
|
_onOrientationChanged(): void;
|
|
17
|
+
protected attachNative(): void;
|
|
20
18
|
private _lastScrollX;
|
|
21
19
|
private _lastScrollY;
|
|
22
20
|
private _onScrollChanged;
|
|
21
|
+
protected dettachNative(): void;
|
|
23
22
|
}
|
|
@@ -102,31 +102,21 @@ export class ScrollView extends ScrollViewBase {
|
|
|
102
102
|
}
|
|
103
103
|
this.nativeViewProtected.setId(this._androidViewId);
|
|
104
104
|
}
|
|
105
|
-
|
|
106
|
-
if (
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
onScrollChange(view, scrollX, scrollY) {
|
|
113
|
-
const owner = that?.get();
|
|
114
|
-
if (owner) {
|
|
115
|
-
owner.notify({
|
|
116
|
-
object: owner,
|
|
117
|
-
eventName: ScrollView.scrollEvent,
|
|
118
|
-
scrollX: layout.toDeviceIndependentPixels(scrollX),
|
|
119
|
-
scrollY: layout.toDeviceIndependentPixels(scrollY),
|
|
120
|
-
});
|
|
121
|
-
}
|
|
122
|
-
},
|
|
123
|
-
});
|
|
124
|
-
this.nativeViewProtected.setOnScrollChangeListener(this.scrollChangeHandler);
|
|
105
|
+
_onOrientationChanged() {
|
|
106
|
+
if (this.nativeViewProtected) {
|
|
107
|
+
const parent = this.parent;
|
|
108
|
+
if (parent) {
|
|
109
|
+
parent._removeView(this);
|
|
110
|
+
parent._addView(this);
|
|
111
|
+
}
|
|
125
112
|
}
|
|
126
|
-
|
|
113
|
+
}
|
|
114
|
+
attachNative() {
|
|
115
|
+
if (!this.handler) {
|
|
116
|
+
const that = new WeakRef(this);
|
|
127
117
|
this.handler = new android.view.ViewTreeObserver.OnScrollChangedListener({
|
|
128
118
|
onScrollChanged: function () {
|
|
129
|
-
const owner = that
|
|
119
|
+
const owner = that.get();
|
|
130
120
|
if (owner) {
|
|
131
121
|
owner._onScrollChanged();
|
|
132
122
|
}
|
|
@@ -135,32 +125,6 @@ export class ScrollView extends ScrollViewBase {
|
|
|
135
125
|
this.nativeViewProtected.getViewTreeObserver().addOnScrollChangedListener(this.handler);
|
|
136
126
|
}
|
|
137
127
|
}
|
|
138
|
-
removeNativeListener() {
|
|
139
|
-
if (!this.nativeViewProtected) {
|
|
140
|
-
return;
|
|
141
|
-
}
|
|
142
|
-
if (this.handler) {
|
|
143
|
-
this.nativeViewProtected?.getViewTreeObserver().removeOnScrollChangedListener(this.handler);
|
|
144
|
-
this.handler = null;
|
|
145
|
-
}
|
|
146
|
-
if (this.scrollChangeHandler) {
|
|
147
|
-
this.nativeView?.setOnScrollChangeListener(null);
|
|
148
|
-
this.scrollChangeHandler = null;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
disposeNativeView() {
|
|
152
|
-
this.removeNativeListener();
|
|
153
|
-
super.disposeNativeView();
|
|
154
|
-
}
|
|
155
|
-
_onOrientationChanged() {
|
|
156
|
-
if (this.nativeViewProtected) {
|
|
157
|
-
const parent = this.parent;
|
|
158
|
-
if (parent) {
|
|
159
|
-
parent._removeView(this);
|
|
160
|
-
parent._addView(this);
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
128
|
_onScrollChanged() {
|
|
165
129
|
const nativeView = this.nativeViewProtected;
|
|
166
130
|
if (nativeView) {
|
|
@@ -180,6 +144,10 @@ export class ScrollView extends ScrollViewBase {
|
|
|
180
144
|
}
|
|
181
145
|
}
|
|
182
146
|
}
|
|
147
|
+
dettachNative() {
|
|
148
|
+
this.nativeViewProtected.getViewTreeObserver().removeOnScrollChangedListener(this.handler);
|
|
149
|
+
this.handler = null;
|
|
150
|
+
}
|
|
183
151
|
}
|
|
184
152
|
ScrollView.prototype.recycleNativeView = 'never';
|
|
185
153
|
//# sourceMappingURL=index.android.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/index.android.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,gCAAgC,EAAE,MAAM,cAAc,CAAC;AAEhE,cAAc,sBAAsB,CAAC;AAErC,MAAM,OAAO,UAAW,SAAQ,cAAc;IAA9C;;QAES,mBAAc,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/index.android.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,9 @@ export declare class ScrollView extends ScrollViewBase {
|
|
|
8
8
|
createNativeView(): UIScrollView;
|
|
9
9
|
initNativeView(): void;
|
|
10
10
|
disposeNativeView(): void;
|
|
11
|
-
protected addNativeListener(): void;
|
|
12
|
-
protected removeNativeListener(): void;
|
|
13
11
|
_setNativeClipToBounds(): void;
|
|
12
|
+
protected attachNative(): void;
|
|
13
|
+
protected dettachNative(): void;
|
|
14
14
|
protected updateScrollBarVisibility(value: any): void;
|
|
15
15
|
get horizontalOffset(): number;
|
|
16
16
|
get verticalOffset(): number;
|
|
@@ -43,29 +43,27 @@ export class ScrollView extends ScrollViewBase {
|
|
|
43
43
|
this._setNativeClipToBounds();
|
|
44
44
|
}
|
|
45
45
|
disposeNativeView() {
|
|
46
|
-
this.
|
|
46
|
+
this.dettachNative();
|
|
47
47
|
this._delegate = null;
|
|
48
48
|
super.disposeNativeView();
|
|
49
49
|
}
|
|
50
|
-
|
|
50
|
+
_setNativeClipToBounds() {
|
|
51
51
|
if (!this.nativeViewProtected) {
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
|
-
|
|
55
|
-
this.nativeViewProtected.
|
|
54
|
+
// Always set clipsToBounds for scroll-view
|
|
55
|
+
this.nativeViewProtected.clipsToBounds = true;
|
|
56
56
|
}
|
|
57
|
-
|
|
58
|
-
if (!this.
|
|
59
|
-
|
|
57
|
+
attachNative() {
|
|
58
|
+
if (!this._delegate) {
|
|
59
|
+
this._delegate = UIScrollViewDelegateImpl.initWithOwner(new WeakRef(this));
|
|
60
|
+
this.nativeViewProtected.delegate = this._delegate;
|
|
60
61
|
}
|
|
61
|
-
this.nativeViewProtected.delegate = null;
|
|
62
62
|
}
|
|
63
|
-
|
|
64
|
-
if (
|
|
65
|
-
|
|
63
|
+
dettachNative() {
|
|
64
|
+
if (this.nativeViewProtected) {
|
|
65
|
+
this.nativeViewProtected.delegate = null;
|
|
66
66
|
}
|
|
67
|
-
// Always set clipsToBounds for scroll-view
|
|
68
|
-
this.nativeViewProtected.clipsToBounds = true;
|
|
69
67
|
}
|
|
70
68
|
updateScrollBarVisibility(value) {
|
|
71
69
|
if (!this.nativeViewProtected) {
|
|
@@ -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,eAAe,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,cAAc,sBAAsB,CAAC;AAErC,MAAM,YAAY,GAAG,eAAe,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BlD,MAAM,OAAO,UAAW,SAAQ,cAAc;IAA9C;;QAES,0BAAqB,GAAG,CAAC,CAAC;QAC1B,2BAAsB,GAAG,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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"}
|
|
@@ -4,15 +4,19 @@ import { Property } from '../core/properties';
|
|
|
4
4
|
import { EventData } from '../../data/observable';
|
|
5
5
|
import { CoreTypes } from '../../core-types';
|
|
6
6
|
export declare abstract class ScrollViewBase extends ContentView implements ScrollViewDefinition {
|
|
7
|
-
private
|
|
7
|
+
private _scrollChangeCount;
|
|
8
8
|
static scrollEvent: string;
|
|
9
9
|
orientation: CoreTypes.OrientationType;
|
|
10
10
|
scrollBarIndicatorVisible: boolean;
|
|
11
11
|
isScrollEnabled: boolean;
|
|
12
12
|
addEventListener(arg: string, callback: any, thisArg?: any): void;
|
|
13
13
|
removeEventListener(arg: string, callback: any, thisArg?: any): void;
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
onLoaded(): void;
|
|
15
|
+
disposeNativeView(): void;
|
|
16
|
+
private attach;
|
|
17
|
+
private dettach;
|
|
18
|
+
protected attachNative(): void;
|
|
19
|
+
protected dettachNative(): void;
|
|
16
20
|
get horizontalOffset(): number;
|
|
17
21
|
get verticalOffset(): number;
|
|
18
22
|
get scrollableWidth(): number;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
var ScrollViewBase_1;
|
|
2
2
|
import { ContentView } from '../content-view';
|
|
3
|
+
import { profile } from '../../profiling';
|
|
3
4
|
import { Property, makeParser, makeValidator } from '../core/properties';
|
|
4
5
|
import { CSSType } from '../core/view';
|
|
5
6
|
import { booleanConverter } from '../core/view-base';
|
|
@@ -7,27 +8,45 @@ import { CoreTypes } from '../../core-types';
|
|
|
7
8
|
let ScrollViewBase = ScrollViewBase_1 = class ScrollViewBase extends ContentView {
|
|
8
9
|
constructor() {
|
|
9
10
|
super(...arguments);
|
|
10
|
-
this.
|
|
11
|
+
this._scrollChangeCount = 0;
|
|
11
12
|
}
|
|
12
13
|
addEventListener(arg, callback, thisArg) {
|
|
13
14
|
super.addEventListener(arg, callback, thisArg);
|
|
14
|
-
if (arg === ScrollViewBase_1.scrollEvent
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
15
|
+
if (arg === ScrollViewBase_1.scrollEvent) {
|
|
16
|
+
this._scrollChangeCount++;
|
|
17
|
+
this.attach();
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
removeEventListener(arg, callback, thisArg) {
|
|
20
21
|
super.removeEventListener(arg, callback, thisArg);
|
|
21
|
-
if (arg === ScrollViewBase_1.scrollEvent
|
|
22
|
-
this.
|
|
23
|
-
this.
|
|
22
|
+
if (arg === ScrollViewBase_1.scrollEvent) {
|
|
23
|
+
this._scrollChangeCount--;
|
|
24
|
+
this.dettach();
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
onLoaded() {
|
|
28
|
+
super.onLoaded();
|
|
29
|
+
this.attach();
|
|
28
30
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
+
disposeNativeView() {
|
|
32
|
+
this.dettach();
|
|
33
|
+
super.disposeNativeView();
|
|
34
|
+
}
|
|
35
|
+
attach() {
|
|
36
|
+
if (this._scrollChangeCount > 0 && this.isLoaded) {
|
|
37
|
+
this.attachNative();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
dettach() {
|
|
41
|
+
if (this._scrollChangeCount === 0 && this.isLoaded) {
|
|
42
|
+
this.dettachNative();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
attachNative() {
|
|
46
|
+
//
|
|
47
|
+
}
|
|
48
|
+
dettachNative() {
|
|
49
|
+
//
|
|
31
50
|
}
|
|
32
51
|
get horizontalOffset() {
|
|
33
52
|
return 0;
|
|
@@ -43,6 +62,12 @@ let ScrollViewBase = ScrollViewBase_1 = class ScrollViewBase extends ContentView
|
|
|
43
62
|
}
|
|
44
63
|
};
|
|
45
64
|
ScrollViewBase.scrollEvent = 'scroll';
|
|
65
|
+
__decorate([
|
|
66
|
+
profile,
|
|
67
|
+
__metadata("design:type", Function),
|
|
68
|
+
__metadata("design:paramtypes", []),
|
|
69
|
+
__metadata("design:returntype", void 0)
|
|
70
|
+
], ScrollViewBase.prototype, "onLoaded", null);
|
|
46
71
|
ScrollViewBase = ScrollViewBase_1 = __decorate([
|
|
47
72
|
CSSType('ScrollView')
|
|
48
73
|
], ScrollViewBase);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/scroll-view-common.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"scroll-view-common.js","sourceRoot":"","sources":["../../../../../packages/core/ui/scroll-view/scroll-view-common.ts"],"names":[],"mappings":"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"}
|