Merge branch 'main' into 9948-form-spacing-migration

carbon-design-system · Mar 22, 2022 · 12d838c · 12d838c
2 parents 54551c1 + 118938a
commit 12d838c
Show file tree

Hide file tree

Showing 18 changed files with 437 additions and 262 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16.x'
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3
         id: cache
         with:
           path: |
@@ -83,7 +83,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16.x'
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3
         id: cache
         with:
           path: |
@@ -119,7 +119,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16.x'
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3
         id: cache
         with:
           path: |

diff --git a/.github/workflows/v10-ci.yml b/.github/workflows/v10-ci.yml
@@ -65,7 +65,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16.x'
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3
         id: cache
         with:
           path: |
@@ -93,7 +93,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16.x'
-      - uses: actions/cache@v2.1.7
+      - uses: actions/cache@v3
         id: cache
         with:
           path: |

diff --git a/packages/carbon-react/src/index.js b/packages/carbon-react/src/index.js
@@ -106,6 +106,10 @@ export {
   Tab,
   TabContent,
   Tabs,
+  TabPanel,
+  TabPanels,
+  TabList,
+  IconTab,
   Tag,
   TextArea,
   TextInput,
@@ -208,10 +212,6 @@ export {
   unstable_ProgressBar as ProgressBar,
   unstable_Section as Section,
   unstable_Stack as Stack,
-  unstable_TabPanel as TabPanel,
-  unstable_TabPanels as TabPanels,
-  unstable_TabList as TabList,
-  unstable_IconTab as IconTab,
   unstable_ThemeContext as ThemeContext,
   unstable_Theme as Theme,
   unstable_Tooltip as Tooltip,

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -3497,6 +3497,31 @@ Map {
       },
     },
   },
+  "IconTab" => Object {
+    "$$typeof": Symbol(react.forward_ref),
+    "propTypes": Object {
+      "children": Object {
+        "type": "node",
+      },
+      "className": Object {
+        "type": "string",
+      },
+      "defaultOpen": Object {
+        "type": "bool",
+      },
+      "enterDelayMs": Object {
+        "type": "number",
+      },
+      "label": Object {
+        "isRequired": true,
+        "type": "node",
+      },
+      "leaveDelayMs": Object {
+        "type": "number",
+      },
+    },
+    "render": [Function],
+  },
   "InlineLoading" => Object {
     "defaultProps": Object {
       "successDelay": 1500,
@@ -6293,6 +6318,75 @@ Map {
       },
     },
   },
