Add way to compile out ASTextNode + TextKit dependencies

TextureGroup · Nov 18, 2018 · 7863840 · 7863840
1 parent 8029632
commit 7863840
Show file tree

Hide file tree

Showing 30 changed files with 158 additions and 6 deletions.
diff --git a/Source/ASTextNode.h b/Source/ASTextNode.h
@@ -8,9 +8,17 @@
 //
 
 #import <AsyncDisplayKit/ASAvailability.h>
+
 #import <AsyncDisplayKit/ASControlNode.h>
 #import <AsyncDisplayKit/ASTextNodeCommon.h>
 
+#if (!AS_ENABLE_TEXTNODE)
+
+// Pull in ASTextNode2 to replace ASTextNode with ASTextNode2
+#import <AsyncDisplayKit/ASTextNode2.h>
+
+#else
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -251,3 +259,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/Source/ASTextNode.mm b/Source/ASTextNode.mm
@@ -8,6 +8,9 @@
 //
 
 #import <AsyncDisplayKit/ASTextNode.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASTextNode2.h>
 
 #import <AsyncDisplayKit/ASTextNode+Beta.h>
@@ -1427,3 +1430,5 @@ - (NSAttributedString *)truncationAttributedString
 }
 
 @end
+
+#endif
diff --git a/Source/ASTextNode2.h b/Source/ASTextNode2.h
@@ -17,7 +17,11 @@ NS_ASSUME_NONNULL_BEGIN
  @abstract Draws interactive rich text.
  @discussion Backed by the code in TextExperiment folder, on top of CoreText.
  */
+#if AS_ENABLE_TEXTNODE
 @interface ASTextNode2 : ASControlNode
