Uses the ivar getters for certain lazily created properties. This should fix retain cycle issues.

Author: Ignacio Romero Zurbuchen

Source/SLKTextViewController.m

@@ -357,17 +357,17 @@ - (BOOL)isPresentedInPopover
 
 - (SLKTextView *)textView
 {
-    return self.textInputbar.textView;
+    return _textInputbar.textView;
 }
 
 - (UIButton *)leftButton
 {
-    return self.textInputbar.leftButton;
+    return _textInputbar.leftButton;
 }
 
 - (UIButton *)rightButton
 {
-    return self.textInputbar.rightButton;
+    return _textInputbar.rightButton;
 }
 
 - (UIModalPresentationStyle)modalPresentationStyle
@@ -655,10 +655,10 @@ - (void)textDidUpdate:(BOOL)animated
         return;
     }
 
-    CGFloat inputbarHeight = self.textInputbar.appropriateHeight;
+    CGFloat inputbarHeight = _textInputbar.appropriateHeight;
 
-    self.textInputbar.rightButton.enabled = [self canPressRightButton];
-    self.textInputbar.editorRightButton.enabled = [self canPressRightButton];
+    _textInputbar.rightButton.enabled = [self canPressRightButton];
+    _textInputbar.editorRightButton.enabled = [self canPressRightButton];
 
     if (inputbarHeight != self.textInputbarHC.constant)
     {
@@ -669,11 +669,13 @@ - (void)textDidUpdate:(BOOL)animated
 
             BOOL bounces = self.bounces && [self.textView isFirstResponder];
 
+            __weak typeof(self) weakSelf = self;
+            
             [self.view slk_animateLayoutIfNeededWithBounce:bounces
                                                    options:UIViewAnimationOptionCurveEaseInOut|UIViewAnimationOptionLayoutSubviews|UIViewAnimationOptionBeginFromCurrentState
                                                 animations:^{
-                                                    if (self.textInputbar.isEditing) {
-                                                        [self.textView slk_scrollToCaretPositonAnimated:NO];
+                                                    if (weakSelf.textInputbar.isEditing) {
+                                                        [weakSelf.textView slk_scrollToCaretPositonAnimated:NO];
                                                     }
                                                 }];
         }
@@ -713,7 +715,7 @@ - (BOOL)canPressRightButton
 {
     NSString *text = [self.textView.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
 
-    if (text.length > 0 && ![self.textInputbar limitExceeded]) {
+    if (text.length > 0 && ![_textInputbar limitExceeded]) {
         return YES;
     }
 
@@ -738,14 +740,14 @@ - (void)didPressRightButton:(id)sender
 
 - (void)editText:(NSString *)text
 {
-    if (![self.textInputbar canEditText:text]) {
+    if (![_textInputbar canEditText:text]) {
         return;
     }
 
     // Caches the current text, in case the user cancels the edition
     [self slk_cacheTextToDisk:self.textView.text];
 
-    [self.textInputbar beginTextEditing];
+    [_textInputbar beginTextEditing];
 
     // Setting the text after calling -beginTextEditing is safer
     [self.textView setText:text];
@@ -758,23 +760,23 @@ - (void)editText:(NSString *)text
 
 - (void)didCommitTextEditing:(id)sender
 {
-    if (!self.textInputbar.isEditing) {
+    if (!_textInputbar.isEditing) {
         return;
     }
 
-    [self.textInputbar endTextEdition];
+    [_textInputbar endTextEdition];
 
     // Clears the text and but not the undo manager
     [self.textView slk_clearText:NO];
 }
 
 - (void)didCancelTextEditing:(id)sender
 {
-    if (!self.textInputbar.isEditing) {
+    if (!_textInputbar.isEditing) {
         return;
     }
 
-    [self.textInputbar endTextEdition];
+    [_textInputbar endTextEdition];
 
     // Clears the text and but not the undo manager
     [self.textView slk_clearText:NO];
@@ -786,7 +788,7 @@ - (void)didCancelTextEditing:(id)sender
 - (BOOL)canShowTypingIndicator
 {
     // Don't show if the text is being edited or auto-completed.
-    if (self.textInputbar.isEditing || self.isAutoCompleting) {
+    if (_textInputbar.isEditing || self.isAutoCompleting) {
         return NO;
     }
 
@@ -916,7 +918,7 @@ - (void)slk_handlePanGestureRecognizer:(UIPanGestureRecognizer *)gesture
     static BOOL dragging = NO;
     static BOOL presenting = NO;
 
-    __block UIView *keyboardView = [self.textInputbar.inputAccessoryView keyboardViewProxy];
+    __block UIView *keyboardView = [_textInputbar.inputAccessoryView keyboardViewProxy];
 
     // When no keyboard view has been detecting, let's skip any handling.
     if (!keyboardView) {
@@ -947,7 +949,7 @@ - (void)slk_handlePanGestureRecognizer:(UIPanGestureRecognizer *)gesture
 
         presenting = YES;
 #else
-        if ([gesture.view isEqual:self.textInputbar] && gestureVelocity.y < 0) {
+        if ([gesture.view isEqual:_textInputbar] && gestureVelocity.y < 0) {
             [self presentKeyboard:YES];
         }
         return;
@@ -965,7 +967,7 @@ - (void)slk_handlePanGestureRecognizer:(UIPanGestureRecognizer *)gesture
                 [self presentKeyboard:NO];
 
                 // So we can capture the keyboard's view
-                keyboardView = [self.textInputbar.inputAccessoryView keyboardViewProxy];
+                keyboardView = [_textInputbar.inputAccessoryView keyboardViewProxy];
 
                 originalFrame = keyboardView.frame;
                 originalFrame.origin.y = CGRectGetMaxY(self.view.frame);
@@ -979,7 +981,7 @@ - (void)slk_handlePanGestureRecognizer:(UIPanGestureRecognizer *)gesture
         }
         case UIGestureRecognizerStateChanged: {
 
-            if (CGRectContainsPoint(self.textInputbar.frame, gestureLocation) || dragging || presenting){
+            if (CGRectContainsPoint(_textInputbar.frame, gestureLocation) || dragging || presenting){
 
                 if (CGPointEqualToPoint(startPoint, CGPointZero)) {
                     startPoint = gestureLocation;
@@ -1271,7 +1273,7 @@ - (void)slk_prepareForInterfaceTransitionWithDuration:(NSTimeInterval)duration
 
 - (void)didPressReturnKey:(id)sender
 {
-    if (self.textInputbar.isEditing) {
+    if (_textInputbar.isEditing) {
         [self didCommitTextEditing:sender];
     }
     else {
@@ -1284,7 +1286,7 @@ - (void)didPressEscapeKey:(id)sender
     if (self.isAutoCompleting) {
         [self cancelAutoCompletion];
     }
-    else if (self.textInputbar.isEditing) {
+    else if (_textInputbar.isEditing) {
         [self didCancelTextEditing:sender];
     }
 
@@ -1611,7 +1613,7 @@ - (void)showAutoCompletionView:(BOOL)show
 {
     // Reloads the tableview before showing/hiding
     if (show) {
-        [self.autoCompletionView reloadData];
+        [_autoCompletionView reloadData];
     }
 
     self.autoCompleting = show;
@@ -1762,7 +1764,7 @@ - (void)slk_invalidateAutoCompletion
     _foundWord = nil;
     _foundPrefixRange = NSMakeRange(0, 0);
 
-    [self.autoCompletionView setContentOffset:CGPointZero];
+    [_autoCompletionView setContentOffset:CGPointZero];
 }
 
 - (void)slk_hideAutoCompletionViewIfNeeded
@@ -2102,7 +2104,7 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
-    if ([scrollView isEqual:self.autoCompletionView]) {
+    if ([scrollView isEqual:_autoCompletionView]) {
         CGRect frame = self.autoCompletionHairline.frame;
         frame.origin.y = scrollView.contentOffset.y;
         self.autoCompletionHairline.frame = frame;
@@ -2179,7 +2181,7 @@ - (void)slk_updateViewConstraints
     self.scrollViewHC.constant = [self slk_appropriateScrollViewHeight];
     self.keyboardHC.constant = [self slk_appropriateKeyboardHeightFromRect:CGRectNull];
 
-    if (self.textInputbar.isEditing) {
+    if (_textInputbar.isEditing) {
         self.textInputbarHC.constant += self.textInputbar.editorContentViewHeight;
     }
 
@@ -2208,8 +2210,8 @@ - (UIKeyCommand *)slk_returnKeyCommand
 #ifdef __IPHONE_9_0
     if ([UIKeyCommand respondsToSelector:@selector(keyCommandWithInput:modifierFlags:action:discoverabilityTitle:)] ) {
         // Only available since iOS 9
-        if (self.textInputbar.isEditing) {
-            command.discoverabilityTitle = [self.textInputbar.editorRightButton titleForState:UIControlStateNormal] ? : NSLocalizedString(@"Commit Editing", nil);
+        if (_textInputbar.isEditing) {
+            command.discoverabilityTitle = [_textInputbar.editorRightButton titleForState:UIControlStateNormal] ? : NSLocalizedString(@"Commit Editing", nil);
         }
         else if (self.textView.text.length > 0) {
             command.discoverabilityTitle = [self.rightButton titleForState:UIControlStateNormal] ? : NSLocalizedString(@"Send", nil);
@@ -2230,8 +2232,8 @@ - (UIKeyCommand *)slk_escKeyCommand
         if (self.isAutoCompleting) {
             command.discoverabilityTitle = NSLocalizedString(@"Exit Auto-Completion", nil);
         }
-        else if (self.textInputbar.isEditing) {
-            command.discoverabilityTitle = [self.textInputbar.editorRightButton titleForState:UIControlStateNormal] ? : NSLocalizedString(@"Exit Editing", nil);
+        else if (_textInputbar.isEditing) {
+            command.discoverabilityTitle = [_textInputbar.editorRightButton titleForState:UIControlStateNormal] ? : NSLocalizedString(@"Exit Editing", nil);
         }
         else if (!self.isExternalKeyboardDetected && self.keyboardHC.constant != 0) {
             command.discoverabilityTitle = NSLocalizedString(@"Hide Keyboard", nil);
@@ -2375,6 +2377,8 @@ - (void)didReceiveMemoryWarning
 
 - (void)dealloc
 {
+    [self slk_unregisterNotifications];
+
     _tableView.delegate = nil;
     _tableView.dataSource = nil;
     _tableView = nil;
@@ -2389,7 +2393,6 @@ - (void)dealloc
     _autoCompletionView.dataSource = nil;
     _autoCompletionView = nil;
 
-    _textInputbar.textView.delegate = nil;
     _textInputbar = nil;
     _textViewClass = nil;
 
@@ -2407,8 +2410,6 @@ - (void)dealloc
     _typingIndicatorViewHC = nil;
     _autoCompletionViewHC = nil;
     _keyboardHC = nil;
-    
-    [self slk_unregisterNotifications];
 }
 
 @end