Skip to content

Commit ff418f4

Browse files
kodiakhq[bot]kodiakhq[bot]
authored
Merge branch 'main' into HCM-updates
2 parents 3da2632 + ee650df commit ff418f4

File tree

23 files changed

+113
-108
lines changed

23 files changed

+113
-108
lines changed

‎config/storybook-preset-carbon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "storybook-preset-carbon",
33
"private": true,
4-
"version": "0.5.0-rc.0",
4+
"version": "0.5.0",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"repository": {

‎config/stylelint-config-carbon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "stylelint-config-carbon",
33
"description": "Stylelint configuration for Carbon",
4-
"version": "1.4.0",
4+
"version": "1.5.0",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"repository": {

‎packages/carbon-react/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@carbon/react",
33
"private": true,
44
"description": "React components for the Carbon Design System",
5-
"version": "0.2.0-rc.0",
5+
"version": "0.2.0",
66
"license": "Apache-2.0",
77
"main": "lib/index.js",
88
"module": "es/index.js",
@@ -39,10 +39,10 @@
3939
},
4040
"dependencies": {
4141
"@carbon/feature-flags": "^0.3.0",
42-
"@carbon/icons-react": "^10.31.0-rc.0",
43-
"@carbon/styles": "^0.5.0-rc.0",
42+
"@carbon/icons-react": "^10.31.0",
43+
"@carbon/styles": "^0.5.0",
4444
"@carbon/telemetry": "0.0.0-alpha.6",
45-
"carbon-components-react": "^7.34.0-rc.0"
45+
"carbon-components-react": "^7.34.0"
4646
},
4747
"devDependencies": {
4848
"@babel/core": "^7.13.14",

‎packages/colors/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/colors",
33
"description": "Colors for digital and software products using the Carbon Design System",
4-
"version": "10.24.0-rc.0",
4+
"version": "10.24.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",

‎packages/components/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "carbon-components",
33
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
4-
"version": "10.34.0-rc.0",
4+
"version": "10.34.0",
55
"license": "Apache-2.0",
66
"main": "umd/index.js",
77
"module": "es/index.js",
@@ -85,9 +85,9 @@
8585
"@babel/preset-react": "^7.10.0",
8686
"@babel/runtime": "^7.10.0",
8787
"@carbon/cli": "^10.22.0",
88-
"@carbon/elements": "^10.33.0-rc.0",
89-
"@carbon/icons-handlebars": "^10.30.0",
90-
"@carbon/icons-react": "^10.31.0-rc.0",
88+
"@carbon/elements": "^10.33.0",
89+
"@carbon/icons-handlebars": "^10.31.0",
90+
"@carbon/icons-react": "^10.31.0",
9191
"@carbon/test-utils": "^10.15.0",
9292
"@frctl/fractal": "^1.1.0",
9393
"@rollup/plugin-babel": "^5.2.2",

‎packages/elements/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/elements",
33
"description": "A collection of design elements in code for the IBM Design Language",
4-
"version": "10.33.0-rc.0",
4+
"version": "10.33.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -35,14 +35,14 @@
3535
"clean": "rimraf es lib umd && node tasks/clean.js"
3636
},
3737
"dependencies": {
38-
"@carbon/colors": "^10.24.0-rc.0",
39-
"@carbon/grid": "^10.26.0-rc.0",
40-
"@carbon/icons": "^10.30.0",
38+
"@carbon/colors": "^10.24.0",
39+
"@carbon/grid": "^10.26.0",
40+
"@carbon/icons": "^10.31.0",
4141
"@carbon/import-once": "^10.6.0",
4242
"@carbon/layout": "^10.23.0",
43-
"@carbon/motion": "^10.17.0-rc.0",
44-
"@carbon/themes": "^10.33.0-rc.0",
45-
"@carbon/type": "^10.27.0-rc.0"
43+
"@carbon/motion": "^10.17.0",
44+
"@carbon/themes": "^10.33.0",
45+
"@carbon/type": "^10.27.0"
4646
},
4747
"devDependencies": {
4848
"@carbon/cli": "^10.22.0",

‎packages/grid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/grid",
33
"description": "Grid for digital and software products using the Carbon Design System",
4-
"version": "10.26.0-rc.0",
4+
"version": "10.26.0",
55
"license": "Apache-2.0",
66
"repository": {
77
"type": "git",

‎packages/icon-build-helpers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@carbon/icon-build-helpers",
33
"private": true,
44
"description": "Build helpers for the Carbon Design System icon library",
5-
"version": "0.19.0",
5+
"version": "0.20.0",
66
"license": "Apache-2.0",
77
"main": "src/index.js",
88
"repository": {

‎packages/icons-handlebars/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/icons-handlebars",
33
"description": "Handlebars helpers for IBM Design Language icons in digital and software products using the Carbon Design System",
4-
"version": "10.30.0",
4+
"version": "10.31.0",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"repository": {
@@ -27,7 +27,7 @@
2727
},
2828
"dependencies": {
2929
"@carbon/icon-helpers": "^10.16.0",
30-
"@carbon/icons": "^10.30.0"
30+
"@carbon/icons": "^10.31.0"
3131
},
3232
"devDependencies": {
3333
"handlebars": "^4.0.12"

‎packages/icons-react/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/icons-react",
33
"description": "React components for icons in digital and software products using the Carbon Design System",
4-
"version": "10.31.0-rc.0",
4+
"version": "10.31.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -43,8 +43,8 @@
4343
"prop-types": "^15.7.2"
4444
},
4545
"devDependencies": {
46-
"@carbon/icon-build-helpers": "^0.19.0",
47-
"@carbon/icons": "^10.30.0",
46+
"@carbon/icon-build-helpers": "^0.20.0",
47+
"@carbon/icons": "^10.31.0",
4848
"rimraf": "^3.0.2"
4949
},
5050
"sideEffects": false

‎packages/icons-vue/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/icons-vue",
33
"description": "Vue components for icons in digital and software products using the Carbon Design System",
4-
"version": "10.30.0",
4+
"version": "10.31.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -32,7 +32,7 @@
3232
},
3333
"devDependencies": {
3434
"@carbon/cli-reporter": "^10.4.0",
35-
"@carbon/icons": "^10.30.0",
35+
"@carbon/icons": "^10.31.0",
3636
"fs-extra": "^8.1.0",
3737
"prettier": "^2.2.1",
3838
"rimraf": "^3.0.0",

‎packages/icons/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/icons",
33
"description": "Icons for digital and software products using the Carbon Design System",
4-
"version": "10.30.0",
4+
"version": "10.31.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@carbon/cli": "^10.22.0",
42-
"@carbon/icon-build-helpers": "^0.19.0",
42+
"@carbon/icon-build-helpers": "^0.20.0",
4343
"rimraf": "^3.0.2"
4444
}
4545
}

‎packages/motion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/motion",
33
"description": "Motion helpers for digital and software products using the Carbon Design System",
4-
"version": "10.17.0-rc.0",
4+
"version": "10.17.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",

‎packages/pictograms-react/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/pictograms-react",
33
"description": "React components for pictograms in digital and software products using the Carbon Design System",
4-
"version": "11.9.0-rc.0",
4+
"version": "11.9.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -42,8 +42,8 @@
4242
"prop-types": "^15.7.2"
4343
},
4444
"devDependencies": {
45-
"@carbon/icon-build-helpers": "^0.19.0",
46-
"@carbon/pictograms": "^11.9.0-rc.0"
45+
"@carbon/icon-build-helpers": "^0.20.0",
46+
"@carbon/pictograms": "^11.9.0"
4747
},
4848
"sideEffects": false
4949
}

