Skip to content

Commit

Permalink
Merge branch 'main' into tilegroup-wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
tw15egan committed Mar 21, 2024
2 parents f9cfb9a + 9d445e1 commit dbca08f
Show file tree
Hide file tree
Showing 72 changed files with 1,367 additions and 520 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Expand Up @@ -1398,6 +1398,7 @@
"code"
]
},
{
"login": "mattborghi",
"name": "Matias Borghi",
"avatar_url": "https://avatars.githubusercontent.com/u/11933424?v=4",
Expand Down Expand Up @@ -1451,6 +1452,15 @@
"contributions": [
"code"
]
},
{
"login": "cuppajoey",
"name": "Joseph Schultz",
"avatar_url": "https://avatars.githubusercontent.com/u/14837881?v=4",
"profile": "https://cuppajoey.com/",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #v4.0.2
with:
node-version: '20.x'
- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
if: github.event_name != 'merge_group'
id: cache
with:
Expand All @@ -88,7 +88,7 @@ jobs:
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #v4.0.2
with:
node-version: '20.x'
- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
if: github.event_name != 'merge_group'
id: cache
with:
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #v4.0.2
with:
node-version: '20.x'
- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
if: github.event_name != 'merge_group'
id: cache
with:
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #v4.0.2
with:
node-version: '20.x'
- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
if: github.event_name != 'merge_group'
id: cache
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -24,9 +24,9 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c #v3.24.7
uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c #v3.24.7
uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f #v3.24.8
2 changes: 1 addition & 1 deletion .github/workflows/dco.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
(github.event.comment.body == 'recheck' || github.event.comment.body
== 'I have read the DCO document and I hereby sign the DCO.') ||
github.event_name == 'pull_request_target'
uses: cla-assistant/github-action@a895a435fcce79ecf28fbce61a4ef0f0dabc9853 #v2.3.1
uses: cla-assistant/github-action@dbc1c64d82d3aad5072007a41fff2828ae6d23ec #v2.3.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/v10-ci.yml
Expand Up @@ -64,7 +64,7 @@ jobs:
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #v4.0.2
with:
node-version: '20.x'
- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
id: cache
with:
path: |
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #v4.0.2
with:
node-version: '20.x'
- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
id: cache
with:
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Expand Up @@ -36,7 +36,7 @@ jobs:
with:
node-version: '20.x'
registry-url: 'https://registry.npmjs.org'
- uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 #v4.0.1
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
id: cache
with:
path: |
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -271,14 +271,16 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<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>
<td align="center"><a href="https://github.com/xalc"><img src="https://avatars.githubusercontent.com/u/18441947?v=4?s=100" width="100px;" alt=""/><br /><sub><b>HunterXalc</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=xalc" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/onurozkardes"><img src="https://avatars.githubusercontent.com/u/38096930?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Onur Özkardeş</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=onurozkardes" title="Code">💻</a></td>
<td align="center"><a href="https://mattborghi.github.io/"><img src="https://avatars.githubusercontent.com/u/11933424?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matias Borghi</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mattborghi" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/amercury"><img src="https://avatars.githubusercontent.com/u/17834588?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexandr Ovchinnikov</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=amercury" title="Code">💻</a></td>
<td align="center"><a href="https://jt-helsinki.github.io/blog/"><img src="https://avatars.githubusercontent.com/u/20871336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>J Thomas</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jt-helsinki" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://jt-helsinki.github.io/blog/"><img src="https://avatars.githubusercontent.com/u/20871336?v=4?s=100" width="100px;" alt=""/><br /><sub><b>J Thomas</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=jt-helsinki" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ggdawson"><img src="https://avatars.githubusercontent.com/u/37080130?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Garrett Dawson</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ggdawson" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=ggdawson" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/dedanade"><img src="https://avatars.githubusercontent.com/u/66811981?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Adebonojo</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=dedanade" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/mranjana"><img src="https://avatars.githubusercontent.com/u/91003483?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anjana M R</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mranjana" title="Code">💻</a></td>
<td align="center"><a href="https://cuppajoey.com/"><img src="https://avatars.githubusercontent.com/u/14837881?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Schultz</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=cuppajoey" title="Code">💻</a></td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion e2e/components/CodeSnippet/CodeSnippet-test.avt.e2e.js
Expand Up @@ -127,7 +127,7 @@ test.describe('@avt CodeSnippet', () => {
await page.keyboard.press('Tab');
await page.keyboard.press('Enter');
await expect(page.getByText('Show less')).toBeVisible();
await expect(page.getByText('Show more')).not.toBeVisible();
await expect(page.getByText('Show more')).toBeHidden();
});

test('@avt-keyboard-nav singleline', async ({ page }) => {
Expand Down
12 changes: 6 additions & 6 deletions e2e/components/ComboBox/ComboBox-test.avt.e2e.js
Expand Up @@ -38,7 +38,7 @@ test.describe('@avt ComboBox', () => {
await page.keyboard.press('Tab');
await expect(combobox).toBeFocused();
await page.keyboard.press('Enter');
await expect(page.getByRole('combobox', { expanded: true })).toBeVisible;
await expect(page.getByRole('combobox', { expanded: true })).toBeVisible();
await expect(combobox).toBeFocused();

await expect(page).toHaveNoACViolations('ComboBox-open');
Expand All @@ -65,22 +65,22 @@ test.describe('@avt ComboBox', () => {
});

await expect(combobox).toBeVisible();
await expect(clearButton).not.toBeVisible();
await expect(clearButton).toBeHidden();
// Tab and open the ComboBox with Arrow Down
await page.keyboard.press('Tab');
await expect(combobox).toBeFocused();
await page.keyboard.press('ArrowDown');
await expect(menu).toBeVisible();
// Close with Escape, retain focus, and open with Spacebar
await page.keyboard.press('Escape');
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(combobox).toBeFocused();
await page.keyboard.press('Space');
await expect(menu).toBeVisible();
// Close and clear with Escape, retain focus, and open with Enter
await page.keyboard.press('Escape');
await page.keyboard.press('Escape');
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(combobox).toBeFocused();
await page.keyboard.press('Enter');
await expect(menu).toBeVisible();
Expand All @@ -99,11 +99,11 @@ test.describe('@avt ComboBox', () => {
);
// focus comes back to the toggle button after selecting
await expect(combobox).toBeFocused();
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(clearButton).toBeVisible();
// should only clear selection when escape is pressed when the menu is closed
await page.keyboard.press('Escape');
await expect(clearButton).not.toBeVisible();
await expect(clearButton).toBeHidden();
await expect(combobox).toHaveValue('');
// should highlight menu items based on text input
await page.keyboard.press('2');
Expand Down
4 changes: 2 additions & 2 deletions e2e/components/ComboButton/ComboButton-test.avt.e2e.js
Expand Up @@ -58,7 +58,7 @@ test.describe('@avt ComboButton', () => {
await page.keyboard.press('ArrowDown');
await expect(page.getByRole('menuitem').nth(1)).toBeFocused();
await page.keyboard.press('Escape');
await expect(page.getByRole('menuitem').first()).not.toBeVisible();
await expect(page.getByRole('menuitem').first()).toBeHidden();
});

test('@avt-keyboard-nav ComboButton with danger', async ({ page }) => {
Expand Down Expand Up @@ -93,6 +93,6 @@ test.describe('@avt ComboButton', () => {
);
// Selecting the item to close the menu
await page.keyboard.press('Enter');
await expect(page.getByRole('menuitem').first()).not.toBeVisible();
await expect(page.getByRole('menuitem').first()).toBeHidden();
});
});
8 changes: 4 additions & 4 deletions e2e/components/ComposedModal/ComposedModal-test.avt.e2e.js
Expand Up @@ -79,7 +79,7 @@ test.describe('@avt ComposedModal', () => {
await expect(page.getByRole('button', { name: 'Close' })).toBeFocused();
await page.keyboard.press('Enter');
// Make sure modal was closed
await expect(page.getByText('Account resource')).not.toBeVisible();
await expect(page.getByText('Account resource')).toBeHidden();
});

test('@avt-keyboard-nav Full width', async ({ page }) => {
Expand All @@ -102,7 +102,7 @@ test.describe('@avt ComposedModal', () => {
await expect(page.getByRole('button', { name: 'Cancel' })).toBeFocused();
await page.keyboard.press('Enter');
// Make sure modal was closed
await expect(page.getByText('Full Width Modal')).not.toBeVisible();
await expect(page.getByText('Full Width Modal')).toBeHidden();
});

test('@avt-keyboard-nav Passive modal', async ({ page }) => {
Expand All @@ -122,7 +122,7 @@ test.describe('@avt ComposedModal', () => {
// Make sure modal was closed
await expect(
page.getByText('You have been successfully signed out')
).not.toBeVisible();
).toBeHidden();
});

test('@avt-keyboard-nav With state manager', async ({ page }) => {
Expand Down Expand Up @@ -157,7 +157,7 @@ test.describe('@avt ComposedModal', () => {
await expect(page.getByRole('button', { name: 'Close' })).toBeFocused();
await page.keyboard.press('Enter');
// Make sure modal was closed and button gets focused
await expect(page.getByText('Account resource')).not.toBeVisible();
await expect(page.getByText('Account resource')).toBeHidden();
await expect(page.getByRole('button')).toBeFocused();
await expect(
page.getByRole('button', { name: 'Launch composed modal' })
Expand Down
8 changes: 4 additions & 4 deletions e2e/components/ContainedList/ContainedList-test.avt.e2e.js
Expand Up @@ -172,7 +172,7 @@ test.describe('@avt ContainedList', () => {
await page.keyboard.press('ArrowDown');
await page.keyboard.press('ArrowDown');
await page.keyboard.press('Enter');
await expect(page.getByText('Remove')).not.toBeVisible();
await expect(page.getByText('Remove')).toBeHidden();
});

test('@avt-keyboard-nav With actions', async ({ page }) => {
Expand All @@ -192,7 +192,7 @@ test.describe('@avt ContainedList', () => {
).toBeFocused();
await expect(page.getByText('Dismiss').first()).toBeVisible();
await page.keyboard.press('Enter');
await expect(page.getByText('Dismiss').first()).not.toBeVisible();
await expect(page.getByText('Dismiss').first()).toBeHidden();

//navigating to the last element
await page.keyboard.press('Tab');
Expand Down Expand Up @@ -220,7 +220,7 @@ test.describe('@avt ContainedList', () => {
await expect(page.getByRole('search')).toHaveClass(/cds--search--expanded/);
page.getByRole('searchbox').fill('List item 3');
await expect(page.getByText('List item 3')).toBeVisible();
await expect(page.getByText('List item 1')).not.toBeVisible();
await expect(page.getByText('List item 1')).toBeHidden();

// Close search
await page.keyboard.press('Escape');
Expand Down Expand Up @@ -299,7 +299,7 @@ test.describe('@avt ContainedList', () => {
await expect(page.getByRole('searchbox')).toBeFocused();
page.getByRole('searchbox').fill('List item 3');
await expect(page.getByText('List item 3')).toBeVisible();
await expect(page.getByText('List item 1')).not.toBeVisible();
await expect(page.getByText('List item 1')).toBeHidden();

// Close search
await page.keyboard.press('Escape');
Expand Down
2 changes: 1 addition & 1 deletion e2e/components/DataTable/DataTable-test.avt.e2e.js
Expand Up @@ -167,7 +167,7 @@ test.describe('@avt DataTable', () => {
await expect(page.getByRole('button', { name: 'Cancel' })).toBeFocused();
// Invoke the cancel button
await page.keyboard.press('Space');
await expect(page.getByText('1 item selected')).not.toBeVisible();
await expect(page.getByText('1 item selected')).toBeHidden();
// Every checkbox should no longer be checked
for (const checkbox of await page.getByRole('checkbox').all()) {
await expect(checkbox).not.toBeChecked();
Expand Down
4 changes: 2 additions & 2 deletions e2e/components/Dropdown/Dropdown-test.avt.e2e.js
Expand Up @@ -39,7 +39,7 @@ test.describe('@avt Dropdown', () => {
const menu = page.getByRole('listbox');
await expect(toggleButton).toBeFocused();
await page.keyboard.press('Enter');
await expect(page.getByRole('combobox', { expanded: true })).toBeVisible;
await expect(page.getByRole('combobox', { expanded: true })).toBeVisible();
await expect(menu).toBeFocused();

await expect(page).toHaveNoACViolations('Dropdown-open');
Expand Down Expand Up @@ -68,7 +68,7 @@ test.describe('@avt Dropdown', () => {
await expect(menu).toBeVisible();
// Close with Escape, retain focus, and open with Enter
await page.keyboard.press('Escape');
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(toggleButton).toBeFocused();
await page.keyboard.press('Enter');
// Should focus on selected item by default
Expand Down
2 changes: 1 addition & 1 deletion e2e/components/ErrorBoundary/ErrorBoundary-test.avt.e2e.js
Expand Up @@ -35,7 +35,7 @@ test.describe('@avt ErrorBoundary', () => {
);
});

test('@avt-keyboard-state', async ({ page }) => {
test('@avt-keyboard-nav', async ({ page }) => {
await visitStory(page, {
component: 'ErrorBoundary',
id: 'components-errorboundary--default',
Expand Down
6 changes: 3 additions & 3 deletions e2e/components/FileUploader/FileUploader-test.avt.e2e.js
Expand Up @@ -120,7 +120,7 @@ test.describe('@avt FileUploader', () => {
// Delete the file
await page.keyboard.press('Tab');
await page.keyboard.press('Enter');
await expect(page.getByText('test-file-for-uploading')).not.toBeVisible();
await expect(page.getByText('test-file-for-uploading')).toBeHidden();
});

test.slow(
Expand Down Expand Up @@ -164,7 +164,7 @@ test.describe('@avt FileUploader', () => {
await page.keyboard.press('Enter');
await expect(
page.locator('#test-upload-file-long-text-for-tooltip-to-show-up.jpg')
).not.toBeVisible();
).toBeHidden();
}
);

Expand Down Expand Up @@ -207,6 +207,6 @@ test.describe('@avt FileUploader', () => {
await page.keyboard.press('Enter');
await expect(
page.locator('#test-upload-file-long-text-for-tooltip-to-show-up.jpg')
).not.toBeVisible();
).toBeHidden();
});
});
12 changes: 6 additions & 6 deletions e2e/components/FluidComboBox/FluidComboBox-test.avt.e2e.js
Expand Up @@ -38,7 +38,7 @@ test.describe('@avt FluidComboBox', () => {
await page.keyboard.press('Tab');
await expect(combobox).toBeFocused();
await page.keyboard.press('Enter');
await expect(page.getByRole('combobox', { expanded: true })).toBeVisible;
await expect(page.getByRole('combobox', { expanded: true })).toBeVisible();
await expect(combobox).toBeFocused();

await expect(page).toHaveNoACViolations('FluidComboBox-open');
Expand All @@ -65,22 +65,22 @@ test.describe('@avt FluidComboBox', () => {
});

await expect(combobox).toBeVisible();
await expect(clearButton).not.toBeVisible();
await expect(clearButton).toBeHidden();
// Tab and open the ComboBox with Arrow Down
await page.keyboard.press('Tab');
await expect(combobox).toBeFocused();
await page.keyboard.press('ArrowDown');
await expect(menu).toBeVisible();
// Close with Escape, retain focus, and open with Spacebar
await page.keyboard.press('Escape');
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(combobox).toBeFocused();
await page.keyboard.press('Space');
await expect(menu).toBeVisible();
// Close and clear with Escape, retain focus, and open with Enter
await page.keyboard.press('Escape');
await page.keyboard.press('Escape');
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(combobox).toBeFocused();
await page.keyboard.press('Enter');
await expect(menu).toBeVisible();
Expand All @@ -99,11 +99,11 @@ test.describe('@avt FluidComboBox', () => {
);
// focus comes back to the toggle button after selecting
await expect(combobox).toBeFocused();
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(clearButton).toBeVisible();
// should only clear selection when escape is pressed when the menu is closed
await page.keyboard.press('Escape');
await expect(clearButton).not.toBeVisible();
await expect(clearButton).toBeHidden();
await expect(combobox).toHaveValue('');
// should highlight menu items based on text input
await page.keyboard.press('2');
Expand Down
2 changes: 1 addition & 1 deletion e2e/components/FluidDropdown/FluidDropdown-test.avt.e2e.js
Expand Up @@ -67,7 +67,7 @@ test.describe('@avt FluidDropdown', () => {
await expect(menu).toBeVisible();
// Close with Escape, retain focus, and open with Enter
await page.keyboard.press('Escape');
await expect(menu).not.toBeVisible();
await expect(menu).toBeHidden();
await expect(toggleButton).toBeFocused();
await page.keyboard.press('Enter');
// Should focus on selected item by default
Expand Down

0 comments on commit dbca08f

Please sign in to comment.