diff --git a/change/@fluentui-contrib-react-tree-grid-c0ce56d3-c939-4b8c-a0bf-323d05935f0e.json b/change/@fluentui-contrib-react-tree-grid-c0ce56d3-c939-4b8c-a0bf-323d05935f0e.json new file mode 100644 index 00000000..c2629a08 --- /dev/null +++ b/change/@fluentui-contrib-react-tree-grid-c0ce56d3-c939-4b8c-a0bf-323d05935f0e.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "fix: TreeGrid components should allow tabster override", + "packageName": "@fluentui-contrib/react-tree-grid", + "email": "lingfangao@hotmail.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-tree-grid/src/components/TreeGrid/TreeGrid.tsx b/packages/react-tree-grid/src/components/TreeGrid/TreeGrid.tsx index f54ff4c0..5507f9ab 100644 --- a/packages/react-tree-grid/src/components/TreeGrid/TreeGrid.tsx +++ b/packages/react-tree-grid/src/components/TreeGrid/TreeGrid.tsx @@ -20,8 +20,8 @@ export const TreeGrid = React.forwardRef( getIntrinsicElementProps('div', { ref, role: 'treegrid', - ...props, ...navigationProps, + ...props, className: mergeClasses('fui-TreeGrid', props.className), }), { elementType: 'div' } diff --git a/packages/react-tree-grid/src/components/TreeGridRow/TreeGridRow.tsx b/packages/react-tree-grid/src/components/TreeGridRow/TreeGridRow.tsx index fe08f1aa..9bd798ea 100644 --- a/packages/react-tree-grid/src/components/TreeGridRow/TreeGridRow.tsx +++ b/packages/react-tree-grid/src/components/TreeGridRow/TreeGridRow.tsx @@ -86,9 +86,9 @@ export const TreeGridRow = React.forwardRef( role: 'row', tabIndex: 0, 'aria-level': level, + ...tabsterAttributes, ...props, className: mergeClasses(styles, props.className), - ...tabsterAttributes, ...(Subtree && { onKeyDown: handleKeyDown, onClick: handleClick,