react-native 0.68.1 → 0.69.0-rc.1

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java

@@ -28,9 +28,8 @@ import com.facebook.react.bridge.ReactNoCrashSoftException;
 import com.facebook.react.bridge.ReactSoftExceptionLogger;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.uimanager.PixelUtil;
-import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
@@ -79,7 +78,7 @@ public class TextLayoutManagerMapBuffer {
 
   private static final Object sSpannableCacheLock = new Object();
   private static final boolean DEFAULT_INCLUDE_FONT_PADDING = true;
-  private static final LruCache<ReadableMapBuffer, Spannable> sSpannableCache =
+  private static final LruCache<MapBuffer, Spannable> sSpannableCache =
       new LruCache<>(spannableCacheSize);
   private static final ConcurrentHashMap<Integer, Spannable> sTagToSpannableCache =
       new ConcurrentHashMap<>();
@@ -98,39 +97,36 @@ public class TextLayoutManagerMapBuffer {
     sTagToSpannableCache.remove(reactTag);
   }
 
-  public static boolean isRTL(ReadableMapBuffer attributedString) {
-    ReadableMapBuffer fragments = attributedString.getMapBuffer(AS_KEY_FRAGMENTS);
+  public static boolean isRTL(MapBuffer attributedString) {
+    MapBuffer fragments = attributedString.getMapBuffer(AS_KEY_FRAGMENTS);
     if (fragments.getCount() == 0) {
       return false;
     }
 
-    ReadableMapBuffer fragment = fragments.getMapBuffer((short) 0);
-    ReadableMapBuffer textAttributes = fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES);
+    MapBuffer fragment = fragments.getMapBuffer((short) 0);
+    MapBuffer textAttributes = fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES);
     return TextAttributeProps.getLayoutDirection(
             textAttributes.getString(TextAttributeProps.TA_KEY_LAYOUT_DIRECTION))
         == LayoutDirection.RTL;
   }
 
   private static void buildSpannableFromFragment(
-      Context context,
-      ReadableMapBuffer fragments,
-      SpannableStringBuilder sb,
-      List<SetSpanOperation> ops) {
+      Context context, MapBuffer fragments, SpannableStringBuilder sb, List<SetSpanOperation> ops) {
 
     for (int i = 0, length = fragments.getCount(); i < length; i++) {
-      ReadableMapBuffer fragment = fragments.getMapBuffer(i);
+      MapBuffer fragment = fragments.getMapBuffer(i);
       int start = sb.length();
 
       TextAttributeProps textAttributes =
-          TextAttributeProps.fromReadableMapBuffer(fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES));
+          TextAttributeProps.fromMapBuffer(fragment.getMapBuffer(FR_KEY_TEXT_ATTRIBUTES));
 
       sb.append(
           TextTransform.apply(fragment.getString(FR_KEY_STRING), textAttributes.mTextTransform));
 
       int end = sb.length();
       int reactTag =
-          fragment.hasKey(FR_KEY_REACT_TAG) ? fragment.getInt(FR_KEY_REACT_TAG) : View.NO_ID;
-      if (fragment.hasKey(FR_KEY_IS_ATTACHMENT) && fragment.getBoolean(FR_KEY_IS_ATTACHMENT)) {
+          fragment.contains(FR_KEY_REACT_TAG) ? fragment.getInt(FR_KEY_REACT_TAG) : View.NO_ID;
+      if (fragment.contains(FR_KEY_IS_ATTACHMENT) && fragment.getBoolean(FR_KEY_IS_ATTACHMENT)) {
         float width = PixelUtil.toPixelFromSP(fragment.getDouble(FR_KEY_WIDTH));
         float height = PixelUtil.toPixelFromSP(fragment.getDouble(FR_KEY_HEIGHT));
         ops.add(
@@ -139,12 +135,10 @@ public class TextLayoutManagerMapBuffer {
                 sb.length(),
                 new TextInlineViewPlaceholderSpan(reactTag, (int) width, (int) height)));
       } else if (end >= start) {
-        if (ReactAccessibilityDelegate.AccessibilityRole.LINK.equals(
-            textAttributes.mAccessibilityRole)) {
-          ops.add(
-              new SetSpanOperation(
-                  start, end, new ReactClickableSpan(reactTag, textAttributes.mColor)));
-        } else if (textAttributes.mIsColorSet) {
+        if (textAttributes.mIsAccessibilityLink) {
+          ops.add(new SetSpanOperation(start, end, new ReactClickableSpan(reactTag)));
+        }
+        if (textAttributes.mIsColorSet) {
           ops.add(
               new SetSpanOperation(
                   start, end, new ReactForegroundColorSpan(textAttributes.mColor)));
@@ -206,7 +200,7 @@ public class TextLayoutManagerMapBuffer {
   // public because both ReactTextViewManager and ReactTextInputManager need to use this
   public static Spannable getOrCreateSpannableForText(
       Context context,
-      ReadableMapBuffer attributedString,
+      MapBuffer attributedString,
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
 
     Spannable preparedSpannableText;
@@ -231,7 +225,7 @@ public class TextLayoutManagerMapBuffer {
 
   private static Spannable createSpannableFromAttributedString(
       Context context,
-      ReadableMapBuffer attributedString,
+      MapBuffer attributedString,
       @Nullable ReactTextViewManagerCallback reactTextViewManagerCallback) {
 
     SpannableStringBuilder sb = new SpannableStringBuilder();
@@ -354,8 +348,8 @@ public class TextLayoutManagerMapBuffer {
 
   public static long measureText(
       Context context,
-      ReadableMapBuffer attributedString,
-      ReadableMapBuffer paragraphAttributes,
+      MapBuffer attributedString,
+      MapBuffer paragraphAttributes,
       float width,
       YogaMeasureMode widthYogaMeasureMode,
       float height,
@@ -366,7 +360,7 @@ public class TextLayoutManagerMapBuffer {
     // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
     TextPaint textPaint = sTextPaintInstance;
     Spannable text;
-    if (attributedString.hasKey(AS_KEY_CACHE_ID)) {
+    if (attributedString.contains(AS_KEY_CACHE_ID)) {
       int cacheId = attributedString.getInt(AS_KEY_CACHE_ID);
       if (ENABLE_MEASURE_LOGGING) {
         FLog.e(TAG, "Get cached spannable for cacheId[" + cacheId + "]");
@@ -390,7 +384,7 @@ public class TextLayoutManagerMapBuffer {
         TextAttributeProps.getTextBreakStrategy(
             paragraphAttributes.getString(PA_KEY_TEXT_BREAK_STRATEGY));
     boolean includeFontPadding =
-        paragraphAttributes.hasKey(PA_KEY_INCLUDE_FONT_PADDING)
+        paragraphAttributes.contains(PA_KEY_INCLUDE_FONT_PADDING)
             ? paragraphAttributes.getBoolean(PA_KEY_INCLUDE_FONT_PADDING)
             : DEFAULT_INCLUDE_FONT_PADDING;
     int hyphenationFrequency =
@@ -418,7 +412,7 @@ public class TextLayoutManagerMapBuffer {
             hyphenationFrequency);
 
     int maximumNumberOfLines =
-        paragraphAttributes.hasKey(PA_KEY_MAX_NUMBER_OF_LINES)
+        paragraphAttributes.contains(PA_KEY_MAX_NUMBER_OF_LINES)
             ? paragraphAttributes.getInt(PA_KEY_MAX_NUMBER_OF_LINES)
             : UNSET;
 
@@ -557,8 +551,8 @@ public class TextLayoutManagerMapBuffer {
 
   public static WritableArray measureLines(
       @NonNull Context context,
-      ReadableMapBuffer attributedString,
-      ReadableMapBuffer paragraphAttributes,
+      MapBuffer attributedString,
+      MapBuffer paragraphAttributes,
       float width) {
 
     TextPaint textPaint = sTextPaintInstance;
@@ -569,7 +563,7 @@ public class TextLayoutManagerMapBuffer {
         TextAttributeProps.getTextBreakStrategy(
             paragraphAttributes.getString(PA_KEY_TEXT_BREAK_STRATEGY));
     boolean includeFontPadding =
-        paragraphAttributes.hasKey(PA_KEY_INCLUDE_FONT_PADDING)
+        paragraphAttributes.contains(PA_KEY_INCLUDE_FONT_PADDING)
             ? paragraphAttributes.getBoolean(PA_KEY_INCLUDE_FONT_PADDING)
             : DEFAULT_INCLUDE_FONT_PADDING;
     int hyphenationFrequency =

package/ReactAndroid/src/main/java/com/facebook/react/views/text/frescosupport/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -154,9 +154,9 @@ public class ReactEditText extends AppCompatEditText
       setLayerType(View.LAYER_TYPE_SOFTWARE, null);
     }
 
-    ViewCompat.setAccessibilityDelegate(
-        this,
-        new ReactAccessibilityDelegate() {
+    ReactAccessibilityDelegate editTextAccessibilityDelegate =
+        new ReactAccessibilityDelegate(
+            this, this.isFocusable(), this.getImportantForAccessibility()) {
           @Override
           public boolean performAccessibilityAction(View host, int action, Bundle args) {
             if (action == AccessibilityNodeInfo.ACTION_CLICK) {
@@ -172,7 +172,8 @@ public class ReactEditText extends AppCompatEditText
             }
             return super.performAccessibilityAction(host, action, args);
           }
-        });
+        };
+    ViewCompat.setAccessibilityDelegate(this, editTextAccessibilityDelegate);
   }
 
   @Override
@@ -914,6 +915,10 @@ public class ReactEditText extends AppCompatEditText
     mReactBackgroundManager.setBorderColor(position, color, alpha);
   }
 
+  public int getBorderColor(int position) {
+    return mReactBackgroundManager.getBorderColor(position);
+  }
+
   public void setBorderRadius(float borderRadius) {
     mReactBackgroundManager.setBorderRadius(borderRadius);
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java

@@ -75,6 +75,7 @@ import com.facebook.yoga.YogaConstants;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.Locale;
 import java.util.Map;
 
 /** Manages instances of TextInput. */
@@ -569,7 +570,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   }
 
   private static boolean shouldHideCursorForEmailTextInput() {
-    String manufacturer = Build.MANUFACTURER.toLowerCase();
+    String manufacturer = Build.MANUFACTURER.toLowerCase(Locale.ROOT);
     return (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q && manufacturer.contains("xiaomi"));
   }
 
@@ -636,7 +637,16 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
     if (underlineColor == null) {
       drawableToMutate.clearColorFilter();
     } else {
-      drawableToMutate.setColorFilter(underlineColor, PorterDuff.Mode.SRC_IN);
+      // fixes underlineColor transparent not working on API 21
+      // re-sets the TextInput underlineColor https://bit.ly/3M4alr6
+      if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
+        int bottomBorderColor = view.getBorderColor(Spacing.BOTTOM);
+        setBorderColor(view, Spacing.START, underlineColor);
+        drawableToMutate.setColorFilter(underlineColor, PorterDuff.Mode.SRC_IN);
+        setBorderColor(view, Spacing.START, bottomBorderColor);
+      } else {
+        drawableToMutate.setColorFilter(underlineColor, PorterDuff.Mode.SRC_IN);
+      }
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java

@@ -258,7 +258,7 @@ public class ReactTextInputShadowNode extends ReactBaseTextShadowNode
   }
 
   /**
-   * May be overriden by subclasses that would like to provide their own instance of the internal
+   * May be overridden by subclasses that would like to provide their own instance of the internal
    * {@code EditText} this class uses to determine the expected size of the view.
    */
   protected EditText createInternalEditText() {

package/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),

package/ReactAndroid/src/main/java/com/facebook/react/views/view/BUCK

@@ -2,16 +2,24 @@ load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "r
 
 rn_android_library(
     name = "view",
-    srcs = glob(["*.java"]),
+    srcs = glob([
+        "*.java",
+        "*.kt",
+    ]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    language = "KOTLIN",
     provided_deps = [
         react_native_dep("third-party/android/androidx:core"),
         react_native_dep("third-party/android/androidx:fragment"),
         react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
         react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
     ],
+    pure_kotlin = False,
     visibility = [
         "PUBLIC",
     ],
@@ -23,6 +31,7 @@ rn_android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/touch:touch"),

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ColorUtil.java

@@ -39,6 +39,7 @@ public class ColorUtil {
   /**
    * Gets the opacity from a color. Inspired by Android ColorDrawable.
    *
+   * @param color color to get opacity from
    * @return opacity expressed by one of PixelFormat constants
    */
   public static int getOpacityFromColor(int color) {
@@ -51,4 +52,22 @@ public class ColorUtil {
       return PixelFormat.TRANSLUCENT;
     }
   }
+
+  /**
+   * Converts individual {r, g, b, a} channel values to a single integer representation of the color
+   * as 0xAARRGGBB.
+   *
+   * @param r red channel value, [0, 255]
+   * @param g green channel value, [0, 255]
+   * @param b blue channel value, [0, 255]
+   * @param a alpha channel value, [0, 1]
+   * @return integer representation of the color as 0xAARRGGBB
+   */
+  public static int normalize(double r, double g, double b, double a) {
+    return (clamp255(a * 255) << 24) | (clamp255(r) << 16) | (clamp255(g) << 8) | clamp255(b);
+  }
+
+  private static int clamp255(double value) {
+    return Math.max(0, Math.min(255, (int) Math.round(value)));
+  }
 }