Skip to content

Commit 53cb218

Browse files
kennylamkennylam
authored
Merge branch 'main' into dedupe-setupGetInstanceId
2 parents 97b9745 + 748400f commit 53cb218

File tree

185 files changed

+3640
-2625
lines changed

Some content is hidden

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

185 files changed

+3640
-2625
lines changed

‎.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,6 +1569,24 @@
15691569
"contributions": [
15701570
"code"
15711571
]
1572+
},
1573+
{
1574+
"login": "lharrison13",
1575+
"name": "Luke Harrison",
1576+
"avatar_url": "https://avatars.githubusercontent.com/u/172074450?v=4",
1577+
"profile": "https://github.com/lharrison13",
1578+
"contributions": [
1579+
"code"
1580+
]
1581+
},
1582+
{
1583+
"login": "tekno0ryder",
1584+
"name": "Ahmed Alsinan",
1585+
"avatar_url": "https://avatars.githubusercontent.com/u/8721803?v=4",
1586+
"profile": "https://github.com/tekno0ryder",
1587+
"contributions": [
1588+
"code"
1589+
]
15721590
}
15731591
],
15741592
"commitConvention": "none"

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,11 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
297297
<td align="center"><a href="https://github.com/nandininarayanofficial"><img src="https://avatars.githubusercontent.com/u/165769075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nandininarayanofficial</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=nandininarayanofficial" title="Code">💻</a></td>
298298
<td align="center"><a href="https://github.com/digiacomo-a"><img src="https://avatars.githubusercontent.com/u/117646602?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrea DG</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=digiacomo-a" title="Code">💻</a></td>
299299
<td align="center"><a href="https://github.com/lluisrojass"><img src="https://avatars.githubusercontent.com/u/15043356?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luis</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lluisrojass" title="Code">💻</a></td>
300+
301+
<td align="center"><a href="https://github.com/lharrison13"><img src="https://avatars.githubusercontent.com/u/172074450?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luke Harrison</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=lharrison13" title="Code">💻</a></td>
302+
303+
<td align="center"><a href="https://github.com/tekno0ryder"><img src="https://avatars.githubusercontent.com/u/8721803?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ahmed Alsinan</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=tekno0ryder" title="Code">💻</a></td>
304+
300305
</tr>
301306
</table>
302307

‎achecker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
const path = require('path');
1111

