Convert ASTextKitComponents to an object.

ARC doesn't play nicely with structs that contain references to
Objective-C objects, which causes breakage when using AsyncDisplayKit as
a dynamic framework (e.g., with CocoaPods 0.36+).  Fixes #198.
This commit is contained in:
Nadine Salter
2015-01-25 15:18:21 -08:00
parent 9cf71828ad
commit 35d7f43fb6
5 changed files with 22 additions and 16 deletions

View File

@@ -11,12 +11,14 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
typedef struct {
NSTextStorage *textStorage;
NSTextContainer *textContainer;
NSLayoutManager *layoutManager;
UITextView *textView;
} ASTextKitComponents;
@interface ASTextKitComponents : NSObject
@property (nonatomic, strong) NSTextStorage *textStorage;
@property (nonatomic, strong) NSTextContainer *textContainer;
@property (nonatomic, strong) NSLayoutManager *layoutManager;
@property (nonatomic, strong) UITextView *textView;
@end
// Convenience.
/**
@@ -26,11 +28,11 @@ typedef struct {
@return A `ASTextKitComponents` containing the created components. The text view component will be nil.
@discussion The returned components will be hooked up together, so they are ready for use as a system upon return.
*/
extern ASTextKitComponents ASTextKitComponentsCreate(NSAttributedString *attributedSeedString, CGSize textContainerSize);
extern ASTextKitComponents *ASTextKitComponentsCreate(NSAttributedString *attributedSeedString, CGSize textContainerSize);
/**
@abstract Returns the bounding size for the text view's text.
@param components The TextKit components to calculate the constrained size of the text for.
@param constrainedWidth The constraining width to be used during text-sizing. Usually, this value should be the receiver's calculated size.
@result A CGSize representing the bounding size for the receiver's text.
*/
extern CGSize ASTextKitComponentsSizeForConstrainedWidth(ASTextKitComponents components, CGFloat constrainedWidth);
extern CGSize ASTextKitComponentsSizeForConstrainedWidth(ASTextKitComponents *components, CGFloat constrainedWidth);