Merge branch 'carbon-v11' into removeReactResizeDetector

carbon-design-system · Apr 25, 2023 · e7fb955 · e7fb955
2 parents 03259e1 + 33ed98e
commit e7fb955
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 9 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -162,6 +162,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "lily-peng",
+      "name": "Lily",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3118961?v=4",
+      "profile": "https://linkedin.com/in/mslilypeng/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mgallo25",
+      "name": "Marienella Gallo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23409382?v=4",
+      "profile": "https://github.com/mgallo25",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 5,

diff --git a/README.md b/README.md
@@ -106,6 +106,8 @@ Thanks goes to these wonderful people
     <tr>
       <td align="center" valign="top" width="20%"><a href="https://github.com/Laura-Marshall"><img src="https://avatars.githubusercontent.com/u/53219208?v=4?s=100" width="100px;" alt="Laura Marshall"/><br /><sub><b>Laura Marshall</b></sub></a><br /><a href="#design-Laura-Marshall" title="Design">🎨</a></td>
       <td align="center" valign="top" width="20%"><a href="https://github.com/glapadre"><img src="https://avatars.githubusercontent.com/u/25260547?v=4?s=100" width="100px;" alt="Drew Glapa"/><br /><sub><b>Drew Glapa</b></sub></a><br /><a href="https://github.com/carbon-design-system/ibm-cloud-cognitive/commits?author=glapadre" title="Code">💻</a></td>
+      <td align="center" valign="top" width="20%"><a href="https://linkedin.com/in/mslilypeng/"><img src="https://avatars.githubusercontent.com/u/3118961?v=4?s=100" width="100px;" alt="Lily"/><br /><sub><b>Lily</b></sub></a><br /><a href="https://github.com/carbon-design-system/ibm-cloud-cognitive/commits?author=lily-peng" title="Code">💻</a></td>
+      <td align="center" valign="top" width="20%"><a href="https://github.com/mgallo25"><img src="https://avatars.githubusercontent.com/u/23409382?v=4?s=100" width="100px;" alt="Marienella Gallo"/><br /><sub><b>Marienella Gallo</b></sub></a><br /><a href="https://github.com/carbon-design-system/ibm-cloud-cognitive/commits?author=mgallo25" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/cspell.contributors.txt b/cspell.contributors.txt
@@ -43,3 +43,6 @@ Jayakumar
 
 glapadre
 Glapa
