Skip to content

Commit d4273b3

Browse files
feat: make DatePicker implement HasAriaLabel (#4839)
Co-authored-by: Serhii Kulykov <iamkulykov@gmail.com>
1 parent 8fbe7a8 commit d4273b3

2 files changed

Lines changed: 58 additions & 2 deletions

File tree

  • vaadin-date-picker-flow-parent/vaadin-date-picker-flow/src

‎vaadin-date-picker-flow-parent/vaadin-date-picker-flow/src/main/java/com/vaadin/flow/component/datepicker/DatePicker.java‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.List;
2323
import java.util.Locale;
2424
import java.util.Objects;
25+
import java.util.Optional;
2526
import java.util.stream.Collectors;
2627
import java.util.stream.Stream;
2728

@@ -30,6 +31,7 @@
3031
import com.vaadin.flow.component.ComponentEvent;
3132
import com.vaadin.flow.component.ComponentEventListener;
3233
import com.vaadin.flow.component.Focusable;
34+
import com.vaadin.flow.component.HasAriaLabel;
3335
import com.vaadin.flow.component.HasHelper;
3436
import com.vaadin.flow.component.HasLabel;
3537
import com.vaadin.flow.component.HasSize;
@@ -89,8 +91,8 @@
8991
@NpmPackage(value = "date-fns", version = "2.29.3")
9092
public class DatePicker
9193
extends AbstractSinglePropertyField<DatePicker, LocalDate>
92-
implements Focusable<DatePicker>, HasAllowedCharPattern, HasAutoOpen,
93-
HasClearButton, HasClientValidation, HasHelper, HasLabel,
94+
implements Focusable<DatePicker>, HasAllowedCharPattern, HasAriaLabel,
95+
HasAutoOpen, HasClearButton, HasClientValidation, HasHelper, HasLabel,
9496
HasOverlayClassName, HasPrefix, HasSize, HasStyle, HasTooltip,
9597
HasThemeVariant<DatePickerVariant>, HasValidationProperties,
9698
HasValidator<LocalDate> {
@@ -366,6 +368,27 @@ public Locale getLocale() {
366368
}
367369
}
368370

371+
@Override
372+
public void setAriaLabel(String ariaLabel) {
373+
getElement().setProperty("accessibleName", ariaLabel);
374+
}
375+
376+
@Override
377+
public Optional<String> getAriaLabel() {
378+
return Optional.ofNullable(getElement().getProperty("accessibleName"));
379+
}
380+
381+
@Override
382+
public void setAriaLabelledBy(String labelledBy) {
383+
getElement().setProperty("accessibleNameRef", labelledBy);
384+
}
385+
386+
@Override
387+
public Optional<String> getAriaLabelledBy() {
388+
return Optional
389+
.ofNullable(getElement().getProperty("accessibleNameRef"));
390+
}
391+
369392
@Override
370393
protected void onAttach(AttachEvent attachEvent) {
371394
super.onAttach(attachEvent);

‎vaadin-date-picker-flow-parent/vaadin-date-picker-flow/src/test/java/com/vaadin/flow/component/datepicker/DatePickerTest.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Arrays;
2020
import java.util.List;
2121

22+
import com.vaadin.flow.component.HasAriaLabel;
2223
import org.junit.Assert;
2324
import org.junit.Test;
2425
import org.mockito.Mockito;
@@ -282,6 +283,38 @@ public void implementsHasTooltip() {
282283
Assert.assertTrue(picker instanceof HasTooltip);
283284
}
284285

286+
@Test
287+
public void implementHasAriaLabel() {
288+
Assert.assertTrue(
289+
"Date picker should support aria-label and aria-labelledby",
290+
HasAriaLabel.class.isAssignableFrom(DatePicker.class));
291+
}
292+
293+
@Test
294+
public void setAriaLabel() {
295+
DatePicker datePicker = new DatePicker();
296+
297+
datePicker.setAriaLabel("aria-label");
298+
Assert.assertTrue(datePicker.getAriaLabel().isPresent());
299+
Assert.assertEquals("aria-label", datePicker.getAriaLabel().get());
300+
301+
datePicker.setAriaLabel(null);
302+
Assert.assertTrue(datePicker.getAriaLabel().isEmpty());
303+
}
304+
305+
@Test
306+
public void setAriaLabelledBy() {
307+
DatePicker datePicker = new DatePicker();
308+
309+
datePicker.setAriaLabelledBy("aria-labelledby");
310+
Assert.assertTrue(datePicker.getAriaLabelledBy().isPresent());
311+
Assert.assertEquals("aria-labelledby",
312+
datePicker.getAriaLabelledBy().get());
313+
314+
datePicker.setAriaLabelledBy(null);
315+
Assert.assertTrue(datePicker.getAriaLabelledBy().isEmpty());
316+
}
317+
285318
@Test
286319
public void setPrefix_hasPrefix() {
287320
DatePicker picker = new DatePicker();

0 commit comments

Comments
 (0)