Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 3 additions & 13 deletions src/components/Snackbar/SnackbarContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export const SnackbarContainer: FC<SnackbarContainerProps> = ({
}) => {
const [snacks, setSnacks] = useState<SnackbarProps[]>([]);
const closeButtonRefs = useRef<Map<string, HTMLButtonElement>>(new Map());
const firstTabPressedRef = useRef<boolean>(false);

const [snackbarLocale] = useLocaleReceiver('Snackbar');
let mergedLocale: SnackbarLocale;
Expand Down Expand Up @@ -62,11 +61,10 @@ export const SnackbarContainer: FC<SnackbarContainerProps> = ({
return;
}

// First tab interception
if (e.key === 'Tab' && !firstTabPressedRef.current) {
// Handle tab interception
if (e.key === 'Tab') {
e.preventDefault();
firstTabPressedRef.current = true;
// Focus the first closable snackbar's close button
// Move focus to the first closable snackbar's close button
const firstSnack = closableSnacks[0];
const firstButton = closeButtonRefs.current.get(firstSnack.id!);
firstButton?.focus();
Expand Down Expand Up @@ -110,14 +108,6 @@ export const SnackbarContainer: FC<SnackbarContainerProps> = ({
};
}, [snacks]);

// Reset firstTabPressed when no closable snacks exist
useEffect(() => {
const closableSnacks = snacks.filter((snack) => snack.closable);
if (closableSnacks.length === 0) {
firstTabPressedRef.current = false;
}
}, [snacks]);

const positionToClassMap: Record<SnackbarPosition, string> = {
'top-left': styles.topLeft,
'top-right': styles.topRight,
Expand Down