[ButtonBar] Fall back to accessibilityLabel for UILargeContentView wh…

…en there is an image and no title. PiperOrigin-RevId: 327013666
material-components · Aug 17, 2020 · ae3fc08 · ae3fc08
1 parent 453eaa8
commit ae3fc08
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/components/ButtonBar/src/private/MDCButtonBarButton.m b/components/ButtonBar/src/private/MDCButtonBarButton.m
@@ -68,7 +68,12 @@ - (NSString *)largeContentTitle {
     return _largeContentTitle;
   }
 
-  return [self titleForState:UIControlStateNormal];
+  NSString *title = [self titleForState:UIControlStateNormal];
+  if (!title && self.largeContentImage) {
+    return self.accessibilityLabel;
+  }
+
+  return title;
 }
 
 - (UIImage *)largeContentImage {

diff --git a/components/ButtonBar/tests/unit/MDCButtonBarTests.m b/components/ButtonBar/tests/unit/MDCButtonBarTests.m
@@ -124,6 +124,26 @@ - (void)testSettingLargeContentImageOnBarButtonSetsItOnButtonBarView {
   }
 }
 
+- (void)testSettingImageWihNoTitleFallbacksToAccessibilityLabel {
+  if (@available(iOS 13.0, *)) {
+    // Given
+    UIImage *image = [[UIImage alloc] init];
+    UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithImage:image
+                                                             style:UIBarButtonItemStylePlain
+                                                            target:nil
+                                                            action:nil];
+    item.accessibilityLabel = @"foo";
+    self.buttonBar.items = @[ item ];
+
+    // When
+    NSArray<UIView *> *itemViews = [self.buttonBar viewsForItems:self.buttonBar.items];
+    NSString *largeContentTitle = itemViews.firstObject.largeContentTitle;
+
+    // Then
+    XCTAssertEqualObjects(largeContentTitle, item.accessibilityLabel);
+  }
+}
+
 - (void)testSettingLargeContentSizeImageInsetsOnBarButtonSetsItOnButtonBarView {
   if (@available(iOS 13.0, *)) {
     // Given