[ASDisplayNode] Do not start measurement for a transition if we have never been provided a constrainedSize. (#1844)

This commit is contained in:
appleguy
2016-07-09 21:16:29 -07:00
committed by GitHub
parent 3b2af7eb6d
commit dc12042589

View File

@@ -695,6 +695,11 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
shouldMeasureAsync:(BOOL)shouldMeasureAsync
measurementCompletion:(void(^)())completion
{
if (_layout == nil) {
// constrainedSizeRange returns a struct and is invalid to call on nil.
// Defaulting to CGSizeZero can cause negative values in client layout code.
return;
}
[self invalidateCalculatedLayout];
[self transitionLayoutWithSizeRange:_layout.constrainedSizeRange
animated:animated