Merge branch 'main' into expand-table-size-variations

.github/CONTRIBUTING.md

@@ -98,7 +98,7 @@ To create a new branch, ensure you are in your forked branch in your terminal
 and run:
 
 ```sh
-git pull origin master
+git pull origin main
 git checkout -b {your-branch-name}
 ```
 
@@ -137,7 +137,7 @@ http://localhost:9000 to see the changes happen on the fly.
 
 For information about our coding style, such as how we name our classes and our
 file structure, go to our
-[developer handbook](https://github.com/carbon-design-system/carbon/blob/master/docs/developer-handbook.md#coding-style)
+[developer handbook](https://github.com/carbon-design-system/carbon/blob/main/docs/developer-handbook.md#coding-style)
 
 ### 6. Test your JavaScript code
 
@@ -149,7 +149,7 @@ yarn test
 ```
 
 For more extensive testing information, see our
-[developer handbook](https://github.com/carbon-design-system/carbon/blob/master/docs/developer-handbook.md#common-tasks)
+[developer handbook](https://github.com/carbon-design-system/carbon/blob/main/docs/developer-handbook.md#common-tasks)
 
 ### 7. Add yourself to the contributor list
 
@@ -203,7 +203,7 @@ git commit -m "YOUR  COMMIT MESSAGE HERE"
 
 For more information about how to write your commit message, view our commit
 conventions detailed in a our
-[developer handbook](https://github.com/carbon-design-system/carbon/blob/master/docs/developer-handbook.md#commit-conventions).
+[developer handbook](https://github.com/carbon-design-system/carbon/blob/main/docs/developer-handbook.md#commit-conventions).
 
 After your changes are committed, run:
 
@@ -295,23 +295,23 @@ Here are some contribution quick tips:
 
 ### What projects can I contribute to?
 
-- [`carbon-components`](https://github.com/carbon-design-system/carbon/tree/master/packages/components)
-- [`carbon-components-react`](https://github.com/carbon-design-system/carbon/tree/master/packages/react)
+- [`carbon-components`](https://github.com/carbon-design-system/carbon/tree/main/packages/components)
+- [`carbon-components-react`](https://github.com/carbon-design-system/carbon/tree/main/packages/react)
 - [`carbon-website`](https://github.com/carbon-design-system/carbon-website)
 - [`gatsby-theme-carbon`](https://github.com/carbon-design-system/gatsby-theme-carbon)
 - [`carbon-design-kit`](https://github.com/carbon-design-system/carbon-design-kit)
-- [`@carbon/elements`](https://github.com/carbon-design-system/carbon/tree/master/packages/elements)
-- [`@carbon/type`](https://github.com/carbon-design-system/carbon/tree/master/packages/type)
-- [`@carbon/colors`](https://github.com/carbon-design-system/carbon/tree/master/packages/colors)
-- [`@carbon/grid`](https://github.com/carbon-design-system/carbon/tree/master/packages/grid)
-- [`@carbon/icons`](https://github.com/carbon-design-system/carbon/tree/master/packages/icons)
-- [`@carbon/layout`](https://github.com/carbon-design-system/carbon/tree/master/packages/layout)
-- [`@carbon/motion`](https://github.com/carbon-design-system/carbon/tree/master/packages/motion)
-- [`@carbon/themes`](https://github.com/carbon-design-system/carbon/tree/master/packages/themes)
-- [`@carbon/icons-react`](https://github.com/carbon-design-system/carbon/tree/master/packages/icons-react)
+- [`@carbon/elements`](https://github.com/carbon-design-system/carbon/tree/main/packages/elements)
+- [`@carbon/type`](https://github.com/carbon-design-system/carbon/tree/main/packages/type)
+- [`@carbon/colors`](https://github.com/carbon-design-system/carbon/tree/main/packages/colors)
+- [`@carbon/grid`](https://github.com/carbon-design-system/carbon/tree/main/packages/grid)
+- [`@carbon/icons`](https://github.com/carbon-design-system/carbon/tree/main/packages/icons)
+- [`@carbon/layout`](https://github.com/carbon-design-system/carbon/tree/main/packages/layout)
+- [`@carbon/motion`](https://github.com/carbon-design-system/carbon/tree/main/packages/motion)
+- [`@carbon/themes`](https://github.com/carbon-design-system/carbon/tree/main/packages/themes)
+- [`@carbon/icons-react`](https://github.com/carbon-design-system/carbon/tree/main/packages/icons-react)
 
 And more! You can view a complete list of our packages
-[here](https://github.com/carbon-design-system/carbon/tree/master/packages).
+[here](https://github.com/carbon-design-system/carbon/tree/main/packages).
 
 ### Besides some of the obvious contributions mentioned above, how else can I contribute?
 

.github/ISSUE_TEMPLATE/accessibility-issue.md

@@ -42,9 +42,9 @@ assignees: ''
 > Please create a reduced test case in CodeSandbox
 >
 > - Style and vanilla JS:
->   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/master/packages/components/examples/codesandbox
+>   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/main/packages/components/examples/codesandbox
 > - React:
->   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/master/packages/react/examples/codesandbox
+>   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/main/packages/react/examples/codesandbox
 
 ## Additional information
 

.github/ISSUE_TEMPLATE/bug-report.md

@@ -48,9 +48,9 @@ assignees: ''
 > Please create a reduced test case in CodeSandbox
 >
 > - Style and vanilla JS:
->   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/master/packages/components/examples/codesandbox
+>   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/main/packages/components/examples/codesandbox
 > - React:
->   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/master/packages/react/examples/codesandbox
+>   https://codesandbox.io/s/github/carbon-design-system/carbon/tree/main/packages/react/examples/codesandbox
 
 ## Additional information
 

docs/developer-handbook.md

@@ -706,7 +706,7 @@ pattern that we tend to use:
 ```jsx
 // SomeComponent.js
 // React imports
-import warning from 'warning';
+import { warning } from '../../internal/warning';
 
 let didWarnAboutDeprecation = false;
 

e2e/icons-react/__snapshots__/PublicAPI-test.js.snap

@@ -4491,6 +4491,10 @@ Array [
   "Scan20",
   "Scan24",
   "Scan32",
+  "ScanDisabled16",
+  "ScanDisabled20",
+  "ScanDisabled24",
+  "ScanDisabled32",
   "ScatterMatrix16",
   "ScatterMatrix20",
   "ScatterMatrix24",
@@ -5495,6 +5499,10 @@ Array [
   "User20",
   "User24",
   "User32",
+  "UserAccess16",
+  "UserAccess20",
+  "UserAccess24",
+  "UserAccess32",
   "UserActivity16",
   "UserActivity20",
   "UserActivity24",

e2e/icons-vue/__snapshots__/PublicAPI-test.js.snap

@@ -4491,6 +4491,10 @@ Array [
   "Scan20",
   "Scan24",
   "Scan32",
+  "ScanDisabled16",
+  "ScanDisabled20",
+  "ScanDisabled24",
+  "ScanDisabled32",
   "ScatterMatrix16",
   "ScatterMatrix20",
   "ScatterMatrix24",
@@ -5495,6 +5499,10 @@ Array [
   "User20",
   "User24",
   "User32",
+  "UserAccess16",
+  "UserAccess20",
+  "UserAccess24",
+  "UserAccess32",
   "UserActivity16",
   "UserActivity20",
   "UserActivity24",

e2e/icons/__snapshots__/PublicAPI-test.js.snap

@@ -4491,6 +4491,10 @@ Array [
   "Scan20",
   "Scan24",
   "Scan32",
+  "ScanDisabled16",
+  "ScanDisabled20",
+  "ScanDisabled24",
+  "ScanDisabled32",
   "ScatterMatrix16",
   "ScatterMatrix20",
   "ScatterMatrix24",
@@ -5495,6 +5499,10 @@ Array [
   "User20",
   "User24",
   "User32",
+  "UserAccess16",
+  "UserAccess20",
+  "UserAccess24",
+  "UserAccess32",
   "UserActivity16",
   "UserActivity20",
   "UserActivity24",

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/cli",
   "description": "Task automation for working with the Carbon Design System",
-  "version": "10.20.0",
+  "version": "10.21.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"

packages/cli/src/git.js

@@ -30,7 +30,7 @@ async function fetchLatestFromUpstream() {
       'git@github.com:carbon-design-system/carbon.git',
     ]);
   }
-  await execa('git', ['fetch', 'upstream', 'master', '--tags']);
+  await execa('git', ['fetch', 'upstream', 'main', '--tags']);
 }
 
 module.exports = {

packages/colors/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/colors",
   "description": "Colors for digital and software products using the Carbon Design System",
-  "version": "10.21.0",
+  "version": "10.22.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -35,7 +35,7 @@
     "clean": "rimraf css es lib umd scss index.scss"
   },
   "devDependencies": {
-    "@carbon/cli": "^10.20.0",
+    "@carbon/cli": "^10.21.0",
     "@carbon/cli-reporter": "^10.4.0",
     "@carbon/scss-generator": "^10.13.0",
     "@carbon/test-utils": "^10.15.0",

packages/components/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carbon-components",
   "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
-  "version": "10.30.0",
+  "version": "10.31.0",
   "license": "Apache-2.0",
   "main": "umd/index.js",
   "module": "es/index.js",
@@ -84,10 +84,10 @@
     "@babel/preset-env": "^7.10.0",
     "@babel/preset-react": "^7.10.0",
     "@babel/runtime": "^7.10.0",
-    "@carbon/cli": "^10.20.0",
-    "@carbon/elements": "^10.29.0",
-    "@carbon/icons-handlebars": "^10.27.0",
-    "@carbon/icons-react": "^10.27.0",
+    "@carbon/cli": "^10.21.0",
+    "@carbon/elements": "^10.30.0",
+    "@carbon/icons-handlebars": "^10.28.0",
+    "@carbon/icons-react": "^10.28.0",
     "@carbon/test-utils": "^10.15.0",
     "@frctl/fractal": "^1.1.0",
     "@rollup/plugin-babel": "^5.2.2",

packages/components/src/components/accordion/_accordion.scss

@@ -98,11 +98,11 @@
 
   .#{$prefix}--accordion__item--disabled,
   .#{$prefix}--accordion__item--disabled + .#{$prefix}--accordion__item {
-    border-top: 1px solid $disabled-01;
+    border-top: 1px solid $disabled-02;
   }
 
   li.#{$prefix}--accordion__item--disabled:last-of-type {
-    border-bottom: 1px solid $disabled-01;
+    border-bottom: 1px solid $disabled-02;
   }
 
   .#{$prefix}--accordion__arrow {

packages/components/src/components/button/_button.scss

@@ -162,6 +162,12 @@
     }
   }
 
+  // Allow pointer events on tooltip when tooltip is visible
+  .#{$prefix}--btn.#{$prefix}--btn--icon-only:not(.#{$prefix}--tooltip--hidden)
+    .#{$prefix}--assistive-text {
+    pointer-events: all;
+  }
+
   .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:focus {
     border-color: $focus;
 

packages/components/src/components/checkbox/_checkbox.scss

@@ -99,7 +99,7 @@
   .#{$prefix}--checkbox-label::after {
     position: absolute;
     top: rem(8px);
-    left: rem(6px);
+    left: rem(7px);
     width: rem(9px);
     height: rem(5px);
     margin-top: rem(-3px) #{'/*rtl:0rem*/'};

packages/components/src/components/code-snippet/_code-snippet.scss

@@ -197,20 +197,19 @@
     }
   }
 
-  //closed snippet container
+  //collapsed snippet container
   .#{$prefix}--snippet--multi .#{$prefix}--snippet-container {
     position: relative;
     order: 1;
     min-height: rem(56px);
-    max-height: rem(238px);
-    overflow: hidden;
+    max-height: 100%;
+    overflow-y: auto;
     transition: max-height $duration--moderate-01 motion(standard, productive);
   }
 
   // expanded snippet container
   .#{$prefix}--snippet--multi.#{$prefix}--snippet--expand
     .#{$prefix}--snippet-container {
-    max-height: 100%;
     padding-bottom: $spacing-05;
     transition: max-height $duration--moderate-01 motion(standard, productive);
   }
@@ -220,7 +219,7 @@
     word-wrap: break-word;
   }
 
-  // closed pre
+  // collapsed pre
   .#{$prefix}--snippet--multi .#{$prefix}--snippet-container pre {
     padding-right: $carbon--spacing-08;
     padding-bottom: rem(24px);