diff --git a/React/Base/Surface/RCTSurface.h b/React/Base/Surface/RCTSurface.h
index 1f6ec2b63fea82..603f0e851acf1b 100644
--- a/React/Base/Surface/RCTSurface.h
+++ b/React/Base/Surface/RCTSurface.h
@@ -80,7 +80,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Previously set `maximumSize` layout constraint.
- * Defaults to `{INFINITY, INFINITY}`.
+ * Defaults to `{CGFLOAT_MAX, CGFLOAT_MAX}`.
  */
 @property (atomic, assign, readonly) CGSize maximumSize;
 
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index ebe11690bca6a2..9624663afba403 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -67,7 +67,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     _rootShadowViewDidStartLayingOutSemaphore = dispatch_semaphore_create(0);
 
     _minimumSize = CGSizeZero;
-    _maximumSize = CGSizeMake(INFINITY, INFINITY);
+    _maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleBridgeWillLoadJavaScriptNotification:)
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.m b/React/Base/Surface/RCTSurfaceRootShadowView.m
index 9ffe7364cb32f4..3b98c6d7984064 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.m
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.m
@@ -9,9 +9,9 @@
 
 #import "RCTSurfaceRootShadowView.h"
 
-#import <React/RCTUIManagerUtils.h>
-
 #import "RCTI18nUtil.h"
+#import "RCTShadowView+Layout.h"
+#import "RCTUIManagerUtils.h"
 
 @implementation RCTSurfaceRootShadowView {
   CGSize _intrinsicSize;
@@ -25,7 +25,7 @@ - (instancetype)init
     self.viewName = @"RCTSurfaceRootView";
     _baseDirection = [[RCTI18nUtil sharedInstance] isRTL] ? YGDirectionRTL : YGDirectionLTR;
     _minimumSize = CGSizeZero;
-    _maximumSize = CGSizeMake(INFINITY, INFINITY);
+    _maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
     self.alignSelf = YGAlignStretch;
     self.flex = 1;
@@ -45,14 +45,17 @@ - (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)atIndex
 
 - (void)calculateLayoutWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximimSize
 {
-  // Treating `INFINITY` as `YGUndefined` (which equals `NAN`).
-  float availableWidth = isinf(maximimSize.width) ? YGUndefined : maximimSize.width;
-  float availableHeight = isinf(maximimSize.height) ? YGUndefined : maximimSize.height;
+  YGNodeRef yogaNode = self.yogaNode;
 
-  self.minWidth = (YGValue){isinf(minimumSize.width) ? YGUndefined : minimumSize.width, YGUnitPoint};
-  self.minHeight = (YGValue){isinf(minimumSize.height) ? YGUndefined : minimumSize.height, YGUnitPoint};
+  YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximimSize.width));
+  YGNodeStyleSetMinHeight(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(maximimSize.height));
 
-  YGNodeCalculateLayout(self.yogaNode, availableWidth, availableHeight, _baseDirection);
+  YGNodeCalculateLayout(
+    self.yogaNode,
+    RCTYogaFloatFromCoreGraphicsFloat(maximimSize.width),
+    RCTYogaFloatFromCoreGraphicsFloat(maximimSize.height),
+    _baseDirection
+  );
 }
 
 - (NSSet<RCTShadowView *> *)collectViewsWithUpdatedFrames
diff --git a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
index 5d55f62a4ca4ec..4759b6f542224d 100644
--- a/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
+++ b/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm
@@ -85,7 +85,7 @@ - (CGSize)sizeThatFits:(CGSize)size
   }
 
   CGSize minimumSize = CGSizeZero;
-  CGSize maximumSize = CGSizeMake(INFINITY, INFINITY);
+  CGSize maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
   if (_sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) {
     minimumSize.width = size.width;