Merge pull request slackhq#268 from slackhq/ios-9-fixes

Ignacio Romero Zurbuchen · Ignacio Romero Zurbuchen · commit 9078166ee945 · 2015-09-17T03:22:02.000-03:00
More iOS 9 fixes
diff --git a/Source/Classes/SLKTextView.h b/Source/Classes/SLKTextView.h
@@ -67,6 +67,9 @@ typedef NS_OPTIONS(NSUInteger, SLKPastableMediaType) {
 /** YES if the magnifying glass is visible. */
 @property (nonatomic, getter=isLoupeVisible) BOOL loupeVisible;
 
+/** YES if the keyboard track pad has been recognized. iOS 9 only. */
+@property (nonatomic, readonly, getter=isTrackpadEnabled) BOOL trackpadEnabled;
+
 /** YES if autocorrection and spell checking are enabled. On iOS8, this property also controls the predictive QuickType bar from being visible. Default is YES. */
 @property (nonatomic, getter=isTypingSuggestionEnabled) BOOL typingSuggestionEnabled;
 
diff --git a/Source/Classes/SLKTextView.m b/Source/Classes/SLKTextView.m
@@ -119,6 +119,15 @@ - (void)layoutSubviews
     }
 }
 
+- (void)addGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+{
+    if ([gestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]]) {
+        [gestureRecognizer addTarget:self action:@selector(slk_gestureRecognized:)];
+    }
+    
+    [super addGestureRecognizer:gestureRecognizer];
+}
+
 
 #pragma mark - Getters
 
@@ -405,24 +414,6 @@ - (void)layoutIfNeeded
     [super layoutIfNeeded];
 }
 
-- (NSArray *)gestureRecognizers
-{
-    NSArray *gestureRecognizers = [super gestureRecognizers];
-    
-    // Adds an aditional action to a private gesture to detect when the magnifying glass becomes visible
-    for (UIGestureRecognizer *gesture in gestureRecognizers) {
-        if ([gesture isMemberOfClass:NSClassFromString(@"UIVariableDelayLoupeGesture")]) {
-            
-            NSArray *targets = [gesture valueForKeyPath:@"_targets"];
-            if (targets.count > 0) {
-                [gesture addTarget:self action:@selector(slk_willShowLoupe:)];
-            }
-        }
-    }
-    
-    return gestureRecognizers;
-}
-
 - (void)setSelectedRange:(NSRange)selectedRange
 {
     [super setSelectedRange:selectedRange];
@@ -500,6 +491,31 @@ - (void)setTextAlignment:(NSTextAlignment)textAlignment
 }
 
 
+#pragma mark - UITextInput Overrides
+
+- (void)beginFloatingCursorAtPoint:(CGPoint)point
+{
+    _trackpadEnabled = YES;
+}
+
+- (void)updateFloatingCursorAtPoint:(CGPoint)point
+{
+    // Do something
+}
+
+- (void)endFloatingCursor
+{
+    _trackpadEnabled = NO;
+    
+    // We still need to notify a selection change in the textview after the trackpad is disabled
+    if (self.delegate && [self.delegate respondsToSelector:@selector(textViewDidChangeSelection:)]) {
+        [self.delegate textViewDidChangeSelection:self];
+    }
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:SLKTextViewSelectedRangeDidChangeNotification object:self userInfo:nil];
+}
+
+
 #pragma mark - UIResponder Overrides
 
 - (BOOL)canBecomeFirstResponder
@@ -592,13 +608,23 @@ - (void)paste:(id)sender
 
 #pragma mark - Custom Actions
 
+- (void)slk_gestureRecognized:(UIGestureRecognizer *)gesture
+{
+    // In iOS 8 and earlier, the gesture recognizer responsible for the magnifying glass movement was 'UIVariableDelayLoupeGesture'
+    // Since iOS 9, that gesture is now called '_UITextSelectionForceGesture'
+    if ([gesture isMemberOfClass:NSClassFromString(@"UIVariableDelayLoupeGesture")] ||
+        [gesture isMemberOfClass:NSClassFromString(@"_UITextSelectionForceGesture")]) {
+        [self slk_willShowLoupe:gesture];
+    }
+}
+
 - (void)slk_willShowLoupe:(UIGestureRecognizer *)gesture
 {
-    if (gesture.state == UIGestureRecognizerStateChanged) {
-        self.loupeVisible = YES;
+    if (gesture.state == UIGestureRecognizerStateBegan || gesture.state == UIGestureRecognizerStateChanged) {
+        _loupeVisible = YES;
     }
     else {
-        self.loupeVisible = NO;
+        _loupeVisible = NO;
     }
     
     // We still need to notify a selection change in the textview after the magnifying class is dismissed
diff --git a/Source/Classes/SLKTextViewController.m b/Source/Classes/SLKTextViewController.m
@@ -656,7 +656,14 @@ - (void)textSelectionDidChange
     }
     
     // Skips if the loupe is visible or if there is a real text selection
-    if (self.textView.isLoupeVisible || self.textView.selectedRange.length > 0) {
+    if (self.textView.isLoupeVisible || self.textView.isTrackpadEnabled) {
+        return;
+    }
+    
+    if (self.textView.selectedRange.length > 0) {
+        if (self.isAutoCompleting) {
+            [self cancelAutoCompletion];
+        }
         return;
     }
     

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,14 @@ - (void)textSelectionDidChange`
`656`	`656`	`}`
`657`	`657`
`658`	`658`	`// Skips if the loupe is visible or if there is a real text selection`
`659`		`- if (self.textView.isLoupeVisible \|\| self.textView.selectedRange.length > 0) {`
	`659`	`+ if (self.textView.isLoupeVisible \|\| self.textView.isTrackpadEnabled) {`
	`660`	`+ return;`
	`661`	`+ }`
	`662`	`+`
	`663`	`+ if (self.textView.selectedRange.length > 0) {`
	`664`	`+ if (self.isAutoCompleting) {`
	`665`	`+ [self cancelAutoCompletion];`
	`666`	`+ }`
`660`	`667`	`return;`
`661`	`668`	`}`
`662`	`669`