Merge branch 'master' into 6383-update-downshift

carbon-design-system · Jul 13, 2020 · 83d3ef8 · 83d3ef8
2 parents 72fe88e + 2692813
commit 83d3ef8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/react/src/components/MultiSelect/MultiSelect.js b/packages/react/src/components/MultiSelect/MultiSelect.js
@@ -221,7 +221,6 @@ function MultiSelect({
                   .length > 0;
               return (
                 <ListBox.MenuItem
-                  aria-selected={isChecked}
                   key={itemProps.id}
                   isActive={isChecked}
                   isHighlighted={highlightedIndex === index}

diff --git a/packages/react/src/components/PaginationNav/PaginationNav.js b/packages/react/src/components/PaginationNav/PaginationNav.js
@@ -104,6 +104,7 @@ function PaginationItem({
           [`${prefix}--pagination-nav__page--active`]: isActive,
         })}
         onClick={onClick}
+        data-page={page}
         aria-current={isActive ? 'page' : null}>
         <span className={`${prefix}--pagination-nav__accessibility-label`}>
           {isActive
@@ -139,6 +140,7 @@ function PaginationOverflow({
             {[...Array(count)].map((e, i) => (
               <option
                 value={(fromIndex + i).toString()}
+                data-page={fromIndex + i + 1}
                 key={`overflow-${fromIndex + i}`}>
                 {fromIndex + i + 1}
               </option>