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

SOEOPSFY24-350 | tweak timeline for accessibility #11

Merged
merged 2 commits into from
Dec 18, 2024
Merged

SOEOPSFY24-350 | tweak timeline for accessibility #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c48436
SOEOPSFY24-350 | tweak timeline for accessibility
rebeccahongsf Dec 18, 2024
a4c21f4
save
rebeccahongsf Dec 18, 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
99 changes: 18 additions & 81 deletions components/Timeline/TimelineOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { motion, AnimatePresence } from "framer-motion";
import { useMediaQuery } from "usehooks-ts";
import { TimelineItem as TimelineItemData } from "@/utilities/loadTimelineData";
import { ClipLoader } from "react-spinners";
import { AnimateInView } from "../Animate";

type TimelineProps = {
timelineData: TimelineItemData[];
Expand All @@ -18,8 +19,6 @@ type TimelineProps = {
const TimelineOverview = ({ timelineData }: TimelineProps) => {
const [isMounted, setIsMounted] = useState(false);
const [expandedUuid, setExpandedUuid] = useState<string | null>(null);
const [expandedRowIndex, setExpandedRowIndex] = useState<number | null>(null);
const [focusedTabIndex, setFocusedTabIndex] = useState<number>(0);

// Ensure the component is mounted before running media queries
useEffect(() => {
Expand All @@ -41,55 +40,8 @@ const TimelineOverview = ({ timelineData }: TimelineProps) => {
return acc;
}, []);

const handleToggle = (uuid: string, rowIndex: number) => {
setExpandedUuid((currentUuid) => {
const isSameRow = rowIndex === expandedRowIndex;
const isSameItem = uuid === currentUuid;

if (isSameRow) return isSameItem ? null : uuid;

setExpandedRowIndex(rowIndex);
return uuid;
});
};

const handleKeyDown = (
event: React.KeyboardEvent<HTMLButtonElement>,
itemUuid: string,
rowIndex: number,
) => {
switch (event.key) {
case "Enter":
case " ":
event.preventDefault();
handleToggle(itemUuid, rowIndex);
break;
case "ArrowRight":
case "ArrowDown":
event.preventDefault();
setFocusedTabIndex(
(prevIndex) => (prevIndex + 1) % timelineData.length,
);
break;
case "ArrowLeft":
case "ArrowUp":
event.preventDefault();
setFocusedTabIndex(
(prevIndex) =>
(prevIndex - 1 + timelineData.length) % timelineData.length,
);
break;
case "Home":
event.preventDefault();
setFocusedTabIndex(0);
break;
case "End":
event.preventDefault();
setFocusedTabIndex(timelineData.length - 1);
break;
default:
break;
}
const handleToggle = (uuid: string) => {
setExpandedUuid((currentUuid) => (currentUuid === uuid ? null : uuid));
};

if (!isMounted) {
Expand All @@ -110,49 +62,35 @@ const TimelineOverview = ({ timelineData }: TimelineProps) => {
key={`row-${rowIndex}`}
className="odd:children:children:even:rs-pt-6 even:children:children:odd:rs-pt-6"
>
<div
role="tablist"
aria-label={`Timeline row ${rowIndex + 1}`}
className="flex flex-col items-center md:items-start md:flex-row md:justify-between"
>
<div className="flex flex-col items-center md:items-start md:flex-row md:justify-between">
{row.map((item, itemIndex) => {
const sizePattern: SizeType[] = ["large", "medium", "small"];
const size = sizePattern[itemIndex % sizePattern.length];
const trapezoid = itemIndex % 2 === 0 ? "left" : "right";
const globalIndex = rowIndex * itemsPerRow + itemIndex;

return (
<TimelineItem
{...item}
id={`tab-${item.uuid}`}
role="tab"
aria-selected={expandedUuid === item.uuid}
aria-controls={`tabpanel-${item.uuid}`}
key={item.uuid}
isExpanded={expandedUuid === item.uuid}
size={size}
trapezoid={trapezoid}
onClick={() => handleToggle(item.uuid, rowIndex)}
tabIndex={focusedTabIndex === globalIndex ? 0 : -1}
onKeyDown={(e) => handleKeyDown(e, item.uuid, rowIndex)}
ref={(el) => {
if (focusedTabIndex === globalIndex) {
el?.focus();
}
}}
/>
<AnimateInView key={item.uuid}>
<TimelineItem
{...item}
id={`tab-${item.uuid}`}
role="tab"
aria-expanded={expandedUuid === item.uuid}
aria-controls={`drawer-${item.uuid}`}
isExpanded={expandedUuid === item.uuid}
size={size}
trapezoid={trapezoid}
onClick={() => handleToggle(item.uuid)}
/>
</AnimateInView>
);
})}
</div>

<AnimatePresence>
{expandedUuid &&
expandedRowIndex === rowIndex &&
row.some((item) => item.uuid === expandedUuid) && (
<motion.div
id={`tabpanel-${expandedUuid}`}
role="tabpanel"
aria-labelledby={`tab-${expandedUuid}`}
id={`drawer-${expandedUuid}`}
className="w-full"
initial={{ opacity: 0, height: 0 }}
animate={{ opacity: 1, height: "auto" }}
Expand All @@ -165,7 +103,6 @@ const TimelineOverview = ({ timelineData }: TimelineProps) => {
)!}
onClose={() => {
setExpandedUuid(null);
setExpandedRowIndex(null);
}}
/>
</motion.div>
Expand Down
Loading