[TextControls] consider floating label min Y in - accessibilityPath

PiperOrigin-RevId: 337120665
material-components · Oct 14, 2020 · b8d8690 · b8d8690
1 parent 364b062
commit b8d8690
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextAreaConfiguratorExample.m b/components/TextControls/examples/supplemental/MDCTextControlTextAreaConfiguratorExample.m
@@ -45,6 +45,7 @@ @implementation MDCTextControlTextAreaConfiguratorExample (CatalogByConvention)
 + (NSDictionary *)catalogMetadata {
   return @{
     @"breadcrumbs" : @[ @"Text Controls", kExampleTitle ],
+    @"description" : @"Text areas let users enter and edit text.",
     @"primaryDemo" : @NO,
     @"presentable" : @YES,
   };

diff --git a/components/TextControls/examples/supplemental/MDCTextControlTextFieldConfiguratorExample.m b/components/TextControls/examples/supplemental/MDCTextControlTextFieldConfiguratorExample.m
@@ -45,6 +45,7 @@ @implementation MDCTextControlTextFieldConfiguratorExample (CatalogByConvention)
 + (NSDictionary *)catalogMetadata {
   return @{
     @"breadcrumbs" : @[ @"Text Controls", kExampleTitle ],
+    @"description" : @"Text fields let users enter and edit text.",
     @"primaryDemo" : @YES,
     @"presentable" : @YES,
   };

diff --git a/components/TextControls/src/BaseTextFields/MDCBaseTextField.m b/components/TextControls/src/BaseTextFields/MDCBaseTextField.m
@@ -692,12 +692,22 @@ - (NSString *)accessibilityLabel {
 }
 
 - (UIBezierPath *)accessibilityPath {
+  return [UIBezierPath bezierPathWithRect:self.accessibilityFrame];
+}
+
+- (CGRect)accessibilityFrame {
   if (self.window) {
-    CGRect frameInScreenCoordinates = [self convertRect:self.bounds
-                                      toCoordinateSpace:self.window.screen.coordinateSpace];
-    return [UIBezierPath bezierPathWithRect:frameInScreenCoordinates];
+    CGRect bounds = self.bounds;
+    CGFloat boundsMinY = CGRectGetMinY(bounds);
+    CGFloat floatingLabelMinY = CGRectGetMinY(self.layout.labelFrameFloating);
+    if (floatingLabelMinY < boundsMinY) {
+      CGFloat difference = boundsMinY - floatingLabelMinY;
+      bounds.origin.y = boundsMinY - difference;
+      bounds.size.height = bounds.size.height + difference;
+    }
+    return [self convertRect:bounds toCoordinateSpace:self.window.screen.coordinateSpace];
   } else {
-    return [super accessibilityPath];
+    return [super accessibilityFrame];
   }
 }