From e4da4131cf380c9dd78dc0e1ec9564a4fbe8cdd7 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Sat, 5 Nov 2016 18:45:18 -0700 Subject: [PATCH] Improve layout spec block documentation (#2547) --- AsyncDisplayKit/ASDisplayNode+Subclasses.h | 2 +- AsyncDisplayKit/ASDisplayNode.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h index d82353e69c..f6ed7b6f47 100644 --- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h +++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h @@ -160,7 +160,7 @@ NS_ASSUME_NONNULL_BEGIN * be done before display can be performed here, and using ivars to cache any valuable intermediate results is * encouraged. * - * @note This method should not be called directly outside of ASDisplayNode; use -measure: or -calculatedLayout instead. + * @note This method should not be called directly outside of ASDisplayNode; use -layoutThatFits: instead. * * @warning Subclasses that implement -layoutSpecThatFits: must not use .layoutSpecBlock. Doing so will trigger an * exception. A future version of the framework may support using both, calling them serially, with the .layoutSpecBlock diff --git a/AsyncDisplayKit/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h index abfce19847..2b47c84d3f 100644 --- a/AsyncDisplayKit/ASDisplayNode.h +++ b/AsyncDisplayKit/ASDisplayNode.h @@ -280,6 +280,8 @@ extern NSInteger const ASDefaultDrawingPriority; * @warning Subclasses that implement -layoutSpecThatFits: must not also use .layoutSpecBlock. Doing so will trigger * an exception. A future version of the framework may support using both, calling them serially, with the * .layoutSpecBlock superseding any values set by the method override. + * + * @code ^ASLayoutSpec *(__kindof ASDisplayNode * _Nonnull node, ASSizeRange constrainedSize) {}; */ @property (nonatomic, readwrite, copy, nullable) ASLayoutSpecBlock layoutSpecBlock;