chore: ensure TreeItem role can be overridden by props (#33277)

microsoft · Nov 15, 2024 · d766af9 · d766af9
1 parent 072ad5a
commit d766af9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/change/@fluentui-react-tree-a886fa7c-b0f9-4646-8bd7-e9be02201229.json b/change/@fluentui-react-tree-a886fa7c-b0f9-4646-8bd7-e9be02201229.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "chore: ensure TreeItem role can be overridden by props",
+  "packageName": "@fluentui/react-tree",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/react-tree/library/src/components/TreeItem/useTreeItem.tsx b/packages/react-components/react-tree/library/src/components/TreeItem/useTreeItem.tsx
@@ -288,12 +288,11 @@ export function useTreeItem_unstable(props: TreeItemProps, ref: React.Ref<HTMLDi
       getIntrinsicElementProps(as, {
         tabIndex: -1,
         [dataTreeItemValueAttrName]: value,
+        role: 'treeitem',
         ...rest,
         ref: useMergedRefs(ref, treeItemRef),
-        role: 'treeitem',
         'aria-level': level,
         'aria-checked': selectionMode === 'multiselect' ? checked : undefined,
-        // Casting: when selectionMode is 'single', checked is a boolean
         'aria-selected': ariaSelected !== undefined ? ariaSelected : selectionMode === 'single' ? !!checked : undefined,
         'aria-expanded': ariaExpanded !== undefined ? ariaExpanded : itemType === 'branch' ? open : undefined,
         onClick: handleClick,