Skip to content

Commit

Permalink
Merge branch 'main' into text-area-word-limit
Browse files Browse the repository at this point in the history
  • Loading branch information
matejoslav authored Dec 2, 2023
2 parents 573fdf5 + 32cb4f3 commit 42a0616
Show file tree
Hide file tree
Showing 576 changed files with 15,172 additions and 12,954 deletions.
12 changes: 11 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1298,6 +1298,15 @@
"code"
]
},
{
"login": "cesardlinx",
"name": "David Padilla",
"avatar_url": "https://avatars.githubusercontent.com/u/25573926?v=4",
"profile": "https://www.davidpadilla.dev/",
"contributions": [
"code"
]
},
{
"login": "allisonishida",
"name": "Allison Ishida",
Expand Down Expand Up @@ -1331,7 +1340,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/62743644?v=4",
"profile": "https://haruki-kuriwada.netlify.app/",
"contributions": [
"code"
"code",
"doc"
]
},
{
Expand Down
14 changes: 7 additions & 7 deletions .github/COMPONENT_DOCS_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Mixins specific to { THIS_COMPONENT_NAME } are located in

#### Modifiers

Use these modifiers with `.bx--root-class` class.
Use these modifiers with `.cds--root-class` class.

| Selector | Description |
| -------------- | ---------------- |
| .bx--something | Description here |
| Selector | Description |
| --------------- | ---------------- |
| .cds--something | Description here |

### JavaScript

Expand All @@ -40,9 +40,9 @@ Use these modifiers with `.bx--root-class` class.

#### Classes

| Name | Description |
| -------------------- | ------------- |
| bx--class\_\_element | The class for |
| Name | Description |
| --------------------- | ------------- |
| cds--class\_\_element | The class for |

### FAQ

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contribution-accepted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: echo "$GITHUB_CONTEXT_LABELS"
- name: Conditional Check and Add Comment
id: conditional-comment
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
response = await github.rest.issues.listLabelsOnIssue({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contribution-proposal-not-pursuing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: echo "$GITHUB_CONTEXT_LABELS"
- name: Conditional Comment Proposal Not Pursuing
id: conditional-comment-proposal-not-pursuing
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
response = await github.rest.issues.listLabelsOnIssue({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contribution-proposal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
$GITHUB_CONTEXT_LABELS: ${{ toJson(github.event.label) }}
run: echo "$GITHUB_CONTEXT_LABELS"
- name: Add comment
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
github.rest.issues.createComment({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contribution-ready-to-be-worked.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: echo "$GITHUB_CONTEXT_LABELS"
- name: Conditional Check and Add Comment
id: conditional-comment
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
comments = await github.rest.issues.listComments({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-triage-strategic-adopter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
Cloud|Sterling Data Exchange SaaS|TRIRIGA|Sterling Order and
Inventory Management|Supply Chain Intelligence Suite\b'
flags: g
- uses: actions/github-script@v6
- uses: actions/github-script@v7
if: ${{ steps.regex-match.outputs.match != '' }}
with:
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:

- name: Create Release
id: create_release
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
github.rest.repos.createRelease({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/v10-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Create Release
id: create_release
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
github.rest.repos.createRelease({
Expand Down
Binary file not shown.
Binary file not shown.
670 changes: 335 additions & 335 deletions .yarn/releases/yarn-4.0.1.cjs → .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ supportedArchitectures:
- linux
- win32

yarnPath: .yarn/releases/yarn-4.0.1.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->

<table>
<tr>
<td align="center"><a href="https://github.com/tay1orjones"><img src="https://avatars0.githubusercontent.com/u/3360588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Taylor Jones</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=tay1orjones" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=tay1orjones" title="Documentation">📖</a> <a href="#a11y-tay1orjones" title="Accessibility">️️️️♿️</a></td>
Expand Down Expand Up @@ -259,14 +260,15 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<tr>
<td align="center"><a href="https://github.com/Nirajsah"><img src="https://avatars.githubusercontent.com/u/51414373?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niraj Sah</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Nirajsah" title="Code">💻</a></td>
<td align="center"><a href="https://www.davidpadilla.dev/"><img src="https://avatars.githubusercontent.com/u/25573926?v=4?s=100" width="100px;" alt=""/><br /><sub><b>David Padilla</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=cesardlinx" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/allisonishida"><img src="https://avatars.githubusercontent.com/u/22247062?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Allison Ishida</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=allisonishida" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/alewitt2"><img src="https://avatars.githubusercontent.com/u/48691328?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alex Lewitt</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=alewitt2" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Tresau-IBM"><img src="https://avatars.githubusercontent.com/u/148357638?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tresau-IBM</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Tresau-IBM" title="Code">💻</a></td>
<td align="center"><a href="https://haruki-kuriwada.netlify.app/"><img src="https://avatars.githubusercontent.com/u/62743644?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ruki</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=kuri-sun" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/matejoslav"><img src="https://avatars.githubusercontent.com/u/8973672?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matej Ocovsky</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=matejoslav" title="Code">💻</a></td>
<td align="center"><a href="https://samuelechinellato.com/#/"><img src="https://avatars.githubusercontent.com/u/49278203?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SamChinellato</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=SamChinellato" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://samuelechinellato.com/#/"><img src="https://avatars.githubusercontent.com/u/49278203?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SamChinellato</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=SamChinellato" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/stevenpatrick009"><img src="https://avatars.githubusercontent.com/u/106097350?v=4?s=100" width="100px;" alt=""/><br /><sub><b>stevenpatrick009</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=stevenpatrick009" title="Code">💻</a></td>
</tr>
</table>
Expand Down
10 changes: 5 additions & 5 deletions docs/guides/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ $css--plex: true;

Style selectors that are a part of the sass files for Carbon are built using a
global `$prefix` variable that allows us to dynamically change the prefix of
selectors that we ship. By default, `$prefix` is set to `bx`. `bx` comes from
Carbon's origins in Bluemix. If you look at our source files, you'll see that we
use `$prefix` in our selectors in the following way:
selectors that we ship. By default, `$prefix` is set to `cds`. If you look at
our source files, you'll see that we use `$prefix` in our selectors in the
following way:

```scss
// Input
Expand All @@ -138,7 +138,7 @@ use `$prefix` in our selectors in the following way:
}

// Output
.bx--my-component {
.cds--my-component {
// ...
}
```
Expand All @@ -154,7 +154,7 @@ In order to override `$prefix` to your own custom prefix, you will need to set

```scss
// Custom prefix
$prefix: 'cds';
$prefix: 'ibm';

// Import Carbon
@import 'path-to-carbon';
Expand Down
50 changes: 50 additions & 0 deletions e2e/components/Slug/Slug-test.avt.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/**
* Copyright IBM Corp. 2016, 2023
*
* 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';

const { expect, test } = require('@playwright/test');
const { visitStory } = require('../../test-utils/storybook');

test.describe('Slug @avt', () => {
test('@avt-default-state', async ({ page }) => {
await visitStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug--default',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('Slug');
});

test('@avt-advanced-states open state', async ({ page }) => {
await visitStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug--default',
globals: {
theme: 'white',
},
});
await page.keyboard.press('Tab');
await page.keyboard.press('Tab');
await page.keyboard.press('Tab');
await page.keyboard.press('Enter');
await expect(page).toHaveNoACViolations('Slug-open');
});

test('@avt-advanced-states ai form', async ({ page }) => {
await visitStory(page, {
component: 'Slug',
id: 'components-form--ai-form',
globals: {
theme: 'white',
},
});
await expect(page).toHaveNoACViolations('Slug-form');
});
});
34 changes: 34 additions & 0 deletions e2e/components/Slug/Slug-test.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/**
* Copyright IBM Corp. 2016, 2023
*
* 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';

const { test } = require('@playwright/test'); // eslint-disable-line
const { themes } = require('../../test-utils/env');
const { snapshotStory } = require('../../test-utils/storybook'); // eslint-disable-line

test.describe('Slug', () => {
themes.forEach((theme) => {
test.describe(theme, () => {
test('default @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slug',
id: 'experimental-unstable-slug--default',
theme,
});
});

test('slug inside form @vrt', async ({ page }) => {
await snapshotStory(page, {
component: 'Slug',
id: 'components-form--ai-form',
theme,
});
});
});
});
});
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.40.0-rc.0",
"version": "0.41.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.43.0-rc.0",
"@carbon/react": "^1.44.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.46.0-rc.0",
"version": "0.47.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.43.0-rc.0"
"@carbon/styles": "^1.44.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.41.0-rc.0",
"version": "0.42.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.43.0-rc.0",
"@carbon/react": "^1.44.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.40.0-rc.0",
"version": "0.41.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.43.0-rc.0",
"@carbon/react": "^1.44.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration-vite/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration-vite",
"private": true,
"version": "0.8.0-rc.0",
"version": "0.9.0",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -12,7 +12,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.43.0-rc.0",
"@carbon/react": "^1.44.0",
"carbon-components": "^10.57.0",
"carbon-components-react": "^7.57.0",
"carbon-icons": "^7.0.7",
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.41.0-rc.0",
"version": "0.42.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.43.0-rc.0",
"@carbon/react": "^1.44.0",
"next": "12.1.4",
"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.43.0-rc.0",
"version": "0.44.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.43.0-rc.0",
"@carbon/react": "^1.44.0",
"next": "13.5.6",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
Loading

0 comments on commit 42a0616

Please sign in to comment.