react-native-tvos 0.83.2-0 → 0.84.0-0

package/ReactCommon/react/renderer/animated/nodes/InterpolationAnimatedNode.cpp

@@ -11,9 +11,11 @@
 
 #include "InterpolationAnimatedNode.h"
 
+#include <glog/logging.h>
 #include <react/renderer/animated/NativeAnimatedNodesManager.h>
 #include <react/renderer/animated/drivers/AnimationDriverUtils.h>
 #include <react/renderer/animated/internal/primitives.h>
+#include <react/renderer/animated/nodes/PropsAnimatedNode.h>
 #include <react/renderer/graphics/HostPlatformColor.h>
 
 namespace facebook::react {
@@ -29,13 +31,19 @@ InterpolationAnimatedNode::InterpolationAnimatedNode(
     inputRanges_.push_back(rangeValue.asDouble());
   }
 
-  const bool isColorOutput = nodeConfig["outputType"].isString() &&
-      nodeConfig["outputType"].asString() == "color";
-  if (isColorOutput) {
+  const auto outputType = nodeConfig["outputType"].isString()
+      ? nodeConfig["outputType"].asString()
+      : "";
+  outputType_ = outputType;
+  if (outputType == "color") {
     isColorValue_ = true;
     for (const auto& rangeValue : nodeConfig["outputRange"]) {
       colorOutputRanges_.push_back(static_cast<int>(rangeValue.asInt()));
     }
+  } else if (outputType == "platform_color") {
+    for (const auto& rangeValue : nodeConfig["outputRange"]) {
+      platformColorOutputRanges_.push_back(rangeValue);
+    }
   } else {
     for (const auto& rangeValue : nodeConfig["outputRange"]) {
       defaultOutputRanges_.push_back(rangeValue.asDouble());
@@ -53,8 +61,10 @@ void InterpolationAnimatedNode::update() {
 
   if (const auto node =
           manager_->getAnimatedNode<ValueAnimatedNode>(parentTag_)) {
-    if (isColorValue_) {
+    if (outputType_ == "color") {
       setRawValue(interpolateColor(node->getValue()));
+    } else if (outputType_ == "platform_color") {
+      setRawValue(interpolatePlatformColor(node->getValue()));
     } else {
       setRawValue(interpolateValue(node->getValue()));
     }
@@ -141,4 +151,93 @@ double InterpolationAnimatedNode::interpolateColor(double value) {
       static_cast<uint8_t>(outputValueA)));
 }
 
+double InterpolationAnimatedNode::interpolatePlatformColor(double value) {
+  if (connectedRootTag_ == animated::undefinedAnimatedNodeIdentifier) {
+    connectedRootTag_ = resolveConnectedRootTag();
+  }
+
+  // Compute range index
+  size_t index = 1;
+  for (; index < inputRanges_.size() - 1; ++index) {
+    if (inputRanges_[index] >= value) {
+      break;
+    }
+  }
+  index--;
+  SharedColor outputMinSharedColor;
+  SharedColor outputMaxSharedColor;
+  if (manager_ != nullptr) {
+    manager_->resolvePlatformColor(
+        connectedRootTag_,
+        RawValue(platformColorOutputRanges_[index]),
+        outputMinSharedColor);
+    manager_->resolvePlatformColor(
+        connectedRootTag_,
+        RawValue(platformColorOutputRanges_[index + 1]),
+        outputMaxSharedColor);
+  }
+  auto outputMin = *outputMinSharedColor;
+  auto outputMax = *outputMaxSharedColor;
+
+  if (outputMin == outputMax) {
+    return outputMin;
+  }
+
+  const auto inputMin = inputRanges_[index];
+  const auto inputMax = inputRanges_[index + 1];
+  if (inputMin == inputMax) {
+    if (value <= inputMin) {
+      return static_cast<int32_t>(outputMin);
+    } else {
+      return static_cast<int32_t>(outputMax);
+    }
+  }
+
+  auto ratio = (value - inputMin) / (inputMax - inputMin);
+
+  auto outputMinA = alphaFromHostPlatformColor(outputMin);
+  auto outputMinR = redFromHostPlatformColor(outputMin);
+  auto outputMinG = greenFromHostPlatformColor(outputMin);
+  auto outputMinB = blueFromHostPlatformColor(outputMin);
+
+  auto outputMaxA = alphaFromHostPlatformColor(outputMax);
+  auto outputMaxR = redFromHostPlatformColor(outputMax);
+  auto outputMaxG = greenFromHostPlatformColor(outputMax);
+  auto outputMaxB = blueFromHostPlatformColor(outputMax);
+
+  auto outputValueA = ratio * (outputMaxA - outputMinA) + outputMinA;
+  auto outputValueR = ratio * (outputMaxR - outputMinR) + outputMinR;
+  auto outputValueG = ratio * (outputMaxG - outputMinG) + outputMinG;
+  auto outputValueB = ratio * (outputMaxB - outputMinB) + outputMinB;
+
+  return static_cast<int32_t>(hostPlatformColorFromRGBA(
+      static_cast<uint8_t>(outputValueR),
+      static_cast<uint8_t>(outputValueG),
+      static_cast<uint8_t>(outputValueB),
+      static_cast<uint8_t>(outputValueA)));
+}
+
+SurfaceId InterpolationAnimatedNode::resolveConnectedRootTag() const {
+  // find nearest connected props node
+  std::deque<Tag> nodesQueue{tag()};
+  while (!nodesQueue.empty()) {
+    auto nodeTag = nodesQueue.front();
+    nodesQueue.pop_front();
+    if (auto node = manager_->getAnimatedNode<AnimatedNode>(nodeTag)) {
+      if (node->type() == AnimatedNodeType::Props) {
+        if (auto propsNode = static_cast<PropsAnimatedNode*>(node)) {
+          return propsNode->connectedRootTag();
+        }
+        break;
+      }
+      auto children = node->getChildren();
+      nodesQueue.insert(nodesQueue.end(), children.begin(), children.end());
+    }
+  }
+
+  LOG(ERROR)
+      << "InterpolationAnimatedNode: Unable to resolve connected root tag";
+  return animated::undefinedAnimatedNodeIdentifier;
+}
+
 } // namespace facebook::react

package/ReactCommon/react/renderer/animated/nodes/InterpolationAnimatedNode.h

@@ -29,13 +29,22 @@ class InterpolationAnimatedNode final : public ValueAnimatedNode {
  private:
   double interpolateValue(double value);
   double interpolateColor(double value);
+  double interpolatePlatformColor(double value);
+
+  SurfaceId resolveConnectedRootTag() const;
 
   std::vector<double> inputRanges_;
   std::vector<double> defaultOutputRanges_;
   std::vector<Color> colorOutputRanges_;
+  std::vector<folly::dynamic> platformColorOutputRanges_;
   std::string extrapolateLeft_;
   std::string extrapolateRight_;
 
+  std::string outputType_;
+
   Tag parentTag_{animated::undefinedAnimatedNodeIdentifier};
+
+  // Needed for PlatformColor resolver
+  SurfaceId connectedRootTag_{animated::undefinedAnimatedNodeIdentifier};
 };
 } // namespace facebook::react

package/ReactCommon/react/renderer/animated/nodes/PropsAnimatedNode.cpp

@@ -49,7 +49,11 @@ PropsAnimatedNode::PropsAnimatedNode(
     const folly::dynamic& config,
     NativeAnimatedNodesManager& manager)
     : AnimatedNode(tag, config, manager, AnimatedNodeType::Props),
-      props_(folly::dynamic::object()) {}
+      props_(folly::dynamic::object()) {
+  if (auto it = getConfig().find("rootTag"); it != getConfig().items().end()) {
+    connectedRootTag_ = static_cast<Tag>(it->second.asInt());
+  }
+}
 
 void PropsAnimatedNode::connectToView(Tag viewTag) {
   react_native_assert(

package/ReactCommon/react/renderer/animated/nodes/PropsAnimatedNode.h

@@ -14,6 +14,7 @@
 #include "AnimatedNode.h"
 
 #include <react/renderer/animated/internal/primitives.h>
+#include <react/renderer/core/ShadowNode.h>
 #include <mutex>
 
 namespace facebook::react {
@@ -29,6 +30,11 @@ class PropsAnimatedNode final : public AnimatedNode {
     return connectedViewTag_;
   }
 
+  SurfaceId connectedRootTag() const
+  {
+    return connectedRootTag_;
+  }
+
   folly::dynamic props()
   {
     std::lock_guard<std::mutex> lock(propsMutex_);
@@ -45,5 +51,8 @@ class PropsAnimatedNode final : public AnimatedNode {
   bool layoutStyleUpdated_{false};
 
   Tag connectedViewTag_{animated::undefinedAnimatedNodeIdentifier};
+
+  // Needed for PlatformColor resolver
+  SurfaceId connectedRootTag_{animated::undefinedAnimatedNodeIdentifier};
 };
 } // namespace facebook::react

package/ReactCommon/react/renderer/animated/nodes/RoundAnimatedNode.cpp

@@ -22,7 +22,7 @@ RoundAnimatedNode::RoundAnimatedNode(
     NativeAnimatedNodesManager& manager)
     : ValueAnimatedNode(tag, config, manager),
       inputNodeTag_(static_cast<Tag>(getConfig()["input"].asInt())),
-      nearest_(getConfig()["input"].asDouble()) {
+      nearest_(getConfig()["nearest"].asDouble()) {
   react_native_assert(
       nearest_ != 0 &&
       "'nearest' cannot be 0 (can't round to the nearest multiple of 0)");

package/ReactCommon/react/renderer/animated/nodes/ValueAnimatedNode.cpp

@@ -55,7 +55,7 @@ bool ValueAnimatedNode::setOffset(double offset) noexcept {
     offset_ = offset;
     return true;
   }
-  return true;
+  return false;
 }
 
 double ValueAnimatedNode::getValue() const noexcept {

package/ReactCommon/react/renderer/animated/tests/AnimatedNodeTests.cpp

@@ -215,6 +215,73 @@ TEST_F(AnimatedNodeTests, DiffClampAnimatedNode) {
   EXPECT_EQ(nodesManager_->getValue(diffClampTag), 1);
 }
 
+TEST_F(AnimatedNodeTests, RoundAnimatedNodeUsesNearestConfigKey) {
+  // This test verifies that RoundAnimatedNode reads the "nearest" config key
+  // for the rounding factor, not the "input" key.
+  initNodesManager();
+
+  auto rootTag = getNextRootViewTag();
+
+  auto valueTag = ++rootTag;
+  auto roundTag = ++rootTag;
+
+  nodesManager_->createAnimatedNode(
+      valueTag,
+      folly::dynamic::object("type", "value")("value", 7.3)("offset", 0));
+
+  // The round node should read "nearest" for the rounding factor (5.0),
+  // not "input" (which is the valueTag integer).
+  nodesManager_->createAnimatedNode(
+      roundTag,
+      folly::dynamic::object("type", "round")("input", valueTag)(
+          "nearest", 5.0));
+  nodesManager_->connectAnimatedNodes(valueTag, roundTag);
+
+  runAnimationFrame(0);
+
+  // 7.3 rounded to nearest 5.0 should be 5.0 (since round(7.3/5) * 5 = 1 * 5)
+  // If the bug existed (reading "input" instead of "nearest"), it would use
+  // the valueTag as the rounding factor, giving incorrect results.
+  EXPECT_DOUBLE_EQ(nodesManager_->getValue(roundTag).value(), 5.0);
+
+  // Test another value to ensure rounding works correctly
+  nodesManager_->setAnimatedNodeValue(valueTag, 12.6);
+  runAnimationFrame(0);
+
+  // 12.6 rounded to nearest 5.0 should be 15.0 (since round(12.6/5) * 5 = 3 *
+  // 5)
+  EXPECT_DOUBLE_EQ(nodesManager_->getValue(roundTag).value(), 15.0);
+}
+
+TEST_F(AnimatedNodeTests, SetOffsetReturnsFalseWhenUnchanged) {
+  // This test verifies that setAnimatedNodeOffset doesn't trigger unnecessary
+  // updates when the offset value hasn't changed.
+  initNodesManager();
+
+  auto rootTag = getNextRootViewTag();
+  auto valueTag = ++rootTag;
+
+  nodesManager_->createAnimatedNode(
+      valueTag,
+      folly::dynamic::object("type", "value")("value", 10)("offset", 0));
+
+  runAnimationFrame(0);
+  EXPECT_EQ(nodeNeedsUpdate(valueTag), false);
+
+  // First setOffset should mark the node as needing update
+  nodesManager_->setAnimatedNodeOffset(valueTag, 5);
+  EXPECT_EQ(nodeNeedsUpdate(valueTag), true);
+  EXPECT_EQ(nodesManager_->getValue(valueTag), 15); // 10 + 5
+
+  runAnimationFrame(0);
+  EXPECT_EQ(nodeNeedsUpdate(valueTag), false);
+
+  // Setting the same offset again should NOT mark the node as needing update
+  nodesManager_->setAnimatedNodeOffset(valueTag, 5);
+  EXPECT_EQ(nodeNeedsUpdate(valueTag), false); // No change, no update needed
+  EXPECT_EQ(nodesManager_->getValue(valueTag), 15); // Still 10 + 5
+}
+
 TEST_F(AnimatedNodeTests, ObjectAnimatedNode) {
   initNodesManager();
 

package/ReactCommon/react/renderer/animated/tests/AnimationDriverTests.cpp

@@ -58,4 +58,63 @@ TEST_F(AnimationDriverTests, framesAnimation) {
   EXPECT_EQ(round(nodesManager_->getValue(valueNodeTag).value()), toValue);
 }
 
+TEST_F(AnimationDriverTests, framesAnimationReconfigurationClearsFrames) {
+  // This test verifies that when an animation is reconfigured via updateConfig,
+  // the frames array is cleared before adding new frames. Without clearing,
+  // frames would accumulate and cause incorrect animation behavior.
+  initNodesManager();
+
+  auto rootTag = getNextRootViewTag();
+
+  auto valueNodeTag = ++rootTag;
+  nodesManager_->createAnimatedNode(
+      valueNodeTag,
+      folly::dynamic::object("type", "value")("value", 0)("offset", 0));
+
+  const auto animationId = 1;
+  // First animation: 5 frames from 0 to 100
+  const auto frames1 = folly::dynamic::array(0.0f, 0.25f, 0.5f, 0.75f, 1.0f);
+  const auto toValue1 = 100;
+  nodesManager_->startAnimatingNode(
+      animationId,
+      valueNodeTag,
+      folly::dynamic::object("type", "frames")("frames", frames1)(
+          "toValue", toValue1),
+      std::nullopt);
+
+  const double startTimeInTick = 12345;
+
+  // Run first frame
+  runAnimationFrame(startTimeInTick);
+  EXPECT_EQ(round(nodesManager_->getValue(valueNodeTag).value()), 0);
+
+  // Reconfigure the same animation (same animationId) with new frames
+  // This triggers updateConfig on the existing FrameAnimationDriver
+  const auto frames2 = folly::dynamic::array(0.0f, 0.5f, 1.0f);
+  const auto toValue2 = 200;
+  nodesManager_->startAnimatingNode(
+      animationId,
+      valueNodeTag,
+      folly::dynamic::object("type", "frames")("frames", frames2)(
+          "toValue", toValue2),
+      std::nullopt);
+
+  // Reset animation timing
+  const double newStartTimeInTick = 20000;
+
+  // Run animation at halfway point (1 frame into 3-frame animation)
+  runAnimationFrame(newStartTimeInTick);
+  runAnimationFrame(newStartTimeInTick + SingleFrameIntervalMs * 1);
+
+  // At frame 1 of 3 frames (50% progress), value should be approximately:
+  // startValue (0) + 0.5 * (toValue2 - startValue) = 0 + 0.5 * 200 = 100
+  // If frames accumulated (5 + 3 = 8 frames), we'd be at wrong position
+  // Use ceil rounding so 100.00x becomes 100.01
+  EXPECT_EQ(round(nodesManager_->getValue(valueNodeTag).value()), 100.01);
+
+  // Complete the animation
+  runAnimationFrame(newStartTimeInTick + SingleFrameIntervalMs * 2);
+  EXPECT_EQ(round(nodesManager_->getValue(valueNodeTag).value()), toValue2);
+}
+
 } // namespace facebook::react

package/ReactCommon/react/renderer/animated/tests/AnimationTestsBase.h

@@ -35,7 +35,8 @@ class AnimationTestsBase : public testing::Test {
             lastUpdatedNodeTag = nodesProps.begin()->first;
             lastCommittedProps = nodesProps.begin()->second;
           }
-        });
+        },
+        nullptr);
     NativeAnimatedNodesManager::isOnRenderThread_ = true;
   }