Skip to content

[pull] master from microsoft:master #537

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
Jul 10, 2026
Merged

[pull] master from microsoft:master #537

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
7 changes: 7 additions & 0 deletions change/@fluentui-web-components-9c7dc48c-180c-4d64-aeb6-b7e3f1415e45.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix focusgroup in tree when focusgroup is natively supported",
"packageName": "@fluentui/web-components",
"email": "machi@microsoft.com",
"dependentChangeType": "patch"
}
1 change: 0 additions & 1 deletion packages/web-components/src/tree/tree.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<f-template name="fluent-tree" shadowrootmode="open">
<template
tabindex="0"
focusgroup="menu inline block nowrap nomemory"
@click="{clickHandler($e)}"
@keydown="{keydownHandler($e)}"
Expand Down
3 changes: 1 addition & 2 deletions packages/web-components/src/tree/tree.template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ import type { Tree } from './tree.js';

export const template = html<Tree>`
<template
tabindex="0"
focusgroup="menu inline block nowrap nomemory"
@click="${(x, c) => x.clickHandler(c.event)}"
@keydown="${(x, c) => x.keydownHandler(c.event as KeyboardEvent)}"
@change="${(x, c) => x.changeHandler(c.event)}"
@toggle="${(x, c) => x.itemToggleHandler()}"
@toggle="${x => x.itemToggleHandler()}"
>
<slot ${ref('defaultSlot')} @slotchange="${x => x.handleDefaultSlotChange()}"></slot>
</template>
Expand Down
Loading