Skip to content

[pull] master from microsoft:master #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 13, 2026
+51 −51
Merged

[pull] master from microsoft:master #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/web-components/src/menu-list/menu-list.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,14 @@ test.describe('MenuList', () => {

test('should navigate to previously hidden items when visibility restored', async ({ fastPage }) => {
const { element } = fastPage;
const menuItems = element.locator('fluent-menu-item');
const menuItems = element.locator(MenuItemTagName);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-menu-item>Menu item 1</fluent-menu-item>
<fluent-menu-item hidden="hidden">Menu item 2</fluent-menu-item>
<fluent-menu-item>Menu item 3</fluent-menu-item>
<fluent-menu-item>Menu item 4</fluent-menu-item>
<${MenuItemTagName}>Menu item 1</${MenuItemTagName}>
<${MenuItemTagName} hidden="hidden">Menu item 2</${MenuItemTagName}>
<${MenuItemTagName}>Menu item 3</${MenuItemTagName}>
<${MenuItemTagName}>Menu item 4</${MenuItemTagName}>
`,
});

Expand Down
92 changes: 46 additions & 46 deletions packages/web-components/src/tree/tree.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,14 @@ test.describe('Tree', () => {
});
test('should move focus down with ArrowDown', async ({ fastPage, page }) => {
const { element } = fastPage;
const treeItems = element.locator(`:scope > fluent-tree-item`);
const treeItems = element.locator(`:scope > ${TreeItemTagName}`);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>Item 1</fluent-tree-item>
<fluent-tree-item>Item 2</fluent-tree-item>
<fluent-tree-item>Item 3</fluent-tree-item>
`,
<${TreeItemTagName}>Item 1</${TreeItemTagName}>
<${TreeItemTagName}>Item 2</${TreeItemTagName}>
<${TreeItemTagName}>Item 3</${TreeItemTagName}>
`,
});

await treeItems.nth(0).focus();
Expand All @@ -266,14 +266,14 @@ test.describe('Tree', () => {

test('should move focus up with ArrowUp', async ({ fastPage, page }) => {
const { element } = fastPage;
const treeItems = element.locator(`:scope > fluent-tree-item`);
const treeItems = element.locator(`:scope > ${TreeItemTagName}`);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>Item 1</fluent-tree-item>
<fluent-tree-item>Item 2</fluent-tree-item>
<fluent-tree-item>Item 3</fluent-tree-item>
`,
<${TreeItemTagName}>Item 1</${TreeItemTagName}>
<${TreeItemTagName}>Item 2</${TreeItemTagName}>
<${TreeItemTagName}>Item 3</${TreeItemTagName}>
`,
});

await treeItems.nth(0).focus();
Expand All @@ -290,15 +290,15 @@ test.describe('Tree', () => {

test('should expand a collapsed item with ArrowRight', async ({ fastPage, page }) => {
const { element } = fastPage;
const parentItem = element.locator(`:scope > fluent-tree-item`);
const parentItem = element.locator(`:scope > ${TreeItemTagName}`);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>
Item 1
<fluent-tree-item slot="item">Nested Item A</fluent-tree-item>
</fluent-tree-item>
`,
<${TreeItemTagName}>
Item 1
<${TreeItemTagName} slot="item">Nested Item A</${TreeItemTagName}>
</${TreeItemTagName}>
`,
});

await parentItem.focus();
Expand All @@ -311,16 +311,16 @@ test.describe('Tree', () => {

test('should focus child after ArrowRight on an expanded item', async ({ fastPage, page }) => {
const { element } = fastPage;
const parentItem = element.locator(`:scope > fluent-tree-item`);
const nestedItem = parentItem.locator('fluent-tree-item');
const parentItem = element.locator(`:scope > ${TreeItemTagName}`);
const nestedItem = parentItem.locator(TreeItemTagName);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>
Item 1
<fluent-tree-item slot="item">Nested Item A</fluent-tree-item>
</fluent-tree-item>
`,
<${TreeItemTagName}>
Item 1
<${TreeItemTagName} slot="item">Nested Item A</${TreeItemTagName}>
</${TreeItemTagName}>
`,
});

await parentItem.focus();
Expand All @@ -336,15 +336,15 @@ test.describe('Tree', () => {

test('should collapse an expanded item with ArrowLeft', async ({ fastPage, page }) => {
const { element } = fastPage;
const parentItem = element.locator(`:scope > fluent-tree-item`);
const parentItem = element.locator(`:scope > ${TreeItemTagName}`);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>
Item 1
<fluent-tree-item slot="item">Nested Item A</fluent-tree-item>
</fluent-tree-item>
`,
<${TreeItemTagName}>
Item 1
<${TreeItemTagName} slot="item">Nested Item A</${TreeItemTagName}>
</${TreeItemTagName}>
`,
});

await parentItem.focus();
Expand All @@ -357,16 +357,16 @@ test.describe('Tree', () => {

test('should focus parent item with ArrowLeft on a nested item', async ({ fastPage, page }) => {
const { element } = fastPage;
const parentItem = element.locator(`:scope > fluent-tree-item`);
const nestedItem = parentItem.locator('fluent-tree-item');
const parentItem = element.locator(`:scope > ${TreeItemTagName}`);
const nestedItem = parentItem.locator(TreeItemTagName);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>
Item 1
<fluent-tree-item slot="item">Nested Item A</fluent-tree-item>
</fluent-tree-item>
`,
<${TreeItemTagName}>
Item 1
<${TreeItemTagName} slot="item">Nested Item A</${TreeItemTagName}>
</${TreeItemTagName}>
`,
});

await parentItem.focus();
Expand All @@ -386,14 +386,14 @@ test.describe('Tree', () => {

test('should focus first item with Home key', async ({ fastPage, page }) => {
const { element } = fastPage;
const treeItems = element.locator(`:scope > fluent-tree-item`);
const treeItems = element.locator(`:scope > ${TreeItemTagName}`);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>Item 1</fluent-tree-item>
<fluent-tree-item>Item 2</fluent-tree-item>
<fluent-tree-item>Item 3</fluent-tree-item>
`,
<${TreeItemTagName}>Item 1</${TreeItemTagName}>
<${TreeItemTagName}>Item 2</${TreeItemTagName}>
<${TreeItemTagName}>Item 3</${TreeItemTagName}>
`,
});

await treeItems.nth(0).focus();
Expand All @@ -407,14 +407,14 @@ test.describe('Tree', () => {

test('should focus last item with End key', async ({ fastPage, page }) => {
const { element } = fastPage;
const treeItems = element.locator(`:scope > fluent-tree-item`);
const treeItems = element.locator(`:scope > ${TreeItemTagName}`);

await fastPage.setTemplate({
innerHTML: /* html */ `
<fluent-tree-item>Item 1</fluent-tree-item>
<fluent-tree-item>Item 2</fluent-tree-item>
<fluent-tree-item>Item 3</fluent-tree-item>
`,
<${TreeItemTagName}>Item 1</${TreeItemTagName}>
<${TreeItemTagName}>Item 2</${TreeItemTagName}>
<${TreeItemTagName}>Item 3</${TreeItemTagName}>
`,
});

await treeItems.nth(0).focus();
Expand Down
Loading