Skip to content

Commit

Permalink
Merge branch 'master' into 7685-combobox-warning-state
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Feb 9, 2021
2 parents cca4e05 + f6ecfbf commit 639f32a
Show file tree
Hide file tree
Showing 108 changed files with 4,602 additions and 949 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/fsevents-patch-06bd254f51-f4e06c69cb.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/resolve-patch-bef242007a-ca4e21815c.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 5 additions & 1 deletion config/eslint-config-carbon/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@

module.exports = {
parser: 'babel-eslint',
extends: ['eslint:recommended', require.resolve('./plugins/jsdoc')],
extends: [
'eslint:recommended',
require.resolve('./rules/best-practices'),
require.resolve('./plugins/jsdoc'),
],
rules: {
// Handle cases where we are destructuring but may not be using the initial
// variables
Expand Down
15 changes: 15 additions & 0 deletions config/eslint-config-carbon/rules/best-practices.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* 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.
*/

'use strict';

module.exports = {
rules: {
// @see https://eslint.org/docs/rules/curly
curly: 'error',
},
};
2 changes: 1 addition & 1 deletion config/storybook-preset-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "storybook-preset-carbon",
"private": true,
"version": "0.2.0-rc.0",
"version": "0.2.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
21 changes: 21 additions & 0 deletions docs/migration/11.x-themes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Motion

**Note: everything in this file is a work-in-progress and will be changed.**

## Changes

| Filename | v10 | v11 |
| ------------------ | ----------------------- | ------------------------------------------ |
| `_tokens.scss` | | Deprecated, use Custom Properties directly |
| `_theme-maps.scss` | | Removed, use `_themes.scss` instead |
| `_theme-maps.scss` | `$carbon--theme--white` | `$white` |
| | `$carbon--theme--g10` | `$g10` |
| | `$carbon--theme--g90` | `$g90` |
| | `$carbon--theme--g100` | `$g100` |
| `_mixins.scss` | | Removed, use `_theme.scss` instead |
| `_mixins.scss` | `carbon--theme` | `theme` |

- Theme maps are now available in `scss/_themes.scss` and no longer require a
namespace
- Theme mixin has been simplified, it now emits the given theme as Custom
Properties for the parent selector
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/cli",
"description": "Task automation for working with the Carbon Design System",
"version": "10.19.0-rc.0",
"version": "10.19.0",
"license": "Apache-2.0",
"bin": {
"carbon-cli": "./bin/carbon-cli.js"
Expand Down
12 changes: 9 additions & 3 deletions packages/cli/src/commands/sassdoc/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ function createAnchorLink(name, heading) {
function createMarkdownItem(item) {
let str = '';

if (!item.context) return '';
if (!item.context) {
return '';
}

let status = item.access === 'public' ? '✅' : '❌';

Expand Down Expand Up @@ -160,9 +162,13 @@ $${item.context.name}: ${item.context.value};

if (item.parameter) {
item.parameter.forEach((param) => {
if (paramStr) paramStr += `, `;
if (paramStr) {
paramStr += `, `;
}
paramStr += `$${param.name}`;
if (param.default) paramStr += `: ${param.default}`;
if (param.default) {
paramStr += `: ${param.default}`;
}
});
}

Expand Down
6 changes: 3 additions & 3 deletions packages/colors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/colors",
"description": "Colors for digital and software products using the Carbon Design System",
"version": "10.20.0-rc.0",
"version": "10.20.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,9 +35,9 @@
"clean": "rimraf css es lib umd scss index.scss"
},
"devDependencies": {
"@carbon/cli": "^10.19.0-rc.0",
"@carbon/cli": "^10.19.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/scss-generator": "^10.12.0",
"@carbon/scss-generator": "^10.13.0",
"@carbon/test-utils": "^10.14.0",
"change-case": "^4.1.1",
"core-js": "^3.6.5",
Expand Down
4 changes: 3 additions & 1 deletion packages/components/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ const convertToESMGulpPlugin = () =>
}),
],
onwarn: (warning, handle) => {
if (warning.code !== 'EMPTY_BUNDLE') handle(warning);
if (warning.code !== 'EMPTY_BUNDLE') {
handle(warning);
}
},
})
.then((bundle) => bundle.generate({ format: 'esm' }))
Expand Down
14 changes: 7 additions & 7 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -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.28.0-rc.0",
"version": "10.28.0",
"license": "Apache-2.0",
"main": "umd/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -84,10 +84,10 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.10.0",
"@carbon/cli": "^10.19.0-rc.0",
"@carbon/elements": "^10.27.0-rc.0",
"@carbon/icons-handlebars": "^10.25.0-rc.0",
"@carbon/icons-react": "^10.25.0-rc.0",
"@carbon/cli": "^10.19.0",
"@carbon/elements": "^10.27.0",
"@carbon/icons-handlebars": "^10.25.0",
"@carbon/icons-react": "^10.25.0",
"@carbon/test-utils": "^10.14.0",
"@frctl/fractal": "^1.1.0",
"@rollup/plugin-babel": "^5.2.2",
Expand Down Expand Up @@ -139,7 +139,7 @@
"jasmine-core": "^3.0.0",
"karma": "^4.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.0",
"karma-coverage": "^2.0.3",
"karma-firefox-launcher": "^2.1.0",
"karma-html2js-preprocessor": "^1.1.0",
"karma-ie-launcher": "^1.0.0",
Expand All @@ -149,7 +149,7 @@
"karma-spec-reporter": "0.0.32",
"karma-webpack": "^3.0.0",
"lolex": "^3.0.0",
"markdown-it": "^8.4.0",
"markdown-it": "^12.0.4",
"minimatch": "^3.0.4",
"mkdirp": "^0.5.0",
"mock-raf": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@
background-color: $ui-03;
}

