Skip to content

Commit

Permalink
Merge branch 'main' into filterablemultiselect-id
Browse files Browse the repository at this point in the history
  • Loading branch information
riddhybansal authored Jul 23, 2024
2 parents abb0188 + 8fe1ee3 commit d67e165
Show file tree
Hide file tree
Showing 2,796 changed files with 8,589 additions and 11,115 deletions.
3 changes: 2 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/7907338?v=4",
"profile": "https://github.com/ychavoya",
"contributions": [
"code"
"code",
"doc"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<td align="center"><a href="https://github.com/2nikhiltom"><img src="https://avatars.githubusercontent.com/2nikhiltom?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikhil Tomar</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=2nikhiltom" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/aninaantony"><img src="https://avatars.githubusercontent.com/u/164350784?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anina Antony</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=aninaantony" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ahmedsemih"><img src="https://avatars.githubusercontent.com/u/102798814?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ahmed Semih Erkan</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ahmedsemih" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ychavoya"><img src="https://avatars.githubusercontent.com/u/7907338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yael Chavoya</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ychavoya" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ychavoya"><img src="https://avatars.githubusercontent.com/u/7907338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yael Chavoya</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ychavoya" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=ychavoya" title="Documentation">📖</a></td>
<td align="center"><img src="https://avatars.githubusercontent.com/u/37899503?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kilian Collender</b></sub><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Kilian-Collender" title="Code">💻</a></td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "3.13.0-rc.0",
"version": "3.13.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
16 changes: 6 additions & 10 deletions docs/guides/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,16 +346,12 @@ business impact that the feature will bring with future research done.

### Severity

There are 4 levels of severity for bugs in the Carbon core repositories:

- https://github.com/carbon-design-system/carbon/labels/severity%3A%201 - _"Must
be fixed ASAP"_
- https://github.com/carbon-design-system/carbon/labels/severity%3A%202 - _"User
cannot complete task, and/or no workaround"_
- https://github.com/carbon-design-system/carbon/labels/severity%3A%203 - _"User
can complete task, and/or has a workaround"_
- https://github.com/carbon-design-system/carbon/labels/severity%3A%204 -
_"Unrelated to a user task, has a workaround or does not need a workaround"_
| Level | Description | Kit | Docs | Code | Release |
| :-------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------: | ---------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%201 | Affects major functionality. Blocks users from completing tasks, exposes intellectual property or damages the brand. No workaround. | The kit is has major functionality defects, designers can’t design and there is no workaround | The documentation damages the brand or exposes intellectual property. | The code has major functionality defects, breaking builds and can’t be worked around. | If the problem is in production, it must be fixed as soon as possible in a patch.   |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%202 | Affects major functionality. Does not block users from completing tasks. Has a workaround. | The kit has a major functionality defect, but it doesn't block users from completing tasks. It has a workaround. | The documentation is wrong or missing major details. It conflicts with what we are saying in another part of the system. | The code has a major functionality defect, but it doesn't block users from completing tasks. It has a workaround | A release will be moved into Production with defects at this severity level included. These defects will have priority in future sprints to be resolved ASAP. |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%203 | Affects minor functionality. Does not block users from completing tasks. Has a workaround. | The kit has a minor functionality defect. It doesn't block users from completing tasks. Has a workaround. | The documentation is mis-leading, somewhat true, missing minor details, or grammatically incorrect. It doesn't present conflicts with other parts of the design system. | The code has a minor functionality defect. It doesn’t block users from completing tasks. Has a workaround. | A release will be moved into Production with defects at this severity level included. These defects will have priority in future sprints after sev2’s. |
| https://github.com/carbon-design-system/carbon/labels/severity%3A%204 | Unrelated to a user task. Does not need a workaround. | Unrelated to a user task. Does not need a workaround. | Unrelated to a user task. Content has a typo. | Unrelated to a user task. Does not need a workaround. | A release will be moved into Production with defects at this severity level included. These will often not be addressed by the maintainer team as a priority in future releases. |

Workarounds can be described as either of the following:

Expand Down
47 changes: 47 additions & 0 deletions e2e/components/Slider/Slider-test.avt.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,53 @@ test.describe('@avt Slider', () => {
await expect(page).toHaveNoACViolations('Slider-with-layer');
});

test('@avt-advanced-states slider with custom format', async ({ page }) => {
await visitStory(page, {
component: 'Slider',
id: 'components-slider--slider-with-custom-value-label',
globals: {
theme: 'white',
},
});

await expect(page).toHaveNoACViolations('Slider-with-custom-value-label');
});

test.slow('@avt-keyboard-nav slider with custom format', async ({ page }) => {
await visitStory(page, {
component: 'Slider',
id: 'components-slider--slider-with-custom-value-label',
globals: {
theme: 'white',
},
});

// Test for label changes
// Initial value
await page.keyboard.press('Tab');
await expect(page.getByRole('slider')).toBeVisible();
await page.keyboard.press('Tab');

await expect(page.getByRole('slider')).toHaveAttribute(
'aria-valuetext',
'Medium'
);
// Move to high
await page.keyboard.press('Shift+ArrowRight');
await expect(page.getByRole('slider')).toHaveAttribute(
'aria-valuetext',
'High'
);

// Move to Low
await page.keyboard.press('Shift+ArrowLeft');
await page.keyboard.press('Shift+ArrowLeft');
await expect(page.getByRole('slider')).toHaveAttribute(
'aria-valuetext',
'Low'
);
});

// Prevent timeout
test.slow('@avt-keyboard-nav', async ({ page }) => {
await visitStory(page, {
Expand Down
8 changes: 8 additions & 0 deletions e2e/components/Slider/Slider-test.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ test.describe('Slider', () => {
theme,
});
});

test('slider with formatLabel @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slider',
id: 'components-slider--slider-with-custom-value-label',
theme,
});
});
});
});
});
47 changes: 43 additions & 4 deletions e2e/components/Tile/Tile-test.avt.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ test.describe('@avt Tile', () => {
},
});
await expect(page.locator('body')).toBeFocused();

