@nativescript/core 8.3.0-alpha.0 → 8.3.0-alpha.1
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/styling/font.ios.js +21 -2
- package/ui/styling/font.ios.js.map +1 -1
package/package.json
CHANGED
package/ui/styling/font.ios.js
CHANGED
|
@@ -2,6 +2,25 @@ 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
|
+
let hitCount = 0;
|
|
7
|
+
let missCount = 0;
|
|
8
|
+
function computeFontCacheKey(fontDescriptor) {
|
|
9
|
+
const { fontFamily, fontSize, fontWeight, isBold, isItalic } = fontDescriptor;
|
|
10
|
+
const sep = ':';
|
|
11
|
+
return fontFamily.join(sep) + sep + fontSize + sep + fontWeight + sep + isBold + sep + isItalic;
|
|
12
|
+
}
|
|
13
|
+
function getUIFontCached(fontDescriptor) {
|
|
14
|
+
const cacheKey = computeFontCacheKey(fontDescriptor);
|
|
15
|
+
if (uiFontCache.has(cacheKey)) {
|
|
16
|
+
console.log('uiFont cache hit', ++hitCount, '| misses:', missCount);
|
|
17
|
+
return uiFontCache.get(cacheKey);
|
|
18
|
+
}
|
|
19
|
+
console.log('uiFont cache miss', ++missCount);
|
|
20
|
+
const uiFont = NativeScriptUtils.createUIFont(fontDescriptor);
|
|
21
|
+
uiFontCache.set(cacheKey, uiFont);
|
|
22
|
+
return uiFont;
|
|
23
|
+
}
|
|
5
24
|
export class Font extends FontBase {
|
|
6
25
|
constructor(family, size, style, weight, scale) {
|
|
7
26
|
super(family, size, style, weight, scale);
|
|
@@ -22,13 +41,13 @@ export class Font extends FontBase {
|
|
|
22
41
|
return new Font(this.fontFamily, this.fontSize, this.fontStyle, this.fontWeight, scale);
|
|
23
42
|
}
|
|
24
43
|
getUIFont(defaultFont) {
|
|
25
|
-
return
|
|
44
|
+
return getUIFontCached({
|
|
26
45
|
fontFamily: parseFontFamily(this.fontFamily),
|
|
27
46
|
fontSize: this.fontSize || defaultFont.pointSize,
|
|
28
47
|
fontWeight: getNativeFontWeight(this.fontWeight),
|
|
29
48
|
isBold: this.isBold,
|
|
30
49
|
isItalic: this.isItalic,
|
|
31
|
-
})
|
|
50
|
+
});
|
|
32
51
|
}
|
|
33
52
|
getAndroidTypeface() {
|
|
34
53
|
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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"}
|