Merge branch 'main' into patch-12

carbon-design-system · Oct 5, 2021 · 25fc1c5 · 25fc1c5
2 parents 056f75c + cd6fc39
commit 25fc1c5
Show file tree

Hide file tree

Showing 226 changed files with 2,733 additions and 1,152 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - name: Run yarn dedupe
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - name: Install dependencies
@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - name: Install dependencies
@@ -51,7 +51,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - uses: actions/[email protected]
@@ -77,7 +77,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - uses: actions/[email protected]
@@ -113,7 +113,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - uses: actions/[email protected]

diff --git a/.github/workflows/deploy-react-storybook.yml b/.github/workflows/deploy-react-storybook.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.github/workflows/deploy-vanilla-devenv.yml b/.github/workflows/deploy-vanilla-devenv.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v1
 
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/sync-generated-files.yml b/.github/workflows/sync-generated-files.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js 14.x
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: '14.x'
       - name: Install dependencies

diff --git a/.yarn/cache/array-differ-npm-1.0.0-ad58eb65d0-ac6060952c.zip b/.yarn/cache/array-differ-npm-1.0.0-ad58eb65d0-ac6060952c.zip
diff --git a/.yarn/cache/cross-spawn-async-npm-2.2.5-414a7d390a-6d9059a68a.zip b/.yarn/cache/cross-spawn-async-npm-2.2.5-414a7d390a-6d9059a68a.zip
diff --git a/.yarn/cache/execa-npm-0.4.0-bc4c0c59ab-aa78c841cb.zip b/.yarn/cache/execa-npm-0.4.0-bc4c0c59ab-aa78c841cb.zip
diff --git a/.yarn/cache/is-git-clean-npm-1.1.0-9bcc20f102-aa89b03f97.zip b/.yarn/cache/is-git-clean-npm-1.1.0-9bcc20f102-aa89b03f97.zip
diff --git a/.yarn/cache/multimatch-npm-2.1.0-759256cc0a-19259848ec.zip b/.yarn/cache/multimatch-npm-2.1.0-759256cc0a-19259848ec.zip
diff --git a/.yarn/cache/npm-run-path-npm-1.0.0-32f6a8b3e5-ffabf15b6e.zip b/.yarn/cache/npm-run-path-npm-1.0.0-32f6a8b3e5-ffabf15b6e.zip
diff --git a/.yarn/cache/path-key-npm-1.0.0-b2abce779e-41c4aa248d.zip b/.yarn/cache/path-key-npm-1.0.0-b2abce779e-41c4aa248d.zip
diff --git a/.yarn/cache/sass-npm-1.36.0-1ecc2af923-fdb03deed1.zip b/.yarn/cache/sass-npm-1.36.0-1ecc2af923-fdb03deed1.zip
diff --git a/.yarn/cache/sass-npm-1.41.0-da27912b16-12f791d1d3.zip b/.yarn/cache/sass-npm-1.41.0-da27912b16-12f791d1d3.zip
diff --git a/config/jest-config-carbon/package.json b/config/jest-config-carbon/package.json
@@ -2,7 +2,7 @@
   "name": "jest-config-carbon",
   "private": true,
   "description": "Jest configuration and preset for Carbon",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": {

diff --git a/config/jest-config-carbon/setup/setup.js b/config/jest-config-carbon/setup/setup.js
@@ -39,3 +39,13 @@ if (global.window) {
   const { getComputedStyle } = window;
   window.getComputedStyle = (element) => getComputedStyle(element);
 }
+
+if (global.window) {
+  window.ResizeObserver = jest.fn(() => {
+    return {
+      observe: jest.fn(),
+      unobserve: jest.fn(),
+      disconnect: jest.fn(),
+    };
+  });
+}
diff --git a/packages/carbon-react/.storybook/Welcome/Welcome.stories.js b/packages/carbon-react/.storybook/Welcome/Welcome.stories.js
@@ -16,6 +16,9 @@ export default {
     docs: {
       page: mdx,
     },
+    controls: {
+      hideNoControlsWarning: true,
+    },
   },
 };
 

