fix: align official recommendations behavior
All checks were successful
Deploy to Frontend Servers / deploy (push) Successful in 47s

This commit is contained in:
TerryM
2026-05-19 00:34:29 +08:00
parent 40143afc39
commit e6bc212c4e
5 changed files with 85 additions and 47 deletions

View File

@@ -53,13 +53,40 @@ export function Browse() {
useEffect(() => {
setErr(null);
if (sort === "recommended") {
const p = new URLSearchParams();
p.set("lang", lang);
p.set("limit", "100");
getJSON<{ items: Resource[] }>(`/api/resources/recommended?${p}`)
.then((r) => {
const tagLower = tag.toLowerCase();
const officialItems = itemsOrEmpty(r.items)
.filter((item) => item.isRecommended)
.filter((item) => type === "all" || item.type === type)
.filter((item) => !resourceLang || item.language === resourceLang)
.filter(
(item) =>
!tagLower ||
item.tags?.some(
(itemTag) => itemTag.toLowerCase() === tagLower,
),
);
setTotal(officialItems.length);
setItems(officialItems.slice((page - 1) * limit, page * limit));
})
.catch((e) => setErr(String(e)));
return;
}
getJSON<{ items: Resource[]; total?: number }>(`/api/resources?${query}`)
.then((r) => {
setItems(itemsOrEmpty(r.items));
setTotal(typeof r.total === "number" ? r.total : 0);
})
.catch((e) => setErr(String(e)));
}, [query]);
}, [lang, limit, page, query, resourceLang, sort, tag, type]);
const setPage = (next: number) => {
const n = new URLSearchParams(sp);

View File

@@ -8,10 +8,7 @@ import {
ComingSoonLatestUpdateRow,
LatestUpdateRow,
} from "../components/LatestUpdateRow";
import {
ComingSoonRecommendedCard,
RecommendedCard,
} from "../components/RecommendedCard";
import { RecommendedCard } from "../components/RecommendedCard";
import { SectionHeader } from "../components/SectionHeader";
import { useI18n } from "../i18n";
import { categoryCardLines } from "../utils/categoryDisplay";
@@ -23,6 +20,7 @@ export function Home() {
const [latest, setLatest] = useState<Resource[]>([]);
const [err, setErr] = useState<string | null>(null);
const recRowRef = useRef<HTMLDivElement>(null);
const [canScrollRec, setCanScrollRec] = useState(false);
useEffect(() => {
const q = `?lang=${encodeURIComponent(lang)}`;
@@ -42,11 +40,27 @@ export function Home() {
const iconKeyForResource = (r: Resource) =>
cats.find((c) => c.id === r.categoryId)?.iconKey ?? "folder";
useEffect(() => {
const row = recRowRef.current;
if (!row) {
setCanScrollRec(false);
return;
}
const updateCanScroll = () => {
setCanScrollRec(row.scrollWidth > row.clientWidth + 1);
};
updateCanScroll();
const resizeObserver = new ResizeObserver(updateCanScroll);
resizeObserver.observe(row);
return () => resizeObserver.disconnect();
}, [rec.length]);
const scrollRec = (dir: 1 | -1) => {
recRowRef.current?.scrollBy({ left: dir * 280, behavior: "smooth" });
};
const recommendedPlaceholderCount = Math.max(0, 5 - rec.length);
const latestPlaceholderCount = Math.max(0, 5 - latest.length);
if (err) {
@@ -115,28 +129,20 @@ export function Home() {
<RecommendedCard r={r} visualIndex={index} />
</div>
))}
{Array.from({ length: recommendedPlaceholderCount }).map(
(_, index) => (
<div
key={`recommended-coming-soon-${index}`}
className="snap-start"
>
<ComingSoonRecommendedCard visualIndex={rec.length + index} />
</div>
),
)}
</div>
<div className="h-1 rounded-full bg-black/80 md:hidden">
<div className="h-full w-24 rounded-full bg-[#353740]" />
</div>
<button
type="button"
onClick={() => scrollRec(1)}
className="absolute right-0 top-[45%] hidden h-9 w-9 -translate-y-1/2 items-center justify-center rounded-lg border border-ark-line bg-[#292a31]/95 text-neutral-200 shadow-lg backdrop-blur transition hover:border-ark-gold hover:text-ark-gold md:flex"
aria-label={t("viewAll")}
>
<ChevronRight className="h-5 w-5" />
</button>
{canScrollRec ? (
<button
type="button"
onClick={() => scrollRec(1)}
className="absolute right-0 top-[45%] hidden h-9 w-9 -translate-y-1/2 items-center justify-center rounded-lg border border-ark-line bg-[#292a31]/95 text-neutral-200 shadow-lg backdrop-blur transition hover:border-ark-gold hover:text-ark-gold md:flex"
aria-label={t("viewAll")}
>
<ChevronRight className="h-5 w-5" />
</button>
) : null}
</div>
</section>