// Pause to ensure the initial animation finishes before we interact
await expect(
page.getByRole('button', { name: 'Above the fold content here' })
).toBeVisible();

await page.keyboard.press('Tab');
await expect(page.locator('#expandable-tile-1')).toBeFocused();
await page.keyboard.press('Enter');
Expand All @@ -109,6 +115,31 @@ test.describe('@avt Tile', () => {
);
});

test('@avt-advanced-states ExpandableTile with interactive spacebar', async ({
page,
}) => {
await visitStory(page, {
component: 'ExpandableTile',
id: 'components-tile--expandable-with-interactive',
globals: {
theme: 'white',
},
});
await expect(page.locator('body')).toBeFocused();

// Pause to ensure the initial animation finishes before we interact
await expect(page.getByLabel('Interact to Expand tile')).toBeVisible();

await page.keyboard.press('Tab');
await page.keyboard.press('Tab');

await expect(page.getByLabel('Interact to Expand tile')).toBeFocused();
await page.keyboard.press('Space');
await expect(page.locator('#expandable-tile-1')).toHaveClass(
'cds--tile cds--tile--expandable cds--tile--expandable--interactive cds--tile--is-expanded'
);
});

test('@avt-keyboard-nav SelectableTile', async ({ page }) => {
await visitStory(page, {
component: 'SelectableTile',
Expand All @@ -118,10 +149,14 @@ test.describe('@avt Tile', () => {
},
});
await expect(page.locator('body')).toBeFocused();

// Pause to ensure the initial animation finishes before we interact
await expect(page.getByRole('checkbox')).toBeVisible();

await page.keyboard.press('Tab');
await expect(page.locator('#selectable-tile-1')).toBeFocused();
await expect(page.getByRole('checkbox')).toBeFocused();
await page.keyboard.press('Enter');
await expect(page.locator('#selectable-tile-1')).toHaveClass(
await expect(page.getByRole('checkbox')).toHaveClass(
'cds--tile cds--tile--selectable cds--tile--is-selected'
);
});
Expand All @@ -135,9 +170,13 @@ test.describe('@avt Tile', () => {
},
});
await expect(page.locator('body')).toBeFocused();

// Pause to ensure the initial animation finishes before we interact
await expect(page.getByRole('radio').nth(0)).toBeVisible();

await page.keyboard.press('Tab');
await expect(page.locator('#radio-tile-2')).toBeFocused();
await expect(page.getByRole('radio').nth(1)).toBeFocused();
await page.keyboard.press('ArrowUp');
await expect(page.locator('#radio-tile-1')).toBeChecked();
await expect(page.getByRole('radio').nth(0)).toBeChecked();
});
});
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.58.0-rc.1",
"version": "0.59.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/react": "^1.62.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.64.0-rc.0",
"version": "0.64.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.61.0-rc.0"
"@carbon/styles": "^1.61.0"
}
}
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.59.0-rc.1",
"version": "0.60.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/react": "^1.62.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.58.0-rc.1",
"version": "0.59.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/react": "^1.62.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/light-dark-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-light-dark",
"private": true,
"version": "0.59.0-rc.1",
"version": "0.60.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/react": "^1.62.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-nextjs",
"private": true,
"version": "0.61.0-rc.1",
"version": "0.62.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/react": "^1.62.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/v10-token-compat-in-v11/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.59.0-rc.1",
"version": "0.60.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/react": "^1.62.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.59.0-rc.1",
"version": "0.60.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/react": "^1.62.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/carbon-components-react/package.json
Original file line number Diff line number Diff line change
@@ -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": "8.61.0-rc.1",
"version": "8.62.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,8 +42,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.61.0-rc.1",
"@carbon/styles": "^1.61.0-rc.0",
"@carbon/react": "^1.62.0",
"@carbon/styles": "^1.61.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-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": "11.61.0-rc.0",
"version": "11.61.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,7 +43,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.61.0-rc.0",
"@carbon/styles": "^1.61.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
Loading

0 comments on commit d67e165

Please sign in to comment.