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

Feature/smoother sticky date and date highlighting #849

Merged
merged 3 commits into from
Jan 4, 2025
Merged

Feature/smoother sticky date and date highlighting #849

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c661b06
FE: Stats: fixed: switched from sticky to absolute
marcelhillesheim Jan 3, 2025
29820b8
Merge branch 'main' into feature/smoother_sticky_date
marcelhillesheim Jan 4, 2025
3d2cd74
FE: Stats: highlight date on game card hover
marcelhillesheim Jan 4, 2025
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
140 changes: 102 additions & 38 deletions rcongui_public/src/pages/games/horizontal-games-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,42 @@ dayjs.extend(localizedFormat)
export const HorizontalGamesList = ({ games }: { games: ScoreboardMaps }) => {
const { pathname } = useLocation()
const [hiddenDates, setHiddenDates] = useState<Record<string, boolean>>({});
const [hoverGameDate, setHoverGameDate] = useState<string | null>(null);
const scrollAreaRef = useRef<HTMLDivElement>(null);
// is used for sticky dates (position upper left corner of MapCard)
const gameRefs = useRef<Map<string, HTMLDivElement>>(new Map());
const gameBoundingRefs = useRef<Map<number, HTMLDivElement>>(new Map());

const validGames = games.maps.filter(validGame);

/**
* onMouseLeave/onMouseEnter is not triggered during scrolling
* so we have to check manually while scrolling if mouse is within GameCard
*/
useEffect(() => {
const handleMouseMove = (e: any) => {
gameBoundingRefs.current.forEach((item, key) => {
const rect = item.getBoundingClientRect();
if (
e.clientX >= rect.left &&
e.clientX <= rect.right &&
e.clientY >= rect.top &&
e.clientY <= rect.bottom
) {
if (hoverGameDate !== validGames[key].start) {
setHoverGameDate(validGames[key].start);
}
}
});
};

window.addEventListener('wheel', handleMouseMove);

return () => {
window.removeEventListener('wheel', handleMouseMove);
};
}, []);

useEffect(() => {
if (scrollAreaRef.current && gameRefs.current.size > 0) {
const targetElement = Array.from(gameRefs.current.entries()).find(([href, _]) =>
Expand Down Expand Up @@ -56,28 +87,51 @@ export const HorizontalGamesList = ({ games }: { games: ScoreboardMaps }) => {
const stickyDate = visibleDates.length ? dayjsLocal(visibleDates[0][0]) : null;

return (
<ScrollArea ref={scrollAreaRef} className="w-full whitespace-nowrap sm:-mx-4 xl:mx-0 pb-2">
<div className="flex flex-row w-max space-x-2">
<ScrollArea ref={scrollAreaRef} className="w-full whitespace-nowrap sm:-mx-4 xl:mx-0 pb-2 relative overflow-hidden z-auto">
<div className="flex flex-row w-max">
{validGames.map((game, index) => (
<>
<GameCard
key={game.id}
game={game}
pathname={pathname}
ref={(element) => {
if (element) {
gameRefs.current.set(`/games/${game.id}`, element);
} else {
gameRefs.current.delete(`/games/${game.id}`);
}
}}
/>
{!dayjsLocal(game.start).isSame(dayjsLocal(validGames[index + 1]?.start), 'day') &&
<DateCard
key={game.start}
dateString={game.start}
isSticky={!!stickyDate && stickyDate.isSame(dayjsLocal(game.start), 'day')}
<div ref={(element: any) => {
if (element) {
gameBoundingRefs.current.set(index, element);
} else {
gameBoundingRefs.current.delete(index);
}
}}>
<GameCard
key={game.id}
game={game}
pathname={pathname}
onMouseEnter={() => setHoverGameDate(game.start)}
onMouseLeave={() => setHoverGameDate(null)}
ref={(element) => {
if (element) {
gameRefs.current.set(`/games/${game.id}`, element);
} else {
gameRefs.current.delete(`/games/${game.id}`);
}
}}
/>
</div>
{!dayjsLocal(game.start).isSame(dayjsLocal(validGames[index + 1]?.start), 'day') &&
<>
<DateCard
zIndex={validGames.length - index}
key={game.start}
dateString={game.start}
highlight={!!hoverGameDate && dayjsLocal(hoverGameDate).isSame(dayjsLocal(game.start), 'day')}
sticky={false}
/>
{!!stickyDate && stickyDate.isSame(dayjsLocal(game.start), 'day') &&
<DateCard
zIndex={validGames.length - index}
key={`sticky-${game.start}`}
dateString={game.start}
sticky={true}
highlight={!!hoverGameDate && dayjsLocal(hoverGameDate).isSame(dayjsLocal(game.start), 'day')}
/>
}
</>
}
</>
))}
Expand All @@ -89,35 +143,45 @@ export const HorizontalGamesList = ({ games }: { games: ScoreboardMaps }) => {

const GameCard = React.forwardRef(
(
{ game, pathname }: { game: ScoreboardMap; pathname: string },
{ game, pathname, onMouseEnter, onMouseLeave }: { game: ScoreboardMap; pathname: string; onMouseEnter: () => void, onMouseLeave: () => void },
ref: React.Ref<HTMLDivElement>
) => {
return (
<Link to={`/games/${game.id}`} data-date={game.start}>
<div ref={ref} key={game.id} data-date={game.start}/>
<MapFigure
text={dayjsLocal(game.start).format("LT")}
src={`/maps/${game.map.image_name}`}
name={`${game.map.map.pretty_name} (${game.result?.allied ?? '?'}:${game.result?.axis ?? '?'})`}
className={cn(
"group h-20 w-64",
pathname.startsWith(`/games/${game.id}`) && "border-2 border-primary"
)}
/>
<Link
to={`/games/${game.id}`}
data-date={game.start}
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
>
<div className="px-0.5">
<div ref={ref} key={game.id} data-date={game.start}/>
<MapFigure
text={dayjsLocal(game.start).format("LT")}
src={`/maps/${game.map.image_name}`}
name={`${game.map.map.pretty_name} (${game.result?.allied ?? '?'}:${game.result?.axis ?? '?'})`}
className={cn(
"group h-20 w-64",
pathname.startsWith(`/games/${game.id}`) && "border-2 border-primary"
)}
/>
</div>
</Link>
);
}
);
});

const DateCard = ({ dateString, isSticky }: { dateString: string, isSticky: boolean }) => {
const DateCard = ({ dateString, zIndex, highlight, sticky }: { dateString: string, zIndex: number, highlight: boolean, sticky: boolean }) => {
const { t } = useTranslation('translation');
const date = dayjsLocal(dateString);

return (
<div className={cn(
"w-10 h-20 m-auto items-center text-center flex flex-col bg-background z-20",
isSticky && "sticky right-0 shadow-sm z-10"
)}>
<div
className={cn(
"w-14 h-20 m-auto items-center text-center flex flex-col bg-background z-20",
sticky && "absolute right-0 shadow-sm",
highlight && "text-primary",
)}
style={{zIndex: zIndex}}
>
<div className="font-mono font-bold text-sm">{(t(`weekday.${date.day()}` as unknown as TemplateStringsArray) as string).toUpperCase()}</div>
<div className="font-bold text-2xl">{date.date()}</div>
<div className="font-mono font-bold text-lg">{(t(`month.${date.month()}` as unknown as TemplateStringsArray) as string).toUpperCase()}</div>
Expand Down
Loading