Merge branch 'master' into joshblack-patch-1

carbon-design-system · Oct 9, 2019 · babc9a9 · babc9a9
2 parents eee3ea7 + eaf1435
commit babc9a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 35 deletions.
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
@@ -2246,13 +2246,11 @@ exports[`DataTable should render 1`] = `
                     >
                       <ForwardRef(Search16)
                         className="bx--search-magnifier"
-                        role="img"
                       >
                         <Icon
                           className="bx--search-magnifier"
                           height={16}
                           preserveAspectRatio="xMidYMid meet"
-                          role="img"
                           viewBox="0 0 16 16"
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
@@ -2263,7 +2261,6 @@ exports[`DataTable should render 1`] = `
                             focusable="false"
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
                             style={
                               Object {
                                 "willChange": "transform",
@@ -2300,25 +2297,19 @@ exports[`DataTable should render 1`] = `
                         onClick={[Function]}
                         type="button"
                       >
-                        <ForwardRef(Close16)
-                          aria-label="Clear search input"
-                          role="img"
-                        >
+                        <ForwardRef(Close16)>
                           <Icon
-                            aria-label="Clear search input"
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
                             <svg
-                              aria-label="Clear search input"
+                              aria-hidden={true}
                               focusable="false"
                               height={16}
                               preserveAspectRatio="xMidYMid meet"
-                              role="img"
                               style={
                                 Object {
                                   "willChange": "transform",
@@ -3225,13 +3216,11 @@ exports[`DataTable sticky header should render 1`] = `
                     >
                       <ForwardRef(Search16)
                         className="bx--search-magnifier"
-                        role="img"
                       >
                         <Icon
                           className="bx--search-magnifier"
                           height={16}
                           preserveAspectRatio="xMidYMid meet"
-                          role="img"
                           viewBox="0 0 16 16"
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
@@ -3242,7 +3231,6 @@ exports[`DataTable sticky header should render 1`] = `
                             focusable="false"
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
                             style={
                               Object {
                                 "willChange": "transform",
@@ -3279,25 +3267,19 @@ exports[`DataTable sticky header should render 1`] = `
                         onClick={[Function]}
                         type="button"
                       >
-                        <ForwardRef(Close16)
-                          aria-label="Clear search input"
-                          role="img"
-                        >
+                        <ForwardRef(Close16)>
                           <Icon
-                            aria-label="Clear search input"
                             height={16}
                             preserveAspectRatio="xMidYMid meet"
-                            role="img"
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
                           >
                             <svg
-                              aria-label="Clear search input"
+                              aria-hidden={true}
                               focusable="false"
                               height={16}
                               preserveAspectRatio="xMidYMid meet"
-                              role="img"
                               style={
                                 Object {
                                   "willChange": "transform",

diff --git a/...es/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap b/...es/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap
@@ -33,13 +33,11 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
       >
         <ForwardRef(Search16)
           className="bx--search-magnifier"
-          role="img"
         >
           <Icon
             className="bx--search-magnifier"
             height={16}
             preserveAspectRatio="xMidYMid meet"
-            role="img"
             viewBox="0 0 16 16"
             width={16}
             xmlns="http://www.w3.org/2000/svg"
@@ -50,7 +48,6 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
               focusable="false"
               height={16}
               preserveAspectRatio="xMidYMid meet"
-              role="img"
               style={
                 Object {
                   "willChange": "transform",
@@ -87,25 +84,19 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <ForwardRef(Close16)
-            aria-label="Clear search input"
-            role="img"
-          >
+          <ForwardRef(Close16)>
             <Icon
-              aria-label="Clear search input"
               height={16}
               preserveAspectRatio="xMidYMid meet"
-              role="img"
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
               <svg
-                aria-label="Clear search input"
+                aria-hidden={true}
                 focusable="false"
                 height={16}
                 preserveAspectRatio="xMidYMid meet"
-                role="img"
                 style={
                   Object {
                     "willChange": "transform",

diff --git a/packages/react/src/components/Search/Search.js b/packages/react/src/components/Search/Search.js
@@ -151,7 +151,7 @@ export default class Search extends Component {
 
     return (
       <div className={searchClasses}>
-        <Search16 className={`${prefix}--search-magnifier`} role="img" />
+        <Search16 className={`${prefix}--search-magnifier`} />
         <label htmlFor={id} className={`${prefix}--label`}>
           {labelText}
         </label>
@@ -171,7 +171,7 @@ export default class Search extends Component {
           onClick={this.clearInput}
           type="button"
           aria-label={closeButtonLabelText}>
-          <CloseIconX aria-label={closeButtonLabelText} role="img" />
+          <CloseIconX />
         </button>
       </div>
     );