Skip to content

Commit 5a8451e

Browse files
authored
Merge branch 'main' into PasswordInput_readonly_state
2 parents 4a26e34 + 6686fc3 commit 5a8451e

File tree

63 files changed

+2372
-169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2372
-169
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424

2525
# Initializes the CodeQL tools for scanning.
2626
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
27+
uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
2828
with:
2929
languages: javascript
3030

3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
32+
uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
Binary file not shown.
Binary file not shown.

config/jest-config-carbon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "jest-config-carbon",
33
"private": true,
44
"description": "Jest configuration and preset for Carbon",
5-
"version": "1.13.0",
5+
"version": "1.14.0-rc.0",
66
"license": "Apache-2.0",
77
"main": "index.js",
88
"repository": {

examples/class-prefix/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "class-prefix",
33
"private": true,
4-
"version": "0.60.0",
4+
"version": "0.61.0-rc.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
88
"build": "vite build",
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@carbon/react": "^1.63.0",
12+
"@carbon/react": "^1.64.0-rc.0",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0"
1515
},
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "codesandbox-styles",
33
"private": true,
4-
"version": "0.65.0",
4+
"version": "0.66.0-rc.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite"
@@ -11,6 +11,6 @@
1111
"vite": "^4.3.8"
1212
},
1313
"dependencies": {
14-
"@carbon/styles": "^1.62.0"
14+
"@carbon/styles": "^1.63.0-rc.0"
1515
}
1616
}

examples/custom-theme/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "custom-theme",
33
"private": true,
4-
"version": "0.61.0",
4+
"version": "0.62.0-rc.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
88
"build": "vite build",
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@carbon/react": "^1.63.0",
12+
"@carbon/react": "^1.64.0-rc.0",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0"
1515
},

examples/id-prefix/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "id-prefix",
33
"private": true,
4-
"version": "0.60.0",
4+
"version": "0.61.0-rc.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
88
"build": "vite build",
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@carbon/react": "^1.63.0",
12+
"@carbon/react": "^1.64.0-rc.0",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0"
1515
},

examples/light-dark-mode/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "examples-light-dark",
33
"private": true,
4-
"version": "0.61.0",
4+
"version": "0.62.0-rc.0",
55
"scripts": {
66
"build": "next build",
77
"dev": "next dev",
88
"lint": "next lint",
99
"start": "next start"
1010
},
1111
"dependencies": {
12-
"@carbon/react": "^1.63.0",
12+
"@carbon/react": "^1.64.0-rc.0",
1313
"next": "14.1.1",
1414
"react": "18.2.0",
1515
"react-dom": "18.2.0"

examples/nextjs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "examples-nextjs",
33
"private": true,
4-
"version": "0.63.0",
4+
"version": "0.64.0-rc.0",
55
"scripts": {
66
"build": "next build",
77
"dev": "next dev",
88
"lint": "next lint",
99
"start": "next start"
1010
},
1111
"dependencies": {
12-
"@carbon/react": "^1.63.0",
12+
"@carbon/react": "^1.64.0-rc.0",
1313
"next": "14.1.1",
1414
"react": "18.2.0",
1515
"react-dom": "18.2.0"

examples/v10-token-compat-in-v11/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "v10-token-compat-in-v11",
33
"private": true,
4-
"version": "0.61.0",
4+
"version": "0.62.0-rc.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
88
"build": "vite build",
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@carbon/react": "^1.63.0",
12+
"@carbon/react": "^1.64.0-rc.0",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0"
1515
},

examples/vite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "vite",
33
"private": true,
4-
"version": "0.61.0",
4+
"version": "0.62.0-rc.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
88
"build": "vite build",
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"@carbon/react": "^1.63.0",
12+
"@carbon/react": "^1.64.0-rc.0",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0"
1515
},

packages/carbon-components-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-components-react",
33
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
4-
"version": "8.63.0",
4+
"version": "8.64.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -42,8 +42,8 @@
4242
"sass": "^1.33.0"
4343
},
4444
"dependencies": {
45-
"@carbon/react": "^1.63.0",
46-
"@carbon/styles": "^1.62.0",
45+
"@carbon/react": "^1.64.0-rc.0",
46+
"@carbon/styles": "^1.63.0-rc.0",
4747
"@ibm/telemetry-js": "^1.5.0",
4848
"chalk": "1.1.3"
4949
},

packages/carbon-components/package.json

Lines changed: 2 additions & 2 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": "11.62.0",
4+
"version": "11.63.0-rc.0",
55
"license": "Apache-2.0",
66
"repository": {
77
"type": "git",
@@ -43,7 +43,7 @@
4343
"sass": "^1.33.0"
4444
},
4545
"dependencies": {
46-
"@carbon/styles": "^1.62.0",
46+
"@carbon/styles": "^1.63.0-rc.0",
4747
"@ibm/telemetry-js": "^1.5.0",
4848
"chalk": "1.1.3"
4949
},