+  "TabList" => Object {
+    "propTypes": Object {
+      "activation": Object {
+        "args": Array [
+          Array [
+            "automatic",
+            "manual",
+          ],
+        ],
+        "type": "oneOf",
+      },
+      "aria-label": Object {
+        "isRequired": true,
+        "type": "string",
+      },
+      "children": Object {
+        "type": "node",
+      },
+      "className": Object {
+        "type": "string",
+      },
+      "contained": Object {
+        "type": "bool",
+      },
+      "iconSize": Object {
+        "args": Array [
+          Array [
+            "default",
+            "lg",
+          ],
+        ],
+        "type": "oneOf",
+      },
+      "leftOverflowButtonProps": Object {
+        "type": "object",
+      },
+      "light": Object {
+        "type": "bool",
+      },
+      "rightOverflowButtonProps": Object {
+        "type": "object",
+      },
+      "scrollDebounceWait": Object {
+        "type": "number",
+      },
+      "scrollIntoView": Object {
+        "type": "bool",
+      },
+    },
+  },
+  "TabPanel" => Object {
+    "$$typeof": Symbol(react.forward_ref),
+    "propTypes": Object {
+      "children": Object {
+        "type": "node",
+      },
+      "className": Object {
+        "type": "string",
+      },
+    },
+    "render": [Function],
+  },
+  "TabPanels" => Object {
+    "propTypes": Object {
+      "children": Object {
+        "type": "node",
+      },
+    },
+  },
   "Table" => Object {
     "defaultProps": Object {
       "isSortable": false,
@@ -8201,31 +8295,6 @@ Map {
     },
     "render": [Function],
   },
-  "unstable_IconTab" => Object {
-    "$$typeof": Symbol(react.forward_ref),
-    "propTypes": Object {
-      "children": Object {
-        "type": "node",
-      },
-      "className": Object {
-        "type": "string",
-      },
-      "defaultOpen": Object {
-        "type": "bool",
-      },
-      "enterDelayMs": Object {
-        "type": "number",
-      },
-      "label": Object {
-        "isRequired": true,
-        "type": "node",
-      },
-      "leaveDelayMs": Object {
-        "type": "number",
-      },
-    },
-    "render": [Function],
-  },
   "unstable_Layer" => Object {
     "propTypes": Object {
       "as": Object {
@@ -8817,75 +8886,6 @@ Map {
     },
     "render": [Function],
   },
-  "unstable_TabList" => Object {
-    "propTypes": Object {
-      "activation": Object {
-        "args": Array [
-          Array [
-            "automatic",
-            "manual",
-          ],
-        ],
-        "type": "oneOf",
-      },
-      "aria-label": Object {
-        "isRequired": true,
-        "type": "string",
-      },
-      "children": Object {
-        "type": "node",
-      },
-      "className": Object {
-        "type": "string",
-      },
-      "contained": Object {
-        "type": "bool",
-      },
-      "iconSize": Object {
-        "args": Array [
-          Array [
-            "default",
-            "lg",
-          ],
-        ],
-        "type": "oneOf",
-      },
-      "leftOverflowButtonProps": Object {
-        "type": "object",
-      },
-      "light": Object {
-        "type": "bool",
-      },
-      "rightOverflowButtonProps": Object {
-        "type": "object",
-      },
-      "scrollDebounceWait": Object {
-        "type": "number",
-      },
-      "scrollIntoView": Object {
-        "type": "bool",
-      },
-    },
-  },
-  "unstable_TabPanel" => Object {
-    "$$typeof": Symbol(react.forward_ref),
-    "propTypes": Object {
-      "children": Object {
-        "type": "node",
-      },
-      "className": Object {
-        "type": "string",
-      },
-    },
-    "render": [Function],
-  },
-  "unstable_TabPanels" => Object {
-    "propTypes": Object {
-      "children": Object {
-        "type": "node",
-      },
-    },
-  },
   "unstable_Theme" => Object {
     "propTypes": Object {
       "as": Object {

diff --git a/packages/react/src/__tests__/index-test.js b/packages/react/src/__tests__/index-test.js
@@ -77,6 +77,7 @@ describe('Carbon Components React', () => {
         "HeaderSideNavItems",
         "Icon",
         "IconSkeleton",
+        "IconTab",
         "InlineLoading",
         "InlineNotification",
         "Link",
@@ -151,6 +152,9 @@ describe('Carbon Components React', () => {
         "SwitcherItem",
         "Tab",
         "TabContent",
+        "TabList",
+        "TabPanel",
+        "TabPanels",
         "Table",
         "TableActionList",
         "TableBatchAction",
@@ -207,7 +211,6 @@ describe('Carbon Components React', () => {
         "unstable_HStack",
         "unstable_Heading",
         "unstable_IconButton",
-        "unstable_IconTab",
         "unstable_Layer",
         "unstable_Menu",
         "unstable_MenuDivider",
@@ -223,9 +226,6 @@ describe('Carbon Components React', () => {
         "unstable_ProgressBar",
         "unstable_Section",
         "unstable_Stack",
-        "unstable_TabList",
-        "unstable_TabPanel",
-        "unstable_TabPanels",
         "unstable_Theme",
         "unstable_ThemeContext",
         "unstable_Tooltip",

diff --git a/packages/react/src/components/DataTable/stories/DataTable-batch-actions-story.js b/packages/react/src/components/DataTable/stories/DataTable-batch-actions-story.js
@@ -233,7 +233,7 @@ export const Small = () => (
               </Button>
             </TableToolbarContent>
           </TableToolbar>
-          <Table {...getTableProps()}>
+          <Table {...getTableProps()} size="sm">
             <TableHead>
               <TableRow>
                 <TableSelectAll {...getSelectionProps()} />

diff --git a/packages/react/src/components/DatePicker/DatePicker.js b/packages/react/src/components/DatePicker/DatePicker.js
@@ -614,6 +614,7 @@ export default class DatePicker extends Component {
             onChange, // eslint-disable-line
             locale, // eslint-disable-line
             value, // eslint-disable-line
+            onOpen, // eslint-disable-line
             ...other
           } = this.props;