@react-native-ohos/react-native-reanimated 4.0.0-rc.1 → 4.0.2-beta.1

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/interpolation/transforms/TransformsStyleInterpolator.cpp

@@ -1,149 +1,149 @@
-#include <reanimated/CSS/interpolation/transforms/TransformsStyleInterpolator.h>
-
-#include <unordered_map>
-
-namespace reanimated::css {
-
-const folly::dynamic defaultStyleValue = folly::dynamic::array(MatrixOperation(TransformMatrix3D()).toDynamic());
-
-TransformsStyleInterpolator::TransformsStyleInterpolator(
-    const PropertyPath &propertyPath,
-    const std::shared_ptr<StyleOperationInterpolators> &interpolators,
-    const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
-    : OperationsStyleInterpolatorBase<TransformOperation>(
-          propertyPath,
-          interpolators,
-          viewStylesRepository,
-          defaultStyleValue) {}
-
-void TransformsStyleInterpolator::addConvertedOperations(
-    const std::shared_ptr<TransformOperation> &sourceOperation,
-    const std::shared_ptr<TransformOperation> &targetOperation,
-    StyleOperations &sourceResult,
-    StyleOperations &targetResult) const {
-  const auto convertedOps = sourceOperation->convertTo(static_cast<TransformOp>(targetOperation->type));
-
-  targetResult.emplace_back(targetOperation);
-  for (size_t k = 0; k < convertedOps.size(); ++k) {
-    sourceResult.emplace_back(convertedOps[k]);
-    // Converted operations will contain one operation with the same type and
-    // can contain more operations derived from the source operation (we need
-    // to pair them with operations of the same type with default values)
-    if (k > 0) {
-      targetResult.emplace_back(getDefaultOperationOfType(convertedOps[k]->type));
-    }
-  }
-}
-
-std::optional<std::pair<StyleOperations, StyleOperations>> TransformsStyleInterpolator::createInterpolationPair(
-    const StyleOperations &fromOperations,
-    const StyleOperations &toOperations) const {
-  StyleOperations fromOperationsResult, toOperationsResult;
-  size_t i = 0, j = 0;
-  bool shouldInterpolateMatrices = false;
-
-  // Build index maps and check for matrix operation
-  std::unordered_map<uint8_t, size_t> lastIndexInFrom, lastIndexInTo;
-  for (size_t idx = 0; idx < fromOperations.size(); ++idx) {
-    if (static_cast<TransformOp>(fromOperations[idx]->type) == TransformOp::Matrix) {
-      shouldInterpolateMatrices = true;
-      break;
-    }
-    lastIndexInFrom[fromOperations[idx]->type] = idx;
-  }
-  for (size_t idx = 0; idx < toOperations.size() && !shouldInterpolateMatrices; ++idx) {
-    if (static_cast<TransformOp>(toOperations[idx]->type) == TransformOp::Matrix) {
-      shouldInterpolateMatrices = true;
-      break;
-    }
-    lastIndexInTo[toOperations[idx]->type] = idx;
-  }
-
-  while (!shouldInterpolateMatrices && i < fromOperations.size() && j < toOperations.size()) {
-    const auto &fromOperation = std::static_pointer_cast<TransformOperation>(fromOperations[i]);
-    const auto &toOperation = std::static_pointer_cast<TransformOperation>(toOperations[j]);
-    const auto fromType = static_cast<TransformOp>(fromOperation->type);
-    const auto toType = static_cast<TransformOp>(toOperation->type);
-
-    // Case 1: Types match directly
-    if (fromType == toType) {
-      fromOperationsResult.emplace_back(fromOperation);
-      toOperationsResult.emplace_back(toOperation);
-      i++;
-      j++;
-    } else if (fromOperation->canConvertTo(toType)) {
-      // Case 2: Operations can be converted to each other's type
-      addConvertedOperations(fromOperation, toOperation, fromOperationsResult, toOperationsResult);
-      i++;
-      j++;
-    } else if (toOperation->canConvertTo(fromType)) {
-      addConvertedOperations(toOperation, fromOperation, toOperationsResult, fromOperationsResult);
-      i++;
-      j++;
-    } else {
-      if (fromType == TransformOp::Perspective || toType == TransformOp::Perspective) {
-        shouldInterpolateMatrices = true;
-        break;
-      }
-      // Case 3: Use default values if no conversion possible
-      bool toExistsLaterInFrom = lastIndexInFrom.count(toOperation->type) && lastIndexInFrom[toOperation->type] > i;
-      bool fromExistsLaterInTo = lastIndexInTo.count(fromOperation->type) && lastIndexInTo[fromOperation->type] > j;
-
-      if (toExistsLaterInFrom == fromExistsLaterInTo) {
-        // If neither exists later, or both exist later (were reordered), we
-        // cannot interpolate the operations directly and we need to convert
-        // these operations to matrices
-        shouldInterpolateMatrices = true;
-        break;
-      } else if (!fromExistsLaterInTo) {
-        // If fromOperation does not exist later in toOperations, we can
-        // interpolate it to the default value
-        fromOperationsResult.emplace_back(fromOperation);
-        toOperationsResult.emplace_back(getDefaultOperationOfType(fromOperation->type));
-        i++;
-      } else {
-        // If toOperation does not exist later in fromOperations, we can
-        // interpolate it from the default value
-        fromOperationsResult.emplace_back(getDefaultOperationOfType(toOperation->type));
-        toOperationsResult.emplace_back(toOperation);
-        j++;
-      }
-    }
-  }
-
-  // Convert all operations to matrices if matrix interpolation is required
-  if (shouldInterpolateMatrices) {
-    return std::make_pair(
-        StyleOperations{std::make_shared<MatrixOperation>(convertToTransformOperations(fromOperations))},
-        StyleOperations{std::make_shared<MatrixOperation>(convertToTransformOperations(toOperations))});
-  }
-
-  // Add remaining operations with default values
-  for (; i < fromOperations.size(); ++i) {
-    fromOperationsResult.emplace_back(fromOperations[i]);
-    toOperationsResult.emplace_back(getDefaultOperationOfType(fromOperations[i]->type));
-  }
-  for (; j < toOperations.size(); ++j) {
-    fromOperationsResult.emplace_back(getDefaultOperationOfType(toOperations[j]->type));
-    toOperationsResult.emplace_back(toOperations[j]);
-  }
-
-  return std::make_pair(fromOperationsResult, toOperationsResult);
-}
-
-TransformOperations TransformsStyleInterpolator::convertToTransformOperations(const StyleOperations &operations) const {
-  TransformOperations result;
-  result.reserve(operations.size());
-
-  for (const auto &operation : operations) {
-    result.emplace_back(std::static_pointer_cast<TransformOperation>(operation));
-  }
-
-  return result;
-}
-
-std::shared_ptr<TransformOperation> TransformsStyleInterpolator::getDefaultOperationOfType(const uint8_t type) const {
-  return std::static_pointer_cast<TransformOperation>(interpolators_->at(type)->getDefaultOperation());
-}
-
-} // namespace reanimated::css
+#include <reanimated/CSS/interpolation/transforms/TransformsStyleInterpolator.h>
+
+#include <unordered_map>
+
+namespace reanimated::css {
+
+const folly::dynamic defaultStyleValue = folly::dynamic::array(MatrixOperation(TransformMatrix3D()).toDynamic());
+
+TransformsStyleInterpolator::TransformsStyleInterpolator(
+    const PropertyPath &propertyPath,
+    const std::shared_ptr<StyleOperationInterpolators> &interpolators,
+    const std::shared_ptr<ViewStylesRepository> &viewStylesRepository)
+    : OperationsStyleInterpolatorBase<TransformOperation>(
+          propertyPath,
+          interpolators,
+          viewStylesRepository,
+          defaultStyleValue) {}
+
+void TransformsStyleInterpolator::addConvertedOperations(
+    const std::shared_ptr<TransformOperation> &sourceOperation,
+    const std::shared_ptr<TransformOperation> &targetOperation,
+    StyleOperations &sourceResult,
+    StyleOperations &targetResult) const {
+  const auto convertedOps = sourceOperation->convertTo(static_cast<TransformOp>(targetOperation->type));
+
+  targetResult.emplace_back(targetOperation);
+  for (size_t k = 0; k < convertedOps.size(); ++k) {
+    sourceResult.emplace_back(convertedOps[k]);
+    // Converted operations will contain one operation with the same type and
+    // can contain more operations derived from the source operation (we need
+    // to pair them with operations of the same type with default values)
+    if (k > 0) {
+      targetResult.emplace_back(getDefaultOperationOfType(convertedOps[k]->type));
+    }
+  }
+}
+
+std::optional<std::pair<StyleOperations, StyleOperations>> TransformsStyleInterpolator::createInterpolationPair(
+    const StyleOperations &fromOperations,
+    const StyleOperations &toOperations) const {
+  StyleOperations fromOperationsResult, toOperationsResult;
+  size_t i = 0, j = 0;
+  bool shouldInterpolateMatrices = false;
+
+  // Build index maps and check for matrix operation
+  std::unordered_map<uint8_t, size_t> lastIndexInFrom, lastIndexInTo;
+  for (size_t idx = 0; idx < fromOperations.size(); ++idx) {
+    if (static_cast<TransformOp>(fromOperations[idx]->type) == TransformOp::Matrix) {
+      shouldInterpolateMatrices = true;
+      break;
+    }
+    lastIndexInFrom[fromOperations[idx]->type] = idx;
+  }
+  for (size_t idx = 0; idx < toOperations.size() && !shouldInterpolateMatrices; ++idx) {
+    if (static_cast<TransformOp>(toOperations[idx]->type) == TransformOp::Matrix) {
+      shouldInterpolateMatrices = true;
+      break;
+    }
+    lastIndexInTo[toOperations[idx]->type] = idx;
+  }
+
+  while (!shouldInterpolateMatrices && i < fromOperations.size() && j < toOperations.size()) {
+    const auto &fromOperation = std::static_pointer_cast<TransformOperation>(fromOperations[i]);
+    const auto &toOperation = std::static_pointer_cast<TransformOperation>(toOperations[j]);
+    const auto fromType = static_cast<TransformOp>(fromOperation->type);
+    const auto toType = static_cast<TransformOp>(toOperation->type);
+
+    // Case 1: Types match directly
+    if (fromType == toType) {
+      fromOperationsResult.emplace_back(fromOperation);
+      toOperationsResult.emplace_back(toOperation);
+      i++;
+      j++;
+    } else if (fromOperation->canConvertTo(toType)) {
+      // Case 2: Operations can be converted to each other's type
+      addConvertedOperations(fromOperation, toOperation, fromOperationsResult, toOperationsResult);
+      i++;
+      j++;
+    } else if (toOperation->canConvertTo(fromType)) {
+      addConvertedOperations(toOperation, fromOperation, toOperationsResult, fromOperationsResult);
+      i++;
+      j++;
+    } else {
+      if (fromType == TransformOp::Perspective || toType == TransformOp::Perspective) {
+        shouldInterpolateMatrices = true;
+        break;
+      }
+      // Case 3: Use default values if no conversion possible
+      bool toExistsLaterInFrom = lastIndexInFrom.count(toOperation->type) && lastIndexInFrom[toOperation->type] > i;
+      bool fromExistsLaterInTo = lastIndexInTo.count(fromOperation->type) && lastIndexInTo[fromOperation->type] > j;
+
+      if (toExistsLaterInFrom == fromExistsLaterInTo) {
+        // If neither exists later, or both exist later (were reordered), we
+        // cannot interpolate the operations directly and we need to convert
+        // these operations to matrices
+        shouldInterpolateMatrices = true;
+        break;
+      } else if (!fromExistsLaterInTo) {
+        // If fromOperation does not exist later in toOperations, we can
+        // interpolate it to the default value
+        fromOperationsResult.emplace_back(fromOperation);
+        toOperationsResult.emplace_back(getDefaultOperationOfType(fromOperation->type));
+        i++;
+      } else {
+        // If toOperation does not exist later in fromOperations, we can
+        // interpolate it from the default value
+        fromOperationsResult.emplace_back(getDefaultOperationOfType(toOperation->type));
+        toOperationsResult.emplace_back(toOperation);
+        j++;
+      }
+    }
+  }
+
+  // Convert all operations to matrices if matrix interpolation is required
+  if (shouldInterpolateMatrices) {
+    return std::make_pair(
+        StyleOperations{std::make_shared<MatrixOperation>(convertToTransformOperations(fromOperations))},
+        StyleOperations{std::make_shared<MatrixOperation>(convertToTransformOperations(toOperations))});
+  }
+
+  // Add remaining operations with default values
+  for (; i < fromOperations.size(); ++i) {
+    fromOperationsResult.emplace_back(fromOperations[i]);
+    toOperationsResult.emplace_back(getDefaultOperationOfType(fromOperations[i]->type));
+  }
+  for (; j < toOperations.size(); ++j) {
+    fromOperationsResult.emplace_back(getDefaultOperationOfType(toOperations[j]->type));
+    toOperationsResult.emplace_back(toOperations[j]);
+  }
+
+  return std::make_pair(fromOperationsResult, toOperationsResult);
+}
+
+TransformOperations TransformsStyleInterpolator::convertToTransformOperations(const StyleOperations &operations) const {
+  TransformOperations result;
+  result.reserve(operations.size());
+
+  for (const auto &operation : operations) {
+    result.emplace_back(std::static_pointer_cast<TransformOperation>(operation));
+  }
+
+  return result;
+}
+
+std::shared_ptr<TransformOperation> TransformsStyleInterpolator::getDefaultOperationOfType(const uint8_t type) const {
+  return std::static_pointer_cast<TransformOperation>(interpolators_->at(type)->getDefaultOperation());
+}
+
+} // namespace reanimated::css

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/CSS/interpolation/transforms/TransformsStyleInterpolator.h

@@ -1,33 +1,33 @@
-#pragma once
-
-#include <reanimated/CSS/interpolation/operations/OperationsStyleInterpolator.h>
-#include <reanimated/CSS/interpolation/transforms/TransformOperationInterpolator.h>
-
-#include <memory>
-#include <utility>
-
-namespace reanimated::css {
-
-class TransformsStyleInterpolator final : public OperationsStyleInterpolatorBase<TransformOperation> {
- public:
-  TransformsStyleInterpolator(
-      const PropertyPath &propertyPath,
-      const std::shared_ptr<StyleOperationInterpolators> &interpolators,
-      const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
-
- protected:
-  std::optional<std::pair<StyleOperations, StyleOperations>> createInterpolationPair(
-      const StyleOperations &fromOperations,
-      const StyleOperations &toOperations) const override;
-
- private:
-  void addConvertedOperations(
-      const std::shared_ptr<TransformOperation> &sourceOperation,
-      const std::shared_ptr<TransformOperation> &targetOperation,
-      StyleOperations &sourceResult,
-      StyleOperations &targetResult) const;
-  TransformOperations convertToTransformOperations(const StyleOperations &operations) const;
-  std::shared_ptr<TransformOperation> getDefaultOperationOfType(uint8_t type) const;
-};
-
-} // namespace reanimated::css
+#pragma once
+
+#include <reanimated/CSS/interpolation/operations/OperationsStyleInterpolator.h>
+#include <reanimated/CSS/interpolation/transforms/TransformOperationInterpolator.h>
+
+#include <memory>
+#include <utility>
+
+namespace reanimated::css {
+
+class TransformsStyleInterpolator final : public OperationsStyleInterpolatorBase<TransformOperation> {
+ public:
+  TransformsStyleInterpolator(
+      const PropertyPath &propertyPath,
+      const std::shared_ptr<StyleOperationInterpolators> &interpolators,
+      const std::shared_ptr<ViewStylesRepository> &viewStylesRepository);
+
+ protected:
+  std::optional<std::pair<StyleOperations, StyleOperations>> createInterpolationPair(
+      const StyleOperations &fromOperations,
+      const StyleOperations &toOperations) const override;
+
+ private:
+  void addConvertedOperations(
+      const std::shared_ptr<TransformOperation> &sourceOperation,
+      const std::shared_ptr<TransformOperation> &targetOperation,
+      StyleOperations &sourceResult,
+      StyleOperations &targetResult) const;
+  TransformOperations convertToTransformOperations(const StyleOperations &operations) const;
+  std::shared_ptr<TransformOperation> getDefaultOperationOfType(uint8_t type) const;
+};
+
+} // namespace reanimated::css