From 3650ae3d08755975287b7feffb10a85d0f8192fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= Date: Fri, 19 Dec 2025 10:17:58 -0800 Subject: [PATCH] Add support for max/min width/height props to Animation Backend (#54945) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54945 ## Summary: Adds support for `maxWidth`, `maxHeight`, `minWidth`, and `minHeight` props to be passed as `AnimatedProp` to the animation backend. ## Changelog: [General][Added] - Added support for `maxWidth`, `maxHeight`, `minWidth`, and `minHeight` props to the AnimationBackend. Reviewed By: zeyap Differential Revision: D89543698 fbshipit-source-id: f283e945bde8aae0b6e6c29ae5cdd8e39dcf15bd --- .../AnimatedPropSerializer.cpp | 4 ++++ .../renderer/animationbackend/AnimatedProps.h | 22 ++++++++++++++++++- .../animationbackend/AnimatedPropsBuilder.h | 16 ++++++++++++++ .../animationbackend/AnimatedPropsRegistry.h | 20 +++++++++++++++++ .../animationbackend/AnimationBackend.cpp | 2 ++ 5 files changed, 63 insertions(+), 1 deletion(-) diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp index 10926fee90b..85c3da824eb 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropSerializer.cpp @@ -279,6 +279,10 @@ void packAnimatedProp( case FLEX_SHRINK: case FLEX_WRAP: case JUSTIFY_CONTENT: + case MAX_HEIGHT: + case MAX_WIDTH: + case MIN_HEIGHT: + case MIN_WIDTH: throw std::runtime_error("Tried to synchronously update layout props"); } } diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h index bc2f35d88a3..034a67fbd78 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedProps.h @@ -47,7 +47,11 @@ enum PropName { FLEX_GROW, FLEX_SHRINK, FLEX_WRAP, - JUSTIFY_CONTENT + JUSTIFY_CONTENT, + MAX_HEIGHT, + MAX_WIDTH, + MIN_HEIGHT, + MIN_WIDTH }; struct AnimatedPropBase { @@ -335,6 +339,22 @@ inline void cloneProp(BaseViewProps &viewProps, const AnimatedPropBase &animated viewProps.yogaStyle.setJustifyContent(get(animatedProp)); break; + case MAX_HEIGHT: + viewProps.yogaStyle.setMaxDimension(yoga::Dimension::Height, get(animatedProp)); + break; + + case MAX_WIDTH: + viewProps.yogaStyle.setMaxDimension(yoga::Dimension::Width, get(animatedProp)); + break; + + case MIN_HEIGHT: + viewProps.yogaStyle.setMinDimension(yoga::Dimension::Height, get(animatedProp)); + break; + + case MIN_WIDTH: + viewProps.yogaStyle.setMinDimension(yoga::Dimension::Width, get(animatedProp)); + break; + default: break; } diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h index 72f8da28517..a3755c4c36c 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsBuilder.h @@ -152,6 +152,22 @@ struct AnimatedPropsBuilder { { props.push_back(std::make_unique>(JUSTIFY_CONTENT, value)); } + void setMaxHeight(yoga::Style::SizeLength value) + { + props.push_back(std::make_unique>(MAX_HEIGHT, value)); + } + void setMaxWidth(yoga::Style::SizeLength value) + { + props.push_back(std::make_unique>(MAX_WIDTH, value)); + } + void setMinHeight(yoga::Style::SizeLength value) + { + props.push_back(std::make_unique>(MIN_HEIGHT, value)); + } + void setMinWidth(yoga::Style::SizeLength value) + { + props.push_back(std::make_unique>(MIN_WIDTH, value)); + } void storeDynamic(folly::dynamic &d) { rawProps = std::make_unique(std::move(d)); diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h index 1d1d2d1288d..7799cf9d486 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimatedPropsRegistry.h @@ -219,6 +219,26 @@ inline void updateProp(const PropName propName, BaseViewProps &viewProps, const case JUSTIFY_CONTENT: viewProps.yogaStyle.setJustifyContent(snapshot.props.yogaStyle.justifyContent()); break; + + case MAX_HEIGHT: + viewProps.yogaStyle.setMaxDimension( + yoga::Dimension::Height, snapshot.props.yogaStyle.maxDimension(yoga::Dimension::Height)); + break; + + case MAX_WIDTH: + viewProps.yogaStyle.setMaxDimension( + yoga::Dimension::Width, snapshot.props.yogaStyle.maxDimension(yoga::Dimension::Width)); + break; + + case MIN_HEIGHT: + viewProps.yogaStyle.setMinDimension( + yoga::Dimension::Height, snapshot.props.yogaStyle.minDimension(yoga::Dimension::Height)); + break; + + case MIN_WIDTH: + viewProps.yogaStyle.setMinDimension( + yoga::Dimension::Width, snapshot.props.yogaStyle.minDimension(yoga::Dimension::Width)); + break; } } diff --git a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.cpp b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.cpp index 43e4d4af50d..0ca2f940206 100644 --- a/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackend.cpp @@ -23,6 +23,8 @@ static const auto layoutProps = std::set{ PropName::DISPLAY, PropName::FLEX_BASIS, PropName::FLEX_DIRECTION, PropName::ROW_GAP, PropName::COLUMN_GAP, PropName::FLEX_GROW, PropName::FLEX_SHRINK, PropName::FLEX_WRAP, PropName::JUSTIFY_CONTENT, + PropName::MAX_HEIGHT, PropName::MAX_WIDTH, PropName::MIN_HEIGHT, + PropName::MIN_WIDTH, }; UIManagerNativeAnimatedDelegateBackendImpl::