From 772b40d4e9db3e1c2dbd2a8251bc6480a9727e46 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 18 Nov 2026 20:09:22 +0000 Subject: [PATCH] Simplify activity copy and open calendar at newest days --- src/__tests__/activity.test.tsx | 18 ++++- .../components/activity/activity-grid.tsx | 72 ++++++++++++++----- 2 files changed, 69 insertions(+), 21 deletions(-) diff --git a/src/__tests__/activity.test.tsx b/src/__tests__/activity.test.tsx index 72fc8d9..02c64c8 100644 --- a/src/__tests__/activity.test.tsx +++ b/src/__tests__/activity.test.tsx @@ -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(); + rerender(); + 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(); 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(); 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(); 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(); expect(container.querySelector('section')).toHaveAttribute('dir','rtl'); expect(screen.getByText('روز فعال')).toBeInTheDocument(); }); }); diff --git a/src/app/(routes)/(website)/components/activity/activity-grid.tsx b/src/app/(routes)/(website)/components/activity/activity-grid.tsx index f9d5e3c..c291247 100644 --- a/src/app/(routes)/(website)/components/activity/activity-grid.tsx +++ b/src/app/(routes)/(website)/components/activity/activity-grid.tsx @@ -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(null); + const viewport = useRef(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
-

GITEA / {fa ? "فعالیت مهندسی" : "ENGINEERING ACTIVITY"}

-

{fa ? "یک سال ساختن، روز به روز" : "A year of building, day by day"}

-

{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."}

- {!valid ?

{fa ? "اطلاعات فعالیت اکنون در دسترس نیست. لطفاً بعداً صفحه را تازه کنید." : "Activity is unavailable right now. Please refresh later."}

: <> -
{[ - [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], +

Gitea

+

{fa ? "فعالیت‌های من" : "My activity"}

+

{fa ? "نگاهی به فعالیت‌هایم در یک سال گذشته." : "A look at my activity over the past year."}

+ {!valid ?

{fa ? "فعالیت‌ها فعلاً در دسترس نیست. کمی بعد دوباره سر بزنید." : "Activity is unavailable right now. Please check back later."}

: <> +
{[ + [fa ? "فعالیت" : "Activities", data!.stats.total], + [fa ? "روز فعال" : "Active days", data!.stats.active_days], ].map(([label, value]) =>
{label}
{number.format(Number(value))}
)}
-
-
- {Array.from({ length: new Date(data.from + "T12:00:00Z").getUTCDay() }, (_, i) => )} - {data.days.map(day =>
+
; + })} -

{selected ? dayLabel(data.days.find(d => d.date === selected)!) : fa ? "برای جزئیات، یک روز را انتخاب کنید. برای دیدن تمام سال به کناره‌ها پیمایش کنید." : "Select a day for details. Scroll sideways to explore the full year."}

+

{selectedDay ? dayLabel(selectedDay) : fa ? "هر خانه یک روز؛ برای جزئیات انتخاب کنید." : "Each square is a day. Select one for details."}

{fa ? "کمتر" : "Less"}{tones.map(tone => )}{fa ? "بیشتر" : "More"}
-
{fa ? "مجموع ماهانه (ماه‌های میلادی)" : "Monthly totals (Gregorian months)"}
{data.months.map(month =>
{month.month}
{number.format(month.count)}
)}
-

{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"}

+
{fa ? "فعالیت ماهانه" : "Monthly activity"}
{data!.months.map(month =>
{monthName(month.month + "-01", true)}
{number.format(month.count)}
)}
+

{date(data!.from)} — {date(data!.to)}

}
; }