Tweaked "next input view" search

Author: michaeltyson

TPKeyboardAvoiding/UIScrollView+TPKeyboardAvoidingAdditions.m

@@ -199,16 +199,16 @@ - (void)TPKeyboardAvoiding_findNextInputViewAfterView:(UIView*)priorView beneath
     // Search recursively for input view below/to right of priorTextField
     CGRect priorFrame = [self convertRect:priorView.frame fromView:priorView.superview];
     CGRect candidateFrame = *bestCandidate ? [self convertRect:(*bestCandidate).frame fromView:(*bestCandidate).superview] : CGRectZero;
-    CGFloat bestCandidateHeuristic = -sqrt(candidateFrame.origin.x*candidateFrame.origin.x + candidateFrame.origin.y*candidateFrame.origin.y)
-                                        + (fabs(CGRectGetMinY(candidateFrame) - CGRectGetMinY(priorFrame)) < FLT_EPSILON ? 1e6 : 0);
+    CGFloat bestCandidateHeuristic = [self TPKeyboardAvoiding_nextInputViewHeuristicForViewFrame:candidateFrame];
 
     for ( UIView *childView in view.subviews ) {
         if ( [self TPKeyboardAvoiding_viewIsValidKeyViewCandidate:childView] ) {
             CGRect frame = [self convertRect:childView.frame fromView:view];
 
-            // Use a heuristic to evaluate candidates: prefer elements closest to the top left, and on the same line
-            CGFloat heuristic = -sqrt(frame.origin.x*frame.origin.x + frame.origin.y*frame.origin.y)
-                                    + (fabs(CGRectGetMinY(frame) - CGRectGetMinY(priorFrame)) < FLT_EPSILON ? 1e6 : 0);
+            // Use a heuristic to evaluate candidates
+            CGFloat heuristic = [self TPKeyboardAvoiding_nextInputViewHeuristicForViewFrame:frame];
+            
+            NSLog(@"%@: (%lfx%lf, %lf)", ((UITextField*)childView).placeholder, frame.origin.x, frame.origin.y, heuristic);
 
             // Find views beneath, or to the right. For those views that match, choose the view closest to the top left
             if ( childView != priorView
@@ -225,6 +225,11 @@ - (void)TPKeyboardAvoiding_findNextInputViewAfterView:(UIView*)priorView beneath
     }
 }
 
+- (CGFloat)TPKeyboardAvoiding_nextInputViewHeuristicForViewFrame:(CGRect)frame {
+    return  (-frame.origin.y * 1000.0) // Prefer elements closest to top (most important)
+          + (-frame.origin.x);         // Prefer elements closest to left
+}
+
 - (BOOL)TPKeyboardAvoiding_viewIsValidKeyViewCandidate:(UIView *)view {
     if ( view.hidden || !view.userInteractionEnabled ) return NO;