@nativescript-community/text 1.6.16 → 1.6.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/text",
-    "version": "1.6.16",
+    "version": "1.6.18",
     "description": "Expands the capabilities of NativeScript's text property.",
     "main": "./index",
     "sideEffects": false,
@@ -12,11 +12,11 @@
         }
     },
     "scripts": {
-        "build": "npm run tsc",
+        "build": "npm run tsc && npm run readme",
         "build.all": "npm run build",
         "readme": "readme generate -c ../../tools/readme/blueprint.json",
-        "tsc": "cpy '**/*.d.ts' '../../packages/text' --parents --cwd=../../src/text && tsc -skipLibCheck -d",
-        "clean": "rimraf ./*.d.ts ./*.js ./*.js.map"
+        "tsc": "cpy '**/*.d.ts' '../../packages/text' --parents --cwd=../../src/text && tsc  --build",
+        "clean": "bin/rimraf ./*.d.ts ./*.js ./*.js.map ./*.tsbuildinfo ./*.mjs ./*.mjs.map ./angular ./svelte ./vue* ./react"
     },
     "keywords": [
         "NativeScript",
@@ -37,5 +37,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "3dc2aa3c57c448f76879bc5b7068b6ebb5c6b6a0"
+    "gitHead": "e4d59e57add4fa4250c9f8808f07609231721212"
 }

package/platforms/android/java/com/nativescript/text/Font.java

@@ -336,7 +336,7 @@ public class Font {
             fontFamily = parentFontFamily;
         }
         Typeface typeface = null;
-        if (fontFamily != null) {
+        if (fontFamily != null || (!bold && fontWeight != null)) {
             String fontVariationSettings = span.optString("fontVariationSettings", null);
             typeface = createTypeface(context, fontFolder, fontFamily,fontWeight, bold, italic, fontVariationSettings);
             TypefaceSpan typefaceSpan = new CustomTypefaceSpan(fontFamily, typeface);

package/platforms/android/java/com/nativescript/text/FontSizeSpan.java

@@ -51,11 +51,11 @@ public class FontSizeSpan extends MetricAffectingSpan {
             if (FONT_SIZE_FACTOR == -1) {
                 android.util.DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
                 SCREEN_DENSITY = metrics.density;
-                FONT_SIZE_FACTOR = android.util.TypedValue.applyDimension(android.util.TypedValue.COMPLEX_UNIT_SP, 1, metrics);
+                FONT_SIZE_FACTOR = android.util.TypedValue.applyDimension(android.util.TypedValue.COMPLEX_UNIT_DIP, 1, metrics);
             }
             if (mDip && (flags & 2048) != 2048) {
                 ds.setTextSize(TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_SP,
+                    TypedValue.COMPLEX_UNIT_DIP,
                     mSize,
                     mContext.getResources().getDisplayMetrics()
                 ));

package/platforms/ios/src/NSTextUtils.swift

@@ -250,7 +250,7 @@ class NSTextUtils: NSObject {
       }
       let verticalTextAlignment:String! = spanDetails.object(forKey: "verticalTextAlignment") as? String
       if (verticalTextAlignment != nil) && (iosFont != nil) && !(verticalTextAlignment == "initial") && !(verticalTextAlignment == "stretch") {
-        let fontSize:NSNumber! = spanDetails.object(forKey: "fontSize") as? NSNumber
+        let fontSize:NSNumber! = fontSize != nil ? fontSize : NSNumber(value: Float(iosFont.pointSize))
         let ctFont:CTFont = iosFont
         let ascent:CGFloat = CTFontGetAscent(ctFont)
         let descent:CGFloat = CTFontGetDescent(ctFont)

package/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../../src/text/index-common.ts","../../src/text/index.android.ts","../../src/text/index.d.ts","../../src/text/index.ios.ts","../../src/text/references.d.ts","../../src/text/typings/DTCoreText.ios.d.ts","../../src/text/typings/android.d.ts","../../src/text/typings/ios.d.ts","../../references.d.ts","../../tools/references.d.ts"],"version":"5.8.3"}