diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp index 2210b6fd93d..f904e03f306 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp @@ -74,6 +74,34 @@ void packTransform(folly::dynamic& dyn, const AnimatedPropBase& animatedProp) { folly::dynamic::array(folly::dynamic::object("matrix", matrixArray))); } +std::string unitTypeToString(UnitType unit) { + switch (unit) { + case UnitType::Undefined: + return "undefined"; + case UnitType::Point: + return "point"; + case UnitType::Percent: + return "percent"; + default: + throw std::runtime_error("Unknown unit type"); + } +} + +void packTransformOrigin( + folly::dynamic& dyn, + const AnimatedPropBase& animatedProp) { + const auto& transformOrigin = get(animatedProp); + auto originArray = folly::dynamic::array(); + for (const auto& xyValue : transformOrigin.xy) { + folly::dynamic valueObj = folly::dynamic::object(); + valueObj["value"] = xyValue.value; + valueObj["unit"] = unitTypeToString(xyValue.unit); + originArray.push_back(valueObj); + } + originArray.push_back(transformOrigin.z); + dyn.insert("transformOrigin", originArray); +} + void packBackgroundColor( folly::dynamic& dyn, const AnimatedPropBase& animatedProp) { @@ -550,6 +578,10 @@ void packAnimatedProp( packTransform(dyn, *animatedProp); break; + case TRANSFORM_ORIGIN: + packTransformOrigin(dyn, *animatedProp); + break; + case BACKGROUND_COLOR: packBackgroundColor(dyn, *animatedProp); break; diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h index 43a76ee1e5f..db7e00f78c9 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h @@ -24,6 +24,7 @@ enum PropName { POSITION, FLEX, TRANSFORM, + TRANSFORM_ORIGIN, BACKGROUND_COLOR, SHADOW_COLOR, SHADOW_OFFSET, @@ -255,6 +256,10 @@ inline void cloneProp(BaseViewProps &viewProps, const AnimatedPropBase &animated viewProps.transform = get(animatedProp); break; + case TRANSFORM_ORIGIN: + viewProps.transformOrigin = get(animatedProp); + break; + case BACKGROUND_COLOR: viewProps.backgroundColor = get(animatedProp); break; diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h index eb884dc1a4f..b3608ebd692 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h @@ -56,9 +56,13 @@ struct AnimatedPropsBuilder { { props.push_back(std::make_unique>(FLEX, value)); } - void setTransform(Transform &t) + void setTransform(const Transform &t) { - props.push_back(std::make_unique>(TRANSFORM, std::move(t))); + props.push_back(std::make_unique>(TRANSFORM, t)); + } + void setTransformOrigin(const TransformOrigin &value) + { + props.push_back(std::make_unique>(TRANSFORM_ORIGIN, value)); } void setBackgroundColor(SharedColor value) { diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h index bac7b738237..ccc73b13093 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h @@ -68,6 +68,10 @@ inline void updateProp(const PropName propName, BaseViewProps &viewProps, const viewProps.transform = snapshot.props.transform; break; + case TRANSFORM_ORIGIN: + viewProps.transformOrigin = snapshot.props.transformOrigin; + break; + case BORDER_RADII: viewProps.borderRadii = snapshot.props.borderRadii; break;