From 159d024c697ab927b257d9c334eb592e7b55f241 Mon Sep 17 00:00:00 2001 From: Andrew Ghostuhin Date: Tue, 9 Jun 2026 12:42:47 +0300 Subject: [PATCH] fix(android): relayout root after font scale changes --- .../react/renderer/scheduler/SurfaceHandler.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp index c69fc641ae0b..7c0326034309 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp @@ -9,6 +9,7 @@ #include #include +#include #include namespace facebook::react { @@ -242,8 +243,17 @@ void SurfaceHandler::constraintLayout( link_.shadowTree && "`link_.shadowTree` must not be null."); link_.shadowTree->commit( [&](const RootShadowNode& oldRootShadowNode) { - return oldRootShadowNode.clone( + auto newRoot = oldRootShadowNode.clone( propsParserContext, layoutConstraints, layoutContext); + + if (ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout() && + layoutContext.fontSizeMultiplier != + oldRootShadowNode.getConcreteProps() + .layoutContext.fontSizeMultiplier) { + newRoot->dirtyLayout(); + } + + return newRoot; }, {/* default commit options */}); }