1212
module.exports = {
13-
ruleArchive: 'latest',
13+
ruleArchive: '17June2024',
1414
policies: ['Custom_Ruleset'],
1515
failLevels: ['violation'],
1616
reportLevels: [

‎config/babel-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": "babel-preset-carbon",
33
"private": true,
4-
"version": "0.6.0-rc.0",
4+
"version": "0.6.0",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"repository": {

‎config/eslint-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": "eslint-config-carbon",
33
"description": "ESLint configuration for Carbon",
4-
"version": "3.14.0-rc.0",
4+
"version": "3.14.0",
55
"license": "Apache-2.0",
66
"main": "index.js",
77
"repository": {

‎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-rc.0",
5+
"version": "1.13.0",
66
"license": "Apache-2.0",
77
"main": "index.js",
88
"repository": {

‎e2e/components/Slug/Slug-test.avt.e2e.js renamed to ‎e2e/components/AILabel/Slug-test.avt.e2e.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright IBM Corp. 2016, 2023
2+
* Copyright IBM Corp. 2016, 2024
33
*
44
* This source code is licensed under the Apache-2.0 license found in the
55
* LICENSE file in the root directory of this source tree.
@@ -10,22 +10,22 @@
1010
const { expect, test } = require('@playwright/test');
1111
const { visitStory } = require('../../test-utils/storybook');
1212

13-
test.describe('@avt Slug', async () => {
13+
test.describe('@avt AILabel', () => {
1414
test('@avt-default-state', async ({ page }) => {
1515
await visitStory(page, {
16-
component: 'Slug',
17-
id: 'experimental-unstable-slug--default',
16+
component: 'AILabel',
17+
id: 'components-ailabel--default',
1818
globals: {
1919
theme: 'white',
2020
},
2121
});
22-
await expect(page).toHaveNoACViolations('Slug');
22+
await expect(page).toHaveNoACViolations('AILabel');
2323
});
2424

2525
test.slow('@avt-advanced-states open state', async ({ page }) => {
2626
await visitStory(page, {
27-
component: 'Slug',
28-
id: 'experimental-unstable-slug--default',
27+
component: 'AILabel',
28+
id: 'components-ailabel--default',
2929
globals: {
3030
theme: 'white',
3131
},
@@ -34,24 +34,24 @@ test.describe('@avt Slug', async () => {
3434
await page.keyboard.press('Tab');
3535
await page.keyboard.press('Tab');
3636
await page.keyboard.press('Enter');
37-
await expect(page).toHaveNoACViolations('Slug-open');
37+
await expect(page).toHaveNoACViolations('AILabel-open');
3838
});
3939

4040
test.slow('@avt-advanced-states ai form', async ({ page }) => {
4141
await visitStory(page, {
42-
component: 'Slug',
43-
id: 'experimental-unstable-slug-form--form-example',
42+
component: 'AILabel',
43+
id: 'components-form--with-ai-label',
4444
globals: {
4545
theme: 'white',
4646
},
4747
});
48-
await expect(page).toHaveNoACViolations('Slug-form');
48+
await expect(page).toHaveNoACViolations('AILabel-form');
4949
});
5050

5151
test('@avt-keyboard-nav - slug', async ({ page }) => {
5252
await visitStory(page, {
5353
component: 'Search',
54-
id: 'experimental-unstable-slug--callout',
54+
id: 'components-ailabel--callout',
5555
globals: {
5656
theme: 'white',
5757
},
@@ -63,7 +63,7 @@ test.describe('@avt Slug', async () => {
6363
await expect(slug).toBeVisible();
6464
await expect(callout).toBeVisible();
6565

66-
// Tab to the Slug
66+
// Tab to the AILabel
6767
await page.keyboard.press('Tab');
6868
await expect(slug).toBeFocused();
6969

‎e2e/components/Slug/Slug-test.e2e.js renamed to ‎e2e/components/AILabel/Slug-test.e2e.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright IBM Corp. 2016, 2023
2+
* Copyright IBM Corp. 2016, 2024
33
*
44
* This source code is licensed under the Apache-2.0 license found in the
55
* LICENSE file in the root directory of this source tree.
@@ -11,53 +11,53 @@ const { test } = require('@playwright/test'); // eslint-disable-line
1111
const { themes } = require('../../test-utils/env');
1212
const { snapshotStory } = require('../../test-utils/storybook'); // eslint-disable-line
1313

14-
test.describe('Slug', () => {
14+
test.describe('AILabel', () => {
1515
themes.forEach((theme) => {
1616
test.describe(theme, () => {
1717
test('default @vrt', async ({ page }) => {
1818
await snapshotStory(page, {
19-
component: 'Slug',
20-
id: 'experimental-unstable-slug--default',
19+
component: 'AILabel',
20+
id: 'components-ailabel--default',
2121
theme,
2222
});
2323
});
2424

25-
test('slug callout @vrt', async ({ page }) => {
25+
test('AILabel callout @vrt', async ({ page }) => {
2626
await snapshotStory(page, {
27-
component: 'Slug',
28-
id: 'experimental-unstable-slug--callout',
27+
component: 'AILabel',
28+
id: 'components-ailabel--callout',
2929
theme,
3030
});
3131
});
3232

33-
test('slug inside form @vrt', async ({ page }) => {
33+
test('AILabel inside form @vrt', async ({ page }) => {
3434
await snapshotStory(page, {
35-
component: 'Slug',
36-
id: 'experimental-unstable-slug-form--form-example',
35+
component: 'AILabel',
36+
id: 'components-form--with-ai-label',
3737
theme,
3838
});
3939
});
4040

41-
test('slug inside DataTable column @vrt', async ({ page }) => {
41+
test('AILabel inside DataTable column @vrt', async ({ page }) => {
4242
await snapshotStory(page, {
43-
component: 'Slug',
44-
id: 'experimental-unstable-slug-datatable--column-slug-sort',
43+
component: 'AILabel',
44+
id: 'components-datatable-withailabel--column-ai-label-sort',
4545
theme,
4646
});
4747
});
4848

49-
test('slug inside DataTable row @vrt', async ({ page }) => {
49+
test('AILabel inside DataTable row @vrt', async ({ page }) => {
5050
await snapshotStory(page, {
51-
component: 'Slug',
52-
id: 'experimental-unstable-slug-datatable--slug-with-selection-and-expansion',
51+
component: 'AILabel',
52+
id: 'components-datatable-withailabel--ai-label-with-selection-and-expansion',
5353
theme,
5454
});
5555
});
5656

57-
test('slug inside Tile @vrt', async ({ page }) => {
57+
test('AILabel inside Tile @vrt', async ({ page }) => {
5858
await snapshotStory(page, {
59-
component: 'Slug',
60-
id: 'experimental-unstable-slug-examples--tile',
59+
component: 'AILabel',
60+
id: 'components-tile--with-ai-label',
6161
theme,
6262
});
6363
});

‎e2e/components/ComboBox/ComboBox-test.avt.e2e.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ test.describe('@avt ComboBox', () => {
8484
await expect(combobox).toBeFocused();
8585
await page.keyboard.press('Enter');
8686
await expect(menu).toBeVisible();
87+
await page.keyboard.press('ArrowDown');
8788
// Navigation inside the menu
8889
// move to first option
8990
await expect(optionOne).toHaveClass(
@@ -122,15 +123,17 @@ test.describe('@avt ComboBox', () => {
122123
await page.keyboard.press('Enter');
123124
await page.keyboard.press('ArrowDown');
124125
await page.keyboard.press('Enter');
125-
await expect(combobox).toHaveValue('Option 1');
126+
await expect(combobox).toHaveValue(
127+
'An example option that is really long to show what should be done to handle long text'
128+
);
126129
await page.keyboard.press('Escape');
127130

128131
// should open and select option 2
129132
await page.keyboard.press('Enter');
130133
await page.keyboard.press('ArrowDown');
131134
await page.keyboard.press('ArrowDown');
132135
await page.keyboard.press('Enter');
133-
await expect(combobox).toHaveValue('Option 2');
136+
await expect(combobox).toHaveValue('Option 1');
134137
await page.keyboard.press('Escape');
135138
});
136139
});

‎e2e/components/DatePicker/DatePicker-test.avt.e2e.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ test.describe('@avt DatePicker', () => {
125125
await page.keyboard.press('Enter');
126126
await page.keyboard.press('Enter');
127127
await expect(
128-
page.locator('input#date-picker-input-id-finish')
128+
page.locator('input#date-picker-input-id-start')
129129
).toBeFocused();
130130
await expect(page.locator('div.flatpickr-calendar')).not.toHaveClass(
131131
/open/

‎e2e/components/FluidComboBox/FluidComboBox-test.avt.e2e.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ test.describe('@avt FluidComboBox', () => {
8484
await expect(combobox).toBeFocused();
8585
await page.keyboard.press('Enter');
8686
await expect(menu).toBeVisible();
87+
await page.keyboard.press('ArrowDown');
8788
// Navigation inside the menu
8889
// move to first option
8990
await expect(optionOne).toHaveClass(

‎e2e/components/FluidDatePicker/FluidDatePicker-test.avt.e2e.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ test.describe('@avt FluidDatePicker', () => {
9898
await page.keyboard.press('ArrowDown');
9999
await page.keyboard.press('Enter');
100100
await expect(
101-
page.locator('input#date-picker-input-id-finish')
101+
page.locator('input#date-picker-input-id-start')
102102
).toBeFocused();
103103
await expect(page.locator('div.flatpickr-calendar')).not.toHaveClass(
104104
/open/

‎e2e/components/FluidMultiSelect/FluidMultiSelect-test.avt.e2e.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ test.describe('@avt FluidMultiSelect', () => {
8181
await expect(toggleButton).toBeFocused();
8282
await page.keyboard.press('Space');
8383
await expect(menu).toBeVisible();
84+
await page.keyboard.press('ArrowDown');
8485
// Navigation inside the menu
8586
// Focus on first element by default
8687
await expect(
@@ -175,6 +176,7 @@ test.describe('@avt FluidMultiSelect', () => {
175176
await expect(toggleButton).toBeFocused();
176177
await page.keyboard.press('Space');
177178
await expect(menu).toBeVisible();
179+
await page.keyboard.press('ArrowDown');
178180
// Navigation inside the menu
179181
// Focus on first element by default
180182
await expect(

‎e2e/components/MultiSelect/MultiSelect-test.avt.e2e.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,11 @@ test.describe('@avt MultiSelect', () => {
118118
page.getByRole('option', {
119119
name: 'An example option that is really long to show what should be done to handle long text',
120120
})
121-
).toHaveClass(
121+
).not.toHaveClass(
122122
'cds--list-box__menu-item cds--list-box__menu-item--highlighted'
123123
);
124124
// select first option (should select with enter and space)
125+
await page.keyboard.press('ArrowDown');
125126
await page.keyboard.press('Enter');
126127
await expect(
127128
page.getByRole('option', {

‎e2e/components/Toggle/Toggle-test.avt.e2e.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ test.describe('@avt Toggle', () => {
6363
theme: 'white',
6464
},
6565
});
66+
const toggleSwitch = page.getByRole('switch');
6667
await page.keyboard.press('Tab');
67-
await expect(page.getByRole('switch')).toBeVisible();
68-
await page.keyboard.press('Space');
69-
page.getByText('Off');
70-
await page.keyboard.press('Space');
71-
page.getByText('On');
68+
await expect(toggleSwitch).toBeVisible();
69+
await expect(toggleSwitch).toHaveAttribute('aria-checked', 'true');
70+
await page.keyboard.press('Enter');
71+
await expect(toggleSwitch).toHaveAttribute('aria-checked', 'false');
7272
});
7373
});

‎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-rc.0",
4+
"version": "0.60.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-rc.0",
12+
"@carbon/react": "^1.63.0",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0"
1515
},

‎examples/codesandbox-styles/package.json

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-rc.0",
4+
"version": "0.65.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-rc.0"
14+
"@carbon/styles": "^1.62.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-rc.0",
4+
"version": "0.61.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-rc.0",
12+
"@carbon/react": "^1.63.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-rc.0",
4+
"version": "0.60.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-rc.0",
12+
"@carbon/react": "^1.63.0",
1313
"react": "^18.2.0",
1414
"react-dom": "^18.2.0"
1515
},

0 commit comments

Comments
 (0)