Skip to content
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

fix(List): fix ListTitle getting focus on initialization #2638

Merged
merged 2 commits into from
Dec 10, 2024
Merged

fix(List): fix ListTitle getting focus on initialization #2638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d407cf8
fix(List): fix ListTitle getting focus on initialization
rivka-ungar Dec 9, 2024
452506a
fix seleted item
rivka-ungar Dec 10, 2024
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
21 changes: 19 additions & 2 deletions packages/core/src/components/List/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import React, {
forwardRef,
ReactElement,
useCallback,
useEffect,
useMemo,
useRef,
useState
Expand All @@ -26,6 +27,7 @@ import {
getListItemIndexById,
getNextListItemIndex,
getPrevListItemIndex,
isListItem,
useListId
} from "./utils/ListUtils";
import styles from "./List.module.scss";
Expand Down Expand Up @@ -113,6 +115,20 @@ const List: VibeComponent<ListProps> & {
ref: componentRef
});

useEffect(() => {
const selectedItemIndex = childrenRefs.current.findIndex(
child => isListItem(child) && child?.getAttribute("aria-selected") === "true"
);
if (selectedItemIndex !== -1) {
updateFocusedItem(getListItemIdByIndex(childrenRefs, selectedItemIndex));
} else {
const firstFocusableIndex = childrenRefs.current.findIndex(child => isListItem(child));
if (firstFocusableIndex !== -1) {
updateFocusedItem(getListItemIdByIndex(childrenRefs, firstFocusableIndex));
}
}
}, [updateFocusedItem]);

const overrideChildren = useMemo(() => {
let override: ReactElement | ReactElement[] = Array.isArray(children) ? children : [children];
if (renderOnlyVisibleItems) {
Expand All @@ -123,12 +139,13 @@ const List: VibeComponent<ListProps> & {
if (!React.isValidElement(child)) {
return child;
}

const id = (child.props as { id: string }).id || `${overrideId}-item-${index}`;
const isFocusableItem = isListItem(childrenRefs.current[index]);

return React.cloneElement(child, {
// @ts-ignore not sure how to deal with ref here
ref: ref => (childrenRefs.current[index] = ref),
tabIndex: focusIndex === index ? 0 : -1,
tabIndex: focusIndex === index && isFocusableItem ? 0 : -1,
id,
component: getListItemComponentType(component)
});
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/List/__tests__/__snapshots__/List.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ exports[`List renders correctly with list items 1`] = `
onFocus={[Function]}
onMouseEnter={[Function]}
role="option"
tabIndex={0}
tabIndex={-1}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the bug already existed in the snapshot?? that shows the amount of trust you can get from this kind of testing 😓

>
1
</li>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/components/List/utils/ListUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const getListItemComponentType = (listComponent: ListElement): ListItemEl
}
};

const isListItem = (element: HTMLElement) => {
export const isListItem = (element: HTMLElement) => {
return element && element.getAttribute("role") === "option";
};

Expand Down
Loading