Merge branch 'master' into ordered-list-fix

carbon-design-system · Jan 21, 2020 · 15a18cb · 15a18cb
2 parents f439469 + 00f87f8
commit 15a18cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/react/src/components/Breadcrumb/Breadcrumb.js b/packages/react/src/components/Breadcrumb/Breadcrumb.js
@@ -17,6 +17,7 @@ const Breadcrumb = ({
   children,
   className: customClassNameNav,
   noTrailingSlash,
+  ...rest
 }) => {
   const className = cx({
     [`${prefix}--breadcrumb`]: true,
@@ -26,7 +27,8 @@ const Breadcrumb = ({
   return (
     <nav
       className={customClassNameNav}
-      aria-label={ariaLabel ? ariaLabel : 'Breadcrumb'}>
+      aria-label={ariaLabel ? ariaLabel : 'Breadcrumb'}
+      {...rest}>
       <ol className={className}>{children}</ol>
     </nav>
   );

diff --git a/packages/react/src/components/Pagination/Pagination.js b/packages/react/src/components/Pagination/Pagination.js
@@ -311,7 +311,7 @@ export default class Pagination extends Component {
         <div className={`${prefix}--pagination__right`}>
           {pageInputDisabled ? null : (
             <Select
-              id={`${prefix}-pagination-select-${inputId + 2}`}
+              id={`${prefix}-pagination-select-${inputId}-right`}
               className={`${prefix}--select__page-number`}
               labelText={`Page number, of ${totalPages} pages`}
               inline

diff --git a/packages/react/src/components/Tabs/Tabs-story.js b/packages/react/src/components/Tabs/Tabs-story.js
@@ -58,7 +58,7 @@ const TabContentRenderedOnlyWhenSelected = ({
   ...other
 }) =>
   !selected ? (
-    <div {...other} ciassName="bx--visually-hidden" />
+    <div {...other} className={`${prefix}--visually-hidden`} />
   ) : (
     <div
       {...other}