‎packages/pictograms/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/pictograms",
33
"description": "Pictograms for digital and software products using the Carbon Design System",
4-
"version": "11.9.0-rc.0",
4+
"version": "11.9.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -31,7 +31,7 @@
3131
"prepublishOnly": "yarn build"
3232
},
3333
"devDependencies": {
34-
"@carbon/icon-build-helpers": "^0.19.0",
34+
"@carbon/icon-build-helpers": "^0.20.0",
3535
"rimraf": "^3.0.0"
3636
}
3737
}

‎packages/react/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "carbon-components-react",
33
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
4-
"version": "7.34.0-rc.0",
4+
"version": "7.34.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -45,7 +45,7 @@
4545
},
4646
"dependencies": {
4747
"@carbon/feature-flags": "^0.3.0",
48-
"@carbon/icons-react": "^10.31.0-rc.0",
48+
"@carbon/icons-react": "^10.31.0",
4949
"@carbon/telemetry": "0.0.0-alpha.6",
5050
"classnames": "2.3.1",
5151
"copy-to-clipboard": "^3.3.1",
@@ -90,7 +90,7 @@
9090
"babel-plugin-react-docgen": "^4.2.1",
9191
"babel-plugin-transform-inline-environment-variables": "^0.4.0",
9292
"browserslist-config-carbon": "^10.6.1",
93-
"carbon-components": "^10.34.0-rc.0",
93+
"carbon-components": "^10.34.0",
9494
"carbon-icons": "^7.0.5",
9595
"chalk": "^2.3.0",
9696
"cli-table": "^0.3.0",
@@ -116,7 +116,7 @@
116116
"rollup-plugin-strip-banner": "^2.0.0",
117117
"rollup-plugin-terser": "^7.0.2",
118118
"rtlcss": "^2.4.0",
119-
"storybook-preset-carbon": "^0.5.0-rc.0",
119+
"storybook-preset-carbon": "^0.5.0",
120120
"string-replace-loader": "^2.1.0",
121121
"terser-webpack-plugin": "^2.3.2",
122122
"webpack": "^4.41.5",

‎packages/react/src/components/ComboBox/ComboBox.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ const ComboBox = (props) => {
113113
);
114114
const [prevSelectedItem, setPrevSelectedItem] = useState(null);
115115
const [doneInitialSelectedItem, setDoneInitialSelectedItem] = useState(null);
116+
const savedOnInputChange = useRef(onInputChange);
116117

117118
if (!doneInitialSelectedItem || prevSelectedItem !== selectedItem) {
118119
setDoneInitialSelectedItem(true);
@@ -147,10 +148,14 @@ const ComboBox = (props) => {
147148
};
148149

149150
useEffect(() => {
150-
if (onInputChange) {
151-
onInputChange(inputValue);
151+
savedOnInputChange.current = onInputChange;
152+
}, [onInputChange]);
153+
154+
useEffect(() => {
155+
if (savedOnInputChange.current) {
156+
savedOnInputChange.current(inputValue);
152157
}
153-
});
158+
}, [inputValue]);
154159

155160
const handleSelectionClear = () => {
156161
if (textInput?.current) {
@@ -267,7 +272,7 @@ const ComboBox = (props) => {
267272
event.stopPropagation();
268273
}
269274

270-
if (match(event, keys.Enter)) {
275+
if (match(event, keys.Enter) && !inputValue) {
271276
toggleMenu();
272277
}
273278
},

‎packages/sketch/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@carbon/sketch",
33
"private": true,
44
"description": "Tooling for generating a sketch plugin to bring code to design",
5-
"version": "10.32.0-rc.0",
5+
"version": "10.32.0",
66
"license": "Apache-2.0",
77
"repository": {
88
"type": "git",
@@ -29,11 +29,11 @@
2929
},
3030
"dependencies": {
3131
"@babel/polyfill": "^7.8.7",
32-
"@carbon/colors": "^10.24.0-rc.0",
32+
"@carbon/colors": "^10.24.0",
3333
"@carbon/icon-helpers": "^10.16.0",
34-
"@carbon/icons": "^10.30.0",
35-
"@carbon/themes": "^10.33.0-rc.0",
36-
"@carbon/type": "^10.27.0-rc.0",
34+
"@carbon/icons": "^10.31.0",
35+
"@carbon/themes": "^10.33.0",
36+
"@carbon/type": "^10.27.0",
3737
"@skpm/builder": "^0.7.0",
3838
"color-string": "^1.5.3",
3939
"skpm": "^1.2.0"

‎packages/styles/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@carbon/styles",
33
"private": true,
44
"description": "Styles for the Carbon Design System",
5-
"version": "0.5.0-rc.0",
5+
"version": "0.5.0",
66
"license": "Apache-2.0",
77
"repository": {
88
"type": "git",
@@ -18,13 +18,13 @@
1818
"react"
1919
],
2020
"dependencies": {
21-
"@carbon/colors": "^10.24.0-rc.0",
21+
"@carbon/colors": "^10.24.0",
2222
"@carbon/feature-flags": "^0.3.0",
23-
"@carbon/grid": "^10.26.0-rc.0",
23+
"@carbon/grid": "^10.26.0",
2424
"@carbon/layout": "^10.23.0",
25-
"@carbon/motion": "^10.17.0-rc.0",
26-
"@carbon/themes": "^10.33.0-rc.0",
27-
"@carbon/type": "^10.27.0-rc.0"
25+
"@carbon/motion": "^10.17.0",
26+
"@carbon/themes": "^10.33.0",
27+
"@carbon/type": "^10.27.0"
2828
},
2929
"devDependencies": {
3030
"@carbon/test-utils": "10.15.0"

‎packages/themes/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/themes",
33
"description": "Themes for applying color in the Carbon Design System",
4-
"version": "10.33.0-rc.0",
4+
"version": "10.33.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -29,9 +29,9 @@
2929
"build": "yarn clean && carbon-cli bundle src/index.js --name CarbonThemes && node tasks/build.js && carbon-cli check \"scss/*.scss\""
3030
},
3131
"dependencies": {
32-
"@carbon/colors": "^10.24.0-rc.0",
32+
"@carbon/colors": "^10.24.0",
3333
"@carbon/layout": "^10.23.0",
34-
"@carbon/type": "^10.27.0-rc.0",
34+
"@carbon/type": "^10.27.0",
3535
"color": "^3.1.2"
3636
},
3737
"devDependencies": {

‎packages/type/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@carbon/type",
33
"description": "Typography for digital and software products using the Carbon Design System",
4-
"version": "10.27.0-rc.0",
4+
"version": "10.27.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",

0 commit comments

Comments
 (0)