Merge pull request facebook#311 from darknoon/fix-memoize-with-no-mem…

…oizer Fix layout bug where you didn't setup the memoizer
orlowang · Jul 20, 2015 · 951260d · 951260d
2 parents 246fe33 + 38227b9
commit 951260d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ComponentKit/Core/CKComponentMemoizer.mm b/ComponentKit/Core/CKComponentMemoizer.mm
@@ -167,9 +167,11 @@ id CKMemoize(CKMemoizationKey memoizationKey, id (^block)(void))
 CKComponentLayout CKMemoizeOrComputeLayout(CKComponent *component, CKSizeRange constrainedSize, const CKComponentSize& size, CGSize parentSize)
 {
   if (component && [component shouldMemoizeLayout]) {
-    return [[_CKComponentMemoizerImpl currentMemoizer] cachedLayout:component thatFits:constrainedSize restrictedToSize:size parentSize:parentSize];
-  } else {
-    return [component computeLayoutThatFits:constrainedSize restrictedToSize:size relativeToParentSize:parentSize];
+    _CKComponentMemoizerImpl *impl = [_CKComponentMemoizerImpl currentMemoizer];
+    if (impl) { // If component wants layout memoization but there isn't a current memoizer, fall down to compute case
+      return [impl cachedLayout:component thatFits:constrainedSize restrictedToSize:size parentSize:parentSize];
+    }
   }
+  return [component computeLayoutThatFits:constrainedSize restrictedToSize:size relativeToParentSize:parentSize];
 }