Simplify activity copy and open calendar at newest days
Deploy Frontend / deploy (push) Successful in 6m40s
Deploy Frontend / deploy (push) Successful in 6m40s
This commit is contained in:
1 parent
12a79b38de
commit
772b40d4e9
2 files changed
+69
-21
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { render, screen, fireEvent } from '@testing-library/react';
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import { describe, it, expect, vi } from 'vitest';
|
||||
import ActivityGrid, { ActivityData } from '../app/(routes)/(website)/components/activity/activity-grid';
|
||||
const data: ActivityData = {
|
||||
timezone: 'Asia/Tehran', from: '2025-11-19', to: '2026-11-18', updated_at: '2026-11-18T10:00:00+03:30',
|
||||
@@ -7,7 +7,21 @@ const data: ActivityData = {
|
||||
stats: {total:3, active_days:1, daily_average:0.01, longest_streak:1}, months:[{month:'2026-11',count:3}]
|
||||
};
|
||||
describe('Activity aggregate view (isolated fixtures)', () => {
|
||||
it('aligns after async data and resize, then respects visitor scroll', () => {
|
||||
let resize = () => {};
|
||||
vi.stubGlobal('ResizeObserver', class { constructor(callback: () => void) { resize = callback; } observe() {} disconnect() {} });
|
||||
const width = vi.spyOn(HTMLElement.prototype, 'clientWidth', 'get').mockReturnValue(280);
|
||||
const scroll = vi.spyOn(HTMLElement.prototype, 'scrollWidth', 'get').mockReturnValue(852);
|
||||
const { container, rerender, unmount } = render(<ActivityGrid data={null} locale="fa" />);
|
||||
rerender(<ActivityGrid data={data} locale="fa" />);
|
||||
const element = container.querySelector('[data-activity-scroll]') as HTMLElement;
|
||||
expect(element.scrollLeft).toBe(572);
|
||||
width.mockReturnValue(400); resize(); expect(element.scrollLeft).toBe(452);
|
||||
fireEvent.touchStart(element); element.scrollLeft = 100;
|
||||
width.mockReturnValue(300); resize(); expect(element.scrollLeft).toBe(100);
|
||||
unmount(); width.mockRestore(); scroll.mockRestore(); vi.unstubAllGlobals();
|
||||
});
|
||||
it('shows honest unavailable without invented statistics', () => { render(<ActivityGrid data={null} locale="en" />); expect(screen.getByRole('status')).toHaveTextContent('unavailable'); expect(screen.queryByText('Active days')).not.toBeInTheDocument(); });
|
||||
it('renders daily accessible selection and real supplied stats', () => { const {container}=render(<ActivityGrid data={data} locale="en" />); const days=screen.getAllByRole('button'); expect(days).toHaveLength(365); fireEvent.click(days[364]); expect(container.querySelector('[aria-live]')).toHaveTextContent('3 contributions'); expect(screen.getByText('Daily average')).toBeInTheDocument(); });
|
||||
it('renders daily accessible selection and real supplied stats', () => { const {container}=render(<ActivityGrid data={data} locale="en" />); const days=screen.getAllByRole('button'); expect(days).toHaveLength(365); fireEvent.click(days[364]); expect(container.querySelector('[aria-live]')).toHaveTextContent('3 activities'); expect(screen.queryByText('Daily average')).not.toBeInTheDocument(); expect(container.querySelector('[data-activity-scroll]')).toHaveAttribute('dir','ltr'); expect(screen.getByText('My activity')).toBeInTheDocument(); expect(screen.getByText('November 2026')).toBeInTheDocument(); });
|
||||
it('renders Persian with RTL and translated state', () => {const {container}=render(<ActivityGrid data={data} locale="fa" />); expect(container.querySelector('section')).toHaveAttribute('dir','rtl'); expect(screen.getByText('روز فعال')).toBeInTheDocument(); });
|
||||
});
|
||||
@@ -1,5 +1,5 @@
|
||||
"use client";
|
||||
import { useState } from "react";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
export type ActivityData = {
|
||||
timezone: string; from: string; to: string; updated_at: string;
|
||||
days: { date: string; count: number }[];
|
||||
@@ -9,32 +9,66 @@ export type ActivityData = {
|
||||
export default function ActivityGrid({ data, locale }: { data: ActivityData | null; locale: string }) {
|
||||
const fa = locale === "fa";
|
||||
const [selected, setSelected] = useState<string | null>(null);
|
||||
const viewport = useRef<HTMLDivElement>(null);
|
||||
const number = new Intl.NumberFormat(fa ? "fa-IR" : "en-US");
|
||||
const date = (value: string) => new Intl.DateTimeFormat(fa ? "fa-IR" : "en-GB", { dateStyle: "medium", timeZone: "Asia/Tehran" }).format(new Date(value + "T12:00:00+03:30"));
|
||||
const valid = data && Array.isArray(data.days) && data.days.length === 365 && data.stats && Array.isArray(data.months);
|
||||
const dayLabel = (day: { date: string; count: number }) => `${date(day.date)} — ${number.format(day.count)} ${fa ? "مشارکت" : "contributions"}`;
|
||||
const monthName = (value: string, full = false) => new Intl.DateTimeFormat(fa ? "fa-IR" : "en-GB", { calendar: "gregory", month: full ? "long" : "short", ...(full ? { year: "numeric" as const } : {}), timeZone: "Asia/Tehran" }).format(new Date(value + "T12:00:00+03:30"));
|
||||
const valid = !!(data && Array.isArray(data.days) && data.days.length === 365 && data.stats && Array.isArray(data.months));
|
||||
// Keep chronology physically LTR in either language. Follow the newest edge
|
||||
// until the visitor takes control; resizing must never undo their exploration.
|
||||
useEffect(() => {
|
||||
const element = viewport.current;
|
||||
if (!valid || !element) return;
|
||||
let exploring = false;
|
||||
const latest = () => { if (!exploring) element.scrollLeft = element.scrollWidth - element.clientWidth; };
|
||||
const takeControl = () => { exploring = true; };
|
||||
latest();
|
||||
const observer = typeof ResizeObserver === "undefined" ? null : new ResizeObserver(latest);
|
||||
observer?.observe(element);
|
||||
element.addEventListener("pointerdown", takeControl, { passive: true });
|
||||
element.addEventListener("touchstart", takeControl, { passive: true });
|
||||
element.addEventListener("wheel", takeControl, { passive: true });
|
||||
element.addEventListener("keydown", takeControl);
|
||||
return () => {
|
||||
observer?.disconnect();
|
||||
element.removeEventListener("pointerdown", takeControl);
|
||||
element.removeEventListener("touchstart", takeControl);
|
||||
element.removeEventListener("wheel", takeControl);
|
||||
element.removeEventListener("keydown", takeControl);
|
||||
};
|
||||
}, [valid, data?.from, data?.to]);
|
||||
const dayLabel = (day: { date: string; count: number }) => `${date(day.date)} — ${number.format(day.count)} ${fa ? "فعالیت" : "activities"}`;
|
||||
const tones = ["bg-muted", "bg-orange-200 dark:bg-orange-950", "bg-orange-300 dark:bg-orange-800", "bg-orange-500", "bg-orange-700 dark:bg-orange-400"];
|
||||
const padding = valid ? new Date(data!.from + "T12:00:00Z").getUTCDay() : 0;
|
||||
const days = valid ? [...Array.from({ length: padding }, () => null), ...data!.days] : [];
|
||||
const weeks = Array.from({ length: Math.ceil(days.length / 7) }, (_, i) => days.slice(i * 7, i * 7 + 7));
|
||||
const selectedDay = data?.days.find(day => day.date === selected);
|
||||
return <section aria-labelledby="activity-title" className="w-full min-w-0 rounded-3xl border bg-card p-5 md:p-9" dir={fa ? "rtl" : "ltr"}>
|
||||
<p className="text-sm font-mono text-muted-foreground">GITEA / {fa ? "فعالیت مهندسی" : "ENGINEERING ACTIVITY"}</p>
|
||||
<h2 id="activity-title" className="mt-3 text-2xl font-bold md:text-3xl">{fa ? "یک سال ساختن، روز به روز" : "A year of building, day by day"}</h2>
|
||||
<p className="mt-3 text-sm leading-7 text-muted-foreground">{fa ? "مشارکتهای عمومی و خصوصی؛ فقط تعداد روزانه، بدون نام یا محتوای مخزن. ۳۶۵ روز اخیر بر اساس زمان تهران. مشارکت با تعداد کامیت برابر نیست." : "Public and private contributions, shared only as daily counts. No repository names or content. Last 365 days in Tehran time; contributions are not commit counts."}</p>
|
||||
{!valid ? <p role="status" className="mt-6 rounded-xl border p-5 text-sm">{fa ? "اطلاعات فعالیت اکنون در دسترس نیست. لطفاً بعداً صفحه را تازه کنید." : "Activity is unavailable right now. Please refresh later."}</p> : <>
|
||||
<dl className="my-7 grid grid-cols-2 gap-4 lg:grid-cols-4">{[
|
||||
[fa ? "مشارکت" : "Contributions", data.stats.total],
|
||||
[fa ? "روز فعال" : "Active days", data.stats.active_days],
|
||||
[fa ? "میانگین روزانه" : "Daily average", data.stats.daily_average],
|
||||
[fa ? "طولانیترین زنجیره روزانه" : "Longest daily streak", data.stats.longest_streak],
|
||||
<p className="text-sm text-muted-foreground">Gitea</p>
|
||||
<h2 id="activity-title" className="mt-3 text-2xl font-bold md:text-3xl">{fa ? "فعالیتهای من" : "My activity"}</h2>
|
||||
<p className="mt-3 text-sm leading-7 text-muted-foreground">{fa ? "نگاهی به فعالیتهایم در یک سال گذشته." : "A look at my activity over the past year."}</p>
|
||||
{!valid ? <p role="status" className="mt-6 rounded-xl border p-5 text-sm">{fa ? "فعالیتها فعلاً در دسترس نیست. کمی بعد دوباره سر بزنید." : "Activity is unavailable right now. Please check back later."}</p> : <>
|
||||
<dl className="my-7 grid grid-cols-2 gap-4">{[
|
||||
[fa ? "فعالیت" : "Activities", data!.stats.total],
|
||||
[fa ? "روز فعال" : "Active days", data!.stats.active_days],
|
||||
].map(([label, value]) => <div key={label} className="rounded-xl bg-muted/50 p-4"><dt className="text-sm text-muted-foreground">{label}</dt><dd className="mt-2 text-2xl font-bold tabular-nums">{number.format(Number(value))}</dd></div>)}</dl>
|
||||
<div className="overflow-x-auto pb-3" dir="ltr" aria-label={fa ? "تقویم مشارکت؛ برای مشاهده جزئیات روز را انتخاب کنید" : "Contribution calendar; select a day for details"} tabIndex={0}>
|
||||
<div className="grid w-max grid-flow-col grid-rows-7 gap-1 p-1" style={{ gridTemplateColumns: "repeat(53, 12px)" }}>
|
||||
{Array.from({ length: new Date(data.from + "T12:00:00Z").getUTCDay() }, (_, i) => <span key={`pad-${i}`} />)}
|
||||
{data.days.map(day => <button type="button" key={day.date} aria-label={dayLabel(day)} title={dayLabel(day)} onFocus={() => setSelected(day.date)} onClick={() => setSelected(day.date)} className={`h-3 w-3 rounded-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary ${tones[day.count === 0 ? 0 : day.count < 3 ? 1 : day.count < 6 ? 2 : day.count < 10 ? 3 : 4]}`} />)}
|
||||
<div ref={viewport} data-activity-scroll className="overflow-x-auto pb-3" dir="ltr" style={{ direction: "ltr", overflowAnchor: "none" }} aria-label={fa ? "تقویم فعالیت؛ برای روزهای قبل به کنارهها بکشید" : "Activity calendar; swipe sideways for earlier days"} tabIndex={0}>
|
||||
<div className="flex w-max gap-1 p-1" style={{ direction: "ltr" }}>
|
||||
{weeks.map((week, index) => {
|
||||
const first = week.find(day => day !== null)!;
|
||||
const previous = weeks[index - 1]?.find(day => day !== null);
|
||||
const showMonth = !previous || first.date.slice(0, 7) !== previous.date.slice(0, 7);
|
||||
return <div key={first.date} className="w-3 shrink-0">
|
||||
<div className="relative mb-2 h-5 text-[13px] text-muted-foreground">{showMonth && index < weeks.length - 2 ? <span className="absolute left-0 whitespace-nowrap" dir={fa ? "rtl" : "ltr"}>{monthName(first.date)}</span> : null}</div>
|
||||
<div className="grid grid-rows-7 gap-1">{week.map((day, row) => day ? <button type="button" data-date={day.date} data-count={day.count} key={day.date} aria-label={dayLabel(day)} title={dayLabel(day)} onFocus={() => setSelected(day.date)} onClick={() => setSelected(day.date)} className={`h-3 w-3 rounded-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary ${tones[day.count === 0 ? 0 : day.count < 3 ? 1 : day.count < 6 ? 2 : day.count < 10 ? 3 : 4]}`} /> : <span key={`pad-${row}`} className="h-3 w-3" />)}</div>
|
||||
</div>;
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
<p aria-live="polite" className="mt-3 min-h-7 text-sm">{selected ? dayLabel(data.days.find(d => d.date === selected)!) : fa ? "برای جزئیات، یک روز را انتخاب کنید. برای دیدن تمام سال به کنارهها پیمایش کنید." : "Select a day for details. Scroll sideways to explore the full year."}</p>
|
||||
<p aria-live="polite" className="mt-3 min-h-7 text-sm">{selectedDay ? dayLabel(selectedDay) : fa ? "هر خانه یک روز؛ برای جزئیات انتخاب کنید." : "Each square is a day. Select one for details."}</p>
|
||||
<div className="mt-2 flex items-center gap-2 text-sm text-muted-foreground"><span>{fa ? "کمتر" : "Less"}</span>{tones.map(tone => <span key={tone} className={`h-3 w-3 rounded-sm ${tone}`} />)}<span>{fa ? "بیشتر" : "More"}</span></div>
|
||||
<details className="mt-6 border-t pt-4 text-sm"><summary className="cursor-pointer py-2 font-medium">{fa ? "مجموع ماهانه (ماههای میلادی)" : "Monthly totals (Gregorian months)"}</summary><dl className="mt-4 grid grid-cols-2 gap-3 md:grid-cols-4">{data.months.map(month => <div key={month.month} className="flex justify-between gap-4 rounded-lg bg-muted/50 p-3"><dt dir="ltr">{month.month}</dt><dd>{number.format(month.count)}</dd></div>)}</dl></details>
|
||||
<p className="mt-5 text-sm leading-7 text-muted-foreground">{date(data.from)} — {date(data.to)} · {fa ? "آخرین دریافت:" : "Fetched:"} {new Intl.DateTimeFormat(fa ? "fa-IR" : "en-GB", { dateStyle: "medium", timeStyle: "short", timeZone: "Asia/Tehran" }).format(new Date(data.updated_at))} · {fa ? "زمان تهران · تازهسازی تا ۵ دقیقه" : "Tehran time · refreshes within 5 minutes"}</p>
|
||||
<details className="mt-6 border-t pt-4 text-sm"><summary className="cursor-pointer py-2 font-medium">{fa ? "فعالیت ماهانه" : "Monthly activity"}</summary><dl className="mt-4 grid grid-cols-2 gap-3 md:grid-cols-4">{data!.months.map(month => <div key={month.month} className="flex justify-between gap-4 rounded-lg bg-muted/50 p-3"><dt>{monthName(month.month + "-01", true)}</dt><dd>{number.format(month.count)}</dd></div>)}</dl></details>
|
||||
<p className="mt-5 text-sm leading-7 text-muted-foreground">{date(data!.from)} — {date(data!.to)}</p>
|
||||
</>}
|
||||
</section>;
|
||||
}
|
||||
Reference in new issue
Block a user