From b71ffff08b25a40d81a905fef7af039eb2671226 Mon Sep 17 00:00:00 2001
From: luna <luna@wvvw.me>
Date: Tue, 7 Jan 2025 20:17:28 +1030
Subject: [PATCH] fix: add sticky header to posts

---
 src/components/PostCard.tsx                   |  2 +-
 src/components/Timeline.tsx                   |  2 +-
 src/i18n/lang/en.ts                           |  1 +
 src/routes/__root.tsx                         |  2 +-
 src/routes/profile/$handle/index.lazy.tsx     | 58 ++++++++++---------
 .../profile/$handle/post.$postId.lazy.tsx     | 12 ++--
 6 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/src/components/PostCard.tsx b/src/components/PostCard.tsx
index 05428fd..97dccac 100644
--- a/src/components/PostCard.tsx
+++ b/src/components/PostCard.tsx
@@ -79,7 +79,7 @@ export function PostCard({ post, context, className, onClick }: PostCardProps) {
         params={{ handle: post.author.handle, postId: post.uri.split('/').pop()! }}
         className="absolute inset-0"
       />
-      <div className="flex flex-col border-b border-gray-200 dark:border-gray-800">
+      <div className="flex flex-col">
         <div className={cn('p-3 w-full max-w-[550px] gap-2 flex flex-row', className)} onClick={onClick} id={post.uri}>
           <div className="flex-shrink-0">
             <Avatar handle={post.author.handle} avatar={post.author.avatar} />
diff --git a/src/components/Timeline.tsx b/src/components/Timeline.tsx
index 36fcb0a..71a6958 100644
--- a/src/components/Timeline.tsx
+++ b/src/components/Timeline.tsx
@@ -117,7 +117,7 @@ export function Timeline({ columnNumber = 1 }: { columnNumber: number }) {
           endReached={() => fetchNextPage()}
           components={{
             List: forwardRef(function List(props, ref) {
-              return <div ref={ref} {...props} className="flex flex-col" />;
+              return <div ref={ref} {...props} className="flex flex-col divide-y" />;
             }),
           }}
           itemContent={(index: number) => (
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 73a21cb..0ae6441 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -16,6 +16,7 @@ export const en = {
       blueskyHandle: 'bluesky handle e.g. @alice.bsky.social',
       following: 'following',
       followers: 'followers',
+      post: 'post',
       posts: 'posts',
       replies: 'replies',
       reposts: 'reposts',
diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx
index e42de5d..6a7db00 100644
--- a/src/routes/__root.tsx
+++ b/src/routes/__root.tsx
@@ -95,7 +95,7 @@ function Root() {
             <Navbar />
             <div className="flex justify-center mx-auto">
               <ErrorBoundary>
-                <div className={cn('flex flex-col gap-2 sm:border-x', pathname !== '/' && 'w-screen sm:w-[550px]')}>
+                <div className={cn('flex flex-col sm:border-x', pathname !== '/' && 'w-screen sm:w-[550px]')}>
                   <Outlet key="app" />
                 </div>
               </ErrorBoundary>
diff --git a/src/routes/profile/$handle/index.lazy.tsx b/src/routes/profile/$handle/index.lazy.tsx
index 229ec41..f53e307 100644
--- a/src/routes/profile/$handle/index.lazy.tsx
+++ b/src/routes/profile/$handle/index.lazy.tsx
@@ -29,7 +29,7 @@ export const Route = createLazyFileRoute('/profile/$handle/')({
 });
 
 const List = forwardRef(function List(props: HtmlHTMLAttributes<HTMLDivElement>, ref: Ref<HTMLDivElement>) {
-  return <div ref={ref} {...props} className="flex flex-col gap-2" />;
+  return <div ref={ref} {...props} className="flex flex-col divide-y" />;
 });
 
 function All() {
@@ -146,7 +146,9 @@ function Media() {
 
   const filteredPosts = feed
     // Filter to only media
-    ?.filter(({ post }) => (post.record as BSkyPost['record']).embed?.$type === 'app.bsky.embed.images');
+    // TODO: fix this
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ?.filter(({ post }) => (post.record as any).embed?.$type === 'app.bsky.embed.images');
 
   return (
     <Virtuoso
@@ -183,35 +185,37 @@ function Profile() {
           {profile.displayName} (@{handle})
         </title>
       </Helmet>
-      <div className="flex flex-col gap-2">
-        <Banner banner={profile?.banner} />
-        <div className="px-4 -mt-12">
-          <Avatar avatar={profile?.avatar} handle={profile.handle} className="size-24" />
-          <div>
-            <div className="flex gap-2">
-              <h2 className="text-xl font-bold">{profile?.displayName || profile.handle}</h2>
-              <Badge title={profile.viewer?.following && profile.viewer?.followedBy ? 'You both follow each other' : ''}>
-                {profile.viewer?.following && profile.viewer?.followedBy && 'Mutuals'}
-              </Badge>
-              {handle !== session?.handle && <FollowButton handle={handle} following={!!profile.viewer?.following} />}
-            </div>
-            <Handle handle={profile.handle} />
-            {!experiments.zenMode && (
+      <div className="flex flex-col">
+        <div className="flex flex-col gap-2">
+          <Banner banner={profile?.banner} />
+          <div className="px-4 -mt-12">
+            <Avatar avatar={profile?.avatar} handle={profile.handle} className="size-24" />
+            <div>
               <div className="flex gap-2">
-                <FormattedNumber value={profile?.followersCount} unit={t('followers')} />
-                <FormattedNumber value={profile?.followsCount} unit={t('following')} />
-                <FormattedNumber value={profile?.postsCount} unit={t('posts')} />
+                <h2 className="text-xl font-bold">{profile?.displayName || profile.handle}</h2>
+                <Badge title={profile.viewer?.following && profile.viewer?.followedBy ? 'You both follow each other' : ''}>
+                  {profile.viewer?.following && profile.viewer?.followedBy && 'Mutuals'}
+                </Badge>
+                {handle !== session?.handle && <FollowButton handle={handle} following={!!profile.viewer?.following} />}
               </div>
-            )}
-            <FormattedText text={profile?.description ?? ''} linkify key="profile-description" />
+              <Handle handle={profile.handle} />
+              {!experiments.zenMode && (
+                <div className="flex gap-2">
+                  <FormattedNumber value={profile?.followersCount} unit={t('followers')} />
+                  <FormattedNumber value={profile?.followsCount} unit={t('following')} />
+                  <FormattedNumber value={profile?.postsCount} unit={t('posts')} />
+                </div>
+              )}
+              <FormattedText text={profile?.description ?? ''} linkify key="profile-description" />
 
-            {profile.viewer?.blockingByList && (
-              <div className="p-2 border mt-2">
-                <span>{t('profile:blockedBy', { name: profile.viewer.blockingByList.name })}</span>
-              </div>
-            )}
+              {profile.viewer?.blockingByList && (
+                <div className="p-2 border mt-2">
+                  <span>{t('profile:blockedBy', { name: profile.viewer.blockingByList.name })}</span>
+                </div>
+              )}
 
-            <Debug value={profile} />
+              <Debug value={profile} />
+            </div>
           </div>
         </div>
         {!profile.viewer?.blockingByList && (
diff --git a/src/routes/profile/$handle/post.$postId.lazy.tsx b/src/routes/profile/$handle/post.$postId.lazy.tsx
index 68b25d9..8a39925 100644
--- a/src/routes/profile/$handle/post.$postId.lazy.tsx
+++ b/src/routes/profile/$handle/post.$postId.lazy.tsx
@@ -8,13 +8,14 @@ import { Helmet } from 'react-helmet';
 import { Loading } from '@/components/ui/loading';
 import { Virtuoso } from 'react-virtuoso';
 import { forwardRef, HtmlHTMLAttributes, Ref } from 'react';
+import { StickyHeader } from '@/components/sticky-header';
 
 export const Route = createLazyFileRoute('/profile/$handle/post/$postId')({
   component: Post,
 });
 
 const List = forwardRef(function List(props: HtmlHTMLAttributes<HTMLDivElement>, ref: Ref<HTMLDivElement>) {
-  return <div ref={ref} {...props} className="flex flex-col gap-2" />;
+  return <div ref={ref} {...props} className="flex flex-col divide-y" />;
 });
 
 function Post() {
@@ -37,12 +38,15 @@ function Post() {
       <Helmet>
         <link rel="canonical" href={`https://bsky.app/profile/${handle}/post/${params.postId}`} />
       </Helmet>
-      <div className="border-x h-screen">
+      <StickyHeader>
+        <h1 className="text-xl font-bold">{t('post')}</h1>
+      </StickyHeader>
+      <div className="border-x h-full">
         <Virtuoso
           useWindowScroll
           // we need the [&>*]: since we're targeting the window scroll div
           // and the div is inside of the Virtuoso component
-          className="[&>*]:flex [&>*]:flex-col [&>*]:gap-2"
+          className="[&>*]:flex [&>*]:flex-col"
           totalCount={replies.length}
           itemContent={(index) => {
             const reply = replies?.[index];
@@ -50,7 +54,7 @@ function Post() {
             return reply.post && <PostCard post={reply.post} key={reply.post.uri} />;
           }}
           components={{
-            Header: () => <PostCard post={postThread?.post as BSkyPost} />,
+            Header: () => <PostCard post={postThread?.post as BSkyPost} className="border-b" />,
             List,
           }}
         />