diff --git a/config/stylelint-config-carbon/package.json b/config/stylelint-config-carbon/package.json index cbaff6f2f82e..18c4b90189f3 100644 --- a/config/stylelint-config-carbon/package.json +++ b/config/stylelint-config-carbon/package.json @@ -1,7 +1,7 @@ { "name": "stylelint-config-carbon", "description": "Stylelint configuration for Carbon", - "version": "1.2.0-rc.0", + "version": "1.2.0", "license": "Apache-2.0", "main": "index.js", "repository": "https://github.com/carbon-design-system/carbon/tree/master/config/stylelint-config-carbon", diff --git a/package.json b/package.json index eb6c95814e15..fd8c6e2adfef 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,8 @@ "perf", "refactor", "revert", - "test" + "test", + "style" ] ] } diff --git a/packages/colors/package.json b/packages/colors/package.json index 8a5918fda4b8..ed013d0445cd 100644 --- a/packages/colors/package.json +++ b/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.14.0-rc.0", + "version": "10.14.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index b0b6bbe924ba..7433a02c4f32 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -25001,6 +25001,13 @@ Tile styles &:focus { @include focus-outline('outline'); + + // Windows, Firefox HCM Fix + @media screen and (-ms-high-contrast: active), + screen and (prefers-contrast) { + outline: 3px solid transparent; + outline-offset: -3px; + } } } @@ -25084,6 +25091,13 @@ Tile styles transform-origin: center; transition: $duration--fast-02 motion(standard, productive); fill: $ui-05; + + // Windows, Firefox HCM Fix + @media screen and (-ms-high-contrast: active), + screen and (prefers-contrast) { + // `ButtonText` is a CSS2 system color to help improve colors in HCM + fill: ButtonText; + } } &:hover { @@ -25147,6 +25161,13 @@ Tile styles > .#{$prefix}--tile__checkmark svg { fill: $ui-05; + + // Windows, Firefox HCM Fix + @media screen and (-ms-high-contrast: active), + screen and (prefers-contrast) { + // `ButtonText` is a CSS2 system color to help improve colors in HCM + fill: ButtonText; + } } .#{$prefix}--tile-content { @@ -25691,7 +25712,7 @@ Toggle styles .#{$prefix}--toggle-input--small:disabled:checked + .#{$prefix}--toggle-input__label .#{$prefix}--toggle__check { - fill: $disabled-02; + fill: $disabled-01; } //---------------------------------------------- diff --git a/packages/components/package.json b/packages/components/package.json index 39728d56d2ca..164691d1b48e 100644 --- a/packages/components/package.json +++ b/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.21.0-rc.1", + "version": "10.21.0", "license": "Apache-2.0", "main": "umd/index.js", "module": "es/index.js", @@ -79,9 +79,9 @@ "@babel/preset-env": "^7.10.0", "@babel/preset-react": "^7.10.0", "@babel/runtime": "^7.10.0", - "@carbon/elements": "^10.20.0-rc.0", - "@carbon/icons-handlebars": "^10.19.0-rc.0", - "@carbon/icons-react": "^10.19.0-rc.0", + "@carbon/elements": "^10.20.0", + "@carbon/icons-handlebars": "^10.19.0", + "@carbon/icons-react": "^10.19.0", "@carbon/test-utils": "^10.11.0", "@frctl/fractal": "^1.1.0", "adaro": "1.0.4", diff --git a/packages/components/src/components/content-switcher/_content-switcher.scss b/packages/components/src/components/content-switcher/_content-switcher.scss index 0c42251f3c97..63c1de491ab8 100644 --- a/packages/components/src/components/content-switcher/_content-switcher.scss +++ b/packages/components/src/components/content-switcher/_content-switcher.scss @@ -48,7 +48,8 @@ &:focus { z-index: 3; - box-shadow: inset 0 0 0 2px $focus; + border-color: $focus; + box-shadow: inset 0 0 0 2px $focus, inset 0 0 0 3px $ui-01; } &:hover { diff --git a/packages/components/src/components/tile/_tile.scss b/packages/components/src/components/tile/_tile.scss index 6d577922b78a..2d8a8d27e6c5 100644 --- a/packages/components/src/components/tile/_tile.scss +++ b/packages/components/src/components/tile/_tile.scss @@ -30,6 +30,13 @@ &:focus { @include focus-outline('outline'); + + // Windows, Firefox HCM Fix + @media screen and (-ms-high-contrast: active), + screen and (prefers-contrast) { + outline: 3px solid transparent; + outline-offset: -3px; + } } } @@ -113,6 +120,13 @@ transform-origin: center; transition: $duration--fast-02 motion(standard, productive); fill: $ui-05; + + // Windows, Firefox HCM Fix + @media screen and (-ms-high-contrast: active), + screen and (prefers-contrast) { + // `ButtonText` is a CSS2 system color to help improve colors in HCM + fill: ButtonText; + } } &:hover { @@ -176,6 +190,13 @@ > .#{$prefix}--tile__checkmark svg { fill: $ui-05; + + // Windows, Firefox HCM Fix + @media screen and (-ms-high-contrast: active), + screen and (prefers-contrast) { + // `ButtonText` is a CSS2 system color to help improve colors in HCM + fill: ButtonText; + } } .#{$prefix}--tile-content { diff --git a/packages/components/src/components/toggle/_toggle.scss b/packages/components/src/components/toggle/_toggle.scss index b2cc4a28edaf..d8d78caca162 100644 --- a/packages/components/src/components/toggle/_toggle.scss +++ b/packages/components/src/components/toggle/_toggle.scss @@ -440,7 +440,7 @@ .#{$prefix}--toggle-input--small:disabled:checked + .#{$prefix}--toggle-input__label .#{$prefix}--toggle__check { - fill: $disabled-02; + fill: $disabled-01; } //---------------------------------------------- diff --git a/packages/elements/package.json b/packages/elements/package.json index 79528855071a..ef88cb14b0b0 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/elements", "description": "A collection of design elements in code for the IBM Design Language", - "version": "10.20.0-rc.0", + "version": "10.20.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -31,13 +31,13 @@ "clean": "rimraf es lib umd && node tasks/clean.js" }, "dependencies": { - "@carbon/colors": "^10.14.0-rc.0", + "@carbon/colors": "^10.14.0", "@carbon/grid": "^10.15.0", - "@carbon/icons": "^10.19.0-rc.0", + "@carbon/icons": "^10.19.0", "@carbon/import-once": "^10.3.0", "@carbon/layout": "^10.13.0", "@carbon/motion": "^10.9.0", - "@carbon/themes": "^10.20.0-rc.0", + "@carbon/themes": "^10.20.0", "@carbon/type": "^10.16.0" }, "devDependencies": { diff --git a/packages/icons-handlebars/package.json b/packages/icons-handlebars/package.json index 41f0c69f983e..b27d1d9c5ded 100644 --- a/packages/icons-handlebars/package.json +++ b/packages/icons-handlebars/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-handlebars", "description": "Handlebars helpers for IBM Design Language icons in digital and software products using the Carbon Design System", - "version": "10.19.0-rc.0", + "version": "10.19.0", "license": "Apache-2.0", "main": "index.js", "repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/icons-handlebars", @@ -23,7 +23,7 @@ }, "dependencies": { "@carbon/icon-helpers": "^10.9.0", - "@carbon/icons": "^10.19.0-rc.0" + "@carbon/icons": "^10.19.0" }, "devDependencies": { "handlebars": "^4.0.12" diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json index a9483670dcc3..4580f1ca5c6c 100644 --- a/packages/icons-react/package.json +++ b/packages/icons-react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-react", "description": "React components for icons in digital and software products using the Carbon Design System", - "version": "10.19.0-rc.0", + "version": "10.19.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ }, "devDependencies": { "@carbon/icon-build-helpers": "^0.11.0", - "@carbon/icons": "^10.19.0-rc.0" + "@carbon/icons": "^10.19.0" }, "sideEffects": false } diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json index 8c68f602ce09..2b5b9b235864 100644 --- a/packages/icons-vue/package.json +++ b/packages/icons-vue/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-vue", "description": "Vue components for icons in digital and software products using the Carbon Design System", - "version": "10.19.0-rc.0", + "version": "10.19.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -28,7 +28,7 @@ }, "devDependencies": { "@carbon/cli-reporter": "^10.3.0", - "@carbon/icons": "^10.19.0-rc.0", + "@carbon/icons": "^10.19.0", "fs-extra": "^8.1.0", "prettier": "^2.1.0", "rimraf": "^3.0.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index d2eb55c7bf58..4c322b5f6c8c 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons", "description": "Icons for digital and software products using the Carbon Design System", - "version": "10.19.0-rc.0", + "version": "10.19.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index 00e5911e73ff..7e001f5b056b 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/react-hooks", "private": true, - "version": "10.15.0-rc.1", + "version": "10.15.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -39,7 +39,7 @@ "autoprefixer": "^9.7.4", "babel-loader": "^8.1.0", "browserslist-config-carbon": "^10.5.0", - "carbon-components": "^10.21.0-rc.1", + "carbon-components": "^10.21.0", "css-loader": "^3.4.2", "node-sass": "^4.13.1", "postcss-loader": "^3.0.0", diff --git a/packages/react/package.json b/packages/react/package.json index 15a91ac21b3f..37eccb892087 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "carbon-components-react", "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.", - "version": "7.21.0-rc.1", + "version": "7.21.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -39,7 +39,7 @@ "react-dom": "^16.8.6" }, "dependencies": { - "@carbon/icons-react": "^10.19.0-rc.0", + "@carbon/icons-react": "^10.19.0", "classnames": "2.2.6", "downshift": "5.2.1", "flatpickr": "4.6.1", @@ -84,7 +84,7 @@ "babel-plugin-react-docgen": "^4.0.0", "babel-plugin-transform-inline-environment-variables": "^0.4.0", "browserslist-config-carbon": "^10.5.0", - "carbon-components": "^10.21.0-rc.1", + "carbon-components": "^10.21.0", "carbon-icons": "^7.0.5", "chalk": "^2.3.0", "cli-table": "^0.3.0", diff --git a/packages/react/src/components/TreeView/TreeNode.js b/packages/react/src/components/TreeView/TreeNode.js index 4505f60477de..e6e4d4fb3881 100644 --- a/packages/react/src/components/TreeView/TreeNode.js +++ b/packages/react/src/components/TreeView/TreeNode.js @@ -171,6 +171,7 @@ export default function TreeNode({ const treeNodeProps = { ...rest, + ['aria-current']: isActive || null, ['aria-selected']: disabled ? null : isSelected, ['aria-disabled']: disabled, className: treeNodeClasses, diff --git a/packages/react/src/components/TreeView/TreeView.js b/packages/react/src/components/TreeView/TreeView.js index 3d25b4bf68aa..994253c157e7 100644 --- a/packages/react/src/components/TreeView/TreeView.js +++ b/packages/react/src/components/TreeView/TreeView.js @@ -161,6 +161,7 @@ export default function TreeView({ {...rest} aria-label={hideLabel ? label : null} aria-labelledby={!hideLabel ? labelId : null} + aria-multiselectable={multiselect || null} className={treeClasses} onKeyDown={handleKeyDown} ref={treeRootRef} diff --git a/packages/react/src/components/TreeView/__snapshots__/TreeView-test.js.snap b/packages/react/src/components/TreeView/__snapshots__/TreeView-test.js.snap index 8e908c5edf78..ac1115c7aefe 100644 --- a/packages/react/src/components/TreeView/__snapshots__/TreeView-test.js.snap +++ b/packages/react/src/components/TreeView/__snapshots__/TreeView-test.js.snap @@ -21,6 +21,7 @@ exports[`TreeView should render 1`] = `