@nativescript/core 8.2.6-alpha.2 → 8.3.0-alpha.2
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/platforms/android/widgets-release.aar +0 -0
- package/platforms/ios/TNSWidgets.xcframework/Info.plist +7 -7
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64/TNSWidgets.framework/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64/dSYMs/TNSWidgets.framework.dSYM/Contents/Resources/DWARF/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/Current/TNSWidgets +0 -0
- package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/TNSWidgets +0 -0
- package/ui/label/index.ios.js +1 -1
- package/ui/label/index.ios.js.map +1 -1
- package/ui/styling/font.ios.js +23 -2
- package/ui/styling/font.ios.js.map +1 -1
package/package.json
CHANGED
|
Binary file
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<key>DebugSymbolsPath</key>
|
|
9
9
|
<string>dSYMs</string>
|
|
10
10
|
<key>LibraryIdentifier</key>
|
|
11
|
-
<string>ios-arm64_x86_64-
|
|
11
|
+
<string>ios-arm64_x86_64-simulator</string>
|
|
12
12
|
<key>LibraryPath</key>
|
|
13
13
|
<string>TNSWidgets.framework</string>
|
|
14
14
|
<key>SupportedArchitectures</key>
|
|
@@ -19,38 +19,38 @@
|
|
|
19
19
|
<key>SupportedPlatform</key>
|
|
20
20
|
<string>ios</string>
|
|
21
21
|
<key>SupportedPlatformVariant</key>
|
|
22
|
-
<string>
|
|
22
|
+
<string>simulator</string>
|
|
23
23
|
</dict>
|
|
24
24
|
<dict>
|
|
25
25
|
<key>DebugSymbolsPath</key>
|
|
26
26
|
<string>dSYMs</string>
|
|
27
27
|
<key>LibraryIdentifier</key>
|
|
28
|
-
<string>ios-
|
|
28
|
+
<string>ios-arm64_x86_64-maccatalyst</string>
|
|
29
29
|
<key>LibraryPath</key>
|
|
30
30
|
<string>TNSWidgets.framework</string>
|
|
31
31
|
<key>SupportedArchitectures</key>
|
|
32
32
|
<array>
|
|
33
33
|
<string>arm64</string>
|
|
34
|
+
<string>x86_64</string>
|
|
34
35
|
</array>
|
|
35
36
|
<key>SupportedPlatform</key>
|
|
36
37
|
<string>ios</string>
|
|
38
|
+
<key>SupportedPlatformVariant</key>
|
|
39
|
+
<string>maccatalyst</string>
|
|
37
40
|
</dict>
|
|
38
41
|
<dict>
|
|
39
42
|
<key>DebugSymbolsPath</key>
|
|
40
43
|
<string>dSYMs</string>
|
|
41
44
|
<key>LibraryIdentifier</key>
|
|
42
|
-
<string>ios-
|
|
45
|
+
<string>ios-arm64</string>
|
|
43
46
|
<key>LibraryPath</key>
|
|
44
47
|
<string>TNSWidgets.framework</string>
|
|
45
48
|
<key>SupportedArchitectures</key>
|
|
46
49
|
<array>
|
|
47
50
|
<string>arm64</string>
|
|
48
|
-
<string>x86_64</string>
|
|
49
51
|
</array>
|
|
50
52
|
<key>SupportedPlatform</key>
|
|
51
53
|
<string>ios</string>
|
|
52
|
-
<key>SupportedPlatformVariant</key>
|
|
53
|
-
<string>simulator</string>
|
|
54
54
|
</dict>
|
|
55
55
|
</array>
|
|
56
56
|
<key>CFBundlePackageType</key>
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/ui/label/index.ios.js
CHANGED
|
@@ -81,7 +81,7 @@ let Label = class Label extends TextBase {
|
|
|
81
81
|
}
|
|
82
82
|
_measureNativeView(width, widthMode, height, heightMode) {
|
|
83
83
|
const view = this.nativeTextViewProtected;
|
|
84
|
-
const nativeSize = view.textRectForBoundsLimitedToNumberOfLines(CGRectMake(0, 0, widthMode === 0 /* layout.UNSPECIFIED */ ? Number.POSITIVE_INFINITY : layout.toDeviceIndependentPixels(width), heightMode === 0 /* layout.UNSPECIFIED */ ? Number.POSITIVE_INFINITY : layout.toDeviceIndependentPixels(height)),
|
|
84
|
+
const nativeSize = view.textRectForBoundsLimitedToNumberOfLines(CGRectMake(0, 0, widthMode === 0 /* layout.UNSPECIFIED */ ? Number.POSITIVE_INFINITY : layout.toDeviceIndependentPixels(width), heightMode === 0 /* layout.UNSPECIFIED */ ? Number.POSITIVE_INFINITY : layout.toDeviceIndependentPixels(height)), view.numberOfLines).size;
|
|
85
85
|
nativeSize.width = layout.round(layout.toDevicePixels(nativeSize.width));
|
|
86
86
|
nativeSize.height = layout.round(layout.toDevicePixels(nativeSize.height));
|
|
87
87
|
return nativeSize;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/label/index.ios.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/label/index.ios.ts"],"names":[],"mappings":"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"}
|
package/ui/styling/font.ios.js
CHANGED
|
@@ -2,6 +2,27 @@ import { Font as FontBase, parseFontFamily, FontStyle, FontWeight } from './font
|
|
|
2
2
|
import { Trace } from '../../trace';
|
|
3
3
|
import * as fs from '../../file-system';
|
|
4
4
|
export * from './font-common';
|
|
5
|
+
const uiFontCache = new Map();
|
|
6
|
+
function computeFontCacheKey(fontDescriptor) {
|
|
7
|
+
const { fontFamily, fontSize, fontWeight, isBold, isItalic } = fontDescriptor;
|
|
8
|
+
const sep = ':';
|
|
9
|
+
return fontFamily.join(sep) + sep + fontSize + sep + fontWeight + sep + isBold + sep + isItalic;
|
|
10
|
+
}
|
|
11
|
+
function getUIFontCached(fontDescriptor) {
|
|
12
|
+
const cacheKey = computeFontCacheKey(fontDescriptor);
|
|
13
|
+
if (uiFontCache.has(cacheKey)) {
|
|
14
|
+
if (Trace.isEnabled()) {
|
|
15
|
+
Trace.write(`UIFont reuse from cache: ${JSON.stringify(fontDescriptor)}, cache size: ${uiFontCache.size}`, Trace.categories.Style, Trace.messageType.info);
|
|
16
|
+
}
|
|
17
|
+
return uiFontCache.get(cacheKey);
|
|
18
|
+
}
|
|
19
|
+
const uiFont = NativeScriptUtils.createUIFont(fontDescriptor);
|
|
20
|
+
uiFontCache.set(cacheKey, uiFont);
|
|
21
|
+
if (Trace.isEnabled()) {
|
|
22
|
+
Trace.write(`UIFont creation: ${JSON.stringify(fontDescriptor)}, cache size: ${uiFontCache.size}`, Trace.categories.Style, Trace.messageType.info);
|
|
23
|
+
}
|
|
24
|
+
return uiFont;
|
|
25
|
+
}
|
|
5
26
|
export class Font extends FontBase {
|
|
6
27
|
constructor(family, size, style, weight, scale) {
|
|
7
28
|
super(family, size, style, weight, scale);
|
|
@@ -22,13 +43,13 @@ export class Font extends FontBase {
|
|
|
22
43
|
return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, scale);
|
|
23
44
|
}
|
|
24
45
|
getUIFont(defaultFont) {
|
|
25
|
-
return
|
|
46
|
+
return getUIFontCached({
|
|
26
47
|
fontFamily: parseFontFamily(this.fontFamily),
|
|
27
48
|
fontSize: this.fontSize || defaultFont.pointSize,
|
|
28
49
|
fontWeight: getNativeFontWeight(this.fontWeight),
|
|
29
50
|
isBold: this.isBold,
|
|
30
51
|
isItalic: this.isItalic,
|
|
31
|
-
})
|
|
52
|
+
});
|
|
32
53
|
}
|
|
33
54
|
getAndroidTypeface() {
|
|
34
55
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"font.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/styling/font.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAiC,MAAM,eAAe,CAAC;AACxH,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACxC,cAAc,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"font.ios.js","sourceRoot":"","sources":["../../../../../packages/core/ui/styling/font.ios.ts"],"names":[],"mappings":"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"}
|