.#{$prefix}--data-table.#{$prefix}--data-table--sort th {
padding: 0;
}

.#{$prefix}--data-table.#{$prefix}--data-table--sort .#{$prefix}--table-sort {
padding-left: $spacing-05;
}

.#{$prefix}--data-table th:last-of-type {
// Do not use `position: relative`, as its behavior is undefined for many table elements: https://www.w3.org/TR/CSS21/visuren.html#propdef-position
position: static;
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/components/list-box/_list-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ $list-box-menu-width: rem(300px);
}

.#{$prefix}--list-box .#{$prefix}--text-input {
min-width: 0;
height: 100%;
}

Expand Down
25 changes: 22 additions & 3 deletions packages/components/src/components/multi-select/_multi-select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,34 @@
color: $text-01;
}

.#{$prefix}--multi-select--filterable {
transition: outline-color $duration--fast-01 motion(standard, productive);
}

.#{$prefix}--multi-select--filterable.#{$prefix}--combo-box
.#{$prefix}--text-input {
background-clip: padding-box;
border: rem(2px) solid transparent;
outline: none;
}

.#{$prefix}--multi-select--filterable--input-focused {
@include focus-outline('outline');
}

.#{$prefix}--multi-select--filterable.#{$prefix}--multi-select--selected
.#{$prefix}--text-input {
padding-left: 0;
}

.#{$prefix}--multi-select--filterable.#{$prefix}--list-box--disabled:hover
.#{$prefix}--text-input {
background-color: $field-01;
}

.#{$prefix}--multi-select--filterable {
.#{$prefix}--multi-select--filterable
.#{$prefix}--list-box__selection--multi {
margin: 0 0 0 $spacing-05;
}
margin: 0 0 0 $spacing-05;
}

