feat: add replace_hero hook to custom section
This commit is contained in:
@@ -3,18 +3,20 @@
|
|||||||
/**
|
/**
|
||||||
* PostsGrid — client-side body for /u/[handle] (Posts tab).
|
* PostsGrid — client-side body for /u/[handle] (Posts tab).
|
||||||
*
|
*
|
||||||
* Split out from page.tsx so the page itself can be a server component
|
* Split out from page.tsx so the page itself can be a server component that
|
||||||
* that exports `generateMetadata` for the public-profile OG card. The
|
* exports `generateMetadata` for the public-profile OG card. The
|
||||||
* /u/[handle]/layout.tsx still owns ProfileHeader + tab strip + the
|
* /u/[handle]/layout.tsx still owns ProfileHeader + tab strip + the outer
|
||||||
* outer max-w-3xl container; this grid just renders the post grid
|
* container (and 404s unknown handles); this just renders the post grid.
|
||||||
* inside that shell. Tapping a thumbnail jumps to
|
*
|
||||||
* /u/[handle]/posts#post-<id> where the Instagram-style scroll feed
|
* Window-virtualised, infinite-scroll 2-up grid (usePostScrollFeed keyset-pages
|
||||||
* shows the full passages.
|
* the user's posts). Tapping a thumbnail jumps to /u/[handle]/posts#post-<id>
|
||||||
|
* where the scroll feed shows the full passages.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { use, useEffect, useState } from "react";
|
import { use } from "react";
|
||||||
import { profile, type Post } from "@/lib/social";
|
import { profile } from "@/lib/social";
|
||||||
import { PostViews } from "@/components/social/post/post-views";
|
import { VirtualPostGrid } from "@/components/social/post/virtual-post-grid";
|
||||||
|
import { usePostScrollFeed } from "@/components/social/post/use-post-scroll-feed";
|
||||||
import { usePublicProfile } from "./profile-context";
|
import { usePublicProfile } from "./profile-context";
|
||||||
|
|
||||||
export function PostsGrid({
|
export function PostsGrid({
|
||||||
@@ -24,34 +26,18 @@ export function PostsGrid({
|
|||||||
}) {
|
}) {
|
||||||
const { handle } = use(params);
|
const { handle } = use(params);
|
||||||
const data = usePublicProfile();
|
const data = usePublicProfile();
|
||||||
const [feed, setFeed] = useState<Post[]>([]);
|
const { feed, loading, hasMore, sentinelRef } = usePostScrollFeed(
|
||||||
const [loading, setLoading] = useState(true);
|
(before, limit) =>
|
||||||
|
profile.feed(handle, { limit, before: before ?? undefined }),
|
||||||
useEffect(() => {
|
24,
|
||||||
let cancelled = false;
|
);
|
||||||
profile
|
|
||||||
.feed(handle, { limit: 30 })
|
|
||||||
.then((rows) => {
|
|
||||||
if (!cancelled) setFeed(rows ?? []);
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
// Layout already 404'd if the handle is unknown; if the feed
|
|
||||||
// itself fails we just show an empty grid rather than blocking
|
|
||||||
// the page with an error toast.
|
|
||||||
})
|
|
||||||
.finally(() => !cancelled && setLoading(false));
|
|
||||||
return () => {
|
|
||||||
cancelled = true;
|
|
||||||
};
|
|
||||||
}, [handle]);
|
|
||||||
|
|
||||||
if (loading) {
|
|
||||||
return <p className="text-sm text-muted-foreground">Loading…</p>;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PostViews
|
<VirtualPostGrid
|
||||||
posts={feed}
|
posts={feed}
|
||||||
|
loading={loading}
|
||||||
|
hasMore={hasMore}
|
||||||
|
sentinelRef={sentinelRef}
|
||||||
hrefFor={(p) => `/u/${data.handle}/posts#post-${p.id}`}
|
hrefFor={(p) => `/u/${data.handle}/posts#post-${p.id}`}
|
||||||
emptyMessage="No posts yet — quotes shared by this user will appear here."
|
emptyMessage="No posts yet — quotes shared by this user will appear here."
|
||||||
/>
|
/>
|
||||||
|
|||||||
+31
-60
@@ -3,47 +3,39 @@
|
|||||||
/**
|
/**
|
||||||
* /u/me — owner Posts grid (the default tab).
|
* /u/me — owner Posts grid (the default tab).
|
||||||
*
|
*
|
||||||
* Grid-only — no Grid/Scroll toggle. Tapping a thumbnail jumps to
|
* Window-virtualised, infinite-scroll 2-up grid (usePostScrollFeed keyset-pages
|
||||||
* /u/me/posts#post-<id> where the Instagram-style scroll feed renders
|
* the owner's posts; VirtualPostGrid renders + windows them). Tapping a
|
||||||
* the full passages.
|
* thumbnail jumps to /u/me/posts#post-<id> where the scroll feed renders the
|
||||||
|
* full passages.
|
||||||
*
|
*
|
||||||
* Editing the profile lives on its own page (/settings/profile), reached
|
* Editing the profile lives on its own page (/settings/profile), reached
|
||||||
* from the header's "Edit profile" button.
|
* from the header's "Edit profile" button.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { useEffect, useState } from "react";
|
import { useState } from "react";
|
||||||
import { LayoutGrid } from "lucide-react";
|
|
||||||
import { useAuth } from "@/components/auth/auth-provider";
|
import { useAuth } from "@/components/auth/auth-provider";
|
||||||
import { PostGridCard } from "@/components/social/post/post-grid-card";
|
import { VirtualPostGrid } from "@/components/social/post/virtual-post-grid";
|
||||||
|
import { usePostScrollFeed } from "@/components/social/post/use-post-scroll-feed";
|
||||||
import { ConfirmModal } from "@/components/ui/confirm-modal";
|
import { ConfirmModal } from "@/components/ui/confirm-modal";
|
||||||
import { posts, SocialError, type Post } from "@/lib/social";
|
import { posts, SocialError, type Post } from "@/lib/social";
|
||||||
|
|
||||||
export default function MyProfilePage() {
|
export default function MyProfilePage() {
|
||||||
const { user } = useAuth();
|
const { user } = useAuth();
|
||||||
|
// Defer the authed /posts/mine fetch until we have a user.
|
||||||
|
if (!user) return null;
|
||||||
|
return <OwnerGrid />;
|
||||||
|
}
|
||||||
|
|
||||||
const [feed, setFeed] = useState<Post[]>([]);
|
function OwnerGrid() {
|
||||||
const [loading, setLoading] = useState(true);
|
const { feed, setFeed, loading, hasMore, error, setError, sentinelRef } =
|
||||||
const [error, setError] = useState<string | null>(null);
|
usePostScrollFeed(
|
||||||
// Post id pending confirmation — modal opens when non-null and runs
|
(before, limit) => posts.mine({ limit, before: before ?? undefined }),
|
||||||
// the actual delete on confirm.
|
24,
|
||||||
|
);
|
||||||
const [pendingDelete, setPendingDelete] = useState<string | null>(null);
|
const [pendingDelete, setPendingDelete] = useState<string | null>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
// Card delete buttons stage an id; ConfirmModal runs `performDelete` when the
|
||||||
if (!user) return;
|
// user confirms. We throw on failure so the modal stays open with an error.
|
||||||
posts
|
|
||||||
.mine()
|
|
||||||
.then((rows) => setFeed(rows ?? []))
|
|
||||||
.catch((err) =>
|
|
||||||
setError(
|
|
||||||
err instanceof SocialError ? err.message : "Could not load posts.",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.finally(() => setLoading(false));
|
|
||||||
}, [user]);
|
|
||||||
|
|
||||||
// Card delete buttons stage an id; ConfirmModal runs `performDelete`
|
|
||||||
// when the user confirms. We throw on failure so the modal stays open
|
|
||||||
// with an inline error message.
|
|
||||||
async function performDelete() {
|
async function performDelete() {
|
||||||
const id = pendingDelete;
|
const id = pendingDelete;
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
@@ -64,29 +56,20 @@ export default function MyProfilePage() {
|
|||||||
setFeed((rows) => rows.map((p) => (p.id === updated.id ? updated : p)));
|
setFeed((rows) => rows.map((p) => (p.id === updated.id ? updated : p)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!user) return null;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section>
|
<section>
|
||||||
{error ? (
|
{error ? <p className="mb-3 text-sm text-destructive">{error}</p> : null}
|
||||||
<p className="text-sm text-destructive">{error}</p>
|
|
||||||
) : loading ? (
|
<VirtualPostGrid
|
||||||
<p className="text-sm text-muted-foreground">Loading…</p>
|
posts={feed}
|
||||||
) : feed.length === 0 ? (
|
loading={loading}
|
||||||
<EmptyPosts />
|
hasMore={hasMore}
|
||||||
) : (
|
sentinelRef={sentinelRef}
|
||||||
<div className="grid grid-cols-2 gap-2 sm:gap-3">
|
hrefFor={(p) => `/u/me/posts#post-${p.id}`}
|
||||||
{feed.map((p) => (
|
onDelete={(id) => setPendingDelete(id)}
|
||||||
<PostGridCard
|
onUpdated={onPostUpdated}
|
||||||
key={p.id}
|
emptyMessage="You haven't posted anything yet. Select any passage in the knowledgebase and use the toolbar to share it to your feed."
|
||||||
post={p}
|
/>
|
||||||
onDelete={(id) => setPendingDelete(id)}
|
|
||||||
onUpdated={onPostUpdated}
|
|
||||||
href={`/u/me/posts#post-${p.id}`}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<ConfirmModal
|
<ConfirmModal
|
||||||
open={!!pendingDelete}
|
open={!!pendingDelete}
|
||||||
@@ -99,15 +82,3 @@ export default function MyProfilePage() {
|
|||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function EmptyPosts() {
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col items-center text-center gap-3 py-12 text-muted-foreground">
|
|
||||||
<LayoutGrid className="size-8" />
|
|
||||||
<p className="text-sm">
|
|
||||||
You haven't posted anything yet. Select any passage in the
|
|
||||||
knowledgebase and use the toolbar to share it to your feed.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -14,15 +14,14 @@
|
|||||||
* stop when a page is short) — the same idiom as the home feed.
|
* stop when a page is short) — the same idiom as the home feed.
|
||||||
*
|
*
|
||||||
* `fetchPage(before, limit)` is supplied by the caller so the same hook serves
|
* `fetchPage(before, limit)` is supplied by the caller so the same hook serves
|
||||||
* the owner feed (posts.mine) and the public feed (profile.feed). `setFeed` is
|
* the scroll feeds (posts.mine / profile.feed) AND the virtualised profile
|
||||||
* returned so the owner page can optimistically prune on delete/hide.
|
* grids — anything that keyset-pages a user's posts. `setFeed` is returned so
|
||||||
|
* the owner views can optimistically prune on delete/hide.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
import { posts as postsApi, type FeedCursor, type Post } from "@/lib/social";
|
import { posts as postsApi, type FeedCursor, type Post } from "@/lib/social";
|
||||||
|
|
||||||
const PAGE = 10;
|
|
||||||
|
|
||||||
type FetchPage = (before: FeedCursor | null, limit: number) => Promise<Post[]>;
|
type FetchPage = (before: FeedCursor | null, limit: number) => Promise<Post[]>;
|
||||||
|
|
||||||
const cursorOf = (p: Post): FeedCursor => ({
|
const cursorOf = (p: Post): FeedCursor => ({
|
||||||
@@ -30,7 +29,7 @@ const cursorOf = (p: Post): FeedCursor => ({
|
|||||||
id: p.id,
|
id: p.id,
|
||||||
});
|
});
|
||||||
|
|
||||||
export function usePostScrollFeed(fetchPage: FetchPage) {
|
export function usePostScrollFeed(fetchPage: FetchPage, pageSize = 10) {
|
||||||
const [feed, setFeed] = useState<Post[]>([]);
|
const [feed, setFeed] = useState<Post[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [hasMore, setHasMore] = useState(true);
|
const [hasMore, setHasMore] = useState(true);
|
||||||
@@ -51,7 +50,7 @@ export function usePostScrollFeed(fetchPage: FetchPage) {
|
|||||||
if (fetchingRef.current || !hasMore) return;
|
if (fetchingRef.current || !hasMore) return;
|
||||||
fetchingRef.current = true;
|
fetchingRef.current = true;
|
||||||
try {
|
try {
|
||||||
const rows = (await fetchPage(cursorRef.current, PAGE)) ?? [];
|
const rows = (await fetchPage(cursorRef.current, pageSize)) ?? [];
|
||||||
const fresh = rows.filter((p) => !idsRef.current.has(p.id));
|
const fresh = rows.filter((p) => !idsRef.current.has(p.id));
|
||||||
if (fresh.length > 0) {
|
if (fresh.length > 0) {
|
||||||
fresh.forEach((p) => idsRef.current.add(p.id));
|
fresh.forEach((p) => idsRef.current.add(p.id));
|
||||||
@@ -60,7 +59,7 @@ export function usePostScrollFeed(fetchPage: FetchPage) {
|
|||||||
setFeed((prev) => [...prev, ...fresh]);
|
setFeed((prev) => [...prev, ...fresh]);
|
||||||
}
|
}
|
||||||
// Stop on a short page OR a page that produced nothing new (stalled).
|
// Stop on a short page OR a page that produced nothing new (stalled).
|
||||||
if (rows.length < PAGE || fresh.length === 0) setHasMore(false);
|
if (rows.length < pageSize || fresh.length === 0) setHasMore(false);
|
||||||
} catch {
|
} catch {
|
||||||
setHasMore(false);
|
setHasMore(false);
|
||||||
setError((e) => e ?? "Could not load posts.");
|
setError((e) => e ?? "Could not load posts.");
|
||||||
@@ -68,7 +67,7 @@ export function usePostScrollFeed(fetchPage: FetchPage) {
|
|||||||
fetchingRef.current = false;
|
fetchingRef.current = false;
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
}, [fetchPage, hasMore]);
|
}, [fetchPage, hasMore, pageSize]);
|
||||||
|
|
||||||
// First load: anchor-first when arriving with #post-<id>, else newest page.
|
// First load: anchor-first when arriving with #post-<id>, else newest page.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* VirtualPostGrid — window-virtualised, infinite-scroll 2-up thumbnail grid for
|
||||||
|
* the profile Posts tabs (/u/me and /u/[handle]).
|
||||||
|
*
|
||||||
|
* Mirrors HomeFeed's window virtualization, but the unit of virtualization is a
|
||||||
|
* GRID ROW (two square cards) rather than a single card. Data (keyset paging +
|
||||||
|
* the bottom sentinel) comes from usePostScrollFeed; this component only owns
|
||||||
|
* rendering + windowing, so a profile with hundreds of posts stays cheap.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
import { useWindowVirtualizer } from "@tanstack/react-virtual";
|
||||||
|
import { Loader2 } from "lucide-react";
|
||||||
|
import type { Post } from "@/lib/social";
|
||||||
|
import { PostGridCard } from "./post-grid-card";
|
||||||
|
|
||||||
|
const COLS = 2;
|
||||||
|
|
||||||
|
export function VirtualPostGrid({
|
||||||
|
posts,
|
||||||
|
loading,
|
||||||
|
hasMore,
|
||||||
|
sentinelRef,
|
||||||
|
emptyMessage,
|
||||||
|
hrefFor,
|
||||||
|
onDelete,
|
||||||
|
onUpdated,
|
||||||
|
}: {
|
||||||
|
posts: Post[];
|
||||||
|
loading: boolean;
|
||||||
|
hasMore: boolean;
|
||||||
|
/** Bottom sentinel observed by usePostScrollFeed to load the next page. */
|
||||||
|
sentinelRef: React.RefObject<HTMLDivElement | null>;
|
||||||
|
emptyMessage?: string;
|
||||||
|
hrefFor?: (post: Post) => string;
|
||||||
|
onDelete?: (id: string) => void;
|
||||||
|
onUpdated?: (updated: Post) => void;
|
||||||
|
}) {
|
||||||
|
// Chunk the flat post list into rows of COLS for row-level virtualization.
|
||||||
|
const rows = useMemo(() => {
|
||||||
|
const out: Post[][] = [];
|
||||||
|
for (let i = 0; i < posts.length; i += COLS) out.push(posts.slice(i, i + COLS));
|
||||||
|
return out;
|
||||||
|
}, [posts]);
|
||||||
|
|
||||||
|
// Document-absolute top of the grid, so the window virtualizer can map window
|
||||||
|
// scroll → visible rows (the profile header/tabs sit above us). Re-measured
|
||||||
|
// on resize and any body reflow. Same approach as HomeFeed.
|
||||||
|
const parentRef = useRef<HTMLDivElement>(null);
|
||||||
|
const [offsetTop, setOffsetTop] = useState(0);
|
||||||
|
useEffect(() => {
|
||||||
|
const measure = () => {
|
||||||
|
const el = parentRef.current;
|
||||||
|
if (el) setOffsetTop(el.getBoundingClientRect().top + window.scrollY);
|
||||||
|
};
|
||||||
|
measure();
|
||||||
|
window.addEventListener("resize", measure);
|
||||||
|
const ro = new ResizeObserver(measure);
|
||||||
|
ro.observe(document.body);
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener("resize", measure);
|
||||||
|
ro.disconnect();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const virtualizer = useWindowVirtualizer({
|
||||||
|
count: rows.length,
|
||||||
|
estimateSize: () => 240, // square card + gap; measureElement corrects it
|
||||||
|
overscan: 6,
|
||||||
|
scrollMargin: offsetTop,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (loading && posts.length === 0) {
|
||||||
|
return (
|
||||||
|
<div className="flex justify-center py-16">
|
||||||
|
<Loader2 className="size-6 animate-spin text-muted-foreground" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!loading && posts.length === 0) {
|
||||||
|
return (
|
||||||
|
<p className="text-sm text-muted-foreground">
|
||||||
|
{emptyMessage ?? "Nothing here yet."}
|
||||||
|
</p>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const virtualRows = virtualizer.getVirtualItems();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
ref={parentRef}
|
||||||
|
className="relative w-full"
|
||||||
|
style={{ height: virtualizer.getTotalSize() }}
|
||||||
|
>
|
||||||
|
{virtualRows.map((vr) => {
|
||||||
|
const row = rows[vr.index];
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={row[0]?.id ?? vr.index}
|
||||||
|
data-index={vr.index}
|
||||||
|
ref={virtualizer.measureElement}
|
||||||
|
className="absolute left-0 top-0 w-full"
|
||||||
|
style={{ transform: `translateY(${vr.start - offsetTop}px)` }}
|
||||||
|
>
|
||||||
|
<div className="grid grid-cols-2 gap-2 sm:gap-3 pb-2 sm:pb-3">
|
||||||
|
{row.map((p) => (
|
||||||
|
<PostGridCard
|
||||||
|
key={p.id}
|
||||||
|
post={p}
|
||||||
|
href={hrefFor?.(p)}
|
||||||
|
onDelete={onDelete}
|
||||||
|
onUpdated={onUpdated}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{hasMore ? (
|
||||||
|
<div ref={sentinelRef} className="flex justify-center py-6">
|
||||||
|
<Loader2 className="size-5 animate-spin text-muted-foreground" />
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user