+#else
+@interface ASTextNode : ASControlNode
+#endif
 
 /**
  @abstract The styled text displayed by the node.
@@ -215,7 +219,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#if AS_ENABLE_TEXTNODE
 @interface ASTextNode2 (Unavailable)
+#else
+@interface ASTextNode (Unavailable)
+#endif
 
 - (instancetype)initWithLayerBlock:(ASDisplayNodeLayerBlock)viewBlock didLoadBlock:(nullable ASDisplayNodeDidLoadBlock)didLoadBlock NS_UNAVAILABLE;
 

diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
@@ -141,11 +141,19 @@ @implementation ASTextCacheValue
 static const CGFloat ASTextNodeHighlightDarkOpacity = 0.22;
 static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncationAttribute";
 
+#if AS_ENABLE_TEXTNODE
 @interface ASTextNode2 () <UIGestureRecognizerDelegate>
+#else
+@interface ASTextNode () <UIGestureRecognizerDelegate>
+#endif
 
 @end
 
+#if AS_ENABLE_TEXTNODE
 @implementation ASTextNode2 {
+#else
+@implementation ASTextNode {
+#endif
   ASTextContainer *_textContainer;
 
   CGSize _shadowOffset;

diff --git a/Source/ASTextNodeCommon.h b/Source/ASTextNodeCommon.h
@@ -8,6 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import <AsyncDisplayKit/ASAvailability.h>
+
 @class ASTextNode;
 
 #define AS_TEXT_ALERT_UNIMPLEMENTED_FEATURE() { \

diff --git a/Source/Base/ASAvailability.h b/Source/Base/ASAvailability.h
@@ -17,6 +17,10 @@
   #define AS_TLS_AVAILABLE 1
 #endif
 
+#ifndef AS_ENABLE_TEXTNODE
+  #define AS_ENABLE_TEXTNODE 1 // Enable old TextNode by default
+#endif
+
 #ifndef AS_USE_PHOTOS
   #define AS_USE_PHOTOS 0
 #endif

diff --git a/Source/TextKit/ASTextKitAttributes.h b/Source/TextKit/ASTextKitAttributes.h
@@ -10,6 +10,11 @@
 #pragma once
 
 #import <UIKit/UIKit.h>
+
+#import <AsyncDisplayKit/ASAvailability.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 
 AS_EXTERN NSString *const ASTextKitTruncationAttributeName;
@@ -119,3 +124,5 @@ struct ASTextKitAttributes {
 
   size_t hash() const;
 };
+
+#endif
diff --git a/Source/TextKit/ASTextKitAttributes.mm b/Source/TextKit/ASTextKitAttributes.mm
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitAttributes.h>
 
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASHashing.h>
 
 NSString *const ASTextKitTruncationAttributeName = @"ck_truncation";
@@ -44,3 +46,5 @@
   };
   return ASHashBytes(&data, sizeof(data));
 }
+
+#endif
diff --git a/Source/TextKit/ASTextKitComponents.h b/Source/TextKit/ASTextKitComponents.h
@@ -8,6 +8,7 @@
 //
 
 #import <UIKit/UIKit.h>
+
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/Source/TextKit/ASTextKitContext.h b/Source/TextKit/ASTextKitContext.h
@@ -8,6 +8,11 @@
 //
 
 #import <UIKit/UIKit.h>
+
+#import <AsyncDisplayKit/ASAvailability.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 /**
@@ -44,3 +49,5 @@ AS_SUBCLASSING_RESTRICTED
                                                           NSTextContainer *textContainer))block;
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitContext.mm b/Source/TextKit/ASTextKitContext.mm
@@ -8,6 +8,9 @@
 //
 
 #import <AsyncDisplayKit/ASTextKitContext.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASLayoutManager.h>
 #import <AsyncDisplayKit/ASThread.h>
 
@@ -73,3 +76,5 @@ - (void)performBlockWithLockedTextKitComponents:(NS_NOESCAPE void (^)(NSLayoutMa
 }
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitCoreTextAdditions.h b/Source/TextKit/ASTextKitCoreTextAdditions.h
@@ -7,9 +7,12 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+#import <AsyncDisplayKit/ASAvailability.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -82,3 +85,5 @@ AS_EXTERN NSAttributedString *ASCleanseAttributedStringOfCoreTextAttributes(NSAt
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/Source/TextKit/ASTextKitCoreTextAdditions.mm b/Source/TextKit/ASTextKitCoreTextAdditions.mm
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitCoreTextAdditions.h>
 
+#if AS_ENABLE_TEXTNODE
+
 #import <CoreText/CTFont.h>
 #import <CoreText/CTStringAttributes.h>
 
@@ -333,3 +335,5 @@ + (NSParagraphStyle *)paragraphStyleWithCTParagraphStyle:(CTParagraphStyleRef)co
 }
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitEntityAttribute.h b/Source/TextKit/ASTextKitEntityAttribute.h
@@ -8,6 +8,11 @@
 //
 
 #import <Foundation/Foundation.h>
+
+#import <AsyncDisplayKit/ASAvailability.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 /**
@@ -27,3 +32,5 @@ AS_SUBCLASSING_RESTRICTED
 - (instancetype)initWithEntity:(id<NSObject>)entity;
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitEntityAttribute.mm b/Source/TextKit/ASTextKitEntityAttribute.mm
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitEntityAttribute.h>
 
+#if AS_ENABLE_TEXTNODE
+
 @implementation ASTextKitEntityAttribute
 
 - (instancetype)initWithEntity:(id<NSObject>)entity
@@ -37,3 +39,5 @@ - (BOOL)isEqual:(id)object
 }
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitFontSizeAdjuster.h b/Source/TextKit/ASTextKitFontSizeAdjuster.h
@@ -8,8 +8,12 @@
 //
 
 #import <UIKit/UIKit.h>
+
+#import <AsyncDisplayKit/ASAvailability.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASTextKitAttributes.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -50,3 +54,5 @@ AS_SUBCLASSING_RESTRICTED
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/Source/TextKit/ASTextKitFontSizeAdjuster.mm b/Source/TextKit/ASTextKitFontSizeAdjuster.mm
@@ -10,6 +10,8 @@
 
 #import <AsyncDisplayKit/ASTextKitFontSizeAdjuster.h>
 
+#if AS_ENABLE_TEXTNODE
+
 #import <tgmath.h>
 #import <mutex>
 
@@ -235,3 +237,5 @@ - (CGFloat)scaleFactor
 }
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitRenderer+Positioning.h b/Source/TextKit/ASTextKitRenderer+Positioning.h
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitRenderer.h>
 
+#if AS_ENABLE_TEXTNODE
+
 typedef void (^as_text_component_index_block_t)(NSUInteger characterIndex,
                                                 CGRect glyphBoundingRect,
                                                 BOOL *stop);
@@ -100,3 +102,5 @@ typedef NS_ENUM(NSUInteger, ASTextKitRendererMeasureOption) {
 - (CGRect)trailingRect;
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitRenderer+Positioning.mm b/Source/TextKit/ASTextKitRenderer+Positioning.mm
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
 
+#if AS_ENABLE_TEXTNODE
+
 #import <CoreText/CoreText.h>
 #import <tgmath.h>
 
@@ -380,3 +382,5 @@ - (CGRect)frameForTextRange:(NSRange)textRange
 }
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitRenderer+TextChecking.h b/Source/TextKit/ASTextKitRenderer+TextChecking.h
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitRenderer.h>
 
+#if AS_ENABLE_TEXTNODE
+
 /**
  Application extensions to NSTextCheckingType. We're allowed to do this (see NSTextCheckingAllCustomTypes).
  */
