Merge pull request #169 from AnthonyMDev/AnthonyMDev-Master

Skip disabled text fields when using 'focusNextTextField'
michaeltyson · Jun 17, 2015 · b154752 · b154752
2 parents 87eaf03 + da34bb3
commit b154752
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/TPKeyboardAvoiding/UIScrollView+TPKeyboardAvoidingAdditions.m b/TPKeyboardAvoiding/UIScrollView+TPKeyboardAvoidingAdditions.m
@@ -198,8 +198,7 @@ - (void)TPKeyboardAvoiding_findTextFieldAfterTextField:(UIView*)priorTextField b
     // Search recursively for text field or text view below priorTextField
     CGFloat priorFieldOffset = CGRectGetMinY([self convertRect:priorTextField.frame fromView:priorTextField.superview]);
     for ( UIView *childView in view.subviews ) {
-        if ( childView.hidden ) continue;
-        if ( ([childView isKindOfClass:[UITextField class]] || [childView isKindOfClass:[UITextView class]]) && childView.isUserInteractionEnabled) {
+        if ([self TPKeyboardAvoiding_viewIsNextTextField:childView]) {
             CGRect frame = [self convertRect:childView.frame fromView:view];
             if ( childView != priorTextField
                     && CGRectGetMinY(frame) >= priorFieldOffset
@@ -215,6 +214,24 @@ - (void)TPKeyboardAvoiding_findTextFieldAfterTextField:(UIView*)priorTextField b
     }
 }
 
+- (BOOL)TPKeyboardAvoiding_viewIsNextTextField:(UIView *)view {
+    if (view.hidden) return NO;
+
+    if ([view isKindOfClass:[UITextField class]]) {
+        UITextField *textField = (UITextField *)view;
+        if (!textField.enabled) return NO;
+
+    }
+
+    if ( ([view isKindOfClass:[UITextField class]] ||
+          [view isKindOfClass:[UITextView class]])
+        && view.isUserInteractionEnabled) {
+        return YES;
+    }
+
+    return NO;
+}
+
 - (void)TPKeyboardAvoiding_assignTextDelegateForViewsBeneathView:(UIView*)view {
     for ( UIView *childView in view.subviews ) {
         if ( ([childView isKindOfClass:[UITextField class]] || [childView isKindOfClass:[UITextView class]]) ) {