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: issues with responsive schedule grid #28

Merged
merged 2 commits into from
Oct 6, 2024
Merged

fix: issues with responsive schedule grid #28

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
17dd3d9
fix: switch to render visible columns strategy
glitchedmob Oct 6, 2024
e8526e8
feat: add react-swipable to keep gestures
glitchedmob Oct 6, 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
9 changes: 9 additions & 0 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"openapi-fetch": "^0.12.2",
"react": "^18",
"react-dom": "^18",
"react-swipeable": "^7.0.1",
"sharp": "^0.33.5",
"sweetalert2": "^11.14.1",
"throttle-debounce": "^5.0.2"
Expand Down
25 changes: 3 additions & 22 deletions frontend/src/components/ScheduleGrid/ScheduleGrid.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,15 @@
gap: 1rem;

@media screen(lg) {
grid-template-columns: repeat(var(--grid-template-columns), minmax(calc(50% - 0.5rem), 1fr));
grid-template-columns: repeat(var(--grid-template-columns), minmax(50%, 1fr));
}

@media screen(xl) {
grid-template-columns: repeat(var(--grid-template-columns), minmax(calc(33.3333333% - 0.5rem), 1fr));
grid-template-columns: repeat(var(--grid-template-columns), minmax(33.3333333%, 1fr));
}

@media screen('2xl') {
gap: 2rem;
grid-template-columns: repeat(var(--grid-template-columns), minmax(calc(33.3333333% - 1rem), 1fr));
}
}

.scheduleGrid.hasOneCol,
.scheduleGrid.hasTwoCol {
@media screen(lg) {
grid-template-columns: repeat(var(--grid-template-columns), minmax(calc(50% - 1rem), 1fr));
}
}

.scheduleGrid.hasOneCol,
.scheduleGrid.hasTwoCol,
.scheduleGrid.hasThreeCol {
@media screen(xl) {
grid-template-columns: repeat(var(--grid-template-columns), minmax(calc(33.3333333% - 1rem), 1fr));
}

@media screen('2xl') {
grid-template-columns: repeat(var(--grid-template-columns), minmax(calc(33.3333333% - 2rem), 1fr));
}
}