@@ -26,3 +28,5 @@ static uint64_t const ASTextKitTextCheckingTypeTruncation =           1ULL << 34
 - (NSTextCheckingResult *)textCheckingResultAtPoint:(CGPoint)point;
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitRenderer+TextChecking.mm b/Source/TextKit/ASTextKitRenderer+TextChecking.mm
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitRenderer+TextChecking.h>
 
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASTextKitEntityAttribute.h>
 #import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
 #import <AsyncDisplayKit/ASTextKitTailTruncater.h>
@@ -98,3 +100,5 @@ - (NSTextCheckingResult *)textCheckingResultAtPoint:(CGPoint)point
 }
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitRenderer.h b/Source/TextKit/ASTextKitRenderer.h
@@ -7,12 +7,16 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <vector>
-
 #import <UIKit/UIKit.h>
 
+#import <AsyncDisplayKit/ASAvailability.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASTextKitAttributes.h>
 
+#import <vector>
+
 @class ASTextKitContext;
 @class ASTextKitShadower;
 @class ASTextKitFontSizeAdjuster;
@@ -100,3 +104,5 @@
 @property (nonatomic, readonly) NSRange firstVisibleRange;
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitRenderer.mm b/Source/TextKit/ASTextKitRenderer.mm
@@ -9,6 +9,8 @@
 
 #import <AsyncDisplayKit/ASTextKitRenderer.h>
 
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASAssert.h>
 
 #import <AsyncDisplayKit/ASTextKitContext.h>
@@ -289,3 +291,5 @@ - (NSRange)firstVisibleRange
 }
 
 @end
+
+#endif
diff --git a/Source/TextKit/ASTextKitShadower.h b/Source/TextKit/ASTextKitShadower.h
@@ -8,6 +8,11 @@
 //
 
 #import <UIKit/UIKit.h>
+
+#import <AsyncDisplayKit/ASAvailability.h>
+
+#if AS_ENABLE_TEXTNODE
+
 #import <AsyncDisplayKit/ASBaseDefines.h>
 
 /**
@@ -69,3 +74,5 @@ AS_SUBCLASSING_RESTRICTED
 - (void)setShadowInContext:(CGContextRef)context;
 
 @end
+
+#endif