fix: smooth auction timer bar
This commit is contained in:
1 parent
55b80e62cd
commit
9c69e35cfa
1 file changed
+205
-37
@@ -3,6 +3,7 @@ import {
|
|||||||
memo,
|
memo,
|
||||||
Suspense,
|
Suspense,
|
||||||
useEffect,
|
useEffect,
|
||||||
|
useLayoutEffect,
|
||||||
useMemo,
|
useMemo,
|
||||||
useRef,
|
useRef,
|
||||||
useState,
|
useState,
|
||||||
@@ -161,6 +162,7 @@ const POSITION_TO_RIOT_LANE = {
|
|||||||
ADC: 'BOTTOM',
|
ADC: 'BOTTOM',
|
||||||
SUP: 'UTILITY',
|
SUP: 'UTILITY',
|
||||||
} as const;
|
} as const;
|
||||||
|
const LIVE_TIMER_TICK_MS = 100;
|
||||||
|
|
||||||
function getAuctionTeamSize(team: AuctionStateView['teams'][number]) {
|
function getAuctionTeamSize(team: AuctionStateView['teams'][number]) {
|
||||||
return team.members.length + 1;
|
return team.members.length + 1;
|
||||||
@@ -240,15 +242,189 @@ function PosBadge({ pos }: { pos: Position }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function TimerBar({ timer, maxTimer }: { timer: number; maxTimer: number }) {
|
function getLiveRemainingSeconds(
|
||||||
const pct = maxTimer > 0 ? (timer / maxTimer) * 100 : 0;
|
deadline: string | undefined,
|
||||||
const urgent = timer <= 5;
|
serverTimeOffsetMs: number,
|
||||||
|
) {
|
||||||
|
if (!deadline) return 0;
|
||||||
|
|
||||||
|
const deadlineTimestampMS = Date.parse(deadline);
|
||||||
|
if (!Number.isFinite(deadlineTimestampMS)) return 0;
|
||||||
|
|
||||||
|
return Math.max(
|
||||||
|
0,
|
||||||
|
(deadlineTimestampMS - (Date.now() + serverTimeOffsetMs)) / 1000,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function useLiveRemainingSeconds(
|
||||||
|
deadline: string | undefined,
|
||||||
|
serverTimeOffsetMs: number,
|
||||||
|
enabled: boolean,
|
||||||
|
) {
|
||||||
|
const [remainingSeconds, setRemainingSeconds] = useState(() =>
|
||||||
|
getLiveRemainingSeconds(deadline, serverTimeOffsetMs),
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let timeoutId: ReturnType<typeof window.setTimeout> | null = null;
|
||||||
|
let timerId: ReturnType<typeof window.setInterval> | null = null;
|
||||||
|
const updateRemainingSeconds = () => {
|
||||||
|
const nextRemainingSeconds = getLiveRemainingSeconds(
|
||||||
|
deadline,
|
||||||
|
serverTimeOffsetMs,
|
||||||
|
);
|
||||||
|
setRemainingSeconds(nextRemainingSeconds);
|
||||||
|
|
||||||
|
if (nextRemainingSeconds <= 0 && timerId) {
|
||||||
|
window.clearInterval(timerId);
|
||||||
|
timerId = null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
timeoutId = window.setTimeout(updateRemainingSeconds, 0);
|
||||||
|
if (!enabled) {
|
||||||
|
return () => {
|
||||||
|
if (timeoutId) window.clearTimeout(timeoutId);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
timerId = window.setInterval(
|
||||||
|
updateRemainingSeconds,
|
||||||
|
LIVE_TIMER_TICK_MS,
|
||||||
|
);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (timeoutId) window.clearTimeout(timeoutId);
|
||||||
|
if (timerId) window.clearInterval(timerId);
|
||||||
|
};
|
||||||
|
}, [deadline, enabled, serverTimeOffsetMs]);
|
||||||
|
|
||||||
|
return remainingSeconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
function useIsDeadlineExpired(
|
||||||
|
deadline: string | undefined,
|
||||||
|
serverTimeOffsetMs: number,
|
||||||
|
enabled: boolean,
|
||||||
|
) {
|
||||||
|
const [isExpired, setIsExpired] = useState(
|
||||||
|
() => getLiveRemainingSeconds(deadline, serverTimeOffsetMs) <= 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let syncTimeoutId: ReturnType<typeof window.setTimeout> | null = null;
|
||||||
|
let expireTimeoutId: ReturnType<typeof window.setTimeout> | null = null;
|
||||||
|
|
||||||
|
const remainingMs =
|
||||||
|
getLiveRemainingSeconds(deadline, serverTimeOffsetMs) * 1000;
|
||||||
|
|
||||||
|
syncTimeoutId = window.setTimeout(() => {
|
||||||
|
setIsExpired(remainingMs <= 0);
|
||||||
|
}, 0);
|
||||||
|
|
||||||
|
if (enabled && remainingMs > 0) {
|
||||||
|
expireTimeoutId = window.setTimeout(() => {
|
||||||
|
setIsExpired(true);
|
||||||
|
}, remainingMs);
|
||||||
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (syncTimeoutId) window.clearTimeout(syncTimeoutId);
|
||||||
|
if (expireTimeoutId) window.clearTimeout(expireTimeoutId);
|
||||||
|
};
|
||||||
|
}, [deadline, enabled, serverTimeOffsetMs]);
|
||||||
|
|
||||||
|
return isExpired;
|
||||||
|
}
|
||||||
|
|
||||||
|
function AuctionTimerText({
|
||||||
|
deadline,
|
||||||
|
serverTimeOffsetMs,
|
||||||
|
}: {
|
||||||
|
deadline: string | undefined;
|
||||||
|
serverTimeOffsetMs: number;
|
||||||
|
}) {
|
||||||
|
const timer = useLiveRemainingSeconds(deadline, serverTimeOffsetMs, true);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full h-1.5 bg-base-content/5">
|
<span
|
||||||
|
className={`text-lg font-black tabular-nums ${timer <= 5 ? 'text-red-500' : 'text-base-content'}`}
|
||||||
|
>
|
||||||
|
{timer.toFixed(1)}s
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function TimerBar({
|
||||||
|
deadline,
|
||||||
|
maxTimer,
|
||||||
|
serverTimeOffsetMs,
|
||||||
|
}: {
|
||||||
|
deadline: string | undefined;
|
||||||
|
maxTimer: number;
|
||||||
|
serverTimeOffsetMs: number;
|
||||||
|
}) {
|
||||||
|
const barRef = useRef<HTMLDivElement>(null);
|
||||||
|
const serverTimeOffsetRef = useRef(serverTimeOffsetMs);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
serverTimeOffsetRef.current = serverTimeOffsetMs;
|
||||||
|
}, [serverTimeOffsetMs]);
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
const bar = barRef.current;
|
||||||
|
if (!bar) return;
|
||||||
|
|
||||||
|
let animationFrameId: number | null = null;
|
||||||
|
let urgentTimeoutId: ReturnType<typeof window.setTimeout> | null = null;
|
||||||
|
const remainingSeconds = getLiveRemainingSeconds(
|
||||||
|
deadline,
|
||||||
|
serverTimeOffsetRef.current,
|
||||||
|
);
|
||||||
|
const nextScale =
|
||||||
|
maxTimer > 0
|
||||||
|
? Math.max(0, Math.min(1, remainingSeconds / maxTimer))
|
||||||
|
: 0;
|
||||||
|
|
||||||
|
bar.style.transition = 'none';
|
||||||
|
bar.style.transform = `scaleX(${nextScale})`;
|
||||||
|
bar.classList.toggle('bg-red-500', remainingSeconds <= 5);
|
||||||
|
bar.classList.toggle('bg-primary', remainingSeconds > 5);
|
||||||
|
void bar.offsetWidth;
|
||||||
|
|
||||||
|
if (remainingSeconds > 5) {
|
||||||
|
urgentTimeoutId = window.setTimeout(() => {
|
||||||
|
bar.classList.remove('bg-primary');
|
||||||
|
bar.classList.add('bg-red-500');
|
||||||
|
}, (remainingSeconds - 5) * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
animationFrameId = window.requestAnimationFrame(() => {
|
||||||
|
const currentRemainingSeconds = getLiveRemainingSeconds(
|
||||||
|
deadline,
|
||||||
|
serverTimeOffsetRef.current,
|
||||||
|
);
|
||||||
|
bar.style.transition = `transform ${Math.round(
|
||||||
|
currentRemainingSeconds * 1000,
|
||||||
|
)}ms linear`;
|
||||||
|
bar.style.transform = 'scaleX(0)';
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (animationFrameId !== null) {
|
||||||
|
window.cancelAnimationFrame(animationFrameId);
|
||||||
|
}
|
||||||
|
if (urgentTimeoutId) window.clearTimeout(urgentTimeoutId);
|
||||||
|
};
|
||||||
|
}, [deadline, maxTimer]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-1.5 w-full overflow-hidden bg-base-content/5">
|
||||||
<div
|
<div
|
||||||
className={`h-full transition-all duration-300 linear ${urgent ? 'bg-red-500' : 'bg-primary'}`}
|
ref={barRef}
|
||||||
style={{ width: `${pct}%` }}
|
className="h-full origin-left transform-gpu bg-primary will-change-transform"
|
||||||
|
style={{ transform: 'scaleX(0)' }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -712,11 +888,13 @@ function BidControls({
|
|||||||
state,
|
state,
|
||||||
captainRole,
|
captainRole,
|
||||||
isBidPending,
|
isBidPending,
|
||||||
|
serverTimeOffsetMs,
|
||||||
onBid,
|
onBid,
|
||||||
}: {
|
}: {
|
||||||
state: AuctionStateView;
|
state: AuctionStateView;
|
||||||
captainRole: CaptainRole | null;
|
captainRole: CaptainRole | null;
|
||||||
isBidPending: boolean;
|
isBidPending: boolean;
|
||||||
|
serverTimeOffsetMs: number;
|
||||||
onBid: (teamIndex: number, amount: number) => void;
|
onBid: (teamIndex: number, amount: number) => void;
|
||||||
}) {
|
}) {
|
||||||
const [bidAmount, setBidAmount] = useState(100);
|
const [bidAmount, setBidAmount] = useState(100);
|
||||||
@@ -731,7 +909,11 @@ function BidControls({
|
|||||||
: 0;
|
: 0;
|
||||||
const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0;
|
const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0;
|
||||||
const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid;
|
const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid;
|
||||||
const isBidExpired = state.remainingMs <= 0;
|
const isBidExpired = useIsDeadlineExpired(
|
||||||
|
state.deadline,
|
||||||
|
serverTimeOffsetMs,
|
||||||
|
state.phase === 'bidding',
|
||||||
|
);
|
||||||
const effectiveBidAmount = activeTeam
|
const effectiveBidAmount = activeTeam
|
||||||
? Math.min(maxBid, Math.max(minBid, bidAmount))
|
? Math.min(maxBid, Math.max(minBid, bidAmount))
|
||||||
: Math.max(minBid, bidAmount);
|
: Math.max(minBid, bidAmount);
|
||||||
@@ -902,7 +1084,6 @@ export default function AuctionPage() {
|
|||||||
const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID);
|
const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID);
|
||||||
const socket = useAuctionSocket(id);
|
const socket = useAuctionSocket(id);
|
||||||
const captainTeamIndex = useDevCaptainTeamIndex();
|
const captainTeamIndex = useDevCaptainTeamIndex();
|
||||||
const [now, setNow] = useState(() => Date.now());
|
|
||||||
const [assignedPosition, setAssignedPosition] = useState<Position>('MID');
|
const [assignedPosition, setAssignedPosition] = useState<Position>('MID');
|
||||||
const [showCancelModal, setShowCancelModal] = useState(false);
|
const [showCancelModal, setShowCancelModal] = useState(false);
|
||||||
const [cancelConfirmText, setCancelConfirmText] = useState('');
|
const [cancelConfirmText, setCancelConfirmText] = useState('');
|
||||||
@@ -937,40 +1118,19 @@ export default function AuctionPage() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const timer = window.setInterval(() => setNow(Date.now()), 250);
|
|
||||||
return () => window.clearInterval(timer);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!showCancelModal) return;
|
if (!showCancelModal) return;
|
||||||
cancelConfirmInputRef.current?.focus();
|
cancelConfirmInputRef.current?.focus();
|
||||||
}, [showCancelModal]);
|
}, [showCancelModal]);
|
||||||
|
|
||||||
const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data);
|
const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data);
|
||||||
const syncedNow = now + socket.serverTimeOffsetMs;
|
const auctionState = useMemo(
|
||||||
const baseAuctionState = useMemo(
|
|
||||||
() =>
|
() =>
|
||||||
liveAuction && matchQuery.data
|
liveAuction && matchQuery.data
|
||||||
? mapApiAuctionToAuctionState(liveAuction, matchQuery.data)
|
? mapApiAuctionToAuctionState(liveAuction, matchQuery.data)
|
||||||
: null,
|
: null,
|
||||||
[liveAuction, matchQuery.data],
|
[liveAuction, matchQuery.data],
|
||||||
);
|
);
|
||||||
const auctionState = useMemo(() => {
|
|
||||||
if (!baseAuctionState) return null;
|
|
||||||
const deadlineTimestampMS = baseAuctionState.deadline
|
|
||||||
? Date.parse(baseAuctionState.deadline)
|
|
||||||
: undefined;
|
|
||||||
const remainingMs =
|
|
||||||
typeof deadlineTimestampMS === 'number' && Number.isFinite(deadlineTimestampMS)
|
|
||||||
? Math.max(0, deadlineTimestampMS - syncedNow)
|
|
||||||
: 0;
|
|
||||||
return {
|
|
||||||
...baseAuctionState,
|
|
||||||
remainingMs,
|
|
||||||
timer: Math.floor(remainingMs / 1000),
|
|
||||||
};
|
|
||||||
}, [baseAuctionState, syncedNow]);
|
|
||||||
const availableTeamIndexes = useMemo(() => {
|
const availableTeamIndexes = useMemo(() => {
|
||||||
const indexes = new Set((auctionState?.teams ?? []).map((team) => team.teamIndex));
|
const indexes = new Set((auctionState?.teams ?? []).map((team) => team.teamIndex));
|
||||||
return [...indexes].sort((left, right) => left - right);
|
return [...indexes].sort((left, right) => left - right);
|
||||||
@@ -1225,11 +1385,10 @@ export default function AuctionPage() {
|
|||||||
{phaseLabel[auctionState.phase]}
|
{phaseLabel[auctionState.phase]}
|
||||||
</span>
|
</span>
|
||||||
{auctionState.phase === 'bidding' && (
|
{auctionState.phase === 'bidding' && (
|
||||||
<span
|
<AuctionTimerText
|
||||||
className={`text-lg font-black tabular-nums ${auctionState.timer <= 5 ? 'text-red-500' : 'text-base-content'}`}
|
deadline={auctionState.deadline}
|
||||||
>
|
serverTimeOffsetMs={socket.serverTimeOffsetMs}
|
||||||
{auctionState.timer}s
|
/>
|
||||||
</span>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-2 text-xs text-base-content/40">
|
<div className="flex items-center gap-2 text-xs text-base-content/40">
|
||||||
@@ -1257,9 +1416,17 @@ export default function AuctionPage() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{auctionState.phase === 'bidding' && (
|
<div className="h-1.5">
|
||||||
<TimerBar timer={auctionState.timer} maxTimer={auctionState.maxTimer} />
|
{auctionState.phase === 'bidding' ? (
|
||||||
|
<TimerBar
|
||||||
|
deadline={auctionState.deadline}
|
||||||
|
maxTimer={auctionState.maxTimer}
|
||||||
|
serverTimeOffsetMs={socket.serverTimeOffsetMs}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div aria-hidden className="h-full" />
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-1 xl:grid-cols-[260px_minmax(0,1fr)_minmax(340px,440px)_320px] gap-4 mt-4">
|
<div className="grid grid-cols-1 xl:grid-cols-[260px_minmax(0,1fr)_minmax(340px,440px)_320px] gap-4 mt-4">
|
||||||
<aside className="hidden xl:block">
|
<aside className="hidden xl:block">
|
||||||
@@ -1324,6 +1491,7 @@ export default function AuctionPage() {
|
|||||||
state={auctionState}
|
state={auctionState}
|
||||||
captainRole={captainRole}
|
captainRole={captainRole}
|
||||||
isBidPending={socket.isBidPending}
|
isBidPending={socket.isBidPending}
|
||||||
|
serverTimeOffsetMs={socket.serverTimeOffsetMs}
|
||||||
onBid={(teamIndex, amount) =>
|
onBid={(teamIndex, amount) =>
|
||||||
socket.placeBid({
|
socket.placeBid({
|
||||||
bidderTeamIndex: teamIndex,
|
bidderTeamIndex: teamIndex,
|
||||||
|
|||||||
Reference in new issue
Block a user