Revert changes to visibility.

Summary: These changes to WDA broke visibility when keyboard is visible. Stuff which is visible is shown as not visible, and vice versa as well.

Reviewed By: marekcirkos

Differential Revision: D6484423

fbshipit-source-id: 3998e0bdee52fbfe7b302e0da53d822d18406bf0

Author: Archit Pal Singh Sachdeva

WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m

@@ -9,12 +9,15 @@
 
 #import "XCUIElement+FBIsVisible.h"
 
+#import "FBApplication.h"
 #import "FBConfiguration.h"
+#import "FBMathUtils.h"
 #import "FBXCodeCompatibility.h"
 #import "XCElementSnapshot+FBHelpers.h"
-#import "XCElementSnapshot+FBHitPoint.h"
-#import "XCTestPrivateSymbols.h"
 #import "XCUIElement+FBUtilities.h"
+#import "XCTestPrivateSymbols.h"
+#import <XCTest/XCUIDevice.h>
+#import "XCElementSnapshot+FBHitPoint.h"
 
 @implementation XCUIElement (FBIsVisible)
 
@@ -27,35 +30,35 @@ - (BOOL)fb_isVisible
 
 @implementation XCElementSnapshot (FBIsVisible)
 
-- (BOOL)fb_isVisibleInContainerWindow:(XCElementSnapshot *)window hierarchyIntersection:(nullable NSValue *)intersectionRectange appFrame:(CGRect)appFrame
-{
-  CGRect currentRectangle = nil == intersectionRectange ? self.frame : [intersectionRectange CGRectValue];
-  XCElementSnapshot *parent = self.parent;
-  CGRect intersectionWithParent = CGRectIntersection(currentRectangle, parent.frame);
-  if (CGRectIsEmpty(intersectionWithParent)) {
-    return NO;
-  }
-  if (parent == window) {
-    // Assume the element is visible if its root container is hittable and the frame is onscreen
-    return CGRectContainsPoint(appFrame, self.fb_hitPoint);
-  }
-  return [parent fb_isVisibleInContainerWindow:window hierarchyIntersection:[NSValue valueWithCGRect:intersectionWithParent] appFrame:appFrame];
-}
-
 - (BOOL)fb_isVisible
 {
-  if (CGRectIsEmpty(self.frame)) {
+  CGRect frame = self.frame;
+  if (CGRectIsEmpty(frame)) {
     return NO;
   }
   if ([FBConfiguration shouldUseTestManagerForVisibilityDetection]) {
     return [(NSNumber *)[self fb_attributeValue:FB_XCAXAIsVisibleAttribute] boolValue];
   }
   CGRect appFrame = [self fb_rootElement].frame;
-  XCElementSnapshot *containerWindow = [self fb_parentMatchingType:XCUIElementTypeWindow];
-  if (nil != containerWindow) {
-    return [self fb_isVisibleInContainerWindow:containerWindow hierarchyIntersection:nil appFrame:appFrame];
+  CGSize screenSize = FBAdjustDimensionsForApplication(appFrame.size, (UIInterfaceOrientation)[XCUIDevice sharedDevice].orientation);
+  CGRect screenFrame = CGRectMake(0, 0, screenSize.width, screenSize.height);
+  if (!CGRectIntersectsRect(frame, screenFrame)) {
+    return NO;
+  }
+  CGPoint midPoint = [self.suggestedHitpoints.lastObject CGPointValue];
+  XCElementSnapshot *hitElement = [self hitTest:midPoint];
+  if (self == hitElement || [self._allDescendants.copy containsObject:hitElement]) {
+    return YES;
+  }
+  if (CGRectContainsPoint(appFrame, self.fb_hitPoint)) {
+    return YES;
+  }
+  for (XCElementSnapshot *elementSnapshot in self.children.copy) {
+    if (elementSnapshot.fb_isVisible) {
+      return YES;
+    }
   }
-  return CGRectContainsPoint(appFrame, self.fb_hitPoint);
+  return NO;
 }
 
 @end

WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m

@@ -54,7 +54,7 @@ - (void)testExtrasIconContent
   FBAssertWaitTillBecomesTrue(self.springboard.icons[@"Contacts"].fb_isVisible);
   NSArray *elements = self.springboard.pageIndicators.allElementsBoundByIndex;
   for (XCUIElement *element in elements) {
-    XCTAssertTrue(element.fb_isVisible);
+    XCTAssertFalse(element.fb_isVisible);
   }
 }
 

WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m

@@ -321,9 +321,9 @@ - (void)setUp
 
 - (void)testInvisibleDescendantWithXPathQuery
 {
-  NSArray<XCUIElement *> *matchingSnapshots = [self.testedApplication fb_descendantsMatchingXPathQuery:@"//XCUIElementTypeWindow[@visible='false']" shouldReturnAfterFirstMatch:NO];
+  NSArray<XCUIElement *> *matchingSnapshots = [self.testedApplication fb_descendantsMatchingXPathQuery:@"//XCUIElementTypePageIndicator[@visible='false']" shouldReturnAfterFirstMatch:NO];
   XCTAssertEqual(matchingSnapshots.count, 1);
-  XCTAssertEqual(matchingSnapshots.lastObject.elementType, XCUIElementTypeWindow);
+  XCTAssertEqual(matchingSnapshots.lastObject.elementType, XCUIElementTypePageIndicator);
   XCTAssertFalse(matchingSnapshots.lastObject.fb_isVisible);
 }