fix(Radio): Updated Radio aria-label prop so that it is optional (pat…

…ternfly#930) patternfly#803
redallen · Nov 27, 2018 · a3e74fa · a3e74fa
1 parent 9e41c6c
commit a3e74fa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/packages/patternfly-4/react-core/src/components/Radio/Radio.d.ts b/packages/patternfly-4/react-core/src/components/Radio/Radio.d.ts
@@ -7,7 +7,7 @@ export interface RadioProps extends Omit<HTMLProps<HTMLInputElement>, 'type' | '
   isChecked?: boolean;
   onChange?(checked: boolean, event: FormEvent<HTMLInputElement>): void;
   id: string;
-  'aria-label': string;
+  'aria-label'?: string;
   label?: ReactNode;
   name: string;
 }

diff --git a/packages/patternfly-4/react-core/src/components/Radio/Radio.js b/packages/patternfly-4/react-core/src/components/Radio/Radio.js
@@ -19,7 +19,12 @@ const propTypes = {
   /** Id of the Radio. */
   id: PropTypes.string.isRequired,
   /** Aria-label of the Radio. */
-  'aria-label': PropTypes.any.isRequired,
+  'aria-label': props => {
+    if (!props['aria-label']) {
+      return new Error('Radio requires an aria-label to be specified');
+    }
+    return null;
+  },
   /** Name for group of Radios */
   name: PropTypes.string.isRequired
 };
@@ -30,7 +35,8 @@ const defaultProps = {
   isDisabled: false,
   isChecked: null,
   onChange: () => undefined,
-  label: undefined
+  label: undefined,
+  'aria-label': null
 };
 
 class Radio extends React.Component {

diff --git a/packages/patternfly-4/react-core/src/components/Radio/examples/ControlledRadio.js b/packages/patternfly-4/react-core/src/components/Radio/examples/ControlledRadio.js
@@ -26,7 +26,7 @@ class ControlledRadio extends React.Component {
         <Radio
           value="4"
           isChecked={this.state.value === '4'}
-          name="pf-version"
+          name="pf-version2"
           onChange={this.handleChange}
           aria-label="Controlled radio 2"
           label="Controlled radio 2"

diff --git a/packages/patternfly-4/react-core/src/components/Radio/examples/CustomLabelRadio.js b/packages/patternfly-4/react-core/src/components/Radio/examples/CustomLabelRadio.js
@@ -9,7 +9,7 @@ class CustomLabelRadio extends React.Component {
         <Radio
           label={<Badge isRead>Different badge!</Badge>}
           id="radio-7"
-          name="radios-custom"
+          name="radios-custom2"
           aria-label="custom-label-2"
         />
       </React.Fragment>

diff --git a/packages/patternfly-4/react-core/src/components/Radio/examples/DisabledRadio.js b/packages/patternfly-4/react-core/src/components/Radio/examples/DisabledRadio.js
@@ -10,7 +10,7 @@ class DisabledRadio extends React.Component {
           aria-label="disabled checked radio example"
           defaultChecked
           isDisabled
-          name="group-2"
+          name="group-1"
           id="radio-disabled"
         />{' '}
         <Radio