@nativescript-community/text 1.4.29 → 1.4.30

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.30](https://github.com/nativescript-community/text/compare/v1.4.29...v1.4.30) (2022-01-11)
+
+
+### Bug Fixes
+
+* **android:** span lineHeight fix ([ef0d20c](https://github.com/nativescript-community/text/commit/ef0d20c93d6059401f1b24468f1a4c16cb63c0aa))
+
+
+
+
+
 ## [1.4.29](https://github.com/nativescript-community/text/compare/v1.4.28...v1.4.29) (2022-01-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/text",
-    "version": "1.4.29",
+    "version": "1.4.30",
     "description": "Expands the capabilities of NativeScript's text property.",
     "main": "./index",
     "sideEffects": false,
@@ -30,5 +30,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "ff201308ae9336680e1911fc65f636225dfaa603"
+    "gitHead": "50020c9c198665fe7860d022d775bbb2e4872341"
 }

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

@@ -0,0 +1,43 @@
+package com.nativescript.text;
+
+import android.annotation.SuppressLint;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.TextPaint;
+import android.text.style.LineHeightSpan;
+import java.lang.CharSequence;
+
+@SuppressLint("ParcelCreator")
+public class DensityLineHeightSpan implements LineHeightSpan.WithDensity {
+    private int mSize;
+    private static float sProportion = 0;
+
+    public HeightSpan(int size) {
+        mSize = size;
+    }
+
+    public void chooseHeight(CharSequence text, int start, int end,
+                             int spanstartv, int v,
+                             Paint.FontMetricsInt fm) {
+        // Should not get called, at least not by StaticLayout.
+        chooseHeight(text, start, end, spanstartv, v, fm, null);
+    }
+
+    public void chooseHeight(CharSequence text, int start, int end,
+                             int spanstartv, int v,
+                             Paint.FontMetricsInt fm, TextPaint paint) {
+        int size = mSize;
+        if (paint != null) {
+            size *= paint.density;
+        }
+
+        final int originHeight = fm.descent - fm.ascent;
+        // If original height is not positive, do nothing.
+        if (originHeight <= 0) {
+            return;
+        }
+        final float ratio = size * 1.0f / originHeight;
+        fm.descent = Math.round(fm.descent * ratio);
+        fm.ascent = fm.descent - size;
+    }
+}

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

@@ -377,7 +377,9 @@ public class Font {
         }
         Double lineHeight =  span.optDouble("lineHeight");
         if (!Double.isNaN(lineHeight)) {
-            ssb.setSpan(new HeightSpan(lineHeight.intValue()), start, end,
+            // we use standard for now though it does not take density into account
+            // is this what we want?
+            ssb.setSpan(new android.text.style.LineHeightSpan.Standard(lineHeight.intValue()), start, end,
                     android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 

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

@@ -1,81 +0,0 @@
-package com.nativescript.text;
-
-import android.annotation.SuppressLint;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.text.TextPaint;
-import android.text.style.LineHeightSpan;
-import java.lang.CharSequence;
-
-@SuppressLint("ParcelCreator")
-public class HeightSpan implements LineHeightSpan.WithDensity {
-    private int mSize;
-    private static float sProportion = 0;
-
-    public HeightSpan(int size) {
-        mSize = size;
-    }
-
-    public void chooseHeight(CharSequence text, int start, int end,
-                             int spanstartv, int v,
-                             Paint.FontMetricsInt fm) {
-        // Should not get called, at least not by StaticLayout.
-        chooseHeight(text, start, end, spanstartv, v, fm, null);
-    }
-
-    public void chooseHeight(CharSequence text, int start, int end,
-                             int spanstartv, int v,
-                             Paint.FontMetricsInt fm, TextPaint paint) {
-        int size = mSize;
-        if (paint != null) {
-            size *= paint.density;
-        }
-
-        if (fm.bottom - fm.top < size) {
-            fm.top = fm.bottom - size;
-            fm.ascent = fm.ascent - size;
-        } else {
-            if (sProportion == 0) {
-                /*
-                 * Calculate what fraction of the nominal ascent
-                 * the height of a capital letter actually is,
-                 * so that we won't reduce the ascent to less than
-                 * that unless we absolutely have to.
-                 */
-
-                Paint p = new Paint();
-                p.setTextSize(100);
-                Rect r = new Rect();
-                p.getTextBounds("ABCDEFG", 0, 7, r);
-
-                sProportion = (r.top) / p.ascent();
-            }
-
-            int need = (int) Math.ceil(-fm.top * sProportion);
-
-            if (size - fm.descent >= need) {
-                /*
-                 * It is safe to shrink the ascent this much.
-                 */
-
-                fm.top = fm.bottom - size;
-                fm.ascent = fm.descent - size;
-            } else if (size >= need) {
-                /*
-                 * We can't show all the descent, but we can at least
-                 * show all the ascent.
-                 */
-
-                fm.top = fm.ascent = -need;
-                fm.bottom = fm.descent = fm.top + size;
-            } else {
-                /*
-                 * Show as much of the ascent as we can, and no descent.
-                 */
-
-                fm.top = fm.ascent = -size;
-                fm.bottom = fm.descent = 0;
-            }
-        }
-    }
-}