Added ability to set default font features on android

feastr · Sep 6, 2022 · bda3650 · bda3650
1 parent 56c4f27
commit bda3650
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/CustomStyleSpan.java
@@ -79,7 +79,15 @@ private static void apply(
       @Nullable String family,
       Context context) {
     Typeface typeface = ReactTypefaceUtils.applyStyles(paint.getTypeface(), style, weight, family, context);
-    paint.setFontFeatureSettings(fontFeatureSettings);
+    String ffs = ReactTypefaceUtils.defaultFontFeatures;
+    if (fontFeatureSettings != null && fontFeatureSettings.trim().length() > 0) {
+      if (ffs != null && ffs.trim().length() > 0) {
+        ffs += ", " + fontFeatureSettings;
+      } else {
+        ffs = fontFeatureSettings;
+      }
+    }
+    paint.setFontFeatureSettings(ffs);
     paint.setTypeface(typeface);
     paint.setSubpixelText(true);
   }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTypefaceUtils.java
@@ -21,6 +21,7 @@
 public class ReactTypefaceUtils {
 
   public static Typeface defaultTypeface = Typeface.DEFAULT;
+  public static @Nullable String defaultFontFeatures = null;
 
   public static int parseFontWeight(@Nullable String fontWeightString) {
     if (fontWeightString != null) {

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -483,6 +483,8 @@ public void setFontStyle(String fontStyleString) {
   }
 
   public void maybeUpdateTypeface() {
+    getPaint().setFontFeatureSettings(ReactTypefaceUtils.defaultFontFeatures);
+
     if (!mTypefaceDirty) {
       return;
     }