Simplify passing aria-label

Author: wojtekmaj

src/DateInput.jsx

@@ -445,7 +445,7 @@ export default class DateInput extends PureComponent {
       <DayInput
         key="day"
         {...this.commonInputProps}
-        dayAriaLabel={dayAriaLabel}
+        ariaLabel={dayAriaLabel}
         month={month}
         placeholder={dayPlaceholder}
         showLeadingZeros={showLeadingZerosFromFormat || showLeadingZeros}
@@ -473,8 +473,8 @@ export default class DateInput extends PureComponent {
         <MonthSelect
           key="month"
           {...this.commonInputProps}
+          ariaLabel={monthAriaLabel}
           locale={locale}
-          monthAriaLabel={monthAriaLabel}
           placeholder={monthPlaceholder}
           short={currentMatch.length === 3}
           value={month}
@@ -489,7 +489,7 @@ export default class DateInput extends PureComponent {
       <MonthInput
         key="month"
         {...this.commonInputProps}
-        monthAriaLabel={monthAriaLabel}
+        ariaLabel={monthAriaLabel}
         placeholder={monthPlaceholder}
         showLeadingZeros={showLeadingZerosFromFormat || showLeadingZeros}
         value={month}
@@ -506,10 +506,10 @@ export default class DateInput extends PureComponent {
       <YearInput
         key="year"
         {...this.commonInputProps}
+        ariaLabel={yearAriaLabel}
         placeholder={yearPlaceholder}
         value={year}
         valueType={this.valueType}
-        yearAriaLabel={yearAriaLabel}
       />
     );
   }
@@ -546,7 +546,7 @@ export default class DateInput extends PureComponent {
         maxDate={maxDate || defaultMaxDate}
         minDate={minDate || defaultMinDate}
         name={name}
-        nativeInputAriaLabel={nativeInputAriaLabel}
+        ariaLabel={nativeInputAriaLabel}
         onChange={this.onChangeNative}
         required={required}
         value={value}

src/DateInput/DayInput.jsx

@@ -13,7 +13,6 @@ import { isMaxDate, isMinDate } from '../shared/propTypes';
 import { min, max } from '../shared/utils';
 
 export default function DayInput({
-  dayAriaLabel,
   maxDate,
   minDate,
   month,
@@ -40,7 +39,6 @@ export default function DayInput({
   return (
     <Input
       name="day"
-      ariaLabel={dayAriaLabel}
       max={maxDay}
       min={minDay}
       {...otherProps}
@@ -49,8 +47,8 @@ export default function DayInput({
 }
 
 DayInput.propTypes = {
+  ariaLabel: PropTypes.string,
   className: PropTypes.string.isRequired,
-  dayAriaLabel: PropTypes.string,
   disabled: PropTypes.bool,
   itemRef: PropTypes.func,
   maxDate: isMaxDate,
@@ -59,6 +57,7 @@ DayInput.propTypes = {
   onChange: PropTypes.func,
   onKeyDown: PropTypes.func,
   onKeyUp: PropTypes.func,
+  placeholder: PropTypes.string,
   required: PropTypes.bool,
   showLeadingZeros: PropTypes.bool,
   value: PropTypes.number,

src/DateInput/MonthInput.jsx

@@ -10,7 +10,6 @@ import { min, max } from '../shared/utils';
 export default function MonthInput({
   maxDate,
   minDate,
-  monthAriaLabel,
   year,
   ...otherProps
 }) {
@@ -20,7 +19,6 @@ export default function MonthInput({
   return (
     <Input
       name="month"
-      ariaLabel={monthAriaLabel}
       max={maxMonth}
       min={minMonth}
       {...otherProps}
@@ -29,15 +27,16 @@ export default function MonthInput({
 }
 
 MonthInput.propTypes = {
+  ariaLabel: PropTypes.string,
   className: PropTypes.string.isRequired,
   disabled: PropTypes.bool,
   itemRef: PropTypes.func,
   maxDate: isMaxDate,
   minDate: isMinDate,
-  monthAriaLabel: PropTypes.string,
   onChange: PropTypes.func,
   onKeyDown: PropTypes.func,
   onKeyUp: PropTypes.func,
+  placeholder: PropTypes.string,
   required: PropTypes.bool,
   showLeadingZeros: PropTypes.bool,
   value: PropTypes.number,

src/DateInput/MonthSelect.jsx

@@ -8,12 +8,12 @@ import { isMaxDate, isMinDate } from '../shared/propTypes';
 import { min, max } from '../shared/utils';
 
 export default function MonthSelect({
+  ariaLabel,
   className,
   itemRef,
   locale,
   maxDate,
   minDate,
-  monthAriaLabel,
   short,
   year,
   value,
@@ -27,7 +27,7 @@ export default function MonthSelect({
 
   return (
     <select
-      aria-label={monthAriaLabel}
+      aria-label={ariaLabel}
       className={mergeClassNames(
         `${className}__input`,
         `${className}__${name}`,
@@ -65,16 +65,17 @@ export default function MonthSelect({
 }
 
 MonthSelect.propTypes = {
+  ariaLabel: PropTypes.string,
   className: PropTypes.string.isRequired,
   disabled: PropTypes.bool,
   itemRef: PropTypes.func,
   locale: PropTypes.string,
   maxDate: isMaxDate,
   minDate: isMinDate,
-  monthAriaLabel: PropTypes.string,
   onChange: PropTypes.func,
   onKeyDown: PropTypes.func,
   onKeyUp: PropTypes.func,
+  placeholder: PropTypes.string,
   required: PropTypes.bool,
   short: PropTypes.bool,
   value: PropTypes.number,

src/DateInput/NativeInput.jsx

@@ -9,11 +9,11 @@ import {
 import { isMaxDate, isMinDate, isValueType } from '../shared/propTypes';
 
 export default function NativeInput({
+  ariaLabel,
   disabled,
   maxDate,
   minDate,
   name,
-  nativeInputAriaLabel,
   onChange,
   required,
   value,
@@ -55,7 +55,7 @@ export default function NativeInput({
   return (
     <input
       type={nativeInputType}
-      aria-label={nativeInputAriaLabel}
+      aria-label={ariaLabel}
       disabled={disabled}
       max={maxDate ? nativeValueParser(maxDate) : null}
       min={minDate ? nativeValueParser(minDate) : null}
@@ -75,11 +75,11 @@ export default function NativeInput({
 }
 
 NativeInput.propTypes = {
+  ariaLabel: PropTypes.string,
   disabled: PropTypes.bool,
   maxDate: isMaxDate,
   minDate: isMinDate,
   name: PropTypes.string,
-  nativeInputAriaLabel: PropTypes.string,
   onChange: PropTypes.func,
   required: PropTypes.bool,
   value: PropTypes.oneOfType([

src/DateInput/YearInput.jsx

@@ -11,7 +11,6 @@ export default function YearInput({
   maxDate,
   minDate,
   valueType,
-  yearAriaLabel,
   ...otherProps
 }) {
   const maxYear = min(275760, maxDate && getYear(maxDate));
@@ -28,7 +27,6 @@ export default function YearInput({
   return (
     <Input
       name="year"
-      ariaLabel={yearAriaLabel}
       max={maxYear}
       min={minYear}
       step={yearStep}
@@ -38,6 +36,7 @@ export default function YearInput({
 }
 
 YearInput.propTypes = {
+  ariaLabel: PropTypes.string,
   className: PropTypes.string.isRequired,
   disabled: PropTypes.bool,
   itemRef: PropTypes.func,
@@ -50,7 +49,6 @@ YearInput.propTypes = {
   required: PropTypes.bool,
   value: PropTypes.number,
   valueType: isValueType,
-  yearAriaLabel: PropTypes.string,
 };
 
 YearInput.defaultProps = {

src/DateInput/__tests__/DayInput.jsx

@@ -71,7 +71,7 @@ describe('DayInput', () => {
     const component = mount(
       <DayInput
         {...defaultProps}
-        dayAriaLabel={dayAriaLabel}
+        ariaLabel={dayAriaLabel}
       />
     );
 

src/DateInput/__tests__/MonthInput.jsx

@@ -71,7 +71,7 @@ describe('MonthInput', () => {
     const component = mount(
       <MonthInput
         {...defaultProps}
-        monthAriaLabel={monthAriaLabel}
+        ariaLabel={monthAriaLabel}
       />
     );
 

src/DateInput/__tests__/MonthSelect.jsx

@@ -29,7 +29,7 @@ describe('MonthSelect', () => {
     const component = mount(
       <MonthSelect
         {...defaultProps}
-        monthAriaLabel={monthAriaLabel}
+        ariaLabel={monthAriaLabel}
       />
     );
 

src/DateInput/__tests__/NativeInput.jsx

@@ -27,7 +27,7 @@ describe('NativeInput', () => {
     const component = shallow(
       <NativeInput
         {...defaultProps}
-        nativeInputAriaLabel={nativeInputAriaLabel}
+        ariaLabel={nativeInputAriaLabel}
       />
     );