+
+Marienella
+mgallo
diff --git a/packages/cloud-cognitive/CHANGELOG.md b/packages/cloud-cognitive/CHANGELOG.md
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-rc.27](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-04-25)
+
+
+### Bug Fixes
+
+* allow nodes to be passed to additional card props v11 ([#2886](https://github.com/carbon-design-system/ibm-cloud-cognitive/issues/2886)) ([5c2639a](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/5c2639a52e3b831316a113e52e8748e867c6370d))
+* **card:** Add styles.test.js.snap ([3597da8](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/3597da8e4d68071e61b599dc0557a2c38fde45f1))
+* **card:** CI Lint updates ([64f225a](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/64f225ab8f61cea0469641e4e616912d6c009d1e))
+* **card:** CI Lint updates ([78034f0](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/78034f07042098674b0cc57191b34478ae453ab2))
+* **card:** Remove with action icon ([450025c](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/450025c4fdd272b858a9c7d41d568950f20a59a0))
+* **card:** update button requirements ([856e369](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/856e369a3b643bc4721fc7cd123df14b70e9d228))
+* **card:** update card design review ([#2763](https://github.com/carbon-design-system/ibm-cloud-cognitive/issues/2763)) ([edab7e1](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/edab7e1f834c4172a9aca5e0bf73819ebddb2685))
+* **card:** Update style errors ([6dfbfc3](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/6dfbfc3caacd822efb0da59778c76f3608ea37a0))
+* **card:** Update tests ([8eb30e0](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/8eb30e0443f0de9ea7045c3ce12eef13f4783e61))
+* **Datagrid:** filtering number empty tag bug (v11) ([#2880](https://github.com/carbon-design-system/ibm-cloud-cognitive/issues/2880)) ([b7ed43a](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/b7ed43a8a52117db4a7436451ee15b8329a6674b))
+* **Datagrid:** invalid aria role ([7ab6d49](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/7ab6d499872b960fb789a0d5a7c69037ca464b30))
+* **Datagrid:** removed explicit role from tbody ([8c10b54](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/8c10b5450934681bff2457f82b21ac3f93dac4b1))
+* styling issues found in 2830 ([#2890](https://github.com/carbon-design-system/ibm-cloud-cognitive/issues/2890)) ([46ea160](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/46ea1600dc11efc2b0ca06d9a2d730d1fee84fee))
+* **TagSet:** remove tag radius in overflow ([#2897](https://github.com/carbon-design-system/ibm-cloud-cognitive/issues/2897)) ([17cd5b5](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/17cd5b5ede6dbdc1b8706983636c51c5379f508f))
+* user profile image focus v11 ([#2874](https://github.com/carbon-design-system/ibm-cloud-cognitive/issues/2874)) ([d7f4dfd](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/d7f4dfda92481086b1e7993cc11af7dfe8ef91b7))
+
+
+### Features
+
+* **Datagrid:** add support for NotFound empty state ([efff037](https://github.com/carbon-design-system/ibm-cloud-cognitive/commit/efff0373fd464af6f578cb16579cfd72d17aacb0))
+
+
+
+
+
 # [2.0.0-rc.26](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2023-04-18)
 
 

diff --git a/packages/cloud-cognitive/package.json b/packages/cloud-cognitive/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.0.0-rc.26",
+  "version": "2.0.0-rc.27",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridEmptyBody.js b/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridEmptyBody.js
@@ -40,7 +40,7 @@ const DatagridEmptyBody = (datagridState) => {
 
   return (
     <TableBody
-      {...getTableBodyProps()}
+      {...getTableBodyProps({ role: false })}
       className={`${blockClass}__empty-state-body`}
     >
       <TableRow>

diff --git a/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridHeaderRow.js b/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridHeaderRow.js
@@ -16,7 +16,7 @@ const blockClass = `${pkg.prefix}--datagrid`;
 
 const HeaderRow = (datagridState, headRef, headerGroup) => (
   <TableRow
-    {...headerGroup.getHeaderGroupProps()}
+    {...headerGroup.getHeaderGroupProps({ role: false })}
     className={cx(
       `${blockClass}__head`,
       headerGroup.getHeaderGroupProps().className
@@ -32,7 +32,7 @@ const HeaderRow = (datagridState, headRef, headerGroup) => (
         }
         return (
           <TableHeader
-            {...header.getHeaderProps()}
+            {...header.getHeaderProps({ role: false })}
             className={cx(
               {
                 [`${blockClass}__resizableColumn`]: header.getResizerProps,

diff --git a/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridRefBody.js b/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridRefBody.js
@@ -19,7 +19,7 @@ const DatagridRefBody = (datagridState) => {
   const { getTableBodyProps, rows, prepareRow } = datagridState;
   return (
     <tbody
-      {...getTableBodyProps()}
+      {...getTableBodyProps({ role: false })}
       className={cx(
         `${blockClass}__simple-body`,
         getTableBodyProps().className

diff --git a/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridRow.js b/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridRow.js
@@ -79,7 +79,7 @@ const DatagridRow = (datagridState) => {
         [`${blockClass}__carbon-row-expandable`]: row.canExpand,
         [`${carbon.prefix}--data-table--selected`]: row.isSelected,
       })}
-      {...row.getRowProps()}
+      {...row.getRowProps({ role: false })}
       key={row.id}
       onMouseEnter={(event) => {
         if (!withNestedRows) {
@@ -115,7 +115,7 @@ const DatagridRow = (datagridState) => {
       }}
     >
       {row.cells.map((cell, index) => {
-        const cellProps = cell.getCellProps();
+        const cellProps = cell.getCellProps({ role: false });
         const { children, ...restProps } = cellProps;
         const content = children || (
           <>

diff --git a/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridSimpleBody.js b/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridSimpleBody.js
@@ -16,7 +16,7 @@ const DatagridSimpleBody = (datagridState) => {
   const { getTableBodyProps, rows, prepareRow } = datagridState;
   return (
     <TableBody
-      {...getTableBodyProps()}
+      {...getTableBodyProps({ role: false })}
       className={cx(
         `${blockClass}__simple-body`,
         getTableBodyProps().className

diff --git a/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridVirtualBody.js b/packages/cloud-cognitive/src/components/Datagrid/Datagrid/DatagridVirtualBody.js
@@ -85,7 +85,10 @@ const DatagridVirtualBody = (datagridState) => {
       >
         <DatagridHead {...datagridState} />
       </div>
-      <TableBody {...getTableBodyProps()} onScroll={(e) => syncScroll(e)}>
+      <TableBody
+        {...getTableBodyProps({ role: false })}
+        onScroll={(e) => syncScroll(e)}
+      >
         <VariableSizeList
           height={virtualHeight || tableHeight}
           itemCount={visibleRows.length}
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,3 +43,6 @@ Jayakumar @@
     glapadre
     Glapa
+    Marienella
+    mgallo