diff --git a/packages/carbon-react/.storybook/preview.js b/packages/carbon-react/.storybook/preview.js
@@ -11,6 +11,9 @@ import { configureActions } from '@storybook/addon-actions';
 import { white, g10, g90, g100 } from '@carbon/themes';
 import React from 'react';
 import { breakpoints } from '@carbon/layout';
+import { settings } from 'carbon-components';
+
+settings.prefix = 'cds';
 
 export const globalTypes = {
   locale: {

diff --git a/packages/carbon-react/__tests__/index-test.js b/packages/carbon-react/__tests__/index-test.js
@@ -18,6 +18,7 @@ Array [
   "Accordion",
   "AccordionItem",
   "AccordionSkeleton",
+  "ActionableNotification",
   "AspectRatio",
   "Breadcrumb",
   "BreadcrumbItem",
@@ -75,6 +76,7 @@ Array [
   "IconSkeleton",
   "InlineLoading",
   "InlineNotification",
+  "Layer",
   "Link",
   "ListItem",
   "Loading",

diff --git a/packages/carbon-react/package.json b/packages/carbon-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/react",
   "description": "React components for the Carbon Design System",
-  "version": "0.5.0-rc.0",
+  "version": "0.6.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -43,11 +43,11 @@
   },
   "dependencies": {
     "@carbon/feature-flags": "^0.6.0",
-    "@carbon/icons-react": "^10.38.0",
-    "@carbon/styles": "^0.5.0-rc.0",
+    "@carbon/icons-react": "^10.40.0",
+    "@carbon/styles": "^0.6.0",
     "@carbon/telemetry": "0.0.0-alpha.6",
-    "carbon-components": "^10.44.0-rc.0",
-    "carbon-components-react": "^7.44.0-rc.0",
+    "carbon-components": "^10.45.0",
+    "carbon-components-react": "^7.45.0",
     "carbon-icons": "^7.0.7"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "@babel/plugin-transform-react-constant-elements": "^7.14.5",
     "@babel/preset-env": "^7.14.7",
     "@babel/preset-react": "^7.14.5",
-    "@carbon/themes": "^10.42.0",
+    "@carbon/themes": "^10.44.0",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-commonjs": "^18.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
@@ -85,13 +85,15 @@
     "rollup": "^2.46.0",
     "rollup-plugin-strip-banner": "^2.0.0",
     "rtlcss": "^3.1.2",
-    "sass": "^1.36.0",
+    "sass": "^1.41.0",
     "sass-loader": "10",
     "style-loader": "^2.0.0",
     "webpack": "^4.41.5"
   },
   "sideEffects": [
     "es/feature-flags.js",
-    "lib/feature-flags.js"
+    "lib/feature-flags.js",
+    "es/prefix.js",
+    "lib/prefix.js"
   ]
 }
diff --git a/packages/carbon-react/scss/components/combo-box/_index.scss b/packages/carbon-react/scss/components/combo-box/_index.scss
@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// Copyright IBM Corp. 2018, 2018
+//
+// This source code is licensed under the Apache-2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+@forward '@carbon/styles/scss/components/combo-box';
diff --git a/packages/carbon-react/scss/components/dropdown/_index.scss b/packages/carbon-react/scss/components/dropdown/_index.scss
@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// Copyright IBM Corp. 2018, 2018
+//
+// This source code is licensed under the Apache-2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+@forward '@carbon/styles/scss/components/dropdown';
diff --git a/packages/carbon-react/scss/components/multiselect/_index.scss b/packages/carbon-react/scss/components/multiselect/_index.scss
@@ -0,0 +1,9 @@
+// Code generated by @carbon/react. DO NOT EDIT.
+//
+// Copyright IBM Corp. 2018, 2018
+//
+// This source code is licensed under the Apache-2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+@forward '@carbon/styles/scss/components/multiselect';
diff --git a/packages/carbon-react/src/components/Layer/index.js b/packages/carbon-react/src/components/Layer/index.js
@@ -8,14 +8,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
+import { usePrefix } from '../../internal/usePrefix';
 
 export function Layer({
   as: BaseComponent = 'div',
   className: customClassName,
   children,
   ...rest
 }) {
-  const className = cx('bx--layer', customClassName);
+  const prefix = usePrefix();
+  const className = cx(`${prefix}--layer`, customClassName);
   return (
     <BaseComponent {...rest} className={className}>
       {children}