Ensure full layout occurs when a system scale change occurs

acoates-ms · Jun 18, 2024 · d04b1e5 · d04b1e5
1 parent d8739e1
commit d04b1e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp
@@ -49,7 +49,9 @@ RootShadowNode::Unshared RootShadowNode::clone(
           /* .props = */ props,
       });
 
-  if (layoutConstraints != getConcreteProps().layoutConstraints) {
+  if (layoutConstraints != getConcreteProps().layoutConstraints ||
+      layoutContext.pointScaleFactor !=
+          getConcreteProps().layoutContext.pointScaleFactor) {
     newRootShadowNode->dirtyLayout();
   }
 

diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp
@@ -2140,7 +2140,8 @@ bool calculateLayoutInternal(
 
   const bool needToVisitNode =
       (node->isDirty() && layout->generationCount != generationCount) ||
-      layout->lastOwnerDirection != ownerDirection;
+      layout->lastOwnerDirection != ownerDirection ||
+      layout->lastScale != node->getConfig()->getPointScaleFactor();
 
   if (needToVisitNode) {
     // Invalidate the cached results.
@@ -2255,6 +2256,7 @@ bool calculateLayoutInternal(
         reason);
 
     layout->lastOwnerDirection = ownerDirection;
+    layout->lastScale = node->getConfig()->getPointScaleFactor();
 
     if (cachedResults == nullptr) {
       layoutMarkerData.maxMeasureCache = std::max(

diff --git a/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.cpp b/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.cpp
@@ -21,6 +21,7 @@ bool LayoutResults::operator==(LayoutResults layout) const {
       direction() == layout.direction() &&
       hadOverflow() == layout.hadOverflow() &&
       lastOwnerDirection == layout.lastOwnerDirection &&
+      lastScale == layout.lastScale &&
       nextCachedMeasurementsIndex == layout.nextCachedMeasurementsIndex &&
       cachedLayout == layout.cachedLayout &&
       computedFlexBasis == layout.computedFlexBasis;

diff --git a/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h b/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h
@@ -31,6 +31,7 @@ struct LayoutResults {
   // information to break early when nothing changed
   uint32_t generationCount = 0;
   Direction lastOwnerDirection = Direction::Inherit;
+  float lastScale = 1.0f;
 
   uint32_t nextCachedMeasurementsIndex = 0;
   std::array<CachedMeasurement, MaxCachedMeasurements> cachedMeasurements = {};