Set minHeight instead of minWidth for calculating the layout in RCTSurfaceRootShadowView

maicki · facebook-github-bot · commit d3b41e0da37c · 2017-12-28T10:40:28.000-08:00
Summary: Fix calculating layout in `RCTSurfaceRootShadowView` as the `minWidth` is set doubled in `calculateLayoutWithMinimumSize:maximumSize:`. cc shergin Closes #17203 Differential Revision: D6642437 Pulled By: shergin fbshipit-source-id: 3483c952c9ecf0132182a156b7b916eb1e975424
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.m b/React/Base/Surface/RCTSurfaceRootShadowView.m
@@ -50,7 +50,7 @@ - (void)calculateLayoutWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)m
   float availableHeight = isinf(maximimSize.height) ? YGUndefined : maximimSize.height;
 
   self.minWidth = (YGValue){isinf(minimumSize.width) ? YGUndefined : minimumSize.width, YGUnitPoint};
-  self.minWidth = (YGValue){isinf(minimumSize.height) ? YGUndefined : minimumSize.height, YGUnitPoint};
+  self.minHeight = (YGValue){isinf(minimumSize.height) ? YGUndefined : minimumSize.height, YGUnitPoint};
 
   YGNodeCalculateLayout(self.yogaNode, availableWidth, availableHeight, _baseDirection);
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ - (void)calculateLayoutWithMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)m`
`50`	`50`	`float availableHeight = isinf(maximimSize.height) ? YGUndefined : maximimSize.height;`
`51`	`51`
`52`	`52`	`self.minWidth = (YGValue){isinf(minimumSize.width) ? YGUndefined : minimumSize.width, YGUnitPoint};`
`53`		`- self.minWidth = (YGValue){isinf(minimumSize.height) ? YGUndefined : minimumSize.height, YGUnitPoint};`
	`53`	`+ self.minHeight = (YGValue){isinf(minimumSize.height) ? YGUndefined : minimumSize.height, YGUnitPoint};`
`54`	`54`
`55`	`55`	`YGNodeCalculateLayout(self.yogaNode, availableWidth, availableHeight, _baseDirection);`
`56`	`56`	`}`