Skip to content

Commit b2f561a

Browse files
authored
Revert "feat(RAC Breadcrumbs): add autoFocusCurrent to RAC Breadcrumbs (#6325)" (#6407)
This reverts commit 122d0c8.
1 parent d80999e commit b2f561a

File tree

3 files changed

+12
-71
lines changed

3 files changed

+12
-71
lines changed

packages/react-aria-components/src/Breadcrumbs.tsx

+12-20
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ export interface BreadcrumbsProps<T> extends Omit<CollectionProps<T>, 'disabledK
2222
/** Whether the breadcrumbs are disabled. */
2323
isDisabled?: boolean,
2424
/** Handler that is called when a breadcrumb is clicked. */
25-
onAction?: (key: Key) => void,
26-
/** Whether to autoFocus the last Breadcrumb item when the Breadcrumbs render. */
27-
autoFocusCurrent?: boolean
25+
onAction?: (key: Key) => void
2826
}
2927

3028
export const BreadcrumbsContext = createContext<ContextValue<BreadcrumbsProps<any>, HTMLOListElement>>(null);
@@ -56,18 +54,14 @@ function BreadcrumbsInner<T extends object>({props, collection, breadcrumbsRef:
5654
slot={props.slot || undefined}
5755
style={props.style}
5856
className={props.className ?? 'react-aria-Breadcrumbs'}>
59-
{[...collection].map((node, i) => {
60-
let isCurrent = i === collection.size - 1;
61-
return (
62-
<BreadcrumbItem
63-
key={node.key}
64-
node={node}
65-
isCurrent={isCurrent}
66-
isDisabled={props.isDisabled}
67-
onAction={props.onAction}
68-
autoFocus={props.autoFocusCurrent && isCurrent} />
69-
);
70-
})}
57+
{[...collection].map((node, i) => (
58+
<BreadcrumbItem
59+
key={node.key}
60+
node={node}
61+
isCurrent={i === collection.size - 1}
62+
isDisabled={props.isDisabled}
63+
onAction={props.onAction} />
64+
))}
7165
</ol>
7266
);
7367
}
@@ -99,17 +93,15 @@ interface BreadcrumbItemProps {
9993
node: Node<object>,
10094
isCurrent: boolean,
10195
isDisabled?: boolean,
102-
onAction?: (key: Key) => void,
103-
autoFocus?: boolean
96+
onAction?: (key: Key) => void
10497
}
10598

106-
function BreadcrumbItem({node, isCurrent, isDisabled, onAction, autoFocus}: BreadcrumbItemProps) {
99+
function BreadcrumbItem({node, isCurrent, isDisabled, onAction}: BreadcrumbItemProps) {
107100
// Recreating useBreadcrumbItem because we want to use composition instead of having the link builtin.
108101
let linkProps = {
109102
'aria-current': isCurrent ? 'page' : null,
110103
isDisabled: isDisabled || isCurrent,
111-
onPress: () => onAction?.(node.key),
112-
autoFocus: autoFocus
104+
onPress: () => onAction?.(node.key)
113105
};
114106

115107
return (

packages/react-aria-components/stories/Breadcrumbs.stories.tsx

-38
This file was deleted.

packages/react-aria-components/test/Breadcrumbs.test.js

-13
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,4 @@ describe('Breadcrumbs', () => {
103103
let item = getByRole('listitem');
104104
expect(breadcrumbRef.current).toBe(item);
105105
});
106-
107-
it('should support autoFocusCurrent', () => {
108-
let {getAllByRole} = render(
109-
<Breadcrumbs autoFocusCurrent>
110-
<Breadcrumb><Link href="/">Home</Link></Breadcrumb>
111-
<Breadcrumb><Link href="/react-aria">React Aria</Link></Breadcrumb>
112-
<Breadcrumb><Link href="/react-aria">useBreadcrumbs</Link></Breadcrumb>
113-
</Breadcrumbs>
114-
);
115-
116-
let links = getAllByRole('link');
117-
expect(links[2]).toHaveFocus();
118-
});
119106
});

0 commit comments

Comments
 (0)