.#{$prefix}--multi-select--filterable.#{$prefix}--multi-select--inline,
Expand Down
8 changes: 6 additions & 2 deletions packages/components/tests/pure-modules-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ describe('ES modules', () => {
terser.terser(),
],
onwarn: (warning, handle) => {
if (warning.code !== 'EMPTY_BUNDLE') handle(warning);
if (warning.code !== 'EMPTY_BUNDLE') {
handle(warning);
}
},
treeshake: {
annotations: false,
Expand Down Expand Up @@ -103,7 +105,9 @@ describe('ES modules', () => {
terser.terser(),
],
onwarn: (warning, handle) => {
if (warning.code !== 'EMPTY_BUNDLE') handle(warning);
if (warning.code !== 'EMPTY_BUNDLE') {
handle(warning);
}
},
treeshake: {
annotations: false,
Expand Down
20 changes: 10 additions & 10 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "10.27.0-rc.0",
"version": "10.27.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,17 +35,17 @@
"clean": "rimraf es lib umd && node tasks/clean.js"
},
"dependencies": {
"@carbon/colors": "^10.20.0-rc.0",
"@carbon/grid": "^10.20.0-rc.0",
"@carbon/icons": "^10.25.0-rc.0",
"@carbon/import-once": "^10.5.0",
"@carbon/layout": "^10.18.0-rc.0",
"@carbon/motion": "^10.13.0-rc.0",
"@carbon/themes": "^10.27.0-rc.0",
"@carbon/type": "^10.21.0-rc.0"
"@carbon/colors": "^10.20.0",
"@carbon/grid": "^10.20.0",
"@carbon/icons": "^10.25.0",
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.18.0",
"@carbon/motion": "^10.13.0",
"@carbon/themes": "^10.27.0",
"@carbon/type": "^10.21.0"
},
"devDependencies": {
"@carbon/cli": "^10.19.0-rc.0",
"@carbon/cli": "^10.19.0",
"fs-extra": "^8.1.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^3.4.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/feature-flags/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/feature-flags",
"private": true,
"description": "Build with feature flags in Carbon",
"version": "0.5.0-rc.0",
"version": "0.5.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand All @@ -27,7 +27,7 @@
"devDependencies": {
"@babel/generator": "^7.10.2",
"@babel/types": "^7.10.2",
"@carbon/scss-generator": "^10.12.0",
"@carbon/scss-generator": "^10.13.0",
"fs-extra": "^9.0.1",
"js-yaml": "^3.14.0",
"rimraf": "^3.0.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/grid/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/grid",
"description": "Grid for digital and software products using the Carbon Design System",
"version": "10.20.0-rc.0",
"version": "10.20.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -31,11 +31,11 @@
"clean": "rimraf scss/_inlined scss/vendor"
},
"dependencies": {
"@carbon/import-once": "^10.5.0",
"@carbon/layout": "^10.18.0-rc.0"
"@carbon/import-once": "^10.6.0",
"@carbon/layout": "^10.18.0"
},
"devDependencies": {
"@carbon/cli": "^10.19.0-rc.0",
"@carbon/cli": "^10.19.0",
"rimraf": "^3.0.0"
},
"eyeglass": {
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@carbon/icon-build-helpers",
"private": true,
"description": "Build helpers for the Carbon Design System icon library",
"version": "0.15.0-rc.0",
"version": "0.15.0",
"license": "Apache-2.0",
"main": "src/index.js",
"repository": {
Expand All @@ -25,7 +25,7 @@
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@carbon/cli-reporter": "^10.4.0",
"@carbon/icon-helpers": "^10.13.0-rc.0",
"@carbon/icon-helpers": "^10.13.0",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-replace": "^2.3.4",
"browserslist-config-carbon": "^10.6.0",
Expand Down
11 changes: 8 additions & 3 deletions packages/icon-build-helpers/src/builders/plugins/virtual.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,18 @@ module.exports = function virtual(modules) {
name: 'virtual',

resolveId(id, importer) {
if (id in modules) return PREFIX + id;
if (id in modules) {
return PREFIX + id;
}

if (importer) {
if (importer.startsWith(PREFIX))
if (importer.startsWith(PREFIX)) {
importer = importer.slice(PREFIX.length);
}
const resolved = path.resolve(path.dirname(importer), id);
if (resolvedIds.has(resolved)) return PREFIX + resolved;
if (resolvedIds.has(resolved)) {
return PREFIX + resolved;
}
}
},

Expand Down
4 changes: 2 additions & 2 deletions packages/icon-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/icon-helpers",
"description": "Helpers used alongside icons for digital and software products using the Carbon Design System",
"version": "10.13.0-rc.0",
"version": "10.13.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"clean": "rimraf es lib umd"
},
"devDependencies": {
"@carbon/cli": "^10.19.0-rc.0",
"@carbon/cli": "^10.19.0",
"rimraf": "^3.0.0"
},
"sideEffects": false
Expand Down
Loading

0 comments on commit 639f32a

Please sign in to comment.