Merge branch 'master' into alisonjoseph-patch-codeowners

carbon-design-system · Nov 19, 2019 · 8b3e4c6 · 8b3e4c6
2 parents 4e0f72e + 033a91f
commit 8b3e4c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/react/src/components/ContentSwitcher/ContentSwitcher.js b/packages/react/src/components/ContentSwitcher/ContentSwitcher.js
@@ -110,7 +110,7 @@ export default class ContentSwitcher extends React.Component {
     const classes = classNames(`${prefix}--content-switcher`, className);
 
     return (
-      <div {...other} className={classes}>
+      <div {...other} className={classes} role="tablist">
         {React.Children.map(children, (child, index) =>
           React.cloneElement(child, {
             index,

diff --git a/packages/react/src/components/Modal/Modal.js b/packages/react/src/components/Modal/Modal.js
@@ -135,7 +135,7 @@ export default class Modal extends Component {
     /**
      * Specify the size variant.
      */
-    size: PropTypes.oneOf('xs', 'sm', 'lg'),
+    size: PropTypes.oneOf(['xs', 'sm', 'lg']),
 
     /**
      * Specify whether the modal should use 3rd party `focus-trap-react` for the focus-wrap feature.