test

Author: janicduplessis

packages/react-native/Libraries/StyleSheet/processTransform.js

@@ -209,18 +209,18 @@ function _validateTransform(
     case 'rotate':
     case 'skewX':
     case 'skewY':
-      invariant(
-        typeof value === 'string',
-        'Transform with key of "%s" must be a string: %s',
-        key,
-        stringifySafe(transformation),
-      );
-      invariant(
-        value.indexOf('deg') > -1 || value.indexOf('rad') > -1,
-        'Rotate transform must be expressed in degrees (deg) or radians ' +
-          '(rad): %s',
-        stringifySafe(transformation),
-      );
+      // invariant(
+      //   typeof value === 'string',
+      //   'Transform with key of "%s" must be a string: %s',
+      //   key,
+      //   stringifySafe(transformation),
+      // );
+      // invariant(
+      //   value.indexOf('deg') > -1 || value.indexOf('rad') > -1,
+      //   'Rotate transform must be expressed in degrees (deg) or radians ' +
+      //     '(rad): %s',
+      //   stringifySafe(transformation),
+      // );
       break;
     case 'perspective':
       invariant(

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt

@@ -20,15 +20,15 @@ import kotlin.jvm.JvmStatic
 public open class ReadableNativeArray protected constructor() : NativeArray(), ReadableArray {
 
   private val localArray: Array<Any?> by
-      lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+      lazy(LazyThreadSafetyMode.NONE) {
         jniPassCounter++
         importArray()
       }
 
   private external fun importArray(): Array<Any?>
 
   private val localTypeArray: Array<ReadableType> by
-      lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+      lazy(LazyThreadSafetyMode.NONE) {
         jniPassCounter++
         val tempArray = importTypeArray()
         Arrays.copyOf(tempArray, tempArray.size, Array<ReadableType>::class.java)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.kt

@@ -8,6 +8,7 @@
 package com.facebook.react.bridge
 
 import android.annotation.SuppressLint
+import android.util.ArrayMap
 import com.facebook.infer.annotation.Assertions
 import com.facebook.proguard.annotations.DoNotStripAny
 
@@ -18,12 +19,12 @@ import com.facebook.proguard.annotations.DoNotStripAny
 @DoNotStripAny
 public open class ReadableNativeMap protected constructor() : NativeMap(), ReadableMap {
   private val keys: Array<String> by
-      lazy(LazyThreadSafetyMode.SYNCHRONIZED) { importKeys().also { jniPassCounter++ } }
+      lazy(LazyThreadSafetyMode.NONE) { importKeys().also { jniPassCounter++ } }
 
-  private val localMap: HashMap<String, Any?> by
-      lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+  private val localMap: Map<String, Any?> by
+      lazy(LazyThreadSafetyMode.NONE) {
         val length = keys.size
-        val res = HashMap<String, Any?>(length)
+        val res = if (length > 10) HashMap<String, Any?>(length) else ArrayMap(length)
         val values = importValues()
         jniPassCounter++
         for (i in 0 until length) {
@@ -32,10 +33,10 @@ public open class ReadableNativeMap protected constructor() : NativeMap(), Reada
         res
       }
 
-  private val localTypeMap: HashMap<String, ReadableType> by
-      lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+  private val localTypeMap: Map<String, ReadableType> by
+      lazy(LazyThreadSafetyMode.NONE) {
         val length = keys.size
-        val res = HashMap<String, ReadableType>(length)
+        val res = if (length > 10) HashMap<String, ReadableType>(length) else ArrayMap(length)
         val types = importTypes()
         jniPassCounter++
         for (i in 0 until length) {
@@ -66,16 +67,17 @@ public open class ReadableNativeMap protected constructor() : NativeMap(), Reada
               "Value for $name cannot be cast from ${instance?.javaClass?.simpleName ?: "NULL"} to ${type.simpleName}")
 
   private fun getValue(name: String): Any {
-    if (hasKey(name)) {
-      return Assertions.assertNotNull(localMap[name])
+    val value = localMap[name]
+    if (value != null) {
+      return value
     }
     throw NoSuchKeyException(name)
   }
 
   private inline fun <reified T> getValue(name: String, type: Class<T>): T =
       checkInstance(name, getValue(name), type)
 
-  private fun getNullableValue(name: String): Any? = localMap.get(name)
+  private fun getNullableValue(name: String): Any? = localMap[name]
 
   private inline fun <reified T> getNullableValue(name: String, type: Class<T>): T? {
     val res = getNullableValue(name)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -637,8 +637,8 @@ protected void setTransformProperty(
       @Nullable ReadableArray transforms,
       @Nullable ReadableArray transformOrigin) {
     if (transforms == null) {
-      view.setTranslationX(PixelUtil.toPixelFromDIP(0));
-      view.setTranslationY(PixelUtil.toPixelFromDIP(0));
+      view.setTranslationX(0);
+      view.setTranslationY(0);
       view.setRotation(0);
       view.setRotationX(0);
       view.setRotationY(0);
@@ -659,6 +659,8 @@ protected void setTransformProperty(
         transformOrigin,
         allowPercentageResolution);
     MatrixMathHelper.decomposeMatrix(sTransformDecompositionArray, sMatrixDecompositionContext);
+    float rotationX = sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.rotationDegrees[0]);
+    float rotationY = sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.rotationDegrees[1]);
     view.setTranslationX(
         PixelUtil.toPixelFromDIP(
             sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.translation[0])));
@@ -667,16 +669,14 @@ protected void setTransformProperty(
             sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.translation[1])));
     view.setRotation(
         sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.rotationDegrees[2]));
-    view.setRotationX(
-        sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.rotationDegrees[0]));
-    view.setRotationY(
-        sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.rotationDegrees[1]));
+    view.setRotationX(rotationX);
+    view.setRotationY(rotationY);
     view.setScaleX(sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.scale[0]));
     view.setScaleY(sanitizeFloatPropertyValue((float) sMatrixDecompositionContext.scale[1]));
 
     double[] perspectiveArray = sMatrixDecompositionContext.perspective;
 
-    if (perspectiveArray.length > PERSPECTIVE_ARRAY_INVERTED_CAMERA_DISTANCE_INDEX) {
+    if ((rotationX != 0 || rotationY != 0) && perspectiveArray.length > PERSPECTIVE_ARRAY_INVERTED_CAMERA_DISTANCE_INDEX) {
       float invertedCameraDistance =
           (float) perspectiveArray[PERSPECTIVE_ARRAY_INVERTED_CAMERA_DISTANCE_INDEX];
       if (invertedCameraDistance == 0) {