packages/elements/package.json

Lines changed: 2 additions & 2 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": "11.50.0",
4+
"version": "11.51.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -40,7 +40,7 @@
4040
"dependencies": {
4141
"@carbon/colors": "^11.24.0",
4242
"@carbon/grid": "^11.25.0",
43-
"@carbon/icons": "^11.46.0",
43+
"@carbon/icons": "^11.47.0-rc.0",
4444
"@carbon/layout": "^11.24.0",
4545
"@carbon/motion": "^11.20.0",
4646
"@carbon/themes": "^11.38.0",

packages/icons-react/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-react",
33
"description": "React components for icons in digital and software products using the Carbon Design System",
4-
"version": "11.46.0",
4+
"version": "11.47.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -44,7 +44,7 @@
4444
},
4545
"devDependencies": {
4646
"@carbon/icon-build-helpers": "^1.28.0",
47-
"@carbon/icons": "^11.46.0",
47+
"@carbon/icons": "^11.47.0-rc.0",
4848
"rimraf": "^5.0.0"
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.95.0",
4+
"version": "10.96.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
@@ -35,7 +35,7 @@
3535
},
3636
"devDependencies": {
3737
"@carbon/cli-reporter": "^10.7.0",
38-
"@carbon/icons": "^11.46.0",
38+
"@carbon/icons": "^11.47.0-rc.0",
3939
"fs-extra": "^11.0.0",
4040
"prettier": "^2.8.8",
4141
"rimraf": "^5.0.0",

packages/icons/package.json

Lines changed: 1 addition & 1 deletion
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": "11.46.0",
4+
"version": "11.47.0-rc.0",
55
"license": "Apache-2.0",
66
"main": "lib/index.js",
77
"module": "es/index.js",
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
/**
2+
* Copyright IBM Corp. 2016, 2024
3+
*
4+
* This source code is licensed under the Apache-2.0 license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
// @ts-nocheck
9+
import React from 'react';
10+
import { ComboBox, DropdownSkeleton } from '@carbon/react';
11+
import figma from '@figma/code-connect';
12+
13+
figma.connect(
14+
ComboBox,
15+
'https://www.figma.com/design/YAnB1jKx0yCUL29j6uSLpg/(v11)-All-themes---Carbon-Design-System?node-id=14032-290976&t=5acDGCinwyrs5Bbc-4',
16+
{
17+
props: {
18+
placeholder: figma.string('Filter text'),
19+
helperText: figma.boolean('Show helper', {
20+
true: figma.string('Helper text'),
21+
}),
22+
size: figma.enum('Size', {
23+
Large: 'lg',
24+
Medium: 'md',
25+
Small: 'sm',
26+
}),
27+
titleText: figma.string('Label text'),
28+
hideLabel: figma.boolean('Show label', {
29+
true: false,
30+
false: true,
31+
}),
32+
readOnly: figma.enum('State', {
33+
'Read-only': true,
34+
}),
35+
disabled: figma.enum('State', {
36+
Disabled: true,
37+
}),
38+
invalid: figma.enum('State', {
39+
Error: true,
40+
}),
41+
invalidText: figma.string('Error message'),
42+
warn: figma.enum('State', {
43+
Warning: true,
44+
}),
45+
warnText: figma.string('Warning message'),
46+
},
47+
example: ({ ...props }) => {
48+
const items = [
49+
{
50+
id: 'option-0',
51+
text: 'Option 0',
52+
},
53+
{
54+
id: 'option-1',
55+
text: 'Option 1',
56+
},
57+
];
58+
59+
return (
60+
<ComboBox
61+
onChange={() => {}}
62+
id="carbon-combobox"
63+
items={items}
64+
itemToString={(item) => (item ? item.text : '')}
65+
{...props}
66+
/>
67+
);
68+
},
69+
}
70+
);
71+
72+
figma.connect(
73+
DropdownSkeleton,
74+
'https://www.figma.com/design/YAnB1jKx0yCUL29j6uSLpg/(v11)-All-themes---Carbon-Design-System?node-id=14032-290976&t=5acDGCinwyrs5Bbc-4',
75+
{
76+
variant: { State: 'Skeleton' },
77+
props: {
78+
size: figma.enum('Size', {
79+
Large: 'lg',
80+
Medium: 'md',
81+
Small: 'sm',
82+
}),
83+
hideLabel: figma.boolean('Show label', {
84+
true: false,
85+
false: true,
86+
}),
87+
},
88+
example: ({ ...props }) => {
89+
return <DropdownSkeleton {...props} />;
90+
},
91+
}
92+
);

0 commit comments

Comments
 (0)