fix: apply suggestions

facebook · May 31, 2024 · 8549425 · 8549425
1 parent 9dd41dd
commit 8549425
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/...ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt b/...ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt
@@ -79,7 +79,7 @@ public class CustomStyleSpan(
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
           try {
             fontVariationSettings = fontVariationSettingsParam
-          } catch (e: Exception) {
+          } catch (e: IllegalArgumentException) {
             // Do nothing
           }
         }

diff --git a/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -38,6 +38,8 @@
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.TextView;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.core.util.Predicate;
@@ -114,7 +116,6 @@ public class ReactEditText extends AppCompatEditText {
   private TextAttributes mTextAttributes;
   private boolean mTypefaceDirty = false;
   private @Nullable String mFontFamily = null;
-  private @Nullable String mFontVariationSettings = null;
   private int mFontWeight = ReactConstants.UNSET;
   private int mFontStyle = ReactConstants.UNSET;
   private boolean mAutoFocus = false;
@@ -527,7 +528,7 @@ public void setInputType(int type) {
     /**
      * If set forces multiline on input, because of a restriction on Android source that enables
      * multiline only for inputs of type Text and Multiline on method {@link
-     * android.widget.TextView#isMultilineInputType(int)}} Source: {@Link <a
+     * TextView#isMultilineInputType(int)}} Source: {@Link <a
      * href='https://android.googlesource.com/platform/frameworks/base/+/jb-release/core/java/android/widget/TextView.java'>TextView.java</a>}
      */
     if (isMultiline()) {
@@ -557,18 +558,6 @@ public void setFontFamily(String fontFamily) {
     mTypefaceDirty = true;
   }
 
-  @Override
-  public boolean setFontVariationSettings(@Nullable String fontVariationSettings) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      if (!Objects.equals(fontVariationSettings, getFontVariationSettings())) {
-        mTypefaceDirty = true;
-        mFontVariationSettings = fontVariationSettings;
-        return super.setFontVariationSettings(fontVariationSettings);
-      }
-    }
-    return false;
-  }
-
   public void setFontWeight(String fontWeightString) {
     int fontWeight = ReactTypefaceUtils.parseFontWeight(fontWeightString);
     if (fontWeight != mFontWeight) {
@@ -610,6 +599,7 @@ public void maybeUpdateTypeface() {
     if (mFontStyle != ReactConstants.UNSET
         || mFontWeight != ReactConstants.UNSET
         || mFontFamily != null
+        || getFontVariationSettingsInternal() != null
         || getFontFeatureSettings() != null) {
       setPaintFlags(getPaintFlags() | Paint.SUBPIXEL_TEXT_FLAG);
     } else {
@@ -783,11 +773,20 @@ private void stripStyleEquivalentSpans(SpannableStringBuilder sb) {
           return span.getStyle() == mFontStyle
               && Objects.equals(span.getFontFamily(), mFontFamily)
               && span.getWeight() == mFontWeight
-              && Objects.equals(span.getFontVariationSettings(), mFontVariationSettings)
+              && Objects.equals(span.getFontVariationSettings(), getFontVariationSettingsInternal())
               && Objects.equals(span.getFontFeatureSettings(), getFontFeatureSettings());
         });
   }
 
+  // Font variation settings is only available on API 26+, we return null if not available
+  private @Nullable String getFontVariationSettingsInternal() {
+    String fontVariationSettings = null;
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      fontVariationSettings = super.getFontVariationSettings();
+    }
+    return fontVariationSettings;
+  }
+
   private <T> void stripSpansOfKind(
       SpannableStringBuilder sb, Class<T> clazz, Predicate<T> shouldStrip) {
     T[] spans = sb.getSpans(0, sb.length(), clazz);
@@ -842,14 +841,15 @@ private void addSpansFromStyleAttributes(SpannableStringBuilder workingText) {
     if (mFontStyle != ReactConstants.UNSET
         || mFontWeight != ReactConstants.UNSET
         || mFontFamily != null
+        || getFontVariationSettingsInternal() != null
         || getFontFeatureSettings() != null) {
       workingText.setSpan(
           new CustomStyleSpan(
               mFontStyle,
               mFontWeight,
               getFontFeatureSettings(),
               mFontFamily,
-              mFontVariationSettings,
+              getFontVariationSettingsInternal(),
               getContext().getAssets()),
           0,
           workingText.length(),

diff --git a/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js b/packages/rn-tester/js/examples/TextInput/TextInputExample.android.js
@@ -522,6 +522,19 @@ const examples: Array<RNTesterModuleExample> = [
       return <ToggleDefaultPaddingExample />;
     },
   },
+  {
+    title: 'TextInput with font variation settings',
+    render: function (): React.Node {
+      return (
+        <ExampleTextInput
+          style={{
+            fontFamily: 'inter',
+            fontVariationSettings: "'wght' 800, 'slnt' -10",
+          }}
+        />
+      );
+    },
+  },
 ];
 
 module.exports = ({