Skip to content

chore(react-tree): delegate focus outline to layout components #29293

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
bsunderhus merged 1 commit into from
Oct 3, 2023
Merged

chore(react-tree): delegate focus outline to layout components #29293

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-react-tree-b5db8474-a1ba-4ec8-9c42-18215b9e2632.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: delegate focus outline to layout components",
"packageName": "@fluentui/react-tree",
"email": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "patch"
}
29 changes: 26 additions & 3 deletions packages/react-components/react-tree/src/components/TreeItem/useTreeItemStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { GriffelStyle, makeResetStyles, makeStyles, mergeClasses } from '@griffel/react';
import { GriffelStyle, makeResetStyles, makeStyles, mergeClasses, shorthands } from '@griffel/react';
import type { TreeItemCSSProperties, TreeItemSlots, TreeItemState } from './TreeItem.types';
import type { SlotClassNames } from '@fluentui/react-utilities';
import { tokens } from '@fluentui/react-theme';
import { createFocusOutlineStyle } from '@fluentui/react-tabster';
import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster';
import { treeItemLevelToken } from '../../utils/tokens';
import { treeItemLayoutClassNames } from '../TreeItemLayout/useTreeItemLayoutStyles.styles';
import { treeItemPersonaLayoutClassNames } from '../TreeItemPersonaLayout/useTreeItemPersonaLayoutStyles.styles';

export const treeItemClassNames: SlotClassNames<TreeItemSlots> = {
root: 'fui-TreeItem',
Expand All @@ -18,7 +20,28 @@ const useBaseStyles = makeResetStyles({
backgroundColor: tokens.colorSubtleBackground,
color: tokens.colorNeutralForeground2,
paddingRight: tokens.spacingHorizontalNone,
...createFocusOutlineStyle(),
// if using createCustomFocusIndicatorStyle then we need to remove default outline styles provided by the browser
':focus': {
outlineStyle: 'none',
},
':focus-visible': {
outlineStyle: 'none',
},
// This adds the focus outline for the TreeItemLayout element
...createCustomFocusIndicatorStyle(
{
...shorthands.borderRadius(tokens.borderRadiusMedium),
outlineColor: tokens.colorStrokeFocus2,
outlineRadius: tokens.borderRadiusMedium,
// FIXME: tokens.strokeWidthThick causes some weird bugs
outlineWidth: '2px',
outlineStyle: 'solid',
},
{
customizeSelector: selector =>
`${selector} > .${treeItemLayoutClassNames.root}, ${selector} > .${treeItemPersonaLayoutClassNames.root}`,
},
),
});

type StaticLevel = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
Expand Down
1 change: 0 additions & 1 deletion ...act-components/react-tree/src/components/TreeItemLayout/useTreeItemLayoutStyles.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const useRootBaseStyles = makeResetStyles({
minHeight: '32px',
boxSizing: 'border-box',
...shorthands.gridArea('layout'),
...shorthands.borderRadius(tokens.borderRadiusMedium),
':active': {
color: tokens.colorNeutralForeground2Pressed,
backgroundColor: tokens.colorSubtleBackgroundPressed,
Expand Down