@triniwiz/nativescript-masonkit 1.0.0-alpha.24 → 1.0.0-alpha.25
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/common.d.ts +6 -5
- package/common.js +44 -12
- package/common.js.map +1 -1
- package/img/index.android.d.ts +0 -1
- package/img/index.android.js +2 -3
- package/img/index.android.js.map +1 -1
- package/img/index.ios.d.ts +1 -1
- package/img/index.ios.js +28 -18
- package/img/index.ios.js.map +1 -1
- package/package.json +1 -1
- package/platforms/android/masonkit-release.aar +0 -0
- package/platforms/ios/Mason.xcframework/Info.plist +5 -5
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/Mason-Swift.h +122 -11
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/Mason.h +0 -5
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/NSObject+MasonElement_Defaults.h +100 -0
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Mason +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.abi.json +29619 -25969
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.private.swiftinterface +314 -181
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.swiftdoc +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.swiftinterface +314 -181
- package/platforms/ios/Mason.xcframework/ios-arm64/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64/dSYMs/Mason.framework.dSYM/Contents/Resources/Relocations/aarch64/Mason.yml +3066 -2864
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/Mason-Swift.h +244 -22
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/Mason.h +0 -5
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/NSObject+MasonElement_Defaults.h +100 -0
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Mason +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.abi.json +17763 -14134
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +314 -181
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftdoc +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftinterface +314 -181
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json +17763 -14134
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +314 -181
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftdoc +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +314 -181
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/_CodeSignature/CodeResources +28 -28
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason +0 -0
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/Relocations/aarch64/Mason.yml +3059 -2864
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/Relocations/x86_64/Mason.yml +2986 -2779
- package/scroll/index.android.d.ts +1 -2
- package/scroll/index.android.js +27 -14
- package/scroll/index.android.js.map +1 -1
- package/scroll/index.ios.d.ts +1 -2
- package/scroll/index.ios.js +46 -21
- package/scroll/index.ios.js.map +1 -1
- package/style.d.ts +6 -0
- package/style.js +117 -6
- package/style.js.map +1 -1
- package/text/index.android.d.ts +2 -1
- package/text/index.android.js +12 -8
- package/text/index.android.js.map +1 -1
- package/text/index.ios.d.ts +4 -4
- package/text/index.ios.js +56 -40
- package/text/index.ios.js.map +1 -1
- package/utils/index.android.js +4 -4
- package/utils/index.android.js.map +1 -1
- package/utils/index.ios.js +11 -11
- package/utils/index.ios.js.map +1 -1
- package/view/index.android.d.ts +1 -2
- package/view/index.android.js +28 -15
- package/view/index.android.js.map +1 -1
- package/view/index.ios.d.ts +1 -2
- package/view/index.ios.js +43 -19
- package/view/index.ios.js.map +1 -1
package/view/index.android.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
import { CSSType, Utils } from '@nativescript/core';
|
|
2
|
-
import { style_, ViewBase } from '../common';
|
|
2
|
+
import { isMasonView_, style_, ViewBase } from '../common';
|
|
3
3
|
import { Tree } from '../tree';
|
|
4
4
|
import { Style } from '../style';
|
|
5
5
|
let View = class View extends ViewBase {
|
|
6
6
|
constructor() {
|
|
7
7
|
super();
|
|
8
|
-
this._hasNativeView = false;
|
|
9
8
|
this._inBatch = false;
|
|
10
|
-
|
|
11
|
-
this
|
|
12
|
-
this._view = view;
|
|
13
|
-
this._isMasonView = true;
|
|
9
|
+
this._view = Tree.instance.createView(Utils.android.getCurrentActivity() || Utils.android.getApplicationContext());
|
|
10
|
+
this[isMasonView_] = true;
|
|
14
11
|
}
|
|
15
12
|
get _styleHelper() {
|
|
16
13
|
if (this[style_] === undefined) {
|
|
@@ -21,20 +18,38 @@ let View = class View extends ViewBase {
|
|
|
21
18
|
createNativeView() {
|
|
22
19
|
return this._view;
|
|
23
20
|
}
|
|
24
|
-
disposeNativeView() {
|
|
25
|
-
this._hasNativeView = false;
|
|
26
|
-
super.disposeNativeView();
|
|
27
|
-
}
|
|
28
21
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
29
22
|
// @ts-ignore
|
|
30
23
|
get android() {
|
|
31
24
|
return this._view;
|
|
32
25
|
}
|
|
26
|
+
set text(value) {
|
|
27
|
+
const nativeView = this._view;
|
|
28
|
+
if (nativeView) {
|
|
29
|
+
// hacking vue3 to handle text nodes
|
|
30
|
+
if (global.VUE3_ELEMENT_REF) {
|
|
31
|
+
const view_ref = this[global.VUE3_ELEMENT_REF];
|
|
32
|
+
if (Array.isArray(view_ref.childNodes)) {
|
|
33
|
+
if (view_ref.childNodes.length === 0) {
|
|
34
|
+
nativeView.addChildAt(value || '', -1);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
view_ref.childNodes.forEach((node, index) => {
|
|
38
|
+
if (node.nodeType === 'text') {
|
|
39
|
+
nativeView.addChildAt(node.text || '', index);
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
// will replace all nodes with a new text node
|
|
46
|
+
// nativeView.setTextContent(value);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
33
50
|
// @ts-ignore
|
|
34
51
|
_addViewToNativeVisualTree(child, atIndex = -1) {
|
|
35
52
|
const nativeView = this._view;
|
|
36
|
-
// @ts-ignore
|
|
37
|
-
child._masonParent = this;
|
|
38
53
|
if (nativeView && child.nativeViewProtected) {
|
|
39
54
|
child._hasNativeView = true;
|
|
40
55
|
child._isMasonChild = true;
|
|
@@ -45,9 +60,7 @@ let View = class View extends ViewBase {
|
|
|
45
60
|
}
|
|
46
61
|
// @ts-ignore
|
|
47
62
|
_removeViewFromNativeVisualTree(view) {
|
|
48
|
-
view
|
|
49
|
-
view._isMasonView = false;
|
|
50
|
-
view._isMasonChild = false;
|
|
63
|
+
view[isMasonView_] = false;
|
|
51
64
|
// @ts-ignore
|
|
52
65
|
super._removeViewFromNativeVisualTree(view);
|
|
53
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/view/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/view/index.android.ts"],"names":[],"mappings":"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"}
|
package/view/index.ios.d.ts
CHANGED
|
@@ -5,11 +5,10 @@ export declare class View extends ViewBase {
|
|
|
5
5
|
private _view;
|
|
6
6
|
constructor();
|
|
7
7
|
get _styleHelper(): Style;
|
|
8
|
-
_hasNativeView: boolean;
|
|
9
8
|
_inBatch: boolean;
|
|
10
9
|
createNativeView(): MasonUIView;
|
|
11
|
-
disposeNativeView(): void;
|
|
12
10
|
get ios(): MasonUIView;
|
|
11
|
+
set text(value: string);
|
|
13
12
|
onLayout(left: number, top: number, right: number, bottom: number): void;
|
|
14
13
|
onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void;
|
|
15
14
|
_setNativeViewFrame(nativeView: any, frame: CGRect): void;
|
package/view/index.ios.js
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
var View_1;
|
|
2
2
|
import { CSSType, Utils } from '@nativescript/core';
|
|
3
|
-
import { style_, ViewBase } from '../common';
|
|
3
|
+
import { isMasonView_, style_, ViewBase } from '../common';
|
|
4
4
|
import { Style } from '../style';
|
|
5
5
|
import { Tree } from '../tree';
|
|
6
6
|
let View = View_1 = class View extends ViewBase {
|
|
7
7
|
constructor() {
|
|
8
8
|
super();
|
|
9
|
-
this._hasNativeView = false;
|
|
10
9
|
this._inBatch = false;
|
|
11
10
|
const view = Tree.instance.createView();
|
|
12
|
-
this._hasNativeView = true;
|
|
13
11
|
this._view = view;
|
|
12
|
+
this[isMasonView_] = true;
|
|
14
13
|
}
|
|
15
14
|
get _styleHelper() {
|
|
16
15
|
if (this[style_] === undefined) {
|
|
@@ -21,21 +20,48 @@ let View = View_1 = class View extends ViewBase {
|
|
|
21
20
|
createNativeView() {
|
|
22
21
|
return this._view;
|
|
23
22
|
}
|
|
24
|
-
disposeNativeView() {
|
|
25
|
-
this._hasNativeView = false;
|
|
26
|
-
super.disposeNativeView();
|
|
27
|
-
}
|
|
28
23
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
29
24
|
// @ts-ignore
|
|
30
25
|
get ios() {
|
|
31
26
|
return this._view;
|
|
32
27
|
}
|
|
28
|
+
set text(value) {
|
|
29
|
+
const nativeView = this._view;
|
|
30
|
+
if (nativeView) {
|
|
31
|
+
// hacking vue3 to handle text nodes
|
|
32
|
+
if (global.VUE3_ELEMENT_REF) {
|
|
33
|
+
const view_ref = this[global.VUE3_ELEMENT_REF];
|
|
34
|
+
if (Array.isArray(view_ref.childNodes)) {
|
|
35
|
+
if (view_ref.childNodes.length === 0) {
|
|
36
|
+
// @ts-ignore
|
|
37
|
+
nativeView.mason_addChildAtText(value || '', -1);
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
view_ref.childNodes.forEach((node, index) => {
|
|
41
|
+
if (node.nodeType === 'text') {
|
|
42
|
+
// using replace to avoid accumulating text nodes
|
|
43
|
+
// @ts-ignore
|
|
44
|
+
// nativeView.mason_replaceChildAtText(node.text || '', index);
|
|
45
|
+
nativeView.mason_replaceChildAtText(node.text || '', index);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
// will replace all nodes with a new text node
|
|
52
|
+
// nativeView.text = value;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
33
56
|
onLayout(left, top, right, bottom) {
|
|
34
57
|
super.onLayout(left, top, right, bottom);
|
|
35
58
|
// @ts-ignore
|
|
36
|
-
let layout = this._view.node.computedLayout
|
|
59
|
+
let layout = this._view.node.computedLayout;
|
|
37
60
|
const children = layout.children;
|
|
38
61
|
let i = 0;
|
|
62
|
+
if (children.count === 0) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
39
65
|
for (const child of this._children) {
|
|
40
66
|
layout = children.objectAtIndex(i);
|
|
41
67
|
const x = layout.x;
|
|
@@ -53,13 +79,15 @@ let View = View_1 = class View extends ViewBase {
|
|
|
53
79
|
const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
|
|
54
80
|
const specHeight = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
|
|
55
81
|
const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
|
|
56
|
-
if (!this
|
|
82
|
+
if (!this[isMasonView_]) {
|
|
57
83
|
// only call compute on the parent
|
|
58
84
|
if (this.width === 'auto' && this.height === 'auto') {
|
|
59
85
|
// @ts-ignore
|
|
60
|
-
this.ios.
|
|
86
|
+
this.ios.mason_computeWithSize(specWidth, specHeight);
|
|
87
|
+
// this.ios.computeWithSize(specWidth, specHeight);
|
|
61
88
|
// @ts-ignore
|
|
62
|
-
const layout = this.ios.
|
|
89
|
+
const layout = this.ios.mason_layout();
|
|
90
|
+
//const layout = this.ios.layout();
|
|
63
91
|
const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
|
|
64
92
|
const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
|
|
65
93
|
this.eachLayoutChild((child) => {
|
|
@@ -70,9 +98,9 @@ let View = View_1 = class View extends ViewBase {
|
|
|
70
98
|
}
|
|
71
99
|
else {
|
|
72
100
|
// @ts-ignore
|
|
73
|
-
this.ios.
|
|
101
|
+
this.ios.mason_computeWithMaxContent();
|
|
74
102
|
// @ts-ignore
|
|
75
|
-
const layout = this.ios.node.computedLayout
|
|
103
|
+
const layout = this.ios.node.computedLayout;
|
|
76
104
|
const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
|
|
77
105
|
const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
|
|
78
106
|
this.setMeasuredDimension(w, h);
|
|
@@ -83,7 +111,7 @@ let View = View_1 = class View extends ViewBase {
|
|
|
83
111
|
}
|
|
84
112
|
else {
|
|
85
113
|
// @ts-ignore
|
|
86
|
-
const layout = this.ios.node.computedLayout
|
|
114
|
+
const layout = this.ios.node.computedLayout;
|
|
87
115
|
const w = Utils.layout.makeMeasureSpec(layout.width, Utils.layout.EXACTLY);
|
|
88
116
|
const h = Utils.layout.makeMeasureSpec(layout.height, Utils.layout.EXACTLY);
|
|
89
117
|
this.setMeasuredDimension(w, h);
|
|
@@ -99,8 +127,6 @@ let View = View_1 = class View extends ViewBase {
|
|
|
99
127
|
// @ts-ignore
|
|
100
128
|
_addViewToNativeVisualTree(child, atIndex = -1) {
|
|
101
129
|
const nativeView = this._view;
|
|
102
|
-
// @ts-ignore
|
|
103
|
-
child._masonParent = this;
|
|
104
130
|
if (nativeView && child.nativeViewProtected) {
|
|
105
131
|
child._hasNativeView = true;
|
|
106
132
|
child._isMasonChild = true;
|
|
@@ -116,9 +142,7 @@ let View = View_1 = class View extends ViewBase {
|
|
|
116
142
|
}
|
|
117
143
|
// @ts-ignore
|
|
118
144
|
_removeViewFromNativeVisualTree(view) {
|
|
119
|
-
view
|
|
120
|
-
view._isMasonView = false;
|
|
121
|
-
view._isMasonChild = false;
|
|
145
|
+
view[isMasonView_] = false;
|
|
122
146
|
// @ts-ignore
|
|
123
147
|
super._removeViewFromNativeVisualTree(view);
|
|
124
148
|
}
|
package/view/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/view/index.ios.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/view/index.ios.ts"],"names":[],"mappings":"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"}
|