+9

.claude/settings.local.json

··· 1 1 + { 2 2 + "permissions": { 3 3 + "allow": [ 4 4 + "mcp__acp__Edit", 5 5 + "mcp__acp__Write", 6 6 + "mcp__acp__Bash" 7 7 + ] 8 8 + } 9 9 + }

-1

.github/pull_request_template.md

··· 2 2 - it looks good on both mobile and desktop 3 3 - it undo's like it ought to 4 4 - it handles keyboard interactions reasonably well 5 5 - - it behaves as you would expect if you lock it 6 5 - no build errors!!!

+116 -55

actions/publishToPublication.ts

··· 65 65 } from "src/utils/collectionHelpers"; 66 66 67 67 type PublishResult = 68 68 - | { success: true; rkey: string; record: PubLeafletDocument.Record } 68 68 + | { success: true; rkey: string; record: SiteStandardDocument.Record } 69 69 | { success: false; error: OAuthSessionError }; 70 70 71 71 export async function publishToPublication({ ··· 199 199 } 200 200 201 201 // Determine the collection to use - preserve existing schema if updating 202 202 - const existingCollection = existingDocUri ? new AtUri(existingDocUri).collection : undefined; 202 202 + const existingCollection = existingDocUri 203 203 + ? new AtUri(existingDocUri).collection 204 204 + : undefined; 203 205 const documentType = getDocumentType(existingCollection); 204 206 205 207 // Build the pages array (used by both formats) ··· 228 230 if (documentType === "site.standard.document") { 229 231 // site.standard.document format 230 232 // For standalone docs, use HTTPS URL; for publication docs, use the publication AT-URI 231 231 - const siteUri = publication_uri || `https://leaflet.pub/p/${credentialSession.did}`; 233 233 + const siteUri = 234 234 + publication_uri || `https://leaflet.pub/p/${credentialSession.did}`; 232 235 233 236 record = { 234 237 $type: "site.standard.document", 235 238 title: title || "Untitled", 236 239 site: siteUri, 237 237 - path: rkey, 240 240 + path: "/" + rkey, 238 241 publishedAt: 239 242 publishedAt || existingRecord.publishedAt || new Date().toISOString(), 240 243 ...(description && { description }), ··· 903 906 const mentionedDids = new Set<string>(); 904 907 const mentionedPublications = new Map<string, string>(); // Map of DID -> publication URI 905 908 const mentionedDocuments = new Map<string, string>(); // Map of DID -> document URI 909 909 + const embeddedBskyPosts = new Map<string, string>(); // Map of author DID -> post URI 906 910 907 911 // Extract pages from either format 908 912 let pages: PubLeafletContent.Main["pages"] | undefined; ··· 917 921 918 922 if (!pages) return; 919 923 920 920 - // Extract mentions from all text blocks in all pages 921 921 - for (const page of pages) { 922 922 - if (page.$type === "pub.leaflet.pages.linearDocument") { 923 923 - const linearPage = page as PubLeafletPagesLinearDocument.Main; 924 924 - for (const blockWrapper of linearPage.blocks) { 925 925 - const block = blockWrapper.block; 926 926 - if (block.$type === "pub.leaflet.blocks.text") { 927 927 - const textBlock = block as PubLeafletBlocksText.Main; 928 928 - if (textBlock.facets) { 929 929 - for (const facet of textBlock.facets) { 930 930 - for (const feature of facet.features) { 931 931 - // Check for DID mentions 932 932 - if (PubLeafletRichtextFacet.isDidMention(feature)) { 933 933 - if (feature.did !== authorDid) { 934 934 - mentionedDids.add(feature.did); 935 935 - } 936 936 - } 937 937 - // Check for AT URI mentions (publications and documents) 938 938 - if (PubLeafletRichtextFacet.isAtMention(feature)) { 939 939 - const uri = new AtUri(feature.atURI); 924 924 + // Helper to extract blocks from all pages (both linear and canvas) 925 925 + function getAllBlocks(pages: PubLeafletContent.Main["pages"]) { 926 926 + const blocks: ( 927 927 + | PubLeafletPagesLinearDocument.Block["block"] 928 928 + | PubLeafletPagesCanvas.Block["block"] 929 929 + )[] = []; 930 930 + for (const page of pages) { 931 931 + if (page.$type === "pub.leaflet.pages.linearDocument") { 932 932 + const linearPage = page as PubLeafletPagesLinearDocument.Main; 933 933 + for (const blockWrapper of linearPage.blocks) { 934 934 + blocks.push(blockWrapper.block); 935 935 + } 936 936 + } else if (page.$type === "pub.leaflet.pages.canvas") { 937 937 + const canvasPage = page as PubLeafletPagesCanvas.Main; 938 938 + for (const blockWrapper of canvasPage.blocks) { 939 939 + blocks.push(blockWrapper.block); 940 940 + } 941 941 + } 942 942 + } 943 943 + return blocks; 944 944 + } 940 945 941 941 - if (isPublicationCollection(uri.collection)) { 942 942 - // Get the publication owner's DID 943 943 - const { data: publication } = await supabaseServerClient 944 944 - .from("publications") 945 945 - .select("identity_did") 946 946 - .eq("uri", feature.atURI) 947 947 - .single(); 946 946 + const allBlocks = getAllBlocks(pages); 948 947 949 949 - if (publication && publication.identity_did !== authorDid) { 950 950 - mentionedPublications.set( 951 951 - publication.identity_did, 952 952 - feature.atURI, 953 953 - ); 954 954 - } 955 955 - } else if (isDocumentCollection(uri.collection)) { 956 956 - // Get the document owner's DID 957 957 - const { data: document } = await supabaseServerClient 958 958 - .from("documents") 959 959 - .select("uri, data") 960 960 - .eq("uri", feature.atURI) 961 961 - .single(); 948 948 + // Extract mentions from all text blocks and embedded Bluesky posts 949 949 + for (const block of allBlocks) { 950 950 + // Check for embedded Bluesky posts 951 951 + if (PubLeafletBlocksBskyPost.isMain(block)) { 952 952 + const bskyPostUri = block.postRef.uri; 953 953 + // Extract the author DID from the post URI (at://did:xxx/app.bsky.feed.post/xxx) 954 954 + const postAuthorDid = new AtUri(bskyPostUri).host; 955 955 + if (postAuthorDid !== authorDid) { 956 956 + embeddedBskyPosts.set(postAuthorDid, bskyPostUri); 957 957 + } 958 958 + } 962 959 963 963 - if (document) { 964 964 - const normalizedMentionedDoc = normalizeDocumentRecord( 965 965 - document.data, 966 966 - ); 967 967 - // Get the author from the document URI (the DID is the host part) 968 968 - const mentionedUri = new AtUri(feature.atURI); 969 969 - const docAuthor = mentionedUri.host; 970 970 - if (normalizedMentionedDoc && docAuthor !== authorDid) { 971 971 - mentionedDocuments.set(docAuthor, feature.atURI); 972 972 - } 973 973 - } 960 960 + // Check for text blocks with mentions 961 961 + if (block.$type === "pub.leaflet.blocks.text") { 962 962 + const textBlock = block as PubLeafletBlocksText.Main; 963 963 + if (textBlock.facets) { 964 964 + for (const facet of textBlock.facets) { 965 965 + for (const feature of facet.features) { 966 966 + // Check for DID mentions 967 967 + if (PubLeafletRichtextFacet.isDidMention(feature)) { 968 968 + if (feature.did !== authorDid) { 969 969 + mentionedDids.add(feature.did); 970 970 + } 971 971 + } 972 972 + // Check for AT URI mentions (publications and documents) 973 973 + if (PubLeafletRichtextFacet.isAtMention(feature)) { 974 974 + const uri = new AtUri(feature.atURI); 975 975 + 976 976 + if (isPublicationCollection(uri.collection)) { 977 977 + // Get the publication owner's DID 978 978 + const { data: publication } = await supabaseServerClient 979 979 + .from("publications") 980 980 + .select("identity_did") 981 981 + .eq("uri", feature.atURI) 982 982 + .single(); 983 983 + 984 984 + if (publication && publication.identity_did !== authorDid) { 985 985 + mentionedPublications.set( 986 986 + publication.identity_did, 987 987 + feature.atURI, 988 988 + ); 989 989 + } 990 990 + } else if (isDocumentCollection(uri.collection)) { 991 991 + // Get the document owner's DID 992 992 + const { data: document } = await supabaseServerClient 993 993 + .from("documents") 994 994 + .select("uri, data") 995 995 + .eq("uri", feature.atURI) 996 996 + .single(); 997 997 + 998 998 + if (document) { 999 999 + const normalizedMentionedDoc = normalizeDocumentRecord( 1000 1000 + document.data, 1001 1001 + ); 1002 1002 + // Get the author from the document URI (the DID is the host part) 1003 1003 + const mentionedUri = new AtUri(feature.atURI); 1004 1004 + const docAuthor = mentionedUri.host; 1005 1005 + if (normalizedMentionedDoc && docAuthor !== authorDid) { 1006 1006 + mentionedDocuments.set(docAuthor, feature.atURI); 974 1007 } 975 1008 } 976 1009 } ··· 1026 1059 }; 1027 1060 await supabaseServerClient.from("notifications").insert(notification); 1028 1061 await pingIdentityToUpdateNotification(recipientDid); 1062 1062 + } 1063 1063 + 1064 1064 + // Create notifications for embedded Bluesky posts (only if the author has a Leaflet account) 1065 1065 + if (embeddedBskyPosts.size > 0) { 1066 1066 + // Check which of the Bluesky post authors have Leaflet accounts 1067 1067 + const { data: identities } = await supabaseServerClient 1068 1068 + .from("identities") 1069 1069 + .select("atp_did") 1070 1070 + .in("atp_did", Array.from(embeddedBskyPosts.keys())); 1071 1071 + 1072 1072 + const leafletUserDids = new Set(identities?.map((i) => i.atp_did) ?? []); 1073 1073 + 1074 1074 + for (const [postAuthorDid, bskyPostUri] of embeddedBskyPosts) { 1075 1075 + // Only notify if the post author has a Leaflet account 1076 1076 + if (leafletUserDids.has(postAuthorDid)) { 1077 1077 + const notification: Notification = { 1078 1078 + id: v7(), 1079 1079 + recipient: postAuthorDid, 1080 1080 + data: { 1081 1081 + type: "bsky_post_embed", 1082 1082 + document_uri: documentUri, 1083 1083 + bsky_post_uri: bskyPostUri, 1084 1084 + }, 1085 1085 + }; 1086 1086 + await supabaseServerClient.from("notifications").insert(notification); 1087 1087 + await pingIdentityToUpdateNotification(postAuthorDid); 1088 1088 + } 1089 1089 + } 1029 1090 } 1030 1091 }

+1 -1

app/(home-pages)/discover/PubListing.tsx

··· 62 62 <p> 63 63 Updated{" "} 64 64 {timeAgo( 65 65 - props.documents_in_publications?.[0]?.documents?.indexed_at || 65 65 + props.documents_in_publications?.[0]?.documents?.sort_date || 66 66 "", 67 67 )} 68 68 </p>

+8 -8

app/(home-pages)/discover/getPublications.ts

··· 8 8 import { deduplicateByUri } from "src/utils/deduplicateRecords"; 9 9 10 10 export type Cursor = { 11 11 - indexed_at?: string; 11 11 + sort_date?: string; 12 12 count?: number; 13 13 uri: string; 14 14 }; ··· 32 32 .or( 33 33 "record->preferences->showInDiscover.is.null,record->preferences->>showInDiscover.eq.true", 34 34 ) 35 35 - .order("indexed_at", { 35 35 + .order("documents(sort_date)", { 36 36 referencedTable: "documents_in_publications", 37 37 ascending: false, 38 38 }) ··· 64 64 } else { 65 65 // recentlyUpdated 66 66 const aDate = new Date( 67 67 - a.documents_in_publications[0]?.indexed_at || 0, 67 67 + a.documents_in_publications[0]?.documents?.sort_date || 0, 68 68 ).getTime(); 69 69 const bDate = new Date( 70 70 - b.documents_in_publications[0]?.indexed_at || 0, 70 70 + b.documents_in_publications[0]?.documents?.sort_date || 0, 71 71 ).getTime(); 72 72 if (bDate !== aDate) { 73 73 return bDate - aDate; ··· 89 89 (pubCount === cursor.count && pub.uri < cursor.uri) 90 90 ); 91 91 } else { 92 92 - const pubDate = pub.documents_in_publications[0]?.indexed_at || ""; 92 92 + const pubDate = pub.documents_in_publications[0]?.documents?.sort_date || ""; 93 93 // Find first pub after cursor 94 94 return ( 95 95 - pubDate < (cursor.indexed_at || "") || 96 96 - (pubDate === cursor.indexed_at && pub.uri < cursor.uri) 95 95 + pubDate < (cursor.sort_date || "") || 96 96 + (pubDate === cursor.sort_date && pub.uri < cursor.uri) 97 97 ); 98 98 } 99 99 }); ··· 117 117 normalizedPage.length > 0 && startIndex + limit < allPubs.length 118 118 ? order === "recentlyUpdated" 119 119 ? { 120 120 - indexed_at: lastItem.documents_in_publications[0]?.indexed_at, 120 120 + sort_date: lastItem.documents_in_publications[0]?.documents?.sort_date, 121 121 uri: lastItem.uri, 122 122 } 123 123 : {

+44

app/(home-pages)/notifications/BskyPostEmbedNotification.tsx

··· 1 1 + import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 2 2 + import { ContentLayout, Notification } from "./Notification"; 3 3 + import { HydratedBskyPostEmbedNotification } from "src/notifications"; 4 4 + import { AtUri } from "@atproto/api"; 5 5 + 6 6 + export const BskyPostEmbedNotification = ( 7 7 + props: HydratedBskyPostEmbedNotification, 8 8 + ) => { 9 9 + const docRecord = props.normalizedDocument; 10 10 + const pubRecord = props.normalizedPublication; 11 11 + 12 12 + if (!docRecord) return null; 13 13 + 14 14 + const docUri = new AtUri(props.document.uri); 15 15 + const rkey = docUri.rkey; 16 16 + const did = docUri.host; 17 17 + 18 18 + const href = pubRecord ? `${pubRecord.url}/${rkey}` : `/p/${did}/${rkey}`; 19 19 + 20 20 + const embedder = props.documentCreatorHandle 21 21 + ? `@${props.documentCreatorHandle}` 22 22 + : "Someone"; 23 23 + 24 24 + return ( 25 25 + <Notification 26 26 + timestamp={props.created_at} 27 27 + href={href} 28 28 + icon={<BlueskyTiny />} 29 29 + actionText={<>{embedder} embedded your Bluesky post</>} 30 30 + content={ 31 31 + <ContentLayout postTitle={docRecord.title} pubRecord={pubRecord}> 32 32 + {props.bskyPostText && ( 33 33 + <pre 34 34 + style={{ wordBreak: "break-word" }} 35 35 + className="whitespace-pre-wrap text-secondary line-clamp-3 text-sm" 36 36 + > 37 37 + {props.bskyPostText} 38 38 + </pre> 39 39 + )} 40 40 + </ContentLayout> 41 41 + } 42 42 + /> 43 43 + ); 44 44 + };

+1 -1

app/(home-pages)/notifications/FollowNotification.tsx

··· 23 23 <Notification 24 24 timestamp={props.created_at} 25 25 href={pubRecord ? pubRecord.url : "#"} 26 26 - icon={<Avatar src={avatarSrc} displayName={displayName} tiny />} 26 26 + icon={<Avatar src={avatarSrc} displayName={displayName} size="tiny" />} 27 27 actionText={ 28 28 <> 29 29 {displayName} subscribed to {pubRecord?.name}!

+4

app/(home-pages)/notifications/NotificationList.tsx

··· 8 8 import { useIdentityData } from "components/IdentityProvider"; 9 9 import { FollowNotification } from "./FollowNotification"; 10 10 import { QuoteNotification } from "./QuoteNotification"; 11 11 + import { BskyPostEmbedNotification } from "./BskyPostEmbedNotification"; 11 12 import { MentionNotification } from "./MentionNotification"; 12 13 import { CommentMentionNotification } from "./CommentMentionNotification"; 13 14 ··· 47 48 } 48 49 if (n.type === "quote") { 49 50 return <QuoteNotification key={n.id} {...n} />; 51 51 + } 52 52 + if (n.type === "bsky_post_embed") { 53 53 + return <BskyPostEmbedNotification key={n.id} {...n} />; 50 54 } 51 55 if (n.type === "mention") { 52 56 return <MentionNotification key={n.id} {...n} />;

+6 -3

app/(home-pages)/p/[didOrHandle]/ProfileHeader.tsx

··· 16 16 popover?: boolean; 17 17 }) => { 18 18 let profileRecord = props.profile; 19 19 - const profileUrl = `/p/${props.profile.handle}`; 19 19 + const profileUrl = `https://leaflet.pub/p/${props.profile.handle}`; 20 20 21 21 const avatarElement = ( 22 22 <Avatar 23 23 src={profileRecord.avatar} 24 24 displayName={profileRecord.displayName} 25 25 className="profileAvatar mx-auto mt-3 sm:mt-4" 26 26 - giant 26 26 + size="giant" 27 27 /> 28 28 ); 29 29 ··· 100 100 </div> 101 101 ); 102 102 }; 103 103 - const PublicationCard = (props: { record: NormalizedPublication; uri: string }) => { 103 103 + const PublicationCard = (props: { 104 104 + record: NormalizedPublication; 105 105 + uri: string; 106 106 + }) => { 104 107 const { record, uri } = props; 105 108 const { bgLeaflet, bgPage, primary } = usePubTheme(record.theme); 106 109

+5 -5

app/(home-pages)/p/[didOrHandle]/getProfilePosts.ts

··· 10 10 import { deduplicateByUriOrdered } from "src/utils/deduplicateRecords"; 11 11 12 12 export type Cursor = { 13 13 - indexed_at: string; 13 13 + sort_date: string; 14 14 uri: string; 15 15 }; 16 16 ··· 29 29 documents_in_publications(publications(*))`, 30 30 ) 31 31 .like("uri", `at://${did}/%`) 32 32 - .order("indexed_at", { ascending: false }) 32 32 + .order("sort_date", { ascending: false }) 33 33 .order("uri", { ascending: false }) 34 34 .limit(limit); 35 35 36 36 if (cursor) { 37 37 query = query.or( 38 38 - `indexed_at.lt.${cursor.indexed_at},and(indexed_at.eq.${cursor.indexed_at},uri.lt.${cursor.uri})`, 38 38 + `sort_date.lt.${cursor.sort_date},and(sort_date.eq.${cursor.sort_date},uri.lt.${cursor.uri})`, 39 39 ); 40 40 } 41 41 ··· 79 79 documents: { 80 80 data: normalizedData, 81 81 uri: doc.uri, 82 82 - indexed_at: doc.indexed_at, 82 82 + sort_date: doc.sort_date, 83 83 comments_on_documents: doc.comments_on_documents, 84 84 document_mentions_in_bsky: doc.document_mentions_in_bsky, 85 85 }, ··· 99 99 const nextCursor = 100 100 posts.length === limit 101 101 ? { 102 102 - indexed_at: posts[posts.length - 1].documents.indexed_at, 102 102 + sort_date: posts[posts.length - 1].documents.sort_date, 103 103 uri: posts[posts.length - 1].documents.uri, 104 104 } 105 105 : null;

+5 -5

app/(home-pages)/reader/getReaderFeed.ts

··· 38 38 "documents_in_publications.publications.publication_subscriptions.identity", 39 39 auth_res.atp_did, 40 40 ) 41 41 - .order("indexed_at", { ascending: false }) 41 41 + .order("sort_date", { ascending: false }) 42 42 .order("uri", { ascending: false }) 43 43 .limit(25); 44 44 if (cursor) { 45 45 query = query.or( 46 46 - `indexed_at.lt.${cursor.timestamp},and(indexed_at.eq.${cursor.timestamp},uri.lt.${cursor.uri})`, 46 46 + `sort_date.lt.${cursor.timestamp},and(sort_date.eq.${cursor.timestamp},uri.lt.${cursor.uri})`, 47 47 ); 48 48 } 49 49 let { data: rawFeed, error } = await query; ··· 78 78 document_mentions_in_bsky: post.document_mentions_in_bsky, 79 79 data: normalizedData, 80 80 uri: post.uri, 81 81 - indexed_at: post.indexed_at, 81 81 + sort_date: post.sort_date, 82 82 }, 83 83 }; 84 84 return p; ··· 88 88 const nextCursor = 89 89 posts.length > 0 90 90 ? { 91 91 - timestamp: posts[posts.length - 1].documents.indexed_at, 91 91 + timestamp: posts[posts.length - 1].documents.sort_date, 92 92 uri: posts[posts.length - 1].documents.uri, 93 93 } 94 94 : null; ··· 109 109 documents: { 110 110 data: NormalizedDocument | null; 111 111 uri: string; 112 112 - indexed_at: string; 112 112 + sort_date: string; 113 113 comments_on_documents: { count: number }[] | undefined; 114 114 document_mentions_in_bsky: { count: number }[] | undefined; 115 115 };

+2 -2

app/(home-pages)/reader/getSubscriptions.ts

··· 32 32 .select(`*, publications(*, documents_in_publications(*, documents(*)))`) 33 33 .order(`created_at`, { ascending: false }) 34 34 .order(`uri`, { ascending: false }) 35 35 - .order("indexed_at", { 35 35 + .order("documents(sort_date)", { 36 36 ascending: false, 37 37 referencedTable: "publications.documents_in_publications", 38 38 }) ··· 85 85 record: NormalizedPublication; 86 86 uri: string; 87 87 documents_in_publications: { 88 88 - documents: { data?: Json; indexed_at: string } | null; 88 88 + documents: { data?: Json; sort_date: string } | null; 89 89 }[]; 90 90 };

+2 -2

app/(home-pages)/tag/[tag]/getDocumentsByTag.ts

··· 24 24 documents_in_publications(publications(*))`, 25 25 ) 26 26 .contains("data->tags", `["${tag}"]`) 27 27 - .order("indexed_at", { ascending: false }) 27 27 + .order("sort_date", { ascending: false }) 28 28 .limit(50); 29 29 30 30 if (error) { ··· 69 69 document_mentions_in_bsky: doc.document_mentions_in_bsky, 70 70 data: normalizedData, 71 71 uri: doc.uri, 72 72 - indexed_at: doc.indexed_at, 72 72 + sort_date: doc.sort_date, 73 73 }, 74 74 }; 75 75 return post;

+17 -1

app/[leaflet_id]/Footer.tsx

··· 8 8 import { HomeButton } from "app/[leaflet_id]/actions/HomeButton"; 9 9 import { PublishButton } from "./actions/PublishButton"; 10 10 import { useEntitySetContext } from "components/EntitySetProvider"; 11 11 - import { HelpButton } from "app/[leaflet_id]/actions/HelpButton"; 12 11 import { Watermark } from "components/Watermark"; 13 12 import { BackToPubButton } from "./actions/BackToPubButton"; 14 13 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 15 14 import { useIdentityData } from "components/IdentityProvider"; 15 15 + import { useEntity } from "src/replicache"; 16 16 + import { block } from "sharp"; 16 17 18 18 + export function hasBlockToolbar(blockType: string | null | undefined) { 19 19 + return ( 20 20 + blockType === "text" || 21 21 + blockType === "heading" || 22 22 + blockType === "blockquote" || 23 23 + blockType === "button" || 24 24 + blockType === "datetime" || 25 25 + blockType === "image" 26 26 + ); 27 27 + } 17 28 export function LeafletFooter(props: { entityID: string }) { 18 29 let focusedBlock = useUIState((s) => s.focusedEntity); 30 30 + 19 31 let entity_set = useEntitySetContext(); 20 32 let { identity } = useIdentityData(); 21 33 let { data: pub } = useLeafletPublicationData(); 34 34 + let blockType = useEntity(focusedBlock?.entityID || null, "block/type")?.data 35 35 + .value; 22 36 23 37 return ( 24 38 <Media mobile className="mobileFooter w-full z-10 touch-none -mt-[54px] "> 25 39 {focusedBlock && 26 40 focusedBlock.entityType == "block" && 41 41 + hasBlockToolbar(blockType) && 27 42 entity_set.permissions.write ? ( 28 43 <div 29 44 className="w-full z-10 p-2 flex bg-bg-page pwa-padding-bottom" ··· 34 49 <Toolbar 35 50 pageID={focusedBlock.parent} 36 51 blockID={focusedBlock.entityID} 52 52 + blockType={blockType} 37 53 /> 38 54 </div> 39 55 ) : entity_set.permissions.write ? (

+1 -7

app/[leaflet_id]/Leaflet.tsx

··· 18 18 token: PermissionToken; 19 19 initialFacts: Fact<Attribute>[]; 20 20 leaflet_id: string; 21 21 - initialHeadingFontId?: string; 22 22 - initialBodyFontId?: string; 23 21 }) { 24 22 return ( 25 23 <ReplicacheProvider ··· 31 29 <EntitySetProvider 32 30 set={props.token.permission_token_rights[0].entity_set} 33 31 > 34 34 - <ThemeProvider 35 35 - entityID={props.leaflet_id} 36 36 - initialHeadingFontId={props.initialHeadingFontId} 37 37 - initialBodyFontId={props.initialBodyFontId} 38 38 - > 32 32 + <ThemeProvider entityID={props.leaflet_id}> 39 33 <ThemeBackgroundProvider entityID={props.leaflet_id}> 40 34 <UpdateLeafletTitle entityID={props.leaflet_id} /> 41 35 <AddLeafletToHomepage />

+12 -23

app/[leaflet_id]/page.tsx

··· 14 14 import { get_leaflet_data } from "app/api/rpc/[command]/get_leaflet_data"; 15 15 import { NotFoundLayout } from "components/PageLayouts/NotFoundLayout"; 16 16 import { getPublicationMetadataFromLeafletData } from "src/utils/getPublicationMetadataFromLeafletData"; 17 17 - import { FontLoader, extractFontsFromFacts } from "components/FontLoader"; 18 17 19 18 export const preferredRegion = ["sfo1"]; 20 19 export const dynamic = "force-dynamic"; ··· 49 48 getPollData(res.data.permission_token_rights.map((ptr) => ptr.entity_set)), 50 49 ]); 51 50 let initialFacts = (data as unknown as Fact<Attribute>[]) || []; 52 52 - 53 53 - // Extract font settings from facts for server-side font loading 54 54 - const { headingFontId, bodyFontId } = extractFontsFromFacts(initialFacts as any, rootEntity); 55 55 - 56 51 return ( 57 57 - <> 58 58 - {/* Server-side font loading with preload and @font-face */} 59 59 - <FontLoader headingFontId={headingFontId} bodyFontId={bodyFontId} /> 60 60 - <PageSWRDataProvider 61 61 - rsvp_data={rsvp_data} 62 62 - poll_data={poll_data} 63 63 - leaflet_id={res.data.id} 64 64 - leaflet_data={res} 65 65 - > 66 66 - <Leaflet 67 67 - initialFacts={initialFacts} 68 68 - leaflet_id={rootEntity} 69 69 - token={res.data} 70 70 - initialHeadingFontId={headingFontId} 71 71 - initialBodyFontId={bodyFontId} 72 72 - /> 73 73 - </PageSWRDataProvider> 74 74 - </> 52 52 + <PageSWRDataProvider 53 53 + rsvp_data={rsvp_data} 54 54 + poll_data={poll_data} 55 55 + leaflet_id={res.data.id} 56 56 + leaflet_data={res} 57 57 + > 58 58 + <Leaflet 59 59 + initialFacts={initialFacts} 60 60 + leaflet_id={rootEntity} 61 61 + token={res.data} 62 62 + /> 63 63 + </PageSWRDataProvider> 75 64 ); 76 65 } 77 66

+4 -7

app/[leaflet_id]/publish/publishBskyPost.ts

··· 8 8 import sharp from "sharp"; 9 9 import { TID } from "@atproto/common"; 10 10 import { getIdentityData } from "actions/getIdentityData"; 11 11 - import { AtpBaseClient, PubLeafletDocument } from "lexicons/api"; 12 12 - import { 13 13 - restoreOAuthSession, 14 14 - OAuthSessionError, 15 15 - } from "src/atproto-oauth"; 11 11 + import { AtpBaseClient, SiteStandardDocument } from "lexicons/api"; 12 12 + import { restoreOAuthSession, OAuthSessionError } from "src/atproto-oauth"; 16 13 import { supabaseServerClient } from "supabase/serverClient"; 17 14 import { Json } from "supabase/database.types"; 18 15 import { ··· 30 27 url: string; 31 28 title: string; 32 29 description: string; 33 33 - document_record: PubLeafletDocument.Record; 30 30 + document_record: SiteStandardDocument.Record; 34 31 rkey: string; 35 32 facets: AppBskyRichtextFacet.Main[]; 36 33 }): Promise<PublishBskyResult> { ··· 115 112 }, 116 113 ); 117 114 let record = args.document_record; 118 118 - record.postRef = post; 115 115 + record.bskyPostRef = post; 119 116 120 117 let { data: result } = await agent.com.atproto.repo.putRecord({ 121 118 rkey: args.rkey,

+25

app/api/inngest/client.ts

··· 26 26 did: string; 27 27 }; 28 28 }; 29 29 + "user/cleanup-expired-oauth-sessions": { 30 30 + data: {}; 31 31 + }; 32 32 + "user/check-oauth-session": { 33 33 + data: { 34 34 + identityId: string; 35 35 + did: string; 36 36 + tokenCount: number; 37 37 + }; 38 38 + }; 39 39 + "documents/fix-publication-references": { 40 40 + data: { 41 41 + documentUris: string[]; 42 42 + }; 43 43 + }; 44 44 + "documents/fix-incorrect-site-values": { 45 45 + data: { 46 46 + did: string; 47 47 + }; 48 48 + }; 49 49 + "documents/fix-postref": { 50 50 + data: { 51 51 + documentUris?: string[]; 52 52 + }; 53 53 + }; 29 54 }; 30 55 31 56 // Create a client to send and receive events

+123

app/api/inngest/functions/cleanup_expired_oauth_sessions.ts

··· 1 1 + import { supabaseServerClient } from "supabase/serverClient"; 2 2 + import { inngest } from "../client"; 3 3 + import { restoreOAuthSession } from "src/atproto-oauth"; 4 4 + 5 5 + // Main function that fetches identities and publishes events for each one 6 6 + export const cleanup_expired_oauth_sessions = inngest.createFunction( 7 7 + { id: "cleanup_expired_oauth_sessions" }, 8 8 + { event: "user/cleanup-expired-oauth-sessions" }, 9 9 + async ({ step }) => { 10 10 + // Get all identities with an atp_did (OAuth users) that have at least one auth token 11 11 + const identities = await step.run("fetch-oauth-identities", async () => { 12 12 + const { data, error } = await supabaseServerClient 13 13 + .from("identities") 14 14 + .select("id, atp_did, email_auth_tokens(count)") 15 15 + .not("atp_did", "is", null); 16 16 + 17 17 + if (error) { 18 18 + throw new Error(`Failed to fetch identities: ${error.message}`); 19 19 + } 20 20 + 21 21 + // Filter to only include identities with at least one auth token 22 22 + return (data || []) 23 23 + .filter((identity) => { 24 24 + const tokenCount = identity.email_auth_tokens?.[0]?.count ?? 0; 25 25 + return tokenCount > 0; 26 26 + }) 27 27 + .map((identity) => ({ 28 28 + id: identity.id, 29 29 + atp_did: identity.atp_did!, 30 30 + tokenCount: identity.email_auth_tokens?.[0]?.count ?? 0, 31 31 + })); 32 32 + }); 33 33 + 34 34 + console.log( 35 35 + `Found ${identities.length} OAuth identities with active sessions to check`, 36 36 + ); 37 37 + 38 38 + // Publish events for each identity in batches 39 39 + const BATCH_SIZE = 100; 40 40 + let totalSent = 0; 41 41 + 42 42 + for (let i = 0; i < identities.length; i += BATCH_SIZE) { 43 43 + const batch = identities.slice(i, i + BATCH_SIZE); 44 44 + 45 45 + await step.run(`send-events-batch-${i}`, async () => { 46 46 + const events = batch.map((identity) => ({ 47 47 + name: "user/check-oauth-session" as const, 48 48 + data: { 49 49 + identityId: identity.id, 50 50 + did: identity.atp_did, 51 51 + tokenCount: identity.tokenCount, 52 52 + }, 53 53 + })); 54 54 + 55 55 + await inngest.send(events); 56 56 + return events.length; 57 57 + }); 58 58 + 59 59 + totalSent += batch.length; 60 60 + } 61 61 + 62 62 + console.log(`Published ${totalSent} check-oauth-session events`); 63 63 + 64 64 + return { 65 65 + success: true, 66 66 + identitiesQueued: totalSent, 67 67 + }; 68 68 + }, 69 69 + ); 70 70 + 71 71 + // Function that checks a single identity's OAuth session and cleans up if expired 72 72 + export const check_oauth_session = inngest.createFunction( 73 73 + { id: "check_oauth_session" }, 74 74 + { event: "user/check-oauth-session" }, 75 75 + async ({ event, step }) => { 76 76 + const { identityId, did, tokenCount } = event.data; 77 77 + 78 78 + const result = await step.run("check-and-cleanup", async () => { 79 79 + console.log(`Checking OAuth session for DID: ${did} (${tokenCount} tokens)`); 80 80 + 81 81 + const sessionResult = await restoreOAuthSession(did); 82 82 + 83 83 + if (sessionResult.ok) { 84 84 + console.log(` Session valid for ${did}`); 85 85 + return { valid: true, tokensDeleted: 0 }; 86 86 + } 87 87 + 88 88 + // Session is expired/invalid - delete associated auth tokens 89 89 + console.log( 90 90 + ` Session expired for ${did}: ${sessionResult.error.message}`, 91 91 + ); 92 92 + 93 93 + const { error: deleteError } = await supabaseServerClient 94 94 + .from("email_auth_tokens") 95 95 + .delete() 96 96 + .eq("identity", identityId); 97 97 + 98 98 + if (deleteError) { 99 99 + console.error( 100 100 + ` Error deleting tokens for identity ${identityId}: ${deleteError.message}`, 101 101 + ); 102 102 + return { 103 103 + valid: false, 104 104 + tokensDeleted: 0, 105 105 + error: deleteError.message, 106 106 + }; 107 107 + } 108 108 + 109 109 + console.log(` Deleted ${tokenCount} auth tokens for identity ${identityId}`); 110 110 + 111 111 + return { 112 112 + valid: false, 113 113 + tokensDeleted: tokenCount, 114 114 + }; 115 115 + }); 116 116 + 117 117 + return { 118 118 + identityId, 119 119 + did, 120 120 + ...result, 121 121 + }; 122 122 + }, 123 123 + );

+300

app/api/inngest/functions/fix_incorrect_site_values.ts

··· 1 1 + import { supabaseServerClient } from "supabase/serverClient"; 2 2 + import { inngest } from "../client"; 3 3 + import { restoreOAuthSession } from "src/atproto-oauth"; 4 4 + import { AtpBaseClient, SiteStandardDocument } from "lexicons/api"; 5 5 + import { AtUri } from "@atproto/syntax"; 6 6 + import { Json } from "supabase/database.types"; 7 7 + 8 8 + async function createAuthenticatedAgent(did: string): Promise<AtpBaseClient> { 9 9 + const result = await restoreOAuthSession(did); 10 10 + if (!result.ok) { 11 11 + throw new Error(`Failed to restore OAuth session: ${result.error.message}`); 12 12 + } 13 13 + const credentialSession = result.value; 14 14 + return new AtpBaseClient( 15 15 + credentialSession.fetchHandler.bind(credentialSession), 16 16 + ); 17 17 + } 18 18 + 19 19 + /** 20 20 + * Build set of valid site values for a publication. 21 21 + * A site value is valid if it matches the publication or its legacy equivalent. 22 22 + */ 23 23 + function buildValidSiteValues(pubUri: string): Set<string> { 24 24 + const validValues = new Set<string>([pubUri]); 25 25 + 26 26 + try { 27 27 + const aturi = new AtUri(pubUri); 28 28 + 29 29 + if (pubUri.includes("/site.standard.publication/")) { 30 30 + // Also accept legacy pub.leaflet.publication 31 31 + validValues.add( 32 32 + `at://${aturi.hostname}/pub.leaflet.publication/${aturi.rkey}`, 33 33 + ); 34 34 + } else if (pubUri.includes("/pub.leaflet.publication/")) { 35 35 + // Also accept new site.standard.publication 36 36 + validValues.add( 37 37 + `at://${aturi.hostname}/site.standard.publication/${aturi.rkey}`, 38 38 + ); 39 39 + } 40 40 + } catch (e) { 41 41 + // Invalid URI, just use the original 42 42 + } 43 43 + 44 44 + return validValues; 45 45 + } 46 46 + 47 47 + /** 48 48 + * This function finds and fixes documents that have incorrect site values. 49 49 + * A document has an incorrect site value if its `site` field doesn't match 50 50 + * the publication it belongs to (via documents_in_publications). 51 51 + * 52 52 + * Takes a DID as input and processes publications owned by that identity. 53 53 + */ 54 54 + export const fix_incorrect_site_values = inngest.createFunction( 55 55 + { id: "fix_incorrect_site_values" }, 56 56 + { event: "documents/fix-incorrect-site-values" }, 57 57 + async ({ event, step }) => { 58 58 + const { did } = event.data; 59 59 + 60 60 + const stats = { 61 61 + publicationsChecked: 0, 62 62 + documentsChecked: 0, 63 63 + documentsWithIncorrectSite: 0, 64 64 + documentsFixed: 0, 65 65 + documentsMissingSite: 0, 66 66 + errors: [] as string[], 67 67 + }; 68 68 + 69 69 + // Step 1: Get all publications owned by this identity 70 70 + const publications = await step.run("fetch-publications", async () => { 71 71 + const { data, error } = await supabaseServerClient 72 72 + .from("publications") 73 73 + .select("uri") 74 74 + .eq("identity_did", did); 75 75 + 76 76 + if (error) { 77 77 + throw new Error(`Failed to fetch publications: ${error.message}`); 78 78 + } 79 79 + return data || []; 80 80 + }); 81 81 + 82 82 + stats.publicationsChecked = publications.length; 83 83 + 84 84 + if (publications.length === 0) { 85 85 + return { 86 86 + success: true, 87 87 + message: "No publications found for this identity", 88 88 + stats, 89 89 + }; 90 90 + } 91 91 + 92 92 + // Step 2: Get all documents_in_publications entries for these publications 93 93 + const publicationUris = publications.map((p) => p.uri); 94 94 + 95 95 + const joinEntries = await step.run( 96 96 + "fetch-documents-in-publications", 97 97 + async () => { 98 98 + const { data, error } = await supabaseServerClient 99 99 + .from("documents_in_publications") 100 100 + .select("document, publication") 101 101 + .in("publication", publicationUris); 102 102 + 103 103 + if (error) { 104 104 + throw new Error( 105 105 + `Failed to fetch documents_in_publications: ${error.message}`, 106 106 + ); 107 107 + } 108 108 + return data || []; 109 109 + }, 110 110 + ); 111 111 + 112 112 + if (joinEntries.length === 0) { 113 113 + return { 114 114 + success: true, 115 115 + message: "No documents found in publications", 116 116 + stats, 117 117 + }; 118 118 + } 119 119 + 120 120 + // Create a map of document URI -> expected publication URI 121 121 + const documentToPublication = new Map<string, string>(); 122 122 + for (const row of joinEntries) { 123 123 + documentToPublication.set(row.document, row.publication); 124 124 + } 125 125 + 126 126 + // Step 3: Fetch all document records 127 127 + const documentUris = Array.from(documentToPublication.keys()); 128 128 + 129 129 + const allDocuments = await step.run("fetch-documents", async () => { 130 130 + const { data, error } = await supabaseServerClient 131 131 + .from("documents") 132 132 + .select("uri, data") 133 133 + .in("uri", documentUris); 134 134 + 135 135 + if (error) { 136 136 + throw new Error(`Failed to fetch documents: ${error.message}`); 137 137 + } 138 138 + return data || []; 139 139 + }); 140 140 + 141 141 + stats.documentsChecked = allDocuments.length; 142 142 + 143 143 + // Step 4: Find documents with incorrect site values 144 144 + const documentsToFix: Array<{ 145 145 + uri: string; 146 146 + currentSite: string | null; 147 147 + correctSite: string; 148 148 + docData: SiteStandardDocument.Record; 149 149 + }> = []; 150 150 + 151 151 + for (const doc of allDocuments) { 152 152 + const expectedPubUri = documentToPublication.get(doc.uri); 153 153 + if (!expectedPubUri) continue; 154 154 + 155 155 + const data = doc.data as unknown as SiteStandardDocument.Record; 156 156 + const currentSite = data?.site; 157 157 + 158 158 + if (!currentSite) { 159 159 + stats.documentsMissingSite++; 160 160 + continue; 161 161 + } 162 162 + 163 163 + const validSiteValues = buildValidSiteValues(expectedPubUri); 164 164 + 165 165 + if (!validSiteValues.has(currentSite)) { 166 166 + // Document has incorrect site value - determine the correct one 167 167 + // Prefer the site.standard.publication format if the doc is site.standard.document 168 168 + let correctSite = expectedPubUri; 169 169 + 170 170 + if (doc.uri.includes("/site.standard.document/")) { 171 171 + // For site.standard.document, use site.standard.publication format 172 172 + try { 173 173 + const pubAturi = new AtUri(expectedPubUri); 174 174 + if (expectedPubUri.includes("/pub.leaflet.publication/")) { 175 175 + correctSite = `at://${pubAturi.hostname}/site.standard.publication/${pubAturi.rkey}`; 176 176 + } 177 177 + } catch (e) { 178 178 + // Use as-is 179 179 + } 180 180 + } 181 181 + 182 182 + documentsToFix.push({ 183 183 + uri: doc.uri, 184 184 + currentSite, 185 185 + correctSite, 186 186 + docData: data, 187 187 + }); 188 188 + } 189 189 + } 190 190 + 191 191 + stats.documentsWithIncorrectSite = documentsToFix.length; 192 192 + 193 193 + if (documentsToFix.length === 0) { 194 194 + return { 195 195 + success: true, 196 196 + message: "All documents have correct site values", 197 197 + stats, 198 198 + }; 199 199 + } 200 200 + 201 201 + // Step 5: Group documents by author DID for efficient OAuth session handling 202 202 + const docsByDid = new Map<string, typeof documentsToFix>(); 203 203 + for (const doc of documentsToFix) { 204 204 + try { 205 205 + const aturi = new AtUri(doc.uri); 206 206 + const authorDid = aturi.hostname; 207 207 + const existing = docsByDid.get(authorDid) || []; 208 208 + existing.push(doc); 209 209 + docsByDid.set(authorDid, existing); 210 210 + } catch (e) { 211 211 + stats.errors.push(`Invalid URI: ${doc.uri}`); 212 212 + } 213 213 + } 214 214 + 215 215 + // Step 6: Process each author's documents 216 216 + for (const [authorDid, docs] of docsByDid) { 217 217 + // Verify OAuth session for this author 218 218 + const oauthValid = await step.run( 219 219 + `verify-oauth-${authorDid.slice(-8)}`, 220 220 + async () => { 221 221 + const result = await restoreOAuthSession(authorDid); 222 222 + return result.ok; 223 223 + }, 224 224 + ); 225 225 + 226 226 + if (!oauthValid) { 227 227 + stats.errors.push(`No valid OAuth session for ${authorDid}`); 228 228 + continue; 229 229 + } 230 230 + 231 231 + // Fix each document for this author 232 232 + for (const docToFix of docs) { 233 233 + const result = await step.run( 234 234 + `fix-doc-${docToFix.uri.slice(-12)}`, 235 235 + async () => { 236 236 + try { 237 237 + const docAturi = new AtUri(docToFix.uri); 238 238 + 239 239 + // Build updated record 240 240 + const updatedRecord: SiteStandardDocument.Record = { 241 241 + ...docToFix.docData, 242 242 + site: docToFix.correctSite, 243 243 + }; 244 244 + 245 245 + // Update on PDS 246 246 + const agent = await createAuthenticatedAgent(authorDid); 247 247 + await agent.com.atproto.repo.putRecord({ 248 248 + repo: authorDid, 249 249 + collection: docAturi.collection, 250 250 + rkey: docAturi.rkey, 251 251 + record: updatedRecord, 252 252 + validate: false, 253 253 + }); 254 254 + 255 255 + // Update in database 256 256 + const { error: dbError } = await supabaseServerClient 257 257 + .from("documents") 258 258 + .update({ data: updatedRecord as Json }) 259 259 + .eq("uri", docToFix.uri); 260 260 + 261 261 + if (dbError) { 262 262 + return { 263 263 + success: false as const, 264 264 + error: `Database update failed: ${dbError.message}`, 265 265 + }; 266 266 + } 267 267 + 268 268 + return { 269 269 + success: true as const, 270 270 + oldSite: docToFix.currentSite, 271 271 + newSite: docToFix.correctSite, 272 272 + }; 273 273 + } catch (e) { 274 274 + return { 275 275 + success: false as const, 276 276 + error: e instanceof Error ? e.message : String(e), 277 277 + }; 278 278 + } 279 279 + }, 280 280 + ); 281 281 + 282 282 + if (result.success) { 283 283 + stats.documentsFixed++; 284 284 + } else { 285 285 + stats.errors.push(`${docToFix.uri}: ${result.error}`); 286 286 + } 287 287 + } 288 288 + } 289 289 + 290 290 + return { 291 291 + success: stats.errors.length === 0, 292 292 + stats, 293 293 + documentsToFix: documentsToFix.map((d) => ({ 294 294 + uri: d.uri, 295 295 + oldSite: d.currentSite, 296 296 + newSite: d.correctSite, 297 297 + })), 298 298 + }; 299 299 + }, 300 300 + );

+196

app/api/inngest/functions/fix_standard_document_postref.ts

··· 1 1 + import { supabaseServerClient } from "supabase/serverClient"; 2 2 + import { inngest } from "../client"; 3 3 + import { restoreOAuthSession } from "src/atproto-oauth"; 4 4 + import { 5 5 + AtpBaseClient, 6 6 + SiteStandardDocument, 7 7 + ComAtprotoRepoStrongRef, 8 8 + } from "lexicons/api"; 9 9 + import { AtUri } from "@atproto/syntax"; 10 10 + import { Json } from "supabase/database.types"; 11 11 + 12 12 + async function createAuthenticatedAgent(did: string): Promise<AtpBaseClient> { 13 13 + const result = await restoreOAuthSession(did); 14 14 + if (!result.ok) { 15 15 + throw new Error(`Failed to restore OAuth session: ${result.error.message}`); 16 16 + } 17 17 + const credentialSession = result.value; 18 18 + return new AtpBaseClient( 19 19 + credentialSession.fetchHandler.bind(credentialSession), 20 20 + ); 21 21 + } 22 22 + 23 23 + /** 24 24 + * Fixes site.standard.document records that have the legacy `postRef` field set. 25 25 + * Migrates the value to `bskyPostRef` (the correct field for site.standard.document) 26 26 + * and removes the legacy `postRef` field. 27 27 + * 28 28 + * Can be triggered with specific document URIs, or will find all affected documents 29 29 + * if no URIs are provided. 30 30 + */ 31 31 + export const fix_standard_document_postref = inngest.createFunction( 32 32 + { id: "fix_standard_document_postref" }, 33 33 + { event: "documents/fix-postref" }, 34 34 + async ({ event, step }) => { 35 35 + const { documentUris: providedUris } = event.data as { 36 36 + documentUris?: string[]; 37 37 + }; 38 38 + 39 39 + const stats = { 40 40 + documentsFound: 0, 41 41 + documentsFixed: 0, 42 42 + documentsSkipped: 0, 43 43 + errors: [] as string[], 44 44 + }; 45 45 + 46 46 + // Step 1: Find documents to fix (either provided or query for them) 47 47 + const documentUris = await step.run("find-documents", async () => { 48 48 + if (providedUris && providedUris.length > 0) { 49 49 + return providedUris; 50 50 + } 51 51 + 52 52 + // Find all site.standard.document records with postRef set 53 53 + const { data: documents, error } = await supabaseServerClient 54 54 + .from("documents") 55 55 + .select("uri") 56 56 + .like("uri", "at://%/site.standard.document/%") 57 57 + .not("data->postRef", "is", null); 58 58 + 59 59 + if (error) { 60 60 + throw new Error(`Failed to query documents: ${error.message}`); 61 61 + } 62 62 + 63 63 + return (documents || []).map((d) => d.uri); 64 64 + }); 65 65 + 66 66 + stats.documentsFound = documentUris.length; 67 67 + 68 68 + if (documentUris.length === 0) { 69 69 + return { 70 70 + success: true, 71 71 + message: "No documents found with postRef field", 72 72 + stats, 73 73 + }; 74 74 + } 75 75 + 76 76 + // Step 2: Group documents by DID for efficient OAuth session handling 77 77 + const docsByDid = new Map<string, string[]>(); 78 78 + for (const uri of documentUris) { 79 79 + try { 80 80 + const aturi = new AtUri(uri); 81 81 + const did = aturi.hostname; 82 82 + const existing = docsByDid.get(did) || []; 83 83 + existing.push(uri); 84 84 + docsByDid.set(did, existing); 85 85 + } catch (e) { 86 86 + stats.errors.push(`Invalid URI: ${uri}`); 87 87 + } 88 88 + } 89 89 + 90 90 + // Step 3: Process each DID's documents 91 91 + for (const [did, uris] of docsByDid) { 92 92 + // Verify OAuth session for this user 93 93 + const oauthValid = await step.run( 94 94 + `verify-oauth-${did.slice(-8)}`, 95 95 + async () => { 96 96 + const result = await restoreOAuthSession(did); 97 97 + return result.ok; 98 98 + }, 99 99 + ); 100 100 + 101 101 + if (!oauthValid) { 102 102 + stats.errors.push(`No valid OAuth session for ${did}`); 103 103 + stats.documentsSkipped += uris.length; 104 104 + continue; 105 105 + } 106 106 + 107 107 + // Fix each document 108 108 + for (const docUri of uris) { 109 109 + const result = await step.run( 110 110 + `fix-doc-${docUri.slice(-12)}`, 111 111 + async () => { 112 112 + // Fetch the document 113 113 + const { data: doc, error: fetchError } = await supabaseServerClient 114 114 + .from("documents") 115 115 + .select("uri, data") 116 116 + .eq("uri", docUri) 117 117 + .single(); 118 118 + 119 119 + if (fetchError || !doc) { 120 120 + return { 121 121 + success: false as const, 122 122 + error: `Document not found: ${fetchError?.message || "no data"}`, 123 123 + }; 124 124 + } 125 125 + 126 126 + const data = doc.data as Record<string, unknown>; 127 127 + const postRef = data.postRef as 128 128 + | ComAtprotoRepoStrongRef.Main 129 129 + | undefined; 130 130 + 131 131 + if (!postRef) { 132 132 + return { 133 133 + success: false as const, 134 134 + skipped: true, 135 135 + error: "Document does not have postRef field", 136 136 + }; 137 137 + } 138 138 + 139 139 + // Build updated record: move postRef to bskyPostRef 140 140 + const { postRef: _, ...restData } = data; 141 141 + let updatedRecord: SiteStandardDocument.Record = { 142 142 + ...(restData as SiteStandardDocument.Record), 143 143 + }; 144 144 + 145 145 + updatedRecord.bskyPostRef = data.bskyPostRef 146 146 + ? (data.bskyPostRef as ComAtprotoRepoStrongRef.Main) 147 147 + : postRef; 148 148 + 149 149 + // Write to PDS 150 150 + const docAturi = new AtUri(docUri); 151 151 + const agent = await createAuthenticatedAgent(did); 152 152 + await agent.com.atproto.repo.putRecord({ 153 153 + repo: did, 154 154 + collection: "site.standard.document", 155 155 + rkey: docAturi.rkey, 156 156 + record: updatedRecord, 157 157 + validate: false, 158 158 + }); 159 159 + 160 160 + // Update database 161 161 + const { error: dbError } = await supabaseServerClient 162 162 + .from("documents") 163 163 + .update({ data: updatedRecord as Json }) 164 164 + .eq("uri", docUri); 165 165 + 166 166 + if (dbError) { 167 167 + return { 168 168 + success: false as const, 169 169 + error: `Database update failed: ${dbError.message}`, 170 170 + }; 171 171 + } 172 172 + 173 173 + return { 174 174 + success: true as const, 175 175 + postRef, 176 176 + bskyPostRef: updatedRecord.bskyPostRef, 177 177 + }; 178 178 + }, 179 179 + ); 180 180 + 181 181 + if (result.success) { 182 182 + stats.documentsFixed++; 183 183 + } else if ("skipped" in result && result.skipped) { 184 184 + stats.documentsSkipped++; 185 185 + } else { 186 186 + stats.errors.push(`${docUri}: ${result.error}`); 187 187 + } 188 188 + } 189 189 + } 190 190 + 191 191 + return { 192 192 + success: stats.errors.length === 0, 193 193 + stats, 194 194 + }; 195 195 + }, 196 196 + );

+213

app/api/inngest/functions/fix_standard_document_publications.ts

··· 1 1 + import { supabaseServerClient } from "supabase/serverClient"; 2 2 + import { inngest } from "../client"; 3 3 + import { restoreOAuthSession } from "src/atproto-oauth"; 4 4 + import { AtpBaseClient, SiteStandardDocument } from "lexicons/api"; 5 5 + import { AtUri } from "@atproto/syntax"; 6 6 + import { Json } from "supabase/database.types"; 7 7 + 8 8 + async function createAuthenticatedAgent(did: string): Promise<AtpBaseClient> { 9 9 + const result = await restoreOAuthSession(did); 10 10 + if (!result.ok) { 11 11 + throw new Error(`Failed to restore OAuth session: ${result.error.message}`); 12 12 + } 13 13 + const credentialSession = result.value; 14 14 + return new AtpBaseClient( 15 15 + credentialSession.fetchHandler.bind(credentialSession), 16 16 + ); 17 17 + } 18 18 + 19 19 + /** 20 20 + * Fixes site.standard.document records that have stale pub.leaflet.publication 21 21 + * references in their site field. Updates both the PDS record and database. 22 22 + */ 23 23 + export const fix_standard_document_publications = inngest.createFunction( 24 24 + { id: "fix_standard_document_publications" }, 25 25 + { event: "documents/fix-publication-references" }, 26 26 + async ({ event, step }) => { 27 27 + const { documentUris } = event.data as { documentUris: string[] }; 28 28 + 29 29 + const stats = { 30 30 + documentsFixed: 0, 31 31 + joinEntriesFixed: 0, 32 32 + errors: [] as string[], 33 33 + }; 34 34 + 35 35 + if (!documentUris || documentUris.length === 0) { 36 36 + return { success: true, stats, message: "No documents to fix" }; 37 37 + } 38 38 + 39 39 + // Group documents by DID (author) for efficient OAuth session handling 40 40 + const docsByDid = new Map<string, string[]>(); 41 41 + for (const uri of documentUris) { 42 42 + try { 43 43 + const aturi = new AtUri(uri); 44 44 + const did = aturi.hostname; 45 45 + const existing = docsByDid.get(did) || []; 46 46 + existing.push(uri); 47 47 + docsByDid.set(did, existing); 48 48 + } catch (e) { 49 49 + stats.errors.push(`Invalid URI: ${uri}`); 50 50 + } 51 51 + } 52 52 + 53 53 + // Process each DID's documents 54 54 + for (const [did, uris] of docsByDid) { 55 55 + // Verify OAuth session for this user 56 56 + const oauthValid = await step.run( 57 57 + `verify-oauth-${did.slice(-8)}`, 58 58 + async () => { 59 59 + const result = await restoreOAuthSession(did); 60 60 + return result.ok; 61 61 + }, 62 62 + ); 63 63 + 64 64 + if (!oauthValid) { 65 65 + stats.errors.push(`No valid OAuth session for ${did}`); 66 66 + continue; 67 67 + } 68 68 + 69 69 + // Fix each document 70 70 + for (const docUri of uris) { 71 71 + const result = await step.run( 72 72 + `fix-doc-${docUri.slice(-12)}`, 73 73 + async () => { 74 74 + // Fetch the document 75 75 + const { data: doc, error: fetchError } = await supabaseServerClient 76 76 + .from("documents") 77 77 + .select("uri, data") 78 78 + .eq("uri", docUri) 79 79 + .single(); 80 80 + 81 81 + if (fetchError || !doc) { 82 82 + return { 83 83 + success: false as const, 84 84 + error: `Document not found: ${fetchError?.message || "no data"}`, 85 85 + }; 86 86 + } 87 87 + 88 88 + const data = doc.data as SiteStandardDocument.Record; 89 89 + const oldSite = data?.site; 90 90 + 91 91 + if (!oldSite || !oldSite.includes("/pub.leaflet.publication/")) { 92 92 + return { 93 93 + success: false as const, 94 94 + error: "Document does not have a pub.leaflet.publication site reference", 95 95 + }; 96 96 + } 97 97 + 98 98 + // Convert to new publication URI 99 99 + const oldPubAturi = new AtUri(oldSite); 100 100 + const newSite = `at://${oldPubAturi.hostname}/site.standard.publication/${oldPubAturi.rkey}`; 101 101 + 102 102 + // Update the record 103 103 + const updatedRecord: SiteStandardDocument.Record = { 104 104 + ...data, 105 105 + site: newSite, 106 106 + }; 107 107 + 108 108 + // Write to PDS 109 109 + const docAturi = new AtUri(docUri); 110 110 + const agent = await createAuthenticatedAgent(did); 111 111 + await agent.com.atproto.repo.putRecord({ 112 112 + repo: did, 113 113 + collection: "site.standard.document", 114 114 + rkey: docAturi.rkey, 115 115 + record: updatedRecord, 116 116 + validate: false, 117 117 + }); 118 118 + 119 119 + // Update database 120 120 + const { error: dbError } = await supabaseServerClient 121 121 + .from("documents") 122 122 + .update({ data: updatedRecord as Json }) 123 123 + .eq("uri", docUri); 124 124 + 125 125 + if (dbError) { 126 126 + return { 127 127 + success: false as const, 128 128 + error: `Database update failed: ${dbError.message}`, 129 129 + }; 130 130 + } 131 131 + 132 132 + return { 133 133 + success: true as const, 134 134 + oldSite, 135 135 + newSite, 136 136 + }; 137 137 + }, 138 138 + ); 139 139 + 140 140 + if (result.success) { 141 141 + stats.documentsFixed++; 142 142 + 143 143 + // Fix the documents_in_publications entry 144 144 + const joinResult = await step.run( 145 145 + `fix-join-${docUri.slice(-12)}`, 146 146 + async () => { 147 147 + // Find the publication URI that exists in the database 148 148 + const { data: doc } = await supabaseServerClient 149 149 + .from("documents") 150 150 + .select("data") 151 151 + .eq("uri", docUri) 152 152 + .single(); 153 153 + 154 154 + const newSite = (doc?.data as any)?.site; 155 155 + if (!newSite) { 156 156 + return { success: false as const, error: "Could not read updated document" }; 157 157 + } 158 158 + 159 159 + // Check which publication URI exists 160 160 + const newPubAturi = new AtUri(newSite); 161 161 + const oldPubUri = `at://${newPubAturi.hostname}/pub.leaflet.publication/${newPubAturi.rkey}`; 162 162 + 163 163 + const { data: pubs } = await supabaseServerClient 164 164 + .from("publications") 165 165 + .select("uri") 166 166 + .in("uri", [newSite, oldPubUri]); 167 167 + 168 168 + const existingPubUri = pubs?.find((p) => p.uri === newSite)?.uri || 169 169 + pubs?.find((p) => p.uri === oldPubUri)?.uri; 170 170 + 171 171 + if (!existingPubUri) { 172 172 + return { success: false as const, error: "No matching publication found" }; 173 173 + } 174 174 + 175 175 + // Delete any existing entries for this document 176 176 + await supabaseServerClient 177 177 + .from("documents_in_publications") 178 178 + .delete() 179 179 + .eq("document", docUri); 180 180 + 181 181 + // Insert the correct entry 182 182 + const { error: insertError } = await supabaseServerClient 183 183 + .from("documents_in_publications") 184 184 + .insert({ 185 185 + document: docUri, 186 186 + publication: existingPubUri, 187 187 + }); 188 188 + 189 189 + if (insertError) { 190 190 + return { success: false as const, error: insertError.message }; 191 191 + } 192 192 + 193 193 + return { success: true as const, publication: existingPubUri }; 194 194 + }, 195 195 + ); 196 196 + 197 197 + if (joinResult.success) { 198 198 + stats.joinEntriesFixed++; 199 199 + } else { 200 200 + stats.errors.push(`Join table fix failed for ${docUri}: ${"error" in joinResult ? joinResult.error : "unknown error"}`); 201 201 + } 202 202 + } else { 203 203 + stats.errors.push(`${docUri}: ${result.error}`); 204 204 + } 205 205 + } 206 206 + } 207 207 + 208 208 + return { 209 209 + success: stats.errors.length === 0, 210 210 + stats, 211 211 + }; 212 212 + }, 213 213 + );

+186 -52

app/api/inngest/functions/migrate_user_to_standard.ts

··· 38 38 const stats = { 39 39 publicationsMigrated: 0, 40 40 documentsMigrated: 0, 41 41 + standardDocumentsFixed: 0, 41 42 userSubscriptionsMigrated: 0, 42 43 referencesUpdated: 0, 43 44 errors: [] as string[], 44 45 }; 45 46 46 47 // Step 1: Verify OAuth session is valid 47 47 - await step.run("verify-oauth-session", async () => { 48 48 + const oauthValid = await step.run("verify-oauth-session", async () => { 48 49 const result = await restoreOAuthSession(did); 49 50 if (!result.ok) { 50 50 - throw new Error( 51 51 - `Failed to restore OAuth session: ${result.error.message}`, 52 52 - ); 51 51 + // Mark identity as needing migration so we can retry later 52 52 + await supabaseServerClient 53 53 + .from("identities") 54 54 + .update({ 55 55 + metadata: { needsStandardSiteMigration: true }, 56 56 + }) 57 57 + .eq("atp_did", did); 58 58 + 59 59 + return { success: false, error: result.error.message }; 53 60 } 54 61 return { success: true }; 55 62 }); 63 63 + 64 64 + if (!oauthValid.success) { 65 65 + return { 66 66 + success: false, 67 67 + error: `Failed to restore OAuth session`, 68 68 + stats, 69 69 + publicationUriMap: {}, 70 70 + documentUriMap: {}, 71 71 + userSubscriptionUriMap: {}, 72 72 + }; 73 73 + } 56 74 57 75 // Step 2: Get user's pub.leaflet.publication records 58 76 const oldPublications = await step.run( ··· 109 127 }) 110 128 .filter((x) => x !== null); 111 129 112 112 - // Run all PDS writes in parallel 113 113 - const pubPdsResults = await Promise.all( 114 114 - publicationsToMigrate.map(({ pub, rkey, newRecord }) => 115 115 - step.run(`pds-write-publication-${pub.uri}`, async () => { 130 130 + // Run PDS + DB writes together for each publication 131 131 + const pubResults = await Promise.all( 132 132 + publicationsToMigrate.map(({ pub, rkey, normalized, newRecord }) => 133 133 + step.run(`migrate-publication-${pub.uri}`, async () => { 134 134 + // PDS write 116 135 const agent = await createAuthenticatedAgent(did); 117 136 const putResult = await agent.com.atproto.repo.putRecord({ 118 137 repo: did, ··· 121 140 record: newRecord, 122 141 validate: false, 123 142 }); 124 124 - return { oldUri: pub.uri, newUri: putResult.data.uri }; 125 125 - }), 126 126 - ), 127 127 - ); 143 143 + const newUri = putResult.data.uri; 128 144 129 129 - // Run all DB writes in parallel 130 130 - const pubDbResults = await Promise.all( 131 131 - publicationsToMigrate.map(({ pub, normalized, newRecord }, index) => { 132 132 - const newUri = pubPdsResults[index].newUri; 133 133 - return step.run(`db-write-publication-${pub.uri}`, async () => { 145 145 + // DB write 134 146 const { error: dbError } = await supabaseServerClient 135 147 .from("publications") 136 148 .upsert({ ··· 149 161 }; 150 162 } 151 163 return { success: true as const, oldUri: pub.uri, newUri }; 152 152 - }); 153 153 - }), 164 164 + }), 165 165 + ), 154 166 ); 155 167 156 168 // Process results 157 157 - for (const result of pubDbResults) { 169 169 + for (const result of pubResults) { 158 170 if (result.success) { 159 171 publicationUriMap[result.oldUri] = result.newUri; 160 172 stats.publicationsMigrated++; ··· 239 251 $type: "site.standard.document", 240 252 title: normalized.title || "Untitled", 241 253 site: siteValue, 242 242 - path: rkey, 254 254 + path: "/" + rkey, 243 255 publishedAt: normalized.publishedAt || new Date().toISOString(), 244 256 description: normalized.description, 245 257 content: normalized.content, ··· 252 264 }) 253 265 .filter((x) => x !== null); 254 266 255 255 - // Run all PDS writes in parallel 256 256 - const docPdsResults = await Promise.all( 257 257 - documentsToMigrate.map(({ doc, rkey, newRecord }) => 258 258 - step.run(`pds-write-document-${doc.uri}`, async () => { 267 267 + // Run PDS + DB writes together for each document 268 268 + const docResults = await Promise.all( 269 269 + documentsToMigrate.map(({ doc, rkey, newRecord, oldPubUri }) => 270 270 + step.run(`migrate-document-${doc.uri}`, async () => { 271 271 + // PDS write 259 272 const agent = await createAuthenticatedAgent(did); 260 273 const putResult = await agent.com.atproto.repo.putRecord({ 261 274 repo: did, ··· 264 277 record: newRecord, 265 278 validate: false, 266 279 }); 267 267 - return { oldUri: doc.uri, newUri: putResult.data.uri }; 268 268 - }), 269 269 - ), 270 270 - ); 280 280 + const newUri = putResult.data.uri; 271 281 272 272 - // Run all DB writes in parallel 273 273 - const docDbResults = await Promise.all( 274 274 - documentsToMigrate.map(({ doc, newRecord, oldPubUri }, index) => { 275 275 - const newUri = docPdsResults[index].newUri; 276 276 - return step.run(`db-write-document-${doc.uri}`, async () => { 282 282 + // DB write 277 283 const { error: dbError } = await supabaseServerClient 278 284 .from("documents") 279 285 .upsert({ ··· 302 308 } 303 309 304 310 return { success: true as const, oldUri: doc.uri, newUri }; 305 305 - }); 306 306 - }), 311 311 + }), 312 312 + ), 307 313 ); 308 314 309 315 // Process results 310 310 - for (const result of docDbResults) { 316 316 + for (const result of docResults) { 311 317 if (result.success) { 312 318 documentUriMap[result.oldUri] = result.newUri; 313 319 stats.documentsMigrated++; ··· 318 324 } 319 325 } 320 326 327 327 + // Step 4b: Fix existing site.standard.document records that reference pub.leaflet.publication 328 328 + // This handles the case where site.standard.document records were created pointing to 329 329 + // pub.leaflet.publication URIs before the publication was migrated to site.standard.publication 330 330 + const existingStandardDocs = await step.run( 331 331 + "fetch-existing-standard-documents", 332 332 + async () => { 333 333 + const { data, error } = await supabaseServerClient 334 334 + .from("documents") 335 335 + .select("uri, data") 336 336 + .like("uri", `at://${did}/site.standard.document/%`); 337 337 + 338 338 + if (error) 339 339 + throw new Error( 340 340 + `Failed to fetch existing standard documents: ${error.message}`, 341 341 + ); 342 342 + return data || []; 343 343 + }, 344 344 + ); 345 345 + 346 346 + // Find documents that reference pub.leaflet.publication and need their site field updated 347 347 + const standardDocsToFix = existingStandardDocs 348 348 + .map((doc) => { 349 349 + const data = doc.data as SiteStandardDocument.Record; 350 350 + const site = data?.site; 351 351 + 352 352 + // Check if site field references a pub.leaflet.publication 353 353 + if (!site || !site.includes("/pub.leaflet.publication/")) { 354 354 + return null; 355 355 + } 356 356 + 357 357 + try { 358 358 + const oldPubAturi = new AtUri(site); 359 359 + const newPubUri = `at://${oldPubAturi.hostname}/site.standard.publication/${oldPubAturi.rkey}`; 360 360 + 361 361 + // Only fix if we have the new publication in our map (meaning it was migrated) 362 362 + // or if the new publication exists (check against all migrated publications) 363 363 + if ( 364 364 + publicationUriMap[site] || 365 365 + Object.values(publicationUriMap).includes(newPubUri) 366 366 + ) { 367 367 + const docAturi = new AtUri(doc.uri); 368 368 + const updatedRecord: SiteStandardDocument.Record = { 369 369 + ...data, 370 370 + site: newPubUri, 371 371 + }; 372 372 + 373 373 + return { 374 374 + doc, 375 375 + rkey: docAturi.rkey, 376 376 + oldSite: site, 377 377 + newSite: newPubUri, 378 378 + updatedRecord, 379 379 + }; 380 380 + } 381 381 + } catch (e) { 382 382 + stats.errors.push(`Invalid site URI in document ${doc.uri}: ${site}`); 383 383 + } 384 384 + 385 385 + return null; 386 386 + }) 387 387 + .filter((x) => x !== null); 388 388 + 389 389 + // Update these documents on PDS and in database 390 390 + if (standardDocsToFix.length > 0) { 391 391 + const fixResults = await Promise.all( 392 392 + standardDocsToFix.map(({ doc, rkey, oldSite, newSite, updatedRecord }) => 393 393 + step.run(`fix-standard-document-${doc.uri}`, async () => { 394 394 + // PDS write to update the site field 395 395 + const agent = await createAuthenticatedAgent(did); 396 396 + await agent.com.atproto.repo.putRecord({ 397 397 + repo: did, 398 398 + collection: "site.standard.document", 399 399 + rkey, 400 400 + record: updatedRecord, 401 401 + validate: false, 402 402 + }); 403 403 + 404 404 + // DB write 405 405 + const { error: dbError } = await supabaseServerClient 406 406 + .from("documents") 407 407 + .update({ data: updatedRecord as Json }) 408 408 + .eq("uri", doc.uri); 409 409 + 410 410 + if (dbError) { 411 411 + return { 412 412 + success: false as const, 413 413 + uri: doc.uri, 414 414 + error: dbError.message, 415 415 + }; 416 416 + } 417 417 + 418 418 + // Update documents_in_publications to point to new publication URI 419 419 + await supabaseServerClient 420 420 + .from("documents_in_publications") 421 421 + .upsert({ 422 422 + publication: newSite, 423 423 + document: doc.uri, 424 424 + }); 425 425 + 426 426 + // Remove old publication reference if different 427 427 + if (oldSite !== newSite) { 428 428 + await supabaseServerClient 429 429 + .from("documents_in_publications") 430 430 + .delete() 431 431 + .eq("publication", oldSite) 432 432 + .eq("document", doc.uri); 433 433 + } 434 434 + 435 435 + return { success: true as const, uri: doc.uri }; 436 436 + }), 437 437 + ), 438 438 + ); 439 439 + 440 440 + for (const result of fixResults) { 441 441 + if (result.success) { 442 442 + stats.standardDocumentsFixed++; 443 443 + } else { 444 444 + stats.errors.push( 445 445 + `Fix standard document ${result.uri}: Database error: ${result.error}`, 446 446 + ); 447 447 + } 448 448 + } 449 449 + } 450 450 + 321 451 // Step 5: Update references in database tables (all in parallel) 322 452 await step.run("update-references", async () => { 323 453 const pubEntries = Object.entries(publicationUriMap); ··· 428 558 }) 429 559 .filter((x) => x !== null); 430 560 431 431 - // Run all PDS writes in parallel 432 432 - const subPdsResults = await Promise.all( 561 561 + // Run PDS + DB writes together for each subscription 562 562 + const subResults = await Promise.all( 433 563 subscriptionsToMigrate.map(({ sub, rkey, newRecord }) => 434 434 - step.run(`pds-write-subscription-${sub.uri}`, async () => { 564 564 + step.run(`migrate-subscription-${sub.uri}`, async () => { 565 565 + // PDS write 435 566 const agent = await createAuthenticatedAgent(did); 436 567 const putResult = await agent.com.atproto.repo.putRecord({ 437 568 repo: did, ··· 440 571 record: newRecord, 441 572 validate: false, 442 573 }); 443 443 - return { oldUri: sub.uri, newUri: putResult.data.uri }; 444 444 - }), 445 445 - ), 446 446 - ); 574 574 + const newUri = putResult.data.uri; 447 575 448 448 - // Run all DB writes in parallel 449 449 - const subDbResults = await Promise.all( 450 450 - subscriptionsToMigrate.map(({ sub, newRecord }, index) => { 451 451 - const newUri = subPdsResults[index].newUri; 452 452 - return step.run(`db-write-subscription-${sub.uri}`, async () => { 576 576 + // DB write 453 577 const { error: dbError } = await supabaseServerClient 454 578 .from("publication_subscriptions") 455 579 .update({ ··· 467 591 }; 468 592 } 469 593 return { success: true as const, oldUri: sub.uri, newUri }; 470 470 - }); 471 471 - }), 594 594 + }), 595 595 + ), 472 596 ); 473 597 474 598 // Process results 475 475 - for (const result of subDbResults) { 599 599 + for (const result of subResults) { 476 600 if (result.success) { 477 601 userSubscriptionUriMap[result.oldUri] = result.newUri; 478 602 stats.userSubscriptionsMigrated++; ··· 489 613 // 2. External references (e.g., from other AT Proto apps) to old URIs continue to work 490 614 // 3. The normalization layer handles both schemas transparently for reads 491 615 // Old records are also kept on the user's PDS so existing AT-URI references remain valid. 616 616 + 617 617 + // Clear the migration flag on success 618 618 + if (stats.errors.length === 0) { 619 619 + await step.run("clear-migration-flag", async () => { 620 620 + await supabaseServerClient 621 621 + .from("identities") 622 622 + .update({ metadata: null }) 623 623 + .eq("atp_did", did); 624 624 + }); 625 625 + } 492 626 493 627 return { 494 628 success: stats.errors.length === 0,

+12

app/api/inngest/route.tsx

··· 5 5 import { batched_update_profiles } from "./functions/batched_update_profiles"; 6 6 import { index_follows } from "./functions/index_follows"; 7 7 import { migrate_user_to_standard } from "./functions/migrate_user_to_standard"; 8 8 + import { fix_standard_document_publications } from "./functions/fix_standard_document_publications"; 9 9 + import { fix_incorrect_site_values } from "./functions/fix_incorrect_site_values"; 10 10 + import { fix_standard_document_postref } from "./functions/fix_standard_document_postref"; 11 11 + import { 12 12 + cleanup_expired_oauth_sessions, 13 13 + check_oauth_session, 14 14 + } from "./functions/cleanup_expired_oauth_sessions"; 8 15 9 16 export const { GET, POST, PUT } = serve({ 10 17 client: inngest, ··· 14 21 batched_update_profiles, 15 22 index_follows, 16 23 migrate_user_to_standard, 24 24 + fix_standard_document_publications, 25 25 + fix_incorrect_site_values, 26 26 + fix_standard_document_postref, 27 27 + cleanup_expired_oauth_sessions, 28 28 + check_oauth_session, 17 29 ], 18 30 });

+11

app/api/oauth/[route]/route.ts

··· 11 11 ActionAfterSignIn, 12 12 parseActionFromSearchParam, 13 13 } from "./afterSignInActions"; 14 14 + import { inngest } from "app/api/inngest/client"; 14 15 15 16 type OauthRequestClientState = { 16 17 redirect: string | null; ··· 84 85 .single(); 85 86 identity = data; 86 87 } 88 88 + 89 89 + // Trigger migration if identity needs it 90 90 + const metadata = identity?.metadata as Record<string, unknown> | null; 91 91 + if (metadata?.needsStandardSiteMigration) { 92 92 + await inngest.send({ 93 93 + name: "user/migrate-to-standard", 94 94 + data: { did: session.did }, 95 95 + }); 96 96 + } 97 97 + 87 98 let { data: token } = await supabaseServerClient 88 99 .from("email_auth_tokens") 89 100 .insert({

+1

app/api/rpc/[command]/get_publication_data.ts

··· 83 83 uri: dip.documents.uri, 84 84 record: normalized, 85 85 indexed_at: dip.documents.indexed_at, 86 86 + sort_date: dip.documents.sort_date, 86 87 data: dip.documents.data, 87 88 commentsCount: dip.documents.comments_on_documents[0]?.count || 0, 88 89 mentionsCount: dip.documents.document_mentions_in_bsky[0]?.count || 0,

+4 -9

app/globals.css

··· 62 62 --shadow-md: 1.2px 2.5px 2.7px -1.8px rgba(var(--primary), 0.1), 63 63 5.6px 11.6px 12.5px -3.5px rgba(var(--primary), 0.15); 64 64 65 65 - --font-sans: var(--theme-font, var(--font-quattro)); 65 65 + --font-sans: var(--font-quattro); 66 66 --font-serif: Garamond; 67 67 } 68 68 ··· 158 158 } 159 159 160 160 /* START FONT STYLING */ 161 161 - h1, 162 162 - h2, 163 163 - h3, 164 164 - h4 { 165 165 - font-family: var(--theme-heading-font, var(--theme-font)); 166 166 - } 167 167 - 168 161 h1 { 169 162 @apply text-2xl; 170 163 @apply font-bold; ··· 201 194 } 202 195 203 196 pre { 204 204 - font-family: var(--theme-font, --font-quattro); 197 197 + font-family: var(--font-quattro); 205 198 } 206 199 207 200 p { ··· 281 274 @apply p-2; 282 275 @apply rounded-md; 283 276 @apply overflow-auto; 277 277 + @apply sm:min-h-12; 278 278 + @apply min-h-10; 284 279 285 280 @media (min-width: 640px) { 286 281 @apply p-3;

+10 -12

app/layout.tsx

··· 36 36 const quattro = localFont({ 37 37 src: [ 38 38 { 39 39 - path: "../public/fonts/iaw-quattro-vf.woff2", 39 39 + path: "../public/fonts/iAWriterQuattroV.ttf", 40 40 style: "normal", 41 41 }, 42 42 { 43 43 - path: "../public/fonts/iaw-quattro-vf-Italic.woff2", 43 43 + path: "../public/fonts/iAWriterQuattroV-Italic.ttf", 44 44 style: "italic", 45 45 }, 46 46 ], ··· 48 48 variable: "--font-quattro", 49 49 }); 50 50 51 51 - export default async function RootLayout({ 52 52 - children, 53 53 - }: { 54 54 - children: React.ReactNode; 55 55 - }) { 51 51 + export default async function RootLayout( 52 52 + { 53 53 + children, 54 54 + }: { 55 55 + children: React.ReactNode; 56 56 + } 57 57 + ) { 56 58 let headersList = await headers(); 57 59 let ipLocation = headersList.get("X-Vercel-IP-Country"); 58 60 let acceptLanguage = headersList.get("accept-language"); ··· 78 80 <InitialPageLoad> 79 81 <PopUpProvider> 80 82 <IdentityProviderServer> 81 81 - <RequestHeadersProvider 82 82 - country={ipLocation} 83 83 - language={acceptLanguage} 84 84 - timezone={ipTimezone} 85 85 - > 83 83 + <RequestHeadersProvider country={ipLocation} language={acceptLanguage} timezone={ipTimezone}> 86 84 <ViewportSizeLayout>{children}</ViewportSizeLayout> 87 85 <RouteUIStateManager /> 88 86 </RequestHeadersProvider>

+34

app/lish/[did]/[publication]/.well-known/site.standard.publication/route.ts

··· 1 1 + import { publicationNameOrUriFilter } from "src/utils/uriHelpers"; 2 2 + import { supabaseServerClient } from "supabase/serverClient"; 3 3 + 4 4 + export async function GET( 5 5 + req: Request, 6 6 + props: { 7 7 + params: Promise<{ publication: string; did: string }>; 8 8 + }, 9 9 + ) { 10 10 + let params = await props.params; 11 11 + let did = decodeURIComponent(params.did); 12 12 + let publication_name = decodeURIComponent(params.publication); 13 13 + let [{ data: publications }] = await Promise.all([ 14 14 + supabaseServerClient 15 15 + .from("publications") 16 16 + .select( 17 17 + `*, 18 18 + publication_subscriptions(*), 19 19 + documents_in_publications(documents( 20 20 + *, 21 21 + comments_on_documents(count), 22 22 + document_mentions_in_bsky(count) 23 23 + )) 24 24 + `, 25 25 + ) 26 26 + .eq("identity_did", did) 27 27 + .or(publicationNameOrUriFilter(did, publication_name)) 28 28 + .order("uri", { ascending: false }) 29 29 + .limit(1), 30 30 + ]); 31 31 + let publication = publications?.[0]; 32 32 + if (!did || !publication) return new Response(null, { status: 404 }); 33 33 + return new Response(publication.uri); 34 34 + }

+14 -133

app/lish/[did]/[publication]/[rkey]/Blocks/PublishBskyPostBlock.tsx

··· 1 1 import { PostView } from "@atproto/api/dist/client/types/app/bsky/feed/defs"; 2 2 import { AppBskyFeedDefs, AppBskyFeedPost } from "@atproto/api"; 3 3 - import { Separator } from "components/Layout"; 4 4 - import { useHasPageLoaded } from "components/InitialPageLoadProvider"; 5 5 - import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 6 6 - import { CommentTiny } from "components/Icons/CommentTiny"; 7 7 - import { QuoteTiny } from "components/Icons/QuoteTiny"; 8 8 - import { ThreadLink, QuotesLink } from "../PostLinks"; 9 9 - import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 10 10 - import { 11 11 - BlueskyEmbed, 12 12 - PostNotAvailable, 13 13 - } from "components/Blocks/BlueskyPostBlock/BlueskyEmbed"; 14 14 - import { BlueskyRichText } from "components/Blocks/BlueskyPostBlock/BlueskyRichText"; 15 15 - import { openPage } from "../PostPages"; 3 3 + import { PostNotAvailable } from "components/Blocks/BlueskyPostBlock/BlueskyEmbed"; 4 4 + import { BskyPostContent } from "../BskyPostContent"; 16 5 17 6 export const PubBlueskyPostBlock = (props: { 18 7 post: PostView; ··· 21 10 }) => { 22 11 let post = props.post; 23 12 24 24 - const handleOpenThread = () => { 25 25 - openPage(props.pageId ? { type: "doc", id: props.pageId } : undefined, { 26 26 - type: "thread", 27 27 - uri: post.uri, 28 28 - }); 29 29 - }; 30 30 - 31 13 switch (true) { 32 14 case AppBskyFeedDefs.isBlockedPost(post) || 33 15 AppBskyFeedDefs.isBlockedAuthor(post) || ··· 49 31 50 32 //getting the url to the post 51 33 let postId = post.uri.split("/")[4]; 34 34 + let postView = post as PostView; 35 35 + 52 36 let url = `https://bsky.app/profile/${post.author.handle}/post/${postId}`; 53 37 54 38 const parent = props.pageId ··· 56 40 : undefined; 57 41 58 42 return ( 59 59 - <div 60 60 - onClick={handleOpenThread} 61 61 - className={` 62 62 - ${props.className} 63 63 - block-border 64 64 - mb-2 65 65 - flex flex-col gap-2 relative w-full overflow-hidden group/blueskyPostBlock sm:p-3 p-2 text-sm text-secondary bg-bg-page 66 66 - cursor-pointer hover:border-accent-contrast 67 67 - `} 68 68 - > 69 69 - {post.author && record && ( 70 70 - <> 71 71 - <div className="bskyAuthor w-full flex items-center gap-2"> 72 72 - {post.author.avatar && ( 73 73 - <img 74 74 - src={post.author?.avatar} 75 75 - alt={`${post.author?.displayName}'s avatar`} 76 76 - className="shink-0 w-8 h-8 rounded-full border border-border-light" 77 77 - /> 78 78 - )} 79 79 - <div className="grow flex flex-col gap-0.5 leading-tight"> 80 80 - <div className=" font-bold text-secondary"> 81 81 - {post.author?.displayName} 82 82 - </div> 83 83 - <a 84 84 - className="text-xs text-tertiary hover:underline" 85 85 - target="_blank" 86 86 - href={`https://bsky.app/profile/${post.author?.handle}`} 87 87 - onClick={(e) => e.stopPropagation()} 88 88 - > 89 89 - @{post.author?.handle} 90 90 - </a> 91 91 - </div> 92 92 - </div> 93 93 - 94 94 - <div className="flex flex-col gap-2 "> 95 95 - <div> 96 96 - <pre className="whitespace-pre-wrap"> 97 97 - {BlueskyRichText({ 98 98 - record: record as AppBskyFeedPost.Record | null, 99 99 - })} 100 100 - </pre> 101 101 - </div> 102 102 - {post.embed && ( 103 103 - <div onClick={(e) => e.stopPropagation()}> 104 104 - <BlueskyEmbed embed={post.embed} postUrl={url} /> 105 105 - </div> 106 106 - )} 107 107 - </div> 108 108 - </> 109 109 - )} 110 110 - <div className="w-full flex gap-2 items-center justify-between"> 111 111 - <ClientDate date={timestamp} /> 112 112 - <div className="flex gap-2 items-center"> 113 113 - {post.replyCount != null && post.replyCount > 0 && ( 114 114 - <> 115 115 - <ThreadLink 116 116 - threadUri={post.uri} 117 117 - parent={parent} 118 118 - className="flex items-center gap-1 hover:text-accent-contrast" 119 119 - onClick={(e) => e.stopPropagation()} 120 120 - > 121 121 - {post.replyCount} 122 122 - <CommentTiny /> 123 123 - </ThreadLink> 124 124 - <Separator classname="h-4" /> 125 125 - </> 126 126 - )} 127 127 - {post.quoteCount != null && post.quoteCount > 0 && ( 128 128 - <> 129 129 - <QuotesLink 130 130 - postUri={post.uri} 131 131 - parent={parent} 132 132 - className="flex items-center gap-1 hover:text-accent-contrast" 133 133 - onClick={(e) => e.stopPropagation()} 134 134 - > 135 135 - {post.quoteCount} 136 136 - <QuoteTiny /> 137 137 - </QuotesLink> 138 138 - <Separator classname="h-4" /> 139 139 - </> 140 140 - )} 141 141 - 142 142 - <a 143 143 - className="" 144 144 - target="_blank" 145 145 - href={url} 146 146 - onClick={(e) => e.stopPropagation()} 147 147 - > 148 148 - <BlueskyTiny /> 149 149 - </a> 150 150 - </div> 151 151 - </div> 152 152 - </div> 43 43 + <BskyPostContent 44 44 + post={postView} 45 45 + parent={undefined} 46 46 + showBlueskyLink={true} 47 47 + showEmbed={true} 48 48 + avatarSize="large" 49 49 + quoteEnabled 50 50 + replyEnabled 51 51 + className="text-sm text-secondary block-border sm:px-3 sm:py-2 px-2 py-1 bg-bg-page mb-2 hover:border-accent-contrast!" 52 52 + /> 153 53 ); 154 54 } 155 55 }; 156 156 - 157 157 - const ClientDate = (props: { date?: string }) => { 158 158 - let pageLoaded = useHasPageLoaded(); 159 159 - const formattedDate = useLocalizedDate( 160 160 - props.date || new Date().toISOString(), 161 161 - { 162 162 - month: "short", 163 163 - day: "numeric", 164 164 - year: "numeric", 165 165 - hour: "numeric", 166 166 - minute: "numeric", 167 167 - hour12: true, 168 168 - }, 169 169 - ); 170 170 - 171 171 - if (!pageLoaded) return null; 172 172 - 173 173 - return <div className="text-xs text-tertiary">{formattedDate}</div>; 174 174 - };

+30 -31

app/lish/[did]/[publication]/[rkey]/BlueskyQuotesPage.tsx

··· 7 7 import { QuoteTiny } from "components/Icons/QuoteTiny"; 8 8 import { openPage } from "./PostPages"; 9 9 import { BskyPostContent } from "./BskyPostContent"; 10 10 - import { QuotesLink, getQuotesKey, fetchQuotes, prefetchQuotes } from "./PostLinks"; 10 10 + import { 11 11 + QuotesLink, 12 12 + getQuotesKey, 13 13 + fetchQuotes, 14 14 + prefetchQuotes, 15 15 + } from "./PostLinks"; 11 16 12 17 // Re-export for backwards compatibility 13 18 export { QuotesLink, getQuotesKey, fetchQuotes, prefetchQuotes }; ··· 27 32 data: quotesData, 28 33 isLoading, 29 34 error, 30 30 - } = useSWR(postUri ? getQuotesKey(postUri) : null, () => fetchQuotes(postUri)); 35 35 + } = useSWR(postUri ? getQuotesKey(postUri) : null, () => 36 36 + fetchQuotes(postUri), 37 37 + ); 31 38 32 39 return ( 33 40 <PageWrapper 34 41 pageType="doc" 35 42 fullPageScroll={false} 36 43 id={`post-page-${pageId}`} 37 37 - drawerOpen={!!drawer} 44 44 + drawerOpen={false} 38 45 pageOptions={pageOptions} 46 46 + fixedWidth 39 47 > 40 48 <div className="flex flex-col sm:px-4 px-3 sm:pt-3 pt-2 pb-1 sm:pb-4"> 41 41 - <div className="text-secondary font-bold mb-3 flex items-center gap-2"> 42 42 - <QuoteTiny /> 43 43 - Bluesky Quotes 44 44 - </div> 49 49 + <h4 className="text-secondary font-bold mb-2">Bluesky Quotes</h4> 45 50 {isLoading ? ( 46 51 <div className="flex items-center justify-center gap-1 text-tertiary italic text-sm py-8"> 47 52 <span>loading quotes</span> ··· 68 73 69 74 return ( 70 75 <div className="flex flex-col gap-0"> 71 71 - {posts.map((post) => ( 72 72 - <QuotePost 73 73 - key={post.uri} 74 74 - post={post} 75 75 - quotesUri={postUri} 76 76 - /> 76 76 + {posts.map((post, index) => ( 77 77 + <> 78 78 + <QuotePost key={post.uri} post={post} quotesUri={postUri} /> 79 79 + {posts.length !== index + 1 && ( 80 80 + <hr className="border-border-light my-4" /> 81 81 + )} 82 82 + </> 77 83 ))} 78 84 </div> 79 85 ); 80 86 } 81 87 82 82 - function QuotePost(props: { 83 83 - post: PostView; 84 84 - quotesUri: string; 85 85 - }) { 88 88 + function QuotePost(props: { post: PostView; quotesUri: string }) { 86 89 const { post, quotesUri } = props; 87 90 const parent = { type: "quotes" as const, uri: quotesUri }; 88 91 89 92 return ( 90 90 - <div 91 91 - className="flex gap-2 relative py-2 px-2 hover:bg-bg-page rounded cursor-pointer" 92 92 - onClick={() => openPage(parent, { type: "thread", uri: post.uri })} 93 93 - > 94 94 - <BskyPostContent 95 95 - post={post} 96 96 - parent={parent} 97 97 - linksEnabled={true} 98 98 - showEmbed={true} 99 99 - showBlueskyLink={true} 100 100 - onLinkClick={(e) => e.stopPropagation()} 101 101 - onEmbedClick={(e) => e.stopPropagation()} 102 102 - /> 103 103 - </div> 93 93 + <BskyPostContent 94 94 + post={post} 95 95 + parent={parent} 96 96 + showEmbed={true} 97 97 + compactEmbed 98 98 + showBlueskyLink={true} 99 99 + quoteEnabled 100 100 + replyEnabled 101 101 + className="relative rounded text-sm" 102 102 + /> 104 103 ); 105 104 }

+234 -104

app/lish/[did]/[publication]/[rkey]/BskyPostContent.tsx

··· 1 1 "use client"; 2 2 import { AppBskyFeedDefs, AppBskyFeedPost } from "@atproto/api"; 3 3 - import { 4 4 - BlueskyEmbed, 5 5 - } from "components/Blocks/BlueskyPostBlock/BlueskyEmbed"; 3 3 + import { BlueskyEmbed } from "components/Blocks/BlueskyPostBlock/BlueskyEmbed"; 6 4 import { BlueskyRichText } from "components/Blocks/BlueskyPostBlock/BlueskyRichText"; 7 5 import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 8 6 import { CommentTiny } from "components/Icons/CommentTiny"; ··· 10 8 import { Separator } from "components/Layout"; 11 9 import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 12 10 import { useHasPageLoaded } from "components/InitialPageLoadProvider"; 13 13 - import { OpenPage } from "./PostPages"; 11 11 + import { OpenPage, openPage } from "./PostPages"; 14 12 import { ThreadLink, QuotesLink } from "./PostLinks"; 13 13 + import { BlueskyLinkTiny } from "components/Icons/BlueskyLinkTiny"; 14 14 + import { Avatar } from "components/Avatar"; 15 15 + import { timeAgo } from "src/utils/timeAgo"; 16 16 + import { ProfilePopover } from "components/ProfilePopover"; 15 17 16 18 type PostView = AppBskyFeedDefs.PostView; 17 19 18 20 export function BskyPostContent(props: { 19 21 post: PostView; 20 20 - parent?: OpenPage; 21 21 - linksEnabled?: boolean; 22 22 - avatarSize?: "sm" | "md"; 22 22 + parent: OpenPage | undefined; 23 23 + avatarSize?: "tiny" | "small" | "medium" | "large" | "giant"; 24 24 + className?: string; 23 25 showEmbed?: boolean; 26 26 + compactEmbed?: boolean; 24 27 showBlueskyLink?: boolean; 25 25 - onEmbedClick?: (e: React.MouseEvent) => void; 26 26 - onLinkClick?: (e: React.MouseEvent) => void; 28 28 + quoteEnabled?: boolean; 29 29 + replyEnabled?: boolean; 30 30 + replyOnClick?: (e: React.MouseEvent) => void; 27 31 }) { 28 32 const { 29 33 post, 30 34 parent, 31 31 - linksEnabled = true, 32 32 - avatarSize = "md", 35 35 + avatarSize = "medium", 33 36 showEmbed = true, 37 37 + compactEmbed = false, 34 38 showBlueskyLink = true, 35 35 - onEmbedClick, 36 36 - onLinkClick, 39 39 + quoteEnabled, 40 40 + replyEnabled, 41 41 + replyOnClick, 37 42 } = props; 38 43 39 44 const record = post.record as AppBskyFeedPost.Record; 40 45 const postId = post.uri.split("/")[4]; 41 46 const url = `https://bsky.app/profile/${post.author.handle}/post/${postId}`; 42 47 43 43 - const avatarClass = avatarSize === "sm" ? "w-8 h-8" : "w-10 h-10"; 48 48 + return ( 49 49 + <div className={`bskyPost relative flex flex-col w-full `}> 50 50 + <button 51 51 + className="absolute inset-0" 52 52 + onClick={() => { 53 53 + openPage(parent, { type: "thread", uri: post.uri }); 54 54 + }} 55 55 + /> 44 56 45 45 - return ( 46 46 - <> 47 47 - <div className="flex flex-col items-center shrink-0"> 48 48 - {post.author.avatar ? ( 49 49 - <img 57 57 + <div 58 58 + className={`flex gap-2 text-left w-full pointer-events-none ${props.className}`} 59 59 + > 60 60 + <div className="flex flex-col items-start shrink-0 w-fit pointer-events-auto"> 61 61 + <Avatar 50 62 src={post.author.avatar} 51 51 - alt={`${post.author.displayName}'s avatar`} 52 52 - className={`${avatarClass} rounded-full border border-border-light`} 63 63 + displayName={post.author.displayName} 64 64 + size={avatarSize ? avatarSize : "medium"} 53 65 /> 54 54 - ) : ( 55 55 - <div className={`${avatarClass} rounded-full border border-border-light bg-border`} /> 56 56 - )} 57 57 - </div> 66 66 + </div> 67 67 + <div className={`flex flex-col min-w-0 w-full mb-2`}> 68 68 + <div 69 69 + className={`bskyPostTextContent flex flex-col grow text-left w-full ${props.avatarSize === "small" ? "mt-0.5" : props.avatarSize === "large" ? "mt-2" : "mt-1"}`} 70 70 + > 71 71 + <PostInfo 72 72 + displayName={post.author.displayName} 73 73 + handle={post.author.handle} 74 74 + createdAt={record.createdAt} 75 75 + /> 58 76 59 59 - <div className="flex flex-col grow min-w-0"> 60 60 - <div className={`flex items-center gap-2 leading-tight ${avatarSize === "sm" ? "text-sm" : ""}`}> 61 61 - <div className="font-bold text-secondary"> 62 62 - {post.author.displayName} 77 77 + <div className={`postContent flex flex-col gap-2 mt-0.5`}> 78 78 + <div className="text-secondary"> 79 79 + <BlueskyRichText record={record} /> 80 80 + </div> 81 81 + {showEmbed && post.embed && ( 82 82 + <div 83 83 + className="pointer-events-auto relative" 84 84 + onClick={(e) => e.stopPropagation()} 85 85 + > 86 86 + <BlueskyEmbed 87 87 + parent={parent} 88 88 + embed={post.embed} 89 89 + compact={compactEmbed} 90 90 + postUrl={url} 91 91 + className="text-sm" 92 92 + /> 93 93 + </div> 94 94 + )} 95 95 + </div> 63 96 </div> 64 64 - <a 65 65 - className="text-xs text-tertiary hover:underline" 66 66 - target="_blank" 67 67 - href={`https://bsky.app/profile/${post.author.handle}`} 68 68 - onClick={onLinkClick} 69 69 - > 70 70 - @{post.author.handle} 71 71 - </a> 97 97 + {props.showBlueskyLink || 98 98 + (props.post.quoteCount && props.post.quoteCount > 0) || 99 99 + (props.post.replyCount && props.post.replyCount > 0) ? ( 100 100 + <div 101 101 + className={`postCountsAndLink flex gap-2 items-center justify-between mt-2 pointer-events-auto`} 102 102 + > 103 103 + <PostCounts 104 104 + post={post} 105 105 + parent={parent} 106 106 + replyEnabled={replyEnabled} 107 107 + replyOnClick={replyOnClick} 108 108 + quoteEnabled={quoteEnabled} 109 109 + showBlueskyLink={showBlueskyLink} 110 110 + url={url} 111 111 + /> 112 112 + 113 113 + <div className="flex gap-3 items-center"> 114 114 + {showBlueskyLink && ( 115 115 + <> 116 116 + <a 117 117 + className="text-tertiary hover:text-accent-contrast" 118 118 + target="_blank" 119 119 + href={url} 120 120 + > 121 121 + <BlueskyLinkTiny /> 122 122 + </a> 123 123 + </> 124 124 + )} 125 125 + </div> 126 126 + </div> 127 127 + ) : null} 72 128 </div> 129 129 + </div> 130 130 + </div> 131 131 + ); 132 132 + } 73 133 74 74 - <div className={`flex flex-col gap-2 ${avatarSize === "sm" ? "mt-0.5" : "mt-1"}`}> 75 75 - <div className="text-sm text-secondary"> 76 76 - <BlueskyRichText record={record} /> 77 77 - </div> 78 78 - {showEmbed && post.embed && ( 79 79 - <div onClick={onEmbedClick}> 80 80 - <BlueskyEmbed embed={post.embed} postUrl={url} /> 134 134 + export function CompactBskyPostContent(props: { 135 135 + post: PostView; 136 136 + parent: OpenPage; 137 137 + className?: string; 138 138 + quoteEnabled?: boolean; 139 139 + replyEnabled?: boolean; 140 140 + replyOnClick?: (e: React.MouseEvent) => void; 141 141 + }) { 142 142 + const { post, parent, quoteEnabled, replyEnabled, replyOnClick } = props; 143 143 + 144 144 + const record = post.record as AppBskyFeedPost.Record; 145 145 + const postId = post.uri.split("/")[4]; 146 146 + const url = `https://bsky.app/profile/${post.author.handle}/post/${postId}`; 147 147 + 148 148 + return ( 149 149 + <div className="bskyPost relative flex flex-col w-full"> 150 150 + <button 151 151 + className="absolute inset-0 " 152 152 + onClick={() => { 153 153 + openPage(parent, { type: "thread", uri: post.uri }); 154 154 + }} 155 155 + /> 156 156 + <div className={`flex gap-2 text-left w-full ${props.className}`}> 157 157 + <Avatar 158 158 + src={post.author.avatar} 159 159 + displayName={post.author.displayName} 160 160 + size="small" 161 161 + /> 162 162 + <div className={`flex flex-col min-w-0 w-full`}> 163 163 + <button 164 164 + className="bskyPostTextContent flex flex-col grow mt-0.5 text-left text-xs text-tertiary" 165 165 + onClick={() => { 166 166 + openPage(parent, { type: "thread", uri: post.uri }); 167 167 + }} 168 168 + > 169 169 + <PostInfo 170 170 + displayName={post.author.displayName} 171 171 + handle={post.author.handle} 172 172 + createdAt={record.createdAt} 173 173 + compact 174 174 + /> 175 175 + 176 176 + <div className="postContent flex flex-col gap-2 mt-0.5"> 177 177 + <div className="line-clamp-3 text-tertiary text-xs"> 178 178 + <BlueskyRichText record={record} /> 179 179 + </div> 81 180 </div> 82 82 - )} 181 181 + </button> 182 182 + {(post.quoteCount && post.quoteCount > 0) || 183 183 + (post.replyCount && post.replyCount > 0) ? ( 184 184 + <div className="postCountsAndLink flex gap-2 items-center justify-between mt-2"> 185 185 + <PostCounts 186 186 + post={post} 187 187 + parent={parent} 188 188 + replyEnabled={replyEnabled} 189 189 + replyOnClick={replyOnClick} 190 190 + quoteEnabled={quoteEnabled} 191 191 + showBlueskyLink={false} 192 192 + url={url} 193 193 + /> 194 194 + </div> 195 195 + ) : null} 83 196 </div> 197 197 + </div> 198 198 + </div> 199 199 + ); 200 200 + } 84 201 85 85 - <div className={`flex gap-2 items-center ${avatarSize === "sm" ? "mt-1" : "mt-2"}`}> 86 86 - <ClientDate date={record.createdAt} /> 87 87 - <PostCounts 88 88 - post={post} 89 89 - parent={parent} 90 90 - linksEnabled={linksEnabled} 91 91 - showBlueskyLink={showBlueskyLink} 92 92 - url={url} 93 93 - onLinkClick={onLinkClick} 202 202 + function PostInfo(props: { 203 203 + displayName?: string; 204 204 + handle: string; 205 205 + createdAt: string; 206 206 + compact?: boolean; 207 207 + }) { 208 208 + const { displayName, handle, createdAt, compact = false } = props; 209 209 + 210 210 + return ( 211 211 + <div className="postInfo flex items-center gap-2 leading-tight w-full"> 212 212 + <div className="flex gap-2 items-center min-w-0"> 213 213 + <div className={`font-bold text-secondary truncate`}> 214 214 + {displayName} 215 215 + </div> 216 216 + <div className="truncate items-end flex pointer-events-auto"> 217 217 + <ProfilePopover 218 218 + trigger={ 219 219 + <div 220 220 + className={`${compact ? "text-xs" : "text-sm"} text-tertiary hover:underline w-full truncate `} 221 221 + > 222 222 + @{handle} 223 223 + </div> 224 224 + } 225 225 + didOrHandle={handle} 94 226 /> 95 227 </div> 96 228 </div> 97 97 - </> 229 229 + <div className="w-1 h-1 rounded-full bg-border shrink-0" /> 230 230 + <div 231 231 + className={`${compact ? "text-xs" : "text-sm"} text-tertiary shrink-0`} 232 232 + > 233 233 + {timeAgo(createdAt, { compact: true })} 234 234 + </div> 235 235 + </div> 98 236 ); 99 237 } 100 238 101 239 function PostCounts(props: { 102 240 post: PostView; 103 241 parent?: OpenPage; 104 104 - linksEnabled: boolean; 242 242 + quoteEnabled?: boolean; 243 243 + replyEnabled?: boolean; 244 244 + replyOnClick?: (e: React.MouseEvent) => void; 105 245 showBlueskyLink: boolean; 106 246 url: string; 107 107 - onLinkClick?: (e: React.MouseEvent) => void; 108 247 }) { 109 109 - const { post, parent, linksEnabled, showBlueskyLink, url, onLinkClick } = props; 248 248 + const replyContent = props.post.replyCount != null && 249 249 + props.post.replyCount > 0 && ( 250 250 + <div className="postRepliesCount flex items-center gap-1 text-xs"> 251 251 + <CommentTiny /> 252 252 + {props.post.replyCount} 253 253 + </div> 254 254 + ); 255 255 + 256 256 + const quoteContent = props.post.quoteCount != null && 257 257 + props.post.quoteCount > 0 && ( 258 258 + <div className="postQuoteCount flex items-center gap-1 text-xs"> 259 259 + <QuoteTiny /> 260 260 + {props.post.quoteCount} 261 261 + </div> 262 262 + ); 110 263 111 264 return ( 112 112 - <div className="flex gap-2 items-center"> 113 113 - {post.replyCount != null && post.replyCount > 0 && ( 114 114 - <> 115 115 - <Separator classname="h-3" /> 116 116 - {linksEnabled ? ( 117 117 - <ThreadLink 118 118 - threadUri={post.uri} 119 119 - parent={parent} 120 120 - className="flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast" 121 121 - onClick={onLinkClick} 122 122 - > 123 123 - {post.replyCount} 124 124 - <CommentTiny /> 125 125 - </ThreadLink> 126 126 - ) : ( 127 127 - <div className="flex items-center gap-1 text-tertiary text-xs"> 128 128 - {post.replyCount} 129 129 - <CommentTiny /> 130 130 - </div> 131 131 - )} 132 132 - </> 133 133 - )} 134 134 - {post.quoteCount != null && post.quoteCount > 0 && ( 135 135 - <> 136 136 - <Separator classname="h-3" /> 265 265 + <div className="postCounts flex gap-2 items-center w-full text-tertiary"> 266 266 + {replyContent && 267 267 + (props.replyEnabled ? ( 268 268 + <ThreadLink 269 269 + postUri={props.post.uri} 270 270 + parent={props.parent} 271 271 + className="relative postRepliesLink hover:text-accent-contrast" 272 272 + onClick={props.replyOnClick} 273 273 + > 274 274 + {replyContent} 275 275 + </ThreadLink> 276 276 + ) : ( 277 277 + replyContent 278 278 + ))} 279 279 + {quoteContent && 280 280 + (props.quoteEnabled ? ( 137 281 <QuotesLink 138 138 - postUri={post.uri} 139 139 - parent={parent} 140 140 - className="flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast" 141 141 - onClick={onLinkClick} 282 282 + postUri={props.post.uri} 283 283 + parent={props.parent} 284 284 + className="relative hover:text-accent-contrast" 142 285 > 143 143 - {post.quoteCount} 144 144 - <QuoteTiny /> 286 286 + {quoteContent} 145 287 </QuotesLink> 146 146 - </> 147 147 - )} 148 148 - {showBlueskyLink && ( 149 149 - <> 150 150 - <Separator classname="h-3" /> 151 151 - <a 152 152 - className="text-tertiary" 153 153 - target="_blank" 154 154 - href={url} 155 155 - onClick={onLinkClick} 156 156 - > 157 157 - <BlueskyTiny /> 158 158 - </a> 159 159 - </> 160 160 - )} 288 288 + ) : ( 289 289 + quoteContent 290 290 + ))} 161 291 </div> 162 292 ); 163 293 }

+14 -4

app/lish/[did]/[publication]/[rkey]/DocumentPageRenderer.tsx

··· 15 15 import { extractCodeBlocks } from "./extractCodeBlocks"; 16 16 import { LeafletLayout } from "components/LeafletLayout"; 17 17 import { fetchPollData } from "./fetchPollData"; 18 18 - import { getDocumentPages, hasLeafletContent } from "src/utils/normalizeRecords"; 18 18 + import { 19 19 + getDocumentPages, 20 20 + hasLeafletContent, 21 21 + } from "src/utils/normalizeRecords"; 19 22 import { DocumentProvider } from "contexts/DocumentContext"; 20 23 import { LeafletContentProvider } from "contexts/LeafletContentContext"; 21 24 ··· 118 121 return ( 119 122 <DocumentProvider value={document}> 120 123 <LeafletContentProvider value={{ pages }}> 121 121 - <PublicationThemeProvider theme={document.theme} pub_creator={pub_creator} isStandalone={isStandalone}> 122 122 - <PublicationBackgroundProvider theme={document.theme} pub_creator={pub_creator}> 124 124 + <PublicationThemeProvider 125 125 + theme={document.theme} 126 126 + pub_creator={pub_creator} 127 127 + isStandalone={isStandalone} 128 128 + > 129 129 + <PublicationBackgroundProvider 130 130 + theme={document.theme} 131 131 + pub_creator={pub_creator} 132 132 + > 123 133 <LeafletLayout> 124 134 <PostPages 125 135 document_uri={document.uri} ··· 127 137 pubRecord={pubRecord} 128 138 profile={JSON.parse(JSON.stringify(profile.data))} 129 139 document={document} 130 130 - bskyPostData={bskyPostData} 140 140 + bskyPostData={JSON.parse(JSON.stringify(bskyPostData))} 131 141 did={did} 132 142 prerenderedCodeBlocks={prerenderedCodeBlocks} 133 143 pollData={pollData}

+11 -13

app/lish/[did]/[publication]/[rkey]/Interactions/Comments/index.tsx

··· 25 25 uri: string; 26 26 bsky_profiles: { record: Json; did: string } | null; 27 27 }; 28 28 - export function Comments(props: { 28 28 + export function CommentsDrawerContent(props: { 29 29 document_uri: string; 30 30 comments: Comment[]; 31 31 pageId?: string; ··· 55 55 id={"commentsDrawer"} 56 56 className="flex flex-col gap-2 relative text-sm text-secondary" 57 57 > 58 58 - <div className="w-full flex justify-between text-secondary font-bold"> 59 59 - Comments 58 58 + <div className="w-full flex justify-between"> 59 59 + <h4> Comments</h4> 60 60 <button 61 61 className="text-tertiary" 62 62 onClick={() => ··· 75 75 </div> 76 76 )} 77 77 <hr className="border-border-light" /> 78 78 - <div className="flex flex-col gap-6 py-2"> 78 78 + <div className="flex flex-col gap-4 py-2"> 79 79 {comments 80 80 .sort((a, b) => { 81 81 let aRecord = a.record as PubLeafletComment.Record; ··· 119 119 }) => { 120 120 const did = props.comment.bsky_profiles?.did; 121 121 122 122 - let timeAgoDate = timeAgo(props.record.createdAt); 123 123 - const formattedDate = useLocalizedDate(props.record.createdAt, { 124 124 - year: "numeric", 125 125 - month: "long", 126 126 - day: "2-digit", 127 127 - }); 122 122 + let timeAgoDate = timeAgo(props.record.createdAt, { compact: true }); 128 123 129 124 return ( 130 125 <div id={props.comment.uri} className="comment"> 131 131 - <div className="flex gap-2"> 126 126 + <div className="flex gap-2 items-center"> 132 127 {did ? ( 133 128 <ProfilePopover 134 129 didOrHandle={did} 135 130 trigger={ 136 136 - <div className="text-sm text-tertiary font-bold hover:underline"> 131 131 + <div className="text-sm text-secondary font-bold hover:underline"> 137 132 {props.profile.displayName} 138 133 </div> 139 134 } 140 135 /> 141 136 ) : null} 137 137 + 138 138 + <div className="w-1 h-1 rounded-full bg-border shrink-0" /> 142 139 <div className="text-sm text-tertiary">{timeAgoDate}</div> 143 140 </div> 144 141 {props.record.attachment && ··· 210 207 setReplyBoxOpen(false); 211 208 }} 212 209 > 213 213 - <CommentTiny className="text-border" /> {replies.length} 210 210 + <CommentTiny className="text-border" />{" "} 211 211 + {replies.length !== 0 && replies.length} 214 212 </button> 215 213 {identity?.atp_did && ( 216 214 <>

+7 -4

app/lish/[did]/[publication]/[rkey]/Interactions/InteractionDrawer.tsx

··· 1 1 "use client"; 2 2 import { Media } from "components/Media"; 3 3 - import { Quotes } from "./Quotes"; 3 3 + import { MentionsDrawerContent } from "./Quotes"; 4 4 import { InteractionState, useInteractionState } from "./Interactions"; 5 5 import { Json } from "supabase/database.types"; 6 6 - import { Comment, Comments } from "./Comments"; 6 6 + import { Comment, CommentsDrawerContent } from "./Comments"; 7 7 import { useSearchParams } from "next/navigation"; 8 8 import { SandwichSpacer } from "components/LeafletLayout"; 9 9 import { decodeQuotePosition } from "../quotePosition"; ··· 42 42 className={`opaque-container h-full w-full px-3 sm:px-4 pt-2 sm:pt-3 pb-6 overflow-scroll ${props.showPageBackground ? "rounded-l-none! rounded-r-lg! -ml-[1px]" : "rounded-lg! sm:ml-4"}`} 43 43 > 44 44 {drawer.drawer === "quotes" ? ( 45 45 - <Quotes {...props} quotesAndMentions={filteredQuotesAndMentions} /> 45 45 + <MentionsDrawerContent 46 46 + {...props} 47 47 + quotesAndMentions={filteredQuotesAndMentions} 48 48 + /> 46 49 ) : ( 47 47 - <Comments 50 50 + <CommentsDrawerContent 48 51 document_uri={props.document_uri} 49 52 comments={filteredComments} 50 53 pageId={props.pageId}

+104 -134

app/lish/[did]/[publication]/[rkey]/Interactions/Quotes.tsx

··· 24 24 import { CommentTiny } from "components/Icons/CommentTiny"; 25 25 import { QuoteTiny } from "components/Icons/QuoteTiny"; 26 26 import { ThreadLink, QuotesLink } from "../PostLinks"; 27 27 + import { BskyPostContent } from "../BskyPostContent"; 27 28 28 29 // Helper to get SWR key for quotes 29 30 export function getQuotesSWRKey(uris: string[]) { ··· 61 62 } 62 63 } 63 64 64 64 - export const Quotes = (props: { 65 65 + export const MentionsDrawerContent = (props: { 65 66 quotesAndMentions: { uri: string; link?: string }[]; 66 67 did: string; 67 68 }) => { ··· 85 86 }); 86 87 87 88 return ( 88 88 - <div className="flex flex-col gap-2"> 89 89 - <div className="w-full flex justify-between text-secondary font-bold"> 90 90 - Quotes 91 91 - <button 92 92 - className="text-tertiary" 93 93 - onClick={() => 94 94 - setInteractionState(document_uri, { drawerOpen: false }) 95 95 - } 96 96 - > 97 97 - <CloseTiny /> 98 98 - </button> 99 99 - </div> 89 89 + <div className="relative w-full flex justify-between "> 90 90 + <button 91 91 + className="text-tertiary absolute top-0 right-0" 92 92 + onClick={() => setInteractionState(document_uri, { drawerOpen: false })} 93 93 + > 94 94 + <CloseTiny /> 95 95 + </button> 100 96 {props.quotesAndMentions.length === 0 ? ( 101 97 <div className="opaque-container flex flex-col gap-0.5 p-[6px] text-tertiary italic text-sm text-center"> 102 98 <div className="font-bold">no quotes yet!</div> ··· 108 104 <DotLoader /> 109 105 </div> 110 106 ) : ( 111 111 - <div className="quotes flex flex-col gap-8"> 112 112 - {/* Quotes with links (quoted content) */} 113 113 - {quotesWithLinks.map((q, index) => { 114 114 - const pv = postViewMap.get(q.uri); 115 115 - if (!pv || !q.link) return null; 116 116 - const url = new URL(q.link); 117 117 - const quoteParam = url.pathname.split("/l-quote/")[1]; 118 118 - if (!quoteParam) return null; 119 119 - const quotePosition = decodeQuotePosition(quoteParam); 120 120 - if (!quotePosition) return null; 121 121 - return ( 122 122 - <div key={`quote-${index}`} className="flex flex-col "> 123 123 - <QuoteContent 124 124 - index={index} 125 125 - did={props.did} 126 126 - position={quotePosition} 127 127 - /> 128 128 - 129 129 - <div className="h-5 w-1 ml-5 border-l border-border-light" /> 130 130 - <BskyPost 131 131 - uri={pv.uri} 132 132 - rkey={new AtUri(pv.uri).rkey} 133 133 - content={pv.record.text as string} 134 134 - user={pv.author.displayName || pv.author.handle} 135 135 - profile={pv.author} 136 136 - handle={pv.author.handle} 137 137 - replyCount={pv.replyCount} 138 138 - quoteCount={pv.quoteCount} 139 139 - /> 140 140 - </div> 141 141 - ); 142 142 - })} 143 143 - 107 107 + <div className="flex flex-col gap-8 w-full"> 108 108 + {quotesWithLinks.length > 0 && ( 109 109 + <div className="flex flex-col w-full"> 110 110 + <h4 className="mb-2">Quotes on Bluesky</h4> 111 111 + {/* Quotes with links (quoted content) */} 112 112 + {quotesWithLinks.map((q, index) => { 113 113 + return ( 114 114 + <> 115 115 + <Quote 116 116 + key={q.uri} 117 117 + q={q} 118 118 + index={index} 119 119 + did={props.did} 120 120 + postViewMap={postViewMap} 121 121 + /> 122 122 + {quotesWithLinks.length !== index + 1 && ( 123 123 + <hr className="border-border-light my-4" /> 124 124 + )} 125 125 + </> 126 126 + ); 127 127 + })} 128 128 + </div> 129 129 + )} 144 130 {/* Direct post mentions (without quoted content) */} 145 131 {directMentions.length > 0 && ( 146 146 - <div className="flex flex-col gap-4"> 147 147 - <div className="text-secondary font-bold">Post Mentions</div> 148 148 - <div className="flex flex-col gap-8"> 149 149 - {directMentions.map((q, index) => { 150 150 - const pv = postViewMap.get(q.uri); 151 151 - if (!pv) return null; 152 152 - return ( 153 153 - <BskyPost 132 132 + <div className="flex flex-col"> 133 133 + <h4 className="mb-2">Mentions on Bluesky</h4> 134 134 + {directMentions.map((q, index) => { 135 135 + const post = postViewMap.get(q.uri); 136 136 + if (!post) return null; 137 137 + 138 138 + const parent = { type: "thread" as const, uri: q.uri }; 139 139 + return ( 140 140 + <> 141 141 + <BskyPostContent 154 142 key={`mention-${index}`} 155 155 - uri={pv.uri} 156 156 - rkey={new AtUri(pv.uri).rkey} 157 157 - content={pv.record.text as string} 158 158 - user={pv.author.displayName || pv.author.handle} 159 159 - profile={pv.author} 160 160 - handle={pv.author.handle} 161 161 - replyCount={pv.replyCount} 162 162 - quoteCount={pv.quoteCount} 143 143 + post={post} 144 144 + parent={parent} 145 145 + showBlueskyLink={true} 146 146 + showEmbed={true} 147 147 + avatarSize="medium" 148 148 + quoteEnabled 149 149 + replyEnabled 150 150 + className="text-sm" 151 151 + compactEmbed 163 152 /> 164 164 - ); 165 165 - })} 166 166 - </div> 153 153 + {directMentions.length !== index + 1 && ( 154 154 + <hr className="border-border-light my-4" /> 155 155 + )} 156 156 + </> 157 157 + ); 158 158 + })} 167 159 </div> 168 160 )} 169 161 </div> ··· 172 164 ); 173 165 }; 174 166 167 167 + const Quote = (props: { 168 168 + q: { 169 169 + uri: string; 170 170 + link?: string; 171 171 + }; 172 172 + index: number; 173 173 + did: string; 174 174 + postViewMap: Map<string, PostView>; 175 175 + }) => { 176 176 + const post = props.postViewMap.get(props.q.uri); 177 177 + if (!post || !props.q.link) return null; 178 178 + const parent = { type: "thread" as const, uri: props.q.uri }; 179 179 + const url = new URL(props.q.link); 180 180 + const quoteParam = url.pathname.split("/l-quote/")[1]; 181 181 + if (!quoteParam) return null; 182 182 + const quotePosition = decodeQuotePosition(quoteParam); 183 183 + if (!quotePosition) return null; 184 184 + 185 185 + return ( 186 186 + <div key={`quote-${props.index}`} className="flex flex-col w-full"> 187 187 + <QuoteContent 188 188 + index={props.index} 189 189 + did={props.did} 190 190 + position={quotePosition} 191 191 + /> 192 192 + 193 193 + <div className="h-3 w-1 ml-[11px] border-l border-border-light" /> 194 194 + <BskyPostContent 195 195 + post={post} 196 196 + parent={parent} 197 197 + showBlueskyLink={true} 198 198 + showEmbed={false} 199 199 + avatarSize="medium" 200 200 + quoteEnabled 201 201 + replyEnabled 202 202 + className="text-sm" 203 203 + /> 204 204 + </div> 205 205 + ); 206 206 + }; 207 207 + 175 208 export const QuoteContent = (props: { 176 209 position: QuotePosition; 177 210 index: number; ··· 206 239 className="quoteSectionQuote text-secondary text-sm text-left hover:cursor-pointer" 207 240 onClick={(e) => { 208 241 if (props.position.pageId) 209 209 - flushSync(() => openPage(undefined, { type: "doc", id: props.position.pageId! })); 242 242 + flushSync(() => 243 243 + openPage(undefined, { type: "doc", id: props.position.pageId! }), 244 244 + ); 210 245 let scrollMargin = isMobile 211 246 ? 16 212 247 : e.currentTarget.getBoundingClientRect().top; 213 248 let scrollContainerId = `post-page-${props.position.pageId ?? document_uri}`; 214 214 - let scrollContainer = window.document.getElementById(scrollContainerId); 249 249 + let scrollContainer = 250 250 + window.document.getElementById(scrollContainerId); 215 251 let el = window.document.getElementById( 216 252 props.position.start.block.join("."), 217 253 ); ··· 236 272 blocks={content} 237 273 did={props.did} 238 274 preview 239 239 - className="py-0!" 275 275 + className="py-0! px-0! text-tertiary" 240 276 /> 241 241 - </div> 242 242 - </div> 243 243 - </div> 244 244 - ); 245 245 - }; 246 246 - 247 247 - export const BskyPost = (props: { 248 248 - uri: string; 249 249 - rkey: string; 250 250 - content: string; 251 251 - user: string; 252 252 - handle: string; 253 253 - profile: ProfileViewBasic; 254 254 - replyCount?: number; 255 255 - quoteCount?: number; 256 256 - }) => { 257 257 - const handleOpenThread = () => { 258 258 - openPage(undefined, { type: "thread", uri: props.uri }); 259 259 - }; 260 260 - 261 261 - return ( 262 262 - <div 263 263 - onClick={handleOpenThread} 264 264 - className="quoteSectionBskyItem px-2 flex gap-[6px] hover:no-underline font-normal cursor-pointer hover:bg-bg-page rounded" 265 265 - > 266 266 - {props.profile.avatar && ( 267 267 - <img 268 268 - className="rounded-full w-6 h-6 shrink-0" 269 269 - src={props.profile.avatar} 270 270 - alt={props.profile.displayName} 271 271 - /> 272 272 - )} 273 273 - <div className="flex flex-col min-w-0"> 274 274 - <div className="flex items-center gap-2 flex-wrap"> 275 275 - <div className="font-bold">{props.user}</div> 276 276 - <a 277 277 - className="text-tertiary hover:underline" 278 278 - href={`https://bsky.app/profile/${props.handle}`} 279 279 - target="_blank" 280 280 - onClick={(e) => e.stopPropagation()} 281 281 - > 282 282 - @{props.handle} 283 283 - </a> 284 284 - </div> 285 285 - <div className="text-primary">{props.content}</div> 286 286 - <div className="flex gap-2 items-center mt-1"> 287 287 - {props.replyCount != null && props.replyCount > 0 && ( 288 288 - <ThreadLink 289 289 - threadUri={props.uri} 290 290 - onClick={(e) => e.stopPropagation()} 291 291 - className="flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast" 292 292 - > 293 293 - <CommentTiny /> 294 294 - {props.replyCount} {props.replyCount === 1 ? "reply" : "replies"} 295 295 - </ThreadLink> 296 296 - )} 297 297 - {props.quoteCount != null && props.quoteCount > 0 && ( 298 298 - <QuotesLink 299 299 - postUri={props.uri} 300 300 - onClick={(e) => e.stopPropagation()} 301 301 - className="flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast" 302 302 - > 303 303 - <QuoteTiny /> 304 304 - {props.quoteCount} {props.quoteCount === 1 ? "quote" : "quotes"} 305 305 - </QuotesLink> 306 306 - )} 307 277 </div> 308 278 </div> 309 279 </div>

-2

app/lish/[did]/[publication]/[rkey]/PostContent.tsx

··· 28 28 import { PubCodeBlock } from "./Blocks/PubCodeBlock"; 29 29 import { AppBskyFeedDefs } from "@atproto/api"; 30 30 import { PubBlueskyPostBlock } from "./Blocks/PublishBskyPostBlock"; 31 31 - import { openPage } from "./PostPages"; 32 32 - import { PageLinkBlock } from "components/Blocks/PageLinkBlock"; 33 31 import { PublishedPageLinkBlock } from "./Blocks/PublishedPageBlock"; 34 32 import { PublishedPollBlock } from "./Blocks/PublishedPollBlock"; 35 33 import { PollData } from "./fetchPollData";

+6 -5

app/lish/[did]/[publication]/[rkey]/PostLinks.tsx

··· 55 55 56 56 // Link component for opening thread pages with prefetching 57 57 export function ThreadLink(props: { 58 58 - threadUri: string; 58 58 + postUri: string; 59 59 parent?: OpenPage; 60 60 children: React.ReactNode; 61 61 className?: string; 62 62 onClick?: (e: React.MouseEvent) => void; 63 63 }) { 64 64 - const { threadUri, parent, children, className, onClick } = props; 64 64 + const { postUri, parent, children, className, onClick } = props; 65 65 66 66 const handleClick = (e: React.MouseEvent) => { 67 67 + e.stopPropagation(); 67 68 onClick?.(e); 68 69 if (e.defaultPrevented) return; 69 69 - openPage(parent, { type: "thread", uri: threadUri }); 70 70 + openPage(parent, { type: "thread", uri: postUri }); 70 71 }; 71 72 72 73 const handlePrefetch = () => { 73 73 - prefetchThread(threadUri); 74 74 + prefetchThread(postUri); 74 75 }; 75 76 76 77 return ( ··· 96 97 const { postUri, parent, children, className, onClick } = props; 97 98 98 99 const handleClick = (e: React.MouseEvent) => { 100 100 + e.stopPropagation(); 99 101 onClick?.(e); 100 102 if (e.defaultPrevented) return; 101 103 openPage(parent, { type: "quotes", uri: postUri }); ··· 104 106 const handlePrefetch = () => { 105 107 prefetchQuotes(postUri); 106 108 }; 107 107 - 108 109 return ( 109 110 <button 110 111 className={className}

+20 -2

app/lish/[did]/[publication]/[rkey]/PostPages.tsx

··· 111 111 const pageKey = getPageKey(page); 112 112 const parentKey = parent ? getPageKey(parent) : undefined; 113 113 114 114 + // Check if the page is already open 115 115 + const currentState = usePostPageUIState.getState(); 116 116 + const existingPageIndex = currentState.pages.findIndex( 117 117 + (p) => getPageKey(p) === pageKey, 118 118 + ); 119 119 + 120 120 + // If page is already open, just scroll to it 121 121 + if (existingPageIndex !== -1) { 122 122 + if (options?.scrollIntoView !== false) { 123 123 + scrollIntoView(`post-page-${pageKey}`); 124 124 + } 125 125 + return; 126 126 + } 127 127 + 114 128 flushSync(() => { 115 129 usePostPageUIState.setState((state) => { 116 130 let parentPosition = state.pages.findIndex( 117 131 (s) => getPageKey(s) === parentKey, 118 132 ); 133 133 + // Close any pages after the parent and add the new page 119 134 return { 120 135 pages: 121 136 parentPosition === -1 ··· 127 142 }); 128 143 129 144 if (options?.scrollIntoView !== false) { 130 130 - scrollIntoView(`post-page-${pageKey}`); 145 145 + // Use requestAnimationFrame to ensure the DOM has been painted before scrolling 146 146 + requestAnimationFrame(() => { 147 147 + scrollIntoView(`post-page-${pageKey}`); 148 148 + }); 131 149 } 132 150 }; 133 151 ··· 297 315 <Fragment key={pageKey}> 298 316 <SandwichSpacer /> 299 317 <ThreadPageComponent 300 300 - threadUri={openPage.uri} 318 318 + parentUri={openPage.uri} 301 319 pageId={pageKey} 302 320 hasPageBackground={hasPageBackground} 303 321 pageOptions={

+151 -137

app/lish/[did]/[publication]/[rkey]/ThreadPage.tsx

··· 6 6 import { useDrawerOpen } from "./Interactions/InteractionDrawer"; 7 7 import { DotLoader } from "components/utils/DotLoader"; 8 8 import { PostNotAvailable } from "components/Blocks/BlueskyPostBlock/BlueskyEmbed"; 9 9 - import { openPage } from "./PostPages"; 10 9 import { useThreadState } from "src/useThreadState"; 11 11 - import { BskyPostContent, ClientDate } from "./BskyPostContent"; 10 10 + import { 11 11 + BskyPostContent, 12 12 + CompactBskyPostContent, 13 13 + ClientDate, 14 14 + } from "./BskyPostContent"; 12 15 import { 13 16 ThreadLink, 14 17 getThreadKey, ··· 25 28 type ThreadType = ThreadViewPost | NotFoundPost | BlockedPost; 26 29 27 30 export function ThreadPage(props: { 28 28 - threadUri: string; 31 31 + parentUri: string; 29 32 pageId: string; 30 33 pageOptions?: React.ReactNode; 31 34 hasPageBackground: boolean; 32 35 }) { 33 33 - const { threadUri, pageId, pageOptions } = props; 34 34 - const drawer = useDrawerOpen(threadUri); 36 36 + const { parentUri, pageId, pageOptions } = props; 37 37 + const drawer = useDrawerOpen(parentUri); 35 38 36 39 const { 37 40 data: thread, 38 41 isLoading, 39 42 error, 40 40 - } = useSWR(threadUri ? getThreadKey(threadUri) : null, () => 41 41 - fetchThread(threadUri), 43 43 + } = useSWR(parentUri ? getThreadKey(parentUri) : null, () => 44 44 + fetchThread(parentUri), 42 45 ); 43 46 44 47 return ( ··· 46 49 pageType="doc" 47 50 fullPageScroll={false} 48 51 id={`post-page-${pageId}`} 49 49 - drawerOpen={!!drawer} 52 52 + drawerOpen={false} 50 53 pageOptions={pageOptions} 54 54 + fixedWidth 51 55 > 52 52 - <div className="flex flex-col sm:px-4 px-3 sm:pt-3 pt-2 pb-1 sm:pb-4"> 56 56 + <div className="flex flex-col sm:px-4 px-3 sm:pt-3 pt-2 pb-1 sm:pb-4 w-full"> 53 57 {isLoading ? ( 54 58 <div className="flex items-center justify-center gap-1 text-tertiary italic text-sm py-8"> 55 59 <span>loading thread</span> ··· 60 64 Failed to load thread 61 65 </div> 62 66 ) : thread ? ( 63 63 - <ThreadContent thread={thread} threadUri={threadUri} /> 67 67 + <ThreadContent post={thread} parentUri={parentUri} /> 64 68 ) : null} 65 69 </div> 66 70 </PageWrapper> 67 71 ); 68 72 } 69 73 70 70 - function ThreadContent(props: { thread: ThreadType; threadUri: string }) { 71 71 - const { thread, threadUri } = props; 74 74 + function ThreadContent(props: { post: ThreadType; parentUri: string }) { 75 75 + const { post, parentUri } = props; 72 76 const mainPostRef = useRef<HTMLDivElement>(null); 73 77 74 78 // Scroll the main post into view when the thread loads ··· 81 85 } 82 86 }, []); 83 87 84 84 - if (AppBskyFeedDefs.isNotFoundPost(thread)) { 88 88 + if (AppBskyFeedDefs.isNotFoundPost(post)) { 85 89 return <PostNotAvailable />; 86 90 } 87 91 88 88 - if (AppBskyFeedDefs.isBlockedPost(thread)) { 92 92 + if (AppBskyFeedDefs.isBlockedPost(post)) { 89 93 return ( 90 94 <div className="text-tertiary italic text-sm text-center py-8"> 91 95 This post is blocked ··· 93 97 ); 94 98 } 95 99 96 96 - if (!AppBskyFeedDefs.isThreadViewPost(thread)) { 100 100 + if (!AppBskyFeedDefs.isThreadViewPost(post)) { 97 101 return <PostNotAvailable />; 98 102 } 99 103 100 104 // Collect all parent posts in order (oldest first) 101 105 const parents: ThreadViewPost[] = []; 102 102 - let currentParent = thread.parent; 106 106 + let currentParent = post.parent; 103 107 while (currentParent && AppBskyFeedDefs.isThreadViewPost(currentParent)) { 104 108 parents.unshift(currentParent); 105 109 currentParent = currentParent.parent; 106 110 } 107 111 108 112 return ( 109 109 - <div className="flex flex-col gap-0"> 110 110 - {/* Parent posts */} 111 111 - {parents.map((parent, index) => ( 112 112 - <div key={parent.post.uri} className="flex flex-col"> 113 113 - <ThreadPost 114 114 - post={parent} 115 115 - isMainPost={false} 116 116 - showReplyLine={index < parents.length - 1 || true} 117 117 - threadUri={threadUri} 118 118 - /> 119 119 - </div> 113 113 + <div 114 114 + className={`threadContent flex flex-col gap-0 w-full ${parents.length !== 0 && "pt-1"}`} 115 115 + > 116 116 + {/* grandparent posts, if any */} 117 117 + {parents.map((parentPost, index) => ( 118 118 + <ThreadPost 119 119 + key={parentPost.post.uri} 120 120 + post={parentPost} 121 121 + isMainPost={false} 122 122 + pageUri={parentUri} 123 123 + /> 120 124 ))} 121 125 122 126 {/* Main post */} 123 127 <div ref={mainPostRef}> 124 124 - <ThreadPost 125 125 - post={thread} 126 126 - isMainPost={true} 127 127 - showReplyLine={false} 128 128 - threadUri={threadUri} 129 129 - /> 128 128 + <ThreadPost post={post} isMainPost={true} pageUri={parentUri} /> 130 129 </div> 131 130 132 131 {/* Replies */} 133 133 - {thread.replies && thread.replies.length > 0 && ( 134 134 - <div className="flex flex-col mt-2 pt-2 border-t border-border-light"> 135 135 - <div className="text-tertiary text-xs font-bold mb-2 px-2"> 136 136 - Replies 137 137 - </div> 132 132 + {post.replies && post.replies.length > 0 && ( 133 133 + <div className="threadReplies flex flex-col mt-4 pt-4 border-t border-border-light w-full"> 138 134 <Replies 139 139 - replies={thread.replies as any[]} 140 140 - threadUri={threadUri} 135 135 + replies={post.replies as any[]} 136 136 + pageUri={post.post.uri} 137 137 + parentPostUri={post.post.uri} 141 138 depth={0} 142 142 - parentAuthorDid={thread.post.author.did} 139 139 + parentAuthorDid={post.post.author.did} 143 140 /> 144 141 </div> 145 142 )} ··· 150 147 function ThreadPost(props: { 151 148 post: ThreadViewPost; 152 149 isMainPost: boolean; 153 153 - showReplyLine: boolean; 154 154 - threadUri: string; 150 150 + pageUri: string; 155 151 }) { 156 156 - const { post, isMainPost, showReplyLine, threadUri } = props; 152 152 + const { post, isMainPost, pageUri } = props; 157 153 const postView = post.post; 158 158 - const parent = { type: "thread" as const, uri: threadUri }; 154 154 + const page = { type: "thread" as const, uri: pageUri }; 159 155 160 160 - return ( 161 161 - <div className="flex gap-2 relative"> 162 162 - {/* Reply line connector */} 163 163 - {showReplyLine && ( 164 164 - <div className="absolute left-[19px] top-10 bottom-0 w-0.5 bg-border-light" /> 165 165 - )} 156 156 + if (isMainPost) { 157 157 + return ( 158 158 + <div className="threadMainPost flex gap-2 relative w-full"> 159 159 + <BskyPostContent 160 160 + post={postView} 161 161 + parent={page} 162 162 + avatarSize="large" 163 163 + showBlueskyLink={true} 164 164 + showEmbed={true} 165 165 + compactEmbed 166 166 + quoteEnabled 167 167 + /> 168 168 + </div> 169 169 + ); 170 170 + } 166 171 167 167 - <BskyPostContent 172 172 + return ( 173 173 + <div className="threadGrandparentPost flex gap-2 relative w-full pl-[6px] pb-2"> 174 174 + <div className="absolute top-0 bottom-0 left-[6px] w-5 "> 175 175 + <div className="bg-border-light w-[2px] h-full mx-auto" /> 176 176 + </div> 177 177 + <CompactBskyPostContent 168 178 post={postView} 169 169 - parent={parent} 170 170 - linksEnabled={!isMainPost} 171 171 - showBlueskyLink={true} 172 172 - showEmbed={true} 179 179 + parent={page} 180 180 + quoteEnabled 181 181 + replyEnabled 173 182 /> 174 183 </div> 175 184 ); ··· 177 186 178 187 function Replies(props: { 179 188 replies: (ThreadViewPost | NotFoundPost | BlockedPost)[]; 180 180 - threadUri: string; 181 189 depth: number; 182 190 parentAuthorDid?: string; 191 191 + pageUri: string; 192 192 + parentPostUri: string; 183 193 }) { 184 184 - const { replies, threadUri, depth, parentAuthorDid } = props; 194 194 + const { replies, depth, parentAuthorDid, pageUri, parentPostUri } = props; 185 195 const collapsedThreads = useThreadState((s) => s.collapsedThreads); 186 196 const toggleCollapsed = useThreadState((s) => s.toggleCollapsed); 187 197 ··· 201 211 : replies; 202 212 203 213 return ( 204 204 - <div className="flex flex-col gap-0"> 214 214 + <div className="replies flex flex-col gap-0 w-full"> 205 215 {sortedReplies.map((reply, index) => { 206 216 if (AppBskyFeedDefs.isNotFoundPost(reply)) { 207 217 return ( 208 218 <div 209 219 key={`not-found-${index}`} 210 210 - className="text-tertiary italic text-xs py-2 px-2" 220 220 + className="text-tertiary italic text-sm px-t py-6 opaque-container text-center justify-center my-2" 211 221 > 212 222 Post not found 213 223 </div> ··· 218 228 return ( 219 229 <div 220 230 key={`blocked-${index}`} 221 221 - className="text-tertiary italic text-xs py-2 px-2" 231 231 + className="text-tertiary italic text-sm px-t py-6 opaque-container text-center justify-center my-2" 222 232 > 223 233 Post blocked 224 234 </div> ··· 231 241 232 242 const hasReplies = reply.replies && reply.replies.length > 0; 233 243 const isCollapsed = collapsedThreads.has(reply.post.uri); 234 234 - const replyCount = reply.replies?.length ?? 0; 235 244 236 245 return ( 237 237 - <div key={reply.post.uri} className="flex flex-col"> 238 238 - <ReplyPost 239 239 - post={reply} 240 240 - showReplyLine={hasReplies || index < replies.length - 1} 241 241 - isLast={index === replies.length - 1 && !hasReplies} 242 242 - threadUri={threadUri} 243 243 - /> 244 244 - {hasReplies && depth < 3 && ( 245 245 - <div className="ml-2 flex"> 246 246 - {/* Clickable collapse line - w-8 matches avatar width, centered line aligns with avatar center */} 247 247 - <button 248 248 - onClick={(e) => { 249 249 - e.stopPropagation(); 250 250 - toggleCollapsed(reply.post.uri); 251 251 - }} 252 252 - className="group w-8 flex justify-center cursor-pointer shrink-0" 253 253 - aria-label={ 254 254 - isCollapsed ? "Expand replies" : "Collapse replies" 255 255 - } 256 256 - > 257 257 - <div className="w-0.5 h-full bg-border-light group-hover:bg-accent-contrast group-hover:w-1 transition-all" /> 258 258 - </button> 259 259 - {isCollapsed ? ( 260 260 - <button 261 261 - onClick={(e) => { 262 262 - e.stopPropagation(); 263 263 - toggleCollapsed(reply.post.uri); 264 264 - }} 265 265 - className="text-xs text-accent-contrast hover:underline py-1 pl-1" 266 266 - > 267 267 - Show {replyCount} {replyCount === 1 ? "reply" : "replies"} 268 268 - </button> 269 269 - ) : ( 270 270 - <div className="grow"> 271 271 - <Replies 272 272 - replies={reply.replies as any[]} 273 273 - threadUri={threadUri} 274 274 - depth={depth + 1} 275 275 - parentAuthorDid={reply.post.author.did} 276 276 - /> 277 277 - </div> 278 278 - )} 279 279 - </div> 280 280 - )} 281 281 - {hasReplies && depth >= 3 && ( 282 282 - <ThreadLink 283 283 - threadUri={reply.post.uri} 284 284 - parent={{ type: "thread", uri: threadUri }} 285 285 - className="ml-12 text-xs text-accent-contrast hover:underline py-1" 286 286 - > 287 287 - View more replies 288 288 - </ThreadLink> 289 289 - )} 290 290 - </div> 246 246 + <ReplyPost 247 247 + key={reply.post.uri} 248 248 + post={reply} 249 249 + isLast={index === replies.length - 1 && !hasReplies} 250 250 + pageUri={pageUri} 251 251 + parentPostUri={parentPostUri} 252 252 + toggleCollapsed={(uri) => toggleCollapsed(uri)} 253 253 + isCollapsed={isCollapsed} 254 254 + depth={props.depth} 255 255 + /> 291 256 ); 292 257 })} 258 258 + {pageUri && depth > 0 && replies.length > 3 && ( 259 259 + <ThreadLink 260 260 + postUri={pageUri} 261 261 + parent={{ type: "thread", uri: pageUri }} 262 262 + className="flex justify-start text-sm text-accent-contrast h-fit hover:underline" 263 263 + > 264 264 + <div className="mx-[19px] w-0.5 h-[24px] bg-border-light" /> 265 265 + View {replies.length - 3} more{" "} 266 266 + {replies.length === 4 ? "reply" : "replies"} 267 267 + </ThreadLink> 268 268 + )} 293 269 </div> 294 270 ); 295 271 } 296 272 297 297 - function ReplyPost(props: { 273 273 + const ReplyPost = (props: { 298 274 post: ThreadViewPost; 299 299 - showReplyLine: boolean; 300 275 isLast: boolean; 301 301 - threadUri: string; 302 302 - }) { 303 303 - const { post, threadUri } = props; 276 276 + pageUri: string; 277 277 + parentPostUri: string; 278 278 + toggleCollapsed: (uri: string) => void; 279 279 + isCollapsed: boolean; 280 280 + depth: number; 281 281 + }) => { 282 282 + const { post, pageUri, parentPostUri } = props; 304 283 const postView = post.post; 305 305 - const parent = { type: "thread" as const, uri: threadUri }; 284 284 + 285 285 + const hasReplies = props.post.replies && props.post.replies.length > 0; 306 286 307 287 return ( 308 308 - <div 309 309 - className="flex gap-2 relative py-2 px-2 hover:bg-bg-page rounded cursor-pointer" 310 310 - onClick={() => openPage(parent, { type: "thread", uri: postView.uri })} 311 311 - > 312 312 - <BskyPostContent 313 313 - post={postView} 314 314 - parent={parent} 315 315 - linksEnabled={true} 316 316 - avatarSize="sm" 317 317 - showEmbed={false} 318 318 - showBlueskyLink={false} 319 319 - onLinkClick={(e) => e.stopPropagation()} 320 320 - onEmbedClick={(e) => e.stopPropagation()} 321 321 - /> 288 288 + <div className="flex h-fit relative"> 289 289 + {props.depth > 0 && ( 290 290 + <> 291 291 + <div className="absolute replyLine top-0 bottom-0 left-0 w-6 pointer-events-none "> 292 292 + <div className="bg-border-light w-[2px] h-full mx-auto" /> 293 293 + </div> 294 294 + <button 295 295 + className="absolute top-0 bottom-0 left-0 w-6 z-10" 296 296 + onClick={(e) => { 297 297 + e.preventDefault(); 298 298 + e.stopPropagation(); 299 299 + 300 300 + props.toggleCollapsed(parentPostUri); 301 301 + console.log("reply clicked"); 302 302 + }} 303 303 + /> 304 304 + </> 305 305 + )} 306 306 + <div 307 307 + className={`reply relative flex flex-col w-full ${props.depth === 0 && "mb-3"}`} 308 308 + > 309 309 + <BskyPostContent 310 310 + post={postView} 311 311 + parent={{ type: "thread", uri: pageUri }} 312 312 + showEmbed={false} 313 313 + showBlueskyLink={false} 314 314 + quoteEnabled 315 315 + replyEnabled 316 316 + replyOnClick={(e) => { 317 317 + e.preventDefault(); 318 318 + props.toggleCollapsed(post.post.uri); 319 319 + }} 320 320 + className="text-sm" 321 321 + /> 322 322 + {hasReplies && props.depth < 3 && ( 323 323 + <div className="ml-[28px] flex grow "> 324 324 + {!props.isCollapsed && ( 325 325 + <Replies 326 326 + pageUri={pageUri} 327 327 + parentPostUri={post.post.uri} 328 328 + replies={props.post.replies as any[]} 329 329 + depth={props.depth + 1} 330 330 + parentAuthorDid={props.post.post.author.did} 331 331 + /> 332 332 + )} 333 333 + </div> 334 334 + )} 335 335 + </div> 322 336 </div> 323 337 ); 324 324 - } 338 338 + };

+7 -4

app/lish/[did]/[publication]/[rkey]/page.tsx

··· 35 35 sizes: "32x32", 36 36 type: "image/png", 37 37 }, 38 38 - other: { 39 39 - rel: "alternate", 40 40 - url: document.uri, 41 41 - }, 38 38 + other: [ 39 39 + { 40 40 + rel: "alternate", 41 41 + url: document.uri, 42 42 + }, 43 43 + { rel: "site.standard.document", url: document.uri }, 44 44 + ], 42 45 }, 43 46 title: 44 47 docRecord.title +

+1

app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx

··· 111 111 documents: { 112 112 uri: doc.uri, 113 113 indexed_at: doc.indexed_at, 114 114 + sort_date: doc.sort_date, 114 115 data: doc.data, 115 116 }, 116 117 },

-1

app/lish/[did]/[publication]/icon/route.ts

··· 14 14 request: NextRequest, 15 15 props: { params: Promise<{ did: string; publication: string }> }, 16 16 ) { 17 17 - console.log("are we getting here?"); 18 17 const params = await props.params; 19 18 try { 20 19 let did = decodeURIComponent(params.did);

+7 -3

app/lish/createPub/getPublicationURL.ts

··· 25 25 } 26 26 27 27 // Fall back to checking raw record for legacy base_path 28 28 - if (isLeafletPublication(pub.record) && pub.record.base_path && isProductionDomain()) { 28 28 + if ( 29 29 + isLeafletPublication(pub.record) && 30 30 + pub.record.base_path && 31 31 + isProductionDomain() 32 32 + ) { 29 33 return `https://${pub.record.base_path}`; 30 34 } 31 35 ··· 36 40 const normalized = normalizePublicationRecord(pub.record); 37 41 const aturi = new AtUri(pub.uri); 38 42 39 39 - // Use normalized name if available, fall back to rkey 40 40 - const name = normalized?.name || aturi.rkey; 43 43 + //use rkey, fallback to name 44 44 + const name = aturi.rkey || normalized?.name; 41 45 return `/lish/${aturi.host}/${encodeURIComponent(name || "")}`; 42 46 }

+1 -4

app/lish/createPub/updatePublication.ts

··· 273 273 showPageBackground: boolean; 274 274 accentBackground: Color; 275 275 accentText: Color; 276 276 - headingFont?: string; 277 277 - bodyFont?: string; 278 276 }; 279 277 }): Promise<UpdatePublicationResult> { 280 278 return withPublicationUpdate(uri, async ({ normalizedPub, existingBasePath, publicationType, agent }) => { 281 279 // Build theme object 282 280 const themeData = { 281 281 + $type: "pub.leaflet.publication#theme" as const, 283 282 backgroundImage: theme.backgroundImage 284 283 ? { 285 284 $type: "pub.leaflet.theme.backgroundImage", ··· 314 313 accentText: { 315 314 ...theme.accentText, 316 315 }, 317 317 - headingFont: theme.headingFont, 318 318 - bodyFont: theme.bodyFont, 319 316 }; 320 317 321 318 // Derive basicTheme from the theme colors for site.standard.publication

+7 -4

app/p/[didOrHandle]/[rkey]/page.tsx

··· 38 38 39 39 return { 40 40 icons: { 41 41 - other: { 42 42 - rel: "alternate", 43 43 - url: document.uri, 44 44 - }, 41 41 + other: [ 42 42 + { 43 43 + rel: "alternate", 44 44 + url: document.uri, 45 45 + }, 46 46 + { rel: "site.standard.document", url: document.uri }, 47 47 + ], 45 48 }, 46 49 title: docRecord.title, 47 50 description: docRecord?.description || "",

+25 -6

components/Avatar.tsx

··· 4 4 src: string | undefined; 5 5 displayName: string | undefined; 6 6 className?: string; 7 7 - tiny?: boolean; 8 8 - large?: boolean; 9 9 - giant?: boolean; 7 7 + size?: "tiny" | "small" | "medium" | "large" | "giant"; 10 8 }) => { 9 9 + let sizeClassName = 10 10 + props.size === "tiny" 11 11 + ? "w-4 h-4" 12 12 + : props.size === "small" 13 13 + ? "w-5 h-5" 14 14 + : props.size === "medium" 15 15 + ? "h-6 w-6" 16 16 + : props.size === "large" 17 17 + ? "w-8 h-8" 18 18 + : props.size === "giant" 19 19 + ? "h-16 w-16" 20 20 + : "w-6 h-6"; 21 21 + 11 22 if (props.src) 12 23 return ( 13 24 <img 14 14 - className={`${props.tiny ? "w-4 h-4" : props.large ? "h-8 w-8" : props.giant ? "h-16 w-16" : "w-5 h-5"} rounded-full shrink-0 border border-border-light ${props.className}`} 25 25 + className={`${sizeClassName} relative rounded-full shrink-0 border border-border-light ${props.className}`} 15 26 src={props.src} 16 27 alt={ 17 28 props.displayName ··· 23 34 else 24 35 return ( 25 36 <div 26 26 - className={`bg-[var(--accent-light)] flex rounded-full shrink-0 border border-border-light place-items-center justify-center text-accent-1 ${props.tiny ? "w-4 h-4" : "w-5 h-5"}`} 37 37 + className={` relative bg-[var(--accent-light)] flex rounded-full shrink-0 border border-border-light place-items-center justify-center text-accent-1 ${sizeClassName}`} 27 38 > 28 28 - <AccountTiny className={props.tiny ? "scale-80" : "scale-90"} /> 39 39 + <AccountTiny 40 40 + className={ 41 41 + props.size === "tiny" 42 42 + ? "scale-80" 43 43 + : props.size === "small" 44 44 + ? "scale-90" 45 45 + : "" 46 46 + } 47 47 + /> 29 48 </div> 30 49 ); 31 50 };

+141 -67

components/Blocks/Block.tsx

··· 33 33 import { deepEquals } from "src/utils/deepEquals"; 34 34 import { isTextBlock } from "src/utils/isTextBlock"; 35 35 import { focusPage } from "src/utils/focusPage"; 36 36 + import { DeleteTiny } from "components/Icons/DeleteTiny"; 37 37 + import { ArrowDownTiny } from "components/Icons/ArrowDownTiny"; 38 38 + import { Separator } from "components/Layout"; 39 39 + import { moveBlockUp, moveBlockDown } from "src/utils/moveBlock"; 40 40 + import { deleteBlock } from "src/utils/deleteBlock"; 36 41 37 42 export type Block = { 38 43 factID: string; ··· 63 68 // Block handles all block level events like 64 69 // mouse events, keyboard events and longPress, and setting AreYouSure state 65 70 // and shared styling like padding and flex for list layouting 66 66 - let { rep } = useReplicache(); 67 71 let mouseHandlers = useBlockMouseHandlers(props); 68 72 let handleDrop = useHandleDrop({ 69 73 parent: props.parent, ··· 72 76 }); 73 77 let entity_set = useEntitySetContext(); 74 78 75 75 - let { isLongPress, handlers } = useLongPress(() => { 79 79 + let { isLongPress, longPressHandlers } = useLongPress(() => { 76 80 if (isTextBlock[props.type]) return; 77 81 if (isLongPress.current) { 78 82 focusBlock( ··· 85 89 let selected = useUIState( 86 90 (s) => !!s.selectedBlocks.find((b) => b.value === props.entityID), 87 91 ); 92 92 + let alignment = useEntity(props.value, "block/text-alignment")?.data.value; 93 93 + 94 94 + let alignmentStyle = 95 95 + props.type === "button" || props.type === "image" 96 96 + ? "justify-center" 97 97 + : "justify-start"; 98 98 + 99 99 + if (alignment) 100 100 + alignmentStyle = { 101 101 + left: "justify-start", 102 102 + right: "justify-end", 103 103 + center: "justify-center", 104 104 + justify: "justify-start", 105 105 + }[alignment]; 88 106 89 107 let [areYouSure, setAreYouSure] = useState(false); 90 108 useEffect(() => { ··· 98 116 99 117 return ( 100 118 <div 101 101 - {...(!props.preview ? { ...mouseHandlers, ...handlers } : {})} 119 119 + {...(!props.preview ? { ...mouseHandlers, ...longPressHandlers } : {})} 102 120 id={ 103 121 !props.preview ? elementId.block(props.entityID).container : undefined 104 122 } ··· 117 135 blockWrapper relative 118 136 flex flex-row gap-2 119 137 px-3 sm:px-4 138 138 + z-1 w-full 139 139 + ${alignmentStyle} 120 140 ${ 121 141 !props.nextBlock 122 142 ? "pb-3 sm:pb-4" ··· 255 275 ) => { 256 276 // BaseBlock renders the actual block content, delete states, controls spacing between block and list markers 257 277 let BlockTypeComponent = BlockTypeComponents[props.type]; 258 258 - let alignment = useEntity(props.value, "block/text-alignment")?.data.value; 259 259 - 260 260 - let alignmentStyle = 261 261 - props.type === "button" || props.type === "image" 262 262 - ? "justify-center" 263 263 - : "justify-start"; 264 264 - 265 265 - if (alignment) 266 266 - alignmentStyle = { 267 267 - left: "justify-start", 268 268 - right: "justify-end", 269 269 - center: "justify-center", 270 270 - justify: "justify-start", 271 271 - }[alignment]; 272 278 273 279 if (!BlockTypeComponent) return <div>unknown block</div>; 274 280 return ( 275 275 - <div 276 276 - className={`blockContentWrapper w-full grow flex gap-2 z-1 ${alignmentStyle}`} 277 277 - > 281 281 + <> 278 282 {props.listData && <ListMarker {...props} />} 279 283 {props.areYouSure ? ( 280 284 <AreYouSure ··· 287 291 ) : ( 288 292 <BlockTypeComponent {...props} preview={props.preview} /> 289 293 )} 290 290 - </div> 294 294 + </> 291 295 ); 292 296 }; 293 297 ··· 326 330 s.selectedBlocks.length > 1, 327 331 ); 328 332 329 329 - let isSelected = useUIState((s) => 330 330 - s.selectedBlocks.find((b) => b.value === props.entityID), 331 331 - ); 332 332 - let isLocked = useEntity(props.value, "block/is-locked"); 333 333 - 334 333 let nextBlockSelected = useUIState((s) => 335 334 s.selectedBlocks.find((b) => b.value === props.nextBlock?.value), 336 335 ); ··· 338 337 s.selectedBlocks.find((b) => b.value === props.previousBlock?.value), 339 338 ); 340 339 341 341 - if (isMultiselected || (isLocked?.data.value && isSelected)) 342 342 - // not sure what multiselected and selected classes are doing (?) 343 343 - // use a hashed pattern for locked things. show this pattern if the block is selected, even if it isn't multiselected 344 344 - 340 340 + if (isMultiselected) 345 341 return ( 346 342 <> 347 343 <div ··· 354 350 ${!prevBlockSelected && "rounded-t-md"} 355 351 ${!nextBlockSelected && "rounded-b-md"} 356 352 `} 357 357 - style={ 358 358 - isLocked?.data.value 359 359 - ? { 360 360 - maskImage: "var(--hatchSVG)", 361 361 - maskRepeat: "repeat repeat", 362 362 - } 363 363 - : {} 364 364 - } 365 365 - ></div> 366 366 - {isLocked?.data.value && ( 367 367 - <div 368 368 - className={` 369 369 - blockSelectionLockIndicator z-10 370 370 - flex items-center 371 371 - text-border rounded-full 372 372 - absolute right-3 373 373 - 374 374 - ${ 375 375 - props.type === "heading" || props.type === "text" 376 376 - ? "top-[6px]" 377 377 - : "top-0" 378 378 - }`} 379 379 - > 380 380 - <LockTiny className="bg-bg-page p-0.5 rounded-full w-5 h-5" /> 381 381 - </div> 382 382 - )} 353 353 + /> 383 354 </> 384 355 ); 385 356 }; 386 357 387 358 export const BlockLayout = (props: { 388 388 - isSelected?: boolean; 359 359 + isSelected: boolean; 389 360 children: React.ReactNode; 390 361 className?: string; 362 362 + optionsClassName?: string; 391 363 hasBackground?: "accent" | "page"; 392 364 borderOnHover?: boolean; 365 365 + hasAlignment?: boolean; 366 366 + areYouSure?: boolean; 367 367 + setAreYouSure?: (value: boolean) => void; 393 368 }) => { 369 369 + // this is used to wrap non-text blocks in consistent selected styling, spacing, and top level options like delete 394 370 return ( 395 371 <div 396 396 - className={`block ${props.className} p-2 sm:p-3 w-full overflow-hidden 372 372 + className={`nonTextBlockAndControls relative ${props.hasAlignment ? "w-fit" : "w-full"}`} 373 373 + > 374 374 + <div 375 375 + className={`nonTextBlock ${props.className} p-2 sm:p-3 overflow-hidden 376 376 + ${props.hasAlignment ? "w-fit" : "w-full"} 397 377 ${props.isSelected ? "block-border-selected " : "block-border"} 398 378 ${props.borderOnHover && "hover:border-accent-contrast! hover:outline-accent-contrast! focus-within:border-accent-contrast! focus-within:outline-accent-contrast!"}`} 399 399 - style={{ 400 400 - backgroundColor: 401 401 - props.hasBackground === "accent" 402 402 - ? "var(--accent-light)" 403 403 - : props.hasBackground === "page" 404 404 - ? "rgb(var(--bg-page))" 405 405 - : "transparent", 406 406 - }} 379 379 + style={{ 380 380 + backgroundColor: 381 381 + props.hasBackground === "accent" 382 382 + ? "var(--accent-light)" 383 383 + : props.hasBackground === "page" 384 384 + ? "rgb(var(--bg-page))" 385 385 + : "transparent", 386 386 + }} 387 387 + > 388 388 + {props.children} 389 389 + </div> 390 390 + {props.isSelected && ( 391 391 + <NonTextBlockOptions 392 392 + optionsClassName={props.optionsClassName} 393 393 + areYouSure={props.areYouSure} 394 394 + setAreYouSure={props.setAreYouSure} 395 395 + /> 396 396 + )} 397 397 + </div> 398 398 + ); 399 399 + }; 400 400 + 401 401 + let debounced: null | number = null; 402 402 + 403 403 + const NonTextBlockOptions = (props: { 404 404 + areYouSure?: boolean; 405 405 + setAreYouSure?: (value: boolean) => void; 406 406 + optionsClassName?: string; 407 407 + }) => { 408 408 + let { rep } = useReplicache(); 409 409 + let entity_set = useEntitySetContext(); 410 410 + let focusedEntity = useUIState((s) => s.focusedEntity); 411 411 + let focusedEntityType = useEntity( 412 412 + focusedEntity?.entityType === "page" 413 413 + ? focusedEntity.entityID 414 414 + : focusedEntity?.parent || null, 415 415 + "page/type", 416 416 + ); 417 417 + 418 418 + let isMultiselected = useUIState((s) => s.selectedBlocks.length > 1); 419 419 + if (focusedEntity?.entityType === "page") return; 420 420 + 421 421 + if (isMultiselected) return; 422 422 + 423 423 + return ( 424 424 + <div 425 425 + className={`flex gap-1 absolute -top-[25px] right-2 pb-0.5 pt-1 px-1 rounded-t-md bg-border text-bg-page ${props.optionsClassName}`} 407 426 > 408 408 - {props.children} 427 427 + {focusedEntityType?.data.value !== "canvas" && ( 428 428 + <> 429 429 + <button 430 430 + onClick={async (e) => { 431 431 + e.stopPropagation(); 432 432 + 433 433 + if (!rep) return; 434 434 + await moveBlockDown(rep, entity_set.set); 435 435 + }} 436 436 + > 437 437 + <ArrowDownTiny /> 438 438 + </button> 439 439 + <button 440 440 + onClick={async (e) => { 441 441 + e.stopPropagation(); 442 442 + 443 443 + if (!rep) return; 444 444 + await moveBlockUp(rep); 445 445 + }} 446 446 + > 447 447 + <ArrowDownTiny className="rotate-180" /> 448 448 + </button> 449 449 + <Separator classname="border-bg-page! h-4! mx-0.5" /> 450 450 + </> 451 451 + )} 452 452 + <button 453 453 + onClick={async (e) => { 454 454 + e.stopPropagation(); 455 455 + if (!rep || !focusedEntity) return; 456 456 + 457 457 + if (props.areYouSure !== undefined && props.setAreYouSure) { 458 458 + if (!props.areYouSure) { 459 459 + props.setAreYouSure(true); 460 460 + debounced = window.setTimeout(() => { 461 461 + debounced = null; 462 462 + }, 300); 463 463 + return; 464 464 + } 465 465 + 466 466 + if (props.areYouSure) { 467 467 + if (debounced) { 468 468 + window.clearTimeout(debounced); 469 469 + debounced = window.setTimeout(() => { 470 470 + debounced = null; 471 471 + }, 300); 472 472 + return; 473 473 + } 474 474 + await deleteBlock([focusedEntity.entityID], rep); 475 475 + } 476 476 + } else { 477 477 + await deleteBlock([focusedEntity.entityID], rep); 478 478 + } 479 479 + }} 480 480 + > 481 481 + <DeleteTiny /> 482 482 + </button> 409 483 </div> 410 484 ); 411 485 };

+70 -45

components/Blocks/BlueskyPostBlock/BlueskyEmbed.tsx

··· 10 10 AppBskyGraphDefs, 11 11 AppBskyLabelerDefs, 12 12 } from "@atproto/api"; 13 13 + import { Avatar } from "components/Avatar"; 14 14 + import { 15 15 + OpenPage, 16 16 + openPage, 17 17 + } from "app/lish/[did]/[publication]/[rkey]/PostPages"; 13 18 14 19 export const BlueskyEmbed = (props: { 15 20 embed: Exclude<AppBskyFeedDefs.PostView["embed"], undefined>; 16 21 postUrl?: string; 22 22 + className?: string; 23 23 + compact?: boolean; 24 24 + parent?: OpenPage; 17 25 }) => { 18 26 // check this file from bluesky for ref 19 27 // https://github.com/bluesky-social/social-app/blob/main/bskyembed/src/components/embed.tsx ··· 21 29 case AppBskyEmbedImages.isView(props.embed): 22 30 let imageEmbed = props.embed; 23 31 return ( 24 24 - <div className="flex flex-wrap rounded-md w-full overflow-hidden"> 32 32 + <div className="imageEmbed flex flex-wrap rounded-md w-full overflow-hidden"> 25 33 {imageEmbed.images.map( 26 34 ( 27 35 image: { ··· 68 76 let isGif = externalEmbed.external.uri.includes(".gif"); 69 77 if (isGif) { 70 78 return ( 71 71 - <div className="flex flex-col border border-border-light rounded-md overflow-hidden aspect-video"> 79 79 + <div className="flex flex-col border border-border-light rounded-md overflow-hidden aspect-video w-full "> 72 80 <img 73 81 src={externalEmbed.external.uri} 74 82 alt={externalEmbed.external.title} ··· 81 89 <a 82 90 href={externalEmbed.external.uri} 83 91 target="_blank" 84 84 - className="group flex flex-col border border-border-light rounded-md overflow-hidden hover:no-underline sm:hover:border-accent-contrast selected-border" 92 92 + className={`externalLinkEmbed group border border-border-light rounded-md overflow-hidden hover:no-underline sm:hover:border-accent-contrast selected-border w-full ${props.compact ? "flex items-stretch" : "flex flex-col"} 93 93 + ${props.className}`} 85 94 > 86 95 {externalEmbed.external.thumb === undefined ? null : ( 87 96 <> 88 88 - <div className="w-full aspect-[1.91/1] overflow-hidden"> 97 97 + <div 98 98 + className={` overflow-hidden shrink-0 ${props.compact ? "aspect-square h-[113px] hidden sm:block" : "aspect-[1.91/1] w-full "}`} 99 99 + > 89 100 <img 90 101 src={externalEmbed.external.thumb} 91 102 alt={externalEmbed.external.title} 92 92 - className="w-full h-full object-cover" 103 103 + className={`object-cover ${props.compact ? "h-full" : "w-full h-full"}`} 93 104 /> 94 105 </div> 95 95 - <hr className="border-border-light" /> 106 106 + {!props.compact && <hr className="border-border-light" />} 96 107 </> 97 108 )} 98 98 - <div className="p-2 flex flex-col gap-1"> 99 99 - <div className="flex flex-col"> 100 100 - <h4>{externalEmbed.external.title}</h4> 101 101 - <p className="text-secondary"> 109 109 + <div 110 110 + className={`p-2 flex flex-col w-full min-w-0 ${props.compact && "sm:pl-3 py-1"}`} 111 111 + > 112 112 + <h4 className="truncate shrink-0" style={{ fontSize: "inherit" }}> 113 113 + {externalEmbed.external.title}{" "} 114 114 + </h4> 115 115 + <div className="grow"> 116 116 + <p className="text-secondary line-clamp-2"> 102 117 {externalEmbed.external.description} 103 118 </p> 104 119 </div> 105 105 - <hr className="border-border-light mt-1" /> 106 106 - <div className="text-tertiary text-xs sm:group-hover:text-accent-contrast"> 120 120 + 121 121 + <hr className="border-border-light my-1" /> 122 122 + <div className="text-tertiary text-xs shrink-0 sm:group-hover:text-accent-contrast truncate"> 107 123 {externalEmbed.external.uri} 108 124 </div> 109 125 </div> ··· 116 132 : 16 / 9; 117 133 return ( 118 134 <div 119 119 - className="rounded-md overflow-hidden relative w-full" 135 135 + className={`videoEmbed rounded-md overflow-hidden relative w-full ${props.className}`} 120 136 style={{ aspectRatio: String(videoAspectRatio) }} 121 137 > 122 138 <img ··· 147 163 text = (record.value as AppBskyFeedPost.Record).text; 148 164 } 149 165 return ( 150 150 - <div 151 151 - className={`flex flex-col gap-0.5 relative w-full overflow-hidden p-2! text-xs block-border`} 166 166 + <button 167 167 + className={`bskyPostEmbed text-left w-full flex gap-2 items-start relative overflow-hidden p-2! text-xs block-border hover:border-accent-contrast! `} 168 168 + onClick={(e) => { 169 169 + e.preventDefault(); 170 170 + e.stopPropagation(); 171 171 + 172 172 + openPage(props.parent, { type: "thread", uri: record.uri }); 173 173 + }} 152 174 > 153 153 - <div className="bskyAuthor w-full flex items-center "> 154 154 - {record.author.avatar && ( 155 155 - <img 156 156 - src={record.author?.avatar} 157 157 - alt={`${record.author?.displayName}'s avatar`} 158 158 - className="shink-0 w-6 h-6 rounded-full border border-border-light mr-[6px]" 159 159 - /> 160 160 - )} 161 161 - <div className=" font-bold text-secondary mr-1"> 162 162 - {record.author?.displayName} 175 175 + <Avatar 176 176 + src={record.author?.avatar} 177 177 + displayName={record.author?.displayName} 178 178 + size="small" 179 179 + /> 180 180 + <div className="flex flex-col "> 181 181 + <div className="flex gap-1"> 182 182 + <div className=" font-bold text-secondary mr-1"> 183 183 + {record.author?.displayName} 184 184 + </div> 185 185 + <a 186 186 + className="text-xs text-tertiary hover:underline" 187 187 + target="_blank" 188 188 + href={`https://bsky.app/profile/${record.author?.handle}`} 189 189 + > 190 190 + @{record.author?.handle} 191 191 + </a> 192 192 + </div> 193 193 + <div className="flex flex-col gap-2 "> 194 194 + {text && ( 195 195 + <pre 196 196 + className={`whitespace-pre-wrap text-secondary ${props.compact ? "line-clamp-6" : ""}`} 197 197 + > 198 198 + {text} 199 199 + </pre> 200 200 + )} 201 201 + {/*{record.embeds !== undefined 202 202 + ? record.embeds.map((embed, index) => ( 203 203 + <BlueskyEmbed embed={embed} key={index} compact /> 204 204 + )) 205 205 + : null}*/} 163 206 </div> 164 164 - <a 165 165 - className="text-xs text-tertiary hover:underline" 166 166 - target="_blank" 167 167 - href={`https://bsky.app/profile/${record.author?.handle}`} 168 168 - > 169 169 - @{record.author?.handle} 170 170 - </a> 171 207 </div> 172 172 - 173 173 - <div className="flex flex-col gap-2 "> 174 174 - {text && ( 175 175 - <pre className="whitespace-pre-wrap text-secondary">{text}</pre> 176 176 - )} 177 177 - {record.embeds !== undefined 178 178 - ? record.embeds.map((embed, index) => ( 179 179 - <BlueskyEmbed embed={embed} key={index} /> 180 180 - )) 181 181 - : null} 182 182 - </div> 183 183 - </div> 208 208 + </button> 184 209 ); 185 210 } 186 211 ··· 207 232 case AppBskyEmbedRecordWithMedia.isView(props.embed) && 208 233 AppBskyEmbedRecord.isViewRecord(props.embed.record.record): 209 234 return ( 210 210 - <div className={`flex flex-col gap-2`}> 235 235 + <div className={`bskyEmbed flex flex-col gap-2`}> 211 236 <BlueskyEmbed embed={props.embed.media} /> 212 237 <BlueskyEmbed 213 238 embed={{

+1 -3

components/Blocks/BlueskyPostBlock/BlueskyEmpty.tsx

··· 18 18 let isSelected = useUIState((s) => 19 19 s.selectedBlocks.find((b) => b.value === props.entityID), 20 20 ); 21 21 - let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value; 22 21 23 22 let entity_set = useEntitySetContext(); 24 23 let [urlValue, setUrlValue] = useState(""); ··· 91 90 className="w-full grow border-none outline-hidden bg-transparent " 92 91 placeholder="bsky.app/post-url" 93 92 value={urlValue} 94 94 - disabled={isLocked} 95 93 onChange={(e) => setUrlValue(e.target.value)} 96 94 onKeyDown={(e) => { 97 95 if (e.key === "Enter") { ··· 109 107 <button 110 108 type="submit" 111 109 id="bluesky-post-block-submit" 112 112 - className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`} 110 110 + className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`} 113 111 onMouseDown={(e) => { 114 112 e.preventDefault(); 115 113 errorSmokers(e.clientX + 12, e.clientY);

+15 -65

components/Blocks/BlueskyPostBlock/index.tsx

··· 6 6 import { elementId } from "src/utils/elementId"; 7 7 import { focusBlock } from "src/utils/focusBlock"; 8 8 import { AppBskyFeedDefs, AppBskyFeedPost, RichText } from "@atproto/api"; 9 9 - import { BlueskyEmbed, PostNotAvailable } from "./BlueskyEmbed"; 9 9 + import { PostNotAvailable } from "./BlueskyEmbed"; 10 10 import { BlueskyPostEmpty } from "./BlueskyEmpty"; 11 11 - import { BlueskyRichText } from "./BlueskyRichText"; 11 11 + 12 12 import { Separator } from "components/Layout"; 13 13 import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 14 14 import { CommentTiny } from "components/Icons/CommentTiny"; 15 15 import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 16 16 + import { BskyPostContent } from "app/lish/[did]/[publication]/[rkey]/BskyPostContent"; 17 17 + import { PostView } from "@atproto/api/dist/client/types/app/bsky/feed/defs"; 16 18 17 19 export const BlueskyPostBlock = (props: BlockProps & { preview?: boolean }) => { 18 20 let { permissions } = useEntitySetContext(); ··· 76 78 77 79 //getting the url to the post 78 80 let postId = post.post.uri.split("/")[4]; 81 81 + let postView = post.post as PostView; 79 82 let url = `https://bsky.app/profile/${post.post.author.handle}/post/${postId}`; 80 83 81 84 return ( 82 85 <BlockLayout 83 86 isSelected={!!isSelected} 84 87 hasBackground="page" 85 85 - className="flex flex-col gap-2 relative overflow-hidden group/blueskyPostBlock text-sm text-secondary" 88 88 + borderOnHover 89 89 + className="blueskyPostBlock sm:px-3! sm:py-2! px-2! py-1!" 86 90 > 87 87 - {post.post.author && record && ( 88 88 - <> 89 89 - <div className="bskyAuthor w-full flex items-center gap-2"> 90 90 - {post.post.author?.avatar ? ( 91 91 - <img 92 92 - src={post.post.author?.avatar} 93 93 - alt={`${post.post.author?.displayName}'s avatar`} 94 94 - className="shrink-0 w-8 h-8 rounded-full border border-border-light" 95 95 - /> 96 96 - ) : ( 97 97 - <div className="shrink-0 w-8 h-8 rounded-full border border-border-light bg-border"></div> 98 98 - )} 99 99 - <div className="grow flex flex-col gap-0.5 leading-tight"> 100 100 - <div className=" font-bold text-secondary"> 101 101 - {post.post.author?.displayName} 102 102 - </div> 103 103 - <a 104 104 - className="text-xs text-tertiary hover:underline" 105 105 - target="_blank" 106 106 - href={`https://bsky.app/profile/${post.post.author?.handle}`} 107 107 - > 108 108 - @{post.post.author?.handle} 109 109 - </a> 110 110 - </div> 111 111 - </div> 112 112 - 113 113 - <div className="flex flex-col gap-2 "> 114 114 - <div> 115 115 - <pre className="whitespace-pre-wrap"> 116 116 - {BlueskyRichText({ 117 117 - record: record as AppBskyFeedPost.Record | null, 118 118 - })} 119 119 - </pre> 120 120 - </div> 121 121 - {post.post.embed && ( 122 122 - <BlueskyEmbed embed={post.post.embed} postUrl={url} /> 123 123 - )} 124 124 - </div> 125 125 - </> 126 126 - )} 127 127 - <div className="w-full flex gap-2 items-center justify-between"> 128 128 - {timestamp && <PostDate timestamp={timestamp} />} 129 129 - <div className="flex gap-2 items-center"> 130 130 - {post.post.replyCount != null && post.post.replyCount > 0 && ( 131 131 - <> 132 132 - <a 133 133 - className="flex items-center gap-1 hover:no-underline" 134 134 - target="_blank" 135 135 - href={url} 136 136 - > 137 137 - {post.post.replyCount} 138 138 - <CommentTiny /> 139 139 - </a> 140 140 - <Separator classname="h-4" /> 141 141 - </> 142 142 - )} 143 143 - 144 144 - <a className="" target="_blank" href={url}> 145 145 - <BlueskyTiny /> 146 146 - </a> 147 147 - </div> 148 148 - </div> 91 91 + <BskyPostContent 92 92 + post={postView} 93 93 + parent={undefined} 94 94 + showBlueskyLink={true} 95 95 + showEmbed={true} 96 96 + avatarSize="large" 97 97 + className="text-sm text-secondary " 98 98 + /> 149 99 </BlockLayout> 150 100 ); 151 101 }

+38 -15

components/Blocks/ButtonBlock.tsx

··· 24 24 let isSelected = useUIState((s) => 25 25 s.selectedBlocks.find((b) => b.value === props.entityID), 26 26 ); 27 27 + let alignment = useEntity(props.entityID, "block/text-alignment")?.data.value; 27 28 28 29 if (!url) { 29 30 if (!permissions.write) return null; ··· 31 32 } 32 33 33 34 return ( 34 34 - <a 35 35 - href={url?.data.value} 36 36 - target="_blank" 37 37 - className={`hover:outline-accent-contrast rounded-md! ${isSelected ? "block-border-selected border-0!" : "block-border border-transparent! border-0!"}`} 35 35 + <BlockLayout 36 36 + isSelected={!!isSelected} 37 37 + borderOnHover 38 38 + hasAlignment={alignment !== "justify"} 39 39 + className={`p-0! rounded-md! border-none!`} 38 40 > 39 39 - <ButtonPrimary role="link" type="submit"> 40 40 - {text?.data.value} 41 41 - </ButtonPrimary> 42 42 - </a> 41 41 + <a 42 42 + href={url?.data.value} 43 43 + target="_blank" 44 44 + className={` ${alignment === "justify" ? "w-full" : "w-fit"}`} 45 45 + > 46 46 + <ButtonPrimary 47 47 + role="link" 48 48 + type="submit" 49 49 + fullWidth={alignment === "justify"} 50 50 + > 51 51 + {text?.data.value} 52 52 + </ButtonPrimary> 53 53 + </a> 54 54 + </BlockLayout> 43 55 ); 44 56 }; 45 57 ··· 51 63 let isSelected = useUIState((s) => 52 64 s.selectedBlocks.find((b) => b.value === props.entityID), 53 65 ); 54 54 - let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value; 55 66 56 67 let [textValue, setTextValue] = useState(""); 57 68 let [urlValue, setUrlValue] = useState(""); 58 69 let text = textValue; 59 70 let url = urlValue; 71 71 + let alignment = useEntity(props.entityID, "block/text-alignment")?.data.value; 60 72 61 73 let submit = async () => { 62 74 let entity = props.entityID; ··· 106 118 }; 107 119 108 120 return ( 109 109 - <div className="buttonBlockSettingsWrapper flex flex-col gap-2 w-full "> 110 110 - <ButtonPrimary className="mx-auto"> 121 121 + <div 122 122 + className={`buttonBlockSettingsWrapper flex flex-col gap-2 w-full 123 123 + `} 124 124 + > 125 125 + <ButtonPrimary 126 126 + className={`relative ${ 127 127 + alignment === "center" 128 128 + ? "place-self-center" 129 129 + : alignment === "left" 130 130 + ? "place-self-start" 131 131 + : alignment === "right" 132 132 + ? "place-self-end" 133 133 + : "place-self-center" 134 134 + }`} 135 135 + fullWidth={alignment === "justify"} 136 136 + > 111 137 {text !== "" ? text : "Button"} 112 138 </ButtonPrimary> 113 139 <BlockLayout ··· 167 193 <Separator /> 168 194 <Input 169 195 type="text" 170 170 - autoFocus 171 196 className="w-full grow border-none outline-hidden bg-transparent" 172 197 placeholder="button text" 173 198 value={textValue} 174 174 - disabled={isLocked} 175 199 onChange={(e) => setTextValue(e.target.value)} 176 200 onKeyDown={(e) => { 177 201 if ( ··· 194 218 className="w-full grow border-none outline-hidden bg-transparent" 195 219 placeholder="www.example.com" 196 220 value={urlValue} 197 197 - disabled={isLocked} 198 221 onChange={(e) => setUrlValue(e.target.value)} 199 222 onKeyDown={(e) => { 200 223 if (e.key === "Backspace" && !e.currentTarget.value) ··· 205 228 <button 206 229 id="button-block-settings" 207 230 type="submit" 208 208 - className={`p-1 shrink-0 w-fit flex gap-2 items-center place-self-end ${isSelected && !isLocked ? "text-accent-contrast" : "text-accent-contrast sm:text-border"}`} 231 231 + className={`p-1 shrink-0 w-fit flex gap-2 items-center place-self-end ${isSelected ? "text-accent-contrast" : "text-accent-contrast sm:text-border"}`} 209 232 > 210 233 <div className="sm:hidden block">Save</div> 211 234 <CheckTiny />

+57 -76

components/Blocks/CodeBlock.tsx

··· 14 14 import { flushSync } from "react-dom"; 15 15 import { elementId } from "src/utils/elementId"; 16 16 import { LAST_USED_CODE_LANGUAGE_KEY } from "src/utils/codeLanguageStorage"; 17 17 + import { focusBlock } from "src/utils/focusBlock"; 17 18 18 19 export function CodeBlock(props: BlockProps) { 19 20 let { rep, rootEntity } = useReplicache(); ··· 42 43 }, [content, lang, theme]); 43 44 44 45 const onClick = useCallback((e: React.MouseEvent<HTMLElement>) => { 45 45 - let selection = window.getSelection(); 46 46 - if (!selection || selection.rangeCount === 0) return; 47 47 - let range = selection.getRangeAt(0); 48 48 - if (!range) return; 49 49 - let length = range.toString().length; 50 50 - range.setStart(e.currentTarget, 0); 51 51 - let end = range.toString().length; 52 52 - let start = end - length; 53 53 - 54 54 - flushSync(() => { 55 55 - useUIState.getState().setSelectedBlock(props); 56 56 - useUIState.getState().setFocusedBlock({ 57 57 - entityType: "block", 58 58 - entityID: props.value, 59 59 - parent: props.parent, 60 60 - }); 61 61 - }); 62 62 - let el = document.getElementById( 63 63 - elementId.block(props.entityID).input, 64 64 - ) as HTMLTextAreaElement; 65 65 - if (!el) return; 66 66 - el.focus(); 67 67 - el.setSelectionRange(start, end); 46 46 + focusBlock( 47 47 + { parent: props.parent, value: props.value, type: "code" }, 48 48 + { type: "end" }, 49 49 + ); 68 50 }, []); 69 51 return ( 70 52 <div className="codeBlock w-full flex flex-col rounded-md gap-0.5 "> 71 71 - {permissions.write && ( 72 72 - <div className="text-sm text-tertiary flex justify-between"> 73 73 - <div className="flex gap-1"> 74 74 - Theme:{" "} 75 75 - <select 76 76 - className="codeBlockLang text-left bg-transparent pr-1 sm:max-w-none max-w-24" 77 77 - onClick={(e) => { 78 78 - e.preventDefault(); 79 79 - e.stopPropagation(); 80 80 - }} 81 81 - value={theme} 82 82 - onChange={async (e) => { 83 83 - await rep?.mutate.assertFact({ 84 84 - attribute: "theme/code-theme", 85 85 - entity: rootEntity, 86 86 - data: { type: "string", value: e.target.value }, 87 87 - }); 88 88 - }} 89 89 - > 90 90 - {bundledThemesInfo.map((t) => ( 91 91 - <option key={t.id} value={t.id}> 92 92 - {t.displayName} 93 93 - </option> 94 94 - ))} 95 95 - </select> 96 96 - </div> 97 97 - <select 98 98 - className="codeBlockLang text-right bg-transparent pr-1 sm:max-w-none max-w-24" 99 99 - onClick={(e) => { 100 100 - e.preventDefault(); 101 101 - e.stopPropagation(); 102 102 - }} 103 103 - value={lang} 104 104 - onChange={async (e) => { 105 105 - localStorage.setItem(LAST_USED_CODE_LANGUAGE_KEY, e.target.value); 106 106 - await rep?.mutate.assertFact({ 107 107 - attribute: "block/code-language", 108 108 - entity: props.entityID, 109 109 - data: { type: "string", value: e.target.value }, 110 110 - }); 111 111 - }} 112 112 - > 113 113 - <option value="plaintext">Plaintext</option> 114 114 - {bundledLanguagesInfo.map((l) => ( 115 115 - <option key={l.id} value={l.id}> 116 116 - {l.name} 117 117 - </option> 118 118 - ))} 119 119 - </select> 120 120 - </div> 121 121 - )} 122 122 - 123 53 <BlockLayout 124 54 isSelected={focusedBlock} 125 55 hasBackground="accent" 126 56 borderOnHover 127 127 - className="p-0! min-h-[48px]" 57 57 + className="p-0! min-h-10 sm:min-h-12" 128 58 > 129 59 {focusedBlock && permissions.write ? ( 130 60 <BaseTextareaBlock ··· 171 101 /> 172 102 )} 173 103 </BlockLayout> 104 104 + {permissions.write && ( 105 105 + <div className="text-sm text-tertiary flex w-full justify-between"> 106 106 + <div className="codeBlockTheme grow flex gap-1"> 107 107 + Theme:{" "} 108 108 + <select 109 109 + className="codeBlockThemeSelect text-left bg-transparent pr-1 sm:max-w-none max-w-24 w-full" 110 110 + onClick={(e) => { 111 111 + e.preventDefault(); 112 112 + e.stopPropagation(); 113 113 + }} 114 114 + value={theme} 115 115 + onChange={async (e) => { 116 116 + await rep?.mutate.assertFact({ 117 117 + attribute: "theme/code-theme", 118 118 + entity: rootEntity, 119 119 + data: { type: "string", value: e.target.value }, 120 120 + }); 121 121 + }} 122 122 + > 123 123 + {bundledThemesInfo.map((t) => ( 124 124 + <option key={t.id} value={t.id}> 125 125 + {t.displayName} 126 126 + </option> 127 127 + ))} 128 128 + </select> 129 129 + </div> 130 130 + <select 131 131 + className="codeBlockLang grow text-right bg-transparent pr-1 sm:max-w-none max-w-24 w-full" 132 132 + onClick={(e) => { 133 133 + e.preventDefault(); 134 134 + e.stopPropagation(); 135 135 + }} 136 136 + value={lang} 137 137 + onChange={async (e) => { 138 138 + localStorage.setItem(LAST_USED_CODE_LANGUAGE_KEY, e.target.value); 139 139 + await rep?.mutate.assertFact({ 140 140 + attribute: "block/code-language", 141 141 + entity: props.entityID, 142 142 + data: { type: "string", value: e.target.value }, 143 143 + }); 144 144 + }} 145 145 + > 146 146 + <option value="plaintext">Plaintext</option> 147 147 + {bundledLanguagesInfo.map((l) => ( 148 148 + <option key={l.id} value={l.id}> 149 149 + {l.name} 150 150 + </option> 151 151 + ))} 152 152 + </select> 153 153 + </div> 154 154 + )} 174 155 </div> 175 156 ); 176 157 }

+2 -3

components/Blocks/DateTimeBlock.tsx

··· 53 53 s.selectedBlocks.find((b) => b.value === props.entityID), 54 54 ); 55 55 56 56 - let isLocked = !!useEntity(props.entityID, "block/is-locked")?.data.value; 57 56 let alignment = useEntity(props.entityID, "block/text-alignment")?.data.value; 58 57 59 58 const handleTimeChange: React.ChangeEventHandler<HTMLInputElement> = (e) => { ··· 117 116 118 117 return ( 119 118 <Popover 120 120 - disabled={isLocked || !permissions.write} 119 119 + disabled={!permissions.write} 121 120 className="w-64 z-10 px-2!" 122 121 trigger={ 123 122 <BlockLayout ··· 133 132 {dateFact ? ( 134 133 <div 135 134 className={`font-bold 136 136 - ${!permissions.write || isLocked ? "" : "group-hover/date:underline"} 135 135 + ${!permissions.write ? "" : "group-hover/date:underline"} 137 136 `} 138 137 > 139 138 {selectedDate.toLocaleDateString(undefined, {

+4 -4

components/Blocks/EmbedBlock.tsx

··· 111 111 <div 112 112 data-draggable 113 113 className={`resizeHandle 114 114 + 115 115 + 114 116 cursor-ns-resize shrink-0 z-10 w-6 h-[5px] 115 115 - absolute bottom-2 right-1/2 translate-x-1/2 translate-y-[2px] 117 117 + absolute bottom-[3px] right-1/2 translate-x-1/2 116 118 rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white] 117 119 ${isCanvasBlock ? "hidden group-hover/canvas-block:block" : ""}`} 118 120 {...heightHandle.handlers} ··· 129 131 let isSelected = useUIState((s) => 130 132 s.selectedBlocks.find((b) => b.value === props.entityID), 131 133 ); 132 132 - let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value; 133 134 134 135 let entity_set = useEntitySetContext(); 135 136 let [linkValue, setLinkValue] = useState(""); ··· 250 251 className="w-full grow border-none outline-hidden bg-transparent " 251 252 placeholder="www.example.com" 252 253 value={linkValue} 253 253 - disabled={isLocked} 254 254 onChange={(e) => setLinkValue(e.target.value)} 255 255 /> 256 256 <button 257 257 type="submit" 258 258 id="embed-block-submit" 259 259 disabled={loading} 260 260 - className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`} 260 260 + className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`} 261 261 onMouseDown={(e) => { 262 262 e.preventDefault(); 263 263 if (loading) return;

+1 -3

components/Blocks/ExternalLinkBlock.tsx

··· 118 118 let isSelected = useUIState((s) => 119 119 s.selectedBlocks.find((b) => b.value === props.entityID), 120 120 ); 121 121 - let isLocked = useEntity(props.value, "block/is-locked")?.data.value; 122 121 let entity_set = useEntitySetContext(); 123 122 let [linkValue, setLinkValue] = useState(""); 124 123 let { rep } = useReplicache(); ··· 173 172 !props.preview ? elementId.block(props.entityID).input : undefined 174 173 } 175 174 type="url" 176 176 - disabled={isLocked} 177 175 className="w-full grow border-none outline-hidden bg-transparent " 178 176 placeholder="www.example.com" 179 177 value={linkValue} ··· 199 197 <div className="flex items-center gap-3 "> 200 198 <button 201 199 autoFocus={false} 202 202 - className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`} 200 200 + className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`} 203 201 onMouseDown={(e) => { 204 202 e.preventDefault(); 205 203 if (!linkValue || linkValue === "") {

+43 -34

components/Blocks/ImageBlock.tsx

··· 19 19 import { ImageAltSmall } from "components/Icons/ImageAlt"; 20 20 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 21 21 import { useSubscribe } from "src/replicache/useSubscribe"; 22 22 - import { ImageCoverImage } from "components/Icons/ImageCoverImage"; 22 22 + import { 23 23 + ImageCoverImage, 24 24 + ImageCoverImageRemove, 25 25 + } from "components/Icons/ImageCoverImage"; 26 26 + import { 27 27 + ButtonPrimary, 28 28 + ButtonSecondary, 29 29 + ButtonTertiary, 30 30 + } from "components/Buttons"; 31 31 + import { CheckTiny } from "components/Icons/CheckTiny"; 23 32 24 33 export function ImageBlock(props: BlockProps & { preview?: boolean }) { 25 34 let { rep } = useReplicache(); ··· 28 37 let isSelected = useUIState((s) => 29 38 s.selectedBlocks.find((b) => b.value === props.value), 30 39 ); 31 31 - let isLocked = useEntity(props.value, "block/is-locked")?.data.value; 32 40 let isFullBleed = useEntity(props.value, "image/full-bleed")?.data.value; 33 41 let isFirst = props.previousBlock === null; 34 42 let isLast = props.nextBlock === null; ··· 84 92 return ( 85 93 <BlockLayout 86 94 hasBackground="accent" 87 87 - isSelected={!!isSelected && !isLocked} 95 95 + isSelected={!!isSelected} 88 96 borderOnHover 89 97 className=" group/image-block text-tertiary hover:text-accent-contrast hover:font-bold h-[104px] border-dashed rounded-lg" 90 98 > 91 99 <label 92 100 className={` 93 93 - 94 101 w-full h-full hover:cursor-pointer 95 102 flex flex-col items-center justify-center 96 96 - ${props.pageType === "canvas" && "bg-bg-page"}`} 103 103 + `} 97 104 onMouseDown={(e) => e.preventDefault()} 98 105 onDragOver={(e) => { 99 106 e.preventDefault(); ··· 102 109 onDrop={async (e) => { 103 110 e.preventDefault(); 104 111 e.stopPropagation(); 105 105 - if (isLocked) return; 106 112 const files = e.dataTransfer.files; 107 113 if (files && files.length > 0) { 108 114 const file = files[0]; ··· 119 125 Upload An Image 120 126 </div> 121 127 <input 122 122 - disabled={isLocked} 123 128 className="h-0 w-0 hidden" 124 129 type="file" 125 130 accept="image/*" ··· 134 139 ); 135 140 } 136 141 137 137 - let imageClassName = isFullBleed 138 138 - ? "" 139 139 - : isSelected 140 140 - ? "block-border-selected border-transparent! " 141 141 - : "block-border border-transparent!"; 142 142 - 143 142 let isLocalUpload = localImages.get(image.data.src); 144 143 145 144 let blockClassName = ` 146 145 relative group/image border-transparent! p-0! w-fit! 147 147 - ${isFullBleed && "-mx-3 sm:-mx-4"} 146 146 + ${isFullBleed && "-mx-[14px] sm:-mx-[18px] rounded-[0px]! sm:outline-offset-[-16px]! -outline-offset[-12px]!"} 148 147 ${isFullBleed ? (isFirst ? "-mt-3 sm:-mt-4" : prevIsFullBleed ? "-mt-1" : "") : ""} 149 148 ${isFullBleed ? (isLast ? "-mb-4" : nextIsFullBleed ? "-mb-2" : "") : ""} 150 149 `; 151 150 152 151 return ( 153 153 - <BlockLayout isSelected={!!isSelected} className={blockClassName}> 152 152 + <BlockLayout 153 153 + hasAlignment 154 154 + isSelected={!!isSelected} 155 155 + className={blockClassName} 156 156 + optionsClassName={isFullBleed ? "top-[-8px]!" : ""} 157 157 + > 154 158 {isLocalUpload || image.data.local ? ( 155 159 <img 156 160 loading="lazy" ··· 168 172 } 169 173 height={image?.data.height} 170 174 width={image?.data.width} 171 171 - className={imageClassName} 172 175 /> 173 176 )} 174 177 {altText !== undefined && !props.preview ? ( ··· 204 207 ); 205 208 206 209 // Only show if focused, in a publication, has write permissions, and no cover image is set 207 207 - if ( 208 208 - !isFocused || 209 209 - !pubData?.publications || 210 210 - !entity_set.permissions.write || 211 211 - coverImage 212 212 - ) 210 210 + if (!isFocused || !pubData?.publications || !entity_set.permissions.write) 213 211 return null; 214 214 - 215 215 - return ( 216 216 - <div className="absolute top-2 left-2"> 217 217 - <button 218 218 - className="flex items-center gap-1 text-xs bg-bg-page/80 hover:bg-bg-page text-secondary hover:text-primary px-2 py-1 rounded-md border border-border hover:border-primary transition-colors" 212 212 + if (coverImage) 213 213 + return ( 214 214 + <ButtonSecondary 215 215 + className="absolute top-2 right-2" 219 216 onClick={async (e) => { 220 217 e.preventDefault(); 221 218 e.stopPropagation(); 222 219 await rep?.mutate.updatePublicationDraft({ 223 223 - cover_image: props.entityID, 220 220 + cover_image: null, 224 221 }); 225 222 }} 226 223 > 227 227 - <span className="w-4 h-4 flex items-center justify-center"> 228 228 - <ImageCoverImage /> 229 229 - </span> 230 230 - Set as Cover 231 231 - </button> 232 232 - </div> 224 224 + Remove Cover Image 225 225 + <ImageCoverImageRemove /> 226 226 + </ButtonSecondary> 227 227 + ); 228 228 + return ( 229 229 + <ButtonPrimary 230 230 + className="absolute top-2 right-2" 231 231 + onClick={async (e) => { 232 232 + e.preventDefault(); 233 233 + e.stopPropagation(); 234 234 + await rep?.mutate.updatePublicationDraft({ 235 235 + cover_image: props.entityID, 236 236 + }); 237 237 + }} 238 238 + > 239 239 + Use as Cover Image 240 240 + <ImageCoverImage /> 241 241 + </ButtonPrimary> 233 242 ); 234 243 }; 235 244

+18 -3

components/Blocks/MailboxBlock.tsx

··· 26 26 import { ArrowDownTiny } from "components/Icons/ArrowDownTiny"; 27 27 import { InfoSmall } from "components/Icons/InfoSmall"; 28 28 29 29 - export const MailboxBlock = (props: BlockProps) => { 29 29 + export const MailboxBlock = ( 30 30 + props: BlockProps & { 31 31 + areYouSure?: boolean; 32 32 + setAreYouSure?: (value: boolean) => void; 33 33 + }, 34 34 + ) => { 30 35 let isSubscribed = useSubscriptionStatus(props.entityID); 31 36 let isSelected = useUIState((s) => 32 37 s.selectedBlocks.find((b) => b.value === props.entityID), ··· 41 46 let subscriber_count = useEntity(props.entityID, "mailbox/subscriber-count"); 42 47 if (!permission) 43 48 return ( 44 44 - <MailboxReaderView entityID={props.entityID} parent={props.parent} /> 49 49 + <MailboxReaderView 50 50 + entityID={props.entityID} 51 51 + parent={props.parent} 52 52 + /> 45 53 ); 46 54 47 55 return ( ··· 49 57 <BlockLayout 50 58 isSelected={!!isSelected} 51 59 hasBackground={"accent"} 60 60 + areYouSure={props.areYouSure} 61 61 + setAreYouSure={props.setAreYouSure} 52 62 className="flex gap-2 items-center justify-center" 53 63 > 54 64 <ButtonPrimary ··· 120 130 ); 121 131 }; 122 132 123 123 - const MailboxReaderView = (props: { entityID: string; parent: string }) => { 133 133 + const MailboxReaderView = (props: { 134 134 + entityID: string; 135 135 + parent: string; 136 136 + 137 137 + }) => { 124 138 let isSubscribed = useSubscriptionStatus(props.entityID); 125 139 let isSelected = useUIState((s) => 126 140 s.selectedBlocks.find((b) => b.value === props.entityID), ··· 133 147 <BlockLayout 134 148 isSelected={!!isSelected} 135 149 hasBackground={"accent"} 150 150 + 136 151 className="`h-full flex flex-col gap-2 items-center justify-center" 137 152 > 138 153 {!isSubscribed?.confirmed ? (

+9 -1

components/Blocks/PageLinkBlock.tsx

··· 13 13 import { CardThemeProvider } from "components/ThemeManager/ThemeProvider"; 14 14 import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 15 15 16 16 - export function PageLinkBlock(props: BlockProps & { preview?: boolean }) { 16 16 + export function PageLinkBlock( 17 17 + props: BlockProps & { 18 18 + preview?: boolean; 19 19 + areYouSure?: boolean; 20 20 + setAreYouSure?: (value: boolean) => void; 21 21 + }, 22 22 + ) { 17 23 let page = useEntity(props.entityID, "block/card"); 18 24 let type = 19 25 useEntity(page?.data.value || null, "page/type")?.data.value || "doc"; ··· 32 38 <BlockLayout 33 39 hasBackground="page" 34 40 isSelected={!!isSelected} 41 41 + areYouSure={props.areYouSure} 42 42 + setAreYouSure={props.setAreYouSure} 35 43 className={`cursor-pointer 36 44 pageLinkBlockWrapper relative group/pageLinkBlock 37 45 flex overflow-clip p-0!

+14 -2

components/Blocks/PollBlock/index.tsx

··· 20 20 import { PublicationPollBlock } from "../PublicationPollBlock"; 21 21 import { usePollBlockUIState } from "./pollBlockState"; 22 22 23 23 - export const PollBlock = (props: BlockProps) => { 23 23 + export const PollBlock = ( 24 24 + props: BlockProps & { 25 25 + areYouSure?: boolean; 26 26 + setAreYouSure?: (value: boolean) => void; 27 27 + }, 28 28 + ) => { 24 29 let { data: pub } = useLeafletPublicationData(); 25 30 if (!pub) return <LeafletPollBlock {...props} />; 26 31 return <PublicationPollBlock {...props} />; 27 32 }; 28 33 29 29 - export const LeafletPollBlock = (props: BlockProps) => { 34 34 + export const LeafletPollBlock = ( 35 35 + props: BlockProps & { 36 36 + areYouSure?: boolean; 37 37 + setAreYouSure?: (value: boolean) => void; 38 38 + }, 39 39 + ) => { 30 40 let isSelected = useUIState((s) => 31 41 s.selectedBlocks.find((b) => b.value === props.entityID), 32 42 ); ··· 64 74 <BlockLayout 65 75 isSelected={!!isSelected} 66 76 hasBackground={"accent"} 77 77 + areYouSure={props.areYouSure} 78 78 + setAreYouSure={props.setAreYouSure} 67 79 className="poll flex flex-col gap-2 w-full" 68 80 > 69 81 {pollState === "editing" ? (

+10 -2

components/Blocks/PublicationPollBlock.tsx

··· 21 21 * It allows adding/editing options when the poll hasn't been published yet, 22 22 * but disables adding new options once the poll record exists (indicated by pollUri). 23 23 */ 24 24 - export const PublicationPollBlock = (props: BlockProps) => { 25 25 - let { data: publicationData, normalizedDocument } = useLeafletPublicationData(); 24 24 + export const PublicationPollBlock = ( 25 25 + props: BlockProps & { 26 26 + areYouSure?: boolean; 27 27 + setAreYouSure?: (value: boolean) => void; 28 28 + }, 29 29 + ) => { 30 30 + let { data: publicationData, normalizedDocument } = 31 31 + useLeafletPublicationData(); 26 32 let isSelected = useUIState((s) => 27 33 s.selectedBlocks.find((b) => b.value === props.entityID), 28 34 ); ··· 57 63 className="poll flex flex-col gap-2" 58 64 hasBackground={"accent"} 59 65 isSelected={!!isSelected} 66 66 + areYouSure={props.areYouSure} 67 67 + setAreYouSure={props.setAreYouSure} 60 68 > 61 69 <EditPollForPublication 62 70 entityID={props.entityID}

+8 -1

components/Blocks/RSVPBlock/index.tsx

··· 24 24 } 25 25 | { state: "contact_details"; status: RSVP_Status }; 26 26 27 27 - export function RSVPBlock(props: BlockProps) { 27 27 + export function RSVPBlock( 28 28 + props: BlockProps & { 29 29 + areYouSure?: boolean; 30 30 + setAreYouSure?: (value: boolean) => void; 31 31 + }, 32 32 + ) { 28 33 let isSelected = useUIState((s) => 29 34 s.selectedBlocks.find((b) => b.value === props.entityID), 30 35 ); ··· 32 37 <BlockLayout 33 38 isSelected={!!isSelected} 34 39 hasBackground={"accent"} 40 40 + areYouSure={props.areYouSure} 41 41 + setAreYouSure={props.setAreYouSure} 35 42 className="rsvp relative flex flex-col gap-1 w-full rounded-lg place-items-center justify-center" 36 43 > 37 44 <RSVPForm entityID={props.entityID} />

+5 -11

components/Blocks/TextBlock/index.tsx

··· 30 30 import { addMentionToEditor } from "app/[leaflet_id]/publish/BskyPostEditorProsemirror"; 31 31 32 32 const HeadingStyle = { 33 33 - 1: "text-xl font-bold [font-family:var(--theme-heading-font)]", 34 34 - 2: "text-lg font-bold [font-family:var(--theme-heading-font)]", 35 35 - 3: "text-base font-bold text-secondary [font-family:var(--theme-heading-font)]", 33 33 + 1: "text-xl font-bold", 34 34 + 2: "text-lg font-bold", 35 35 + 3: "text-base font-bold text-secondary ", 36 36 } as { [level: number]: string }; 37 37 38 38 export function TextBlock( ··· 41 41 preview?: boolean; 42 42 }, 43 43 ) { 44 44 - let isLocked = useEntity(props.entityID, "block/is-locked"); 45 44 let initialized = useHasPageLoaded(); 46 45 let first = props.previousBlock === null; 47 46 let permission = useEntitySetContext().permissions.write; 48 47 49 48 return ( 50 49 <> 51 51 - {(!initialized || 52 52 - !permission || 53 53 - props.preview || 54 54 - isLocked?.data.value) && ( 50 50 + {(!initialized || !permission || props.preview) && ( 55 51 <RenderedTextBlock 56 52 type={props.type} 57 53 entityID={props.entityID} ··· 61 57 previousBlock={props.previousBlock} 62 58 /> 63 59 )} 64 64 - {permission && !props.preview && !isLocked?.data.value && ( 60 60 + {permission && !props.preview && ( 65 61 <div 66 62 className={`w-full relative group ${!initialized ? "hidden" : ""}`} 67 63 > ··· 330 326 let { editorState } = props; 331 327 let rep = useReplicache(); 332 328 let smoker = useSmoker(); 333 333 - let isLocked = useEntity(props.entityID, "block/is-locked"); 334 329 let focused = useUIState((s) => s.focusedEntity?.entityID === props.entityID); 335 330 336 331 let isBlueskyPost = ··· 340 335 // if its bluesky, change text to embed post 341 336 342 337 if ( 343 343 - !isLocked && 344 338 focused && 345 339 editorState && 346 340 betterIsUrl(editorState.doc.textContent) &&

+1 -3

components/Blocks/index.tsx

··· 181 181 : null, 182 182 ); 183 183 184 184 - let isLocked = useEntity(props.lastBlock?.value || null, "block/is-locked"); 185 184 if (!entity_set.permissions.write) return null; 186 185 if ( 187 187 - ((props.lastBlock?.type === "text" && !isLocked?.data.value) || 188 188 - props.lastBlock?.type === "heading") && 186 186 + (props.lastBlock?.type === "text" || props.lastBlock?.type === "heading") && 189 187 (!editorState?.editor || editorState.editor.doc.content.size <= 2) 190 188 ) 191 189 return null;

+5 -15

components/Blocks/useBlockKeyboardHandlers.ts

··· 23 23 ) { 24 24 let { rep, undoManager } = useReplicache(); 25 25 let entity_set = useEntitySetContext(); 26 26 - let isLocked = !!useEntity(props.entityID, "block/is-locked")?.data.value; 27 26 28 27 let isSelected = useUIState((s) => { 29 28 let selectedBlocks = s.selectedBlocks; ··· 70 69 entity_set, 71 70 areYouSure, 72 71 setAreYouSure, 73 73 - isLocked, 74 72 }); 75 73 undoManager.endGroup(); 76 74 }; 77 75 window.addEventListener("keydown", listener); 78 76 return () => window.removeEventListener("keydown", listener); 79 79 - }, [entity_set, isSelected, props, rep, areYouSure, setAreYouSure, isLocked]); 77 77 + }, [entity_set, isSelected, props, rep, areYouSure, setAreYouSure]); 80 78 } 81 79 82 80 type Args = { 83 81 e: KeyboardEvent; 84 84 - isLocked: boolean; 85 82 props: BlockProps; 86 83 rep: Replicache<ReplicacheMutators>; 87 84 entity_set: { set: string }; ··· 133 130 } 134 131 135 132 let debounced: null | number = null; 136 136 - async function Backspace({ 137 137 - e, 138 138 - props, 139 139 - rep, 140 140 - areYouSure, 141 141 - setAreYouSure, 142 142 - isLocked, 143 143 - }: Args) { 133 133 + async function Backspace({ e, props, rep, areYouSure, setAreYouSure }: Args) { 144 134 // if this is a textBlock, let the textBlock/keymap handle the backspace 145 145 - if (isLocked) return; 146 135 // if its an input, label, or teatarea with content, do nothing (do the broswer default instead) 147 136 let el = e.target as HTMLElement; 148 137 if ( ··· 154 143 if ((el as HTMLInputElement).value !== "") return; 155 144 } 156 145 157 157 - // if the block is a card or mailbox... 146 146 + // if the block is a card, mailbox, rsvp, or poll... 158 147 if ( 159 148 props.type === "card" || 160 149 props.type === "mailbox" || 161 161 - props.type === "rsvp" 150 150 + props.type === "rsvp" || 151 151 + props.type === "poll" 162 152 ) { 163 153 // ...and areYouSure state is false, set it to true 164 154 if (!areYouSure) {

+21 -3

components/Blocks/useBlockMouseHandlers.ts

··· 1 1 import { useSelectingMouse } from "components/SelectionManager/selectionState"; 2 2 - import { MouseEvent, useCallback, useRef } from "react"; 2 2 + import { MouseEvent, useCallback } from "react"; 3 3 import { useUIState } from "src/useUIState"; 4 4 import { Block } from "./Block"; 5 5 import { isTextBlock } from "src/utils/isTextBlock"; ··· 12 12 import { elementId } from "src/utils/elementId"; 13 13 14 14 let debounce: number | null = null; 15 15 + 16 16 + // Track scrolling state for mobile 17 17 + let isScrolling = false; 18 18 + let scrollTimeout: number | null = null; 19 19 + 20 20 + if (typeof window !== "undefined") { 21 21 + window.addEventListener( 22 22 + "scroll", 23 23 + () => { 24 24 + isScrolling = true; 25 25 + if (scrollTimeout) window.clearTimeout(scrollTimeout); 26 26 + scrollTimeout = window.setTimeout(() => { 27 27 + isScrolling = false; 28 28 + }, 150); 29 29 + }, 30 30 + true, 31 31 + ); 32 32 + } 15 33 export function useBlockMouseHandlers(props: Block) { 16 34 let entity_set = useEntitySetContext(); 17 35 let isMobile = useIsMobile(); ··· 22 40 if ((e.target as Element).tagName === "BUTTON") return; 23 41 if ((e.target as Element).tagName === "SELECT") return; 24 42 if ((e.target as Element).tagName === "OPTION") return; 25 25 - if (isMobile) return; 43 43 + if (isMobile && isScrolling) return; 26 44 if (!entity_set.permissions.write) return; 27 45 useSelectingMouse.setState({ start: props.value }); 28 46 if (e.shiftKey) { ··· 57 75 ); 58 76 let onMouseEnter = useCallback( 59 77 async (e: MouseEvent) => { 60 60 - if (isMobile) return; 78 78 + if (isMobile && isScrolling) return; 61 79 if (!entity_set.permissions.write) return; 62 80 if (debounce) window.clearTimeout(debounce); 63 81 debounce = window.setTimeout(async () => {

+47 -34

components/Canvas.tsx

··· 22 22 import { PublicationMetadata } from "./Pages/PublicationMetadata"; 23 23 import { useLeafletPublicationData } from "./PageSWRDataProvider"; 24 24 import { useHandleCanvasDrop } from "./Blocks/useHandleCanvasDrop"; 25 25 + import { useBlockMouseHandlers } from "./Blocks/useBlockMouseHandlers"; 25 26 26 27 export function Canvas(props: { 27 28 entityID: string; ··· 286 287 }, 287 288 [props, rep, permissions], 288 289 ); 289 289 - let { dragDelta, handlers } = useDrag({ 290 290 + let { dragDelta, handlers: dragHandlers } = useDrag({ 290 291 onDragEnd, 291 291 - delay: isMobile, 292 292 }); 293 293 294 294 let widthOnDragEnd = useCallback( ··· 335 335 ); 336 336 let rotateHandle = useDrag({ onDragEnd: RotateOnDragEnd }); 337 337 338 338 - let { isLongPress, handlers: longPressHandlers } = useLongPress(() => { 339 339 - if (isLongPress.current && permissions.write) { 340 340 - focusBlock( 341 341 - { 342 342 - type: type?.data.value || "text", 343 343 - value: props.entityID, 344 344 - parent: props.parent, 345 345 - }, 346 346 - { type: "start" }, 347 347 - ); 348 348 - } 349 349 - }); 338 338 + let { isLongPress, longPressHandlers: longPressHandlers } = useLongPress( 339 339 + () => { 340 340 + if (isLongPress.current && permissions.write) { 341 341 + focusBlock( 342 342 + { 343 343 + type: type?.data.value || "text", 344 344 + value: props.entityID, 345 345 + parent: props.parent, 346 346 + }, 347 347 + { type: "start" }, 348 348 + ); 349 349 + } 350 350 + }, 351 351 + ); 350 352 let angle = 0; 351 353 if (rotateHandle.dragDelta) { 352 354 let originX = rect.x + rect.width / 2; ··· 383 385 }; 384 386 }, [props, type?.data.value]); 385 387 useBlockKeyboardHandlers(blockProps, areYouSure, setAreYouSure); 388 388 + let mouseHandlers = useBlockMouseHandlers(blockProps); 389 389 + 386 390 let isList = useEntity(props.entityID, "block/is-list"); 387 391 let isFocused = useUIState( 388 392 (s) => s.focusedEntity?.entityID === props.entityID, ··· 391 395 return ( 392 396 <div 393 397 ref={ref} 394 394 - {...(!props.preview ? { ...longPressHandlers } : {})} 395 395 - {...(isMobile && permissions.write ? { ...handlers } : {})} 398 398 + {...(!props.preview ? { ...longPressHandlers, ...mouseHandlers } : {})} 396 399 id={props.preview ? undefined : elementId.block(props.entityID).container} 397 397 - className={`absolute group/canvas-block will-change-transform rounded-lg flex items-stretch origin-center p-3 `} 400 400 + className={`canvasBlockWrapper absolute group/canvas-block will-change-transform rounded-lg flex items-stretch origin-center p-3 `} 398 401 style={{ 399 402 top: 0, 400 403 left: 0, ··· 403 406 transform, 404 407 }} 405 408 > 406 406 - {/* the gripper show on hover, but longpress logic needs to be added for mobile*/} 407 407 - {!props.preview && permissions.write && <Gripper {...handlers} />} 409 409 + {!props.preview && permissions.write && ( 410 410 + <Gripper isFocused={isFocused} {...dragHandlers} /> 411 411 + )} 412 412 + 408 413 <div 409 409 - className={`contents ${dragDelta || widthHandle.dragDelta || rotateHandle.dragDelta ? "pointer-events-none" : ""} `} 414 414 + className={` w-full ${dragDelta || widthHandle.dragDelta || rotateHandle.dragDelta ? "pointer-events-none" : ""} `} 410 415 > 411 416 <BaseBlock 412 417 {...blockProps} ··· 424 429 <div 425 430 className={`resizeHandle 426 431 cursor-e-resize shrink-0 z-10 427 427 - hidden group-hover/canvas-block:block 428 428 - w-[5px] h-6 -ml-[3px] 429 429 - absolute top-1/2 right-3 -translate-y-1/2 translate-x-[2px] 430 430 - rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white]`} 432 432 + group-hover/canvas-block:block 433 433 + sm:w-[5px] w-3 sm:h-6 h-8 434 434 + absolute top-1/2 sm:right-2 right-1 -translate-y-1/2 435 435 + rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white] 436 436 + ${isFocused ? "block" : "hidden"} 437 437 + 438 438 + `} 431 439 {...widthHandle.handlers} 432 440 /> 433 441 )} ··· 436 444 <div 437 445 className={`rotateHandle 438 446 cursor-grab shrink-0 z-10 439 439 - hidden group-hover/canvas-block:block 440 440 - w-[8px] h-[8px] 441 441 - absolute bottom-0 -right-0 447 447 + group-hover/canvas-block:block 448 448 + sm:w-[8px] sm:h-[8px] w-4 h-4 449 449 + absolute sm:bottom-0 sm:right-0 -bottom-1 -right-1 442 450 -translate-y-1/2 -translate-x-1/2 443 443 - rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white]`} 451 451 + rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white] 452 452 + ${isFocused ? "block" : "hidden"} 453 453 + `} 444 454 {...rotateHandle.handlers} 445 455 /> 446 456 )} ··· 561 571 } 562 572 }; 563 573 564 564 - const Gripper = (props: { onMouseDown: (e: React.MouseEvent) => void }) => { 574 574 + const Gripper = (props: { 575 575 + onMouseDown: (e: React.MouseEvent) => void; 576 576 + isFocused: boolean; 577 577 + }) => { 565 578 return ( 566 579 <div 567 580 onMouseDown={props.onMouseDown} 568 581 onPointerDown={props.onMouseDown} 569 569 - className="w-[9px] shrink-0 py-1 mr-1 bg-bg-card cursor-grab touch-none" 582 582 + className="gripper w-[9px] shrink-0 py-1 mr-1 cursor-grab touch-none" 570 583 > 571 571 - <Media mobile={false} className="h-full grid grid-cols-1 grid-rows-1 "> 584 584 + <div className="h-full grid grid-cols-1 grid-rows-1 "> 572 585 {/* the gripper is two svg's stacked on top of each other. 573 586 One for the actual gripper, the other is an outline to endure the gripper stays visible on image backgrounds */} 574 587 <div 575 575 - className="h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-bg-page hidden group-hover/canvas-block:block" 588 588 + className={`h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-bg-page group-hover/canvas-block:block ${props.isFocused ? "block" : "hidden"}`} 576 589 style={{ maskImage: "var(--gripperSVG2)", maskRepeat: "repeat" }} 577 590 /> 578 591 <div 579 579 - className="h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-tertiary hidden group-hover/canvas-block:block" 592 592 + className={`h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-tertiary group-hover/canvas-block:block ${props.isFocused ? "block" : "hidden"}`} 580 593 style={{ maskImage: "var(--gripperSVG)", maskRepeat: "repeat" }} 581 594 /> 582 582 - </Media> 595 595 + </div> 583 596 </div> 584 597 ); 585 598 };

+7

components/DesktopFooter.tsx

··· 4 4 import { Toolbar } from "./Toolbar"; 5 5 import { useEntitySetContext } from "./EntitySetProvider"; 6 6 import { focusBlock } from "src/utils/focusBlock"; 7 7 + import { hasBlockToolbar } from "app/[leaflet_id]/Footer"; 8 8 + import { useEntity } from "src/replicache"; 7 9 8 10 export function DesktopPageFooter(props: { pageID: string }) { 9 11 let focusedEntity = useUIState((s) => s.focusedEntity); ··· 13 15 : focusedEntity?.parent; 14 16 let entity_set = useEntitySetContext(); 15 17 18 18 + let blockType = useEntity(focusedEntity?.entityID || null, "block/type")?.data 19 19 + .value; 20 20 + 16 21 return ( 17 22 <Media 18 23 mobile={false} ··· 20 25 > 21 26 {focusedEntity && 22 27 focusedEntity.entityType === "block" && 28 28 + hasBlockToolbar(blockType) && 23 29 entity_set.permissions.write && 24 30 focusedBlockParentID === props.pageID && ( 25 31 <div ··· 29 35 }} 30 36 > 31 37 <Toolbar 38 38 + blockType={blockType} 32 39 pageID={focusedBlockParentID} 33 40 blockID={focusedEntity.entityID} 34 41 />

-120

components/FontLoader.tsx

··· 1 1 - // Server-side font loading component 2 2 - // Following Google's best practices: https://web.dev/articles/font-best-practices 3 3 - // - Preconnect to font origins for early connection 4 4 - // - Use font-display: swap (shows fallback immediately, swaps when ready) 5 5 - // - Don't block rendering - some FOUT is acceptable and better UX than invisible text 6 6 - 7 7 - import { 8 8 - getFontConfig, 9 9 - generateFontFaceCSS, 10 10 - getFontPreloadLinks, 11 11 - getGoogleFontsUrl, 12 12 - getFontFamilyValue, 13 13 - } from "src/fonts"; 14 14 - 15 15 - type FontLoaderProps = { 16 16 - headingFontId: string | undefined; 17 17 - bodyFontId: string | undefined; 18 18 - }; 19 19 - 20 20 - export function FontLoader({ headingFontId, bodyFontId }: FontLoaderProps) { 21 21 - const headingFont = getFontConfig(headingFontId); 22 22 - const bodyFont = getFontConfig(bodyFontId); 23 23 - 24 24 - // Collect all unique fonts to load 25 25 - const fontsToLoad = headingFont.id === bodyFont.id 26 26 - ? [headingFont] 27 27 - : [headingFont, bodyFont]; 28 28 - 29 29 - // Collect preload links (deduplicated) 30 30 - const preloadLinksSet = new Set<string>(); 31 31 - const preloadLinks: { href: string; type: string }[] = []; 32 32 - for (const font of fontsToLoad) { 33 33 - for (const link of getFontPreloadLinks(font)) { 34 34 - if (!preloadLinksSet.has(link.href)) { 35 35 - preloadLinksSet.add(link.href); 36 36 - preloadLinks.push(link); 37 37 - } 38 38 - } 39 39 - } 40 40 - 41 41 - // Collect font-face CSS 42 42 - const fontFaceCSS = fontsToLoad 43 43 - .map((font) => generateFontFaceCSS(font)) 44 44 - .filter(Boolean) 45 45 - .join("\n\n"); 46 46 - 47 47 - // Collect Google Fonts URLs (deduplicated) 48 48 - const googleFontsUrls = [...new Set( 49 49 - fontsToLoad 50 50 - .map((font) => getGoogleFontsUrl(font)) 51 51 - .filter((url): url is string => url !== null) 52 52 - )]; 53 53 - 54 54 - const headingFontValue = getFontFamilyValue(headingFont); 55 55 - const bodyFontValue = getFontFamilyValue(bodyFont); 56 56 - 57 57 - // Generate CSS that sets the font family via CSS variables 58 58 - // --theme-font is used for body text (keeps backwards compatibility) 59 59 - // --theme-heading-font is used for headings 60 60 - const fontVariableCSS = ` 61 61 - :root { 62 62 - --theme-heading-font: ${headingFontValue}; 63 63 - --theme-font: ${bodyFontValue}; 64 64 - } 65 65 - `.trim(); 66 66 - 67 67 - return ( 68 68 - <> 69 69 - {/* 70 70 - Google Fonts best practice: preconnect to both origins 71 71 - - fonts.googleapis.com serves the CSS 72 72 - - fonts.gstatic.com serves the font files (needs crossorigin for CORS) 73 73 - Place these as early as possible in <head> 74 74 - */} 75 75 - {googleFontsUrls.length > 0 && ( 76 76 - <> 77 77 - <link rel="preconnect" href="https://fonts.googleapis.com" /> 78 78 - <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" /> 79 79 - {googleFontsUrls.map((url) => ( 80 80 - <link key={url} rel="stylesheet" href={url} /> 81 81 - ))} 82 82 - </> 83 83 - )} 84 84 - {/* Preload local font files for early discovery */} 85 85 - {preloadLinks.map((link) => ( 86 86 - <link 87 87 - key={link.href} 88 88 - rel="preload" 89 89 - href={link.href} 90 90 - as="font" 91 91 - type={link.type} 92 92 - crossOrigin="anonymous" 93 93 - /> 94 94 - ))} 95 95 - {/* @font-face declarations (for local fonts) and CSS variable */} 96 96 - <style 97 97 - dangerouslySetInnerHTML={{ 98 98 - __html: `${fontFaceCSS}\n\n${fontVariableCSS}`, 99 99 - }} 100 100 - /> 101 101 - </> 102 102 - ); 103 103 - } 104 104 - 105 105 - // Helper to extract fonts from facts array (for server-side use) 106 106 - export function extractFontsFromFacts( 107 107 - facts: Array<{ entity: string; attribute: string; data: { value: string } }>, 108 108 - rootEntity: string 109 109 - ): { headingFontId: string | undefined; bodyFontId: string | undefined } { 110 110 - const headingFontFact = facts.find( 111 111 - (f) => f.entity === rootEntity && f.attribute === "theme/heading-font" 112 112 - ); 113 113 - const bodyFontFact = facts.find( 114 114 - (f) => f.entity === rootEntity && f.attribute === "theme/body-font" 115 115 - ); 116 116 - return { 117 117 - headingFontId: headingFontFact?.data?.value, 118 118 - bodyFontId: bodyFontFact?.data?.value, 119 119 - }; 120 120 - }

+19

components/Icons/DeleteTiny.tsx

··· 1 1 + import { Props } from "./Props"; 2 2 + 3 3 + export const DeleteTiny = (props: Props) => { 4 4 + return ( 5 5 + <svg 6 6 + width="16" 7 7 + height="16" 8 8 + viewBox="0 0 16 16" 9 9 + fill="none" 10 10 + xmlns="http://www.w3.org/2000/svg" 11 11 + {...props} 12 12 + > 13 13 + <path 14 14 + d="M4.84013 0.946324C5.45222 0.762486 6.19573 0.729124 6.97782 0.820347C7.32039 0.860495 7.56546 1.1711 7.52568 1.51371C7.48568 1.85656 7.17517 2.10252 6.83232 2.06253C6.16005 1.98415 5.5998 2.02378 5.20048 2.14359C4.79524 2.26531 4.64378 2.43772 4.59599 2.56351C4.34149 3.23723 5.58865 4.19255 6.08232 4.51761C6.54562 4.82266 7.09489 5.10483 7.70536 5.33597C8.80491 5.75229 9.85164 5.90795 10.6409 5.84769C11.4848 5.78311 11.8008 5.50429 11.8714 5.31839C11.9189 5.19263 11.9202 4.96386 11.6976 4.60453C11.478 4.25029 11.0842 3.84861 10.5286 3.46195C10.2455 3.26479 10.1754 2.87508 10.3724 2.59183C10.5696 2.30876 10.9592 2.23946 11.2425 2.43656C11.8885 2.88612 12.4235 3.40237 12.7601 3.94535C13.0932 4.48275 13.2786 5.13116 13.0403 5.76078C12.9083 6.10935 12.6779 6.37566 12.3909 6.57621C12.366 6.82447 12.311 7.37448 12.2425 8.01957C12.1491 8.89816 12.0306 9.96291 11.9329 10.6856C11.809 11.602 11.638 12.5144 11.4153 13.4121C11.237 14.0305 10.6957 14.4725 10.0989 14.75C9.43935 15.0567 8.58506 15.2285 7.63212 15.2285C5.83513 15.2285 4.30017 14.7464 3.83818 13.3604C3.76287 13.0881 3.70695 12.8096 3.6497 12.5332C3.55128 12.058 3.42826 11.4025 3.33134 10.6856C3.23301 9.95806 3.11264 8.74578 3.01689 7.72562C2.96878 7.21315 2.92679 6.74483 2.89677 6.40531C2.87398 6.14754 2.83052 5.88349 2.86454 5.62503C2.95213 4.95974 3.29709 4.69093 3.98271 4.32035C3.46821 3.68093 3.13499 2.89278 3.42704 2.12113C3.66559 1.49131 4.23434 1.12831 4.84013 0.946324ZM4.26103 7.60843C4.35712 8.63219 4.47618 9.82018 4.5706 10.5186C4.66257 11.1989 4.7799 11.8245 4.87431 12.2803C4.92135 12.5074 4.9622 12.6916 4.9915 12.8184C5.24073 13.8967 6.74216 13.9785 7.63212 13.9785C8.44689 13.9785 9.11364 13.8297 9.57255 13.6162C9.98848 13.4227 10.1815 13.2132 10.2727 12.8184C10.3608 12.4373 10.5558 11.538 10.6936 10.5186C10.7887 9.81541 10.9059 8.76587 10.9993 7.88675C11.027 7.62595 11.0512 7.38071 11.0735 7.16507C10.278 7.59273 9.18805 7.88086 7.96318 7.88089C7.26324 7.88089 6.60019 7.80834 6.0081 7.67875C5.37465 7.54007 4.79262 7.29359 4.20732 7.02347C4.22408 7.20782 4.24189 7.4046 4.26103 7.60843ZM5.65849 9.89847C5.93369 9.87744 6.17434 10.0843 6.1956 10.3594C6.21921 10.6683 6.24342 10.9585 6.26396 11.1602C6.29655 11.4801 6.34417 11.7883 6.38407 12.0176C6.40539 12.1401 6.4278 12.2622 6.45341 12.3838C6.51991 12.6498 6.33262 12.9262 6.06962 12.9825C5.79972 13.0399 5.55695 12.8734 5.47587 12.5977C5.43009 12.442 5.42115 12.3183 5.39872 12.1895C5.3563 11.9458 5.30461 11.6127 5.26884 11.2618C5.24694 11.0467 5.22223 10.7457 5.19853 10.4356C5.17773 10.1606 5.38354 9.91976 5.65849 9.89847ZM5.59208 8.40238C6.25224 8.40238 6.25244 9.45121 5.59208 9.45121C4.93177 9.4506 4.93197 8.40299 5.59208 8.40238ZM9.06767 1.26566C9.29634 1.00742 9.69106 0.983602 9.9495 1.21195C10.2079 1.44072 10.2319 1.83535 10.0032 2.09378L9.137 3.07132L8.9622 3.54496C8.84186 3.86848 8.48103 4.03346 8.15751 3.91312C7.83456 3.79265 7.67047 3.43357 7.79032 3.11039L8.00614 2.52738C8.03292 2.45553 8.07353 2.38952 8.12431 2.33207L9.06767 1.26566Z" 15 15 + fill="currentColor" 16 16 + /> 17 17 + </svg> 18 18 + ); 19 19 + };

+20

components/Icons/ImageCoverImage.tsx

··· 1 1 + import { Props } from "./Props"; 2 2 + 1 3 export const ImageCoverImage = () => ( 2 4 <svg 3 5 width="24" ··· 12 14 /> 13 15 </svg> 14 16 ); 17 17 + 18 18 + export const ImageCoverImageRemove = (props: Props) => { 19 19 + return ( 20 20 + <svg 21 21 + width="24" 22 22 + height="24" 23 23 + viewBox="0 0 24 24" 24 24 + fill="none" 25 25 + xmlns="http://www.w3.org/2000/svg" 26 26 + {...props} 27 27 + > 28 28 + <path 29 29 + d="M21.7744 1.48538C22.0673 1.19249 22.542 1.19259 22.835 1.48538C23.1279 1.77824 23.1278 2.253 22.835 2.54592L2.22461 23.1602C1.93172 23.4526 1.45683 23.4528 1.16406 23.1602C0.871349 22.8674 0.871599 22.3926 1.16406 22.0996L21.7744 1.48538ZM22.9229 4.22561C23.1551 4.66244 23.2881 5.16029 23.2881 5.68948V18.3106C23.2879 20.0361 21.8886 21.4362 20.1631 21.4365H5.71582L6.96582 20.1865H20.1631C21.1982 20.1862 22.0379 19.3457 22.0381 18.3106V15.8067H11.3447L12.5947 14.5567H22.0381V10.1299L21.1738 9.42385L19.9775 10.9678C19.5515 11.5167 18.8233 11.7335 18.166 11.5078L16.3213 10.875C16.3092 10.8709 16.2965 10.8691 16.2842 10.8662L17.2705 9.87893L18.5723 10.3262C18.7238 10.378 18.892 10.3278 18.9902 10.2012L20.2061 8.63284L19.2764 7.87307L20.1641 6.9844L22.0381 8.51565V5.68948C22.0381 5.51371 22.0121 5.34397 21.9668 5.18264L22.9229 4.22561ZM17.6797 3.81448H3.83789C2.80236 3.81448 1.96289 4.65394 1.96289 5.68948V11.4805L4.8291 8.91897C5.18774 8.59894 5.70727 8.54438 6.12207 8.77346L6.20312 8.82327L10.083 11.4112L9.18164 12.3125L8.81055 12.0655L8.03027 12.8692C7.55062 13.3622 6.78587 13.438 6.21875 13.0489C6.17034 13.0156 6.10737 13.0113 6.05469 13.0371L4.79883 13.6573C4.258 13.9241 3.61319 13.8697 3.125 13.5157L2.26172 12.8887L1.96289 13.1573V14.5567H6.93945L5.68945 15.8067H1.96289V18.3115C1.96305 18.6614 2.06054 18.9882 2.22754 19.2686L1.32812 20.168C0.943293 19.6486 0.713079 19.0075 0.712891 18.3115V5.68948C0.712891 3.96359 2.112 2.56448 3.83789 2.56448H18.9287L17.6797 3.81448ZM14.4883 17.2578C14.9025 17.2578 15.2382 17.5937 15.2383 18.0078C15.2382 18.422 14.9025 18.7578 14.4883 18.7578H8.39453L9.89453 17.2578H14.4883ZM3.14941 18.3467C3.09734 18.2446 3.06545 18.1302 3.06543 18.0078C3.0655 17.5938 3.40144 17.2581 3.81543 17.2578H4.23828L3.14941 18.3467ZM4.71094 10.7012L4.70996 10.7002L3.21484 12.0362L3.85938 12.5039C3.97197 12.5854 4.12047 12.5976 4.24512 12.5362L5.50098 11.917C5.95928 11.6909 6.5044 11.7294 6.92578 12.0186C6.99104 12.0633 7.07958 12.0547 7.13477 11.9981L7.75488 11.3604L5.58984 9.91506L4.71094 10.7012ZM8.94629 4.52249C9.92559 4.52266 10.7195 5.31662 10.7197 6.29592C10.7197 7.27533 9.92567 8.06919 8.94629 8.06936C7.96687 8.06924 7.17292 7.27536 7.17285 6.29592C7.17304 5.31659 7.96694 4.52261 8.94629 4.52249ZM8.94629 5.52249C8.51923 5.52261 8.17304 5.86888 8.17285 6.29592C8.17292 6.72307 8.51915 7.06924 8.94629 7.06936C9.37338 7.06919 9.71966 6.72304 9.71973 6.29592C9.71954 5.86891 9.37331 5.52266 8.94629 5.52249Z" 30 30 + fill="currentColor" 31 31 + /> 32 32 + </svg> 33 33 + ); 34 34 + };

+2 -1

components/Pages/Page.tsx

··· 80 80 onClickAction?: (e: React.MouseEvent) => void; 81 81 pageType: "canvas" | "doc"; 82 82 drawerOpen: boolean | undefined; 83 83 + fixedWidth?: boolean; 83 84 }) => { 84 85 const cardBorderHidden = useCardBorderHidden(); 85 86 let { ref } = usePreserveScroll<HTMLDivElement>(props.id); ··· 112 113 } 113 114 ${cardBorderHidden && "sm:h-[calc(100%+48px)] h-[calc(100%+20px)] sm:-my-6 -my-3 sm:pt-6 pt-3"} 114 115 ${props.fullPageScroll && "max-w-full "} 115 115 - ${props.pageType === "doc" && !props.fullPageScroll && "w-[10000px] sm:mx-0 max-w-[var(--page-width-units)]"} 116 116 + ${props.pageType === "doc" && !props.fullPageScroll ? (props.fixedWidth ? "w-[10000px] sm:max-w-prose max-w-[var(--page-width-units)]" : "w-[10000px] sm:mx-0 max-w-[var(--page-width-units)]") : ""} 116 117 ${ 117 118 props.pageType === "canvas" && 118 119 !props.fullPageScroll &&

+1 -1

components/Pages/PageOptions.tsx

··· 93 93 94 94 <PageOptionButton 95 95 secondary 96 96 - onClick={() => undoManager.undo()} 96 96 + onClick={() => undoManager.redo()} 97 97 disabled={!undoState.canRedo} 98 98 > 99 99 <RedoTiny />

+1 -1

components/Popover/index.tsx

··· 43 43 <RadixPopover.Content 44 44 className={` 45 45 z-20 bg-bg-page 46 46 - px-3 py-2 46 46 + px-3 py-2 text-primary 47 47 max-w-(--radix-popover-content-available-width) 48 48 max-h-(--radix-popover-content-available-height) 49 49 border border-border rounded-md shadow-md

+5 -67

components/SelectionManager/index.tsx

··· 17 17 import { schema } from "../Blocks/TextBlock/schema"; 18 18 import { MarkType } from "prosemirror-model"; 19 19 import { useSelectingMouse, getSortedSelection } from "./selectionState"; 20 20 + import { moveBlockUp, moveBlockDown } from "src/utils/moveBlock"; 20 21 21 22 //How should I model selection? As ranges w/ a start and end? Store *blocks* so that I can just construct ranges? 22 23 // How does this relate to *when dragging* ? ··· 240 241 shift: true, 241 242 key: ["ArrowDown", "J"], 242 243 handler: async () => { 243 243 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 244 244 - let block = sortedBlocks[0]; 245 245 - let nextBlock = siblings 246 246 - .slice(siblings.findIndex((s) => s.value === block.value) + 1) 247 247 - .find( 248 248 - (f) => 249 249 - f.listData && 250 250 - block.listData && 251 251 - !f.listData.path.find((f) => f.entity === block.value), 252 252 - ); 253 253 - if ( 254 254 - nextBlock?.listData && 255 255 - block.listData && 256 256 - nextBlock.listData.depth === block.listData.depth - 1 257 257 - ) { 258 258 - if (useUIState.getState().foldedBlocks.includes(nextBlock.value)) 259 259 - useUIState.getState().toggleFold(nextBlock.value); 260 260 - await rep?.mutate.moveBlock({ 261 261 - block: block.value, 262 262 - oldParent: block.listData?.parent, 263 263 - newParent: nextBlock.value, 264 264 - position: { type: "first" }, 265 265 - }); 266 266 - } else { 267 267 - await rep?.mutate.moveBlockDown({ 268 268 - entityID: block.value, 269 269 - parent: block.listData?.parent || block.parent, 270 270 - }); 271 271 - } 244 244 + if (!rep) return; 245 245 + await moveBlockDown(rep, entity_set.set); 272 246 }, 273 247 }, 274 248 { ··· 276 250 shift: true, 277 251 key: ["ArrowUp", "K"], 278 252 handler: async () => { 279 279 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 280 280 - let block = sortedBlocks[0]; 281 281 - let previousBlock = 282 282 - siblings?.[siblings.findIndex((s) => s.value === block.value) - 1]; 283 283 - if (previousBlock.value === block.listData?.parent) { 284 284 - previousBlock = 285 285 - siblings?.[ 286 286 - siblings.findIndex((s) => s.value === block.value) - 2 287 287 - ]; 288 288 - } 289 289 - 290 290 - if ( 291 291 - previousBlock?.listData && 292 292 - block.listData && 293 293 - block.listData.depth > 1 && 294 294 - !previousBlock.listData.path.find( 295 295 - (f) => f.entity === block.listData?.parent, 296 296 - ) 297 297 - ) { 298 298 - let depth = block.listData.depth; 299 299 - let newParent = previousBlock.listData.path.find( 300 300 - (f) => f.depth === depth - 1, 301 301 - ); 302 302 - if (!newParent) return; 303 303 - if (useUIState.getState().foldedBlocks.includes(newParent.entity)) 304 304 - useUIState.getState().toggleFold(newParent.entity); 305 305 - rep?.mutate.moveBlock({ 306 306 - block: block.value, 307 307 - oldParent: block.listData?.parent, 308 308 - newParent: newParent.entity, 309 309 - position: { type: "end" }, 310 310 - }); 311 311 - } else { 312 312 - rep?.mutate.moveBlockUp({ 313 313 - entityID: block.value, 314 314 - parent: block.listData?.parent || block.parent, 315 315 - }); 316 316 - } 253 253 + if (!rep) return; 254 254 + await moveBlockUp(rep); 317 255 }, 318 256 }, 319 257

-137

components/ThemeManager/Pickers/TextPickers.tsx

··· 1 1 - "use client"; 2 2 - 3 3 - import { Color } from "react-aria-components"; 4 4 - import { Input } from "components/Input"; 5 5 - import { useState } from "react"; 6 6 - import { useEntity, useReplicache } from "src/replicache"; 7 7 - import { Menu } from "components/Menu"; 8 8 - import { pickers } from "../ThemeSetter"; 9 9 - import { ColorPicker } from "./ColorPicker"; 10 10 - import * as DropdownMenu from "@radix-ui/react-dropdown-menu"; 11 11 - import { useIsMobile } from "src/hooks/isMobile"; 12 12 - import { fonts, defaultFontId, FontConfig } from "src/fonts"; 13 13 - 14 14 - export const TextColorPicker = (props: { 15 15 - openPicker: pickers; 16 16 - setOpenPicker: (thisPicker: pickers) => void; 17 17 - value: Color; 18 18 - setValue: (c: Color) => void; 19 19 - }) => { 20 20 - return ( 21 21 - <ColorPicker 22 22 - label="Text" 23 23 - value={props.value} 24 24 - setValue={props.setValue} 25 25 - thisPicker={"text"} 26 26 - openPicker={props.openPicker} 27 27 - setOpenPicker={props.setOpenPicker} 28 28 - closePicker={() => props.setOpenPicker("null")} 29 29 - /> 30 30 - ); 31 31 - }; 32 32 - 33 33 - type FontAttribute = "theme/heading-font" | "theme/body-font"; 34 34 - 35 35 - export const FontPicker = (props: { 36 36 - label: string; 37 37 - entityID: string; 38 38 - attribute: FontAttribute; 39 39 - }) => { 40 40 - let isMobile = useIsMobile(); 41 41 - let { rep } = useReplicache(); 42 42 - let [searchValue, setSearchValue] = useState(""); 43 43 - let currentFont = useEntity(props.entityID, props.attribute); 44 44 - let fontId = currentFont?.data.value || defaultFontId; 45 45 - let font = fonts[fontId] || fonts[defaultFontId]; 46 46 - 47 47 - let fontList = Object.values(fonts); 48 48 - let filteredFonts = fontList 49 49 - .filter((f) => { 50 50 - const matchesSearch = f.displayName 51 51 - .toLocaleLowerCase() 52 52 - .includes(searchValue.toLocaleLowerCase()); 53 53 - return matchesSearch; 54 54 - }) 55 55 - .sort((a, b) => { 56 56 - return a.displayName.localeCompare(b.displayName); 57 57 - }); 58 58 - 59 59 - return ( 60 60 - <Menu 61 61 - asChild 62 62 - trigger={ 63 63 - <button className="flex gap-2 items-center w-full !outline-none min-w-0"> 64 64 - <div 65 65 - className={`w-6 h-6 rounded-md border border-border relative text-sm bg-bg-page shrink-0 ${props.label === "Heading" ? "font-bold" : "text-secondary"}`} 66 66 - > 67 67 - <div className="absolute top-1/2 left-1/2 -translate-y-1/2 -translate-x-1/2 "> 68 68 - Aa 69 69 - </div> 70 70 - </div> 71 71 - <div className="font-bold shrink-0">{props.label}</div> 72 72 - <div className="truncate">{font.displayName}</div> 73 73 - </button> 74 74 - } 75 75 - side={isMobile ? "bottom" : "right"} 76 76 - align="start" 77 77 - className="w-[250px] !gap-0 !outline-none max-h-72 " 78 78 - > 79 79 - <Input 80 80 - value={searchValue} 81 81 - className="px-3 pb-1 appearance-none !outline-none bg-transparent" 82 82 - placeholder="search..." 83 83 - onChange={(e) => { 84 84 - setSearchValue(e.currentTarget.value); 85 85 - }} 86 86 - /> 87 87 - <hr className="mx-2 border-border" /> 88 88 - <div className="flex flex-col h-full overflow-auto gap-0 pt-1"> 89 89 - {filteredFonts.map((fontOption) => { 90 90 - return ( 91 91 - <FontOption 92 92 - key={fontOption.id} 93 93 - onSelect={() => { 94 94 - rep?.mutate.assertFact({ 95 95 - entity: props.entityID, 96 96 - attribute: props.attribute, 97 97 - data: { type: "string", value: fontOption.id }, 98 98 - }); 99 99 - }} 100 100 - font={fontOption} 101 101 - selected={fontOption.id === fontId} 102 102 - /> 103 103 - ); 104 104 - })} 105 105 - </div> 106 106 - </Menu> 107 107 - ); 108 108 - }; 109 109 - 110 110 - const FontOption = (props: { 111 111 - onSelect: () => void; 112 112 - font: FontConfig; 113 113 - selected: boolean; 114 114 - }) => { 115 115 - return ( 116 116 - <DropdownMenu.RadioItem 117 117 - value={props.font.id} 118 118 - onSelect={props.onSelect} 119 119 - className={` 120 120 - fontOption 121 121 - z-10 px-1 py-0.5 122 122 - text-left text-secondary 123 123 - data-[highlighted]:bg-border-light data-[highlighted]:text-secondary 124 124 - hover:bg-border-light hover:text-secondary 125 125 - outline-none 126 126 - cursor-pointer 127 127 - 128 128 - `} 129 129 - > 130 130 - <div 131 131 - className={`px-2 py-0 rounded-md ${props.selected && "bg-accent-1 text-accent-2"}`} 132 132 - > 133 133 - {props.font.displayName} 134 134 - </div> 135 135 - </DropdownMenu.RadioItem> 136 136 - ); 137 137 - };

-106

components/ThemeManager/PubPickers/PubFontPicker.tsx

··· 1 1 - "use client"; 2 2 - 3 3 - import { useState } from "react"; 4 4 - import { Menu } from "components/Menu"; 5 5 - import { Input } from "components/Input"; 6 6 - import * as DropdownMenu from "@radix-ui/react-dropdown-menu"; 7 7 - import { useIsMobile } from "src/hooks/isMobile"; 8 8 - import { fonts, defaultFontId, FontConfig } from "src/fonts"; 9 9 - 10 10 - export const PubFontPicker = (props: { 11 11 - label: string; 12 12 - value: string | undefined; 13 13 - onChange: (fontId: string) => void; 14 14 - }) => { 15 15 - let isMobile = useIsMobile(); 16 16 - let [searchValue, setSearchValue] = useState(""); 17 17 - let fontId = props.value || defaultFontId; 18 18 - let font = fonts[fontId] || fonts[defaultFontId]; 19 19 - 20 20 - let fontList = Object.values(fonts); 21 21 - let filteredFonts = fontList 22 22 - .filter((f) => { 23 23 - const matchesSearch = f.displayName 24 24 - .toLocaleLowerCase() 25 25 - .includes(searchValue.toLocaleLowerCase()); 26 26 - return matchesSearch; 27 27 - }) 28 28 - .sort((a, b) => { 29 29 - return a.displayName.localeCompare(b.displayName); 30 30 - }); 31 31 - 32 32 - return ( 33 33 - <Menu 34 34 - asChild 35 35 - trigger={ 36 36 - <button className="flex gap-2 items-center w-full !outline-none min-w-0"> 37 37 - <div 38 38 - className={`w-6 h-6 rounded-md border border-border relative text-sm bg-bg-page shrink-0 ${props.label === "Heading" ? "font-bold" : "text-secondary"}`} 39 39 - > 40 40 - <div className="absolute top-1/2 left-1/2 -translate-y-1/2 -translate-x-1/2 "> 41 41 - Aa 42 42 - </div> 43 43 - </div> 44 44 - <div className="font-bold shrink-0">{props.label}</div> 45 45 - <div className="truncate">{font.displayName}</div> 46 46 - </button> 47 47 - } 48 48 - side={isMobile ? "bottom" : "right"} 49 49 - align="start" 50 50 - className="w-[250px] !gap-0 !outline-none max-h-72 " 51 51 - > 52 52 - <Input 53 53 - value={searchValue} 54 54 - className="px-3 pb-1 appearance-none !outline-none bg-transparent" 55 55 - placeholder="search..." 56 56 - onChange={(e) => { 57 57 - setSearchValue(e.currentTarget.value); 58 58 - }} 59 59 - /> 60 60 - <hr className="mx-2 border-border" /> 61 61 - <div className="flex flex-col h-full overflow-auto gap-0 pt-1"> 62 62 - {filteredFonts.map((fontOption) => { 63 63 - return ( 64 64 - <FontOption 65 65 - key={fontOption.id} 66 66 - onSelect={() => { 67 67 - props.onChange(fontOption.id); 68 68 - }} 69 69 - font={fontOption} 70 70 - selected={fontOption.id === fontId} 71 71 - /> 72 72 - ); 73 73 - })} 74 74 - </div> 75 75 - </Menu> 76 76 - ); 77 77 - }; 78 78 - 79 79 - const FontOption = (props: { 80 80 - onSelect: () => void; 81 81 - font: FontConfig; 82 82 - selected: boolean; 83 83 - }) => { 84 84 - return ( 85 85 - <DropdownMenu.RadioItem 86 86 - value={props.font.id} 87 87 - onSelect={props.onSelect} 88 88 - className={` 89 89 - fontOption 90 90 - z-10 px-1 py-0.5 91 91 - text-left text-secondary 92 92 - data-[highlighted]:bg-border-light data-[highlighted]:text-secondary 93 93 - hover:bg-border-light hover:text-secondary 94 94 - outline-none 95 95 - cursor-pointer 96 96 - 97 97 - `} 98 98 - > 99 99 - <div 100 100 - className={`px-2 py-0 rounded-md ${props.selected && "bg-accent-1 text-accent-2"}`} 101 101 - > 102 102 - {props.font.displayName} 103 103 - </div> 104 104 - </DropdownMenu.RadioItem> 105 105 - ); 106 106 - };

+14

components/ThemeManager/PubPickers/PubTextPickers.tsx

··· 26 26 openPicker={props.openPicker} 27 27 setOpenPicker={props.setOpenPicker} 28 28 /> 29 29 + {/* FONT PICKERS HIDDEN FOR NOW */} 30 30 + {/* <hr className="border-border-light" /> 31 31 + <div className="flex gap-2"> 32 32 + <div className="w-6 h-6 font-bold text-center rounded-md bg-border-light"> 33 33 + Aa 34 34 + </div> 35 35 + <div className="font-bold">Header</div> <div>iA Writer</div> 36 36 + </div> 37 37 + <div className="flex gap-2"> 38 38 + <div className="w-6 h-6 place-items-center text-center rounded-md bg-border-light"> 39 39 + Aa 40 40 + </div>{" "} 41 41 + <div className="font-bold">Body</div> <div>iA Writer</div> 42 42 + </div> */} 29 43 </div> 30 44 ); 31 45 };

-17

components/ThemeManager/PubThemeSetter.tsx

··· 20 20 import { useToaster } from "components/Toast"; 21 21 import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError"; 22 22 import { PubPageWidthSetter } from "./PubPickers/PubPageWidthSetter"; 23 23 - import { PubFontPicker } from "./PubPickers/PubFontPicker"; 24 23 25 24 export type ImageState = { 26 25 src: string; ··· 61 60 let [pageWidth, setPageWidth] = useState<number>( 62 61 record?.theme?.pageWidth || 624, 63 62 ); 64 64 - let [headingFont, setHeadingFont] = useState<string | undefined>(record?.theme?.headingFont); 65 65 - let [bodyFont, setBodyFont] = useState<string | undefined>(record?.theme?.bodyFont); 66 63 let pubBGImage = image?.src || null; 67 64 let leafletBGRepeat = image?.repeat || null; 68 65 let toaster = useToaster(); ··· 88 85 primary: ColorToRGB(localPubTheme.primary), 89 86 accentBackground: ColorToRGB(localPubTheme.accent1), 90 87 accentText: ColorToRGB(localPubTheme.accent2), 91 91 - headingFont: headingFont, 92 92 - bodyFont: bodyFont, 93 88 }, 94 89 }); 95 90 ··· 194 189 setOpenPicker={(pickers) => setOpenPicker(pickers)} 195 190 hasPageBackground={showPageBackground} 196 191 /> 197 197 - <div className="bg-bg-page p-2 rounded-md border border-primary shadow-[0_0_0_1px_rgb(var(--bg-page))] flex flex-col gap-1"> 198 198 - <PubFontPicker 199 199 - label="Heading" 200 200 - value={headingFont} 201 201 - onChange={setHeadingFont} 202 202 - /> 203 203 - <PubFontPicker 204 204 - label="Body" 205 205 - value={bodyFont} 206 206 - onChange={setBodyFont} 207 207 - /> 208 208 - </div> 209 192 <PubAccentPickers 210 193 accent1={localPubTheme.accent1} 211 194 setAccent1={(color) => {

+1 -70

components/ThemeManager/ThemeProvider.tsx

··· 22 22 PublicationThemeProvider, 23 23 } from "./PublicationThemeProvider"; 24 24 import { getColorDifference } from "./themeUtils"; 25 25 - import { getFontConfig, getGoogleFontsUrl, getFontFamilyValue } from "src/fonts"; 26 25 27 26 // define a function to set an Aria Color to a CSS Variable in RGB 28 27 function setCSSVariableToColor( ··· 39 38 local?: boolean; 40 39 children: React.ReactNode; 41 40 className?: string; 42 42 - initialHeadingFontId?: string; 43 43 - initialBodyFontId?: string; 44 41 }) { 45 42 let { data: pub, normalizedPublication } = useLeafletPublicationData(); 46 43 if (!pub || !pub.publications) return <LeafletThemeProvider {...props} />; ··· 59 56 entityID: string | null; 60 57 local?: boolean; 61 58 children: React.ReactNode; 62 62 - initialHeadingFontId?: string; 63 63 - initialBodyFontId?: string; 64 59 }) { 65 60 let bgLeaflet = useColorAttribute(props.entityID, "theme/page-background"); 66 61 let bgPage = useColorAttribute(props.entityID, "theme/card-background"); ··· 81 76 let accent2 = useColorAttribute(props.entityID, "theme/accent-text"); 82 77 83 78 let pageWidth = useEntity(props.entityID, "theme/page-width"); 84 84 - // Use initial font IDs as fallback until Replicache syncs 85 85 - let headingFontId = useEntity(props.entityID, "theme/heading-font")?.data.value ?? props.initialHeadingFontId; 86 86 - let bodyFontId = useEntity(props.entityID, "theme/body-font")?.data.value ?? props.initialBodyFontId; 87 79 88 80 return ( 89 81 <CardBorderHiddenContext.Provider value={!!cardBorderHiddenValue}> ··· 100 92 showPageBackground={showPageBackground} 101 93 pageWidth={pageWidth?.data.value} 102 94 hasBackgroundImage={hasBackgroundImage} 103 103 - headingFontId={headingFontId} 104 104 - bodyFontId={bodyFontId} 105 95 > 106 96 {props.children} 107 97 </BaseThemeProvider> ··· 123 113 showPageBackground, 124 114 pageWidth, 125 115 hasBackgroundImage, 126 126 - headingFontId, 127 127 - bodyFontId, 128 116 children, 129 117 }: { 130 118 local?: boolean; ··· 139 127 highlight2: AriaColor; 140 128 highlight3: AriaColor; 141 129 pageWidth?: number; 142 142 - headingFontId?: string; 143 143 - bodyFontId?: string; 144 130 children: React.ReactNode; 145 131 }) => { 146 132 // When showPageBackground is false and there's no background image, ··· 181 167 accentContrast = sortedAccents[0]; 182 168 } 183 169 184 184 - // Get font configs for CSS variables 185 185 - const headingFontConfig = getFontConfig(headingFontId); 186 186 - const bodyFontConfig = getFontConfig(bodyFontId); 187 187 - const headingFontValue = getFontFamilyValue(headingFontConfig); 188 188 - const bodyFontValue = getFontFamilyValue(bodyFontConfig); 189 189 - const headingGoogleFontsUrl = getGoogleFontsUrl(headingFontConfig); 190 190 - const bodyGoogleFontsUrl = getGoogleFontsUrl(bodyFontConfig); 191 191 - 192 192 - // Dynamically load Google Fonts when fonts change 193 193 - useEffect(() => { 194 194 - const loadGoogleFont = (url: string | null, fontFamily: string) => { 195 195 - if (!url) return; 196 196 - 197 197 - // Check if this font stylesheet is already in the document 198 198 - const existingLink = document.querySelector(`link[href="${url}"]`); 199 199 - if (existingLink) return; 200 200 - 201 201 - // Add preconnect hints if not present 202 202 - if (!document.querySelector('link[href="https://fonts.googleapis.com"]')) { 203 203 - const preconnect1 = document.createElement("link"); 204 204 - preconnect1.rel = "preconnect"; 205 205 - preconnect1.href = "https://fonts.googleapis.com"; 206 206 - document.head.appendChild(preconnect1); 207 207 - 208 208 - const preconnect2 = document.createElement("link"); 209 209 - preconnect2.rel = "preconnect"; 210 210 - preconnect2.href = "https://fonts.gstatic.com"; 211 211 - preconnect2.crossOrigin = "anonymous"; 212 212 - document.head.appendChild(preconnect2); 213 213 - } 214 214 - 215 215 - // Load the Google Font stylesheet 216 216 - const link = document.createElement("link"); 217 217 - link.rel = "stylesheet"; 218 218 - link.href = url; 219 219 - document.head.appendChild(link); 220 220 - 221 221 - // Wait for the font to actually load before it gets applied 222 222 - if (document.fonts?.load) { 223 223 - document.fonts.load(`1em "${fontFamily}"`); 224 224 - } 225 225 - }; 226 226 - 227 227 - loadGoogleFont(headingGoogleFontsUrl, headingFontConfig.fontFamily); 228 228 - loadGoogleFont(bodyGoogleFontsUrl, bodyFontConfig.fontFamily); 229 229 - }, [headingGoogleFontsUrl, bodyGoogleFontsUrl, headingFontConfig.fontFamily, bodyFontConfig.fontFamily]); 230 230 - 231 170 useEffect(() => { 232 171 if (local) return; 233 172 let el = document.querySelector(":root") as HTMLElement; ··· 276 215 "--page-width-setting", 277 216 (pageWidth || 624).toString(), 278 217 ); 279 279 - 280 280 - // Set theme font CSS variables 281 281 - el?.style.setProperty("--theme-heading-font", headingFontValue); 282 282 - el?.style.setProperty("--theme-font", bodyFontValue); 283 218 }, [ 284 219 local, 285 220 bgLeaflet, ··· 292 227 accent2, 293 228 accentContrast, 294 229 pageWidth, 295 295 - headingFontValue, 296 296 - bodyFontValue, 297 297 - ]); // bodyFontValue sets --theme-font 230 230 + ]); 298 231 return ( 299 232 <div 300 233 className="leafletWrapper w-full text-primary h-full min-h-fit flex flex-col bg-center items-stretch " ··· 316 249 "--page-width-setting": pageWidth || 624, 317 250 "--page-width-unitless": pageWidth || 624, 318 251 "--page-width-units": `min(${pageWidth || 624}px, calc(100vw - 12px))`, 319 319 - "--theme-heading-font": headingFontValue, 320 320 - "--theme-font": bodyFontValue, 321 252 } as CSSProperties 322 253 } 323 254 >

+1 -9

components/ThemeManager/ThemeSetter.tsx

··· 22 22 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 23 23 import { useIsMobile } from "src/hooks/isMobile"; 24 24 import { Toggle } from "components/Toggle"; 25 25 - import { FontPicker } from "./Pickers/TextPickers"; 26 25 27 26 export type pickers = 28 27 | "null" ··· 158 157 openPicker={openPicker} 159 158 setOpenPicker={(pickers) => setOpenPicker(pickers)} 160 159 /> 161 161 - {!props.home && ( 162 162 - <div className="flex flex-col gap-1 bg-bg-page p-2 rounded-md border border-primary -mt-2"> 163 163 - <FontPicker label="Heading" entityID={props.entityID} attribute="theme/heading-font" /> 164 164 - <FontPicker label="Body" entityID={props.entityID} attribute="theme/body-font" /> 165 165 - </div> 166 166 - )} 167 160 <div className="flex flex-col -gap-[6px]"> 168 161 <div className={`flex flex-col z-10 -mb-[6px] `}> 169 162 <AccentPickers ··· 194 187 </div> 195 188 ); 196 189 }; 197 197 - 198 190 function WatermarkSetter(props: { entityID: string }) { 199 191 let { rep } = useReplicache(); 200 192 let checked = useEntity(props.entityID, "theme/page-leaflet-watermark"); ··· 308 300 onClick={() => { 309 301 props.setOpenPicker("text"); 310 302 }} 311 311 - className="cursor-pointer font-bold w-fit [font-family:var(--theme-heading-font)]" 303 303 + className="cursor-pointer font-bold w-fit" 312 304 > 313 305 Hello! 314 306 </p>

components/Toolbar/BlockToolbar.1.tsx

This is a binary file and will not be displayed.

-223

components/Toolbar/BlockToolbar.tsx

··· 1 1 - import { useEntity, useReplicache } from "src/replicache"; 2 2 - import { ToolbarButton } from "."; 3 3 - import { Separator, ShortcutKey } from "components/Layout"; 4 4 - import { metaKey } from "src/utils/metaKey"; 5 5 - import { useUIState } from "src/useUIState"; 6 6 - import { LockBlockButton } from "./LockBlockButton"; 7 7 - import { TextAlignmentButton } from "./TextAlignmentToolbar"; 8 8 - import { 9 9 - ImageFullBleedButton, 10 10 - ImageAltTextButton, 11 11 - ImageCoverButton, 12 12 - } from "./ImageToolbar"; 13 13 - import { DeleteSmall } from "components/Icons/DeleteSmall"; 14 14 - import { getSortedSelection } from "components/SelectionManager/selectionState"; 15 15 - 16 16 - export const BlockToolbar = (props: { 17 17 - setToolbarState: ( 18 18 - state: "areYouSure" | "block" | "text-alignment" | "img-alt-text", 19 19 - ) => void; 20 20 - }) => { 21 21 - let focusedEntity = useUIState((s) => s.focusedEntity); 22 22 - let focusedEntityType = useEntity( 23 23 - focusedEntity?.entityType === "page" 24 24 - ? focusedEntity.entityID 25 25 - : focusedEntity?.parent || null, 26 26 - "page/type", 27 27 - ); 28 28 - let blockType = useEntity( 29 29 - focusedEntity?.entityType === "block" ? focusedEntity?.entityID : null, 30 30 - "block/type", 31 31 - )?.data.value; 32 32 - 33 33 - return ( 34 34 - <div className="flex items-center gap-2 justify-between w-full"> 35 35 - <div className="flex items-center gap-2"> 36 36 - <ToolbarButton 37 37 - onClick={() => { 38 38 - props.setToolbarState("areYouSure"); 39 39 - }} 40 40 - tooltipContent="Delete Block" 41 41 - > 42 42 - <DeleteSmall /> 43 43 - </ToolbarButton> 44 44 - <Separator classname="h-6!" /> 45 45 - <MoveBlockButtons /> 46 46 - {blockType === "image" && ( 47 47 - <> 48 48 - <TextAlignmentButton setToolbarState={props.setToolbarState} /> 49 49 - <ImageFullBleedButton /> 50 50 - <ImageAltTextButton setToolbarState={props.setToolbarState} /> 51 51 - <ImageCoverButton /> 52 52 - {focusedEntityType?.data.value !== "canvas" && ( 53 53 - <Separator classname="h-6!" /> 54 54 - )} 55 55 - </> 56 56 - )} 57 57 - {(blockType === "button" || blockType === "datetime") && ( 58 58 - <> 59 59 - <TextAlignmentButton setToolbarState={props.setToolbarState} /> 60 60 - {focusedEntityType?.data.value !== "canvas" && ( 61 61 - <Separator classname="h-6!" /> 62 62 - )} 63 63 - </> 64 64 - )} 65 65 - 66 66 - <LockBlockButton /> 67 67 - </div> 68 68 - </div> 69 69 - ); 70 70 - }; 71 71 - 72 72 - const MoveBlockButtons = () => { 73 73 - let { rep } = useReplicache(); 74 74 - return ( 75 75 - <> 76 76 - <ToolbarButton 77 77 - hiddenOnCanvas 78 78 - onClick={async () => { 79 79 - if (!rep) return; 80 80 - let [sortedBlocks, siblings] = await getSortedSelection(rep); 81 81 - if (sortedBlocks.length > 1) return; 82 82 - let block = sortedBlocks[0]; 83 83 - let previousBlock = 84 84 - siblings?.[siblings.findIndex((s) => s.value === block.value) - 1]; 85 85 - if (previousBlock.value === block.listData?.parent) { 86 86 - previousBlock = 87 87 - siblings?.[ 88 88 - siblings.findIndex((s) => s.value === block.value) - 2 89 89 - ]; 90 90 - } 91 91 - 92 92 - if ( 93 93 - previousBlock?.listData && 94 94 - block.listData && 95 95 - block.listData.depth > 1 && 96 96 - !previousBlock.listData.path.find( 97 97 - (f) => f.entity === block.listData?.parent, 98 98 - ) 99 99 - ) { 100 100 - let depth = block.listData.depth; 101 101 - let newParent = previousBlock.listData.path.find( 102 102 - (f) => f.depth === depth - 1, 103 103 - ); 104 104 - if (!newParent) return; 105 105 - if (useUIState.getState().foldedBlocks.includes(newParent.entity)) 106 106 - useUIState.getState().toggleFold(newParent.entity); 107 107 - rep?.mutate.moveBlock({ 108 108 - block: block.value, 109 109 - oldParent: block.listData?.parent, 110 110 - newParent: newParent.entity, 111 111 - position: { type: "end" }, 112 112 - }); 113 113 - } else { 114 114 - rep?.mutate.moveBlockUp({ 115 115 - entityID: block.value, 116 116 - parent: block.listData?.parent || block.parent, 117 117 - }); 118 118 - } 119 119 - }} 120 120 - tooltipContent={ 121 121 - <div className="flex flex-col gap-1 justify-center"> 122 122 - <div className="text-center">Move Up</div> 123 123 - <div className="flex gap-1"> 124 124 - <ShortcutKey>Shift</ShortcutKey> +{" "} 125 125 - <ShortcutKey>{metaKey()}</ShortcutKey> +{" "} 126 126 - <ShortcutKey> ↑ </ShortcutKey> 127 127 - </div> 128 128 - </div> 129 129 - } 130 130 - > 131 131 - <MoveBlockUp /> 132 132 - </ToolbarButton> 133 133 - 134 134 - <ToolbarButton 135 135 - hiddenOnCanvas 136 136 - onClick={async () => { 137 137 - if (!rep) return; 138 138 - let [sortedBlocks, siblings] = await getSortedSelection(rep); 139 139 - if (sortedBlocks.length > 1) return; 140 140 - let block = sortedBlocks[0]; 141 141 - let nextBlock = siblings 142 142 - .slice(siblings.findIndex((s) => s.value === block.value) + 1) 143 143 - .find( 144 144 - (f) => 145 145 - f.listData && 146 146 - block.listData && 147 147 - !f.listData.path.find((f) => f.entity === block.value), 148 148 - ); 149 149 - if ( 150 150 - nextBlock?.listData && 151 151 - block.listData && 152 152 - nextBlock.listData.depth === block.listData.depth - 1 153 153 - ) { 154 154 - if (useUIState.getState().foldedBlocks.includes(nextBlock.value)) 155 155 - useUIState.getState().toggleFold(nextBlock.value); 156 156 - rep?.mutate.moveBlock({ 157 157 - block: block.value, 158 158 - oldParent: block.listData?.parent, 159 159 - newParent: nextBlock.value, 160 160 - position: { type: "first" }, 161 161 - }); 162 162 - } else { 163 163 - rep?.mutate.moveBlockDown({ 164 164 - entityID: block.value, 165 165 - parent: block.listData?.parent || block.parent, 166 166 - }); 167 167 - } 168 168 - }} 169 169 - tooltipContent={ 170 170 - <div className="flex flex-col gap-1 justify-center"> 171 171 - <div className="text-center">Move Down</div> 172 172 - <div className="flex gap-1"> 173 173 - <ShortcutKey>Shift</ShortcutKey> +{" "} 174 174 - <ShortcutKey>{metaKey()}</ShortcutKey> +{" "} 175 175 - <ShortcutKey> ↓ </ShortcutKey> 176 176 - </div> 177 177 - </div> 178 178 - } 179 179 - > 180 180 - <MoveBlockDown /> 181 181 - </ToolbarButton> 182 182 - <Separator classname="h-6!" /> 183 183 - </> 184 184 - ); 185 185 - }; 186 186 - 187 187 - const MoveBlockDown = () => { 188 188 - return ( 189 189 - <svg 190 190 - width="24" 191 191 - height="24" 192 192 - viewBox="0 0 24 24" 193 193 - fill="none" 194 194 - xmlns="http://www.w3.org/2000/svg" 195 195 - > 196 196 - <path 197 197 - fillRule="evenodd" 198 198 - clipRule="evenodd" 199 199 - d="M18.3444 3.56272L3.89705 5.84775C3.48792 5.91246 3.20871 6.29658 3.27342 6.7057L3.83176 10.2358C3.89647 10.645 4.28058 10.9242 4.68971 10.8595L19.137 8.57444C19.5462 8.50973 19.8254 8.12561 19.7607 7.71649L19.2023 4.18635C19.1376 3.77722 18.7535 3.49801 18.3444 3.56272ZM3.70177 4.61309C2.69864 4.77175 1.9884 5.65049 2.01462 6.63905C1.6067 6.92894 1.37517 7.43373 1.45854 7.96083L2.02167 11.5213C2.19423 12.6123 3.21854 13.3568 4.30955 13.1843L15.5014 11.4142L15.3472 10.4394L16.6131 10.2392L17.2948 13.9166L15.3038 12.4752C14.9683 12.2322 14.4994 12.3073 14.2565 12.6428C14.0135 12.9783 14.0886 13.4472 14.4241 13.6902L18.5417 16.6712L21.5228 12.5536C21.7658 12.2181 21.6907 11.7492 21.3552 11.5063C21.0197 11.2634 20.5508 11.3385 20.3079 11.674L18.7926 13.7669L18.0952 10.0048L19.3323 9.80909C20.4233 9.63654 21.1679 8.61222 20.9953 7.52121L20.437 3.99107C20.2644 2.90007 19.2401 2.15551 18.1491 2.32807L3.70177 4.61309ZM12.5175 14.1726C12.8583 14.118 13.0904 13.7974 13.0358 13.4566C12.9812 13.1157 12.6606 12.8837 12.3198 12.9383L4.48217 14.1937C3.37941 14.3704 2.62785 15.4065 2.80232 16.5096L3.35244 19.9878C3.52716 21.0925 4.56428 21.8463 5.66893 21.6716L20.0583 19.3958C21.1618 19.2212 21.9155 18.186 21.7426 17.0822L21.6508 16.4961C21.5974 16.1551 21.2776 15.922 20.9366 15.9754C20.5956 16.0288 20.3624 16.3486 20.4158 16.6896L20.5077 17.2757C20.5738 17.6981 20.2854 18.0943 19.8631 18.1611L5.47365 20.437C5.05089 20.5038 4.65396 20.2153 4.5871 19.7925L4.03697 16.3143C3.9702 15.8921 4.25783 15.4956 4.67988 15.428L12.5175 14.1726ZM5.48645 8.13141C5.4213 7.72235 5.70009 7.33793 6.10914 7.27278L12.7667 6.21241C13.1757 6.14726 13.5602 6.42605 13.6253 6.83511C13.6905 7.24417 13.4117 7.62859 13.0026 7.69374L6.34508 8.75411C5.93602 8.81926 5.5516 8.54047 5.48645 8.13141Z" 200 200 - fill="currentColor" 201 201 - /> 202 202 - </svg> 203 203 - ); 204 204 - }; 205 205 - 206 206 - const MoveBlockUp = () => { 207 207 - return ( 208 208 - <svg 209 209 - width="24" 210 210 - height="24" 211 211 - viewBox="0 0 24 24" 212 212 - fill="none" 213 213 - xmlns="http://www.w3.org/2000/svg" 214 214 - > 215 215 - <path 216 216 - fillRule="evenodd" 217 217 - clipRule="evenodd" 218 218 - d="M4.12086 10.3069C3.69777 10.3744 3.30016 10.0858 3.23323 9.66265L2.68364 6.18782C2.61677 5.76506 2.90529 5.36813 3.32805 5.30127L17.7149 3.0258C18.1378 2.95892 18.5348 3.24759 18.6015 3.67049L18.7835 4.82361C18.8373 5.16457 19.1573 5.39736 19.4983 5.34356C19.8392 5.28975 20.072 4.96974 20.0182 4.62878L19.8363 3.47566C19.6619 2.37067 18.6246 1.61639 17.5197 1.79115L3.13278 4.06661C2.02813 4.24133 1.27427 5.27845 1.44899 6.3831L1.99857 9.85793C2.17346 10.9637 3.21238 11.7177 4.31788 11.5413L11.5185 10.392C11.8594 10.3376 12.0916 10.0171 12.0372 9.67628C11.9828 9.33542 11.6624 9.1032 11.3215 9.15761L4.12086 10.3069ZM19.9004 11.6151L5.45305 13.9001C5.04392 13.9649 4.76471 14.349 4.82942 14.7581L5.38775 18.2882C5.45246 18.6974 5.83658 18.9766 6.24571 18.9119L20.6931 16.6268C21.1022 16.5621 21.3814 16.178 21.3167 15.7689L20.7583 12.2388C20.6936 11.8296 20.3095 11.5504 19.9004 11.6151ZM5.25777 12.6655C4.21806 12.8299 3.49299 13.7679 3.57645 14.8C3.17867 15.1511 2.9637 15.6918 3.05264 16.2541L3.57767 19.5737C3.75023 20.6647 4.77455 21.4093 5.86556 21.2367L19.9927 19.0023C20.7197 18.8873 21.2751 18.3524 21.4519 17.6846C22.2223 17.3097 22.6921 16.4638 22.5513 15.5736L21.993 12.0435C21.8204 10.9525 20.7961 10.2079 19.7051 10.3805L17.9019 10.6657L17.3957 7.46986L19.3483 8.96297C19.6773 9.21457 20.148 9.1518 20.3996 8.82276C20.6512 8.49373 20.5885 8.02302 20.2594 7.77141L16.2213 4.68355L13.1334 8.72172C12.8818 9.05076 12.9445 9.52146 13.2736 9.77307C13.6026 10.0247 14.0733 9.96191 14.3249 9.63287L15.8945 7.58034L16.4203 10.9L5.25777 12.6655ZM7.66514 15.3252C7.25609 15.3903 6.97729 15.7748 7.04245 16.1838C7.1076 16.5929 7.49202 16.8717 7.90108 16.8065L14.5586 15.7461C14.9677 15.681 15.2465 15.2966 15.1813 14.8875C15.1162 14.4785 14.7317 14.1997 14.3227 14.2648L7.66514 15.3252Z" 219 219 - fill="currentColor" 220 220 - /> 221 221 - </svg> 222 222 - ); 223 223 - };

+36 -8

components/Toolbar/ImageToolbar.tsx

··· 6 6 import { ImageAltSmall, ImageRemoveAltSmall } from "components/Icons/ImageAlt"; 7 7 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 8 8 import { useSubscribe } from "src/replicache/useSubscribe"; 9 9 - import { ImageCoverImage } from "components/Icons/ImageCoverImage"; 9 9 + import { 10 10 + ImageCoverImage, 11 11 + ImageCoverImageRemove, 12 12 + } from "components/Icons/ImageCoverImage"; 13 13 + import { Separator } from "components/Layout"; 14 14 + import { TextAlignmentButton } from "./TextAlignmentToolbar"; 15 15 + 16 16 + export const ImageToolbar = (props: { 17 17 + setToolbarState: (state: "image" | "text-alignment") => void; 18 18 + }) => { 19 19 + let focusedEntity = useUIState((s) => s.focusedEntity); 20 20 + let focusedEntityType = useEntity( 21 21 + focusedEntity?.entityType === "page" 22 22 + ? focusedEntity.entityID 23 23 + : focusedEntity?.parent || null, 24 24 + "page/type", 25 25 + ); 26 26 + 27 27 + return ( 28 28 + <div className="flex items-center gap-2 justify-between w-full"> 29 29 + <div className="flex items-center gap-2"> 30 30 + <TextAlignmentButton setToolbarState={props.setToolbarState} /> 31 31 + <ImageAltTextButton /> 32 32 + <ImageFullBleedButton /> 33 33 + <ImageCoverButton /> 34 34 + {focusedEntityType?.data.value !== "canvas" && ( 35 35 + <Separator classname="h-6!" /> 36 36 + )} 37 37 + </div> 38 38 + </div> 39 39 + ); 40 40 + }; 10 41 11 42 export const ImageFullBleedButton = (props: {}) => { 12 43 let { rep } = useReplicache(); ··· 36 67 ); 37 68 }; 38 69 39 39 - export const ImageAltTextButton = (props: { 40 40 - setToolbarState: (s: "img-alt-text") => void; 41 41 - }) => { 70 70 + export const ImageAltTextButton = (props: {}) => { 42 71 let { rep } = useReplicache(); 43 72 let focusedBlock = useUIState((s) => s.focusedEntity)?.entityID || null; 44 73 ··· 48 77 let altEditorOpen = useUIState((s) => s.openPopover === focusedBlock); 49 78 let hasSrc = useEntity(focusedBlock, "block/image")?.data; 50 79 if (!hasSrc) return null; 51 51 - 52 80 return ( 53 81 <ToolbarButton 54 82 active={altText !== undefined} 55 83 onClick={async (e) => { 56 84 e.preventDefault(); 57 85 if (!focusedBlock) return; 58 58 - if (!altText) { 86 86 + if (altText === undefined) { 59 87 await rep?.mutate.assertFact({ 60 88 entity: focusedBlock, 61 89 attribute: "image/alt", ··· 109 137 } 110 138 }} 111 139 tooltipContent={ 112 112 - <div>{isCoverImage ? "Remove Cover Image" : "Set as Cover Image"}</div> 140 140 + <div>{isCoverImage ? "Remove Cover Image" : "Use as Cover Image"}</div> 113 141 } 114 142 > 115 115 - <ImageCoverImage /> 143 143 + {isCoverImage ? <ImageCoverImageRemove /> : <ImageCoverImage />} 116 144 </ToolbarButton> 117 145 ); 118 146 };

-103

components/Toolbar/LockBlockButton.tsx

··· 1 1 - import { useUIState } from "src/useUIState"; 2 2 - import { ToolbarButton } from "."; 3 3 - import { useEntity, useReplicache } from "src/replicache"; 4 4 - 5 5 - import { focusBlock } from "src/utils/focusBlock"; 6 6 - import { Props } from "components/Icons/Props"; 7 7 - 8 8 - export function LockBlockButton() { 9 9 - let focusedBlock = useUIState((s) => s.focusedEntity); 10 10 - let selectedBlocks = useUIState((s) => s.selectedBlocks); 11 11 - let type = useEntity(focusedBlock?.entityID || null, "block/type"); 12 12 - let locked = useEntity(focusedBlock?.entityID || null, "block/is-locked"); 13 13 - let { rep } = useReplicache(); 14 14 - if (focusedBlock?.entityType !== "block") return; 15 15 - return ( 16 16 - <ToolbarButton 17 17 - disabled={false} 18 18 - onClick={async () => { 19 19 - if (!locked?.data.value) { 20 20 - await rep?.mutate.assertFact({ 21 21 - entity: focusedBlock.entityID, 22 22 - attribute: "block/is-locked", 23 23 - data: { value: true, type: "boolean" }, 24 24 - }); 25 25 - if (selectedBlocks.length > 1) { 26 26 - for (let block of selectedBlocks) { 27 27 - await rep?.mutate.assertFact({ 28 28 - attribute: "block/is-locked", 29 29 - entity: block.value, 30 30 - data: { value: true, type: "boolean" }, 31 31 - }); 32 32 - } 33 33 - } 34 34 - } else { 35 35 - await rep?.mutate.retractFact({ factID: locked.id }); 36 36 - if (selectedBlocks.length > 1) { 37 37 - for (let block of selectedBlocks) { 38 38 - await rep?.mutate.retractAttribute({ 39 39 - attribute: "block/is-locked", 40 40 - entity: block.value, 41 41 - }); 42 42 - } 43 43 - } else { 44 44 - type && 45 45 - focusBlock( 46 46 - { 47 47 - type: type.data.value, 48 48 - parent: focusedBlock.parent, 49 49 - value: focusedBlock.entityID, 50 50 - }, 51 51 - { type: "end" }, 52 52 - ); 53 53 - } 54 54 - } 55 55 - }} 56 56 - tooltipContent={ 57 57 - <span>{!locked?.data.value ? "Lock Editing" : " Unlock to Edit"}</span> 58 58 - } 59 59 - > 60 60 - {!locked?.data.value ? <LockSmall /> : <UnlockSmall />} 61 61 - </ToolbarButton> 62 62 - ); 63 63 - } 64 64 - 65 65 - const LockSmall = (props: Props) => { 66 66 - return ( 67 67 - <svg 68 68 - width="24" 69 69 - height="24" 70 70 - viewBox="0 0 24 24" 71 71 - fill="none" 72 72 - xmlns="http://www.w3.org/2000/svg" 73 73 - {...props} 74 74 - > 75 75 - <path 76 76 - fillRule="evenodd" 77 77 - clipRule="evenodd" 78 78 - d="M12 3.9657C9.73217 3.9657 7.89374 5.80413 7.89374 8.07196V10.1794H7.78851C6.82201 10.1794 6.03851 10.9629 6.03851 11.9294V17C6.03851 18.6569 7.38166 20 9.03851 20H14.9615C16.6184 20 17.9615 18.6569 17.9615 17V11.9294C17.9615 10.9629 17.178 10.1794 16.2115 10.1794H16.1063V8.07196C16.1063 5.80413 14.2678 3.9657 12 3.9657ZM14.3563 10.1794V8.07196C14.3563 6.77063 13.3013 5.7157 12 5.7157C10.6987 5.7157 9.64374 6.77063 9.64374 8.07196V10.1794H14.3563ZM12.5824 15.3512C12.9924 15.1399 13.2727 14.7123 13.2727 14.2193C13.2727 13.5165 12.7029 12.9467 12 12.9467C11.2972 12.9467 10.7274 13.5165 10.7274 14.2193C10.7274 14.7271 11.0247 15.1654 11.4548 15.3696L11.2418 17.267C11.2252 17.4152 11.3411 17.5449 11.4902 17.5449H12.5147C12.6621 17.5449 12.7774 17.4181 12.7636 17.2714L12.5824 15.3512Z" 79 79 - fill="currentColor" 80 80 - /> 81 81 - </svg> 82 82 - ); 83 83 - }; 84 84 - 85 85 - const UnlockSmall = (props: Props) => { 86 86 - return ( 87 87 - <svg 88 88 - width="24" 89 89 - height="24" 90 90 - viewBox="0 0 24 24" 91 91 - fill="none" 92 92 - xmlns="http://www.w3.org/2000/svg" 93 93 - {...props} 94 94 - > 95 95 - <path 96 96 - fillRule="evenodd" 97 97 - clipRule="evenodd" 98 98 - d="M7.89376 6.62482C7.89376 4.35699 9.7322 2.51855 12 2.51855C14.2678 2.51855 16.1063 4.35699 16.1063 6.62482V10.1794H16.2115C17.178 10.1794 17.9615 10.9629 17.9615 11.9294V17C17.9615 18.6569 16.6184 20 14.9615 20H9.03854C7.38168 20 6.03854 18.6569 6.03854 17V11.9294C6.03854 10.9629 6.82204 10.1794 7.78854 10.1794H14.3563V6.62482C14.3563 5.32349 13.3013 4.26855 12 4.26855C10.6987 4.26855 9.64376 5.32349 9.64376 6.62482V7.72078C9.64376 8.20403 9.25201 8.59578 8.76876 8.59578C8.28551 8.59578 7.89376 8.20403 7.89376 7.72078V6.62482ZM13.1496 14.2193C13.1496 14.7123 12.8693 15.1399 12.4593 15.3512L12.6405 17.2714C12.6544 17.4181 12.539 17.5449 12.3916 17.5449H11.3672C11.218 17.5449 11.1021 17.4152 11.1187 17.267L11.3317 15.3696C10.9016 15.1654 10.6043 14.7271 10.6043 14.2193C10.6043 13.5165 11.1741 12.9467 11.8769 12.9467C12.5798 12.9467 13.1496 13.5165 13.1496 14.2193ZM5.62896 5.3862C5.4215 5.20395 5.10558 5.2244 4.92333 5.43186C4.74109 5.63932 4.76153 5.95525 4.969 6.13749L6.06209 7.09771C6.26955 7.27996 6.58548 7.25951 6.76772 7.05205C6.94997 6.84458 6.92952 6.52866 6.72206 6.34642L5.62896 5.3862ZM3.5165 6.64283C3.25418 6.55657 2.97159 6.69929 2.88533 6.96161C2.79906 7.22393 2.94178 7.50652 3.20411 7.59278L5.54822 8.36366C5.81054 8.44992 6.09313 8.3072 6.1794 8.04488C6.26566 7.78256 6.12294 7.49997 5.86062 7.41371L3.5165 6.64283ZM3.54574 9.42431C3.52207 9.14918 3.72592 8.90696 4.00105 8.8833L5.52254 8.75244C5.79766 8.72878 6.03988 8.93263 6.06354 9.20776C6.08721 9.48288 5.88335 9.7251 5.60823 9.74876L4.08674 9.87962C3.81162 9.90329 3.5694 9.69943 3.54574 9.42431Z" 99 99 - fill="currentColor" 100 100 - /> 101 101 - </svg> 102 102 - ); 103 103 - };

+33 -12

components/Toolbar/MultiSelectToolbar.tsx

··· 2 2 import { ReplicacheMutators, useReplicache } from "src/replicache"; 3 3 import { ToolbarButton } from "./index"; 4 4 import { copySelection } from "src/utils/copySelection"; 5 5 - import { useSmoker } from "components/Toast"; 6 6 - import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 7 7 - import { Replicache } from "replicache"; 8 8 - import { LockBlockButton } from "./LockBlockButton"; 5 5 + import { useSmoker, useToaster } from "components/Toast"; 6 6 + 9 7 import { Props } from "components/Icons/Props"; 10 8 import { TextAlignmentButton } from "./TextAlignmentToolbar"; 11 9 import { getSortedSelection } from "components/SelectionManager/selectionState"; 10 10 + import { deleteBlock } from "src/utils/deleteBlock"; 11 11 + import { Separator, ShortcutKey } from "components/Layout"; 12 12 13 13 export const MultiselectToolbar = (props: { 14 14 - setToolbarState: ( 15 15 - state: "areYouSure" | "multiselect" | "text-alignment", 16 16 - ) => void; 14 14 + setToolbarState: (state: "multiselect" | "text-alignment") => void; 17 15 }) => { 18 18 - const { rep } = useReplicache(); 16 16 + const { rep, undoManager } = useReplicache(); 19 17 const smoker = useSmoker(); 18 18 + const toaster = useToaster(); 20 19 21 20 const handleCopy = async (event: React.MouseEvent) => { 22 21 if (!rep) return; 23 23 - const [sortedSelection] = await getSortedSelection(rep); 22 22 + let [sortedSelection] = await getSortedSelection(rep); 24 23 await copySelection(rep, sortedSelection); 25 24 smoker({ 26 25 position: { x: event.clientX, y: event.clientY }, ··· 33 32 <div className="flex items-center gap-2"> 34 33 <ToolbarButton 35 34 tooltipContent="Delete Selected Blocks" 36 36 - onClick={() => { 37 37 - props.setToolbarState("areYouSure"); 35 35 + onClick={async (e) => { 36 36 + e.stopPropagation(); 37 37 + if (!rep) return; 38 38 + let [sortedSelection] = await getSortedSelection(rep); 39 39 + await deleteBlock( 40 40 + sortedSelection.map((b) => b.value), 41 41 + rep, 42 42 + undoManager, 43 43 + ); 44 44 + 45 45 + toaster({ 46 46 + content: ( 47 47 + <div className="font-bold items-center flex"> 48 48 + {sortedSelection.length} block 49 49 + {sortedSelection.length === 1 ? "" : "s"} deleted!{" "} 50 50 + <span className="px-2 flex"> 51 51 + <ShortcutKey>Ctrl</ShortcutKey> 52 52 + <ShortcutKey>Z</ShortcutKey>{" "} 53 53 + </span> 54 54 + to undo. 55 55 + </div> 56 56 + ), 57 57 + type: "success", 58 58 + }); 38 59 }} 39 60 > 40 61 <TrashSmall /> ··· 47 68 <CopySmall /> 48 69 </ToolbarButton> 49 70 <TextAlignmentButton setToolbarState={props.setToolbarState} /> 50 50 - <LockBlockButton /> 71 71 + <Separator classname="h-6!" /> 51 72 </div> 52 73 </div> 53 74 );

+8

components/Toolbar/TextAlignmentToolbar.tsx

··· 7 7 export function TextAlignmentToolbar() { 8 8 let focusedBlock = useUIState((s) => s.focusedEntity); 9 9 let { rep } = useReplicache(); 10 10 + let alignment = useEntity( 11 11 + focusedBlock?.entityID || null, 12 12 + "block/text-alignment", 13 13 + )?.data.value; 10 14 let setAlignment = useCallback( 11 15 (alignment: Fact<"block/text-alignment">["data"]["value"]) => { 12 16 let blocks = useUIState.getState().selectedBlocks; ··· 26 30 <ToolbarButton 27 31 onClick={() => setAlignment("left")} 28 32 tooltipContent="Align Left" 33 33 + active={alignment === "left"} 29 34 > 30 35 <AlignLeftSmall /> 31 36 </ToolbarButton> 32 37 <ToolbarButton 33 38 onClick={() => setAlignment("center")} 34 39 tooltipContent="Align Center" 40 40 + active={alignment === "center"} 35 41 > 36 42 <AlignCenterSmall /> 37 43 </ToolbarButton> 38 44 <ToolbarButton 39 45 onClick={() => setAlignment("right")} 40 46 tooltipContent="Align Right" 47 47 + active={alignment === "right"} 41 48 > 42 49 <AlignRightSmall /> 43 50 </ToolbarButton> ··· 45 52 <ToolbarButton 46 53 onClick={() => setAlignment("justify")} 47 54 tooltipContent="Align Justified" 55 55 + active={alignment === "justify"} 48 56 > 49 57 <AlignJustifiedSmall /> 50 58 </ToolbarButton>

-3

components/Toolbar/TextToolbar.tsx

··· 8 8 import { ToolbarTypes } from "."; 9 9 import { schema } from "components/Blocks/TextBlock/schema"; 10 10 import { TextAlignmentButton } from "./TextAlignmentToolbar"; 11 11 - import { LockBlockButton } from "./LockBlockButton"; 12 11 import { Props } from "components/Icons/Props"; 13 12 import { isMac } from "src/utils/isDevice"; 14 13 ··· 81 80 <TextAlignmentButton setToolbarState={props.setToolbarState} /> 82 81 <ListButton setToolbarState={props.setToolbarState} /> 83 82 <Separator classname="h-6!" /> 84 84 - 85 85 - <LockBlockButton /> 86 83 </> 87 84 ); 88 85 };

+57 -87

components/Toolbar/index.tsx

··· 11 11 import { ListToolbar } from "./ListToolbar"; 12 12 import { HighlightToolbar } from "./HighlightToolbar"; 13 13 import { TextToolbar } from "./TextToolbar"; 14 14 - import { BlockToolbar } from "./BlockToolbar"; 14 14 + import { ImageToolbar } from "./ImageToolbar"; 15 15 import { MultiselectToolbar } from "./MultiSelectToolbar"; 16 16 - import { AreYouSure } from "components/Blocks/DeleteBlock"; 17 17 - import { deleteBlock } from "src/utils/deleteBlock"; 18 16 import { TooltipButton } from "components/Buttons"; 19 17 import { TextAlignmentToolbar } from "./TextAlignmentToolbar"; 20 18 import { useIsMobile } from "src/hooks/isMobile"; 21 19 import { CloseTiny } from "components/Icons/CloseTiny"; 22 20 23 21 export type ToolbarTypes = 24 24 - | "areYouSure" 25 22 | "default" 26 26 - | "block" 27 23 | "multiselect" 28 24 | "highlight" 29 25 | "link" ··· 31 27 | "text-alignment" 32 28 | "list" 33 29 | "linkBlock" 34 34 - | "img-alt-text"; 35 35 - 36 36 - export const Toolbar = (props: { pageID: string; blockID: string }) => { 37 37 - let { rep } = useReplicache(); 30 30 + | "img-alt-text" 31 31 + | "image"; 38 32 33 33 + export const Toolbar = (props: { 34 34 + pageID: string; 35 35 + blockID: string; 36 36 + blockType: string | null | undefined; 37 37 + }) => { 39 38 let [toolbarState, setToolbarState] = useState<ToolbarTypes>("default"); 40 39 41 41 - let focusedEntity = useUIState((s) => s.focusedEntity); 42 42 - let selectedBlocks = useUIState((s) => s.selectedBlocks); 43 40 let activeEditor = useEditorStates((s) => s.editorStates[props.blockID]); 44 44 - 45 45 - let blockType = useEntity(props.blockID, "block/type")?.data.value; 41 41 + let selectedBlocks = useUIState((s) => s.selectedBlocks); 46 42 47 43 let lastUsedHighlight = useUIState((s) => s.lastUsedHighlight); 48 44 let setLastUsedHighlight = (color: "1" | "2" | "3") => ··· 64 60 }; 65 61 }, [toolbarState]); 66 62 67 67 - useEffect(() => { 68 68 - if (!blockType) return; 69 69 - if ( 70 70 - blockType !== "heading" && 71 71 - blockType !== "text" && 72 72 - blockType !== "blockquote" 73 73 - ) { 74 74 - setToolbarState("block"); 75 75 - } else { 76 76 - setToolbarState("default"); 77 77 - } 78 78 - }, [blockType]); 63 63 + let isTextBlock = 64 64 + props.blockType === "heading" || 65 65 + props.blockType === "text" || 66 66 + props.blockType === "blockquote"; 79 67 80 68 useEffect(() => { 81 81 - if ( 82 82 - selectedBlocks.length > 1 && 83 83 - !["areYousure", "text-alignment"].includes(toolbarState) 84 84 - ) { 69 69 + if (selectedBlocks.length > 1) { 85 70 setToolbarState("multiselect"); 86 86 - } else if (toolbarState === "multiselect") { 71 71 + return; 72 72 + } 73 73 + if (isTextBlock) { 87 74 setToolbarState("default"); 88 75 } 89 89 - }, [selectedBlocks.length, toolbarState]); 90 90 - let isMobile = useIsMobile(); 76 76 + if (props.blockType === "image") { 77 77 + setToolbarState("image"); 78 78 + } 79 79 + if (props.blockType === "button" || props.blockType === "datetime") { 80 80 + setToolbarState("text-alignment"); 81 81 + } else null; 82 82 + }, [props.blockType, selectedBlocks]); 91 83 84 84 + let isMobile = useIsMobile(); 92 85 return ( 93 86 <Tooltip.Provider> 94 87 <div ··· 125 118 <TextBlockTypeToolbar onClose={() => setToolbarState("default")} /> 126 119 ) : toolbarState === "text-alignment" ? ( 127 120 <TextAlignmentToolbar /> 128 128 - ) : toolbarState === "block" ? ( 129 129 - <BlockToolbar setToolbarState={setToolbarState} /> 121 121 + ) : toolbarState === "image" ? ( 122 122 + <ImageToolbar setToolbarState={setToolbarState} /> 130 123 ) : toolbarState === "multiselect" ? ( 131 124 <MultiselectToolbar setToolbarState={setToolbarState} /> 132 132 - ) : toolbarState === "areYouSure" ? ( 133 133 - <AreYouSure 134 134 - compact 135 135 - type={blockType} 136 136 - entityID={selectedBlocks.map((b) => b.value)} 137 137 - onClick={() => { 138 138 - rep && 139 139 - deleteBlock( 140 140 - selectedBlocks.map((b) => b.value), 141 141 - rep, 142 142 - ); 143 143 - }} 144 144 - closeAreYouSure={() => { 145 145 - setToolbarState( 146 146 - selectedBlocks.length > 1 147 147 - ? "multiselect" 148 148 - : blockType !== "heading" && blockType !== "text" 149 149 - ? "block" 150 150 - : "default", 151 151 - ); 152 152 - }} 153 153 - /> 154 125 ) : null} 155 126 </div> 156 127 {/* if the thing is are you sure state, don't show the x... is each thing handling its own are you sure? theres no need for that */} 157 157 - {toolbarState !== "areYouSure" && ( 158 158 - <button 159 159 - className="toolbarBackToDefault hover:text-accent-contrast" 160 160 - onMouseDown={(e) => { 161 161 - e.preventDefault(); 162 162 - if ( 163 163 - toolbarState === "multiselect" || 164 164 - toolbarState === "block" || 165 165 - toolbarState === "default" 166 166 - ) { 167 167 - useUIState.setState(() => ({ 168 168 - focusedEntity: { 169 169 - entityType: "page", 170 170 - entityID: props.pageID, 171 171 - }, 172 172 - selectedBlocks: [], 173 173 - })); 174 174 - } else { 175 175 - if (blockType !== "heading" && blockType !== "text") { 176 176 - setToolbarState("block"); 177 177 - } else { 178 178 - setToolbarState("default"); 179 179 - } 128 128 + 129 129 + <button 130 130 + className="toolbarBackToDefault hover:text-accent-contrast" 131 131 + onMouseDown={(e) => { 132 132 + e.preventDefault(); 133 133 + if ( 134 134 + toolbarState === "multiselect" || 135 135 + toolbarState === "image" || 136 136 + toolbarState === "default" 137 137 + ) { 138 138 + // close the toolbar 139 139 + useUIState.setState(() => ({ 140 140 + focusedEntity: { 141 141 + entityType: "page", 142 142 + entityID: props.pageID, 143 143 + }, 144 144 + selectedBlocks: [], 145 145 + })); 146 146 + } else { 147 147 + if (props.blockType === "image") { 148 148 + setToolbarState("image"); 180 149 } 181 181 - }} 182 182 - > 183 183 - <CloseTiny /> 184 184 - </button> 185 185 - )} 150 150 + if (isTextBlock) { 151 151 + setToolbarState("default"); 152 152 + } 153 153 + } 154 154 + }} 155 155 + > 156 156 + <CloseTiny /> 157 157 + </button> 186 158 </div> 187 159 </Tooltip.Provider> 188 160 ); ··· 198 170 hiddenOnCanvas?: boolean; 199 171 }) => { 200 172 let focusedEntity = useUIState((s) => s.focusedEntity); 201 201 - let isLocked = useEntity(focusedEntity?.entityID || null, "block/is-locked"); 202 202 - let isDisabled = 203 203 - props.disabled === undefined ? !!isLocked?.data.value : props.disabled; 173 173 + let isDisabled = props.disabled; 204 174 205 175 let focusedEntityType = useEntity( 206 176 focusedEntity?.entityType === "page"

+1

drizzle/schema.ts

··· 140 140 email: text("email"), 141 141 atp_did: text("atp_did"), 142 142 interface_state: jsonb("interface_state"), 143 143 + metadata: jsonb("metadata"), 143 144 }, 144 145 (table) => { 145 146 return {

+3 -3

feeds/index.ts

··· 116 116 } 117 117 query = query 118 118 .or("data->postRef.not.is.null,data->bskyPostRef.not.is.null") 119 119 - .order("indexed_at", { ascending: false }) 119 119 + .order("sort_date", { ascending: false }) 120 120 .order("uri", { ascending: false }) 121 121 .limit(25); 122 122 if (parsedCursor) 123 123 query = query.or( 124 124 - `indexed_at.lt.${parsedCursor.date},and(indexed_at.eq.${parsedCursor.date},uri.lt.${parsedCursor.uri})`, 124 124 + `sort_date.lt.${parsedCursor.date},and(sort_date.eq.${parsedCursor.date},uri.lt.${parsedCursor.uri})`, 125 125 ); 126 126 127 127 let { data, error } = await query; ··· 131 131 posts = posts || []; 132 132 133 133 let lastPost = posts[posts.length - 1]; 134 134 - let newCursor = lastPost ? `${lastPost.indexed_at}::${lastPost.uri}` : null; 134 134 + let newCursor = lastPost ? `${lastPost.sort_date}::${lastPost.uri}` : null; 135 135 return c.json({ 136 136 cursor: newCursor || cursor, 137 137 feed: posts.flatMap((p) => {

+2 -10

lexicons/api/lexicons.ts

··· 1896 1896 'lex:pub.leaflet.theme.color#rgb', 1897 1897 ], 1898 1898 }, 1899 1899 - headingFont: { 1900 1900 - type: 'string', 1901 1901 - maxLength: 100, 1902 1902 - }, 1903 1903 - bodyFont: { 1904 1904 - type: 'string', 1905 1905 - maxLength: 100, 1906 1906 - }, 1907 1899 }, 1908 1900 }, 1909 1901 }, ··· 2223 2215 type: 'ref', 2224 2216 }, 2225 2217 theme: { 2226 2226 - type: 'ref', 2227 2227 - ref: 'lex:pub.leaflet.publication#theme', 2218 2218 + type: 'union', 2219 2219 + refs: ['lex:pub.leaflet.publication#theme'], 2228 2220 }, 2229 2221 description: { 2230 2222 maxGraphemes: 300,

-2

lexicons/api/types/pub/leaflet/publication.ts

··· 76 76 | $Typed<PubLeafletThemeColor.Rgba> 77 77 | $Typed<PubLeafletThemeColor.Rgb> 78 78 | { $type: string } 79 79 - headingFont?: string 80 80 - bodyFont?: string 81 79 } 82 80 83 81 const hashTheme = 'theme'

+1 -1

lexicons/api/types/site/standard/publication.ts

··· 15 15 export interface Record { 16 16 $type: 'site.standard.publication' 17 17 basicTheme?: SiteStandardThemeBasic.Main 18 18 - theme?: PubLeafletPublication.Theme 18 18 + theme?: $Typed<PubLeafletPublication.Theme> | { $type: string } 19 19 description?: string 20 20 icon?: BlobRef 21 21 name: string

-8

lexicons/pub/leaflet/publication.json

··· 112 112 "pub.leaflet.theme.color#rgba", 113 113 "pub.leaflet.theme.color#rgb" 114 114 ] 115 115 - }, 116 116 - "headingFont": { 117 117 - "type": "string", 118 118 - "maxLength": 100 119 119 - }, 120 120 - "bodyFont": { 121 121 - "type": "string", 122 122 - "maxLength": 100 123 115 } 124 116 } 125 117 }

+2 -2

lexicons/site/standard/publication.json

··· 9 9 "type": "ref" 10 10 }, 11 11 "theme": { 12 12 - "type": "ref", 13 13 - "ref": "pub.leaflet.publication#theme" 12 12 + "type": "union", 13 13 + "refs": ["pub.leaflet.publication#theme"] 14 14 }, 15 15 "description": { 16 16 "maxGraphemes": 300,

+40 -5

lexicons/src/normalize.ts

··· 14 14 */ 15 15 16 16 import type * as PubLeafletDocument from "../api/types/pub/leaflet/document"; 17 17 - import type * as PubLeafletPublication from "../api/types/pub/leaflet/publication"; 17 17 + import * as PubLeafletPublication from "../api/types/pub/leaflet/publication"; 18 18 import type * as PubLeafletContent from "../api/types/pub/leaflet/content"; 19 19 import type * as SiteStandardDocument from "../api/types/site/standard/document"; 20 20 import type * as SiteStandardPublication from "../api/types/site/standard/publication"; ··· 31 31 }; 32 32 33 33 // Normalized publication type - uses the generated site.standard.publication type 34 34 - export type NormalizedPublication = SiteStandardPublication.Record; 34 34 + // with the theme narrowed to only the valid pub.leaflet.publication#theme type 35 35 + // (isTheme validates that $type is present, so we use $Typed) 36 36 + // Note: We explicitly list fields rather than using Omit because the generated Record type 37 37 + // has an index signature [k: string]: unknown that interferes with property typing 38 38 + export type NormalizedPublication = { 39 39 + $type: "site.standard.publication"; 40 40 + name: string; 41 41 + url: string; 42 42 + description?: string; 43 43 + icon?: SiteStandardPublication.Record["icon"]; 44 44 + basicTheme?: SiteStandardThemeBasic.Main; 45 45 + theme?: $Typed<PubLeafletPublication.Theme>; 46 46 + preferences?: SiteStandardPublication.Preferences; 47 47 + }; 35 48 36 49 /** 37 50 * Checks if the record is a pub.leaflet.document ··· 210 223 ): NormalizedPublication | null { 211 224 if (!record || typeof record !== "object") return null; 212 225 213 213 - // Pass through site.standard records directly 226 226 + // Pass through site.standard records directly, but validate the theme 214 227 if (isStandardPublication(record)) { 215 215 - return record; 228 228 + // Validate theme - only keep if it's a valid pub.leaflet.publication#theme 229 229 + const theme = PubLeafletPublication.isTheme(record.theme) 230 230 + ? (record.theme as $Typed<PubLeafletPublication.Theme>) 231 231 + : undefined; 232 232 + return { 233 233 + ...record, 234 234 + theme, 235 235 + }; 216 236 } 217 237 218 238 if (isLeafletPublication(record)) { ··· 225 245 226 246 const basicTheme = leafletThemeToBasicTheme(record.theme); 227 247 248 248 + // Validate theme - only keep if it's a valid pub.leaflet.publication#theme with $type set 249 249 + // For legacy records without $type, add it during normalization 250 250 + let theme: $Typed<PubLeafletPublication.Theme> | undefined; 251 251 + if (record.theme) { 252 252 + if (PubLeafletPublication.isTheme(record.theme)) { 253 253 + theme = record.theme as $Typed<PubLeafletPublication.Theme>; 254 254 + } else { 255 255 + // Legacy theme without $type - add it 256 256 + theme = { 257 257 + ...record.theme, 258 258 + $type: "pub.leaflet.publication#theme", 259 259 + }; 260 260 + } 261 261 + } 262 262 + 228 263 // Convert preferences to site.standard format (strip/replace $type) 229 264 const preferences: SiteStandardPublication.Preferences | undefined = 230 265 record.preferences ··· 243 278 description: record.description, 244 279 icon: record.icon, 245 280 basicTheme, 246 246 - theme: record.theme, 281 281 + theme, 247 282 preferences, 248 283 }; 249 284 }

-2

lexicons/src/publication.ts

··· 49 49 showPageBackground: { type: "boolean", default: false }, 50 50 accentBackground: ColorUnion, 51 51 accentText: ColorUnion, 52 52 - headingFont: { type: "string", maxLength: 100 }, 53 53 - bodyFont: { type: "string", maxLength: 100 }, 54 52 }, 55 53 }, 56 54 },

public/fonts/AtkinsonHyperlegibleNext-Italic-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/AtkinsonHyperlegibleNext-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/Lora-Italic-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/Lora-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/NotoSans-Italic-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/NotoSans-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/SourceSans3-Italic-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/SourceSans3-Variable.woff2

This is a binary file and will not be displayed.

public/fonts/iAWriterQuattroV-Italic.ttf

This is a binary file and will not be displayed.

public/fonts/iAWriterQuattroV.ttf

This is a binary file and will not be displayed.

public/fonts/iaw-quattro-vf-Italic.woff2

This is a binary file and will not be displayed.

public/fonts/iaw-quattro-vf.woff2

This is a binary file and will not be displayed.

-154

src/fonts.ts

··· 1 1 - // Font configuration for self-hosted and Google Fonts 2 2 - // This replicates what next/font does but allows dynamic selection per-leaflet 3 3 - 4 4 - export type FontConfig = { 5 5 - id: string; 6 6 - displayName: string; 7 7 - fontFamily: string; 8 8 - fallback: string[]; 9 9 - } & ( 10 10 - | { 11 11 - // Self-hosted fonts with local files 12 12 - type: "local"; 13 13 - files: { 14 14 - path: string; 15 15 - style: "normal" | "italic"; 16 16 - weight?: string; 17 17 - }[]; 18 18 - } 19 19 - | { 20 20 - // Google Fonts loaded via CDN 21 21 - type: "google"; 22 22 - googleFontsFamily: string; // e.g., "Open+Sans:ital,wght@0,400;0,700;1,400;1,700" 23 23 - } 24 24 - | { 25 25 - // System fonts (no loading required) 26 26 - type: "system"; 27 27 - } 28 28 - ); 29 29 - 30 30 - export const fonts: Record<string, FontConfig> = { 31 31 - // Self-hosted variable fonts (WOFF2) 32 32 - quattro: { 33 33 - id: "quattro", 34 34 - displayName: "iA Writer Quattro", 35 35 - fontFamily: "iA Writer Quattro V", 36 36 - type: "local", 37 37 - files: [ 38 38 - { path: "/fonts/iaw-quattro-vf.woff2", style: "normal", weight: "400 700" }, 39 39 - { path: "/fonts/iaw-quattro-vf-Italic.woff2", style: "italic", weight: "400 700" }, 40 40 - ], 41 41 - fallback: ["system-ui", "sans-serif"], 42 42 - }, 43 43 - lora: { 44 44 - id: "lora", 45 45 - displayName: "Lora", 46 46 - fontFamily: "Lora", 47 47 - type: "local", 48 48 - files: [ 49 49 - { path: "/fonts/Lora-Variable.woff2", style: "normal", weight: "400 700" }, 50 50 - { path: "/fonts/Lora-Italic-Variable.woff2", style: "italic", weight: "400 700" }, 51 51 - ], 52 52 - fallback: ["Georgia", "serif"], 53 53 - }, 54 54 - "source-sans": { 55 55 - id: "source-sans", 56 56 - displayName: "Source Sans", 57 57 - fontFamily: "Source Sans 3", 58 58 - type: "local", 59 59 - files: [ 60 60 - { path: "/fonts/SourceSans3-Variable.woff2", style: "normal", weight: "200 900" }, 61 61 - { path: "/fonts/SourceSans3-Italic-Variable.woff2", style: "italic", weight: "200 900" }, 62 62 - ], 63 63 - fallback: ["system-ui", "sans-serif"], 64 64 - }, 65 65 - "atkinson-hyperlegible": { 66 66 - id: "atkinson-hyperlegible", 67 67 - displayName: "Atkinson Hyperlegible", 68 68 - fontFamily: "Atkinson Hyperlegible Next", 69 69 - type: "local", 70 70 - files: [ 71 71 - { path: "/fonts/AtkinsonHyperlegibleNext-Variable.woff2", style: "normal", weight: "200 800" }, 72 72 - { path: "/fonts/AtkinsonHyperlegibleNext-Italic-Variable.woff2", style: "italic", weight: "200 800" }, 73 73 - ], 74 74 - fallback: ["system-ui", "sans-serif"], 75 75 - }, 76 76 - "noto-sans": { 77 77 - id: "noto-sans", 78 78 - displayName: "Noto Sans", 79 79 - fontFamily: "Noto Sans", 80 80 - type: "local", 81 81 - files: [ 82 82 - { path: "/fonts/NotoSans-Variable.woff2", style: "normal", weight: "100 900" }, 83 83 - { path: "/fonts/NotoSans-Italic-Variable.woff2", style: "italic", weight: "100 900" }, 84 84 - ], 85 85 - fallback: ["Arial", "sans-serif"], 86 86 - }, 87 87 - 88 88 - // Google Fonts (no variable version available) 89 89 - "alegreya-sans": { 90 90 - id: "alegreya-sans", 91 91 - displayName: "Alegreya Sans", 92 92 - fontFamily: "Alegreya Sans", 93 93 - type: "google", 94 94 - googleFontsFamily: "Alegreya+Sans:ital,wght@0,400;0,700;1,400;1,700", 95 95 - fallback: ["system-ui", "sans-serif"], 96 96 - }, 97 97 - "space-mono": { 98 98 - id: "space-mono", 99 99 - displayName: "Space Mono", 100 100 - fontFamily: "Space Mono", 101 101 - type: "google", 102 102 - googleFontsFamily: "Space+Mono:ital,wght@0,400;0,700;1,400;1,700", 103 103 - fallback: ["monospace"], 104 104 - }, 105 105 - }; 106 106 - 107 107 - export const defaultFontId = "quattro"; 108 108 - 109 109 - export function getFontConfig(fontId: string | undefined): FontConfig { 110 110 - return fonts[fontId || defaultFontId] || fonts[defaultFontId]; 111 111 - } 112 112 - 113 113 - // Generate @font-face CSS for a local font 114 114 - export function generateFontFaceCSS(font: FontConfig): string { 115 115 - if (font.type !== "local") return ""; 116 116 - return font.files 117 117 - .map((file) => { 118 118 - const format = file.path.endsWith(".woff2") ? "woff2" : "truetype"; 119 119 - return ` 120 120 - @font-face { 121 121 - font-family: '${font.fontFamily}'; 122 122 - src: url('${file.path}') format('${format}'); 123 123 - font-style: ${file.style}; 124 124 - font-weight: ${file.weight || "normal"}; 125 125 - font-display: swap; 126 126 - }`.trim(); 127 127 - }) 128 128 - .join("\n\n"); 129 129 - } 130 130 - 131 131 - // Generate preload link attributes for a local font 132 132 - export function getFontPreloadLinks(font: FontConfig): { href: string; type: string }[] { 133 133 - if (font.type !== "local") return []; 134 134 - return font.files.map((file) => ({ 135 135 - href: file.path, 136 136 - type: file.path.endsWith(".woff2") ? "font/woff2" : "font/ttf", 137 137 - })); 138 138 - } 139 139 - 140 140 - // Get Google Fonts URL for a font 141 141 - // Using display=swap per Google's recommendation: shows fallback immediately, swaps when ready 142 142 - // This is better UX than blocking text rendering (display=block) 143 143 - export function getGoogleFontsUrl(font: FontConfig): string | null { 144 144 - if (font.type !== "google") return null; 145 145 - return `https://fonts.googleapis.com/css2?family=${font.googleFontsFamily}&display=swap`; 146 146 - } 147 147 - 148 148 - // Get the CSS font-family value with fallbacks 149 149 - export function getFontFamilyValue(font: FontConfig): string { 150 150 - const family = font.fontFamily.includes(" ") 151 151 - ? `'${font.fontFamily}'` 152 152 - : font.fontFamily; 153 153 - return [family, ...font.fallback].join(", "); 154 154 - }

+1 -1

src/hooks/useLongPress.ts

··· 90 90 return useMemo( 91 91 () => ({ 92 92 isLongPress: isLongPress, 93 93 - handlers: { 93 93 + longPressHandlers: { 94 94 onPointerDown, 95 95 onPointerUp: end, 96 96 onClickCapture: click,

+106 -2

src/notifications.ts

··· 21 21 | { type: "comment"; comment_uri: string; parent_uri?: string } 22 22 | { type: "subscribe"; subscription_uri: string } 23 23 | { type: "quote"; bsky_post_uri: string; document_uri: string } 24 24 + | { type: "bsky_post_embed"; document_uri: string; bsky_post_uri: string } 24 25 | { type: "mention"; document_uri: string; mention_type: "did" } 25 26 | { type: "mention"; document_uri: string; mention_type: "publication"; mentioned_uri: string } 26 27 | { type: "mention"; document_uri: string; mention_type: "document"; mentioned_uri: string } ··· 32 33 | HydratedCommentNotification 33 34 | HydratedSubscribeNotification 34 35 | HydratedQuoteNotification 36 36 + | HydratedBskyPostEmbedNotification 35 37 | HydratedMentionNotification 36 38 | HydratedCommentMentionNotification; 37 39 export async function hydrateNotifications( 38 40 notifications: NotificationRow[], 39 41 ): Promise<Array<HydratedNotification>> { 40 42 // Call all hydrators in parallel 41 41 - const [commentNotifications, subscribeNotifications, quoteNotifications, mentionNotifications, commentMentionNotifications] = await Promise.all([ 43 43 + const [commentNotifications, subscribeNotifications, quoteNotifications, bskyPostEmbedNotifications, mentionNotifications, commentMentionNotifications] = await Promise.all([ 42 44 hydrateCommentNotifications(notifications), 43 45 hydrateSubscribeNotifications(notifications), 44 46 hydrateQuoteNotifications(notifications), 47 47 + hydrateBskyPostEmbedNotifications(notifications), 45 48 hydrateMentionNotifications(notifications), 46 49 hydrateCommentMentionNotifications(notifications), 47 50 ]); 48 51 49 52 // Combine all hydrated notifications 50 50 - const allHydrated = [...commentNotifications, ...subscribeNotifications, ...quoteNotifications, ...mentionNotifications, ...commentMentionNotifications]; 53 53 + const allHydrated = [...commentNotifications, ...subscribeNotifications, ...quoteNotifications, ...bskyPostEmbedNotifications, ...mentionNotifications, ...commentMentionNotifications]; 51 54 52 55 // Sort by created_at to maintain order 53 56 allHydrated.sort( ··· 198 201 document_uri: notification.data.document_uri, 199 202 bskyPost, 200 203 document, 204 204 + normalizedDocument: normalizeDocumentRecord(document.data, document.uri), 205 205 + normalizedPublication: normalizePublicationRecord( 206 206 + document.documents_in_publications[0]?.publications?.record, 207 207 + ), 208 208 + }; 209 209 + }) 210 210 + .filter((n) => n !== null); 211 211 + } 212 212 + 213 213 + export type HydratedBskyPostEmbedNotification = Awaited< 214 214 + ReturnType<typeof hydrateBskyPostEmbedNotifications> 215 215 + >[0]; 216 216 + 217 217 + async function hydrateBskyPostEmbedNotifications(notifications: NotificationRow[]) { 218 218 + const bskyPostEmbedNotifications = notifications.filter( 219 219 + (n): n is NotificationRow & { data: ExtractNotificationType<"bsky_post_embed"> } => 220 220 + (n.data as NotificationData)?.type === "bsky_post_embed", 221 221 + ); 222 222 + 223 223 + if (bskyPostEmbedNotifications.length === 0) { 224 224 + return []; 225 225 + } 226 226 + 227 227 + // Fetch document data (the leaflet that embedded the post) 228 228 + const documentUris = bskyPostEmbedNotifications.map((n) => n.data.document_uri); 229 229 + const bskyPostUris = bskyPostEmbedNotifications.map((n) => n.data.bsky_post_uri); 230 230 + 231 231 + const [{ data: documents }, { data: cachedBskyPosts }] = await Promise.all([ 232 232 + supabaseServerClient 233 233 + .from("documents") 234 234 + .select("*, documents_in_publications(publications(*))") 235 235 + .in("uri", documentUris), 236 236 + supabaseServerClient 237 237 + .from("bsky_posts") 238 238 + .select("*") 239 239 + .in("uri", bskyPostUris), 240 240 + ]); 241 241 + 242 242 + // Find which posts we need to fetch from the API 243 243 + const cachedPostUris = new Set(cachedBskyPosts?.map((p) => p.uri) ?? []); 244 244 + const missingPostUris = bskyPostUris.filter((uri) => !cachedPostUris.has(uri)); 245 245 + 246 246 + // Fetch missing posts from Bluesky API 247 247 + const fetchedPosts = new Map<string, { text: string } | null>(); 248 248 + if (missingPostUris.length > 0) { 249 249 + try { 250 250 + const { AtpAgent } = await import("@atproto/api"); 251 251 + const agent = new AtpAgent({ service: "https://public.api.bsky.app" }); 252 252 + const response = await agent.app.bsky.feed.getPosts({ uris: missingPostUris }); 253 253 + for (const post of response.data.posts) { 254 254 + const record = post.record as { text?: string }; 255 255 + fetchedPosts.set(post.uri, { text: record.text ?? "" }); 256 256 + } 257 257 + } catch (error) { 258 258 + console.error("Failed to fetch Bluesky posts:", error); 259 259 + } 260 260 + } 261 261 + 262 262 + // Extract unique DIDs from document URIs to resolve handles 263 263 + const documentCreatorDids = [...new Set(documentUris.map((uri) => new AtUri(uri).host))]; 264 264 + 265 265 + // Resolve DIDs to handles in parallel 266 266 + const didToHandleMap = new Map<string, string | null>(); 267 267 + await Promise.all( 268 268 + documentCreatorDids.map(async (did) => { 269 269 + try { 270 270 + const resolved = await idResolver.did.resolve(did); 271 271 + const handle = resolved?.alsoKnownAs?.[0] 272 272 + ? resolved.alsoKnownAs[0].slice(5) // Remove "at://" prefix 273 273 + : null; 274 274 + didToHandleMap.set(did, handle); 275 275 + } catch (error) { 276 276 + console.error(`Failed to resolve DID ${did}:`, error); 277 277 + didToHandleMap.set(did, null); 278 278 + } 279 279 + }), 280 280 + ); 281 281 + 282 282 + return bskyPostEmbedNotifications 283 283 + .map((notification) => { 284 284 + const document = documents?.find((d) => d.uri === notification.data.document_uri); 285 285 + if (!document) return null; 286 286 + 287 287 + const documentCreatorDid = new AtUri(notification.data.document_uri).host; 288 288 + const documentCreatorHandle = didToHandleMap.get(documentCreatorDid) ?? null; 289 289 + 290 290 + // Get post text from cache or fetched data 291 291 + const cachedPost = cachedBskyPosts?.find((p) => p.uri === notification.data.bsky_post_uri); 292 292 + const postView = cachedPost?.post_view as { record?: { text?: string } } | undefined; 293 293 + const bskyPostText = postView?.record?.text ?? fetchedPosts.get(notification.data.bsky_post_uri)?.text ?? null; 294 294 + 295 295 + return { 296 296 + id: notification.id, 297 297 + recipient: notification.recipient, 298 298 + created_at: notification.created_at, 299 299 + type: "bsky_post_embed" as const, 300 300 + document_uri: notification.data.document_uri, 301 301 + bsky_post_uri: notification.data.bsky_post_uri, 302 302 + document, 303 303 + documentCreatorHandle, 304 304 + bskyPostText, 201 305 normalizedDocument: normalizeDocumentRecord(document.data, document.uri), 202 306 normalizedPublication: normalizePublicationRecord( 203 307 document.documents_in_publications[0]?.publications?.record,

+1 -5

src/replicache/attributes.ts

··· 187 187 } as const; 188 188 189 189 export const ThemeAttributes = { 190 190 - "theme/heading-font": { 191 191 - type: "string", 192 192 - cardinality: "one", 193 193 - }, 194 194 - "theme/body-font": { 190 190 + "theme/font": { 195 191 type: "string", 196 192 cardinality: "one", 197 193 },

+7

src/replicache/clientMutationContext.ts

··· 67 67 textData.value = base64.fromByteArray(updateBytes); 68 68 } 69 69 } 70 70 + } else if (f.id) { 71 71 + // For cardinality "many" with an explicit ID, fetch the existing fact 72 72 + // so undo can restore it instead of deleting 73 73 + let fact = await tx.get(f.id); 74 74 + if (fact) { 75 75 + existingFact = [fact as Fact<any>]; 76 76 + } 70 77 } 71 78 if (!ignoreUndo) 72 79 undoManager.add({

+31 -10

src/replicache/mutations.ts

··· 4 4 import { SupabaseClient } from "@supabase/supabase-js"; 5 5 import { Database } from "supabase/database.types"; 6 6 import { generateKeyBetween } from "fractional-indexing"; 7 7 + import { v7 } from "uuid"; 7 8 8 9 export type MutationContext = { 9 10 permission_token_id: string; ··· 307 308 { blockEntity: string } | { blockEntity: string }[] 308 309 > = async (args, ctx) => { 309 310 for (let block of [args].flat()) { 310 310 - let [isLocked] = await ctx.scanIndex.eav( 311 311 - block.blockEntity, 312 312 - "block/is-locked", 313 313 - ); 314 314 - if (isLocked?.data.value) continue; 315 311 let [image] = await ctx.scanIndex.eav(block.blockEntity, "block/image"); 316 312 await ctx.runOnServer(async ({ supabase }) => { 317 313 if (image) { ··· 427 423 }, 428 424 }); 429 425 }; 430 430 - const moveBlockDown: Mutation<{ entityID: string; parent: string }> = async ( 431 431 - args, 432 432 - ctx, 433 433 - ) => { 426 426 + const moveBlockDown: Mutation<{ 427 427 + entityID: string; 428 428 + parent: string; 429 429 + permission_set?: string; 430 430 + }> = async (args, ctx) => { 434 431 let children = (await ctx.scanIndex.eav(args.parent, "card/block")).toSorted( 435 432 (a, b) => (a.data.position > b.data.position ? 1 : -1), 436 433 ); 437 434 let index = children.findIndex((f) => f.data.value === args.entityID); 438 435 if (index === -1) return; 439 436 let next = children[index + 1]; 440 440 - if (!next) return; 437 437 + if (!next) { 438 438 + // If this is the last block, create a new empty block above it using the addBlock helper 439 439 + if (!args.permission_set) return; // Can't create block without permission_set 440 440 + 441 441 + let newEntityID = v7(); 442 442 + let previousBlock = children[index - 1]; 443 443 + let position = generateKeyBetween( 444 444 + previousBlock?.data.position || null, 445 445 + children[index].data.position, 446 446 + ); 447 447 + 448 448 + // Call the addBlock mutation helper directly 449 449 + await addBlock( 450 450 + { 451 451 + parent: args.parent, 452 452 + permission_set: args.permission_set, 453 453 + factID: v7(), 454 454 + type: "text", 455 455 + newEntityID: newEntityID, 456 456 + position: position, 457 457 + }, 458 458 + ctx, 459 459 + ); 460 460 + return; 461 461 + } 441 462 await ctx.retractFact(children[index].id); 442 463 await ctx.assertFact({ 443 464 id: children[index].id,

+10 -2

src/utils/deleteBlock.ts

··· 4 4 import { scanIndex } from "src/replicache/utils"; 5 5 import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 6 6 import { focusBlock } from "src/utils/focusBlock"; 7 7 + import { UndoManager } from "src/undoManager"; 7 8 8 9 export async function deleteBlock( 9 10 entities: string[], 10 11 rep: Replicache<ReplicacheMutators>, 12 12 + undoManager?: UndoManager, 11 13 ) { 12 14 // get what pagess we need to close as a result of deleting this block 13 15 let pagesToClose = [] as string[]; ··· 32 34 } 33 35 } 34 36 35 35 - // the next and previous blocks in the block list 36 36 - // if the focused thing is a page and not a block, return 37 37 + // figure out what to focus 37 38 let focusedBlock = useUIState.getState().focusedEntity; 38 39 let parent = 39 40 focusedBlock?.entityType === "page" ··· 44 45 let parentType = await rep?.query((tx) => 45 46 scanIndex(tx).eav(parent, "page/type"), 46 47 ); 48 48 + // if the page is a canvas, focus the page 47 49 if (parentType[0]?.data.value === "canvas") { 48 50 useUIState 49 51 .getState() 50 52 .setFocusedBlock({ entityType: "page", entityID: parent }); 51 53 useUIState.getState().setSelectedBlocks([]); 52 54 } else { 55 55 + // if the page is a doc, focus the previous block (or if there isn't a prev block, focus the next block) 53 56 let siblings = 54 57 (await rep?.query((tx) => getBlocksWithType(tx, parent))) || []; 55 58 ··· 105 108 } 106 109 } 107 110 111 111 + // close the pages 108 112 pagesToClose.forEach((page) => page && useUIState.getState().closePage(page)); 113 113 + undoManager && undoManager.startGroup(); 114 114 + 115 115 + // delete the blocks 109 116 await Promise.all( 110 117 entities.map((entity) => 111 118 rep?.mutate.removeBlock({ ··· 113 120 }), 114 121 ), 115 122 ); 123 123 + undoManager && undoManager.endGroup(); 116 124 }

+3 -1

src/utils/focusBlock.ts

··· 48 48 } 49 49 50 50 if (pos?.offset !== undefined) { 51 51 - el?.focus(); 51 51 + // trying to focus the block in a subpage causes the page to flash and scroll back to the parent page. 52 52 + // idk how to fix so i'm giving up -- celine 53 53 + // el?.focus(); 52 54 requestAnimationFrame(() => { 53 55 el?.setSelectionRange(pos.offset, pos.offset); 54 56 });

+81

src/utils/moveBlock.ts

··· 1 1 + import { Replicache } from "replicache"; 2 2 + import { ReplicacheMutators } from "src/replicache"; 3 3 + import { getSortedSelection } from "components/SelectionManager/selectionState"; 4 4 + import { useUIState } from "src/useUIState"; 5 5 + 6 6 + export const moveBlockUp = async (rep: Replicache<ReplicacheMutators>) => { 7 7 + let [sortedBlocks, siblings] = await getSortedSelection(rep); 8 8 + if (sortedBlocks.length > 1) return; 9 9 + let block = sortedBlocks[0]; 10 10 + let previousBlock = 11 11 + siblings?.[siblings.findIndex((s) => s.value === block.value) - 1]; 12 12 + if (previousBlock.value === block.listData?.parent) { 13 13 + previousBlock = 14 14 + siblings?.[siblings.findIndex((s) => s.value === block.value) - 2]; 15 15 + } 16 16 + 17 17 + if ( 18 18 + previousBlock?.listData && 19 19 + block.listData && 20 20 + block.listData.depth > 1 && 21 21 + !previousBlock.listData.path.find( 22 22 + (f) => f.entity === block.listData?.parent, 23 23 + ) 24 24 + ) { 25 25 + let depth = block.listData.depth; 26 26 + let newParent = previousBlock.listData.path.find( 27 27 + (f) => f.depth === depth - 1, 28 28 + ); 29 29 + if (!newParent) return; 30 30 + if (useUIState.getState().foldedBlocks.includes(newParent.entity)) 31 31 + useUIState.getState().toggleFold(newParent.entity); 32 32 + rep?.mutate.moveBlock({ 33 33 + block: block.value, 34 34 + oldParent: block.listData?.parent, 35 35 + newParent: newParent.entity, 36 36 + position: { type: "end" }, 37 37 + }); 38 38 + } else { 39 39 + rep?.mutate.moveBlockUp({ 40 40 + entityID: block.value, 41 41 + parent: block.listData?.parent || block.parent, 42 42 + }); 43 43 + } 44 44 + }; 45 45 + 46 46 + export const moveBlockDown = async ( 47 47 + rep: Replicache<ReplicacheMutators>, 48 48 + permission_set: string, 49 49 + ) => { 50 50 + let [sortedBlocks, siblings] = await getSortedSelection(rep); 51 51 + if (sortedBlocks.length > 1) return; 52 52 + let block = sortedBlocks[0]; 53 53 + let nextBlock = siblings 54 54 + .slice(siblings.findIndex((s) => s.value === block.value) + 1) 55 55 + .find( 56 56 + (f) => 57 57 + f.listData && 58 58 + block.listData && 59 59 + !f.listData.path.find((f) => f.entity === block.value), 60 60 + ); 61 61 + if ( 62 62 + nextBlock?.listData && 63 63 + block.listData && 64 64 + nextBlock.listData.depth === block.listData.depth - 1 65 65 + ) { 66 66 + if (useUIState.getState().foldedBlocks.includes(nextBlock.value)) 67 67 + useUIState.getState().toggleFold(nextBlock.value); 68 68 + rep?.mutate.moveBlock({ 69 69 + block: block.value, 70 70 + oldParent: block.listData?.parent, 71 71 + newParent: nextBlock.value, 72 72 + position: { type: "first" }, 73 73 + }); 74 74 + } else { 75 75 + rep?.mutate.moveBlockDown({ 76 76 + entityID: block.value, 77 77 + parent: block.listData?.parent || block.parent, 78 78 + permission_set: permission_set, 79 79 + }); 80 80 + } 81 81 + };

+8 -1

src/utils/scrollIntoView.ts

··· 6 6 threshold: number = 0.9, 7 7 ) { 8 8 const element = document.getElementById(elementId); 9 9 - scrollIntoViewIfNeeded(element, false, "smooth"); 9 9 + // Use double requestAnimationFrame to ensure the element is fully painted 10 10 + // before attempting to scroll. This fixes smooth scrolling when opening 11 11 + // pages from within other pages. 12 12 + requestAnimationFrame(() => { 13 13 + requestAnimationFrame(() => { 14 14 + scrollIntoViewIfNeeded(element, false, "smooth"); 15 15 + }); 16 16 + }); 10 17 }

+23 -1

src/utils/timeAgo.ts

··· 1 1 - export function timeAgo(timestamp: string): string { 1 1 + export function timeAgo( 2 2 + timestamp: string, 3 3 + options?: { compact?: boolean }, 4 4 + ): string { 5 5 + const { compact } = options ?? {}; 2 6 const now = new Date(); 3 7 const date = new Date(timestamp); 4 8 const diffMs = now.getTime() - date.getTime(); ··· 9 13 const diffWeeks = Math.floor(diffDays / 7); 10 14 const diffMonths = Math.floor(diffDays / 30); 11 15 const diffYears = Math.floor(diffDays / 365); 16 16 + 17 17 + if (compact) { 18 18 + if (diffYears > 0) { 19 19 + return `${diffYears}y`; 20 20 + } else if (diffMonths > 0) { 21 21 + return `${diffMonths}mo`; 22 22 + } else if (diffWeeks > 0) { 23 23 + return `${diffWeeks}w`; 24 24 + } else if (diffDays > 0) { 25 25 + return `${diffDays}d`; 26 26 + } else if (diffHours > 0) { 27 27 + return `${diffHours}h`; 28 28 + } else if (diffMinutes > 0) { 29 29 + return `${diffMinutes}m`; 30 30 + } else { 31 31 + return "now"; 32 32 + } 33 33 + } 12 34 13 35 if (diffYears > 0) { 14 36 return `${diffYears} year${diffYears === 1 ? "" : "s"} ago`;

+1 -1

src/utils/uriHelpers.ts

··· 44 44 ).toString(); 45 45 legacy = AtUri.make(did, ids.PubLeafletPublication, nameOrRkey).toString(); 46 46 } 47 47 - return `name.eq."${nameOrRkey}"",uri.eq."${standard}"",uri.eq."${legacy}"`; 47 47 + return `name.eq."${nameOrRkey}"",uri.eq."${standard}",uri.eq."${legacy}"`; 48 48 }

+4

supabase/database.types.ts

··· 337 337 Row: { 338 338 data: Json 339 339 indexed_at: string 340 340 + sort_date: string 340 341 uri: string 341 342 } 342 343 Insert: { ··· 551 552 home_page: string 552 553 id: string 553 554 interface_state: Json | null 555 555 + metadata: Json | null 554 556 } 555 557 Insert: { 556 558 atp_did?: string | null ··· 559 561 home_page?: string 560 562 id?: string 561 563 interface_state?: Json | null 564 564 + metadata?: Json | null 562 565 } 563 566 Update: { 564 567 atp_did?: string | null ··· 567 570 home_page?: string 568 571 id?: string 569 572 interface_state?: Json | null 573 573 + metadata?: Json | null 570 574 } 571 575 Relationships: [ 572 576 {

+1

supabase/migrations/20260123000000_add_metadata_to_identities.sql

··· 1 1 + alter table "public"."identities" add column "metadata" jsonb;

+28

supabase/migrations/20260125000000_add_sort_date_column.sql

··· 1 1 + -- Add sort_date computed column to documents table 2 2 + -- This column stores the older of publishedAt (from JSON data) or indexed_at 3 3 + -- Used for sorting feeds chronologically by when content was actually published 4 4 + 5 5 + -- Create an immutable function to parse ISO 8601 timestamps from text 6 6 + -- This is needed because direct ::timestamp cast is not immutable (accepts 'now', 'today', etc.) 7 7 + -- The regex validates the format before casting to ensure immutability 8 8 + CREATE OR REPLACE FUNCTION parse_iso_timestamp(text) RETURNS timestamptz 9 9 + LANGUAGE sql IMMUTABLE STRICT AS $$ 10 10 + SELECT CASE 11 11 + -- Match ISO 8601 format: YYYY-MM-DDTHH:MM:SS with optional fractional seconds and Z/timezone 12 12 + WHEN $1 ~ '^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}:?\d{2})?$' THEN 13 13 + $1::timestamptz 14 14 + ELSE 15 15 + NULL 16 16 + END 17 17 + $$; 18 18 + 19 19 + ALTER TABLE documents 20 20 + ADD COLUMN sort_date timestamptz GENERATED ALWAYS AS ( 21 21 + LEAST( 22 22 + COALESCE(parse_iso_timestamp(data->>'publishedAt'), indexed_at), 23 23 + indexed_at 24 24 + ) 25 25 + ) STORED; 26 26 + 27 27 + -- Create index on sort_date for efficient ordering 28 28 + CREATE INDEX documents_sort_date_idx ON documents (sort_date DESC, uri DESC);

+1 -1

tailwind.config.js

··· 65 65 }, 66 66 67 67 fontFamily: { 68 68 - sans: ["var(--theme-font, var(--font-quattro))"], 68 68 + sans: ["var(--font-quattro)"], 69 69 serif: ["Garamond"], 70 70 }, 71 71 },