update

zhongwuzw · Nov 19, 2024 · 1d87c89 · 1d87c89
1 parent e9fc02c
commit 1d87c89
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/packages/react-native/Libraries/StyleSheet/processTransform.js b/packages/react-native/Libraries/StyleSheet/processTransform.js
@@ -150,7 +150,7 @@ function _validateTransforms(transform: Array<Object>): void {
     const value = transformation[key];
     if (key === 'matrix' && transform.length > 1) {
       console.error(
-        'You must only specify exactly one matrix per transform object. Passed transform: ' +
+        'When using a matrix transform, you must specify exactly one transform object. Passed transform: ' +
           stringifySafe(transform),
       );
     }

diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp
@@ -561,10 +561,16 @@ Transform BaseViewProps::resolveTransform(
     return transformMatrix;
   }
 
-  for (const auto& operation : transform.operations) {
-    transformMatrix = transformMatrix *
-        Transform::FromTransformOperation(
-                          operation, layoutMetrics.frame.size, transform);
+  // transform is matrix
+  if (transform.operations.size() == 1 &&
+      transform.operations[0].type == TransformOperationType::Arbitrary) {
+    transformMatrix = transform;
+  } else {
+    for (const auto& operation : transform.operations) {
+      transformMatrix = transformMatrix *
+          Transform::FromTransformOperation(
+                            operation, layoutMetrics.frame.size, transform);
+    }
   }
 
   if (transformOrigin.isSet()) {

diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp
@@ -197,6 +197,8 @@ Transform Transform::FromTransformOperation(
         transformOperation.y.resolve(0),
         transformOperation.z.resolve(0));
   }
+  // when using arbitrary transform, the caller is responsible for applying the
+  // value
   if (transformOperation.type == TransformOperationType::Arbitrary) {
     auto arbitraryTransform = Transform{};
     arbitraryTransform.operations.push_back(transformOperation);