Merge branch 'main' into select-audit

carbon-design-system · Feb 18, 2022 · 515ec03 · 515ec03
2 parents e01e3e0 + cdacbe8
commit 515ec03
Show file tree

Hide file tree

Showing 85 changed files with 715 additions and 258 deletions.
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
@@ -30,6 +30,7 @@ body:
         - '@carbon/pictograms'
         - '@carbon/pictograms-react'
         - '@carbon/react'
+        - '@carbon/styles'
         - '@carbon/themes'
         - '@carbon/type'
         - '@carbon/upgrade'

diff --git a/.prettierignore b/.prettierignore
@@ -44,7 +44,7 @@ packages/icons-react/next/**
 **/_inlined/**
 
 # Examples
-**/examples/**
+packages/**/examples/**
 !packages/themes/examples/**
 
 # Yarn

diff --git a/.yarn/cache/@ampproject-remapping-npm-2.1.1-a9311a9236-cc5cf29833.zip b/.yarn/cache/@ampproject-remapping-npm-2.1.1-a9311a9236-cc5cf29833.zip
diff --git a/...ore-npm-7.16.12-10529e0454-29b56f3cb7.zip → ...core-npm-7.17.2-bc12e43b41-68ab3459f4.zip b/...ore-npm-7.16.12-10529e0454-29b56f3cb7.zip → ...core-npm-7.17.2-bc12e43b41-68ab3459f4.zip
diff --git a/...ator-npm-7.16.8-f9d7f9b832-83af38b347.zip → ...ator-npm-7.17.0-8120b22251-2987dbebb4.zip b/...ator-npm-7.16.8-f9d7f9b832-83af38b347.zip → ...ator-npm-7.17.0-8120b22251-2987dbebb4.zip
diff --git a/.yarn/cache/@babel-helpers-npm-7.16.7-69d23ddac5-75504c76b6.zip b/.yarn/cache/@babel-helpers-npm-7.16.7-69d23ddac5-75504c76b6.zip
diff --git a/.yarn/cache/@babel-helpers-npm-7.17.2-b6e9f47d4d-5fa06bbf59.zip b/.yarn/cache/@babel-helpers-npm-7.17.2-b6e9f47d4d-5fa06bbf59.zip
diff --git a/.yarn/cache/@babel-parser-npm-7.16.12-427f7b1500-af287f0f3d.zip b/.yarn/cache/@babel-parser-npm-7.16.12-427f7b1500-af287f0f3d.zip
diff --git a/.yarn/cache/@babel-parser-npm-7.17.0-e1dff7f554-d0ac5ffba0.zip b/.yarn/cache/@babel-parser-npm-7.17.0-e1dff7f554-d0ac5ffba0.zip
diff --git a/.yarn/cache/@babel-plugin-transform-react-jsx-self-npm-7.16.7-76fb9b22b6-cf1e408eed.zip b/.yarn/cache/@babel-plugin-transform-react-jsx-self-npm-7.16.7-76fb9b22b6-cf1e408eed.zip
diff --git a/.yarn/cache/@babel-plugin-transform-react-jsx-source-npm-7.16.7-d42c9e9f0e-722147fd37.zip b/.yarn/cache/@babel-plugin-transform-react-jsx-source-npm-7.16.7-d42c9e9f0e-722147fd37.zip
diff --git a/...rse-npm-7.16.10-25c7c5da49-58f52314f8.zip → ...erse-npm-7.17.0-2ad756de16-9b7de053d8.zip b/...rse-npm-7.16.10-25c7c5da49-58f52314f8.zip → ...erse-npm-7.17.0-2ad756de16-9b7de053d8.zip
diff --git a/.yarn/cache/@babel-types-npm-7.16.8-68f858fd51-4f6a187b29.zip b/.yarn/cache/@babel-types-npm-7.16.8-68f858fd51-4f6a187b29.zip
diff --git a/.yarn/cache/@babel-types-npm-7.17.0-3c936b54e4-12e5a28798.zip b/.yarn/cache/@babel-types-npm-7.17.0-3c936b54e4-12e5a28798.zip
diff --git a/.yarn/cache/@jridgewell-resolve-uri-npm-3.0.5-bb57d127db-1ee652b693.zip b/.yarn/cache/@jridgewell-resolve-uri-npm-3.0.5-bb57d127db-1ee652b693.zip
diff --git a/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.11-68fac44d63-3b2afaf840.zip b/.yarn/cache/@jridgewell-sourcemap-codec-npm-1.4.11-68fac44d63-3b2afaf840.zip
diff --git a/.yarn/cache/@jridgewell-trace-mapping-npm-0.3.4-d0db906c7f-ab8bce84bb.zip b/.yarn/cache/@jridgewell-trace-mapping-npm-0.3.4-d0db906c7f-ab8bce84bb.zip
diff --git a/.yarn/cache/@rollup-pluginutils-npm-4.1.2-10299b48a2-498d67e7b4.zip b/.yarn/cache/@rollup-pluginutils-npm-4.1.2-10299b48a2-498d67e7b4.zip
diff --git a/.yarn/cache/@textlint-ast-node-types-npm-4.2.5-628a4e321a-f516113492.zip b/.yarn/cache/@textlint-ast-node-types-npm-4.2.5-628a4e321a-f516113492.zip
diff --git a/.yarn/cache/@textlint-ast-node-types-npm-4.4.3-23d45d4c41-987f231523.zip b/.yarn/cache/@textlint-ast-node-types-npm-4.4.3-23d45d4c41-987f231523.zip
diff --git a/.yarn/cache/@textlint-markdown-to-ast-npm-6.0.9-113d660a66-9490264d57.zip b/.yarn/cache/@textlint-markdown-to-ast-npm-6.0.9-113d660a66-9490264d57.zip
diff --git a/.yarn/cache/@textlint-markdown-to-ast-npm-6.1.7-594f11b5df-109b3dcca1.zip b/.yarn/cache/@textlint-markdown-to-ast-npm-6.1.7-594f11b5df-109b3dcca1.zip
diff --git a/.yarn/cache/@vitejs-plugin-react-npm-1.2.0-7d55f3ed98-d838018f59.zip b/.yarn/cache/@vitejs-plugin-react-npm-1.2.0-7d55f3ed98-d838018f59.zip
diff --git a/.yarn/cache/doctoc-npm-1.4.0-cd22da6a57-6c669e8264.zip b/.yarn/cache/doctoc-npm-1.4.0-cd22da6a57-6c669e8264.zip
diff --git a/.yarn/cache/doctoc-npm-2.1.0-5443fba10c-ca739bd600.zip b/.yarn/cache/doctoc-npm-2.1.0-5443fba10c-ca739bd600.zip
diff --git a/.yarn/cache/domhandler-npm-3.3.0-6417f7e17e-850e5e9fee.zip b/.yarn/cache/domhandler-npm-3.3.0-6417f7e17e-850e5e9fee.zip
diff --git a/.yarn/cache/esbuild-darwin-64-npm-0.14.10-2ec5e23e10-8.zip b/.yarn/cache/esbuild-darwin-64-npm-0.14.10-2ec5e23e10-8.zip
diff --git a/.yarn/cache/esbuild-darwin-64-npm-0.14.21-f38afbb17d-8.zip b/.yarn/cache/esbuild-darwin-64-npm-0.14.21-f38afbb17d-8.zip
diff --git a/.yarn/cache/esbuild-linux-64-npm-0.14.10-e622a86d7d-8.zip b/.yarn/cache/esbuild-linux-64-npm-0.14.10-e622a86d7d-8.zip
diff --git a/.yarn/cache/esbuild-linux-64-npm-0.14.21-819f7ec971-8.zip b/.yarn/cache/esbuild-linux-64-npm-0.14.21-819f7ec971-8.zip
diff --git a/.yarn/cache/esbuild-npm-0.14.10-7f73f182c8-0e42a74afa.zip b/.yarn/cache/esbuild-npm-0.14.10-7f73f182c8-0e42a74afa.zip
diff --git a/.yarn/cache/esbuild-npm-0.14.21-52750ae172-21a0b30274.zip b/.yarn/cache/esbuild-npm-0.14.21-52750ae172-21a0b30274.zip
diff --git a/.yarn/cache/esbuild-windows-64-npm-0.14.10-d897c35251-8.zip b/.yarn/cache/esbuild-windows-64-npm-0.14.10-d897c35251-8.zip
diff --git a/.yarn/cache/esbuild-windows-64-npm-0.14.21-c7afb76ffe-8.zip b/.yarn/cache/esbuild-windows-64-npm-0.14.21-c7afb76ffe-8.zip
diff --git a/.yarn/cache/fast-sass-loader-npm-1.5.0-f83ec63742-73ac3bba48.zip b/.yarn/cache/fast-sass-loader-npm-1.5.0-f83ec63742-73ac3bba48.zip
diff --git a/.yarn/cache/fast-sass-loader-npm-2.0.1-ba6d1d1880-808ad855f4.zip b/.yarn/cache/fast-sass-loader-npm-2.0.1-ba6d1d1880-808ad855f4.zip
diff --git a/.yarn/cache/htmlparser2-npm-3.9.2-d87e463ad0-ac515644e6.zip b/.yarn/cache/htmlparser2-npm-3.9.2-d87e463ad0-ac515644e6.zip
diff --git a/.yarn/cache/htmlparser2-npm-4.1.0-484402b323-615fcf34ae.zip b/.yarn/cache/htmlparser2-npm-4.1.0-484402b323-615fcf34ae.zip
diff --git a/.yarn/cache/is-core-module-npm-2.8.0-acc8c42f1b-f8b5271489.zip b/.yarn/cache/is-core-module-npm-2.8.0-acc8c42f1b-f8b5271489.zip
diff --git a/.yarn/cache/is-core-module-npm-2.8.1-ce21740d1b-418b7bc107.zip b/.yarn/cache/is-core-module-npm-2.8.1-ce21740d1b-418b7bc107.zip
diff --git a/.yarn/cache/path-parse-npm-1.0.6-4a4c90546c-962a85dd38.zip b/.yarn/cache/path-parse-npm-1.0.6-4a4c90546c-962a85dd38.zip
diff --git a/.yarn/cache/path-parse-npm-1.0.7-09564527b7-49abf3d811.zip b/.yarn/cache/path-parse-npm-1.0.7-09564527b7-49abf3d811.zip
diff --git a/.yarn/cache/resolve-npm-1.20.0-1bc5878aa9-40cf70b2cd.zip b/.yarn/cache/resolve-npm-1.20.0-1bc5878aa9-40cf70b2cd.zip
diff --git a/.yarn/cache/resolve-npm-1.22.0-f641ddcc95-a2d14cc437.zip b/.yarn/cache/resolve-npm-1.22.0-f641ddcc95-a2d14cc437.zip
diff --git a/.yarn/cache/resolve-patch-b4a69197d3-a0dd7d16a8.zip b/.yarn/cache/resolve-patch-b4a69197d3-a0dd7d16a8.zip
diff --git a/.yarn/cache/resolve-patch-bad885c6ea-c79ecaea36.zip b/.yarn/cache/resolve-patch-bad885c6ea-c79ecaea36.zip
diff --git a/.yarn/cache/rollup-npm-2.61.1-c37348b40a-a41bd821c1.zip b/.yarn/cache/rollup-npm-2.61.1-c37348b40a-a41bd821c1.zip
diff --git a/.yarn/cache/rollup-npm-2.67.2-23df7ee784-9aca5251ba.zip b/.yarn/cache/rollup-npm-2.67.2-23df7ee784-9aca5251ba.zip
diff --git a/.yarn/cache/sass-npm-1.45.0-83550ad0f7-f20d22ddf9.zip b/.yarn/cache/sass-npm-1.45.0-83550ad0f7-f20d22ddf9.zip
diff --git a/.yarn/cache/sass-npm-1.49.7-31c62a5c43-514d1abff5.zip b/.yarn/cache/sass-npm-1.49.7-31c62a5c43-514d1abff5.zip
diff --git a/.yarn/cache/supports-preserve-symlinks-flag-npm-1.0.0-f17c4d0028-53b1e247e6.zip b/.yarn/cache/supports-preserve-symlinks-flag-npm-1.0.0-f17c4d0028-53b1e247e6.zip
diff --git a/.yarn/cache/underscore-npm-1.12.1-f5ca0889f5-ec327603aa.zip b/.yarn/cache/underscore-npm-1.12.1-f5ca0889f5-ec327603aa.zip
diff --git a/.yarn/cache/underscore-npm-1.8.3-a2d207f853-46d9ea25c8.zip b/.yarn/cache/underscore-npm-1.8.3-a2d207f853-46d9ea25c8.zip
diff --git a/.yarn/cache/vite-npm-2.8.2-f7d653beb8-2e5ace113e.zip b/.yarn/cache/vite-npm-2.8.2-f7d653beb8-2e5ace113e.zip
diff --git a/examples/codesandbox-styles/.gitignore b/examples/codesandbox-styles/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/examples/codesandbox-styles/favicon.svg b/examples/codesandbox-styles/favicon.svg
diff --git a/examples/codesandbox-styles/index.html b/examples/codesandbox-styles/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Carbon Styles Sandbox</title>
+  </head>
+  <body>
+    <button class="cds--btn cds--btn--primary">Hello world</button>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>
diff --git a/examples/codesandbox-styles/main.js b/examples/codesandbox-styles/main.js
@@ -0,0 +1 @@
+import './style.scss';
diff --git a/examples/codesandbox-styles/package.json b/examples/codesandbox-styles/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "codesandbox-styles",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "develop": "vite"
+  },
+  "devDependencies": {
+    "vite": "^2.8.0"
+  },
+  "dependencies": {
+    "@carbon/styles": "0.14.0",
+    "sass": "^1.49.7"
+  }
+}
diff --git a/examples/codesandbox-styles/style.scss b/examples/codesandbox-styles/style.scss
@@ -0,0 +1,3 @@
+@use '@carbon/styles' with (
+  $font-path: '@ibm/plex'
+);
diff --git a/examples/codesandbox/.gitignore b/examples/codesandbox/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/examples/codesandbox/index.html b/examples/codesandbox/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>
diff --git a/examples/codesandbox/package.json b/examples/codesandbox/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "codesandbox",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "develop": "vite"
+  },
+  "dependencies": {
+    "@carbon/react": "0.14.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-react": "^1.0.7",
+    "sass": "^1.49.7",
+    "vite": "^2.8.0"
+  }
+}
diff --git a/examples/codesandbox/src/App.jsx b/examples/codesandbox/src/App.jsx
@@ -0,0 +1,7 @@
+import { Button } from '@carbon/react';
+
+function App() {
+  return <Button>Hello world</Button>;
+}
+
+export default App
diff --git a/examples/codesandbox/src/favicon.svg b/examples/codesandbox/src/favicon.svg
diff --git a/examples/codesandbox/src/index.scss b/examples/codesandbox/src/index.scss
@@ -0,0 +1,3 @@
+@use '@carbon/react' with (
+  $font-path: '@ibm/plex',
+);
diff --git a/examples/codesandbox/src/main.jsx b/examples/codesandbox/src/main.jsx
@@ -0,0 +1,12 @@
+import './index.scss'
+
+import React from 'react'
+import ReactDOM from 'react-dom'
+import App from './App'
+
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root')
+)
diff --git a/examples/codesandbox/vite.config.js b/examples/codesandbox/vite.config.js
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+});
diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
   "workspaces": [
     "actions/*",
     "config/*",
+    "examples/*",
     "packages/*",
     "www"
   ],
@@ -55,7 +56,7 @@
     "all-contributors-cli": "^6.19.0",
     "cross-env": "^7.0.0",
     "cross-spawn": "^7.0.0",
-    "doctoc": "^1.4.0",
+    "doctoc": "^2.0.0",
     "eslint": "^7.28.0",
     "fs-extra": "^10.0.0",
     "glob": "^7.1.4",

diff --git a/packages/cli/src/workspace.js b/packages/cli/src/workspace.js
@@ -17,7 +17,12 @@ const WORKSPACE_ROOT = getProjectRoot(__dirname);
 const packageJson = fs.readJsonSync(path.join(WORKSPACE_ROOT, 'package.json'));
 const packagePaths = Array.isArray(packageJson.workspaces)
   ? glob
-      .sync(packageJson.workspaces.map((pattern) => `${pattern}/package.json`))
+      .sync(
+        packageJson.workspaces.map((pattern) => `${pattern}/package.json`),
+        {
+          cwd: WORKSPACE_ROOT,
+        }
+      )
       .map((match) => {
         const packageJsonPath = path.join(WORKSPACE_ROOT, match);
         return {

diff --git a/packages/components/src/components/content-switcher/_content-switcher.scss b/packages/components/src/components/content-switcher/_content-switcher.scss
@@ -66,6 +66,10 @@
       transform: scaleY(0);
       transform-origin: bottom;
       transition: all $duration--moderate-01 motion(standard, productive);
+
+      @media (prefers-reduced-motion: reduce) {
+        transition: none;
+      }
     }
 
     &:disabled::after {

diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -3732,6 +3732,7 @@ Map {
     },
   },
   "ModalBody" => Object {
+    "$$typeof": Symbol(react.forward_ref),
     "propTypes": Object {
       "aria-label": [Function],
       "children": Object {
@@ -3747,6 +3748,7 @@ Map {
         "type": "bool",
       },
     },
+    "render": [Function],
   },
   "ModalFooter" => Object {
     "contextType": Object {

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -117,7 +117,7 @@
     "cypress": "^9.2.0",
     "cypress-real-events": "^1.6.0",
     "fast-glob": "^3.2.7",
-    "fast-sass-loader": "^1.5.0",
+    "fast-sass-loader": "^2.0.0",
     "gzip-size": "^6.0.0",
     "lcov2badge": "^0.1.0",
     "mini-css-extract-plugin": "^2.4.5",

diff --git a/packages/react/src/components/ComposedModal/ComposedModal-test.js b/packages/react/src/components/ComposedModal/ComposedModal-test.js
@@ -46,6 +46,13 @@ describe('<ModalHeader />', () => {
         labelWrapper.find(`.${prefix}--modal-header__label`).exists()
       ).toBe(true);
     });
+
+    it('should render with ref', () => {
+      const ref = React.createRef();
+      mount(<ModalHeader title="Something" forwardedRef={ref} />);
+
+      expect(ref.current).toHaveClass(`${prefix}--modal-header`);
+    });
   });
 });
 
@@ -70,6 +77,16 @@ describe('<ModalBody />', () => {
         wrapper.find(`.${prefix}--modal-content`).hasClass('extra-class')
       ).toEqual(true);
     });
+    it('should render with ref', () => {
+      const ref = React.createRef();
+      mount(
+        <ModalBody className="extra-class" ref={ref}>
+          <p>Test</p>
+        </ModalBody>
+      );
+
+      expect(ref.current).toHaveClass(`${prefix}--modal-content`);
+    });
   });
 });
 
@@ -187,6 +204,13 @@ describe('<ModalFooter />', () => {
       expect(buttonComponents.at(1).props().kind).toBe('secondary');
     });
   });
+
+  it('should render with ref', () => {
+    const ref = React.createRef();
+    mount(<ModalFooter primaryButtonText="test" forwardedRef={ref} />);
+
+    expect(ref.current).toHaveClass(`${prefix}--modal-footer`);
+  });
 });
 
 describe('<ComposedModal />', () => {
@@ -204,6 +228,18 @@ describe('<ComposedModal />', () => {
     expect(wrapper).toMatchSnapshot();
   });
 
+  it('renders with a ref', () => {
+    const ref = React.createRef();
+    mount(<ComposedModal open forwardedRef={ref} />);
+    expect(ref.current).toHaveClass(`${prefix}--modal`);
+  });
+
+  it('renders with a callbackRef', () => {
+    const ref = jest.fn();
+    const wrapper = mount(<ComposedModal open forwardedRef={ref} />);
+    expect(ref).toHaveBeenCalledWith(wrapper.getDOMNode());
+  });
+
   it('changes the open state upon change in props', () => {
     const wrapper = mount(<ComposedModal open />);
     expect(wrapper.state().open).toEqual(true);