Move clearing out of ASTextKitComponents property delegates into ASTe…

…xtKitComponents dealloc (TextureGroup#591)
AtomTickets · Apr 25, 2018 · f1ccff1 · f1ccff1
1 parent 408a46e
commit f1ccff1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/Source/ASEditableTextNode.mm b/Source/ASEditableTextNode.mm
@@ -177,13 +177,6 @@ - (instancetype)initWithTextKitComponents:(ASTextKitComponents *)textKitComponen
   return self;
 }
 
-- (void)dealloc
-{
-  _textKitComponents.textView.delegate = nil;
-  _textKitComponents.layoutManager.delegate = nil;
-  _placeholderTextKitComponents.layoutManager.delegate = nil;
-}
-
 #pragma mark - ASDisplayNode Overrides
 - (void)didLoad
 {

diff --git a/Source/TextKit/ASTextKitComponents.mm b/Source/TextKit/ASTextKitComponents.mm
@@ -1,5 +1,5 @@
 //
-//  ASTextKitComponents.m
+//  ASTextKitComponents.mm
 //  Texture
 //
 //  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
@@ -30,6 +30,8 @@ @interface ASTextKitComponents ()
 
 @implementation ASTextKitComponents
 
+#pragma mark - Class
+
 + (instancetype)componentsWithAttributedSeedString:(NSAttributedString *)attributedSeedString
                                  textContainerSize:(CGSize)textContainerSize
 {
@@ -58,6 +60,17 @@ + (instancetype)componentsWithTextStorage:(NSTextStorage *)textStorage
   return components;
 }
 
+#pragma mark - Lifecycle
+
+- (void)dealloc
+{
+  // Nil out all delegate to prevent crash
+  _textView.delegate = nil;
+  _layoutManager.delegate = nil;
+}
+
+#pragma mark - Sizing
+
 - (CGSize)sizeForConstrainedWidth:(CGFloat)constrainedWidth
 {
   ASTextKitComponents *components = self;