155 changes: 81 additions & 74 deletions frontend/src/components/ScheduleGrid/ScheduleGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,114 +8,121 @@ import {
import styles from '@/components/ScheduleGrid/ScheduleGrid.module.css';
import { SessionCard } from '@/components/SessionCard';
import type { ParsedSession, TrackWithSessions } from '@/data/types';
import { useStickyTrackHeader } from '@/components/ScheduleGrid/useStickyTrackHeader';
import { useTrackHeaderControls } from '@/components/ScheduleGrid/useTrackHeaderControls';
import { usePartialGridView } from '@/components/ScheduleGrid/usePartialGridView';
import { useSwipeable } from 'react-swipeable';

export interface ScheduleGridProps {
grid: string[][];
sessions: ParsedSession[];
tracks: TrackWithSessions[];
}

const columnStyles = [styles.hasOneCol, styles.hasTwoCol, styles.hasThreeCol];

const trackHeaderId = 'track-header';
const snapPointId = 'snap-point';

const breakpoints = [
{ query: '(max-width: 1023px)', columns: 1 },
{ query: '(min-width: 1024px) and (max-width: 1279px)', columns: 2 },
{ query: '(min-width: 1280px)', columns: 3 },
];

export function ScheduleGrid({ grid, tracks, sessions }: ScheduleGridProps) {
grid = [
tracks.map(() => trackHeaderId),
...grid,
tracks.map((_, index) => `${snapPointId}-${index}`),
];
grid = [tracks.map(() => trackHeaderId), ...grid];
grid = updateGridIds(grid);

const columns = grid[0]?.length ?? 1;
const { scrollAreaRef, headerRef, headerControlsRef } =
useStickyTrackHeader();
const { gridAreaRef, controlState, onControlClick } =
useTrackHeaderControls();
const {
startColumnIndex,
visibleColumns,
handleControl,
isPrevEnabled,
isNextEnabled,
} = usePartialGridView({
grid,
breakpoints,
});

const visibleGrid = grid.map((row) =>
row.slice(startColumnIndex, startColumnIndex + visibleColumns),
);

const uniqueVisibleGridIds = new Set(visibleGrid.flatMap((row) => row));

const visibleTracks = tracks.slice(
startColumnIndex,
startColumnIndex + visibleColumns,
);

const specialColumnSizing = columnStyles[columns] ?? '';
const handlers = useSwipeable({
onSwipedLeft: () => handleControl('next'),
onSwipedRight: () => handleControl('prev'),
trackMouse: true,
preventScrollOnSwipe: true,
});

return (
<div className="relative">
<div
{...handlers}
className={`${styles.scheduleGrid} touch-pan-y`}
style={
{
'--grid-template-columns': visibleColumns,
'--grid-template-areas': visibleGrid
.map((row) => `"${row.join(' ')}"`)
.join('\n'),
} as CSSProperties
}
>
<div
ref={headerControlsRef}
className="absolute top-0 left-0 right-0 w-full z-20 flex justify-between text-white text-2xl p-2"
>
<button
disabled={!controlState.isPrevEnabled}
onClick={() => onControlClick('prev')}
className={`transition-opacity duration-200 ${!controlState.isPrevEnabled ? 'opacity-0' : 'opacity-100'}`}
>
<FontAwesomeIcon icon={faChevronLeft} />
</button>
<button
disabled={!controlState.isNextEnabled}
onClick={() => onControlClick('next')}
className={`transition-opacity duration-200 ${!controlState.isNextEnabled ? 'opacity-0' : 'opacity-100'}`}
>
<FontAwesomeIcon icon={faChevronRight} />
</button>
</div>
<div
ref={(el) => {
scrollAreaRef.current = el;
gridAreaRef.current = el;
className="bg-primary sticky top-0"
style={{
gridArea: createGridAreaId(trackHeaderId),
}}
className={`${styles.scheduleGrid} ${specialColumnSizing} overflow-x-scroll snap-x snap-mandatory overflow-y-hidden relative`}
style={
{
'--grid-template-columns': tracks.length,
'--grid-template-areas': grid
.map((row) => `"${row.join(' ')}"`)
.join('\n'),
} as CSSProperties
}
>
<div
ref={headerRef}
className="bg-primary relative origin-top will-change-transform overflow-hidden"
style={{
gridArea: createGridAreaId(trackHeaderId),
}}
>
<div className="flex text-white text-2xl">
<button
className={`p-2 transition-opacity duration-300 ${isPrevEnabled ? 'opacity-100' : 'opacity-0'}`}
onClick={() => handleControl('prev')}
>
<FontAwesomeIcon icon={faChevronLeft} />
</button>
<div className="flex w-full">
{tracks.map((track) => (
{visibleTracks.map((track) => (
<div className="p-2 flex-1" key={track.id}>
<div className="text-center text-white">
<h3 className="text-xl xl:text-4xl font-thin">
<h3 className="text-xl xl:text-4xl font-bold">
{track.name}
</h3>
</div>
</div>
))}
</div>
<button
className={`p-2 transition-opacity duration-300 ${isNextEnabled ? 'opacity-100' : 'opacity-0'}`}
onClick={() => handleControl('next')}
>
<FontAwesomeIcon icon={faChevronRight} />
</button>
</div>
{sessions.map((session) => (
</div>
{sessions.map((session) => {
const gridAreaId = createGridAreaId(
getEndPath(session.route.path),
);

return (
<SessionCard
key={session.id}
session={session}
style={{
gridArea: createGridAreaId(
getEndPath(session.route.path),
),
gridArea: gridAreaId,
}}
className={
!uniqueVisibleGridIds.has(gridAreaId)
? 'hidden'
: ''
}
/>
))}
{tracks.map((track, index) => (
<div
key={`${snapPointId}-${track.id}`}
style={{
gridArea: createGridAreaId(
`${snapPointId}-${index}`,
),
}}
className="snap-start w-0 pointer-events-none h-full"
></div>
))}
</div>
);
})}
</div>
);
}
Expand Down
78 changes: 78 additions & 0 deletions frontend/src/components/ScheduleGrid/usePartialGridView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
import { useCallback, useEffect, useState } from 'react';

export interface UsePartialGridViewArgs {
grid: string[][];
breakpoints: { query: string; columns: number }[];
}

export function usePartialGridView({
grid,
breakpoints,
}: UsePartialGridViewArgs) {
const totalColumns = grid[0]?.length ?? 1;
const [visibleColumns, setVisibleColumns] = useState(
Math.min(totalColumns, 3),
);
const [startColumnIndex, setStartColumnIndex] = useState(0);
const maxStartIndex = Math.max(totalColumns - visibleColumns, 0);

const handleControl = useCallback(
(direction: 'next' | 'prev') => {
if (direction === 'next') {
setStartColumnIndex((prevIndex) =>
Math.min(prevIndex + 1, maxStartIndex),
);
} else {
setStartColumnIndex((prevIndex) => Math.max(prevIndex - 1, 0));
}
},
[maxStartIndex],
);

useEffect(() => {
const mediaQueries = breakpoints.map((bp) => ({
...bp,
mediaQueryList: window.matchMedia(bp.query),
}));

const updateVisibleColumns = () => {
for (const bp of mediaQueries) {
if (bp.mediaQueryList.matches) {
setVisibleColumns(bp.columns);
break;
}
}

setStartColumnIndex((prevIndex) => {
const maxStartIndex = Math.max(
totalColumns - visibleColumns,
0,
);
return Math.min(prevIndex, maxStartIndex);
});
};

updateVisibleColumns();

mediaQueries.forEach((bp) =>
bp.mediaQueryList.addEventListener('change', updateVisibleColumns),
);

return () => {
mediaQueries.forEach((bp) =>
bp.mediaQueryList.removeEventListener(
'change',
updateVisibleColumns,
),
);
};
}, [breakpoints, totalColumns, visibleColumns]);

return {
startColumnIndex,
visibleColumns,
handleControl,
isPrevEnabled: startColumnIndex !== 0,
isNextEnabled: startColumnIndex < maxStartIndex,
};
}
Loading