@triniwiz/nativescript-masonkit 1.0.0-alpha.28 → 1.0.0-alpha.29
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 +1 -1
- package/common.js +142 -30
- package/common.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 +2 -1
- 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 +5085 -4828
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.private.swiftinterface +141 -141
- package/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.swiftinterface +141 -141
- 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 +3081 -3066
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/Mason-Swift.h +10 -8
- 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 +21366 -21088
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +170 -170
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftinterface +170 -170
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json +21366 -21088
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +170 -170
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +170 -170
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/_CodeSignature/CodeResources +22 -22
- 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 +3075 -3059
- package/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/Relocations/x86_64/Mason.yml +3002 -2986
- package/scroll/index.android.js +8 -3
- package/scroll/index.android.js.map +1 -1
- package/scroll/index.ios.js +22 -18
- package/scroll/index.ios.js.map +1 -1
- package/style.js +26 -2
- package/style.js.map +1 -1
- package/text/index.ios.d.ts +2 -1
- package/text/index.ios.js +25 -19
- package/text/index.ios.js.map +1 -1
- package/tree/index.ios.d.ts +2 -1
- package/tree/index.ios.js +1 -0
- package/tree/index.ios.js.map +1 -1
- package/view/index.android.js +0 -1
- package/view/index.android.js.map +1 -1
- package/view/index.ios.js +14 -15
- package/view/index.ios.js.map +1 -1
- package/web.d.ts +2 -2
- package/web.js +2 -2
- package/web.js.map +1 -1
package/scroll/index.android.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Utils } from '@nativescript/core';
|
|
1
|
+
import { CSSType, Utils } from '@nativescript/core';
|
|
2
2
|
import { isMasonView_, style_, text_, ViewBase } from '../common';
|
|
3
3
|
import { Style } from '../style';
|
|
4
4
|
import { Tree } from '../tree';
|
|
5
|
-
|
|
5
|
+
let Scroll = class Scroll extends ViewBase {
|
|
6
6
|
constructor() {
|
|
7
7
|
super();
|
|
8
8
|
this._inBatch = false;
|
|
@@ -71,5 +71,10 @@ export class Scroll extends ViewBase {
|
|
|
71
71
|
// @ts-ignore
|
|
72
72
|
super._removeViewFromNativeVisualTree(view);
|
|
73
73
|
}
|
|
74
|
-
}
|
|
74
|
+
};
|
|
75
|
+
Scroll = __decorate([
|
|
76
|
+
CSSType('Scroll'),
|
|
77
|
+
__metadata("design:paramtypes", [])
|
|
78
|
+
], Scroll);
|
|
79
|
+
export { Scroll };
|
|
75
80
|
//# sourceMappingURL=index.android.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/scroll/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/scroll/index.android.ts"],"names":[],"mappings":"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"}
|
package/scroll/index.ios.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Utils, View } from '@nativescript/core';
|
|
2
|
-
import { isMasonView_, style_, ViewBase } from '../common';
|
|
1
|
+
import { CSSType, Utils, View } from '@nativescript/core';
|
|
2
|
+
import { isMasonView_, style_, text_, ViewBase } from '../common';
|
|
3
3
|
import { Style } from '../style';
|
|
4
4
|
import { Tree } from '../tree';
|
|
5
|
-
|
|
5
|
+
let Scroll = class Scroll extends ViewBase {
|
|
6
6
|
constructor() {
|
|
7
7
|
super();
|
|
8
8
|
this._inBatch = false;
|
|
@@ -32,7 +32,7 @@ export class Scroll extends ViewBase {
|
|
|
32
32
|
if (children.count === 0) {
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
|
-
for (const child of this.
|
|
35
|
+
for (const child of this._viewChildren) {
|
|
36
36
|
layout = children.objectAtIndex(i);
|
|
37
37
|
const x = layout.x;
|
|
38
38
|
const y = layout.y;
|
|
@@ -103,23 +103,26 @@ export class Scroll extends ViewBase {
|
|
|
103
103
|
const view_ref = this[global.VUE3_ELEMENT_REF];
|
|
104
104
|
if (Array.isArray(view_ref.childNodes)) {
|
|
105
105
|
if (view_ref.childNodes.length === 0) {
|
|
106
|
-
|
|
107
|
-
|
|
106
|
+
this.addChild({ [text_]: value });
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
if (view_ref.childNodes.length === 1) {
|
|
110
|
+
const node = view_ref.childNodes[0];
|
|
111
|
+
if (node && node.nodeType === 'text') {
|
|
112
|
+
this.addChild({ [text_]: node.text });
|
|
113
|
+
}
|
|
108
114
|
return;
|
|
109
115
|
}
|
|
110
116
|
view_ref.childNodes.forEach((node, index) => {
|
|
111
117
|
if (node.nodeType === 'text') {
|
|
112
|
-
|
|
113
|
-
// @ts-ignore
|
|
114
|
-
// nativeView.mason_replaceChildAtText(node.text || '', index);
|
|
115
|
-
nativeView.mason_replaceChildAtText(node.text || '', index);
|
|
118
|
+
this.replaceChild({ [text_]: node.text }, index);
|
|
116
119
|
}
|
|
117
120
|
});
|
|
118
121
|
}
|
|
119
122
|
}
|
|
120
123
|
else {
|
|
121
124
|
// will replace all nodes with a new text node
|
|
122
|
-
// nativeView.
|
|
125
|
+
// nativeView.setTextContent(value);
|
|
123
126
|
}
|
|
124
127
|
}
|
|
125
128
|
}
|
|
@@ -130,12 +133,8 @@ export class Scroll extends ViewBase {
|
|
|
130
133
|
if (nativeView && child.nativeViewProtected) {
|
|
131
134
|
child._hasNativeView = true;
|
|
132
135
|
child._isMasonChild = true;
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
nativeView.addViewAt(child.nativeViewProtected, atIndex);
|
|
138
|
-
}
|
|
136
|
+
const index = atIndex <= -1 ? this._children.indexOf(child) : atIndex;
|
|
137
|
+
nativeView.addViewAt(child.nativeViewProtected, index);
|
|
139
138
|
return true;
|
|
140
139
|
}
|
|
141
140
|
return false;
|
|
@@ -146,5 +145,10 @@ export class Scroll extends ViewBase {
|
|
|
146
145
|
// @ts-ignore
|
|
147
146
|
super._removeViewFromNativeVisualTree(view);
|
|
148
147
|
}
|
|
149
|
-
}
|
|
148
|
+
};
|
|
149
|
+
Scroll = __decorate([
|
|
150
|
+
CSSType('Scroll'),
|
|
151
|
+
__metadata("design:paramtypes", [])
|
|
152
|
+
], Scroll);
|
|
153
|
+
export { Scroll };
|
|
150
154
|
//# sourceMappingURL=index.ios.js.map
|
package/scroll/index.ios.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/scroll/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/nativescript-masonkit/scroll/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAGxB,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,QAAQ;IAGlC;QACE,KAAK,EAAE,CAAC;QAUV,aAAQ,GAAG,KAAK,CAAC;QATf,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAW,CAAC;QACvD,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC5B,CAAC;IACD,IAAI,YAAY;QACd,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAGD,gBAAgB;QACd,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,6DAA6D;IAC7D,aAAa;IACb,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,MAAc;QACtE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACzC,aAAa;QACb,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;QAC5C,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvC,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;YACnB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;YACnB,MAAM,KAAK,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;YAC/B,MAAM,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;YACjC,IAAI,CAAC,WAAW,CAAC,IAAa,EAAE,KAAc,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACrE,CAAC,EAAE,CAAC;QACN,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,gBAAwB,EAAE,iBAAyB;QAClE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;YACpE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YACtE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxB,kCAAkC;gBAClC,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBACpD,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBACtD,mDAAmD;oBACnD,aAAa;oBACb,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;oBACvC,mCAAmC;oBACnC,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAE5E,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC7B,QAAQ,CAAC,YAAY,CAAC,IAAa,EAAE,KAAK,EAAE,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC/G,CAAC,CAAC,CAAC;oBAEH,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAChC,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,aAAa;oBACb,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC;oBACvC,gBAAgB;oBAChB,oCAAoC;oBACpC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;oBAE5C,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAE5E,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAEhC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC7B,QAAQ,CAAC,YAAY,CAAC,IAAa,EAAE,KAAK,EAAE,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;oBAC/G,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa;gBACb,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC;gBAC5C,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3E,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE5E,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEhC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC7B,QAAQ,CAAC,YAAY,CAAC,IAAa,EAAE,KAAK,EAAE,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAC/G,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,UAAe,EAAE,KAAa;QAChD,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI,CAAC,KAAa;QACpB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,UAAU,EAAE,CAAC;YACf,oCAAoC;YAEpC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAQ,CAAC;gBACtD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACvC,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;wBAClC,OAAO;oBACT,CAAC;oBACD,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACrC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;wBACpC,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;4BACrC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;wBACxC,CAAC;wBACD,OAAO;oBACT,CAAC;oBAEA,QAAQ,CAAC,UAAoB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;wBACrD,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;4BAC7B,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;wBACnD,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,8CAA8C;gBAC9C,oCAAoC;YACtC,CAAC;QACH,CAAC;IACH,CAAC;IAED,aAAa;IACN,0BAA0B,CAAC,KAAiB,EAAE,OAAO,GAAG,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,aAAa;QACb,IAAI,UAAU,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC5C,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;YAC5B,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;YAC3B,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACtE,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,aAAa;IACN,+BAA+B,CAAC,IAAgB;QACrD,IAAI,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC;QAC3B,aAAa;QACb,KAAK,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AAjKY,MAAM;IADlB,OAAO,CAAC,QAAQ,CAAC;;GACL,MAAM,CAiKlB"}
|
package/style.js
CHANGED
|
@@ -472,7 +472,6 @@ export class Style {
|
|
|
472
472
|
break;
|
|
473
473
|
}
|
|
474
474
|
if (weight !== -1) {
|
|
475
|
-
console.log('Setting font weight to', TextStyleKeys.FONT_WEIGHT, this.text_style_view.byteLength, weight);
|
|
476
475
|
setInt32(this.text_style_view, TextStyleKeys.FONT_WEIGHT, weight);
|
|
477
476
|
this.setOrAppendTextState(TextStateKeys.FONT_WEIGHT);
|
|
478
477
|
}
|
|
@@ -1172,7 +1171,7 @@ export class Style {
|
|
|
1172
1171
|
}
|
|
1173
1172
|
break;
|
|
1174
1173
|
}
|
|
1175
|
-
this.setOrAppendState(StateKeys.
|
|
1174
|
+
this.setOrAppendState(StateKeys.MARGIN);
|
|
1176
1175
|
}
|
|
1177
1176
|
get marginRight() {
|
|
1178
1177
|
const type = getInt32(this.style_view, StyleKeys.MARGIN_RIGHT_TYPE);
|
|
@@ -1880,6 +1879,7 @@ export class Style {
|
|
|
1880
1879
|
setInt32(this.style_view, StyleKeys.GRID_AUTO_FLOW, 3);
|
|
1881
1880
|
break;
|
|
1882
1881
|
}
|
|
1882
|
+
this.setOrAppendState(StateKeys.GRID_AUTO_FLOW);
|
|
1883
1883
|
}
|
|
1884
1884
|
get gridRowGap() {
|
|
1885
1885
|
return this.rowGap;
|
|
@@ -1946,6 +1946,7 @@ export class Style {
|
|
|
1946
1946
|
}
|
|
1947
1947
|
break;
|
|
1948
1948
|
}
|
|
1949
|
+
this.setOrAppendState(StateKeys.GRID_COLUMN);
|
|
1949
1950
|
}
|
|
1950
1951
|
get gridColumnEnd() {
|
|
1951
1952
|
switch (getInt32(this.style_view, StyleKeys.GRID_COLUMN_END_TYPE)) {
|
|
@@ -1993,6 +1994,7 @@ export class Style {
|
|
|
1993
1994
|
}
|
|
1994
1995
|
break;
|
|
1995
1996
|
}
|
|
1997
|
+
this.setOrAppendState(StateKeys.GRID_COLUMN);
|
|
1996
1998
|
}
|
|
1997
1999
|
get gridRow() {
|
|
1998
2000
|
if (this.gridRowStart === this.gridRowEnd) {
|
|
@@ -2046,6 +2048,7 @@ export class Style {
|
|
|
2046
2048
|
}
|
|
2047
2049
|
break;
|
|
2048
2050
|
}
|
|
2051
|
+
this.setOrAppendState(StateKeys.GRID_ROW);
|
|
2049
2052
|
}
|
|
2050
2053
|
get gridRowEnd() {
|
|
2051
2054
|
switch (getInt32(this.style_view, StyleKeys.GRID_ROW_END_TYPE)) {
|
|
@@ -2093,6 +2096,7 @@ export class Style {
|
|
|
2093
2096
|
}
|
|
2094
2097
|
break;
|
|
2095
2098
|
}
|
|
2099
|
+
this.setOrAppendState(StateKeys.GRID_ROW);
|
|
2096
2100
|
}
|
|
2097
2101
|
set gridTemplateRows(value) {
|
|
2098
2102
|
if (Array.isArray(value)) {
|
|
@@ -2178,6 +2182,7 @@ export class Style {
|
|
|
2178
2182
|
}
|
|
2179
2183
|
break;
|
|
2180
2184
|
}
|
|
2185
|
+
this.setOrAppendState(StateKeys.OVERFLOW);
|
|
2181
2186
|
}
|
|
2182
2187
|
get overflowX() {
|
|
2183
2188
|
switch (getInt32(this.style_view, StyleKeys.OVERFLOW_X)) {
|
|
@@ -2190,17 +2195,24 @@ export class Style {
|
|
|
2190
2195
|
}
|
|
2191
2196
|
}
|
|
2192
2197
|
set overflowX(value) {
|
|
2198
|
+
let dirty = false;
|
|
2193
2199
|
switch (value) {
|
|
2194
2200
|
case 'visible':
|
|
2195
2201
|
setInt32(this.style_view, StyleKeys.OVERFLOW_X, 0);
|
|
2202
|
+
dirty = true;
|
|
2196
2203
|
break;
|
|
2197
2204
|
case 'hidden':
|
|
2198
2205
|
setInt32(this.style_view, StyleKeys.OVERFLOW_X, 1);
|
|
2206
|
+
dirty = true;
|
|
2199
2207
|
break;
|
|
2200
2208
|
case 'scroll':
|
|
2209
|
+
dirty = true;
|
|
2201
2210
|
setInt32(this.style_view, StyleKeys.OVERFLOW_X, 2);
|
|
2202
2211
|
break;
|
|
2203
2212
|
}
|
|
2213
|
+
if (dirty) {
|
|
2214
|
+
this.setOrAppendState(StateKeys.OVERFLOW_X);
|
|
2215
|
+
}
|
|
2204
2216
|
}
|
|
2205
2217
|
get overflowY() {
|
|
2206
2218
|
switch (getInt32(this.style_view, StyleKeys.OVERFLOW_Y)) {
|
|
@@ -2213,29 +2225,38 @@ export class Style {
|
|
|
2213
2225
|
}
|
|
2214
2226
|
}
|
|
2215
2227
|
set overflowY(value) {
|
|
2228
|
+
let dirty = false;
|
|
2216
2229
|
switch (value) {
|
|
2217
2230
|
case 'visible':
|
|
2218
2231
|
setInt32(this.style_view, StyleKeys.OVERFLOW_Y, 0);
|
|
2232
|
+
dirty = true;
|
|
2219
2233
|
break;
|
|
2220
2234
|
case 'hidden':
|
|
2221
2235
|
setInt32(this.style_view, StyleKeys.OVERFLOW_Y, 1);
|
|
2236
|
+
dirty = true;
|
|
2222
2237
|
break;
|
|
2223
2238
|
case 'scroll':
|
|
2224
2239
|
setInt32(this.style_view, StyleKeys.OVERFLOW_Y, 2);
|
|
2240
|
+
dirty = true;
|
|
2225
2241
|
break;
|
|
2226
2242
|
}
|
|
2243
|
+
if (dirty) {
|
|
2244
|
+
this.setOrAppendState(StateKeys.OVERFLOW_Y);
|
|
2245
|
+
}
|
|
2227
2246
|
}
|
|
2228
2247
|
get flexGrow() {
|
|
2229
2248
|
return getFloat32(this.style_view, StyleKeys.FLEX_GROW);
|
|
2230
2249
|
}
|
|
2231
2250
|
set flexGrow(value) {
|
|
2232
2251
|
setFloat32(this.style_view, StyleKeys.FLEX_GROW, value);
|
|
2252
|
+
this.setOrAppendState(StateKeys.FLEX_GROW);
|
|
2233
2253
|
}
|
|
2234
2254
|
get flexShrink() {
|
|
2235
2255
|
return getFloat32(this.style_view, StyleKeys.FLEX_SHRINK);
|
|
2236
2256
|
}
|
|
2237
2257
|
set flexShrink(value) {
|
|
2238
2258
|
setFloat32(this.style_view, StyleKeys.FLEX_SHRINK, value);
|
|
2259
|
+
this.setOrAppendState(StateKeys.FLEX_SHRINK);
|
|
2239
2260
|
}
|
|
2240
2261
|
get scrollBarWidth() {
|
|
2241
2262
|
return getFloat32(this.style_view, StyleKeys.SCROLLBAR_WIDTH);
|
|
@@ -2243,14 +2264,17 @@ export class Style {
|
|
|
2243
2264
|
set scrollBarWidth(value) {
|
|
2244
2265
|
if (typeof value === 'number') {
|
|
2245
2266
|
setFloat32(this.style_view, StyleKeys.SCROLLBAR_WIDTH, value);
|
|
2267
|
+
this.setOrAppendState(StateKeys.SCROLLBAR_WIDTH);
|
|
2246
2268
|
}
|
|
2247
2269
|
else if (typeof value === 'object') {
|
|
2248
2270
|
switch (value.unit) {
|
|
2249
2271
|
case 'dip':
|
|
2250
2272
|
setFloat32(this.style_view, StyleKeys.SCROLLBAR_WIDTH, layout.toDevicePixels(value.value));
|
|
2273
|
+
this.setOrAppendState(StateKeys.SCROLLBAR_WIDTH);
|
|
2251
2274
|
break;
|
|
2252
2275
|
case 'px':
|
|
2253
2276
|
setFloat32(this.style_view, StyleKeys.SCROLLBAR_WIDTH, value.value);
|
|
2277
|
+
this.setOrAppendState(StateKeys.SCROLLBAR_WIDTH);
|
|
2254
2278
|
break;
|
|
2255
2279
|
}
|
|
2256
2280
|
}
|