Merge branch 'master' into 5079-overflowmenu-click-handler-optimization

carbon-design-system · Feb 15, 2020 · bb8930e · bb8930e
2 parents 2423f3f + 7e4c0e5
commit bb8930e
Show file tree

Hide file tree

Showing 16 changed files with 57 additions and 164 deletions.
diff --git a/packages/icons/svg/16/app-switcher.svg b/packages/icons/svg/16/app-switcher.svg
diff --git a/packages/icons/svg/16/overflow-menu--horizontal.svg b/packages/icons/svg/16/overflow-menu--horizontal.svg
diff --git a/packages/icons/svg/16/overflow-menu--vertical.svg b/packages/icons/svg/16/overflow-menu--vertical.svg
diff --git a/packages/icons/svg/16/switcher.svg b/packages/icons/svg/16/switcher.svg
diff --git a/packages/icons/svg/20/app-switcher.svg b/packages/icons/svg/20/app-switcher.svg
diff --git a/packages/icons/svg/20/switcher.svg b/packages/icons/svg/20/switcher.svg
diff --git a/packages/icons/svg/24/app-switcher.svg b/packages/icons/svg/24/app-switcher.svg
diff --git a/packages/icons/svg/24/switcher.svg b/packages/icons/svg/24/switcher.svg
diff --git a/packages/icons/svg/32/app-switcher.svg b/packages/icons/svg/32/app-switcher.svg
diff --git a/packages/icons/svg/32/overflow-menu--horizontal.svg b/packages/icons/svg/32/overflow-menu--horizontal.svg
diff --git a/packages/icons/svg/32/overflow-menu--vertical.svg b/packages/icons/svg/32/overflow-menu--vertical.svg
diff --git a/packages/icons/svg/32/switcher.svg b/packages/icons/svg/32/switcher.svg
diff --git a/packages/react/src/components/DataTable/TableToolbarSearch.js b/packages/react/src/components/DataTable/TableToolbarSearch.js
@@ -101,7 +101,6 @@ const TableToolbarSearch = ({
   return (
     <div
       tabIndex={expandedState ? '-1' : tabIndex}
-      role="search"
       ref={searchRef}
       onClick={event => onClick(event)}
       onFocus={event => handleExpand(event, true)}

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
@@ -2245,7 +2245,6 @@ exports[`DataTable should render 1`] = `
                   onBlur={[Function]}
                   onClick={[Function]}
                   onFocus={[Function]}
-                  role="search"
                   tabIndex="0"
                 >
                   <Search
@@ -2261,7 +2260,9 @@ exports[`DataTable should render 1`] = `
                     value=""
                   >
                     <div
+                      aria-labelledby="custom-id-search"
                       className="bx--search bx--search--sm"
+                      role="search"
                     >
                       <ForwardRef(Search16)
                         className="bx--search-magnifier"
@@ -2298,6 +2299,7 @@ exports[`DataTable should render 1`] = `
                       <label
                         className="bx--label"
                         htmlFor="custom-id"
+                        id="custom-id-search"
                       >
                         Filter table
                       </label>
@@ -3242,7 +3244,6 @@ exports[`DataTable sticky header should render 1`] = `
                   onBlur={[Function]}
                   onClick={[Function]}
                   onFocus={[Function]}
-                  role="search"
                   tabIndex="0"
                 >
                   <Search
@@ -3258,7 +3259,9 @@ exports[`DataTable sticky header should render 1`] = `
                     value=""
                   >
                     <div
+                      aria-labelledby="custom-id-search"
                       className="bx--search bx--search--sm"
+                      role="search"
                     >
                       <ForwardRef(Search16)
                         className="bx--search-magnifier"
@@ -3295,6 +3298,7 @@ exports[`DataTable sticky header should render 1`] = `
                       <label
                         className="bx--label"
                         htmlFor="custom-id"
+                        id="custom-id-search"
                       >
                         Filter table
                       </label>

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
@@ -14,7 +14,6 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
     onBlur={[Function]}
     onClick={[Function]}
     onFocus={[Function]}
-    role="search"
     tabIndex="0"
   >
     <Search
@@ -31,7 +30,9 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
       value=""
     >
       <div
+        aria-labelledby="custom-id-search"
         className="bx--search bx--search--sm custom-class"
+        role="search"
       >
         <ForwardRef(Search16)
           className="bx--search-magnifier"
@@ -68,6 +69,7 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
         <label
           className="bx--label"
           htmlFor="custom-id"
+          id="custom-id-search"
         >
           Filter table
         </label>

diff --git a/packages/react/src/components/Search/Search.js b/packages/react/src/components/Search/Search.js
@@ -161,10 +161,12 @@ export default class Search extends Component {
 
     const CloseIconX = size === 'xl' ? Close20 : Close16;
 
+    const searchId = `${id}-search`;
+
     return (
-      <div className={searchClasses}>
+      <div role="search" aria-labelledby={searchId} className={searchClasses}>
         <Search16 className={`${prefix}--search-magnifier`} />
-        <label htmlFor={id} className={`${prefix}--label`}>
+        <label id={searchId} htmlFor={id} className={`${prefix}--label`}>
           {labelText}
         </label>
         <input