+1 -1

.prettierrc

··· 1 1 - {} 1 1 + {}

-51

actions/createIdentity.ts

··· 1 1 - import { 2 2 - entities, 3 3 - permission_tokens, 4 4 - permission_token_rights, 5 5 - entity_sets, 6 6 - identities, 7 7 - } from "drizzle/schema"; 8 8 - import { v7 } from "uuid"; 9 9 - import { PgTransaction } from "drizzle-orm/pg-core"; 10 10 - import { NodePgDatabase } from "drizzle-orm/node-postgres"; 11 11 - import { Json } from "supabase/database.types"; 12 12 - 13 13 - export async function createIdentity( 14 14 - db: NodePgDatabase, 15 15 - data?: { email?: string; atp_did?: string }, 16 16 - ) { 17 17 - return db.transaction(async (tx) => { 18 18 - // Create a new entity set 19 19 - let [entity_set] = await tx.insert(entity_sets).values({}).returning(); 20 20 - // Create a root-entity 21 21 - let [entity] = await tx 22 22 - .insert(entities) 23 23 - // And add it to that permission set 24 24 - .values({ set: entity_set.id, id: v7() }) 25 25 - .returning(); 26 26 - //Create a new permission token 27 27 - let [permissionToken] = await tx 28 28 - .insert(permission_tokens) 29 29 - .values({ root_entity: entity.id }) 30 30 - .returning(); 31 31 - //and give it all the permission on that entity set 32 32 - let [rights] = await tx 33 33 - .insert(permission_token_rights) 34 34 - .values({ 35 35 - token: permissionToken.id, 36 36 - entity_set: entity_set.id, 37 37 - read: true, 38 38 - write: true, 39 39 - create_token: true, 40 40 - change_entity_set: true, 41 41 - }) 42 42 - .returning(); 43 43 - let [identity] = await tx 44 44 - .insert(identities) 45 45 - .values({ home_page: permissionToken.id, ...data }) 46 46 - .returning(); 47 47 - return identity as Omit<typeof identity, "interface_state"> & { 48 48 - interface_state: Json; 49 49 - }; 50 50 - }); 51 51 - }

+7 -3

actions/emailAuth.ts

··· 6 6 import { email_auth_tokens, identities } from "drizzle/schema"; 7 7 import { and, eq } from "drizzle-orm"; 8 8 import { cookies } from "next/headers"; 9 9 - import { createIdentity } from "./createIdentity"; 10 9 import { setAuthToken } from "src/auth"; 11 10 import { pool } from "supabase/pool"; 11 11 + import { supabaseServerClient } from "supabase/serverClient"; 12 12 13 13 async function sendAuthCode(email: string, code: string) { 14 14 if (process.env.NODE_ENV === "development") { ··· 114 114 .from(identities) 115 115 .where(eq(identities.email, token.email)); 116 116 if (!identity) { 117 117 - let newIdentity = await createIdentity(db, { email: token.email }); 118 118 - identityID = newIdentity.id; 117 117 + const { data: newIdentity } = await supabaseServerClient 118 118 + .from("identities") 119 119 + .insert({ email: token.email }) 120 120 + .select() 121 121 + .single(); 122 122 + identityID = newIdentity!.id; 119 123 } else { 120 124 identityID = identity.id; 121 125 }

+7 -8

actions/login.ts

··· 4 4 import { 5 5 email_auth_tokens, 6 6 identities, 7 7 - entity_sets, 8 8 - entities, 9 9 - permission_tokens, 10 10 - permission_token_rights, 11 7 permission_token_on_homepage, 12 8 poll_votes_on_entity, 13 9 } from "drizzle/schema"; 14 10 import { and, eq, isNull } from "drizzle-orm"; 15 11 import { cookies } from "next/headers"; 16 12 import { redirect } from "next/navigation"; 17 17 - import { v7 } from "uuid"; 18 18 - import { createIdentity } from "./createIdentity"; 19 13 import { pool } from "supabase/pool"; 14 14 + import { supabaseServerClient } from "supabase/serverClient"; 20 15 21 16 export async function loginWithEmailToken( 22 17 localLeaflets: { token: { id: string }; added_at: string }[], ··· 77 72 identity = existingIdentityFromCookie; 78 73 } 79 74 } else { 80 80 - // Create a new identity 81 81 - identity = await createIdentity(tx, { email: token.email }); 75 75 + const { data: newIdentity } = await supabaseServerClient 76 76 + .from("identities") 77 77 + .insert({ email: token.email }) 78 78 + .select() 79 79 + .single(); 80 80 + identity = newIdentity!; 82 81 } 83 82 } 84 83

+68 -20

actions/publishToPublication.ts

··· 2 2 3 3 import * as Y from "yjs"; 4 4 import * as base64 from "base64-js"; 5 5 - import { createOauthClient } from "src/atproto-oauth"; 5 5 + import { restoreOAuthSession, OAuthSessionError } from "src/atproto-oauth"; 6 6 import { getIdentityData } from "actions/getIdentityData"; 7 7 import { 8 8 AtpBaseClient, ··· 32 32 import { scanIndexLocal } from "src/replicache/utils"; 33 33 import type { Fact } from "src/replicache"; 34 34 import type { Attribute } from "src/replicache/attributes"; 35 35 - import { 36 36 - Delta, 37 37 - YJSFragmentToString, 38 38 - } from "components/Blocks/TextBlock/RenderYJSFragment"; 35 35 + import { Delta, YJSFragmentToString } from "src/utils/yjsFragmentToString"; 39 36 import { ids } from "lexicons/api/lexicons"; 40 37 import { BlobRef } from "@atproto/lexicon"; 41 38 import { AtUri } from "@atproto/syntax"; ··· 50 47 ColorToRGBA, 51 48 } from "components/ThemeManager/colorToLexicons"; 52 49 import { parseColor } from "@react-stately/color"; 53 53 - import { Notification, pingIdentityToUpdateNotification } from "src/notifications"; 50 50 + import { 51 51 + Notification, 52 52 + pingIdentityToUpdateNotification, 53 53 + } from "src/notifications"; 54 54 import { v7 } from "uuid"; 55 55 + 56 56 + type PublishResult = 57 57 + | { success: true; rkey: string; record: PubLeafletDocument.Record } 58 58 + | { success: false; error: OAuthSessionError }; 55 59 56 60 export async function publishToPublication({ 57 61 root_entity, ··· 60 64 title, 61 65 description, 62 66 tags, 67 67 + cover_image, 63 68 entitiesToDelete, 64 69 }: { 65 70 root_entity: string; ··· 68 73 title?: string; 69 74 description?: string; 70 75 tags?: string[]; 76 76 + cover_image?: string | null; 71 77 entitiesToDelete?: string[]; 72 72 - }) { 73 73 - const oauthClient = await createOauthClient(); 78 78 + }): Promise<PublishResult> { 74 79 let identity = await getIdentityData(); 75 75 - if (!identity || !identity.atp_did) throw new Error("No Identity"); 80 80 + if (!identity || !identity.atp_did) { 81 81 + return { 82 82 + success: false, 83 83 + error: { 84 84 + type: "oauth_session_expired", 85 85 + message: "Not authenticated", 86 86 + did: "", 87 87 + }, 88 88 + }; 89 89 + } 76 90 77 77 - let credentialSession = await oauthClient.restore(identity.atp_did); 91 91 + const sessionResult = await restoreOAuthSession(identity.atp_did); 92 92 + if (!sessionResult.ok) { 93 93 + return { success: false, error: sessionResult.error }; 94 94 + } 95 95 + let credentialSession = sessionResult.value; 78 96 let agent = new AtpBaseClient( 79 97 credentialSession.fetchHandler.bind(credentialSession), 80 98 ); ··· 138 156 theme = await extractThemeFromFacts(facts, root_entity, agent); 139 157 } 140 158 159 159 + // Upload cover image if provided 160 160 + let coverImageBlob: BlobRef | undefined; 161 161 + if (cover_image) { 162 162 + let scan = scanIndexLocal(facts); 163 163 + let [imageData] = scan.eav(cover_image, "block/image"); 164 164 + if (imageData) { 165 165 + let imageResponse = await fetch(imageData.data.src); 166 166 + if (imageResponse.status === 200) { 167 167 + let binary = await imageResponse.blob(); 168 168 + let blob = await agent.com.atproto.repo.uploadBlob(binary, { 169 169 + headers: { "Content-Type": binary.type }, 170 170 + }); 171 171 + coverImageBlob = blob.data.blob; 172 172 + } 173 173 + } 174 174 + } 175 175 + 141 176 let record: PubLeafletDocument.Record = { 142 177 publishedAt: new Date().toISOString(), 143 178 ...existingRecord, ··· 148 183 title: title || "Untitled", 149 184 description: description || "", 150 185 ...(tags !== undefined && { tags }), // Include tags if provided (even if empty array to clear tags) 186 186 + ...(coverImageBlob && { coverImage: coverImageBlob }), // Include cover image if uploaded 151 187 pages: pages.map((p) => { 152 188 if (p.type === "canvas") { 153 189 return { ··· 217 253 218 254 // Create notifications for mentions (only on first publish) 219 255 if (!existingDocUri) { 220 220 - await createMentionNotifications(result.uri, record, credentialSession.did!); 256 256 + await createMentionNotifications( 257 257 + result.uri, 258 258 + record, 259 259 + credentialSession.did!, 260 260 + ); 221 261 } 222 262 223 223 - return { rkey, record: JSON.parse(JSON.stringify(record)) }; 263 263 + return { success: true, rkey, record: JSON.parse(JSON.stringify(record)) }; 224 264 } 225 265 226 266 async function processBlocksToPages( ··· 308 348 if (!b) return []; 309 349 let block: PubLeafletPagesLinearDocument.Block = { 310 350 $type: "pub.leaflet.pages.linearDocument#block", 311 311 - alignment, 312 351 block: b, 313 352 }; 353 353 + if (alignment) block.alignment = alignment; 314 354 return [block]; 315 355 } else { 316 356 let block: PubLeafletPagesLinearDocument.Block = { ··· 408 448 let [stringValue, facets] = getBlockContent(b.value); 409 449 let block: $Typed<PubLeafletBlocksHeader.Main> = { 410 450 $type: "pub.leaflet.blocks.header", 411 411 - level: headingLevel?.data.value || 1, 451 451 + level: Math.floor(headingLevel?.data.value || 1), 412 452 plaintext: stringValue, 413 453 facets, 414 454 }; ··· 427 467 428 468 if (b.type == "text") { 429 469 let [stringValue, facets] = getBlockContent(b.value); 470 470 + let [textSize] = scan.eav(b.value, "block/text-size"); 430 471 let block: $Typed<PubLeafletBlocksText.Main> = { 431 472 $type: ids.PubLeafletBlocksText, 432 473 plaintext: stringValue, 433 474 facets, 475 475 + ...(textSize && { textSize: textSize.data.value }), 434 476 }; 435 477 return block; 436 478 } ··· 441 483 let block: $Typed<PubLeafletBlocksIframe.Main> = { 442 484 $type: "pub.leaflet.blocks.iframe", 443 485 url: url.data.value, 444 444 - height: height?.data.value || 600, 486 486 + height: Math.floor(height?.data.value || 600), 445 487 }; 446 488 return block; 447 489 } ··· 455 497 $type: "pub.leaflet.blocks.image", 456 498 image: blobref, 457 499 aspectRatio: { 458 458 - height: image.data.height, 459 459 - width: image.data.width, 500 500 + height: Math.floor(image.data.height), 501 501 + width: Math.floor(image.data.width), 460 502 }, 461 503 alt: altText ? altText.data.value : undefined, 462 504 }; ··· 742 784 root_entity, 743 785 "theme/background-image-repeat", 744 786 )?.[0]; 787 787 + let pageWidth = scan.eav(root_entity, "theme/page-width")?.[0]; 745 788 746 789 let theme: PubLeafletPublication.Theme = { 747 790 showPageBackground: showPageBackground ?? true, 748 791 }; 749 792 793 793 + if (pageWidth) theme.pageWidth = pageWidth.data.value; 750 794 if (pageBackground) 751 795 theme.backgroundColor = ColorToRGBA(parseColor(`hsba(${pageBackground})`)); 752 796 if (cardBackground) ··· 773 817 image: blob.data.blob, 774 818 repeat: backgroundImageRepeat?.data.value ? true : false, 775 819 ...(backgroundImageRepeat?.data.value && { 776 776 - width: backgroundImageRepeat.data.value, 820 820 + width: Math.floor(backgroundImageRepeat.data.value), 777 821 }), 778 822 }; 779 823 } ··· 829 873 .single(); 830 874 831 875 if (publication && publication.identity_did !== authorDid) { 832 832 - mentionedPublications.set(publication.identity_did, feature.atURI); 876 876 + mentionedPublications.set( 877 877 + publication.identity_did, 878 878 + feature.atURI, 879 879 + ); 833 880 } 834 881 } else if (uri.collection === "pub.leaflet.document") { 835 882 // Get the document owner's DID ··· 840 887 .single(); 841 888 842 889 if (document) { 843 843 - const docRecord = document.data as PubLeafletDocument.Record; 890 890 + const docRecord = 891 891 + document.data as PubLeafletDocument.Record; 844 892 if (docRecord.author !== authorDid) { 845 893 mentionedDocuments.set(docRecord.author, feature.atURI); 846 894 }

+1 -1

actions/subscriptions/subscribeToMailboxWithEmail.ts

··· 11 11 import type { Attribute } from "src/replicache/attributes"; 12 12 import { Database } from "supabase/database.types"; 13 13 import * as Y from "yjs"; 14 14 - import { YJSFragmentToString } from "components/Blocks/TextBlock/RenderYJSFragment"; 14 14 + import { YJSFragmentToString } from "src/utils/yjsFragmentToString"; 15 15 import { pool } from "supabase/pool"; 16 16 17 17 let supabase = createServerClient<Database>(

+1 -3

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

··· 17 17 return ( 18 18 <DashboardLayout 19 19 id="discover" 20 20 - cardBorderHidden={false} 21 20 currentPage="discover" 22 21 defaultTab="default" 23 22 actions={null} ··· 32 31 } 33 32 34 33 const DiscoverContent = async (props: { order: string }) => { 35 35 - const orderValue = 36 36 - props.order === "popular" ? "popular" : "recentlyUpdated"; 34 34 + const orderValue = props.order === "popular" ? "popular" : "recentlyUpdated"; 37 35 let { publications, nextCursor } = await getPublications(orderValue); 38 36 39 37 return (

+1 -1

app/(home-pages)/home/Actions/CreateNewButton.tsx

··· 5 5 import { AddTiny } from "components/Icons/AddTiny"; 6 6 import { BlockCanvasPageSmall } from "components/Icons/BlockCanvasPageSmall"; 7 7 import { BlockDocPageSmall } from "components/Icons/BlockDocPageSmall"; 8 8 - import { Menu, MenuItem } from "components/Layout"; 8 8 + import { Menu, MenuItem } from "components/Menu"; 9 9 import { useIsMobile } from "src/hooks/isMobile"; 10 10 11 11 export const CreateNewLeafletButton = (props: {}) => {

-8

app/(home-pages)/home/HomeLayout.tsx

··· 20 20 useDashboardState, 21 21 } from "components/PageLayouts/DashboardLayout"; 22 22 import { Actions } from "./Actions/Actions"; 23 23 - import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 24 23 import { GetLeafletDataReturnType } from "app/api/rpc/[command]/get_leaflet_data"; 25 24 import { useState } from "react"; 26 25 import { useDebouncedEffect } from "src/hooks/useDebouncedEffect"; ··· 56 55 props.entityID, 57 56 "theme/background-image", 58 57 ); 59 59 - let cardBorderHidden = !!useCardBorderHidden(props.entityID); 60 58 61 59 let [searchValue, setSearchValue] = useState(""); 62 60 let [debouncedSearchValue, setDebouncedSearchValue] = useState(""); ··· 81 79 return ( 82 80 <DashboardLayout 83 81 id="home" 84 84 - cardBorderHidden={cardBorderHidden} 85 82 currentPage="home" 86 83 defaultTab="home" 87 84 actions={<Actions />} ··· 101 98 <HomeLeafletList 102 99 titles={props.titles} 103 100 initialFacts={props.initialFacts} 104 104 - cardBorderHidden={cardBorderHidden} 105 101 searchValue={debouncedSearchValue} 106 102 /> 107 103 ), ··· 117 113 [root_entity: string]: Fact<Attribute>[]; 118 114 }; 119 115 searchValue: string; 120 120 - cardBorderHidden: boolean; 121 116 }) { 122 117 let { identity } = useIdentityData(); 123 118 let { data: initialFacts } = useSWR( ··· 171 166 searchValue={props.searchValue} 172 167 leaflets={leaflets} 173 168 titles={initialFacts?.titles || {}} 174 174 - cardBorderHidden={props.cardBorderHidden} 175 169 initialFacts={initialFacts?.facts || {}} 176 170 showPreview 177 171 /> ··· 192 186 [root_entity: string]: Fact<Attribute>[]; 193 187 }; 194 188 searchValue: string; 195 195 - cardBorderHidden: boolean; 196 189 showPreview?: boolean; 197 190 }) { 198 191 let { identity } = useIdentityData(); ··· 238 231 loggedIn={!!identity} 239 232 display={display} 240 233 added_at={added_at} 241 241 - cardBorderHidden={props.cardBorderHidden} 242 234 index={index} 243 235 showPreview={props.showPreview} 244 236 isHidden={

+6 -5

app/(home-pages)/home/LeafletList/LeafletListItem.tsx

··· 4 4 import { useState, useRef, useEffect } from "react"; 5 5 import { SpeedyLink } from "components/SpeedyLink"; 6 6 import { useLeafletPublicationStatus } from "components/PageSWRDataProvider"; 7 7 + import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 7 8 8 9 export const LeafletListItem = (props: { 9 10 archived?: boolean | null; 10 11 loggedIn: boolean; 11 12 display: "list" | "grid"; 12 12 - cardBorderHidden: boolean; 13 13 added_at: string; 14 14 title?: string; 15 15 index: number; 16 16 isHidden: boolean; 17 17 showPreview?: boolean; 18 18 }) => { 19 19 + const cardBorderHidden = useCardBorderHidden(); 19 20 const pubStatus = useLeafletPublicationStatus(); 20 21 let [isOnScreen, setIsOnScreen] = useState(props.index < 16 ? true : false); 21 22 let previewRef = useRef<HTMLDivElement | null>(null); ··· 47 48 ref={previewRef} 48 49 className={`relative flex gap-3 w-full 49 50 ${props.isHidden ? "hidden" : "flex"} 50 50 - ${props.cardBorderHidden ? "" : "px-2 py-1 block-border hover:outline-border relative"}`} 51 51 + ${cardBorderHidden ? "" : "px-2 py-1 block-border hover:outline-border relative"}`} 51 52 style={{ 52 52 - backgroundColor: props.cardBorderHidden 53 53 + backgroundColor: cardBorderHidden 53 54 ? "transparent" 54 55 : "rgba(var(--bg-page), var(--bg-page-alpha))", 55 56 }} ··· 67 68 loggedIn={props.loggedIn} 68 69 /> 69 70 </div> 70 70 - {props.cardBorderHidden && ( 71 71 + {cardBorderHidden && ( 71 72 <hr 72 73 className="last:hidden border-border-light" 73 74 style={{ ··· 87 88 ${props.isHidden ? "hidden" : "flex"} 88 89 `} 89 90 style={{ 90 90 - backgroundColor: props.cardBorderHidden 91 91 + backgroundColor: cardBorderHidden 91 92 ? "transparent" 92 93 : "rgba(var(--bg-page), var(--bg-page-alpha))", 93 94 }}

+1 -1

app/(home-pages)/home/LeafletList/LeafletOptions.tsx

··· 1 1 "use client"; 2 2 3 3 - import { Menu, MenuItem } from "components/Layout"; 3 3 + import { Menu, MenuItem } from "components/Menu"; 4 4 import { useState } from "react"; 5 5 import { ButtonPrimary, ButtonTertiary } from "components/Buttons"; 6 6 import { useToaster } from "components/Toast";

+18 -7

app/(home-pages)/home/LeafletList/LeafletPreview.tsx

··· 18 18 const firstPage = useEntity(root, "root/page")[0]; 19 19 const page = firstPage?.data.value || root; 20 20 21 21 - const cardBorderHidden = useCardBorderHidden(root); 21 21 + const cardBorderHidden = useEntity(root, "theme/card-border-hidden")?.data 22 22 + .value; 22 23 const rootBackgroundImage = useEntity(root, "theme/card-background-image"); 23 24 const rootBackgroundRepeat = useEntity( 24 25 root, ··· 49 50 50 51 const contentWrapperClass = `leafletContentWrapper h-full sm:w-48 w-40 mx-auto overflow-clip ${!cardBorderHidden && "border border-border-light border-b-0 rounded-t-md"}`; 51 52 52 52 - return { root, page, cardBorderHidden, contentWrapperStyle, contentWrapperClass }; 53 53 + return { 54 54 + root, 55 55 + page, 56 56 + cardBorderHidden, 57 57 + contentWrapperStyle, 58 58 + contentWrapperClass, 59 59 + }; 53 60 } 54 61 55 62 export const LeafletListPreview = (props: { isVisible: boolean }) => { 56 56 - const { root, page, cardBorderHidden, contentWrapperStyle, contentWrapperClass } = 57 57 - useLeafletPreviewData(); 63 63 + const { 64 64 + root, 65 65 + page, 66 66 + cardBorderHidden, 67 67 + contentWrapperStyle, 68 68 + contentWrapperClass, 69 69 + } = useLeafletPreviewData(); 58 70 59 71 return ( 60 72 <Tooltip 61 61 - open={true} 62 62 - delayDuration={0} 63 73 side="right" 74 74 + asChild 64 75 trigger={ 65 65 - <div className="w-12 h-full py-1"> 76 76 + <div className="w-12 h-full py-1 z-10"> 66 77 <div className="rounded-md h-full overflow-hidden"> 67 78 <ThemeProvider local entityID={root} className=""> 68 79 <ThemeBackgroundProvider entityID={root}>

-6

app/(home-pages)/looseleafs/LooseleafsLayout.tsx

··· 1 1 "use client"; 2 2 import { DashboardLayout } from "components/PageLayouts/DashboardLayout"; 3 3 - import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 4 3 import { useState } from "react"; 5 4 import { useDebouncedEffect } from "src/hooks/useDebouncedEffect"; 6 5 import { Fact, PermissionToken } from "src/replicache"; ··· 30 29 [searchValue], 31 30 ); 32 31 33 33 - let cardBorderHidden = !!useCardBorderHidden(props.entityID); 34 32 return ( 35 33 <DashboardLayout 36 34 id="looseleafs" 37 37 - cardBorderHidden={cardBorderHidden} 38 35 currentPage="looseleafs" 39 36 defaultTab="home" 40 37 actions={<Actions />} ··· 45 42 <LooseleafList 46 43 titles={props.titles} 47 44 initialFacts={props.initialFacts} 48 48 - cardBorderHidden={cardBorderHidden} 49 45 searchValue={debouncedSearchValue} 50 46 /> 51 47 ), ··· 61 57 [root_entity: string]: Fact<Attribute>[]; 62 58 }; 63 59 searchValue: string; 64 64 - cardBorderHidden: boolean; 65 60 }) => { 66 61 let { identity } = useIdentityData(); 67 62 let { data: initialFacts } = useSWR( ··· 108 103 searchValue={props.searchValue} 109 104 leaflets={leaflets} 110 105 titles={initialFacts?.titles || {}} 111 111 - cardBorderHidden={props.cardBorderHidden} 112 106 initialFacts={initialFacts?.facts || {}} 113 107 showPreview 114 108 />

+1 -1

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

··· 1 1 - import { BaseTextBlock } from "app/lish/[did]/[publication]/[rkey]/BaseTextBlock"; 1 1 + import { BaseTextBlock } from "app/lish/[did]/[publication]/[rkey]/Blocks/BaseTextBlock"; 2 2 import { 3 3 AppBskyActorProfile, 4 4 PubLeafletComment,

+1 -1

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

··· 1 1 "use client"; 2 2 import { Avatar } from "components/Avatar"; 3 3 - import { BaseTextBlock } from "app/lish/[did]/[publication]/[rkey]/BaseTextBlock"; 3 3 + import { BaseTextBlock } from "app/lish/[did]/[publication]/[rkey]/Blocks/BaseTextBlock"; 4 4 import { PubLeafletPublication, PubLeafletRichtextFacet } from "lexicons/api"; 5 5 import { timeAgo } from "src/utils/timeAgo"; 6 6 import { useReplicache, useEntity } from "src/replicache";

+1 -1

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

··· 1 1 import { Avatar } from "components/Avatar"; 2 2 - import { BaseTextBlock } from "app/lish/[did]/[publication]/[rkey]/BaseTextBlock"; 2 2 + import { BaseTextBlock } from "app/lish/[did]/[publication]/[rkey]/Blocks/BaseTextBlock"; 3 3 import { ReplyTiny } from "components/Icons/ReplyTiny"; 4 4 import { 5 5 CommentInNotification,

-1

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

··· 10 10 return ( 11 11 <DashboardLayout 12 12 id="discover" 13 13 - cardBorderHidden={true} 14 13 currentPage="notifications" 15 14 defaultTab="default" 16 15 actions={null}

+88

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { PostListing } from "components/PostListing"; 4 4 + import type { Post } from "app/(home-pages)/reader/getReaderFeed"; 5 5 + import type { Cursor } from "./getProfilePosts"; 6 6 + import { getProfilePosts } from "./getProfilePosts"; 7 7 + import useSWRInfinite from "swr/infinite"; 8 8 + import { useEffect, useRef } from "react"; 9 9 + 10 10 + export const ProfilePostsContent = (props: { 11 11 + did: string; 12 12 + posts: Post[]; 13 13 + nextCursor: Cursor | null; 14 14 + }) => { 15 15 + const getKey = ( 16 16 + pageIndex: number, 17 17 + previousPageData: { 18 18 + posts: Post[]; 19 19 + nextCursor: Cursor | null; 20 20 + } | null, 21 21 + ) => { 22 22 + // Reached the end 23 23 + if (previousPageData && !previousPageData.nextCursor) return null; 24 24 + 25 25 + // First page, we don't have previousPageData 26 26 + if (pageIndex === 0) return ["profile-posts", props.did, null] as const; 27 27 + 28 28 + // Add the cursor to the key 29 29 + return ["profile-posts", props.did, previousPageData?.nextCursor] as const; 30 30 + }; 31 31 + 32 32 + const { data, size, setSize, isValidating } = useSWRInfinite( 33 33 + getKey, 34 34 + ([_, did, cursor]) => getProfilePosts(did, cursor), 35 35 + { 36 36 + fallbackData: [{ posts: props.posts, nextCursor: props.nextCursor }], 37 37 + revalidateFirstPage: false, 38 38 + }, 39 39 + ); 40 40 + 41 41 + const loadMoreRef = useRef<HTMLDivElement>(null); 42 42 + 43 43 + // Set up intersection observer to load more when trigger element is visible 44 44 + useEffect(() => { 45 45 + const observer = new IntersectionObserver( 46 46 + (entries) => { 47 47 + if (entries[0].isIntersecting && !isValidating) { 48 48 + const hasMore = data && data[data.length - 1]?.nextCursor; 49 49 + if (hasMore) { 50 50 + setSize(size + 1); 51 51 + } 52 52 + } 53 53 + }, 54 54 + { threshold: 0.1 }, 55 55 + ); 56 56 + 57 57 + if (loadMoreRef.current) { 58 58 + observer.observe(loadMoreRef.current); 59 59 + } 60 60 + 61 61 + return () => observer.disconnect(); 62 62 + }, [data, size, setSize, isValidating]); 63 63 + 64 64 + const allPosts = data ? data.flatMap((page) => page.posts) : []; 65 65 + 66 66 + if (allPosts.length === 0 && !isValidating) { 67 67 + return <div className="text-tertiary text-center py-4">No posts yet</div>; 68 68 + } 69 69 + 70 70 + return ( 71 71 + <div className="flex flex-col gap-3 text-left relative"> 72 72 + {allPosts.map((post) => ( 73 73 + <PostListing key={post.documents.uri} {...post} /> 74 74 + ))} 75 75 + {/* Trigger element for loading more posts */} 76 76 + <div 77 77 + ref={loadMoreRef} 78 78 + className="absolute bottom-96 left-0 w-full h-px pointer-events-none" 79 79 + aria-hidden="true" 80 80 + /> 81 81 + {isValidating && ( 82 82 + <div className="text-center text-tertiary py-4"> 83 83 + Loading more posts... 84 84 + </div> 85 85 + )} 86 86 + </div> 87 87 + ); 88 88 + };

+243

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

··· 1 1 + "use client"; 2 2 + import { Avatar } from "components/Avatar"; 3 3 + import { AppBskyActorProfile, PubLeafletPublication } from "lexicons/api"; 4 4 + import { blobRefToSrc } from "src/utils/blobRefToSrc"; 5 5 + import type { ProfileData } from "./layout"; 6 6 + import { usePubTheme } from "components/ThemeManager/PublicationThemeProvider"; 7 7 + import { colorToString } from "components/ThemeManager/useColorAttribute"; 8 8 + import { PubIcon } from "components/ActionBar/Publications"; 9 9 + import { Json } from "supabase/database.types"; 10 10 + import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 11 11 + import { ProfileViewDetailed } from "@atproto/api/dist/client/types/app/bsky/actor/defs"; 12 12 + import { SpeedyLink } from "components/SpeedyLink"; 13 13 + import { ReactNode } from "react"; 14 14 + import * as linkify from "linkifyjs"; 15 15 + 16 16 + export const ProfileHeader = (props: { 17 17 + profile: ProfileViewDetailed; 18 18 + publications: { record: Json; uri: string }[]; 19 19 + popover?: boolean; 20 20 + }) => { 21 21 + let profileRecord = props.profile; 22 22 + const profileUrl = `/p/${props.profile.handle}`; 23 23 + 24 24 + const avatarElement = ( 25 25 + <Avatar 26 26 + src={profileRecord.avatar} 27 27 + displayName={profileRecord.displayName} 28 28 + className="mx-auto mt-3 sm:mt-4" 29 29 + giant 30 30 + /> 31 31 + ); 32 32 + 33 33 + const displayNameElement = ( 34 34 + <h3 className=" px-3 sm:px-4 pt-2 leading-tight"> 35 35 + {profileRecord.displayName 36 36 + ? profileRecord.displayName 37 37 + : `@${props.profile.handle}`} 38 38 + </h3> 39 39 + ); 40 40 + 41 41 + const handleElement = profileRecord.displayName && ( 42 42 + <div 43 43 + className={`text-tertiary ${props.popover ? "text-xs" : "text-sm"} pb-1 italic px-3 sm:px-4 truncate`} 44 44 + > 45 45 + @{props.profile.handle} 46 46 + </div> 47 47 + ); 48 48 + 49 49 + return ( 50 50 + <div 51 51 + className={`flex flex-col relative ${props.popover && "text-sm"}`} 52 52 + id="profile-header" 53 53 + > 54 54 + <ProfileLinks handle={props.profile.handle || ""} /> 55 55 + <div className="flex flex-col"> 56 56 + <div className="flex flex-col group"> 57 57 + {props.popover ? ( 58 58 + <SpeedyLink className={"hover:no-underline!"} href={profileUrl}> 59 59 + {avatarElement} 60 60 + </SpeedyLink> 61 61 + ) : ( 62 62 + avatarElement 63 63 + )} 64 64 + {props.popover ? ( 65 65 + <SpeedyLink 66 66 + className={" text-primary group-hover:underline"} 67 67 + href={profileUrl} 68 68 + > 69 69 + {displayNameElement} 70 70 + </SpeedyLink> 71 71 + ) : ( 72 72 + displayNameElement 73 73 + )} 74 74 + {props.popover && handleElement ? ( 75 75 + <SpeedyLink className={"group-hover:underline"} href={profileUrl}> 76 76 + {handleElement} 77 77 + </SpeedyLink> 78 78 + ) : ( 79 79 + handleElement 80 80 + )} 81 81 + </div> 82 82 + <pre className="text-secondary px-3 sm:px-4 whitespace-pre-wrap"> 83 83 + {profileRecord.description 84 84 + ? parseDescription(profileRecord.description) 85 85 + : null} 86 86 + </pre> 87 87 + <div className=" w-full overflow-x-scroll py-3 mb-3 "> 88 88 + <div 89 89 + className={`grid grid-flow-col gap-2 mx-auto w-fit px-3 sm:px-4 ${props.popover ? "auto-cols-[164px]" : "auto-cols-[164px] sm:auto-cols-[240px]"}`} 90 90 + > 91 91 + {props.publications.map((p) => ( 92 92 + <PublicationCard 93 93 + key={p.uri} 94 94 + record={p.record as PubLeafletPublication.Record} 95 95 + uri={p.uri} 96 96 + /> 97 97 + ))} 98 98 + </div> 99 99 + </div> 100 100 + </div> 101 101 + </div> 102 102 + ); 103 103 + }; 104 104 + 105 105 + const ProfileLinks = (props: { handle: string }) => { 106 106 + return ( 107 107 + <div className="absolute sm:top-4 top-3 sm:right-4 right-3 flex flex-row gap-2"> 108 108 + <a 109 109 + className="text-tertiary hover:text-accent-contrast hover:no-underline!" 110 110 + href={`https://bsky.app/profile/${props.handle}`} 111 111 + > 112 112 + <BlueskyTiny /> 113 113 + </a> 114 114 + </div> 115 115 + ); 116 116 + }; 117 117 + const PublicationCard = (props: { 118 118 + record: PubLeafletPublication.Record; 119 119 + uri: string; 120 120 + }) => { 121 121 + const { record, uri } = props; 122 122 + const { bgLeaflet, bgPage, primary } = usePubTheme(record.theme); 123 123 + 124 124 + return ( 125 125 + <a 126 126 + href={`https://${record.base_path}`} 127 127 + className="border border-border p-2 rounded-lg hover:no-underline! text-primary basis-1/2" 128 128 + style={{ backgroundColor: `rgb(${colorToString(bgLeaflet, "rgb")})` }} 129 129 + > 130 130 + <div 131 131 + className="rounded-md p-2 flex flex-row gap-2" 132 132 + style={{ 133 133 + backgroundColor: record.theme?.showPageBackground 134 134 + ? `rgb(${colorToString(bgPage, "rgb")})` 135 135 + : undefined, 136 136 + }} 137 137 + > 138 138 + <PubIcon record={record} uri={uri} /> 139 139 + <h4 140 140 + className="truncate min-w-0" 141 141 + style={{ 142 142 + color: `rgb(${colorToString(primary, "rgb")})`, 143 143 + }} 144 144 + > 145 145 + {record.name} 146 146 + </h4> 147 147 + </div> 148 148 + </a> 149 149 + ); 150 150 + }; 151 151 + 152 152 + function parseDescription(description: string): ReactNode[] { 153 153 + // Find all mentions using regex 154 154 + const mentionRegex = /@\S+/g; 155 155 + const mentions: { start: number; end: number; value: string }[] = []; 156 156 + let mentionMatch; 157 157 + while ((mentionMatch = mentionRegex.exec(description)) !== null) { 158 158 + mentions.push({ 159 159 + start: mentionMatch.index, 160 160 + end: mentionMatch.index + mentionMatch[0].length, 161 161 + value: mentionMatch[0], 162 162 + }); 163 163 + } 164 164 + 165 165 + // Find all URLs using linkifyjs 166 166 + const links = linkify.find(description).filter((link) => link.type === "url"); 167 167 + 168 168 + // Filter out URLs that overlap with mentions (mentions take priority) 169 169 + const nonOverlappingLinks = links.filter((link) => { 170 170 + return !mentions.some( 171 171 + (mention) => 172 172 + (link.start >= mention.start && link.start < mention.end) || 173 173 + (link.end > mention.start && link.end <= mention.end) || 174 174 + (link.start <= mention.start && link.end >= mention.end), 175 175 + ); 176 176 + }); 177 177 + 178 178 + // Combine into a single sorted list 179 179 + const allMatches: Array<{ 180 180 + start: number; 181 181 + end: number; 182 182 + value: string; 183 183 + href: string; 184 184 + type: "url" | "mention"; 185 185 + }> = [ 186 186 + ...nonOverlappingLinks.map((link) => ({ 187 187 + start: link.start, 188 188 + end: link.end, 189 189 + value: link.value, 190 190 + href: link.href, 191 191 + type: "url" as const, 192 192 + })), 193 193 + ...mentions.map((mention) => ({ 194 194 + start: mention.start, 195 195 + end: mention.end, 196 196 + value: mention.value, 197 197 + href: `/p/${mention.value.slice(1)}`, 198 198 + type: "mention" as const, 199 199 + })), 200 200 + ].sort((a, b) => a.start - b.start); 201 201 + 202 202 + const parts: ReactNode[] = []; 203 203 + let lastIndex = 0; 204 204 + let key = 0; 205 205 + 206 206 + for (const match of allMatches) { 207 207 + // Add text before this match 208 208 + if (match.start > lastIndex) { 209 209 + parts.push(description.slice(lastIndex, match.start)); 210 210 + } 211 211 + 212 212 + if (match.type === "mention") { 213 213 + parts.push( 214 214 + <SpeedyLink key={key++} href={match.href}> 215 215 + {match.value} 216 216 + </SpeedyLink>, 217 217 + ); 218 218 + } else { 219 219 + // It's a URL 220 220 + const urlWithoutProtocol = match.value 221 221 + .replace(/^https?:\/\//, "") 222 222 + .replace(/\/+$/, ""); 223 223 + const displayText = 224 224 + urlWithoutProtocol.length > 50 225 225 + ? urlWithoutProtocol.slice(0, 50) + "…" 226 226 + : urlWithoutProtocol; 227 227 + parts.push( 228 228 + <a key={key++} href={match.href} target="_blank" rel="noopener noreferrer"> 229 229 + {displayText} 230 230 + </a>, 231 231 + ); 232 232 + } 233 233 + 234 234 + lastIndex = match.end; 235 235 + } 236 236 + 237 237 + // Add remaining text after last match 238 238 + if (lastIndex < description.length) { 239 239 + parts.push(description.slice(lastIndex)); 240 240 + } 241 241 + 242 242 + return parts; 243 243 + }

+24

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 4 4 + 5 5 + export function ProfileLayout(props: { children: React.ReactNode }) { 6 6 + let cardBorderHidden = useCardBorderHidden(); 7 7 + return ( 8 8 + <div 9 9 + id="profile-content" 10 10 + className={` 11 11 + ${ 12 12 + cardBorderHidden 13 13 + ? "" 14 14 + : "overflow-y-scroll h-full border border-border-light rounded-lg bg-bg-page" 15 15 + } 16 16 + max-w-prose mx-auto w-full 17 17 + flex flex-col 18 18 + text-center 19 19 + `} 20 20 + > 21 21 + {props.children} 22 22 + </div> 23 23 + ); 24 24 + }

+119

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { SpeedyLink } from "components/SpeedyLink"; 4 4 + import { useSelectedLayoutSegment } from "next/navigation"; 5 5 + import { useState, useEffect } from "react"; 6 6 + import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 7 7 + 8 8 + export type ProfileTabType = "posts" | "comments" | "subscriptions"; 9 9 + 10 10 + export const ProfileTabs = (props: { didOrHandle: string }) => { 11 11 + const cardBorderHidden = useCardBorderHidden(); 12 12 + const segment = useSelectedLayoutSegment(); 13 13 + const currentTab = (segment || "posts") as ProfileTabType; 14 14 + const [scrollPosWithinTabContent, setScrollPosWithinTabContent] = useState(0); 15 15 + const [headerHeight, setHeaderHeight] = useState(0); 16 16 + useEffect(() => { 17 17 + let headerHeight = 18 18 + document.getElementById("profile-header")?.clientHeight || 0; 19 19 + setHeaderHeight(headerHeight); 20 20 + 21 21 + const profileContent = cardBorderHidden 22 22 + ? document.getElementById("home-content") 23 23 + : document.getElementById("profile-content"); 24 24 + const handleScroll = () => { 25 25 + if (profileContent) { 26 26 + setScrollPosWithinTabContent( 27 27 + profileContent.scrollTop - headerHeight > 0 28 28 + ? profileContent.scrollTop - headerHeight 29 29 + : 0, 30 30 + ); 31 31 + } 32 32 + }; 33 33 + 34 34 + if (profileContent) { 35 35 + profileContent.addEventListener("scroll", handleScroll); 36 36 + return () => profileContent.removeEventListener("scroll", handleScroll); 37 37 + } 38 38 + }, []); 39 39 + 40 40 + const baseUrl = `/p/${props.didOrHandle}`; 41 41 + const bgColor = cardBorderHidden ? "var(--bg-leaflet)" : "var(--bg-page)"; 42 42 + 43 43 + return ( 44 44 + <div className="flex flex-col w-full sticky top-3 sm:top-4 z-20 sm:px-4 px-3"> 45 45 + <div 46 46 + style={ 47 47 + scrollPosWithinTabContent < 20 48 48 + ? { 49 49 + paddingLeft: `calc(${scrollPosWithinTabContent / 20} * 12px )`, 50 50 + paddingRight: `calc(${scrollPosWithinTabContent / 20} * 12px )`, 51 51 + } 52 52 + : { paddingLeft: "12px", paddingRight: "12px" } 53 53 + } 54 54 + > 55 55 + <div 56 56 + className={` 57 57 + border rounded-lg 58 58 + ${scrollPosWithinTabContent > 20 ? "border-border-light" : "border-transparent"} 59 59 + py-1 60 60 + w-full `} 61 61 + style={ 62 62 + scrollPosWithinTabContent < 20 63 63 + ? { 64 64 + backgroundColor: !cardBorderHidden 65 65 + ? `rgba(${bgColor}, ${scrollPosWithinTabContent / 60 + 0.75})` 66 66 + : `rgba(${bgColor}, ${scrollPosWithinTabContent / 20})`, 67 67 + paddingLeft: !cardBorderHidden 68 68 + ? "4px" 69 69 + : `calc(${scrollPosWithinTabContent / 20} * 4px)`, 70 70 + paddingRight: !cardBorderHidden 71 71 + ? "4px" 72 72 + : `calc(${scrollPosWithinTabContent / 20} * 4px)`, 73 73 + } 74 74 + : { 75 75 + backgroundColor: `rgb(${bgColor})`, 76 76 + paddingLeft: "4px", 77 77 + paddingRight: "4px", 78 78 + } 79 79 + } 80 80 + > 81 81 + <div className="flex gap-2 justify-between"> 82 82 + <div className="flex gap-2"> 83 83 + <TabLink 84 84 + href={baseUrl} 85 85 + name="Posts" 86 86 + selected={currentTab === "posts"} 87 87 + /> 88 88 + <TabLink 89 89 + href={`${baseUrl}/comments`} 90 90 + name="Comments" 91 91 + selected={currentTab === "comments"} 92 92 + /> 93 93 + </div> 94 94 + <TabLink 95 95 + href={`${baseUrl}/subscriptions`} 96 96 + name="Subscriptions" 97 97 + selected={currentTab === "subscriptions"} 98 98 + /> 99 99 + </div> 100 100 + </div> 101 101 + </div> 102 102 + </div> 103 103 + ); 104 104 + }; 105 105 + 106 106 + const TabLink = (props: { href: string; name: string; selected: boolean }) => { 107 107 + return ( 108 108 + <SpeedyLink 109 109 + href={props.href} 110 110 + className={`pubTabs px-1 py-0 flex gap-1 items-center rounded-md hover:cursor-pointer hover:no-underline! ${ 111 111 + props.selected 112 112 + ? "text-accent-2 bg-accent-1 font-bold -mb-px" 113 113 + : "text-tertiary" 114 114 + }`} 115 115 + > 116 116 + {props.name} 117 117 + </SpeedyLink> 118 118 + ); 119 119 + };

+222

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { useEffect, useRef, useMemo } from "react"; 4 4 + import useSWRInfinite from "swr/infinite"; 5 5 + import { AppBskyActorProfile, AtUri } from "@atproto/api"; 6 6 + import { PubLeafletComment, PubLeafletDocument } from "lexicons/api"; 7 7 + import { ReplyTiny } from "components/Icons/ReplyTiny"; 8 8 + import { Avatar } from "components/Avatar"; 9 9 + import { BaseTextBlock } from "app/lish/[did]/[publication]/[rkey]/Blocks/BaseTextBlock"; 10 10 + import { blobRefToSrc } from "src/utils/blobRefToSrc"; 11 11 + import { 12 12 + getProfileComments, 13 13 + type ProfileComment, 14 14 + type Cursor, 15 15 + } from "./getProfileComments"; 16 16 + import { timeAgo } from "src/utils/timeAgo"; 17 17 + import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 18 18 + 19 19 + export const ProfileCommentsContent = (props: { 20 20 + did: string; 21 21 + comments: ProfileComment[]; 22 22 + nextCursor: Cursor | null; 23 23 + }) => { 24 24 + const getKey = ( 25 25 + pageIndex: number, 26 26 + previousPageData: { 27 27 + comments: ProfileComment[]; 28 28 + nextCursor: Cursor | null; 29 29 + } | null, 30 30 + ) => { 31 31 + // Reached the end 32 32 + if (previousPageData && !previousPageData.nextCursor) return null; 33 33 + 34 34 + // First page, we don't have previousPageData 35 35 + if (pageIndex === 0) return ["profile-comments", props.did, null] as const; 36 36 + 37 37 + // Add the cursor to the key 38 38 + return [ 39 39 + "profile-comments", 40 40 + props.did, 41 41 + previousPageData?.nextCursor, 42 42 + ] as const; 43 43 + }; 44 44 + 45 45 + const { data, size, setSize, isValidating } = useSWRInfinite( 46 46 + getKey, 47 47 + ([_, did, cursor]) => getProfileComments(did, cursor), 48 48 + { 49 49 + fallbackData: [ 50 50 + { comments: props.comments, nextCursor: props.nextCursor }, 51 51 + ], 52 52 + revalidateFirstPage: false, 53 53 + }, 54 54 + ); 55 55 + 56 56 + const loadMoreRef = useRef<HTMLDivElement>(null); 57 57 + 58 58 + // Set up intersection observer to load more when trigger element is visible 59 59 + useEffect(() => { 60 60 + const observer = new IntersectionObserver( 61 61 + (entries) => { 62 62 + if (entries[0].isIntersecting && !isValidating) { 63 63 + const hasMore = data && data[data.length - 1]?.nextCursor; 64 64 + if (hasMore) { 65 65 + setSize(size + 1); 66 66 + } 67 67 + } 68 68 + }, 69 69 + { threshold: 0.1 }, 70 70 + ); 71 71 + 72 72 + if (loadMoreRef.current) { 73 73 + observer.observe(loadMoreRef.current); 74 74 + } 75 75 + 76 76 + return () => observer.disconnect(); 77 77 + }, [data, size, setSize, isValidating]); 78 78 + 79 79 + const allComments = data ? data.flatMap((page) => page.comments) : []; 80 80 + 81 81 + if (allComments.length === 0 && !isValidating) { 82 82 + return ( 83 83 + <div className="text-tertiary text-center py-4">No comments yet</div> 84 84 + ); 85 85 + } 86 86 + 87 87 + return ( 88 88 + <div className="flex flex-col gap-2 text-left relative"> 89 89 + {allComments.map((comment) => ( 90 90 + <CommentItem key={comment.uri} comment={comment} /> 91 91 + ))} 92 92 + {/* Trigger element for loading more comments */} 93 93 + <div 94 94 + ref={loadMoreRef} 95 95 + className="absolute bottom-96 left-0 w-full h-px pointer-events-none" 96 96 + aria-hidden="true" 97 97 + /> 98 98 + {isValidating && ( 99 99 + <div className="text-center text-tertiary py-4"> 100 100 + Loading more comments... 101 101 + </div> 102 102 + )} 103 103 + </div> 104 104 + ); 105 105 + }; 106 106 + 107 107 + const CommentItem = ({ comment }: { comment: ProfileComment }) => { 108 108 + const record = comment.record as PubLeafletComment.Record; 109 109 + const profile = comment.bsky_profiles?.record as 110 110 + | AppBskyActorProfile.Record 111 111 + | undefined; 112 112 + const displayName = 113 113 + profile?.displayName || comment.bsky_profiles?.handle || "Unknown"; 114 114 + 115 115 + // Get commenter DID from comment URI 116 116 + const commenterDid = new AtUri(comment.uri).host; 117 117 + 118 118 + const isReply = !!record.reply; 119 119 + 120 120 + // Get document title 121 121 + const docData = comment.document?.data as 122 122 + | PubLeafletDocument.Record 123 123 + | undefined; 124 124 + const postTitle = docData?.title || "Untitled"; 125 125 + 126 126 + // Get parent comment info for replies 127 127 + const parentRecord = comment.parentComment?.record as 128 128 + | PubLeafletComment.Record 129 129 + | undefined; 130 130 + const parentProfile = comment.parentComment?.bsky_profiles?.record as 131 131 + | AppBskyActorProfile.Record 132 132 + | undefined; 133 133 + const parentDisplayName = 134 134 + parentProfile?.displayName || comment.parentComment?.bsky_profiles?.handle; 135 135 + 136 136 + // Build direct link to the comment 137 137 + const commentLink = useMemo(() => { 138 138 + if (!comment.document) return null; 139 139 + const docUri = new AtUri(comment.document.uri); 140 140 + 141 141 + // Get base URL using getPublicationURL if publication exists, otherwise build path 142 142 + let baseUrl: string; 143 143 + if (comment.publication) { 144 144 + baseUrl = getPublicationURL(comment.publication); 145 145 + const pubUri = new AtUri(comment.publication.uri); 146 146 + // If getPublicationURL returns a relative path, append the document rkey 147 147 + if (baseUrl.startsWith("/")) { 148 148 + baseUrl = `${baseUrl}/${docUri.rkey}`; 149 149 + } else { 150 150 + // For custom domains, append the document rkey 151 151 + baseUrl = `${baseUrl}/${docUri.rkey}`; 152 152 + } 153 153 + } else { 154 154 + baseUrl = `/lish/${docUri.host}/-/${docUri.rkey}`; 155 155 + } 156 156 + 157 157 + // Build query parameters 158 158 + const params = new URLSearchParams(); 159 159 + params.set("interactionDrawer", "comments"); 160 160 + if (record.onPage) { 161 161 + params.set("page", record.onPage); 162 162 + } 163 163 + 164 164 + // Use comment URI as hash for direct reference 165 165 + const commentId = encodeURIComponent(comment.uri); 166 166 + 167 167 + return `${baseUrl}?${params.toString()}#${commentId}`; 168 168 + }, [comment.document, comment.publication, comment.uri, record.onPage]); 169 169 + 170 170 + // Get avatar source 171 171 + const avatarSrc = profile?.avatar?.ref 172 172 + ? blobRefToSrc(profile.avatar.ref, commenterDid) 173 173 + : undefined; 174 174 + 175 175 + return ( 176 176 + <div id={comment.uri} className="w-full flex flex-col text-left mb-8"> 177 177 + <div className="flex gap-2 w-full"> 178 178 + <Avatar src={avatarSrc} displayName={displayName} /> 179 179 + <div className="flex flex-col w-full min-w-0 grow"> 180 180 + <div className="flex flex-row gap-2 justify-between"> 181 181 + <div className="text-tertiary text-sm truncate"> 182 182 + <span className="font-bold text-secondary">{displayName}</span>{" "} 183 183 + {isReply ? "replied" : "commented"} on{" "} 184 184 + {commentLink ? ( 185 185 + <a 186 186 + href={commentLink} 187 187 + className="italic text-accent-contrast hover:underline" 188 188 + > 189 189 + {postTitle} 190 190 + </a> 191 191 + ) : ( 192 192 + <span className="italic text-accent-contrast">{postTitle}</span> 193 193 + )} 194 194 + </div> 195 195 + <div className="text-tertiary text-sm shrink-0"> 196 196 + {timeAgo(record.createdAt)} 197 197 + </div> 198 198 + </div> 199 199 + {isReply && parentRecord && ( 200 200 + <div className="text-xs text-tertiary flex flex-row gap-2 w-full my-0.5 items-center"> 201 201 + <ReplyTiny className="shrink-0 scale-75" /> 202 202 + {parentDisplayName && ( 203 203 + <div className="font-bold shrink-0">{parentDisplayName}</div> 204 204 + )} 205 205 + <div className="grow truncate">{parentRecord.plaintext}</div> 206 206 + </div> 207 207 + )} 208 208 + <pre 209 209 + style={{ wordBreak: "break-word" }} 210 210 + className="whitespace-pre-wrap text-secondary" 211 211 + > 212 212 + <BaseTextBlock 213 213 + index={[]} 214 214 + plaintext={record.plaintext} 215 215 + facets={record.facets} 216 216 + /> 217 217 + </pre> 218 218 + </div> 219 219 + </div> 220 220 + </div> 221 221 + ); 222 222 + };

+133

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

··· 1 1 + "use server"; 2 2 + 3 3 + import { supabaseServerClient } from "supabase/serverClient"; 4 4 + import { Json } from "supabase/database.types"; 5 5 + import { PubLeafletComment } from "lexicons/api"; 6 6 + 7 7 + export type Cursor = { 8 8 + indexed_at: string; 9 9 + uri: string; 10 10 + }; 11 11 + 12 12 + export type ProfileComment = { 13 13 + uri: string; 14 14 + record: Json; 15 15 + indexed_at: string; 16 16 + bsky_profiles: { record: Json; handle: string | null } | null; 17 17 + document: { 18 18 + uri: string; 19 19 + data: Json; 20 20 + } | null; 21 21 + publication: { 22 22 + uri: string; 23 23 + record: Json; 24 24 + } | null; 25 25 + // For replies, include the parent comment info 26 26 + parentComment: { 27 27 + uri: string; 28 28 + record: Json; 29 29 + bsky_profiles: { record: Json; handle: string | null } | null; 30 30 + } | null; 31 31 + }; 32 32 + 33 33 + export async function getProfileComments( 34 34 + did: string, 35 35 + cursor?: Cursor | null, 36 36 + ): Promise<{ comments: ProfileComment[]; nextCursor: Cursor | null }> { 37 37 + const limit = 20; 38 38 + 39 39 + let query = supabaseServerClient 40 40 + .from("comments_on_documents") 41 41 + .select( 42 42 + `*, 43 43 + bsky_profiles(record, handle), 44 44 + documents(uri, data, documents_in_publications(publications(*)))`, 45 45 + ) 46 46 + .eq("profile", did) 47 47 + .order("indexed_at", { ascending: false }) 48 48 + .order("uri", { ascending: false }) 49 49 + .limit(limit); 50 50 + 51 51 + if (cursor) { 52 52 + query = query.or( 53 53 + `indexed_at.lt.${cursor.indexed_at},and(indexed_at.eq.${cursor.indexed_at},uri.lt.${cursor.uri})`, 54 54 + ); 55 55 + } 56 56 + 57 57 + const { data: rawComments } = await query; 58 58 + 59 59 + if (!rawComments || rawComments.length === 0) { 60 60 + return { comments: [], nextCursor: null }; 61 61 + } 62 62 + 63 63 + // Collect parent comment URIs for replies 64 64 + const parentUris = rawComments 65 65 + .map((c) => (c.record as PubLeafletComment.Record).reply?.parent) 66 66 + .filter((uri): uri is string => !!uri); 67 67 + 68 68 + // Fetch parent comments if there are any replies 69 69 + let parentCommentsMap = new Map< 70 70 + string, 71 71 + { 72 72 + uri: string; 73 73 + record: Json; 74 74 + bsky_profiles: { record: Json; handle: string | null } | null; 75 75 + } 76 76 + >(); 77 77 + 78 78 + if (parentUris.length > 0) { 79 79 + const { data: parentComments } = await supabaseServerClient 80 80 + .from("comments_on_documents") 81 81 + .select(`uri, record, bsky_profiles(record, handle)`) 82 82 + .in("uri", parentUris); 83 83 + 84 84 + if (parentComments) { 85 85 + for (const pc of parentComments) { 86 86 + parentCommentsMap.set(pc.uri, { 87 87 + uri: pc.uri, 88 88 + record: pc.record, 89 89 + bsky_profiles: pc.bsky_profiles, 90 90 + }); 91 91 + } 92 92 + } 93 93 + } 94 94 + 95 95 + // Transform to ProfileComment format 96 96 + const comments: ProfileComment[] = rawComments.map((comment) => { 97 97 + const record = comment.record as PubLeafletComment.Record; 98 98 + const doc = comment.documents; 99 99 + const pub = doc?.documents_in_publications?.[0]?.publications; 100 100 + 101 101 + return { 102 102 + uri: comment.uri, 103 103 + record: comment.record, 104 104 + indexed_at: comment.indexed_at, 105 105 + bsky_profiles: comment.bsky_profiles, 106 106 + document: doc 107 107 + ? { 108 108 + uri: doc.uri, 109 109 + data: doc.data, 110 110 + } 111 111 + : null, 112 112 + publication: pub 113 113 + ? { 114 114 + uri: pub.uri, 115 115 + record: pub.record, 116 116 + } 117 117 + : null, 118 118 + parentComment: record.reply?.parent 119 119 + ? parentCommentsMap.get(record.reply.parent) || null 120 120 + : null, 121 121 + }; 122 122 + }); 123 123 + 124 124 + const nextCursor = 125 125 + comments.length === limit 126 126 + ? { 127 127 + indexed_at: comments[comments.length - 1].indexed_at, 128 128 + uri: comments[comments.length - 1].uri, 129 129 + } 130 130 + : null; 131 131 + 132 132 + return { comments, nextCursor }; 133 133 + }

+28

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

··· 1 1 + import { idResolver } from "app/(home-pages)/reader/idResolver"; 2 2 + import { getProfileComments } from "./getProfileComments"; 3 3 + import { ProfileCommentsContent } from "./CommentsContent"; 4 4 + 5 5 + export default async function ProfileCommentsPage(props: { 6 6 + params: Promise<{ didOrHandle: string }>; 7 7 + }) { 8 8 + let params = await props.params; 9 9 + let didOrHandle = decodeURIComponent(params.didOrHandle); 10 10 + 11 11 + // Resolve handle to DID if necessary 12 12 + let did = didOrHandle; 13 13 + if (!didOrHandle.startsWith("did:")) { 14 14 + let resolved = await idResolver.handle.resolve(didOrHandle); 15 15 + if (!resolved) return null; 16 16 + did = resolved; 17 17 + } 18 18 + 19 19 + const { comments, nextCursor } = await getProfileComments(did); 20 20 + 21 21 + return ( 22 22 + <ProfileCommentsContent 23 23 + did={did} 24 24 + comments={comments} 25 25 + nextCursor={nextCursor} 26 26 + /> 27 27 + ); 28 28 + }

+95

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

··· 1 1 + "use server"; 2 2 + 3 3 + import { supabaseServerClient } from "supabase/serverClient"; 4 4 + import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 5 5 + import type { Post } from "app/(home-pages)/reader/getReaderFeed"; 6 6 + 7 7 + export type Cursor = { 8 8 + indexed_at: string; 9 9 + uri: string; 10 10 + }; 11 11 + 12 12 + export async function getProfilePosts( 13 13 + did: string, 14 14 + cursor?: Cursor | null, 15 15 + ): Promise<{ posts: Post[]; nextCursor: Cursor | null }> { 16 16 + const limit = 20; 17 17 + 18 18 + let query = supabaseServerClient 19 19 + .from("documents") 20 20 + .select( 21 21 + `*, 22 22 + comments_on_documents(count), 23 23 + document_mentions_in_bsky(count), 24 24 + documents_in_publications(publications(*))`, 25 25 + ) 26 26 + .like("uri", `at://${did}/%`) 27 27 + .order("indexed_at", { ascending: false }) 28 28 + .order("uri", { ascending: false }) 29 29 + .limit(limit); 30 30 + 31 31 + if (cursor) { 32 32 + query = query.or( 33 33 + `indexed_at.lt.${cursor.indexed_at},and(indexed_at.eq.${cursor.indexed_at},uri.lt.${cursor.uri})`, 34 34 + ); 35 35 + } 36 36 + 37 37 + let [{ data: docs }, { data: pubs }, { data: profile }] = await Promise.all([ 38 38 + query, 39 39 + supabaseServerClient 40 40 + .from("publications") 41 41 + .select("*") 42 42 + .eq("identity_did", did), 43 43 + supabaseServerClient 44 44 + .from("bsky_profiles") 45 45 + .select("handle") 46 46 + .eq("did", did) 47 47 + .single(), 48 48 + ]); 49 49 + 50 50 + // Build a map of publications for quick lookup 51 51 + let pubMap = new Map<string, NonNullable<typeof pubs>[number]>(); 52 52 + for (let pub of pubs || []) { 53 53 + pubMap.set(pub.uri, pub); 54 54 + } 55 55 + 56 56 + // Transform data to Post[] format 57 57 + let handle = profile?.handle ? `@${profile.handle}` : null; 58 58 + let posts: Post[] = []; 59 59 + 60 60 + for (let doc of docs || []) { 61 61 + let pubFromDoc = doc.documents_in_publications?.[0]?.publications; 62 62 + let pub = pubFromDoc ? pubMap.get(pubFromDoc.uri) || pubFromDoc : null; 63 63 + 64 64 + let post: Post = { 65 65 + author: handle, 66 66 + documents: { 67 67 + data: doc.data, 68 68 + uri: doc.uri, 69 69 + indexed_at: doc.indexed_at, 70 70 + comments_on_documents: doc.comments_on_documents, 71 71 + document_mentions_in_bsky: doc.document_mentions_in_bsky, 72 72 + }, 73 73 + }; 74 74 + 75 75 + if (pub) { 76 76 + post.publication = { 77 77 + href: getPublicationURL(pub), 78 78 + pubRecord: pub.record, 79 79 + uri: pub.uri, 80 80 + }; 81 81 + } 82 82 + 83 83 + posts.push(post); 84 84 + } 85 85 + 86 86 + const nextCursor = 87 87 + posts.length === limit 88 88 + ? { 89 89 + indexed_at: posts[posts.length - 1].documents.indexed_at, 90 90 + uri: posts[posts.length - 1].documents.uri, 91 91 + } 92 92 + : null; 93 93 + 94 94 + return { posts, nextCursor }; 95 95 + }

+112

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

··· 1 1 + import { idResolver } from "app/(home-pages)/reader/idResolver"; 2 2 + import { NotFoundLayout } from "components/PageLayouts/NotFoundLayout"; 3 3 + import { supabaseServerClient } from "supabase/serverClient"; 4 4 + import { Json } from "supabase/database.types"; 5 5 + import { ProfileHeader } from "./ProfileHeader"; 6 6 + import { ProfileTabs } from "./ProfileTabs"; 7 7 + import { DashboardLayout } from "components/PageLayouts/DashboardLayout"; 8 8 + import { ProfileLayout } from "./ProfileLayout"; 9 9 + import { Agent } from "@atproto/api"; 10 10 + import { get_profile_data } from "app/api/rpc/[command]/get_profile_data"; 11 11 + import { Metadata } from "next"; 12 12 + import { cache } from "react"; 13 13 + 14 14 + // Cache the profile data call to prevent concurrent OAuth restores 15 15 + const getCachedProfileData = cache(async (did: string) => { 16 16 + return get_profile_data.handler( 17 17 + { didOrHandle: did }, 18 18 + { supabase: supabaseServerClient }, 19 19 + ); 20 20 + }); 21 21 + 22 22 + export async function generateMetadata(props: { 23 23 + params: Promise<{ didOrHandle: string }>; 24 24 + }): Promise<Metadata> { 25 25 + let params = await props.params; 26 26 + let didOrHandle = decodeURIComponent(params.didOrHandle); 27 27 + 28 28 + let did = didOrHandle; 29 29 + if (!didOrHandle.startsWith("did:")) { 30 30 + let resolved = await idResolver.handle.resolve(didOrHandle); 31 31 + if (!resolved) return { title: "Profile - Leaflet" }; 32 32 + did = resolved; 33 33 + } 34 34 + 35 35 + let profileData = await getCachedProfileData(did); 36 36 + let { profile } = profileData.result; 37 37 + 38 38 + if (!profile) return { title: "Profile - Leaflet" }; 39 39 + 40 40 + const displayName = profile.displayName; 41 41 + const handle = profile.handle; 42 42 + 43 43 + const title = displayName 44 44 + ? `${displayName} (@${handle}) - Leaflet` 45 45 + : `@${handle} - Leaflet`; 46 46 + 47 47 + return { title }; 48 48 + } 49 49 + 50 50 + export default async function ProfilePageLayout(props: { 51 51 + params: Promise<{ didOrHandle: string }>; 52 52 + children: React.ReactNode; 53 53 + }) { 54 54 + let params = await props.params; 55 55 + let didOrHandle = decodeURIComponent(params.didOrHandle); 56 56 + 57 57 + // Resolve handle to DID if necessary 58 58 + let did = didOrHandle; 59 59 + 60 60 + if (!didOrHandle.startsWith("did:")) { 61 61 + let resolved = await idResolver.handle.resolve(didOrHandle); 62 62 + if (!resolved) { 63 63 + return ( 64 64 + <NotFoundLayout> 65 65 + <p className="font-bold">Sorry, can&apos;t resolve handle!</p> 66 66 + <p> 67 67 + This may be a glitch on our end. If the issue persists please{" "} 68 68 + <a href="mailto:contact@leaflet.pub">send us a note</a>. 69 69 + </p> 70 70 + </NotFoundLayout> 71 71 + ); 72 72 + } 73 73 + did = resolved; 74 74 + } 75 75 + let profileData = await getCachedProfileData(did); 76 76 + let { publications, profile } = profileData.result; 77 77 + 78 78 + if (!profile) return null; 79 79 + 80 80 + return ( 81 81 + <DashboardLayout 82 82 + id="profile" 83 83 + defaultTab="default" 84 84 + currentPage="profile" 85 85 + actions={null} 86 86 + tabs={{ 87 87 + default: { 88 88 + controls: null, 89 89 + content: ( 90 90 + <ProfileLayout> 91 91 + <ProfileHeader 92 92 + profile={profile} 93 93 + publications={publications || []} 94 94 + /> 95 95 + <ProfileTabs didOrHandle={params.didOrHandle} /> 96 96 + <div className="h-full pt-3 pb-4 px-3 sm:px-4 flex flex-col"> 97 97 + {props.children} 98 98 + </div> 99 99 + </ProfileLayout> 100 100 + ), 101 101 + }, 102 102 + }} 103 103 + /> 104 104 + ); 105 105 + } 106 106 + 107 107 + export type ProfileData = { 108 108 + did: string; 109 109 + handle: string | null; 110 110 + indexed_at: string; 111 111 + record: Json; 112 112 + };

+24

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

··· 1 1 + import { idResolver } from "app/(home-pages)/reader/idResolver"; 2 2 + import { getProfilePosts } from "./getProfilePosts"; 3 3 + import { ProfilePostsContent } from "./PostsContent"; 4 4 + 5 5 + export default async function ProfilePostsPage(props: { 6 6 + params: Promise<{ didOrHandle: string }>; 7 7 + }) { 8 8 + let params = await props.params; 9 9 + let didOrHandle = decodeURIComponent(params.didOrHandle); 10 10 + 11 11 + // Resolve handle to DID if necessary 12 12 + let did = didOrHandle; 13 13 + if (!didOrHandle.startsWith("did:")) { 14 14 + let resolved = await idResolver.handle.resolve(didOrHandle); 15 15 + if (!resolved) return null; 16 16 + did = resolved; 17 17 + } 18 18 + 19 19 + const { posts, nextCursor } = await getProfilePosts(did); 20 20 + 21 21 + return ( 22 22 + <ProfilePostsContent did={did} posts={posts} nextCursor={nextCursor} /> 23 23 + ); 24 24 + }

+103

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { useEffect, useRef } from "react"; 4 4 + import useSWRInfinite from "swr/infinite"; 5 5 + import { PubListing } from "app/(home-pages)/discover/PubListing"; 6 6 + import { 7 7 + getSubscriptions, 8 8 + type PublicationSubscription, 9 9 + } from "app/(home-pages)/reader/getSubscriptions"; 10 10 + import { Cursor } from "app/(home-pages)/reader/getReaderFeed"; 11 11 + 12 12 + export const ProfileSubscriptionsContent = (props: { 13 13 + did: string; 14 14 + subscriptions: PublicationSubscription[]; 15 15 + nextCursor: Cursor | null; 16 16 + }) => { 17 17 + const getKey = ( 18 18 + pageIndex: number, 19 19 + previousPageData: { 20 20 + subscriptions: PublicationSubscription[]; 21 21 + nextCursor: Cursor | null; 22 22 + } | null, 23 23 + ) => { 24 24 + // Reached the end 25 25 + if (previousPageData && !previousPageData.nextCursor) return null; 26 26 + 27 27 + // First page, we don't have previousPageData 28 28 + if (pageIndex === 0) 29 29 + return ["profile-subscriptions", props.did, null] as const; 30 30 + 31 31 + // Add the cursor to the key 32 32 + return [ 33 33 + "profile-subscriptions", 34 34 + props.did, 35 35 + previousPageData?.nextCursor, 36 36 + ] as const; 37 37 + }; 38 38 + 39 39 + const { data, size, setSize, isValidating } = useSWRInfinite( 40 40 + getKey, 41 41 + ([_, did, cursor]) => getSubscriptions(did, cursor), 42 42 + { 43 43 + fallbackData: [ 44 44 + { subscriptions: props.subscriptions, nextCursor: props.nextCursor }, 45 45 + ], 46 46 + revalidateFirstPage: false, 47 47 + }, 48 48 + ); 49 49 + 50 50 + const loadMoreRef = useRef<HTMLDivElement>(null); 51 51 + 52 52 + // Set up intersection observer to load more when trigger element is visible 53 53 + useEffect(() => { 54 54 + const observer = new IntersectionObserver( 55 55 + (entries) => { 56 56 + if (entries[0].isIntersecting && !isValidating) { 57 57 + const hasMore = data && data[data.length - 1]?.nextCursor; 58 58 + if (hasMore) { 59 59 + setSize(size + 1); 60 60 + } 61 61 + } 62 62 + }, 63 63 + { threshold: 0.1 }, 64 64 + ); 65 65 + 66 66 + if (loadMoreRef.current) { 67 67 + observer.observe(loadMoreRef.current); 68 68 + } 69 69 + 70 70 + return () => observer.disconnect(); 71 71 + }, [data, size, setSize, isValidating]); 72 72 + 73 73 + const allSubscriptions = data 74 74 + ? data.flatMap((page) => page.subscriptions) 75 75 + : []; 76 76 + 77 77 + if (allSubscriptions.length === 0 && !isValidating) { 78 78 + return ( 79 79 + <div className="text-tertiary text-center py-4">No subscriptions yet</div> 80 80 + ); 81 81 + } 82 82 + 83 83 + return ( 84 84 + <div className="relative"> 85 85 + <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 gap-3"> 86 86 + {allSubscriptions.map((sub) => ( 87 87 + <PubListing key={sub.uri} {...sub} /> 88 88 + ))} 89 89 + </div> 90 90 + {/* Trigger element for loading more subscriptions */} 91 91 + <div 92 92 + ref={loadMoreRef} 93 93 + className="absolute bottom-96 left-0 w-full h-px pointer-events-none" 94 94 + aria-hidden="true" 95 95 + /> 96 96 + {isValidating && ( 97 97 + <div className="text-center text-tertiary py-4"> 98 98 + Loading more subscriptions... 99 99 + </div> 100 100 + )} 101 101 + </div> 102 102 + ); 103 103 + };

+28

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

··· 1 1 + import { idResolver } from "app/(home-pages)/reader/idResolver"; 2 2 + import { getSubscriptions } from "app/(home-pages)/reader/getSubscriptions"; 3 3 + import { ProfileSubscriptionsContent } from "./SubscriptionsContent"; 4 4 + 5 5 + export default async function ProfileSubscriptionsPage(props: { 6 6 + params: Promise<{ didOrHandle: string }>; 7 7 + }) { 8 8 + const params = await props.params; 9 9 + const didOrHandle = decodeURIComponent(params.didOrHandle); 10 10 + 11 11 + // Resolve handle to DID if necessary 12 12 + let did = didOrHandle; 13 13 + if (!didOrHandle.startsWith("did:")) { 14 14 + const resolved = await idResolver.handle.resolve(didOrHandle); 15 15 + if (!resolved) return null; 16 16 + did = resolved; 17 17 + } 18 18 + 19 19 + const { subscriptions, nextCursor } = await getSubscriptions(did); 20 20 + 21 21 + return ( 22 22 + <ProfileSubscriptionsContent 23 23 + did={did} 24 24 + subscriptions={subscriptions} 25 25 + nextCursor={nextCursor} 26 26 + /> 27 27 + ); 28 28 + }

+1 -1

app/(home-pages)/reader/SubscriptionsContent.tsx

··· 32 32 33 33 const { data, error, size, setSize, isValidating } = useSWRInfinite( 34 34 getKey, 35 35 - ([_, cursor]) => getSubscriptions(cursor), 35 35 + ([_, cursor]) => getSubscriptions(null, cursor), 36 36 { 37 37 fallbackData: [ 38 38 { subscriptions: props.publications, nextCursor: props.nextCursor },

+1 -1

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

··· 83 83 84 84 export type Post = { 85 85 author: string | null; 86 86 - publication: { 86 86 + publication?: { 87 87 href: string; 88 88 pubRecord: Json; 89 89 uri: string;

+13 -4

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

··· 8 8 import { idResolver } from "./idResolver"; 9 9 import { Cursor } from "./getReaderFeed"; 10 10 11 11 - export async function getSubscriptions(cursor?: Cursor | null): Promise<{ 11 11 + export async function getSubscriptions( 12 12 + did?: string | null, 13 13 + cursor?: Cursor | null, 14 14 + ): Promise<{ 12 15 nextCursor: null | Cursor; 13 16 subscriptions: PublicationSubscription[]; 14 17 }> { 15 15 - let auth_res = await getIdentityData(); 16 16 - if (!auth_res?.atp_did) return { subscriptions: [], nextCursor: null }; 18 18 + // If no DID provided, use logged-in user's DID 19 19 + let identity = did; 20 20 + if (!identity) { 21 21 + const auth_res = await getIdentityData(); 22 22 + if (!auth_res?.atp_did) return { subscriptions: [], nextCursor: null }; 23 23 + identity = auth_res.atp_did; 24 24 + } 25 25 + 17 26 let query = supabaseServerClient 18 27 .from("publication_subscriptions") 19 28 .select(`*, publications(*, documents_in_publications(*, documents(*)))`) ··· 25 34 }) 26 35 .limit(1, { referencedTable: "publications.documents_in_publications" }) 27 36 .limit(25) 28 28 - .eq("identity", auth_res.atp_did); 37 37 + .eq("identity", identity); 29 38 30 39 if (cursor) { 31 40 query = query.or(

-1

app/(home-pages)/reader/page.tsx

··· 12 12 return ( 13 13 <DashboardLayout 14 14 id="reader" 15 15 - cardBorderHidden={false} 16 15 currentPage="reader" 17 16 defaultTab="Read" 18 17 actions={null}

+1 -4

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

··· 10 10 export async function getDocumentsByTag( 11 11 tag: string, 12 12 ): Promise<{ posts: Post[] }> { 13 13 - // Normalize tag to lowercase for case-insensitive search 14 14 - const normalizedTag = tag.toLowerCase(); 15 15 - 16 13 // Query documents that have this tag 17 14 const { data: documents, error } = await supabaseServerClient 18 15 .from("documents") ··· 22 19 document_mentions_in_bsky(count), 23 20 documents_in_publications(publications(*))`, 24 21 ) 25 25 - .contains("data->tags", `["${normalizedTag}"]`) 22 22 + .contains("data->tags", `["${tag}"]`) 26 23 .order("indexed_at", { ascending: false }) 27 24 .limit(50); 28 25

+9 -1

app/(home-pages)/tag/[tag]/page.tsx

··· 3 3 import { PostListing } from "components/PostListing"; 4 4 import { getDocumentsByTag } from "./getDocumentsByTag"; 5 5 import { TagTiny } from "components/Icons/TagTiny"; 6 6 + import { Metadata } from "next"; 7 7 + 8 8 + export async function generateMetadata(props: { 9 9 + params: Promise<{ tag: string }>; 10 10 + }): Promise<Metadata> { 11 11 + const params = await props.params; 12 12 + const decodedTag = decodeURIComponent(params.tag); 13 13 + return { title: `${decodedTag} - Leaflet` }; 14 14 + } 6 15 7 16 export default async function TagPage(props: { 8 17 params: Promise<{ tag: string }>; ··· 14 23 return ( 15 24 <DashboardLayout 16 25 id="tag" 17 17 - cardBorderHidden={false} 18 26 currentPage="tag" 19 27 defaultTab="default" 20 28 actions={null}

+25 -1

app/[leaflet_id]/actions/HelpButton.tsx

··· 58 58 keys={[metaKey(), isMac() ? "Ctrl" : "Meta", "X"]} 59 59 /> 60 60 <KeyboardShortcut name="Inline Link" keys={[metaKey(), "K"]} /> 61 61 + <KeyboardShortcut 62 62 + name="Make Title" 63 63 + keys={[metaKey(), isMac() ? "Opt" : "Alt", "1"]} 64 64 + /> 65 65 + <KeyboardShortcut 66 66 + name="Make Heading" 67 67 + keys={[metaKey(), isMac() ? "Opt" : "Alt", "2"]} 68 68 + /> 69 69 + <KeyboardShortcut 70 70 + name="Make Subheading" 71 71 + keys={[metaKey(), isMac() ? "Opt" : "Alt", "3"]} 72 72 + /> 73 73 + <KeyboardShortcut 74 74 + name="Regular Text" 75 75 + keys={[metaKey(), isMac() ? "Opt" : "Alt", "0"]} 76 76 + /> 77 77 + <KeyboardShortcut 78 78 + name="Large Text" 79 79 + keys={[metaKey(), isMac() ? "Opt" : "Alt", "+"]} 80 80 + /> 81 81 + <KeyboardShortcut 82 82 + name="Small Text" 83 83 + keys={[metaKey(), isMac() ? "Opt" : "Alt", "-"]} 84 84 + /> 61 85 62 86 <Label>Block Shortcuts</Label> 63 87 {/* shift + up/down arrows (or click + drag): select multiple blocks */} ··· 161 185 className="py-2 px-2 rounded-md flex flex-col gap-1 bg-border-light hover:bg-border hover:no-underline" 162 186 style={{ 163 187 backgroundColor: isHovered 164 164 - ? "color-mix(in oklab, rgb(var(--accent-contrast)), rgb(var(--bg-page)) 85%)" 188 188 + ? "rgb(var(--accent-light))" 165 189 : "color-mix(in oklab, rgb(var(--accent-contrast)), rgb(var(--bg-page)) 75%)", 166 190 }} 167 191 onMouseEnter={handleMouseEnter}

+46 -8

app/[leaflet_id]/actions/PublishButton.tsx

··· 13 13 import { PublishSmall } from "components/Icons/PublishSmall"; 14 14 import { useIdentityData } from "components/IdentityProvider"; 15 15 import { InputWithLabel } from "components/Input"; 16 16 - import { Menu, MenuItem } from "components/Layout"; 16 16 + import { Menu, MenuItem } from "components/Menu"; 17 17 import { 18 18 useLeafletDomains, 19 19 useLeafletPublicationData, ··· 35 35 } from "src/hooks/queries/useBlocks"; 36 36 import * as Y from "yjs"; 37 37 import * as base64 from "base64-js"; 38 38 - import { YJSFragmentToString } from "components/Blocks/TextBlock/RenderYJSFragment"; 38 38 + import { YJSFragmentToString } from "src/utils/yjsFragmentToString"; 39 39 import { BlueskyLogin } from "app/login/LoginForm"; 40 40 import { moveLeafletToPublication } from "actions/publications/moveLeafletToPublication"; 41 41 import { AddTiny } from "components/Icons/AddTiny"; 42 42 + import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError"; 42 43 43 44 export const PublishButton = (props: { entityID: string }) => { 44 45 let { data: pub } = useLeafletPublicationData(); ··· 68 69 let { identity } = useIdentityData(); 69 70 let toaster = useToaster(); 70 71 72 72 + // Get title and description from Replicache state (same as draft editor) 73 73 + // This ensures we use the latest edited values, not stale cached data 74 74 + let replicacheTitle = useSubscribe(rep, (tx) => 75 75 + tx.get<string>("publication_title"), 76 76 + ); 77 77 + let replicacheDescription = useSubscribe(rep, (tx) => 78 78 + tx.get<string>("publication_description"), 79 79 + ); 80 80 + 81 81 + // Use Replicache state if available, otherwise fall back to pub data 82 82 + const currentTitle = 83 83 + typeof replicacheTitle === "string" ? replicacheTitle : pub?.title || ""; 84 84 + const currentDescription = 85 85 + typeof replicacheDescription === "string" 86 86 + ? replicacheDescription 87 87 + : pub?.description || ""; 88 88 + 71 89 // Get tags from Replicache state (same as draft editor) 72 90 let tags = useSubscribe(rep, (tx) => tx.get<string[]>("publication_tags")); 73 91 const currentTags = Array.isArray(tags) ? tags : []; 92 92 + 93 93 + // Get cover image from Replicache state 94 94 + let coverImage = useSubscribe(rep, (tx) => 95 95 + tx.get<string | null>("publication_cover_image"), 96 96 + ); 74 97 75 98 return ( 76 99 <ActionButton ··· 80 103 onClick={async () => { 81 104 if (!pub) return; 82 105 setIsLoading(true); 83 83 - let doc = await publishToPublication({ 106 106 + let result = await publishToPublication({ 84 107 root_entity: rootEntity, 85 108 publication_uri: pub.publications?.uri, 86 109 leaflet_id: permission_token.id, 87 87 - title: pub.title, 88 88 - description: pub.description, 110 110 + title: currentTitle, 111 111 + description: currentDescription, 89 112 tags: currentTags, 113 113 + cover_image: coverImage, 90 114 }); 91 115 setIsLoading(false); 92 116 mutate(); 93 117 118 118 + if (!result.success) { 119 119 + toaster({ 120 120 + content: isOAuthSessionError(result.error) ? ( 121 121 + <OAuthErrorMessage error={result.error} /> 122 122 + ) : ( 123 123 + "Failed to publish" 124 124 + ), 125 125 + type: "error", 126 126 + }); 127 127 + return; 128 128 + } 129 129 + 94 130 // Generate URL based on whether it's in a publication or standalone 95 131 let docUrl = pub.publications 96 96 - ? `${getPublicationURL(pub.publications)}/${doc?.rkey}` 97 97 - : `https://leaflet.pub/p/${identity?.atp_did}/${doc?.rkey}`; 132 132 + ? `${getPublicationURL(pub.publications)}/${result.rkey}` 133 133 + : `https://leaflet.pub/p/${identity?.atp_did}/${result.rkey}`; 98 134 99 135 toaster({ 100 136 content: ( 101 137 <div> 102 138 {pub.doc ? "Updated! " : "Published! "} 103 103 - <SpeedyLink href={docUrl}>link</SpeedyLink> 139 139 + <SpeedyLink className="underline" href={docUrl}> 140 140 + See Published Post 141 141 + </SpeedyLink> 104 142 </div> 105 143 ), 106 144 type: "success",

+1 -1

app/[leaflet_id]/actions/ShareOptions/index.tsx

··· 3 3 import { getShareLink } from "./getShareLink"; 4 4 import { useEntitySetContext } from "components/EntitySetProvider"; 5 5 import { useSmoker } from "components/Toast"; 6 6 - import { Menu, MenuItem } from "components/Layout"; 6 6 + import { Menu, MenuItem } from "components/Menu"; 7 7 import { ActionButton } from "components/ActionBar/ActionButton"; 8 8 import useSWR from "swr"; 9 9 import LoginForm from "app/login/LoginForm";

+1 -1

app/[leaflet_id]/page.tsx

··· 4 4 5 5 import type { Fact } from "src/replicache"; 6 6 import type { Attribute } from "src/replicache/attributes"; 7 7 - import { YJSFragmentToString } from "components/Blocks/TextBlock/RenderYJSFragment"; 7 7 + import { YJSFragmentToString } from "src/utils/yjsFragmentToString"; 8 8 import { Leaflet } from "./Leaflet"; 9 9 import { scanIndexLocal } from "src/replicache/utils"; 10 10 import { getRSVPData } from "actions/getRSVPData";

+58 -22

app/[leaflet_id]/publish/PublishPost.tsx

··· 22 22 import { TagSelector } from "../../../components/Tags"; 23 23 import { LooseLeafSmall } from "components/Icons/LooseleafSmall"; 24 24 import { PubIcon } from "components/ActionBar/Publications"; 25 25 + import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError"; 25 26 26 27 type Props = { 27 28 title: string; ··· 65 66 let [charCount, setCharCount] = useState(0); 66 67 let [shareOption, setShareOption] = useState<"bluesky" | "quiet">("bluesky"); 67 68 let [isLoading, setIsLoading] = useState(false); 69 69 + let [oauthError, setOauthError] = useState< 70 70 + import("src/atproto-oauth").OAuthSessionError | null 71 71 + >(null); 68 72 let params = useParams(); 69 73 let { rep } = useReplicache(); 70 74 ··· 73 77 tx.get<string[]>("publication_tags"), 74 78 ); 75 79 let [localTags, setLocalTags] = useState<string[]>([]); 80 80 + 81 81 + // Get cover image from Replicache 82 82 + let replicacheCoverImage = useSubscribe(rep, (tx) => 83 83 + tx.get<string | null>("publication_cover_image"), 84 84 + ); 76 85 77 86 // Use Replicache tags only when we have a draft 78 87 const hasDraft = props.hasDraft; ··· 96 105 async function submit() { 97 106 if (isLoading) return; 98 107 setIsLoading(true); 108 108 + setOauthError(null); 99 109 await rep?.push(); 100 100 - let doc = await publishToPublication({ 110 110 + let result = await publishToPublication({ 101 111 root_entity: props.root_entity, 102 112 publication_uri: props.publication_uri, 103 113 leaflet_id: props.leaflet_id, 104 114 title: props.title, 105 115 description: props.description, 106 116 tags: currentTags, 117 117 + cover_image: replicacheCoverImage, 107 118 entitiesToDelete: props.entitiesToDelete, 108 119 }); 109 109 - if (!doc) return; 120 120 + 121 121 + if (!result.success) { 122 122 + setIsLoading(false); 123 123 + if (isOAuthSessionError(result.error)) { 124 124 + setOauthError(result.error); 125 125 + } 126 126 + return; 127 127 + } 110 128 111 129 // Generate post URL based on whether it's in a publication or standalone 112 130 let post_url = props.record?.base_path 113 113 - ? `https://${props.record.base_path}/${doc.rkey}` 114 114 - : `https://leaflet.pub/p/${props.profile.did}/${doc.rkey}`; 131 131 + ? `https://${props.record.base_path}/${result.rkey}` 132 132 + : `https://leaflet.pub/p/${props.profile.did}/${result.rkey}`; 115 133 116 134 let [text, facets] = editorStateRef.current 117 135 ? editorStateToFacetedText(editorStateRef.current) 118 136 : []; 119 119 - if (shareOption === "bluesky") 120 120 - await publishPostToBsky({ 137 137 + if (shareOption === "bluesky") { 138 138 + let bskyResult = await publishPostToBsky({ 121 139 facets: facets || [], 122 140 text: text || "", 123 141 title: props.title, 124 142 url: post_url, 125 143 description: props.description, 126 126 - document_record: doc.record, 127 127 - rkey: doc.rkey, 144 144 + document_record: result.record, 145 145 + rkey: result.rkey, 128 146 }); 147 147 + if (!bskyResult.success && isOAuthSessionError(bskyResult.error)) { 148 148 + setIsLoading(false); 149 149 + setOauthError(bskyResult.error); 150 150 + return; 151 151 + } 152 152 + } 129 153 setIsLoading(false); 130 154 props.setPublishState({ state: "success", post_url }); 131 155 } ··· 162 186 </div> 163 187 <hr className="border-border mb-2" /> 164 188 165 165 - <div className="flex justify-between"> 166 166 - <Link 167 167 - className="hover:no-underline! font-bold" 168 168 - href={`/${params.leaflet_id}`} 169 169 - > 170 170 - Back 171 171 - </Link> 172 172 - <ButtonPrimary 173 173 - type="submit" 174 174 - className="place-self-end h-[30px]" 175 175 - disabled={charCount > 300} 176 176 - > 177 177 - {isLoading ? <DotLoader /> : "Publish this Post!"} 178 178 - </ButtonPrimary> 189 189 + <div className="flex flex-col gap-2"> 190 190 + <div className="flex justify-between"> 191 191 + <Link 192 192 + className="hover:no-underline! font-bold" 193 193 + href={`/${params.leaflet_id}`} 194 194 + > 195 195 + Back 196 196 + </Link> 197 197 + <ButtonPrimary 198 198 + type="submit" 199 199 + className="place-self-end h-[30px]" 200 200 + disabled={charCount > 300} 201 201 + > 202 202 + {isLoading ? ( 203 203 + <DotLoader className="h-[23px]" /> 204 204 + ) : ( 205 205 + "Publish this Post!" 206 206 + )} 207 207 + </ButtonPrimary> 208 208 + </div> 209 209 + {oauthError && ( 210 210 + <OAuthErrorMessage 211 211 + error={oauthError} 212 212 + className="text-right text-sm text-accent-contrast" 213 213 + /> 214 214 + )} 179 215 </div> 180 216 </div> 181 217 </form>

+56 -16

app/[leaflet_id]/publish/publishBskyPost.ts

··· 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 { createOauthClient } from "src/atproto-oauth"; 12 12 + import { 13 13 + restoreOAuthSession, 14 14 + OAuthSessionError, 15 15 + } from "src/atproto-oauth"; 13 16 import { supabaseServerClient } from "supabase/serverClient"; 14 17 import { Json } from "supabase/database.types"; 15 18 import { 16 19 getMicroLinkOgImage, 17 20 getWebpageImage, 18 21 } from "src/utils/getMicroLinkOgImage"; 22 22 + import { fetchAtprotoBlob } from "app/api/atproto_images/route"; 23 23 + 24 24 + type PublishBskyResult = 25 25 + | { success: true } 26 26 + | { success: false; error: OAuthSessionError }; 19 27 20 28 export async function publishPostToBsky(args: { 21 29 text: string; ··· 25 33 document_record: PubLeafletDocument.Record; 26 34 rkey: string; 27 35 facets: AppBskyRichtextFacet.Main[]; 28 28 - }) { 29 29 - const oauthClient = await createOauthClient(); 36 36 + }): Promise<PublishBskyResult> { 30 37 let identity = await getIdentityData(); 31 31 - if (!identity || !identity.atp_did) return null; 38 38 + if (!identity || !identity.atp_did) { 39 39 + return { 40 40 + success: false, 41 41 + error: { 42 42 + type: "oauth_session_expired", 43 43 + message: "Not authenticated", 44 44 + did: "", 45 45 + }, 46 46 + }; 47 47 + } 32 48 33 33 - let credentialSession = await oauthClient.restore(identity.atp_did); 49 49 + const sessionResult = await restoreOAuthSession(identity.atp_did); 50 50 + if (!sessionResult.ok) { 51 51 + return { success: false, error: sessionResult.error }; 52 52 + } 53 53 + let credentialSession = sessionResult.value; 34 54 let agent = new AtpBaseClient( 35 55 credentialSession.fetchHandler.bind(credentialSession), 36 56 ); 37 37 - let newPostUrl = args.url; 38 38 - let preview_image = await getWebpageImage(newPostUrl, { 39 39 - width: 1400, 40 40 - height: 733, 41 41 - noCache: true, 42 42 - }); 43 57 44 44 - let binary = await preview_image.blob(); 45 45 - let resized_preview_image = await sharp(await binary.arrayBuffer()) 58 58 + // Get image binary - prefer cover image, fall back to screenshot 59 59 + let imageBinary: Blob | null = null; 60 60 + 61 61 + if (args.document_record.coverImage) { 62 62 + let cid = 63 63 + (args.document_record.coverImage.ref as unknown as { $link: string })[ 64 64 + "$link" 65 65 + ] || args.document_record.coverImage.ref.toString(); 66 66 + 67 67 + let coverImageResponse = await fetchAtprotoBlob(identity.atp_did, cid); 68 68 + if (coverImageResponse) { 69 69 + imageBinary = await coverImageResponse.blob(); 70 70 + } 71 71 + } 72 72 + 73 73 + // Fall back to screenshot if no cover image or fetch failed 74 74 + if (!imageBinary) { 75 75 + let preview_image = await getWebpageImage(args.url, { 76 76 + width: 1400, 77 77 + height: 733, 78 78 + noCache: true, 79 79 + }); 80 80 + imageBinary = await preview_image.blob(); 81 81 + } 82 82 + 83 83 + // Resize and upload 84 84 + let resizedImage = await sharp(await imageBinary.arrayBuffer()) 46 85 .resize({ 47 86 width: 1200, 87 87 + height: 630, 48 88 fit: "cover", 49 89 }) 50 90 .webp({ quality: 85 }) 51 91 .toBuffer(); 52 92 53 53 - let blob = await agent.com.atproto.repo.uploadBlob(resized_preview_image, { 54 54 - headers: { "Content-Type": binary.type }, 93 93 + let blob = await agent.com.atproto.repo.uploadBlob(resizedImage, { 94 94 + headers: { "Content-Type": "image/webp" }, 55 95 }); 56 96 let bsky = new BskyAgent(credentialSession); 57 97 let post = await bsky.app.bsky.feed.post.create( ··· 90 130 data: record as Json, 91 131 }) 92 132 .eq("uri", result.uri); 93 93 - return true; 133 133 + return { success: true }; 94 134 }

+29 -11

app/api/atproto_images/route.ts

··· 1 1 import { IdResolver } from "@atproto/identity"; 2 2 import { NextRequest, NextResponse } from "next/server"; 3 3 + 3 4 let idResolver = new IdResolver(); 4 5 5 5 - export async function GET(req: NextRequest) { 6 6 - const url = new URL(req.url); 7 7 - const params = { 8 8 - did: url.searchParams.get("did") ?? "", 9 9 - cid: url.searchParams.get("cid") ?? "", 10 10 - }; 11 11 - if (!params.did || !params.cid) 12 12 - return new NextResponse(null, { status: 404 }); 6 6 + /** 7 7 + * Fetches a blob from an AT Protocol PDS given a DID and CID 8 8 + * Returns the Response object or null if the blob couldn't be fetched 9 9 + */ 10 10 + export async function fetchAtprotoBlob( 11 11 + did: string, 12 12 + cid: string, 13 13 + ): Promise<Response | null> { 14 14 + if (!did || !cid) return null; 13 15 14 14 - let identity = await idResolver.did.resolve(params.did); 16 16 + let identity = await idResolver.did.resolve(did); 15 17 let service = identity?.service?.find((f) => f.id === "#atproto_pds"); 16 16 - if (!service) return new NextResponse(null, { status: 404 }); 18 18 + if (!service) return null; 19 19 + 17 20 const response = await fetch( 18 18 - `${service.serviceEndpoint}/xrpc/com.atproto.sync.getBlob?did=${params.did}&cid=${params.cid}`, 21 21 + `${service.serviceEndpoint}/xrpc/com.atproto.sync.getBlob?did=${did}&cid=${cid}`, 19 22 { 20 23 headers: { 21 24 "Accept-Encoding": "gzip, deflate, br, zstd", 22 25 }, 23 26 }, 24 27 ); 28 28 + 29 29 + if (!response.ok) return null; 30 30 + 31 31 + return response; 32 32 + } 33 33 + 34 34 + export async function GET(req: NextRequest) { 35 35 + const url = new URL(req.url); 36 36 + const params = { 37 37 + did: url.searchParams.get("did") ?? "", 38 38 + cid: url.searchParams.get("cid") ?? "", 39 39 + }; 40 40 + 41 41 + const response = await fetchAtprotoBlob(params.did, params.cid); 42 42 + if (!response) return new NextResponse(null, { status: 404 }); 25 43 26 44 // Clone the response to modify headers 27 45 const cachedResponse = new Response(response.body, response);

+41

app/api/bsky/agent.ts

··· 1 1 + import { Agent } from "@atproto/api"; 2 2 + import { cookies } from "next/headers"; 3 3 + import { createOauthClient } from "src/atproto-oauth"; 4 4 + import { supabaseServerClient } from "supabase/serverClient"; 5 5 + 6 6 + export async function getAuthenticatedAgent(): Promise<Agent | null> { 7 7 + try { 8 8 + const cookieStore = await cookies(); 9 9 + const authToken = 10 10 + cookieStore.get("auth_token")?.value || 11 11 + cookieStore.get("external_auth_token")?.value; 12 12 + 13 13 + if (!authToken || authToken === "null") return null; 14 14 + 15 15 + const { data } = await supabaseServerClient 16 16 + .from("email_auth_tokens") 17 17 + .select("identities(atp_did)") 18 18 + .eq("id", authToken) 19 19 + .eq("confirmed", true) 20 20 + .single(); 21 21 + 22 22 + const did = data?.identities?.atp_did; 23 23 + if (!did) return null; 24 24 + 25 25 + const oauthClient = await createOauthClient(); 26 26 + const session = await oauthClient.restore(did); 27 27 + return new Agent(session); 28 28 + } catch (error) { 29 29 + console.error("Failed to get authenticated agent:", error); 30 30 + return null; 31 31 + } 32 32 + } 33 33 + 34 34 + export async function getAgent(): Promise<Agent> { 35 35 + const agent = await getAuthenticatedAgent(); 36 36 + if (agent) return agent; 37 37 + 38 38 + return new Agent({ 39 39 + service: "https://public.api.bsky.app", 40 40 + }); 41 41 + }

+41

app/api/bsky/quotes/route.ts

··· 1 1 + import { lexToJson } from "@atproto/api"; 2 2 + import { NextRequest } from "next/server"; 3 3 + import { getAgent } from "../agent"; 4 4 + 5 5 + export const runtime = "nodejs"; 6 6 + 7 7 + export async function GET(req: NextRequest) { 8 8 + try { 9 9 + const searchParams = req.nextUrl.searchParams; 10 10 + const uri = searchParams.get("uri"); 11 11 + const cursor = searchParams.get("cursor"); 12 12 + const limit = searchParams.get("limit"); 13 13 + 14 14 + if (!uri) { 15 15 + return Response.json( 16 16 + { error: "uri parameter is required" }, 17 17 + { status: 400 }, 18 18 + ); 19 19 + } 20 20 + 21 21 + const agent = await getAgent(); 22 22 + 23 23 + const response = await agent.app.bsky.feed.getQuotes({ 24 24 + uri, 25 25 + limit: limit ? parseInt(limit, 10) : 50, 26 26 + cursor: cursor || undefined, 27 27 + }); 28 28 + 29 29 + const result = lexToJson(response.data); 30 30 + 31 31 + return Response.json(result, { 32 32 + headers: { 33 33 + // Cache for 5 minutes on CDN, allow stale content for 1 hour while revalidating 34 34 + "Cache-Control": "public, s-maxage=300, stale-while-revalidate=3600", 35 35 + }, 36 36 + }); 37 37 + } catch (error) { 38 38 + console.error("Error fetching Bluesky quotes:", error); 39 39 + return Response.json({ error: "Failed to fetch quotes" }, { status: 500 }); 40 40 + } 41 41 + }

+41

app/api/bsky/thread/route.ts

··· 1 1 + import { lexToJson } from "@atproto/api"; 2 2 + import { NextRequest } from "next/server"; 3 3 + import { getAgent } from "../agent"; 4 4 + 5 5 + export const runtime = "nodejs"; 6 6 + 7 7 + export async function GET(req: NextRequest) { 8 8 + try { 9 9 + const searchParams = req.nextUrl.searchParams; 10 10 + const uri = searchParams.get("uri"); 11 11 + const depth = searchParams.get("depth"); 12 12 + const parentHeight = searchParams.get("parentHeight"); 13 13 + 14 14 + if (!uri) { 15 15 + return Response.json( 16 16 + { error: "uri parameter is required" }, 17 17 + { status: 400 }, 18 18 + ); 19 19 + } 20 20 + 21 21 + const agent = await getAgent(); 22 22 + 23 23 + const response = await agent.getPostThread({ 24 24 + uri, 25 25 + depth: depth ? parseInt(depth, 10) : 6, 26 26 + parentHeight: parentHeight ? parseInt(parentHeight, 10) : 80, 27 27 + }); 28 28 + 29 29 + const thread = lexToJson(response.data.thread); 30 30 + 31 31 + return Response.json(thread, { 32 32 + headers: { 33 33 + // Cache for 5 minutes on CDN, allow stale content for 1 hour while revalidating 34 34 + "Cache-Control": "public, s-maxage=300, stale-while-revalidate=3600", 35 35 + }, 36 36 + }); 37 37 + } catch (error) { 38 38 + console.error("Error fetching Bluesky thread:", error); 39 39 + return Response.json({ error: "Failed to fetch thread" }, { status: 500 }); 40 40 + } 41 41 + }

+5 -7

app/api/inngest/functions/index_follows.ts

··· 1 1 import { supabaseServerClient } from "supabase/serverClient"; 2 2 import { AtpAgent, AtUri } from "@atproto/api"; 3 3 - import { createIdentity } from "actions/createIdentity"; 4 4 - import { drizzle } from "drizzle-orm/node-postgres"; 5 3 import { inngest } from "../client"; 6 6 - import { pool } from "supabase/pool"; 7 4 8 5 export const index_follows = inngest.createFunction( 9 6 { ··· 58 55 .eq("atp_did", event.data.did) 59 56 .single(); 60 57 if (!exists) { 61 61 - const client = await pool.connect(); 62 62 - let db = drizzle(client); 63 63 - let identity = await createIdentity(db, { atp_did: event.data.did }); 64 64 - client.release(); 58 58 + const { data: identity } = await supabaseServerClient 59 59 + .from("identities") 60 60 + .insert({ atp_did: event.data.did }) 61 61 + .select() 62 62 + .single(); 65 63 return identity; 66 64 } 67 65 }),

+8 -9

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

··· 1 1 - import { createIdentity } from "actions/createIdentity"; 2 1 import { subscribeToPublication } from "app/lish/subscribeToPublication"; 3 3 - import { drizzle } from "drizzle-orm/node-postgres"; 4 2 import { cookies } from "next/headers"; 5 3 import { redirect } from "next/navigation"; 6 4 import { NextRequest, NextResponse } from "next/server"; ··· 13 11 ActionAfterSignIn, 14 12 parseActionFromSearchParam, 15 13 } from "./afterSignInActions"; 16 16 - import { pool } from "supabase/pool"; 17 14 18 15 type OauthRequestClientState = { 19 16 redirect: string | null; ··· 80 77 81 78 return handleAction(s.action, redirectPath); 82 79 } 83 83 - const client = await pool.connect(); 84 84 - const db = drizzle(client); 85 85 - identity = await createIdentity(db, { atp_did: session.did }); 86 86 - client.release(); 80 80 + const { data } = await supabaseServerClient 81 81 + .from("identities") 82 82 + .insert({ atp_did: session.did }) 83 83 + .select() 84 84 + .single(); 85 85 + identity = data; 87 86 } 88 87 let { data: token } = await supabaseServerClient 89 88 .from("email_auth_tokens") 90 89 .insert({ 91 91 - identity: identity.id, 90 90 + identity: identity!.id, 92 91 confirmed: true, 93 92 confirmation_code: "", 94 93 }) ··· 121 120 else url = new URL(decodeURIComponent(redirectPath), "https://example.com"); 122 121 if (action?.action === "subscribe") { 123 122 let result = await subscribeToPublication(action.publication); 124 124 - if (result.hasFeed === false) 123 123 + if (result.success && result.hasFeed === false) 125 124 url.searchParams.set("showSubscribeSuccess", "true"); 126 125 } 127 126

+1 -1

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

··· 5 5 import type { Env } from "./route"; 6 6 import { scanIndexLocal } from "src/replicache/utils"; 7 7 import * as base64 from "base64-js"; 8 8 - import { YJSFragmentToString } from "components/Blocks/TextBlock/RenderYJSFragment"; 8 8 + import { YJSFragmentToString } from "src/utils/yjsFragmentToString"; 9 9 import { applyUpdate, Doc } from "yjs"; 10 10 11 11 export const getFactsFromHomeLeaflets = makeRoute({

+69

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

··· 1 1 + import { z } from "zod"; 2 2 + import { makeRoute } from "../lib"; 3 3 + import type { Env } from "./route"; 4 4 + import { idResolver } from "app/(home-pages)/reader/idResolver"; 5 5 + import { supabaseServerClient } from "supabase/serverClient"; 6 6 + import { Agent } from "@atproto/api"; 7 7 + import { getIdentityData } from "actions/getIdentityData"; 8 8 + import { createOauthClient } from "src/atproto-oauth"; 9 9 + 10 10 + export type GetProfileDataReturnType = Awaited< 11 11 + ReturnType<(typeof get_profile_data)["handler"]> 12 12 + >; 13 13 + 14 14 + export const get_profile_data = makeRoute({ 15 15 + route: "get_profile_data", 16 16 + input: z.object({ 17 17 + didOrHandle: z.string(), 18 18 + }), 19 19 + handler: async ({ didOrHandle }, { supabase }: Pick<Env, "supabase">) => { 20 20 + // Resolve handle to DID if necessary 21 21 + let did = didOrHandle; 22 22 + 23 23 + if (!didOrHandle.startsWith("did:")) { 24 24 + const resolved = await idResolver.handle.resolve(didOrHandle); 25 25 + if (!resolved) { 26 26 + throw new Error("Could not resolve handle to DID"); 27 27 + } 28 28 + did = resolved; 29 29 + } 30 30 + let agent; 31 31 + let authed_identity = await getIdentityData(); 32 32 + if (authed_identity?.atp_did) { 33 33 + try { 34 34 + const oauthClient = await createOauthClient(); 35 35 + let credentialSession = await oauthClient.restore( 36 36 + authed_identity.atp_did, 37 37 + ); 38 38 + agent = new Agent(credentialSession); 39 39 + } catch (e) { 40 40 + agent = new Agent({ 41 41 + service: "https://public.api.bsky.app", 42 42 + }); 43 43 + } 44 44 + } else { 45 45 + agent = new Agent({ 46 46 + service: "https://public.api.bsky.app", 47 47 + }); 48 48 + } 49 49 + 50 50 + let profileReq = agent.app.bsky.actor.getProfile({ actor: did }); 51 51 + 52 52 + let publicationsReq = supabase 53 53 + .from("publications") 54 54 + .select("*") 55 55 + .eq("identity_did", did); 56 56 + 57 57 + let [{ data: profile }, { data: publications }] = await Promise.all([ 58 58 + profileReq, 59 59 + publicationsReq, 60 60 + ]); 61 61 + 62 62 + return { 63 63 + result: { 64 64 + profile, 65 65 + publications: publications || [], 66 66 + }, 67 67 + }; 68 68 + }, 69 69 + });

+6

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

··· 74 74 description: string; 75 75 title: string; 76 76 tags: string[]; 77 77 + cover_image: string | null; 77 78 }[]; 78 79 let pub_patch = publication_data?.[0] 79 80 ? [ ··· 91 92 op: "put", 92 93 key: "publication_tags", 93 94 value: publication_data[0].tags || [], 95 95 + }, 96 96 + { 97 97 + op: "put", 98 98 + key: "publication_cover_image", 99 99 + value: publication_data[0].cover_image || null, 94 100 }, 95 101 ] 96 102 : [];

+2

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

··· 13 13 import { get_publication_data } from "./get_publication_data"; 14 14 import { search_publication_names } from "./search_publication_names"; 15 15 import { search_publication_documents } from "./search_publication_documents"; 16 16 + import { get_profile_data } from "./get_profile_data"; 16 17 17 18 let supabase = createClient<Database>( 18 19 process.env.NEXT_PUBLIC_SUPABASE_API_URL as string, ··· 39 40 get_publication_data, 40 41 search_publication_names, 41 42 search_publication_documents, 43 43 + get_profile_data, 42 44 ]; 43 45 export async function POST( 44 46 req: Request,

+215

app/api/unstable_validate/route.ts

··· 1 1 + import { NextRequest, NextResponse } from "next/server"; 2 2 + import { AtpAgent, AtUri } from "@atproto/api"; 3 3 + import { DidResolver } from "@atproto/identity"; 4 4 + import { 5 5 + PubLeafletDocument, 6 6 + PubLeafletPublication, 7 7 + PubLeafletPagesLinearDocument, 8 8 + PubLeafletPagesCanvas, 9 9 + } from "lexicons/api"; 10 10 + 11 11 + const didResolver = new DidResolver({}); 12 12 + 13 13 + export async function GET(request: NextRequest) { 14 14 + try { 15 15 + const atUriString = request.nextUrl.searchParams.get("uri"); 16 16 + 17 17 + if (!atUriString) { 18 18 + return NextResponse.json( 19 19 + { 20 20 + success: false, 21 21 + error: "Missing uri parameter", 22 22 + }, 23 23 + { status: 400 }, 24 24 + ); 25 25 + } 26 26 + 27 27 + const uri = new AtUri(atUriString); 28 28 + 29 29 + // Only allow document and publication collections 30 30 + if ( 31 31 + uri.collection !== "pub.leaflet.document" && 32 32 + uri.collection !== "pub.leaflet.publication" 33 33 + ) { 34 34 + return NextResponse.json( 35 35 + { 36 36 + success: false, 37 37 + error: 38 38 + "Unsupported collection type. Must be pub.leaflet.document or pub.leaflet.publication", 39 39 + }, 40 40 + { status: 400 }, 41 41 + ); 42 42 + } 43 43 + 44 44 + // Resolve DID to get service endpoint 45 45 + const did = await didResolver.resolve(uri.host); 46 46 + const service = did?.service?.[0]; 47 47 + 48 48 + if (!service) { 49 49 + return NextResponse.json( 50 50 + { 51 51 + success: false, 52 52 + error: "Could not resolve DID service endpoint", 53 53 + }, 54 54 + { status: 404 }, 55 55 + ); 56 56 + } 57 57 + 58 58 + // Fetch the record from AT Protocol 59 59 + const agent = new AtpAgent({ service: service.serviceEndpoint as string }); 60 60 + 61 61 + let recordResponse; 62 62 + try { 63 63 + recordResponse = await agent.com.atproto.repo.getRecord({ 64 64 + repo: uri.host, 65 65 + collection: uri.collection, 66 66 + rkey: uri.rkey, 67 67 + }); 68 68 + } catch (e) { 69 69 + return NextResponse.json( 70 70 + { 71 71 + success: false, 72 72 + error: "Record not found", 73 73 + }, 74 74 + { status: 404 }, 75 75 + ); 76 76 + } 77 77 + 78 78 + // Validate based on collection type 79 79 + if (uri.collection === "pub.leaflet.document") { 80 80 + const result = PubLeafletDocument.validateRecord( 81 81 + recordResponse.data.value, 82 82 + ); 83 83 + if (result.success) { 84 84 + return NextResponse.json({ 85 85 + success: true, 86 86 + collection: uri.collection, 87 87 + record: result.value, 88 88 + }); 89 89 + } else { 90 90 + // Detailed validation: validate pages and blocks individually 91 91 + const record = recordResponse.data.value as { 92 92 + pages?: Array<{ $type?: string; blocks?: Array<{ block?: unknown }> }>; 93 93 + }; 94 94 + const pageErrors: Array<{ 95 95 + pageIndex: number; 96 96 + pageType: string; 97 97 + error?: unknown; 98 98 + blockErrors?: Array<{ 99 99 + blockIndex: number; 100 100 + blockType: string; 101 101 + error: unknown; 102 102 + block: unknown; 103 103 + }>; 104 104 + }> = []; 105 105 + 106 106 + if (record.pages && Array.isArray(record.pages)) { 107 107 + for (let pageIndex = 0; pageIndex < record.pages.length; pageIndex++) { 108 108 + const page = record.pages[pageIndex]; 109 109 + const pageType = page?.$type || "unknown"; 110 110 + 111 111 + // Validate page based on type 112 112 + let pageResult; 113 113 + if (pageType === "pub.leaflet.pages.linearDocument") { 114 114 + pageResult = PubLeafletPagesLinearDocument.validateMain(page); 115 115 + } else if (pageType === "pub.leaflet.pages.canvas") { 116 116 + pageResult = PubLeafletPagesCanvas.validateMain(page); 117 117 + } else { 118 118 + pageErrors.push({ 119 119 + pageIndex, 120 120 + pageType, 121 121 + error: `Unknown page type: ${pageType}`, 122 122 + }); 123 123 + continue; 124 124 + } 125 125 + 126 126 + if (!pageResult.success) { 127 127 + // Page has errors, validate individual blocks 128 128 + const blockErrors: Array<{ 129 129 + blockIndex: number; 130 130 + blockType: string; 131 131 + error: unknown; 132 132 + block: unknown; 133 133 + }> = []; 134 134 + 135 135 + if (page.blocks && Array.isArray(page.blocks)) { 136 136 + for ( 137 137 + let blockIndex = 0; 138 138 + blockIndex < page.blocks.length; 139 139 + blockIndex++ 140 140 + ) { 141 141 + const blockWrapper = page.blocks[blockIndex]; 142 142 + const blockType = 143 143 + (blockWrapper?.block as { $type?: string })?.$type || 144 144 + "unknown"; 145 145 + 146 146 + // Validate block wrapper based on page type 147 147 + let blockResult; 148 148 + if (pageType === "pub.leaflet.pages.linearDocument") { 149 149 + blockResult = 150 150 + PubLeafletPagesLinearDocument.validateBlock(blockWrapper); 151 151 + } else { 152 152 + blockResult = 153 153 + PubLeafletPagesCanvas.validateBlock(blockWrapper); 154 154 + } 155 155 + 156 156 + if (!blockResult.success) { 157 157 + blockErrors.push({ 158 158 + blockIndex, 159 159 + blockType, 160 160 + error: blockResult.error, 161 161 + block: blockWrapper, 162 162 + }); 163 163 + } 164 164 + } 165 165 + } 166 166 + 167 167 + pageErrors.push({ 168 168 + pageIndex, 169 169 + pageType, 170 170 + error: pageResult.error, 171 171 + blockErrors: blockErrors.length > 0 ? blockErrors : undefined, 172 172 + }); 173 173 + } 174 174 + } 175 175 + } 176 176 + 177 177 + return NextResponse.json({ 178 178 + success: false, 179 179 + collection: uri.collection, 180 180 + error: result.error, 181 181 + pageErrors: pageErrors.length > 0 ? pageErrors : undefined, 182 182 + record: recordResponse.data.value, 183 183 + }); 184 184 + } 185 185 + } 186 186 + 187 187 + if (uri.collection === "pub.leaflet.publication") { 188 188 + const result = PubLeafletPublication.validateRecord( 189 189 + recordResponse.data.value, 190 190 + ); 191 191 + if (result.success) { 192 192 + return NextResponse.json({ 193 193 + success: true, 194 194 + collection: uri.collection, 195 195 + record: result.value, 196 196 + }); 197 197 + } else { 198 198 + return NextResponse.json({ 199 199 + success: false, 200 200 + collection: uri.collection, 201 201 + error: result.error, 202 202 + }); 203 203 + } 204 204 + } 205 205 + } catch (error) { 206 206 + console.error("Error validating AT URI:", error); 207 207 + return NextResponse.json( 208 208 + { 209 209 + success: false, 210 210 + error: "Invalid URI or internal error", 211 211 + }, 212 212 + { status: 400 }, 213 213 + ); 214 214 + } 215 215 + }

+40 -17

app/globals.css

··· 107 107 --highlight-3: 255, 205, 195; 108 108 109 109 --list-marker-width: 36px; 110 110 - --page-width-unitless: min(624, calc(var(--leaflet-width-unitless) - 12)); 111 111 - --page-width-units: min(624px, calc(100vw - 12px)); 110 110 + --page-width-unitless: min( 111 111 + var(--page-width-setting), 112 112 + calc(var(--leaflet-width-unitless) - 12) 113 113 + ); 114 114 + --page-width-units: min( 115 115 + calc(var(--page-width-unitless) * 1px), 116 116 + calc(100vw - 12px) 117 117 + ); 112 118 113 119 --gripperSVG: url("/gripperPattern.svg"); 114 120 --gripperSVG2: url("/gripperPattern2.svg"); ··· 125 131 126 132 @media (min-width: 640px) { 127 133 :root { 134 134 + /*picks between max width and screen width with 64px of padding*/ 128 135 --page-width-unitless: min( 129 129 - 624, 136 136 + var(--page-width-setting), 130 137 calc(var(--leaflet-width-unitless) - 128) 131 138 ); 132 132 - --page-width-units: min(624px, calc(100vw - 128px)); 133 133 - } 134 134 - } 135 135 - 136 136 - @media (min-width: 1280px) { 137 137 - :root { 138 138 - --page-width-unitless: min( 139 139 - 624, 140 140 - calc((var(--leaflet-width-unitless) / 2) - 32) 139 139 + --page-width-units: min( 140 140 + calc(var(--page-width-unitless) * 1px), 141 141 + calc(100vw - 128px) 141 142 ); 142 142 - --page-width-units: min(624px, calc((100vw / 2) - 32px)); 143 143 } 144 144 } 145 145 ··· 270 270 } 271 271 272 272 pre.shiki { 273 273 + @apply sm:p-3; 273 274 @apply p-2; 274 275 @apply rounded-md; 275 276 @apply overflow-auto; 277 277 + 278 278 + @media (min-width: 640px) { 279 279 + @apply p-3; 280 280 + } 276 281 } 277 282 278 283 .highlight:has(+ .highlight) { ··· 296 301 @apply py-[1.5px]; 297 302 } 298 303 299 299 - /* Underline mention nodes when selected in ProseMirror */ 304 304 + .ProseMirror:focus-within .selection-highlight { 305 305 + background-color: transparent; 306 306 + } 307 307 + 300 308 .ProseMirror .atMention.ProseMirror-selectednode, 301 309 .ProseMirror .didMention.ProseMirror-selectednode { 302 302 - text-decoration: underline; 310 310 + @apply text-accent-contrast; 311 311 + @apply px-0.5; 312 312 + @apply -mx-[3px]; /* extra px to account for the border*/ 313 313 + @apply -my-px; /*to account for the border*/ 314 314 + @apply rounded-[4px]; 315 315 + @apply box-decoration-clone; 316 316 + background-color: rgba(var(--accent-contrast), 0.2); 317 317 + border: 1px solid rgba(var(--accent-contrast), 1); 303 318 } 304 319 305 305 - .ProseMirror:focus-within .selection-highlight { 306 306 - background-color: transparent; 320 320 + .mention { 321 321 + @apply cursor-pointer; 322 322 + @apply text-accent-contrast; 323 323 + @apply px-0.5; 324 324 + @apply -mx-[3px]; 325 325 + @apply -my-px; /*to account for the border*/ 326 326 + @apply rounded-[4px]; 327 327 + @apply box-decoration-clone; 328 328 + background-color: rgba(var(--accent-contrast), 0.2); 329 329 + border: 1px solid transparent; 307 330 } 308 331 309 332 .multiselected:focus-within .selection-highlight {

+19 -2

app/lish/Subscribe.tsx

··· 23 23 import { useSearchParams } from "next/navigation"; 24 24 import LoginForm from "app/login/LoginForm"; 25 25 import { RSSSmall } from "components/Icons/RSSSmall"; 26 26 + import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError"; 26 27 27 28 export const SubscribeWithBluesky = (props: { 28 29 pubName: string; ··· 133 134 }) => { 134 135 let { identity } = useIdentityData(); 135 136 let toaster = useToaster(); 137 137 + let [oauthError, setOauthError] = useState< 138 138 + import("src/atproto-oauth").OAuthSessionError | null 139 139 + >(null); 136 140 let [, subscribe, subscribePending] = useActionState(async () => { 141 141 + setOauthError(null); 137 142 let result = await subscribeToPublication( 138 143 props.pub_uri, 139 144 window.location.href + "?refreshAuth", 140 145 ); 146 146 + if (!result.success) { 147 147 + if (isOAuthSessionError(result.error)) { 148 148 + setOauthError(result.error); 149 149 + } 150 150 + return; 151 151 + } 141 152 if (result.hasFeed === false) { 142 153 props.setSuccessModalOpen(true); 143 154 } ··· 172 183 } 173 184 174 185 return ( 175 175 - <> 186 186 + <div className="flex flex-col gap-2 place-self-center"> 176 187 <form 177 188 action={subscribe} 178 189 className="place-self-center flex flex-row gap-1" ··· 187 198 )} 188 199 </ButtonPrimary> 189 200 </form> 190 190 - </> 201 201 + {oauthError && ( 202 202 + <OAuthErrorMessage 203 203 + error={oauthError} 204 204 + className="text-center text-sm text-accent-1" 205 205 + /> 206 206 + )} 207 207 + </div> 191 208 ); 192 209 }; 193 210

+21

app/lish/[did]/[publication]/PublicationAuthor.tsx

··· 1 1 + "use client"; 2 2 + import { ProfilePopover } from "components/ProfilePopover"; 3 3 + 4 4 + export const PublicationAuthor = (props: { 5 5 + did: string; 6 6 + displayName?: string; 7 7 + handle: string; 8 8 + }) => { 9 9 + return ( 10 10 + <p className="italic text-tertiary sm:text-base text-sm"> 11 11 + <ProfilePopover 12 12 + didOrHandle={props.did} 13 13 + trigger={ 14 14 + <span className="hover:underline"> 15 15 + <strong>by {props.displayName}</strong> @{props.handle} 16 16 + </span> 17 17 + } 18 18 + /> 19 19 + </p> 20 20 + ); 21 21 + };

-206

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

··· 1 1 - import { UnicodeString } from "@atproto/api"; 2 2 - import { PubLeafletRichtextFacet } from "lexicons/api"; 3 3 - import { didToBlueskyUrl } from "src/utils/mentionUtils"; 4 4 - import { AtMentionLink } from "components/AtMentionLink"; 5 5 - 6 6 - type Facet = PubLeafletRichtextFacet.Main; 7 7 - export function BaseTextBlock(props: { 8 8 - plaintext: string; 9 9 - facets?: Facet[]; 10 10 - index: number[]; 11 11 - preview?: boolean; 12 12 - }) { 13 13 - let children = []; 14 14 - let richText = new RichText({ 15 15 - text: props.plaintext, 16 16 - facets: props.facets || [], 17 17 - }); 18 18 - let counter = 0; 19 19 - for (const segment of richText.segments()) { 20 20 - let id = segment.facet?.find(PubLeafletRichtextFacet.isId); 21 21 - let link = segment.facet?.find(PubLeafletRichtextFacet.isLink); 22 22 - let isBold = segment.facet?.find(PubLeafletRichtextFacet.isBold); 23 23 - let isCode = segment.facet?.find(PubLeafletRichtextFacet.isCode); 24 24 - let isStrikethrough = segment.facet?.find( 25 25 - PubLeafletRichtextFacet.isStrikethrough, 26 26 - ); 27 27 - let isDidMention = segment.facet?.find( 28 28 - PubLeafletRichtextFacet.isDidMention, 29 29 - ); 30 30 - let isAtMention = segment.facet?.find( 31 31 - PubLeafletRichtextFacet.isAtMention, 32 32 - ); 33 33 - let isUnderline = segment.facet?.find(PubLeafletRichtextFacet.isUnderline); 34 34 - let isItalic = segment.facet?.find(PubLeafletRichtextFacet.isItalic); 35 35 - let isHighlighted = segment.facet?.find( 36 36 - PubLeafletRichtextFacet.isHighlight, 37 37 - ); 38 38 - let className = ` 39 39 - ${isCode ? "inline-code" : ""} 40 40 - ${id ? "scroll-mt-12 scroll-mb-10" : ""} 41 41 - ${isBold ? "font-bold" : ""} 42 42 - ${isItalic ? "italic" : ""} 43 43 - ${isUnderline ? "underline" : ""} 44 44 - ${isStrikethrough ? "line-through decoration-tertiary" : ""} 45 45 - ${isHighlighted ? "highlight bg-highlight-1" : ""}`.replaceAll("\n", " "); 46 46 - 47 47 - // Split text by newlines and insert <br> tags 48 48 - const textParts = segment.text.split('\n'); 49 49 - const renderedText = textParts.flatMap((part, i) => 50 50 - i < textParts.length - 1 ? [part, <br key={`br-${counter}-${i}`} />] : [part] 51 51 - ); 52 52 - 53 53 - if (isCode) { 54 54 - children.push( 55 55 - <code key={counter} className={className} id={id?.id}> 56 56 - {renderedText} 57 57 - </code>, 58 58 - ); 59 59 - } else if (isDidMention) { 60 60 - children.push( 61 61 - <a 62 62 - key={counter} 63 63 - href={didToBlueskyUrl(isDidMention.did)} 64 64 - className={`text-accent-contrast hover:underline cursor-pointer ${className}`} 65 65 - target="_blank" 66 66 - rel="noopener noreferrer" 67 67 - > 68 68 - {renderedText} 69 69 - </a>, 70 70 - ); 71 71 - } else if (isAtMention) { 72 72 - children.push( 73 73 - <AtMentionLink 74 74 - key={counter} 75 75 - atURI={isAtMention.atURI} 76 76 - className={className} 77 77 - > 78 78 - {renderedText} 79 79 - </AtMentionLink>, 80 80 - ); 81 81 - } else if (link) { 82 82 - children.push( 83 83 - <a 84 84 - key={counter} 85 85 - href={link.uri} 86 86 - className={`text-accent-contrast hover:underline ${className}`} 87 87 - target="_blank" 88 88 - > 89 89 - {renderedText} 90 90 - </a>, 91 91 - ); 92 92 - } else { 93 93 - children.push( 94 94 - <span key={counter} className={className} id={id?.id}> 95 95 - {renderedText} 96 96 - </span>, 97 97 - ); 98 98 - } 99 99 - 100 100 - counter++; 101 101 - } 102 102 - return <>{children}</>; 103 103 - } 104 104 - 105 105 - type RichTextSegment = { 106 106 - text: string; 107 107 - facet?: Exclude<Facet["features"], { $type: string }>; 108 108 - }; 109 109 - 110 110 - export class RichText { 111 111 - unicodeText: UnicodeString; 112 112 - facets?: Facet[]; 113 113 - 114 114 - constructor(props: { text: string; facets: Facet[] }) { 115 115 - this.unicodeText = new UnicodeString(props.text); 116 116 - this.facets = props.facets; 117 117 - if (this.facets) { 118 118 - this.facets = this.facets 119 119 - .filter((facet) => facet.index.byteStart <= facet.index.byteEnd) 120 120 - .sort((a, b) => a.index.byteStart - b.index.byteStart); 121 121 - } 122 122 - } 123 123 - 124 124 - *segments(): Generator<RichTextSegment, void, void> { 125 125 - const facets = this.facets || []; 126 126 - if (!facets.length) { 127 127 - yield { text: this.unicodeText.utf16 }; 128 128 - return; 129 129 - } 130 130 - 131 131 - let textCursor = 0; 132 132 - let facetCursor = 0; 133 133 - do { 134 134 - const currFacet = facets[facetCursor]; 135 135 - if (textCursor < currFacet.index.byteStart) { 136 136 - yield { 137 137 - text: this.unicodeText.slice(textCursor, currFacet.index.byteStart), 138 138 - }; 139 139 - } else if (textCursor > currFacet.index.byteStart) { 140 140 - facetCursor++; 141 141 - continue; 142 142 - } 143 143 - if (currFacet.index.byteStart < currFacet.index.byteEnd) { 144 144 - const subtext = this.unicodeText.slice( 145 145 - currFacet.index.byteStart, 146 146 - currFacet.index.byteEnd, 147 147 - ); 148 148 - if (!subtext.trim()) { 149 149 - // dont empty string entities 150 150 - yield { text: subtext }; 151 151 - } else { 152 152 - yield { text: subtext, facet: currFacet.features }; 153 153 - } 154 154 - } 155 155 - textCursor = currFacet.index.byteEnd; 156 156 - facetCursor++; 157 157 - } while (facetCursor < facets.length); 158 158 - if (textCursor < this.unicodeText.length) { 159 159 - yield { 160 160 - text: this.unicodeText.slice(textCursor, this.unicodeText.length), 161 161 - }; 162 162 - } 163 163 - } 164 164 - } 165 165 - function addFacet(facets: Facet[], newFacet: Facet, length: number) { 166 166 - if (facets.length === 0) { 167 167 - return [newFacet]; 168 168 - } 169 169 - 170 170 - const allFacets = [...facets, newFacet]; 171 171 - 172 172 - // Collect all boundary positions 173 173 - const boundaries = new Set<number>(); 174 174 - boundaries.add(0); 175 175 - boundaries.add(length); 176 176 - 177 177 - for (const facet of allFacets) { 178 178 - boundaries.add(facet.index.byteStart); 179 179 - boundaries.add(facet.index.byteEnd); 180 180 - } 181 181 - 182 182 - const sortedBoundaries = Array.from(boundaries).sort((a, b) => a - b); 183 183 - const result: Facet[] = []; 184 184 - 185 185 - // Process segments between consecutive boundaries 186 186 - for (let i = 0; i < sortedBoundaries.length - 1; i++) { 187 187 - const start = sortedBoundaries[i]; 188 188 - const end = sortedBoundaries[i + 1]; 189 189 - 190 190 - // Find facets that are active at the start position 191 191 - const activeFacets = allFacets.filter( 192 192 - (facet) => facet.index.byteStart <= start && facet.index.byteEnd > start, 193 193 - ); 194 194 - 195 195 - // Only create facet if there are active facets (features present) 196 196 - if (activeFacets.length > 0) { 197 197 - const features = activeFacets.flatMap((f) => f.features); 198 198 - result.push({ 199 199 - index: { byteStart: start, byteEnd: end }, 200 200 - features, 201 201 - }); 202 202 - } 203 203 - } 204 204 - 205 205 - return result; 206 206 - }

+25

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

··· 1 1 + import { ProfilePopover } from "components/ProfilePopover"; 2 2 + import { 3 3 + TextBlockCore, 4 4 + TextBlockCoreProps, 5 5 + RichText, 6 6 + } from "../Blocks/TextBlockCore"; 7 7 + import { ReactNode } from "react"; 8 8 + 9 9 + // Re-export RichText for backwards compatibility 10 10 + export { RichText }; 11 11 + 12 12 + function DidMentionWithPopover(props: { did: string; children: ReactNode }) { 13 13 + return <ProfilePopover didOrHandle={props.did} trigger={props.children} />; 14 14 + } 15 15 + 16 16 + export function BaseTextBlock(props: Omit<TextBlockCoreProps, "renderers">) { 17 17 + return ( 18 18 + <TextBlockCore 19 19 + {...props} 20 20 + renderers={{ 21 21 + DidMention: DidMentionWithPopover, 22 22 + }} 23 23 + /> 24 24 + ); 25 25 + }

+28

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { PubLeafletBlocksCode } from "lexicons/api"; 4 4 + import { useLayoutEffect, useState } from "react"; 5 5 + import { codeToHtml, bundledLanguagesInfo, bundledThemesInfo } from "shiki"; 6 6 + 7 7 + export function PubCodeBlock({ 8 8 + block, 9 9 + prerenderedCode, 10 10 + }: { 11 11 + block: PubLeafletBlocksCode.Main; 12 12 + prerenderedCode?: string; 13 13 + }) { 14 14 + const [html, setHTML] = useState<string | null>(prerenderedCode || null); 15 15 + 16 16 + useLayoutEffect(() => { 17 17 + const lang = bundledLanguagesInfo.find((l) => l.id === block.language)?.id || "plaintext"; 18 18 + const theme = bundledThemesInfo.find((t) => t.id === block.syntaxHighlightingTheme)?.id || "github-light"; 19 19 + 20 20 + codeToHtml(block.plaintext, { lang, theme }).then(setHTML); 21 21 + }, [block]); 22 22 + return ( 23 23 + <div 24 24 + className="w-full min-h-[42px] my-2 rounded-md border-border-light outline-border-light selected-outline" 25 25 + dangerouslySetInnerHTML={{ __html: html || "" }} 26 26 + /> 27 27 + ); 28 28 + }

+174

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"; 16 16 + 17 17 + export const PubBlueskyPostBlock = (props: { 18 18 + post: PostView; 19 19 + className: string; 20 20 + pageId?: string; 21 21 + }) => { 22 22 + let post = props.post; 23 23 + 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 31 + switch (true) { 32 32 + case AppBskyFeedDefs.isBlockedPost(post) || 33 33 + AppBskyFeedDefs.isBlockedAuthor(post) || 34 34 + AppBskyFeedDefs.isNotFoundPost(post): 35 35 + return ( 36 36 + <div className={`w-full`}> 37 37 + <PostNotAvailable /> 38 38 + </div> 39 39 + ); 40 40 + 41 41 + case AppBskyFeedDefs.validatePostView(post).success: 42 42 + let record = post.record as AppBskyFeedDefs.PostView["record"]; 43 43 + 44 44 + // silliness to get the text and timestamp from the record with proper types 45 45 + let timestamp: string | undefined = undefined; 46 46 + if (AppBskyFeedPost.isRecord(record)) { 47 47 + timestamp = (record as AppBskyFeedPost.Record).createdAt; 48 48 + } 49 49 + 50 50 + //getting the url to the post 51 51 + let postId = post.uri.split("/")[4]; 52 52 + let url = `https://bsky.app/profile/${post.author.handle}/post/${postId}`; 53 53 + 54 54 + const parent = props.pageId 55 55 + ? { type: "doc" as const, id: props.pageId } 56 56 + : undefined; 57 57 + 58 58 + 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> 153 153 + ); 154 154 + } 155 155 + }; 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 + };

+344

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { useEntity, useReplicache } from "src/replicache"; 4 4 + import { useUIState } from "src/useUIState"; 5 5 + import { CSSProperties, useContext, useRef } from "react"; 6 6 + import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 7 7 + import { PostContent, Block } from "../PostContent"; 8 8 + import { 9 9 + PubLeafletBlocksHeader, 10 10 + PubLeafletBlocksText, 11 11 + PubLeafletComment, 12 12 + PubLeafletPagesLinearDocument, 13 13 + PubLeafletPagesCanvas, 14 14 + PubLeafletPublication, 15 15 + } from "lexicons/api"; 16 16 + import { AppBskyFeedDefs } from "@atproto/api"; 17 17 + import { TextBlock } from "./TextBlock"; 18 18 + import { PostPageContext } from "../PostPageContext"; 19 19 + import { openPage, useOpenPages } from "../PostPages"; 20 20 + import { 21 21 + openInteractionDrawer, 22 22 + setInteractionState, 23 23 + useInteractionState, 24 24 + } from "../Interactions/Interactions"; 25 25 + import { CommentTiny } from "components/Icons/CommentTiny"; 26 26 + import { QuoteTiny } from "components/Icons/QuoteTiny"; 27 27 + import { CanvasBackgroundPattern } from "components/Canvas"; 28 28 + 29 29 + export function PublishedPageLinkBlock(props: { 30 30 + blocks: PubLeafletPagesLinearDocument.Block[] | PubLeafletPagesCanvas.Block[]; 31 31 + parentPageId: string | undefined; 32 32 + pageId: string; 33 33 + did: string; 34 34 + preview?: boolean; 35 35 + className?: string; 36 36 + prerenderedCodeBlocks?: Map<string, string>; 37 37 + bskyPostData: AppBskyFeedDefs.PostView[]; 38 38 + isCanvas?: boolean; 39 39 + pages?: (PubLeafletPagesLinearDocument.Main | PubLeafletPagesCanvas.Main)[]; 40 40 + }) { 41 41 + //switch to use actually state 42 42 + let openPages = useOpenPages(); 43 43 + let isOpen = openPages.some((p) => p.type === "doc" && p.id === props.pageId); 44 44 + return ( 45 45 + <div 46 46 + className={`w-full cursor-pointer 47 47 + pageLinkBlockWrapper relative group/pageLinkBlock 48 48 + bg-bg-page shadow-sm 49 49 + flex overflow-clip 50 50 + block-border 51 51 + ${isOpen && "!border-tertiary"} 52 52 + ${props.className} 53 53 + `} 54 54 + onClick={(e) => { 55 55 + if (e.isDefaultPrevented()) return; 56 56 + if (e.shiftKey) return; 57 57 + e.preventDefault(); 58 58 + e.stopPropagation(); 59 59 + 60 60 + openPage( 61 61 + props.parentPageId 62 62 + ? { type: "doc", id: props.parentPageId } 63 63 + : undefined, 64 64 + { type: "doc", id: props.pageId }, 65 65 + ); 66 66 + }} 67 67 + > 68 68 + {props.isCanvas ? ( 69 69 + <CanvasLinkBlock 70 70 + blocks={props.blocks as PubLeafletPagesCanvas.Block[]} 71 71 + did={props.did} 72 72 + pageId={props.pageId} 73 73 + bskyPostData={props.bskyPostData} 74 74 + pages={props.pages || []} 75 75 + /> 76 76 + ) : ( 77 77 + <DocLinkBlock 78 78 + {...props} 79 79 + blocks={props.blocks as PubLeafletPagesLinearDocument.Block[]} 80 80 + /> 81 81 + )} 82 82 + </div> 83 83 + ); 84 84 + } 85 85 + export function DocLinkBlock(props: { 86 86 + blocks: PubLeafletPagesLinearDocument.Block[]; 87 87 + pageId: string; 88 88 + parentPageId?: string; 89 89 + did: string; 90 90 + preview?: boolean; 91 91 + className?: string; 92 92 + prerenderedCodeBlocks?: Map<string, string>; 93 93 + bskyPostData: AppBskyFeedDefs.PostView[]; 94 94 + }) { 95 95 + let [title, description] = props.blocks 96 96 + .map((b) => b.block) 97 97 + .filter( 98 98 + (b) => PubLeafletBlocksText.isMain(b) || PubLeafletBlocksHeader.isMain(b), 99 99 + ); 100 100 + 101 101 + return ( 102 102 + <div 103 103 + style={{ "--list-marker-width": "20px" } as CSSProperties} 104 104 + className={` 105 105 + w-full h-[104px] 106 106 + `} 107 107 + > 108 108 + <> 109 109 + <div className="pageLinkBlockContent w-full flex overflow-clip cursor-pointer h-full"> 110 110 + <div className="my-2 ml-3 grow min-w-0 text-sm bg-transparent overflow-clip flex flex-col "> 111 111 + <div className="grow"> 112 112 + {title && ( 113 113 + <div 114 114 + className={`pageBlockOne outline-none resize-none align-top gap-2 ${title.$type === "pub.leaflet.blocks.header" ? "font-bold text-base" : ""}`} 115 115 + > 116 116 + <TextBlock 117 117 + facets={title.facets} 118 118 + plaintext={title.plaintext} 119 119 + index={[]} 120 120 + preview 121 121 + /> 122 122 + </div> 123 123 + )} 124 124 + {description && ( 125 125 + <div 126 126 + className={`pageBlockLineTwo outline-none resize-none align-top gap-2 ${description.$type === "pub.leaflet.blocks.header" ? "font-bold" : ""}`} 127 127 + > 128 128 + <TextBlock 129 129 + facets={description.facets} 130 130 + plaintext={description.plaintext} 131 131 + index={[]} 132 132 + preview 133 133 + /> 134 134 + </div> 135 135 + )} 136 136 + </div> 137 137 + 138 138 + <Interactions 139 139 + pageId={props.pageId} 140 140 + parentPageId={props.parentPageId} 141 141 + /> 142 142 + </div> 143 143 + {!props.preview && ( 144 144 + <PagePreview blocks={props.blocks} did={props.did} /> 145 145 + )} 146 146 + </div> 147 147 + </> 148 148 + </div> 149 149 + ); 150 150 + } 151 151 + 152 152 + export function PagePreview(props: { 153 153 + did: string; 154 154 + blocks: PubLeafletPagesLinearDocument.Block[]; 155 155 + }) { 156 156 + let previewRef = useRef<HTMLDivElement | null>(null); 157 157 + let { rootEntity } = useReplicache(); 158 158 + let data = useContext(PostPageContext); 159 159 + let theme = data?.theme; 160 160 + let pageWidth = `var(--page-width-unitless)`; 161 161 + let cardBorderHidden = !theme?.showPageBackground; 162 162 + return ( 163 163 + <div 164 164 + ref={previewRef} 165 165 + className={`pageLinkBlockPreview w-[120px] overflow-clip mx-3 mt-3 -mb-2 border rounded-md shrink-0 border-border-light flex flex-col gap-0.5 rotate-[4deg] origin-center ${cardBorderHidden ? "" : "bg-bg-page"}`} 166 166 + > 167 167 + <div 168 168 + className="absolute top-0 left-0 origin-top-left pointer-events-none " 169 169 + style={{ 170 170 + width: `calc(1px * ${pageWidth})`, 171 171 + height: `calc(100vh - 64px)`, 172 172 + transform: `scale(calc((120 / ${pageWidth} )))`, 173 173 + backgroundColor: "rgba(var(--bg-page), var(--bg-page-alpha))", 174 174 + }} 175 175 + > 176 176 + {!cardBorderHidden && ( 177 177 + <div 178 178 + className={`pageLinkBlockBackground 179 179 + absolute top-0 left-0 right-0 bottom-0 180 180 + pointer-events-none 181 181 + `} 182 182 + /> 183 183 + )} 184 184 + <PostContent 185 185 + pollData={[]} 186 186 + pages={[]} 187 187 + did={props.did} 188 188 + blocks={props.blocks} 189 189 + preview 190 190 + bskyPostData={[]} 191 191 + /> 192 192 + </div> 193 193 + </div> 194 194 + ); 195 195 + } 196 196 + 197 197 + const Interactions = (props: { pageId: string; parentPageId?: string }) => { 198 198 + const data = useContext(PostPageContext); 199 199 + const document_uri = data?.uri; 200 200 + if (!document_uri) 201 201 + throw new Error("document_uri not available in PostPageContext"); 202 202 + let comments = data.comments_on_documents.filter( 203 203 + (c) => (c.record as PubLeafletComment.Record)?.onPage === props.pageId, 204 204 + ).length; 205 205 + let quotes = data.document_mentions_in_bsky.filter((q) => 206 206 + q.link.includes(props.pageId), 207 207 + ).length; 208 208 + 209 209 + let { drawerOpen, drawer, pageId } = useInteractionState(document_uri); 210 210 + 211 211 + return ( 212 212 + <div 213 213 + className={`flex gap-2 text-tertiary text-sm absolute bottom-2 bg-bg-page`} 214 214 + > 215 215 + {quotes > 0 && ( 216 216 + <button 217 217 + className={`flex gap-1 items-center`} 218 218 + onClick={(e) => { 219 219 + e.preventDefault(); 220 220 + e.stopPropagation(); 221 221 + openPage( 222 222 + props.parentPageId 223 223 + ? { type: "doc", id: props.parentPageId } 224 224 + : undefined, 225 225 + { type: "doc", id: props.pageId }, 226 226 + { scrollIntoView: false }, 227 227 + ); 228 228 + if (!drawerOpen || drawer !== "quotes") 229 229 + openInteractionDrawer("quotes", document_uri, props.pageId); 230 230 + else setInteractionState(document_uri, { drawerOpen: false }); 231 231 + }} 232 232 + > 233 233 + <span className="sr-only">Page quotes</span> 234 234 + <QuoteTiny aria-hidden /> {quotes}{" "} 235 235 + </button> 236 236 + )} 237 237 + {comments > 0 && ( 238 238 + <button 239 239 + className={`flex gap-1 items-center`} 240 240 + onClick={(e) => { 241 241 + e.preventDefault(); 242 242 + e.stopPropagation(); 243 243 + openPage( 244 244 + props.parentPageId 245 245 + ? { type: "doc", id: props.parentPageId } 246 246 + : undefined, 247 247 + { type: "doc", id: props.pageId }, 248 248 + { scrollIntoView: false }, 249 249 + ); 250 250 + if (!drawerOpen || drawer !== "comments" || pageId !== props.pageId) 251 251 + openInteractionDrawer("comments", document_uri, props.pageId); 252 252 + else setInteractionState(document_uri, { drawerOpen: false }); 253 253 + }} 254 254 + > 255 255 + <span className="sr-only">Page comments</span> 256 256 + <CommentTiny aria-hidden /> {comments}{" "} 257 257 + </button> 258 258 + )} 259 259 + </div> 260 260 + ); 261 261 + }; 262 262 + 263 263 + const CanvasLinkBlock = (props: { 264 264 + blocks: PubLeafletPagesCanvas.Block[]; 265 265 + did: string; 266 266 + pageId: string; 267 267 + bskyPostData: AppBskyFeedDefs.PostView[]; 268 268 + pages: (PubLeafletPagesLinearDocument.Main | PubLeafletPagesCanvas.Main)[]; 269 269 + }) => { 270 270 + let pageWidth = `var(--page-width-unitless)`; 271 271 + let height = 272 272 + props.blocks.length > 0 ? Math.max(...props.blocks.map((b) => b.y), 0) : 0; 273 273 + 274 274 + return ( 275 275 + <div 276 276 + style={{ contain: "size layout paint" }} 277 277 + className={`pageLinkBlockPreview shrink-0 h-[200px] w-full overflow-clip relative`} 278 278 + > 279 279 + <div 280 280 + className={`absolute top-0 left-0 origin-top-left pointer-events-none w-full`} 281 281 + style={{ 282 282 + width: `calc(1px * ${pageWidth})`, 283 283 + height: "calc(1150px * 2)", 284 284 + transform: `scale(calc(((${pageWidth} - 36) / 1272 )))`, 285 285 + }} 286 286 + > 287 287 + <div 288 288 + style={{ 289 289 + minHeight: height + 512, 290 290 + contain: "size layout paint", 291 291 + }} 292 292 + className="relative h-full w-[1272px]" 293 293 + > 294 294 + <div className="w-full h-full pointer-events-none"> 295 295 + <CanvasBackgroundPattern pattern="grid" /> 296 296 + </div> 297 297 + {props.blocks 298 298 + .sort((a, b) => { 299 299 + if (a.y === b.y) { 300 300 + return a.x - b.x; 301 301 + } 302 302 + return a.y - b.y; 303 303 + }) 304 304 + .map((canvasBlock, index) => { 305 305 + let { x, y, width, rotation } = canvasBlock; 306 306 + let transform = `translate(${x}px, ${y}px)${rotation ? ` rotate(${rotation}deg)` : ""}`; 307 307 + 308 308 + // Wrap the block in a LinearDocument.Block structure for compatibility 309 309 + let linearBlock: PubLeafletPagesLinearDocument.Block = { 310 310 + $type: "pub.leaflet.pages.linearDocument#block", 311 311 + block: canvasBlock.block, 312 312 + }; 313 313 + 314 314 + return ( 315 315 + <div 316 316 + key={index} 317 317 + className="absolute rounded-lg flex items-stretch origin-center p-3" 318 318 + style={{ 319 319 + top: 0, 320 320 + left: 0, 321 321 + width, 322 322 + transform, 323 323 + }} 324 324 + > 325 325 + <div className="contents"> 326 326 + <Block 327 327 + pollData={[]} 328 328 + pageId={props.pageId} 329 329 + pages={props.pages} 330 330 + bskyPostData={props.bskyPostData} 331 331 + block={linearBlock} 332 332 + did={props.did} 333 333 + index={[index]} 334 334 + preview={true} 335 335 + /> 336 336 + </div> 337 337 + </div> 338 338 + ); 339 339 + })} 340 340 + </div> 341 341 + </div> 342 342 + </div> 343 343 + ); 344 344 + };

+346

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

··· 1 1 + "use client"; 2 2 + 3 3 + import { 4 4 + PubLeafletBlocksPoll, 5 5 + PubLeafletPollDefinition, 6 6 + PubLeafletPollVote, 7 7 + } from "lexicons/api"; 8 8 + import { useState, useEffect } from "react"; 9 9 + import { ButtonPrimary, ButtonSecondary } from "components/Buttons"; 10 10 + import { useIdentityData } from "components/IdentityProvider"; 11 11 + import { AtpAgent } from "@atproto/api"; 12 12 + import { voteOnPublishedPoll } from "../voteOnPublishedPoll"; 13 13 + import { PollData } from "../fetchPollData"; 14 14 + import { Popover } from "components/Popover"; 15 15 + import LoginForm from "app/login/LoginForm"; 16 16 + import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 17 17 + import { getVoterIdentities, VoterIdentity } from "../getVoterIdentities"; 18 18 + import { Json } from "supabase/database.types"; 19 19 + import { InfoSmall } from "components/Icons/InfoSmall"; 20 20 + 21 21 + // Helper function to extract the first option from a vote record 22 22 + const getVoteOption = (voteRecord: any): string | null => { 23 23 + try { 24 24 + const record = voteRecord as PubLeafletPollVote.Record; 25 25 + return record.option && record.option.length > 0 ? record.option[0] : null; 26 26 + } catch { 27 27 + return null; 28 28 + } 29 29 + }; 30 30 + 31 31 + export const PublishedPollBlock = (props: { 32 32 + block: PubLeafletBlocksPoll.Main; 33 33 + pollData: PollData; 34 34 + className?: string; 35 35 + }) => { 36 36 + const { identity } = useIdentityData(); 37 37 + const [selectedOption, setSelectedOption] = useState<string | null>(null); 38 38 + const [isVoting, setIsVoting] = useState(false); 39 39 + const [showResults, setShowResults] = useState(false); 40 40 + const [optimisticVote, setOptimisticVote] = useState<{ 41 41 + option: string; 42 42 + voter_did: string; 43 43 + } | null>(null); 44 44 + let pollRecord = props.pollData.record as PubLeafletPollDefinition.Record; 45 45 + let [isClient, setIsClient] = useState(false); 46 46 + useEffect(() => { 47 47 + setIsClient(true); 48 48 + }, []); 49 49 + 50 50 + const handleVote = async () => { 51 51 + if (!selectedOption || !identity?.atp_did) return; 52 52 + 53 53 + setIsVoting(true); 54 54 + 55 55 + // Optimistically add the vote 56 56 + setOptimisticVote({ 57 57 + option: selectedOption, 58 58 + voter_did: identity.atp_did, 59 59 + }); 60 60 + setShowResults(true); 61 61 + 62 62 + try { 63 63 + const result = await voteOnPublishedPoll( 64 64 + props.block.pollRef.uri, 65 65 + props.block.pollRef.cid, 66 66 + selectedOption, 67 67 + ); 68 68 + 69 69 + if (!result.success) { 70 70 + console.error("Failed to vote:", result.error); 71 71 + // Revert optimistic update on failure 72 72 + setOptimisticVote(null); 73 73 + setShowResults(false); 74 74 + } 75 75 + } catch (error) { 76 76 + console.error("Failed to vote:", error); 77 77 + // Revert optimistic update on failure 78 78 + setOptimisticVote(null); 79 79 + setShowResults(false); 80 80 + } finally { 81 81 + setIsVoting(false); 82 82 + } 83 83 + }; 84 84 + 85 85 + const hasVoted = 86 86 + !!identity?.atp_did && 87 87 + (!!props.pollData?.atp_poll_votes.find( 88 88 + (v) => v.voter_did === identity?.atp_did, 89 89 + ) || 90 90 + !!optimisticVote); 91 91 + let isCreator = 92 92 + identity?.atp_did && props.pollData.uri.includes(identity?.atp_did); 93 93 + const displayResults = showResults || hasVoted; 94 94 + 95 95 + return ( 96 96 + <div 97 97 + className={`poll flex flex-col gap-2 p-3 w-full ${props.className} block-border`} 98 98 + style={{ 99 99 + backgroundColor: 100 100 + "color-mix(in oklab, rgb(var(--accent-1)), rgb(var(--bg-page)) 85%)", 101 101 + }} 102 102 + > 103 103 + {displayResults ? ( 104 104 + <> 105 105 + <PollResults 106 106 + pollData={props.pollData} 107 107 + hasVoted={hasVoted} 108 108 + setShowResults={setShowResults} 109 109 + optimisticVote={optimisticVote} 110 110 + /> 111 111 + {!hasVoted && ( 112 112 + <div className="flex justify-start"> 113 113 + <button 114 114 + className="w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 115 115 + onClick={() => setShowResults(false)} 116 116 + > 117 117 + Back to Voting 118 118 + </button> 119 119 + </div> 120 120 + )} 121 121 + </> 122 122 + ) : ( 123 123 + <> 124 124 + {pollRecord.options.map((option, index) => ( 125 125 + <PollOptionButton 126 126 + key={index} 127 127 + option={option} 128 128 + optionIndex={index.toString()} 129 129 + selected={selectedOption === index.toString()} 130 130 + onSelect={() => setSelectedOption(index.toString())} 131 131 + disabled={!identity?.atp_did} 132 132 + /> 133 133 + ))} 134 134 + <div className="flex flex-col-reverse sm:flex-row sm:justify-between gap-2 items-center pt-2"> 135 135 + <div className="text-sm text-tertiary">All votes are public</div> 136 136 + <div className="flex sm:gap-3 sm:flex-row flex-col-reverse sm:justify-end justify-center gap-1 items-center"> 137 137 + <button 138 138 + className="w-fit font-bold text-accent-contrast" 139 139 + onClick={() => setShowResults(!showResults)} 140 140 + > 141 141 + See Results 142 142 + </button> 143 143 + {identity?.atp_did ? ( 144 144 + <ButtonPrimary 145 145 + className="place-self-end" 146 146 + onClick={handleVote} 147 147 + disabled={!selectedOption || isVoting} 148 148 + > 149 149 + {isVoting ? "Voting..." : "Vote!"} 150 150 + </ButtonPrimary> 151 151 + ) : ( 152 152 + <Popover 153 153 + asChild 154 154 + trigger={ 155 155 + <ButtonPrimary className="place-self-center"> 156 156 + <BlueskyTiny /> Login to vote 157 157 + </ButtonPrimary> 158 158 + } 159 159 + > 160 160 + {isClient && ( 161 161 + <LoginForm 162 162 + text="Log in to vote on this poll!" 163 163 + noEmail 164 164 + redirectRoute={window?.location.href + "?refreshAuth"} 165 165 + /> 166 166 + )} 167 167 + </Popover> 168 168 + )} 169 169 + </div> 170 170 + </div> 171 171 + </> 172 172 + )} 173 173 + </div> 174 174 + ); 175 175 + }; 176 176 + 177 177 + const PollOptionButton = (props: { 178 178 + option: PubLeafletPollDefinition.Option; 179 179 + optionIndex: string; 180 180 + selected: boolean; 181 181 + onSelect: () => void; 182 182 + disabled?: boolean; 183 183 + }) => { 184 184 + const ButtonComponent = props.selected ? ButtonPrimary : ButtonSecondary; 185 185 + 186 186 + return ( 187 187 + <div className="flex gap-2 items-center"> 188 188 + <ButtonComponent 189 189 + className="pollOption grow max-w-full flex" 190 190 + onClick={props.onSelect} 191 191 + disabled={props.disabled} 192 192 + > 193 193 + {props.option.text} 194 194 + </ButtonComponent> 195 195 + </div> 196 196 + ); 197 197 + }; 198 198 + 199 199 + const PollResults = (props: { 200 200 + pollData: PollData; 201 201 + hasVoted: boolean; 202 202 + setShowResults: (show: boolean) => void; 203 203 + optimisticVote: { option: string; voter_did: string } | null; 204 204 + }) => { 205 205 + // Merge optimistic vote with actual votes 206 206 + const allVotes = props.optimisticVote 207 207 + ? [ 208 208 + ...props.pollData.atp_poll_votes, 209 209 + { 210 210 + voter_did: props.optimisticVote.voter_did, 211 211 + record: { 212 212 + $type: "pub.leaflet.poll.vote", 213 213 + option: [props.optimisticVote.option], 214 214 + }, 215 215 + }, 216 216 + ] 217 217 + : props.pollData.atp_poll_votes; 218 218 + 219 219 + const totalVotes = allVotes.length || 0; 220 220 + let pollRecord = props.pollData.record as PubLeafletPollDefinition.Record; 221 221 + let optionsWithCount = pollRecord.options.map((o, index) => ({ 222 222 + ...o, 223 223 + votes: allVotes.filter((v) => getVoteOption(v.record) == index.toString()), 224 224 + })); 225 225 + 226 226 + const highestVotes = Math.max(...optionsWithCount.map((o) => o.votes.length)); 227 227 + return ( 228 228 + <> 229 229 + {pollRecord.options.map((option, index) => { 230 230 + const voteRecords = allVotes.filter( 231 231 + (v) => getVoteOption(v.record) === index.toString(), 232 232 + ); 233 233 + const isWinner = totalVotes > 0 && voteRecords.length === highestVotes; 234 234 + 235 235 + return ( 236 236 + <PollResult 237 237 + key={index} 238 238 + option={option} 239 239 + votes={voteRecords.length} 240 240 + voteRecords={voteRecords} 241 241 + totalVotes={totalVotes} 242 242 + winner={isWinner} 243 243 + /> 244 244 + ); 245 245 + })} 246 246 + </> 247 247 + ); 248 248 + }; 249 249 + 250 250 + const VoterListPopover = (props: { 251 251 + votes: number; 252 252 + voteRecords: { voter_did: string; record: Json }[]; 253 253 + }) => { 254 254 + const [voterIdentities, setVoterIdentities] = useState<VoterIdentity[]>([]); 255 255 + const [isLoading, setIsLoading] = useState(false); 256 256 + const [hasFetched, setHasFetched] = useState(false); 257 257 + 258 258 + const handleOpenChange = async () => { 259 259 + if (!hasFetched && props.voteRecords.length > 0) { 260 260 + setIsLoading(true); 261 261 + setHasFetched(true); 262 262 + try { 263 263 + const dids = props.voteRecords.map((v) => v.voter_did); 264 264 + const identities = await getVoterIdentities(dids); 265 265 + setVoterIdentities(identities); 266 266 + } catch (error) { 267 267 + console.error("Failed to fetch voter identities:", error); 268 268 + } finally { 269 269 + setIsLoading(false); 270 270 + } 271 271 + } 272 272 + }; 273 273 + 274 274 + return ( 275 275 + <Popover 276 276 + trigger={ 277 277 + <button 278 278 + className="hover:underline cursor-pointer" 279 279 + disabled={props.votes === 0} 280 280 + > 281 281 + {props.votes} 282 282 + </button> 283 283 + } 284 284 + onOpenChange={handleOpenChange} 285 285 + className="w-64 max-h-80" 286 286 + > 287 287 + {isLoading ? ( 288 288 + <div className="flex justify-center py-4"> 289 289 + <div className="text-sm text-secondary">Loading...</div> 290 290 + </div> 291 291 + ) : ( 292 292 + <div className="flex flex-col gap-1 text-sm py-0.5"> 293 293 + {voterIdentities.map((voter) => ( 294 294 + <a 295 295 + key={voter.did} 296 296 + href={`https://bsky.app/profile/${voter.handle || voter.did}`} 297 297 + target="_blank" 298 298 + rel="noopener noreferrer" 299 299 + className="" 300 300 + > 301 301 + @{voter.handle || voter.did} 302 302 + </a> 303 303 + ))} 304 304 + </div> 305 305 + )} 306 306 + </Popover> 307 307 + ); 308 308 + }; 309 309 + 310 310 + const PollResult = (props: { 311 311 + option: PubLeafletPollDefinition.Option; 312 312 + votes: number; 313 313 + voteRecords: { voter_did: string; record: Json }[]; 314 314 + totalVotes: number; 315 315 + winner: boolean; 316 316 + }) => { 317 317 + return ( 318 318 + <div 319 319 + className={`pollResult relative grow py-0.5 px-2 border-accent-contrast rounded-md overflow-hidden ${props.winner ? "font-bold border-2" : "border"}`} 320 320 + > 321 321 + <div 322 322 + style={{ 323 323 + WebkitTextStroke: `${props.winner ? "6px" : "6px"} rgb(var(--bg-page))`, 324 324 + paintOrder: "stroke fill", 325 325 + }} 326 326 + className="pollResultContent text-accent-contrast relative flex gap-2 justify-between z-10" 327 327 + > 328 328 + <div className="grow max-w-full truncate">{props.option.text}</div> 329 329 + <VoterListPopover votes={props.votes} voteRecords={props.voteRecords} /> 330 330 + </div> 331 331 + <div className="pollResultBG absolute bg-bg-page w-full top-0 bottom-0 left-0 right-0 flex flex-row z-0"> 332 332 + <div 333 333 + className="bg-accent-contrast rounded-[2px] m-0.5" 334 334 + style={{ 335 335 + maskImage: "var(--hatchSVG)", 336 336 + maskRepeat: "repeat repeat", 337 337 + ...(props.votes === 0 338 338 + ? { width: "4px" } 339 339 + : { flexBasis: `${(props.votes / props.totalVotes) * 100}%` }), 340 340 + }} 341 341 + /> 342 342 + <div /> 343 343 + </div> 344 344 + </div> 345 345 + ); 346 346 + };

+20

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

··· 1 1 + import { PubLeafletBlocksMath } from "lexicons/api"; 2 2 + import Katex from "katex"; 3 3 + import "katex/dist/katex.min.css"; 4 4 + 5 5 + export const StaticMathBlock = ({ 6 6 + block, 7 7 + }: { 8 8 + block: PubLeafletBlocksMath.Main; 9 9 + }) => { 10 10 + const html = Katex.renderToString(block.tex, { 11 11 + displayMode: true, 12 12 + output: "html", 13 13 + throwOnError: false, 14 14 + }); 15 15 + return ( 16 16 + <div className="math-block my-2"> 17 17 + <div dangerouslySetInnerHTML={{ __html: html }} /> 18 18 + </div> 19 19 + ); 20 20 + };

+95

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

··· 1 1 + "use client"; 2 2 + import { UnicodeString } from "@atproto/api"; 3 3 + import { PubLeafletRichtextFacet } from "lexicons/api"; 4 4 + import { useMemo } from "react"; 5 5 + import { useHighlight } from "../useHighlight"; 6 6 + import { BaseTextBlock } from "./BaseTextBlock"; 7 7 + 8 8 + type Facet = PubLeafletRichtextFacet.Main; 9 9 + export function TextBlock(props: { 10 10 + plaintext: string; 11 11 + facets?: Facet[]; 12 12 + index: number[]; 13 13 + preview?: boolean; 14 14 + pageId?: string; 15 15 + }) { 16 16 + let children = []; 17 17 + let highlights = useHighlight(props.index, props.pageId); 18 18 + let facets = useMemo(() => { 19 19 + if (props.preview) return props.facets; 20 20 + let facets = [...(props.facets || [])]; 21 21 + for (let highlight of highlights) { 22 22 + const fragmentId = props.pageId 23 23 + ? `${props.pageId}~${props.index.join(".")}_${highlight.startOffset || 0}` 24 24 + : `${props.index.join(".")}_${highlight.startOffset || 0}`; 25 25 + facets = addFacet( 26 26 + facets, 27 27 + { 28 28 + index: { 29 29 + byteStart: highlight.startOffset 30 30 + ? new UnicodeString( 31 31 + props.plaintext.slice(0, highlight.startOffset), 32 32 + ).length 33 33 + : 0, 34 34 + byteEnd: new UnicodeString( 35 35 + props.plaintext.slice(0, highlight.endOffset ?? undefined), 36 36 + ).length, 37 37 + }, 38 38 + features: [ 39 39 + { $type: "pub.leaflet.richtext.facet#highlight" }, 40 40 + { 41 41 + $type: "pub.leaflet.richtext.facet#id", 42 42 + id: fragmentId, 43 43 + }, 44 44 + ], 45 45 + }, 46 46 + new UnicodeString(props.plaintext).length, 47 47 + ); 48 48 + } 49 49 + return facets; 50 50 + }, [props.plaintext, props.facets, highlights, props.preview, props.pageId]); 51 51 + return <BaseTextBlock {...props} facets={facets} />; 52 52 + } 53 53 + 54 54 + function addFacet(facets: Facet[], newFacet: Facet, length: number) { 55 55 + if (facets.length === 0) { 56 56 + return [newFacet]; 57 57 + } 58 58 + 59 59 + const allFacets = [...facets, newFacet]; 60 60 + 61 61 + // Collect all boundary positions 62 62 + const boundaries = new Set<number>(); 63 63 + boundaries.add(0); 64 64 + boundaries.add(length); 65 65 + 66 66 + for (const facet of allFacets) { 67 67 + boundaries.add(facet.index.byteStart); 68 68 + boundaries.add(facet.index.byteEnd); 69 69 + } 70 70 + 71 71 + const sortedBoundaries = Array.from(boundaries).sort((a, b) => a - b); 72 72 + const result: Facet[] = []; 73 73 + 74 74 + // Process segments between consecutive boundaries 75 75 + for (let i = 0; i < sortedBoundaries.length - 1; i++) { 76 76 + const start = sortedBoundaries[i]; 77 77 + const end = sortedBoundaries[i + 1]; 78 78 + 79 79 + // Find facets that are active at the start position 80 80 + const activeFacets = allFacets.filter( 81 81 + (facet) => facet.index.byteStart <= start && facet.index.byteEnd > start, 82 82 + ); 83 83 + 84 84 + // Only create facet if there are active facets (features present) 85 85 + if (activeFacets.length > 0) { 86 86 + const features = activeFacets.flatMap((f) => f.features); 87 87 + result.push({ 88 88 + index: { byteStart: start, byteEnd: end }, 89 89 + features, 90 90 + }); 91 91 + } 92 92 + } 93 93 + 94 94 + return result; 95 95 + }

+181

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

··· 1 1 + import { UnicodeString } from "@atproto/api"; 2 2 + import { PubLeafletRichtextFacet } from "lexicons/api"; 3 3 + import { AtMentionLink } from "components/AtMentionLink"; 4 4 + import { ReactNode } from "react"; 5 5 + 6 6 + type Facet = PubLeafletRichtextFacet.Main; 7 7 + 8 8 + export type FacetRenderers = { 9 9 + DidMention?: (props: { did: string; children: ReactNode }) => ReactNode; 10 10 + }; 11 11 + 12 12 + export type TextBlockCoreProps = { 13 13 + plaintext: string; 14 14 + facets?: Facet[]; 15 15 + index: number[]; 16 16 + preview?: boolean; 17 17 + renderers?: FacetRenderers; 18 18 + }; 19 19 + 20 20 + export function TextBlockCore(props: TextBlockCoreProps) { 21 21 + let children = []; 22 22 + let richText = new RichText({ 23 23 + text: props.plaintext, 24 24 + facets: props.facets || [], 25 25 + }); 26 26 + let counter = 0; 27 27 + for (const segment of richText.segments()) { 28 28 + let id = segment.facet?.find(PubLeafletRichtextFacet.isId); 29 29 + let link = segment.facet?.find(PubLeafletRichtextFacet.isLink); 30 30 + let isBold = segment.facet?.find(PubLeafletRichtextFacet.isBold); 31 31 + let isCode = segment.facet?.find(PubLeafletRichtextFacet.isCode); 32 32 + let isStrikethrough = segment.facet?.find( 33 33 + PubLeafletRichtextFacet.isStrikethrough, 34 34 + ); 35 35 + let isDidMention = segment.facet?.find( 36 36 + PubLeafletRichtextFacet.isDidMention, 37 37 + ); 38 38 + let isAtMention = segment.facet?.find(PubLeafletRichtextFacet.isAtMention); 39 39 + let isUnderline = segment.facet?.find(PubLeafletRichtextFacet.isUnderline); 40 40 + let isItalic = segment.facet?.find(PubLeafletRichtextFacet.isItalic); 41 41 + let isHighlighted = segment.facet?.find( 42 42 + PubLeafletRichtextFacet.isHighlight, 43 43 + ); 44 44 + let className = ` 45 45 + ${isCode ? "inline-code" : ""} 46 46 + ${id ? "scroll-mt-12 scroll-mb-10" : ""} 47 47 + ${isBold ? "font-bold" : ""} 48 48 + ${isItalic ? "italic" : ""} 49 49 + ${isUnderline ? "underline" : ""} 50 50 + ${isStrikethrough ? "line-through decoration-tertiary" : ""} 51 51 + ${isHighlighted ? "highlight bg-highlight-1" : ""}`.replaceAll("\n", " "); 52 52 + 53 53 + // Split text by newlines and insert <br> tags 54 54 + const textParts = segment.text.split("\n"); 55 55 + const renderedText = textParts.flatMap((part, i) => 56 56 + i < textParts.length - 1 57 57 + ? [part, <br key={`br-${counter}-${i}`} />] 58 58 + : [part], 59 59 + ); 60 60 + 61 61 + if (isCode) { 62 62 + children.push( 63 63 + <code key={counter} className={className} id={id?.id}> 64 64 + {renderedText} 65 65 + </code>, 66 66 + ); 67 67 + } else if (isDidMention) { 68 68 + const DidMentionRenderer = props.renderers?.DidMention; 69 69 + if (DidMentionRenderer) { 70 70 + children.push( 71 71 + <DidMentionRenderer key={counter} did={isDidMention.did}> 72 72 + <span className="mention">{renderedText}</span> 73 73 + </DidMentionRenderer>, 74 74 + ); 75 75 + } else { 76 76 + // Default: render as a simple link 77 77 + children.push( 78 78 + <a 79 79 + key={counter} 80 80 + href={`https://leaflet.pub/p/${isDidMention.did}`} 81 81 + target="_blank" 82 82 + className="no-underline" 83 83 + > 84 84 + <span className="mention">{renderedText}</span> 85 85 + </a>, 86 86 + ); 87 87 + } 88 88 + } else if (isAtMention) { 89 89 + children.push( 90 90 + <AtMentionLink 91 91 + key={counter} 92 92 + atURI={isAtMention.atURI} 93 93 + className={className} 94 94 + > 95 95 + {renderedText} 96 96 + </AtMentionLink>, 97 97 + ); 98 98 + } else if (link) { 99 99 + children.push( 100 100 + <a 101 101 + key={counter} 102 102 + href={link.uri.trim()} 103 103 + className={`text-accent-contrast hover:underline ${className}`} 104 104 + target="_blank" 105 105 + > 106 106 + {renderedText} 107 107 + </a>, 108 108 + ); 109 109 + } else { 110 110 + children.push( 111 111 + <span key={counter} className={className} id={id?.id}> 112 112 + {renderedText} 113 113 + </span>, 114 114 + ); 115 115 + } 116 116 + 117 117 + counter++; 118 118 + } 119 119 + return <>{children}</>; 120 120 + } 121 121 + 122 122 + type RichTextSegment = { 123 123 + text: string; 124 124 + facet?: Exclude<Facet["features"], { $type: string }>; 125 125 + }; 126 126 + 127 127 + export class RichText { 128 128 + unicodeText: UnicodeString; 129 129 + facets?: Facet[]; 130 130 + 131 131 + constructor(props: { text: string; facets: Facet[] }) { 132 132 + this.unicodeText = new UnicodeString(props.text); 133 133 + this.facets = props.facets; 134 134 + if (this.facets) { 135 135 + this.facets = this.facets 136 136 + .filter((facet) => facet.index.byteStart <= facet.index.byteEnd) 137 137 + .sort((a, b) => a.index.byteStart - b.index.byteStart); 138 138 + } 139 139 + } 140 140 + 141 141 + *segments(): Generator<RichTextSegment, void, void> { 142 142 + const facets = this.facets || []; 143 143 + if (!facets.length) { 144 144 + yield { text: this.unicodeText.utf16 }; 145 145 + return; 146 146 + } 147 147 + 148 148 + let textCursor = 0; 149 149 + let facetCursor = 0; 150 150 + do { 151 151 + const currFacet = facets[facetCursor]; 152 152 + if (textCursor < currFacet.index.byteStart) { 153 153 + yield { 154 154 + text: this.unicodeText.slice(textCursor, currFacet.index.byteStart), 155 155 + }; 156 156 + } else if (textCursor > currFacet.index.byteStart) { 157 157 + facetCursor++; 158 158 + continue; 159 159 + } 160 160 + if (currFacet.index.byteStart < currFacet.index.byteEnd) { 161 161 + const subtext = this.unicodeText.slice( 162 162 + currFacet.index.byteStart, 163 163 + currFacet.index.byteEnd, 164 164 + ); 165 165 + if (!subtext.trim()) { 166 166 + // dont empty string entities 167 167 + yield { text: subtext }; 168 168 + } else { 169 169 + yield { text: subtext, facet: currFacet.features }; 170 170 + } 171 171 + } 172 172 + textCursor = currFacet.index.byteEnd; 173 173 + facetCursor++; 174 174 + } while (facetCursor < facets.length); 175 175 + if (textCursor < this.unicodeText.length) { 176 176 + yield { 177 177 + text: this.unicodeText.slice(textCursor, this.unicodeText.length), 178 178 + }; 179 179 + } 180 180 + } 181 181 + }

+105

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

··· 1 1 + "use client"; 2 2 + import { AppBskyFeedDefs } from "@atproto/api"; 3 3 + import useSWR from "swr"; 4 4 + import { PageWrapper } from "components/Pages/Page"; 5 5 + import { useDrawerOpen } from "./Interactions/InteractionDrawer"; 6 6 + import { DotLoader } from "components/utils/DotLoader"; 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"; 11 11 + 12 12 + // Re-export for backwards compatibility 13 13 + export { QuotesLink, getQuotesKey, fetchQuotes, prefetchQuotes }; 14 14 + 15 15 + type PostView = AppBskyFeedDefs.PostView; 16 16 + 17 17 + export function BlueskyQuotesPage(props: { 18 18 + postUri: string; 19 19 + pageId: string; 20 20 + pageOptions?: React.ReactNode; 21 21 + hasPageBackground: boolean; 22 22 + }) { 23 23 + const { postUri, pageId, pageOptions } = props; 24 24 + const drawer = useDrawerOpen(postUri); 25 25 + 26 26 + const { 27 27 + data: quotesData, 28 28 + isLoading, 29 29 + error, 30 30 + } = useSWR(postUri ? getQuotesKey(postUri) : null, () => fetchQuotes(postUri)); 31 31 + 32 32 + return ( 33 33 + <PageWrapper 34 34 + pageType="doc" 35 35 + fullPageScroll={false} 36 36 + id={`post-page-${pageId}`} 37 37 + drawerOpen={!!drawer} 38 38 + pageOptions={pageOptions} 39 39 + > 40 40 + <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> 45 45 + {isLoading ? ( 46 46 + <div className="flex items-center justify-center gap-1 text-tertiary italic text-sm py-8"> 47 47 + <span>loading quotes</span> 48 48 + <DotLoader /> 49 49 + </div> 50 50 + ) : error ? ( 51 51 + <div className="text-tertiary italic text-sm text-center py-8"> 52 52 + Failed to load quotes 53 53 + </div> 54 54 + ) : quotesData && quotesData.posts.length > 0 ? ( 55 55 + <QuotesContent posts={quotesData.posts} postUri={postUri} /> 56 56 + ) : ( 57 57 + <div className="text-tertiary italic text-sm text-center py-8"> 58 58 + No quotes yet 59 59 + </div> 60 60 + )} 61 61 + </div> 62 62 + </PageWrapper> 63 63 + ); 64 64 + } 65 65 + 66 66 + function QuotesContent(props: { posts: PostView[]; postUri: string }) { 67 67 + const { posts, postUri } = props; 68 68 + 69 69 + return ( 70 70 + <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 + /> 77 77 + ))} 78 78 + </div> 79 79 + ); 80 80 + } 81 81 + 82 82 + function QuotePost(props: { 83 83 + post: PostView; 84 84 + quotesUri: string; 85 85 + }) { 86 86 + const { post, quotesUri } = props; 87 87 + const parent = { type: "quotes" as const, uri: quotesUri }; 88 88 + 89 89 + 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> 104 104 + ); 105 105 + }

+182

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"; 6 6 + import { BlueskyRichText } from "components/Blocks/BlueskyPostBlock/BlueskyRichText"; 7 7 + import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 8 8 + import { CommentTiny } from "components/Icons/CommentTiny"; 9 9 + import { QuoteTiny } from "components/Icons/QuoteTiny"; 10 10 + import { Separator } from "components/Layout"; 11 11 + import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 12 12 + import { useHasPageLoaded } from "components/InitialPageLoadProvider"; 13 13 + import { OpenPage } from "./PostPages"; 14 14 + import { ThreadLink, QuotesLink } from "./PostLinks"; 15 15 + 16 16 + type PostView = AppBskyFeedDefs.PostView; 17 17 + 18 18 + export function BskyPostContent(props: { 19 19 + post: PostView; 20 20 + parent?: OpenPage; 21 21 + linksEnabled?: boolean; 22 22 + avatarSize?: "sm" | "md"; 23 23 + showEmbed?: boolean; 24 24 + showBlueskyLink?: boolean; 25 25 + onEmbedClick?: (e: React.MouseEvent) => void; 26 26 + onLinkClick?: (e: React.MouseEvent) => void; 27 27 + }) { 28 28 + const { 29 29 + post, 30 30 + parent, 31 31 + linksEnabled = true, 32 32 + avatarSize = "md", 33 33 + showEmbed = true, 34 34 + showBlueskyLink = true, 35 35 + onEmbedClick, 36 36 + onLinkClick, 37 37 + } = props; 38 38 + 39 39 + const record = post.record as AppBskyFeedPost.Record; 40 40 + const postId = post.uri.split("/")[4]; 41 41 + const url = `https://bsky.app/profile/${post.author.handle}/post/${postId}`; 42 42 + 43 43 + const avatarClass = avatarSize === "sm" ? "w-8 h-8" : "w-10 h-10"; 44 44 + 45 45 + return ( 46 46 + <> 47 47 + <div className="flex flex-col items-center shrink-0"> 48 48 + {post.author.avatar ? ( 49 49 + <img 50 50 + src={post.author.avatar} 51 51 + alt={`${post.author.displayName}'s avatar`} 52 52 + className={`${avatarClass} rounded-full border border-border-light`} 53 53 + /> 54 54 + ) : ( 55 55 + <div className={`${avatarClass} rounded-full border border-border-light bg-border`} /> 56 56 + )} 57 57 + </div> 58 58 + 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} 63 63 + </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> 72 72 + </div> 73 73 + 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} /> 81 81 + </div> 82 82 + )} 83 83 + </div> 84 84 + 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} 94 94 + /> 95 95 + </div> 96 96 + </div> 97 97 + </> 98 98 + ); 99 99 + } 100 100 + 101 101 + function PostCounts(props: { 102 102 + post: PostView; 103 103 + parent?: OpenPage; 104 104 + linksEnabled: boolean; 105 105 + showBlueskyLink: boolean; 106 106 + url: string; 107 107 + onLinkClick?: (e: React.MouseEvent) => void; 108 108 + }) { 109 109 + const { post, parent, linksEnabled, showBlueskyLink, url, onLinkClick } = props; 110 110 + 111 111 + 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" /> 137 137 + <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} 142 142 + > 143 143 + {post.quoteCount} 144 144 + <QuoteTiny /> 145 145 + </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 + )} 161 161 + </div> 162 162 + ); 163 163 + } 164 164 + 165 165 + export const ClientDate = (props: { date?: string }) => { 166 166 + const pageLoaded = useHasPageLoaded(); 167 167 + const formattedDate = useLocalizedDate( 168 168 + props.date || new Date().toISOString(), 169 169 + { 170 170 + month: "short", 171 171 + day: "numeric", 172 172 + year: "numeric", 173 173 + hour: "numeric", 174 174 + minute: "numeric", 175 175 + hour12: true, 176 176 + }, 177 177 + ); 178 178 + 179 179 + if (!pageLoaded) return null; 180 180 + 181 181 + return <div className="text-xs text-tertiary">{formattedDate}</div>; 182 182 + };

+7 -3

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

··· 57 57 <PageWrapper 58 58 pageType="canvas" 59 59 fullPageScroll={fullPageScroll} 60 60 - cardBorderHidden={!hasPageBackground} 61 61 - id={pageId ? `post-page-${pageId}` : "post-page"} 60 60 + id={`post-page-${pageId ?? document_uri}`} 62 61 drawerOpen={ 63 62 !!drawer && (pageId ? drawer.pageId === pageId : !drawer.pageId) 64 63 } ··· 203 202 isSubpage: boolean | undefined; 204 203 data: PostPageData; 205 204 profile: ProfileViewDetailed; 206 206 - preferences: { showComments?: boolean }; 205 205 + preferences: { 206 206 + showComments?: boolean; 207 207 + showMentions?: boolean; 208 208 + showPrevNext?: boolean; 209 209 + }; 207 210 quotesCount: number | undefined; 208 211 commentsCount: number | undefined; 209 212 }) => { ··· 214 217 quotesCount={props.quotesCount || 0} 215 218 commentsCount={props.commentsCount || 0} 216 219 showComments={props.preferences.showComments} 220 220 + showMentions={props.preferences.showMentions} 217 221 pageId={props.pageId} 218 222 /> 219 223 {!props.isSubpage && (

+24 -5

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

··· 1 1 - import { UnicodeString } from "@atproto/api"; 1 1 + import { AtUri, UnicodeString } from "@atproto/api"; 2 2 import { autolink } from "components/Blocks/TextBlock/autolink-plugin"; 3 3 import { multiBlockSchema } from "components/Blocks/TextBlock/schema"; 4 4 import { PubLeafletRichtextFacet } from "lexicons/api"; ··· 38 38 import { CloseTiny } from "components/Icons/CloseTiny"; 39 39 import { CloseFillTiny } from "components/Icons/CloseFillTiny"; 40 40 import { betterIsUrl } from "src/utils/isURL"; 41 41 + import { useToaster } from "components/Toast"; 42 42 + import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError"; 41 43 import { Mention, MentionAutocomplete } from "components/Mention"; 42 44 import { didToBlueskyUrl, atUriToUrl } from "src/utils/mentionUtils"; 43 45 ··· 95 97 } = useInteractionState(props.doc_uri); 96 98 let [loading, setLoading] = useState(false); 97 99 let view = useRef<null | EditorView>(null); 100 100 + let toaster = useToaster(); 98 101 99 102 // Mention autocomplete state 100 103 const [mentionOpen, setMentionOpen] = useState(false); ··· 161 164 setLoading(true); 162 165 let currentState = view.current.state; 163 166 let [plaintext, facets] = docToFacetedText(currentState.doc); 164 164 - let comment = await publishComment({ 167 167 + let result = await publishComment({ 165 168 pageId: props.pageId, 166 169 document: props.doc_uri, 167 170 comment: { ··· 178 181 }, 179 182 }); 180 183 184 184 + if (!result.success) { 185 185 + setLoading(false); 186 186 + toaster({ 187 187 + content: isOAuthSessionError(result.error) ? ( 188 188 + <OAuthErrorMessage error={result.error} /> 189 189 + ) : ( 190 190 + "Failed to post comment" 191 191 + ), 192 192 + type: "error", 193 193 + }); 194 194 + return; 195 195 + } 196 196 + 181 197 let tr = currentState.tr; 182 198 tr = tr.replaceWith( 183 199 0, ··· 194 210 localComments: [ 195 211 ...s.localComments, 196 212 { 197 197 - record: comment.record, 198 198 - uri: comment.uri, 199 199 - bsky_profiles: { record: comment.profile as Json }, 213 213 + record: result.record, 214 214 + uri: result.uri, 215 215 + bsky_profiles: { 216 216 + record: result.profile as Json, 217 217 + did: new AtUri(result.uri).host, 218 218 + }, 200 219 }, 201 220 ], 202 221 }));

+25 -5

app/lish/[did]/[publication]/[rkey]/Interactions/Comments/commentAction.ts

··· 3 3 import { AtpBaseClient, PubLeafletComment } from "lexicons/api"; 4 4 import { getIdentityData } from "actions/getIdentityData"; 5 5 import { PubLeafletRichtextFacet } from "lexicons/api"; 6 6 - import { createOauthClient } from "src/atproto-oauth"; 6 6 + import { 7 7 + restoreOAuthSession, 8 8 + OAuthSessionError, 9 9 + } from "src/atproto-oauth"; 7 10 import { TID } from "@atproto/common"; 8 11 import { AtUri, lexToJson, Un$Typed } from "@atproto/api"; 9 12 import { supabaseServerClient } from "supabase/serverClient"; ··· 15 18 } from "src/notifications"; 16 19 import { v7 } from "uuid"; 17 20 21 21 + type PublishCommentResult = 22 22 + | { success: true; record: Json; profile: any; uri: string } 23 23 + | { success: false; error: OAuthSessionError }; 24 24 + 18 25 export async function publishComment(args: { 19 26 document: string; 20 27 pageId?: string; ··· 24 31 replyTo?: string; 25 32 attachment: PubLeafletComment.Record["attachment"]; 26 33 }; 27 27 - }) { 28 28 - const oauthClient = await createOauthClient(); 34 34 + }): Promise<PublishCommentResult> { 29 35 let identity = await getIdentityData(); 30 30 - if (!identity || !identity.atp_did) throw new Error("No Identity"); 36 36 + if (!identity || !identity.atp_did) { 37 37 + return { 38 38 + success: false, 39 39 + error: { 40 40 + type: "oauth_session_expired", 41 41 + message: "Not authenticated", 42 42 + did: "", 43 43 + }, 44 44 + }; 45 45 + } 31 46 32 32 - let credentialSession = await oauthClient.restore(identity.atp_did); 47 47 + const sessionResult = await restoreOAuthSession(identity.atp_did); 48 48 + if (!sessionResult.ok) { 49 49 + return { success: false, error: sessionResult.error }; 50 50 + } 51 51 + let credentialSession = sessionResult.value; 33 52 let agent = new AtpBaseClient( 34 53 credentialSession.fetchHandler.bind(credentialSession), 35 54 ); ··· 108 127 } 109 128 110 129 return { 130 130 + success: true, 111 131 record: data?.[0].record as Json, 112 132 profile: lexToJson(profile.value), 113 133 uri: uri.toString(),

+20 -101

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

··· 5 5 import { CommentBox } from "./CommentBox"; 6 6 import { Json } from "supabase/database.types"; 7 7 import { PubLeafletComment } from "lexicons/api"; 8 8 - import { BaseTextBlock } from "../../BaseTextBlock"; 8 8 + import { BaseTextBlock } from "../../Blocks/BaseTextBlock"; 9 9 import { useMemo, useState } from "react"; 10 10 import { CommentTiny } from "components/Icons/CommentTiny"; 11 11 import { Separator } from "components/Layout"; ··· 18 18 import { QuoteContent } from "../Quotes"; 19 19 import { timeAgo } from "src/utils/timeAgo"; 20 20 import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 21 21 + import { ProfilePopover } from "components/ProfilePopover"; 21 22 22 23 export type Comment = { 23 24 record: Json; 24 25 uri: string; 25 25 - bsky_profiles: { record: Json } | null; 26 26 + bsky_profiles: { record: Json; did: string } | null; 26 27 }; 27 28 export function Comments(props: { 28 29 document_uri: string; ··· 50 51 }, []); 51 52 52 53 return ( 53 53 - <div id={"commentsDrawer"} className="flex flex-col gap-2 relative"> 54 54 + <div 55 55 + id={"commentsDrawer"} 56 56 + className="flex flex-col gap-2 relative text-sm text-secondary" 57 57 + > 54 58 <div className="w-full flex justify-between text-secondary font-bold"> 55 59 Comments 56 60 <button ··· 109 113 document: string; 110 114 comment: Comment; 111 115 comments: Comment[]; 112 112 - profile?: AppBskyActorProfile.Record; 116 116 + profile: AppBskyActorProfile.Record; 113 117 record: PubLeafletComment.Record; 114 118 pageId?: string; 115 119 }) => { 120 120 + const did = props.comment.bsky_profiles?.did; 121 121 + 116 122 return ( 117 117 - <div className="comment"> 123 123 + <div id={props.comment.uri} className="comment"> 118 124 <div className="flex gap-2"> 119 119 - {props.profile && ( 120 120 - <ProfilePopover profile={props.profile} comment={props.comment.uri} /> 125 125 + {did && ( 126 126 + <ProfilePopover 127 127 + didOrHandle={did} 128 128 + trigger={ 129 129 + <div className="text-sm text-tertiary font-bold hover:underline"> 130 130 + {props.profile.displayName} 131 131 + </div> 132 132 + } 133 133 + /> 121 134 )} 122 122 - <DatePopover date={props.record.createdAt} /> 123 135 </div> 124 136 {props.record.attachment && 125 137 PubLeafletComment.isLinearDocumentQuote(props.record.attachment) && ( ··· 291 303 </Popover> 292 304 ); 293 305 }; 294 294 - 295 295 - const ProfilePopover = (props: { 296 296 - profile: AppBskyActorProfile.Record; 297 297 - comment: string; 298 298 - }) => { 299 299 - let commenterId = new AtUri(props.comment).host; 300 300 - 301 301 - return ( 302 302 - <> 303 303 - <a 304 304 - className="font-bold text-tertiary text-sm hover:underline" 305 305 - href={`https://bsky.app/profile/${commenterId}`} 306 306 - > 307 307 - {props.profile.displayName} 308 308 - </a> 309 309 - {/*<Media mobile={false}> 310 310 - <Popover 311 311 - align="start" 312 312 - trigger={ 313 313 - <div 314 314 - onMouseOver={() => { 315 315 - setHovering(true); 316 316 - hoverTimeout.current = window.setTimeout(() => { 317 317 - setLoadProfile(true); 318 318 - }, 500); 319 319 - }} 320 320 - onMouseOut={() => { 321 321 - setHovering(false); 322 322 - clearTimeout(hoverTimeout.current); 323 323 - }} 324 324 - className="font-bold text-tertiary text-sm hover:underline" 325 325 - > 326 326 - {props.profile.displayName} 327 327 - </div> 328 328 - } 329 329 - className="max-w-sm" 330 330 - > 331 331 - {profile && ( 332 332 - <> 333 333 - <div className="profilePopover text-sm flex gap-2"> 334 334 - <div className="w-5 h-5 bg-test rounded-full shrink-0 mt-[2px]" /> 335 335 - <div className="flex flex-col"> 336 336 - <div className="flex justify-between"> 337 337 - <div className="profileHeader flex gap-2 items-center"> 338 338 - <div className="font-bold">celine</div> 339 339 - <a className="text-tertiary" href="/"> 340 340 - @{profile.handle} 341 341 - </a> 342 342 - </div> 343 343 - </div> 344 344 - 345 345 - <div className="profileBio text-secondary "> 346 346 - {profile.description} 347 347 - </div> 348 348 - <div className="flex flex-row gap-2 items-center pt-2 font-bold"> 349 349 - {!profile.viewer?.following ? ( 350 350 - <div className="text-tertiary bg-border-light rounded-md px-1 py-0"> 351 351 - Following 352 352 - </div> 353 353 - ) : ( 354 354 - <ButtonPrimary compact className="text-sm"> 355 355 - Follow <BlueskyTiny /> 356 356 - </ButtonPrimary> 357 357 - )} 358 358 - {profile.viewer?.followedBy && ( 359 359 - <div className="text-tertiary">Follows You</div> 360 360 - )} 361 361 - </div> 362 362 - </div> 363 363 - </div> 364 364 - 365 365 - <hr className="my-2 border-border-light" /> 366 366 - <div className="flex gap-2 leading-tight items-center text-tertiary text-sm"> 367 367 - <div className="flex flex-col w-6 justify-center"> 368 368 - {profile.viewer?.knownFollowers?.followers.map((follower) => { 369 369 - return ( 370 370 - <div 371 371 - className="w-[18px] h-[18px] bg-test rounded-full border-2 border-bg-page" 372 372 - key={follower.did} 373 373 - /> 374 374 - ); 375 375 - })} 376 376 - <div className="w-[18px] h-[18px] bg-test rounded-full -mt-2 border-2 border-bg-page" /> 377 377 - <div className="w-[18px] h-[18px] bg-test rounded-full -mt-2 border-2 border-bg-page" /> 378 378 - </div> 379 379 - </div> 380 380 - </> 381 381 - )} 382 382 - </Popover> 383 383 - </Media>*/} 384 384 - </> 385 385 - ); 386 386 - };

+6 -2

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

··· 9 9 import { decodeQuotePosition } from "../quotePosition"; 10 10 11 11 export const InteractionDrawer = (props: { 12 12 + showPageBackground: boolean | undefined; 12 13 document_uri: string; 13 14 quotesAndMentions: { uri: string; link?: string }[]; 14 15 comments: Comment[]; ··· 38 39 <div className="snap-center h-full flex z-10 shrink-0 w-[calc(var(--page-width-units)-6px)] sm:w-[calc(var(--page-width-units))]"> 39 40 <div 40 41 id="interaction-drawer" 41 41 - className="opaque-container rounded-l-none! rounded-r-lg! h-full w-full px-3 sm:px-4 pt-2 sm:pt-3 pb-6 overflow-scroll -ml-[1px] " 42 42 + className={`opaque-container h-full w-full px-3 sm:px-4 pt-2 sm:pt-3 pb-6 overflow-scroll -ml-[1px] ${props.showPageBackground ? "rounded-l-none! rounded-r-lg!" : "rounded-lg! sm:mx-2"}`} 42 43 > 43 44 {drawer.drawer === "quotes" ? ( 44 45 <Quotes {...props} quotesAndMentions={filteredQuotesAndMentions} /> ··· 58 59 export const useDrawerOpen = (uri: string) => { 59 60 let params = useSearchParams(); 60 61 let interactionDrawerSearchParam = params.get("interactionDrawer"); 62 62 + let pageParam = params.get("page"); 61 63 let { drawerOpen: open, drawer, pageId } = useInteractionState(uri); 62 64 if (open === false || (open === undefined && !interactionDrawerSearchParam)) 63 65 return null; 64 66 drawer = 65 67 drawer || (interactionDrawerSearchParam as InteractionState["drawer"]); 66 66 - return { drawer, pageId }; 68 68 + // Use pageId from state, or fall back to page search param 69 69 + const resolvedPageId = pageId ?? pageParam ?? undefined; 70 70 + return { drawer, pageId: resolvedPageId }; 67 71 };

+69 -48

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

··· 108 108 commentsCount: number; 109 109 className?: string; 110 110 showComments?: boolean; 111 111 + showMentions?: boolean; 111 112 pageId?: string; 112 113 }) => { 113 114 const data = useContext(PostPageContext); ··· 131 132 <div className={`flex gap-2 text-tertiary text-sm ${props.className}`}> 132 133 {tagCount > 0 && <TagPopover tags={tags} tagCount={tagCount} />} 133 134 134 134 - {props.quotesCount > 0 && ( 135 135 + {props.quotesCount === 0 || props.showMentions === false ? null : ( 135 136 <button 136 137 className="flex w-fit gap-2 items-center" 137 138 onClick={() => { ··· 168 169 commentsCount: number; 169 170 className?: string; 170 171 showComments?: boolean; 172 172 + showMentions?: boolean; 171 173 pageId?: string; 172 174 }) => { 173 175 const data = useContext(PostPageContext); ··· 189 191 const tags = (data?.data as any)?.tags as string[] | undefined; 190 192 const tagCount = tags?.length || 0; 191 193 194 194 + let noInteractions = !props.showComments && !props.showMentions; 195 195 + 192 196 let subscribed = 193 197 identity?.atp_did && 194 198 publication?.publication_subscriptions && ··· 216 220 <SubscribeWithBluesky 217 221 pubName={publication.name} 218 222 pub_uri={publication.uri} 219 219 - base_url={ 220 220 - (publication.record as PubLeafletPublication.Record) 221 221 - .base_path || "" 222 222 - } 223 223 + base_url={getPublicationURL(publication)} 223 224 subscribers={publication?.publication_subscriptions} 224 225 /> 225 226 </div> ··· 232 233 <TagList tags={tags} className="mb-3" /> 233 234 </> 234 235 )} 236 236 + 235 237 <hr className="border-border-light mb-3 " /> 238 238 + 236 239 <div className="flex gap-2 justify-between"> 237 237 - <div className="flex gap-2"> 238 238 - {props.quotesCount > 0 && ( 239 239 - <button 240 240 - className="flex w-fit gap-2 items-center px-1 py-0.5 border border-border-light rounded-lg trasparent-outline selected-outline" 241 241 - onClick={() => { 242 242 - if (!drawerOpen || drawer !== "quotes") 243 243 - openInteractionDrawer("quotes", document_uri, props.pageId); 244 244 - else setInteractionState(document_uri, { drawerOpen: false }); 245 245 - }} 246 246 - onMouseEnter={handleQuotePrefetch} 247 247 - onTouchStart={handleQuotePrefetch} 248 248 - aria-label="Post quotes" 249 249 - > 250 250 - <QuoteTiny aria-hidden /> {props.quotesCount}{" "} 251 251 - <span 252 252 - aria-hidden 253 253 - >{`Quote${props.quotesCount === 1 ? "" : "s"}`}</span> 254 254 - </button> 255 255 - )} 256 256 - {props.showComments === false ? null : ( 257 257 - <button 258 258 - className="flex gap-2 items-center w-fit px-1 py-0.5 border border-border-light rounded-lg trasparent-outline selected-outline" 259 259 - onClick={() => { 260 260 - if ( 261 261 - !drawerOpen || 262 262 - drawer !== "comments" || 263 263 - pageId !== props.pageId 264 264 - ) 265 265 - openInteractionDrawer("comments", document_uri, props.pageId); 266 266 - else setInteractionState(document_uri, { drawerOpen: false }); 267 267 - }} 268 268 - aria-label="Post comments" 269 269 - > 270 270 - <CommentTiny aria-hidden />{" "} 271 271 - {props.commentsCount > 0 ? ( 272 272 - <span aria-hidden> 273 273 - {`${props.commentsCount} Comment${props.commentsCount === 1 ? "" : "s"}`} 274 274 - </span> 275 275 - ) : ( 276 276 - "Comment" 240 240 + {noInteractions ? ( 241 241 + <div /> 242 242 + ) : ( 243 243 + <> 244 244 + <div className="flex gap-2"> 245 245 + {props.quotesCount === 0 || 246 246 + props.showMentions === false ? null : ( 247 247 + <button 248 248 + className="flex w-fit gap-2 items-center px-1 py-0.5 border border-border-light rounded-lg trasparent-outline selected-outline" 249 249 + onClick={() => { 250 250 + if (!drawerOpen || drawer !== "quotes") 251 251 + openInteractionDrawer( 252 252 + "quotes", 253 253 + document_uri, 254 254 + props.pageId, 255 255 + ); 256 256 + else 257 257 + setInteractionState(document_uri, { drawerOpen: false }); 258 258 + }} 259 259 + onMouseEnter={handleQuotePrefetch} 260 260 + onTouchStart={handleQuotePrefetch} 261 261 + aria-label="Post quotes" 262 262 + > 263 263 + <QuoteTiny aria-hidden /> {props.quotesCount}{" "} 264 264 + <span 265 265 + aria-hidden 266 266 + >{`Mention${props.quotesCount === 1 ? "" : "s"}`}</span> 267 267 + </button> 268 268 + )} 269 269 + {props.showComments === false ? null : ( 270 270 + <button 271 271 + className="flex gap-2 items-center w-fit px-1 py-0.5 border border-border-light rounded-lg trasparent-outline selected-outline" 272 272 + onClick={() => { 273 273 + if ( 274 274 + !drawerOpen || 275 275 + drawer !== "comments" || 276 276 + pageId !== props.pageId 277 277 + ) 278 278 + openInteractionDrawer( 279 279 + "comments", 280 280 + document_uri, 281 281 + props.pageId, 282 282 + ); 283 283 + else 284 284 + setInteractionState(document_uri, { drawerOpen: false }); 285 285 + }} 286 286 + aria-label="Post comments" 287 287 + > 288 288 + <CommentTiny aria-hidden />{" "} 289 289 + {props.commentsCount > 0 ? ( 290 290 + <span aria-hidden> 291 291 + {`${props.commentsCount} Comment${props.commentsCount === 1 ? "" : "s"}`} 292 292 + </span> 293 293 + ) : ( 294 294 + "Comment" 295 295 + )} 296 296 + </button> 277 297 )} 278 278 - </button> 279 279 - )} 280 280 - </div> 298 298 + </div> 299 299 + </> 300 300 + )} 301 301 + 281 302 <EditButton document={data} /> 282 303 {subscribed && publication && ( 283 304 <ManageSubscription

+58 -12

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

··· 4 4 import { useIsMobile } from "src/hooks/isMobile"; 5 5 import { setInteractionState } from "./Interactions"; 6 6 import { PostView } from "@atproto/api/dist/client/types/app/bsky/feed/defs"; 7 7 - import { AtUri } from "@atproto/api"; 7 7 + import { AtUri, AppBskyFeedPost } from "@atproto/api"; 8 8 import { PostPageContext } from "../PostPageContext"; 9 9 import { 10 10 PubLeafletBlocksText, ··· 22 22 import { openPage } from "../PostPages"; 23 23 import useSWR, { mutate } from "swr"; 24 24 import { DotLoader } from "components/utils/DotLoader"; 25 25 + import { CommentTiny } from "components/Icons/CommentTiny"; 26 26 + import { QuoteTiny } from "components/Icons/QuoteTiny"; 27 27 + import { ThreadLink, QuotesLink } from "../PostLinks"; 25 28 26 29 // Helper to get SWR key for quotes 27 30 export function getQuotesSWRKey(uris: string[]) { ··· 129 132 130 133 <div className="h-5 w-1 ml-5 border-l border-border-light" /> 131 134 <BskyPost 135 135 + uri={pv.uri} 132 136 rkey={new AtUri(pv.uri).rkey} 133 137 content={pv.record.text as string} 134 138 user={pv.author.displayName || pv.author.handle} 135 139 profile={pv.author} 136 140 handle={pv.author.handle} 141 141 + replyCount={pv.replyCount} 142 142 + quoteCount={pv.quoteCount} 137 143 /> 138 144 </div> 139 145 ); ··· 150 156 return ( 151 157 <BskyPost 152 158 key={`mention-${index}`} 159 159 + uri={pv.uri} 153 160 rkey={new AtUri(pv.uri).rkey} 154 161 content={pv.record.text as string} 155 162 user={pv.author.displayName || pv.author.handle} 156 163 profile={pv.author} 157 164 handle={pv.author.handle} 165 165 + replyCount={pv.replyCount} 166 166 + quoteCount={pv.quoteCount} 158 167 /> 159 168 ); 160 169 })} ··· 174 183 }) => { 175 184 let isMobile = useIsMobile(); 176 185 const data = useContext(PostPageContext); 186 186 + const document_uri = data?.uri; 177 187 178 188 let record = data?.data as PubLeafletDocument.Record; 179 189 let page: PubLeafletPagesLinearDocument.Main | undefined = ( ··· 201 211 className="quoteSectionQuote text-secondary text-sm text-left hover:cursor-pointer" 202 212 onClick={(e) => { 203 213 if (props.position.pageId) 204 204 - flushSync(() => openPage(undefined, props.position.pageId!)); 214 214 + flushSync(() => openPage(undefined, { type: "doc", id: props.position.pageId! })); 205 215 let scrollMargin = isMobile 206 216 ? 16 207 217 : e.currentTarget.getBoundingClientRect().top; 208 208 - let scrollContainer = window.document.getElementById("post-page"); 218 218 + let scrollContainerId = `post-page-${props.position.pageId ?? document_uri}`; 219 219 + let scrollContainer = window.document.getElementById(scrollContainerId); 209 220 let el = window.document.getElementById( 210 221 props.position.start.block.join("."), 211 222 ); ··· 239 250 }; 240 251 241 252 export const BskyPost = (props: { 253 253 + uri: string; 242 254 rkey: string; 243 255 content: string; 244 256 user: string; 245 257 handle: string; 246 258 profile: ProfileViewBasic; 259 259 + replyCount?: number; 260 260 + quoteCount?: number; 247 261 }) => { 262 262 + const handleOpenThread = () => { 263 263 + openPage(undefined, { type: "thread", uri: props.uri }); 264 264 + }; 265 265 + 248 266 return ( 249 249 - <a 250 250 - target="_blank" 251 251 - href={`https://bsky.app/profile/${props.handle}/post/${props.rkey}`} 252 252 - className="quoteSectionBskyItem px-2 flex gap-[6px] hover:no-underline font-normal" 267 267 + <div 268 268 + onClick={handleOpenThread} 269 269 + className="quoteSectionBskyItem px-2 flex gap-[6px] hover:no-underline font-normal cursor-pointer hover:bg-bg-page rounded" 253 270 > 254 271 {props.profile.avatar && ( 255 272 <img 256 256 - className="rounded-full w-6 h-6" 273 273 + className="rounded-full w-6 h-6 shrink-0" 257 274 src={props.profile.avatar} 258 275 alt={props.profile.displayName} 259 276 /> 260 277 )} 261 261 - <div className="flex flex-col"> 262 262 - <div className="flex items-center gap-2"> 278 278 + <div className="flex flex-col min-w-0"> 279 279 + <div className="flex items-center gap-2 flex-wrap"> 263 280 <div className="font-bold">{props.user}</div> 264 264 - <div className="text-tertiary">@{props.handle}</div> 281 281 + <a 282 282 + className="text-tertiary hover:underline" 283 283 + href={`https://bsky.app/profile/${props.handle}`} 284 284 + target="_blank" 285 285 + onClick={(e) => e.stopPropagation()} 286 286 + > 287 287 + @{props.handle} 288 288 + </a> 265 289 </div> 266 290 <div className="text-primary">{props.content}</div> 291 291 + <div className="flex gap-2 items-center mt-1"> 292 292 + {props.replyCount != null && props.replyCount > 0 && ( 293 293 + <ThreadLink 294 294 + threadUri={props.uri} 295 295 + onClick={(e) => e.stopPropagation()} 296 296 + className="flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast" 297 297 + > 298 298 + <CommentTiny /> 299 299 + {props.replyCount} {props.replyCount === 1 ? "reply" : "replies"} 300 300 + </ThreadLink> 301 301 + )} 302 302 + {props.quoteCount != null && props.quoteCount > 0 && ( 303 303 + <QuotesLink 304 304 + postUri={props.uri} 305 305 + onClick={(e) => e.stopPropagation()} 306 306 + className="flex items-center gap-1 text-tertiary text-xs hover:text-accent-contrast" 307 307 + > 308 308 + <QuoteTiny /> 309 309 + {props.quoteCount} {props.quoteCount === 1 ? "quote" : "quotes"} 310 310 + </QuotesLink> 311 311 + )} 312 312 + </div> 267 313 </div> 268 268 - </a> 314 314 + </div> 269 315 ); 270 316 }; 271 317

+8 -4

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

··· 14 14 ExpandedInteractions, 15 15 getCommentCount, 16 16 getQuoteCount, 17 17 - Interactions, 18 17 } from "./Interactions/Interactions"; 19 18 import { PostContent } from "./PostContent"; 20 19 import { PostHeader } from "./PostHeader/PostHeader"; ··· 25 24 import { decodeQuotePosition } from "./quotePosition"; 26 25 import { PollData } from "./fetchPollData"; 27 26 import { SharedPageProps } from "./PostPages"; 27 27 + import { PostPrevNextButtons } from "./PostPrevNextButtons"; 28 28 29 29 export function LinearDocumentPage({ 30 30 blocks, ··· 56 56 57 57 const isSubpage = !!pageId; 58 58 59 59 + console.log("prev/next?: " + preferences.showPrevNext); 60 60 + 59 61 return ( 60 62 <> 61 63 <PageWrapper 62 64 pageType="doc" 63 65 fullPageScroll={fullPageScroll} 64 64 - cardBorderHidden={!hasPageBackground} 65 65 - id={pageId ? `post-page-${pageId}` : "post-page"} 66 66 + id={`post-page-${pageId ?? document_uri}`} 66 67 drawerOpen={ 67 68 !!drawer && (pageId ? drawer.pageId === pageId : !drawer.pageId) 68 69 } ··· 84 85 did={did} 85 86 prerenderedCodeBlocks={prerenderedCodeBlocks} 86 87 /> 87 87 - 88 88 + <PostPrevNextButtons 89 89 + showPrevNext={preferences.showPrevNext && !isSubpage} 90 90 + /> 88 91 <ExpandedInteractions 89 92 pageId={pageId} 90 93 showComments={preferences.showComments} 94 94 + showMentions={preferences.showMentions} 91 95 commentsCount={getCommentCount(document, pageId) || 0} 92 96 quotesCount={getQuoteCount(document, pageId) || 0} 93 97 />

+19 -9

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

··· 20 20 } from "lexicons/api"; 21 21 22 22 import { blobRefToSrc } from "src/utils/blobRefToSrc"; 23 23 - import { TextBlock } from "./TextBlock"; 23 23 + import { TextBlock } from "./Blocks/TextBlock"; 24 24 import { Popover } from "components/Popover"; 25 25 import { theme } from "tailwind.config"; 26 26 import { ImageAltSmall } from "components/Icons/ImageAlt"; 27 27 - import { StaticMathBlock } from "./StaticMathBlock"; 28 28 - import { PubCodeBlock } from "./PubCodeBlock"; 27 27 + import { StaticMathBlock } from "./Blocks/StaticMathBlock"; 28 28 + import { PubCodeBlock } from "./Blocks/PubCodeBlock"; 29 29 import { AppBskyFeedDefs } from "@atproto/api"; 30 30 - import { PubBlueskyPostBlock } from "./PublishBskyPostBlock"; 30 30 + import { PubBlueskyPostBlock } from "./Blocks/PublishBskyPostBlock"; 31 31 import { openPage } from "./PostPages"; 32 32 import { PageLinkBlock } from "components/Blocks/PageLinkBlock"; 33 33 - import { PublishedPageLinkBlock } from "./PublishedPageBlock"; 34 34 - import { PublishedPollBlock } from "./PublishedPollBlock"; 33 33 + import { PublishedPageLinkBlock } from "./Blocks/PublishedPageBlock"; 34 34 + import { PublishedPollBlock } from "./Blocks/PublishedPollBlock"; 35 35 import { PollData } from "./fetchPollData"; 36 36 import { ButtonPrimary } from "components/Buttons"; 37 37 ··· 173 173 let uri = b.block.postRef.uri; 174 174 let post = bskyPostData.find((p) => p.uri === uri); 175 175 if (!post) return <div>no prefetched post rip</div>; 176 176 - return <PubBlueskyPostBlock post={post} className={className} />; 176 176 + return ( 177 177 + <PubBlueskyPostBlock 178 178 + post={post} 179 179 + className={className} 180 180 + pageId={pageId} 181 181 + /> 182 182 + ); 177 183 } 178 184 case PubLeafletBlocksIframe.isMain(b.block): { 179 185 return ( ··· 324 330 return ( 325 331 // all this margin stuff is a highly unfortunate hack so that the border-l on blockquote is the height of just the text rather than the height of the block, which includes padding. 326 332 <blockquote 327 327 - className={`blockquoteBlock py-0! mb-2! ${className} ${PubLeafletBlocksBlockquote.isMain(previousBlock?.block) ? "-mt-2! pt-3!" : "mt-1!"}`} 333 333 + className={`blockquote py-0! mb-2! ${className} ${PubLeafletBlocksBlockquote.isMain(previousBlock?.block) ? "-mt-2! pt-3!" : "mt-1!"}`} 328 334 {...blockProps} 329 335 > 330 336 <TextBlock ··· 339 345 } 340 346 case PubLeafletBlocksText.isMain(b.block): 341 347 return ( 342 342 - <p className={`textBlock ${className}`} {...blockProps}> 348 348 + <p 349 349 + className={`textBlock ${className} ${b.block.textSize === "small" ? "text-sm text-secondary" : b.block.textSize === "large" ? "text-lg" : ""}`} 350 350 + {...blockProps} 351 351 + > 343 352 <TextBlock 344 353 facets={b.block.facets} 345 354 plaintext={b.block.plaintext} ··· 349 358 /> 350 359 </p> 351 360 ); 361 361 + 352 362 case PubLeafletBlocksHeader.isMain(b.block): { 353 363 if (b.block.level === 1) 354 364 return (

+14 -12

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

··· 18 18 import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 19 19 import Post from "app/p/[didOrHandle]/[rkey]/l-quote/[quote]/page"; 20 20 import { Separator } from "components/Layout"; 21 21 + import { ProfilePopover } from "components/ProfilePopover"; 21 22 22 23 export function PostHeader(props: { 23 24 data: PostPageData; 24 25 profile: ProfileViewDetailed; 25 25 - preferences: { showComments?: boolean }; 26 26 + preferences: { showComments?: boolean; showMentions?: boolean }; 26 27 }) { 27 28 let { identity } = useIdentityData(); 28 29 let document = props.data; ··· 72 73 <> 73 74 <div className="flex flex-row gap-2 items-center"> 74 75 {profile ? ( 75 75 - <> 76 76 - <a 77 77 - className="text-tertiary" 78 78 - href={`https://bsky.app/profile/${profile.handle}`} 79 79 - > 80 80 - {profile.displayName || profile.handle} 81 81 - </a> 82 82 - </> 76 76 + <ProfilePopover 77 77 + didOrHandle={profile.did} 78 78 + trigger={ 79 79 + <span className="text-tertiary hover:underline"> 80 80 + {profile.displayName || profile.handle} 81 81 + </span> 82 82 + } 83 83 + /> 83 84 ) : null} 84 85 {record.publishedAt ? ( 85 86 <> ··· 90 91 </div> 91 92 <Interactions 92 93 showComments={props.preferences.showComments} 94 94 + showMentions={props.preferences.showMentions} 93 95 quotesCount={getQuoteCount(document) || 0} 94 96 commentsCount={getCommentCount(document) || 0} 95 97 /> ··· 107 109 }) => { 108 110 return ( 109 111 <div 110 110 - className="postHeader max-w-prose w-full flex flex-col px-3 sm:px-4 sm:pt-3 pt-2 pb-5" 112 112 + className="postHeader w-full flex flex-col px-3 sm:px-4 sm:pt-3 pt-2 pb-5" 111 113 id="post-header" 112 114 > 113 115 <div className="pubInfo flex text-accent-contrast font-bold justify-between w-full"> ··· 119 121 {props.postTitle ? props.postTitle : "Untitled"} 120 122 </h2> 121 123 {props.postDescription ? ( 122 122 - <p className="postDescription italic text-secondary outline-hidden bg-transparent pt-1"> 124 124 + <div className="postDescription italic text-secondary outline-hidden bg-transparent pt-1"> 123 125 {props.postDescription} 124 124 - </p> 126 126 + </div> 125 127 ) : null} 126 128 <div className="postInfo text-sm text-tertiary pt-3 flex gap-1 flex-wrap justify-between"> 127 129 {props.postInfo}

+118

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

··· 1 1 + "use client"; 2 2 + import { AppBskyFeedDefs } from "@atproto/api"; 3 3 + import { preload } from "swr"; 4 4 + import { openPage, OpenPage } from "./PostPages"; 5 5 + 6 6 + type ThreadViewPost = AppBskyFeedDefs.ThreadViewPost; 7 7 + type NotFoundPost = AppBskyFeedDefs.NotFoundPost; 8 8 + type BlockedPost = AppBskyFeedDefs.BlockedPost; 9 9 + type ThreadType = ThreadViewPost | NotFoundPost | BlockedPost; 10 10 + 11 11 + type PostView = AppBskyFeedDefs.PostView; 12 12 + 13 13 + export interface QuotesResponse { 14 14 + uri: string; 15 15 + cid?: string; 16 16 + cursor?: string; 17 17 + posts: PostView[]; 18 18 + } 19 19 + 20 20 + // Thread fetching 21 21 + export const getThreadKey = (uri: string) => `thread:${uri}`; 22 22 + 23 23 + export async function fetchThread(uri: string): Promise<ThreadType> { 24 24 + const params = new URLSearchParams({ uri }); 25 25 + const response = await fetch(`/api/bsky/thread?${params.toString()}`); 26 26 + 27 27 + if (!response.ok) { 28 28 + throw new Error("Failed to fetch thread"); 29 29 + } 30 30 + 31 31 + return response.json(); 32 32 + } 33 33 + 34 34 + export const prefetchThread = (uri: string) => { 35 35 + preload(getThreadKey(uri), () => fetchThread(uri)); 36 36 + }; 37 37 + 38 38 + // Quotes fetching 39 39 + export const getQuotesKey = (uri: string) => `quotes:${uri}`; 40 40 + 41 41 + export async function fetchQuotes(uri: string): Promise<QuotesResponse> { 42 42 + const params = new URLSearchParams({ uri }); 43 43 + const response = await fetch(`/api/bsky/quotes?${params.toString()}`); 44 44 + 45 45 + if (!response.ok) { 46 46 + throw new Error("Failed to fetch quotes"); 47 47 + } 48 48 + 49 49 + return response.json(); 50 50 + } 51 51 + 52 52 + export const prefetchQuotes = (uri: string) => { 53 53 + preload(getQuotesKey(uri), () => fetchQuotes(uri)); 54 54 + }; 55 55 + 56 56 + // Link component for opening thread pages with prefetching 57 57 + export function ThreadLink(props: { 58 58 + threadUri: 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; 65 65 + 66 66 + const handleClick = (e: React.MouseEvent) => { 67 67 + onClick?.(e); 68 68 + if (e.defaultPrevented) return; 69 69 + openPage(parent, { type: "thread", uri: threadUri }); 70 70 + }; 71 71 + 72 72 + const handlePrefetch = () => { 73 73 + prefetchThread(threadUri); 74 74 + }; 75 75 + 76 76 + return ( 77 77 + <button 78 78 + className={className} 79 79 + onClick={handleClick} 80 80 + onMouseEnter={handlePrefetch} 81 81 + onPointerDown={handlePrefetch} 82 82 + > 83 83 + {children} 84 84 + </button> 85 85 + ); 86 86 + } 87 87 + 88 88 + // Link component for opening quotes pages with prefetching 89 89 + export function QuotesLink(props: { 90 90 + postUri: string; 91 91 + parent?: OpenPage; 92 92 + children: React.ReactNode; 93 93 + className?: string; 94 94 + onClick?: (e: React.MouseEvent) => void; 95 95 + }) { 96 96 + const { postUri, parent, children, className, onClick } = props; 97 97 + 98 98 + const handleClick = (e: React.MouseEvent) => { 99 99 + onClick?.(e); 100 100 + if (e.defaultPrevented) return; 101 101 + openPage(parent, { type: "quotes", uri: postUri }); 102 102 + }; 103 103 + 104 104 + const handlePrefetch = () => { 105 105 + prefetchQuotes(postUri); 106 106 + }; 107 107 + 108 108 + return ( 109 109 + <button 110 110 + className={className} 111 111 + onClick={handleClick} 112 112 + onMouseEnter={handlePrefetch} 113 113 + onPointerDown={handlePrefetch} 114 114 + > 115 115 + {children} 116 116 + </button> 117 117 + ); 118 118 + }

+130 -28

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

··· 19 19 import { Fragment, useEffect } from "react"; 20 20 import { flushSync } from "react-dom"; 21 21 import { scrollIntoView } from "src/utils/scrollIntoView"; 22 22 - import { useParams } from "next/navigation"; 22 22 + import { useParams, useSearchParams } from "next/navigation"; 23 23 import { decodeQuotePosition } from "./quotePosition"; 24 24 import { PollData } from "./fetchPollData"; 25 25 import { LinearDocumentPage } from "./LinearDocumentPage"; 26 26 import { CanvasPage } from "./CanvasPage"; 27 27 + import { ThreadPage as ThreadPageComponent } from "./ThreadPage"; 28 28 + import { BlueskyQuotesPage } from "./BlueskyQuotesPage"; 29 29 + 30 30 + // Page types 31 31 + export type DocPage = { type: "doc"; id: string }; 32 32 + export type ThreadPage = { type: "thread"; uri: string }; 33 33 + export type QuotesPage = { type: "quotes"; uri: string }; 34 34 + export type OpenPage = DocPage | ThreadPage | QuotesPage; 35 35 + 36 36 + // Get a stable key for a page 37 37 + const getPageKey = (page: OpenPage): string => { 38 38 + if (page.type === "doc") return page.id; 39 39 + if (page.type === "quotes") return `quotes:${page.uri}`; 40 40 + return `thread:${page.uri}`; 41 41 + }; 27 42 28 43 const usePostPageUIState = create(() => ({ 29 29 - pages: [] as string[], 44 44 + pages: [] as OpenPage[], 30 45 initialized: false, 31 46 })); 32 47 33 33 - export const useOpenPages = () => { 48 48 + export const useOpenPages = (): OpenPage[] => { 34 49 const { quote } = useParams(); 35 50 const state = usePostPageUIState((s) => s); 51 51 + const searchParams = useSearchParams(); 52 52 + const pageParam = searchParams.get("page"); 36 53 37 37 - if (!state.initialized && quote) { 38 38 - const decodedQuote = decodeQuotePosition(quote as string); 39 39 - if (decodedQuote?.pageId) { 40 40 - return [decodedQuote.pageId]; 54 54 + if (!state.initialized) { 55 55 + // Check for page search param first (for comment links) 56 56 + if (pageParam) { 57 57 + return [{ type: "doc", id: pageParam }]; 58 58 + } 59 59 + // Then check for quote param 60 60 + if (quote) { 61 61 + const decodedQuote = decodeQuotePosition(quote as string); 62 62 + if (decodedQuote?.pageId) { 63 63 + return [{ type: "doc", id: decodedQuote.pageId }]; 64 64 + } 41 65 } 42 66 } 43 67 ··· 46 70 47 71 export const useInitializeOpenPages = () => { 48 72 const { quote } = useParams(); 73 73 + const searchParams = useSearchParams(); 74 74 + const pageParam = searchParams.get("page"); 49 75 50 76 useEffect(() => { 51 77 const state = usePostPageUIState.getState(); 52 78 if (!state.initialized) { 79 79 + // Check for page search param first (for comment links) 80 80 + if (pageParam) { 81 81 + usePostPageUIState.setState({ 82 82 + pages: [{ type: "doc", id: pageParam }], 83 83 + initialized: true, 84 84 + }); 85 85 + return; 86 86 + } 87 87 + // Then check for quote param 53 88 if (quote) { 54 89 const decodedQuote = decodeQuotePosition(quote as string); 55 90 if (decodedQuote?.pageId) { 56 91 usePostPageUIState.setState({ 57 57 - pages: [decodedQuote.pageId], 92 92 + pages: [{ type: "doc", id: decodedQuote.pageId }], 58 93 initialized: true, 59 94 }); 60 95 return; ··· 63 98 // Mark as initialized even if no pageId found 64 99 usePostPageUIState.setState({ initialized: true }); 65 100 } 66 66 - }, [quote]); 101 101 + }, [quote, pageParam]); 67 102 }; 68 103 69 104 export const openPage = ( 70 70 - parent: string | undefined, 71 71 - page: string, 105 105 + parent: OpenPage | undefined, 106 106 + page: OpenPage, 72 107 options?: { scrollIntoView?: boolean }, 73 108 ) => { 109 109 + const pageKey = getPageKey(page); 110 110 + const parentKey = parent ? getPageKey(parent) : undefined; 111 111 + 74 112 flushSync(() => { 75 113 usePostPageUIState.setState((state) => { 76 76 - let parentPosition = state.pages.findIndex((s) => s == parent); 114 114 + let parentPosition = state.pages.findIndex( 115 115 + (s) => getPageKey(s) === parentKey, 116 116 + ); 77 117 return { 78 118 pages: 79 119 parentPosition === -1 ··· 85 125 }); 86 126 87 127 if (options?.scrollIntoView !== false) { 88 88 - scrollIntoView(`post-page-${page}`); 128 128 + scrollIntoView(`post-page-${pageKey}`); 89 129 } 90 130 }; 91 131 92 92 - export const closePage = (page: string) => 132 132 + export const closePage = (page: OpenPage) => { 133 133 + const pageKey = getPageKey(page); 93 134 usePostPageUIState.setState((state) => { 94 94 - let parentPosition = state.pages.findIndex((s) => s == page); 135 135 + let parentPosition = state.pages.findIndex( 136 136 + (s) => getPageKey(s) === pageKey, 137 137 + ); 95 138 return { 96 139 pages: state.pages.slice(0, parentPosition), 97 140 initialized: true, 98 141 }; 99 142 }); 143 143 + }; 100 144 101 145 // Shared props type for both page components 102 146 export type SharedPageProps = { 103 147 document: PostPageData; 104 148 did: string; 105 149 profile: ProfileViewDetailed; 106 106 - preferences: { showComments?: boolean }; 150 150 + preferences: { 151 151 + showComments?: boolean; 152 152 + showMentions?: boolean; 153 153 + showPrevNext?: boolean; 154 154 + }; 107 155 pubRecord?: PubLeafletPublication.Record; 108 156 theme?: PubLeafletPublication.Theme | null; 109 157 prerenderedCodeBlocks?: Map<string, string>; ··· 162 210 did: string; 163 211 prerenderedCodeBlocks?: Map<string, string>; 164 212 bskyPostData: AppBskyFeedDefs.PostView[]; 165 165 - preferences: { showComments?: boolean }; 213 213 + preferences: { 214 214 + showComments?: boolean; 215 215 + showMentions?: boolean; 216 216 + showPrevNext?: boolean; 217 217 + }; 166 218 pollData: PollData[]; 167 219 }) { 168 220 let drawer = useDrawerOpen(document_uri); ··· 217 269 218 270 {drawer && !drawer.pageId && ( 219 271 <InteractionDrawer 272 272 + showPageBackground={pubRecord?.theme?.showPageBackground} 220 273 document_uri={document.uri} 221 274 comments={ 222 275 pubRecord?.preferences?.showComments === false 223 276 ? [] 224 277 : document.comments_on_documents 225 278 } 226 226 - quotesAndMentions={quotesAndMentions} 279 279 + quotesAndMentions={ 280 280 + pubRecord?.preferences?.showMentions === false 281 281 + ? [] 282 282 + : quotesAndMentions 283 283 + } 227 284 did={did} 228 285 /> 229 286 )} 230 287 231 231 - {openPageIds.map((pageId) => { 288 288 + {openPageIds.map((openPage) => { 289 289 + const pageKey = getPageKey(openPage); 290 290 + 291 291 + // Handle thread pages 292 292 + if (openPage.type === "thread") { 293 293 + return ( 294 294 + <Fragment key={pageKey}> 295 295 + <SandwichSpacer /> 296 296 + <ThreadPageComponent 297 297 + threadUri={openPage.uri} 298 298 + pageId={pageKey} 299 299 + hasPageBackground={hasPageBackground} 300 300 + pageOptions={ 301 301 + <PageOptions 302 302 + onClick={() => closePage(openPage)} 303 303 + hasPageBackground={hasPageBackground} 304 304 + /> 305 305 + } 306 306 + /> 307 307 + </Fragment> 308 308 + ); 309 309 + } 310 310 + 311 311 + // Handle quotes pages 312 312 + if (openPage.type === "quotes") { 313 313 + return ( 314 314 + <Fragment key={pageKey}> 315 315 + <SandwichSpacer /> 316 316 + <BlueskyQuotesPage 317 317 + postUri={openPage.uri} 318 318 + pageId={pageKey} 319 319 + hasPageBackground={hasPageBackground} 320 320 + pageOptions={ 321 321 + <PageOptions 322 322 + onClick={() => closePage(openPage)} 323 323 + hasPageBackground={hasPageBackground} 324 324 + /> 325 325 + } 326 326 + /> 327 327 + </Fragment> 328 328 + ); 329 329 + } 330 330 + 331 331 + // Handle document pages 232 332 let page = record.pages.find( 233 333 (p) => 234 334 ( 235 335 p as 236 336 | PubLeafletPagesLinearDocument.Main 237 337 | PubLeafletPagesCanvas.Main 238 238 - ).id === pageId, 338 338 + ).id === openPage.id, 239 339 ) as 240 340 | PubLeafletPagesLinearDocument.Main 241 341 | PubLeafletPagesCanvas.Main ··· 244 344 if (!page) return null; 245 345 246 346 return ( 247 247 - <Fragment key={pageId}> 347 347 + <Fragment key={pageKey}> 248 348 <SandwichSpacer /> 249 349 <PageRenderer 250 350 page={page} ··· 253 353 pageId={page.id} 254 354 pageOptions={ 255 355 <PageOptions 256 256 - onClick={() => closePage(page.id!)} 356 356 + onClick={() => closePage(openPage)} 257 357 hasPageBackground={hasPageBackground} 258 358 /> 259 359 } 260 360 /> 261 361 {drawer && drawer.pageId === page.id && ( 262 362 <InteractionDrawer 363 363 + showPageBackground={pubRecord?.theme?.showPageBackground} 263 364 pageId={page.id} 264 365 document_uri={document.uri} 265 366 comments={ ··· 267 368 ? [] 268 369 : document.comments_on_documents 269 370 } 270 270 - quotesAndMentions={quotesAndMentions} 371 371 + quotesAndMentions={ 372 372 + pubRecord?.preferences?.showMentions === false 373 373 + ? [] 374 374 + : quotesAndMentions 375 375 + } 271 376 did={did} 272 377 /> 273 378 )} ··· 287 392 return ( 288 393 <div 289 394 className={`pageOptions w-fit z-10 290 290 - absolute sm:-right-[20px] right-3 sm:top-3 top-0 395 395 + absolute sm:-right-[19px] right-3 sm:top-3 top-0 291 396 flex sm:flex-col flex-row-reverse gap-1 items-start`} 292 397 > 293 293 - <PageOptionButton 294 294 - cardBorderHidden={!props.hasPageBackground} 295 295 - onClick={props.onClick} 296 296 - > 398 398 + <PageOptionButton onClick={props.onClick}> 297 399 <CloseTiny /> 298 400 </PageOptionButton> 299 401 </div>

+58

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

··· 1 1 + "use client"; 2 2 + import { PubLeafletDocument } from "lexicons/api"; 3 3 + import { usePublicationData } from "../dashboard/PublicationSWRProvider"; 4 4 + import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 5 5 + import { AtUri } from "@atproto/api"; 6 6 + import { useParams } from "next/navigation"; 7 7 + import { getPostPageData } from "./getPostPageData"; 8 8 + import { PostPageContext } from "./PostPageContext"; 9 9 + import { useContext } from "react"; 10 10 + import { SpeedyLink } from "components/SpeedyLink"; 11 11 + import { ArrowRightTiny } from "components/Icons/ArrowRightTiny"; 12 12 + 13 13 + export const PostPrevNextButtons = (props: { 14 14 + showPrevNext: boolean | undefined; 15 15 + }) => { 16 16 + let postData = useContext(PostPageContext); 17 17 + let pub = postData?.documents_in_publications[0]?.publications; 18 18 + 19 19 + if (!props.showPrevNext || !pub || !postData) return; 20 20 + 21 21 + function getPostLink(uri: string) { 22 22 + return pub && uri 23 23 + ? `${getPublicationURL(pub)}/${new AtUri(uri).rkey}` 24 24 + : "leaflet.pub/not-found"; 25 25 + } 26 26 + let prevPost = postData?.prevNext?.prev; 27 27 + let nextPost = postData?.prevNext?.next; 28 28 + 29 29 + return ( 30 30 + <div className="flex flex-col gap-1 w-full px-3 sm:px-4 pb-2 pt-2"> 31 31 + {/*<hr className="border-border-light" />*/} 32 32 + <div className="flex justify-between w-full gap-8 "> 33 33 + {nextPost ? ( 34 34 + <SpeedyLink 35 35 + href={getPostLink(nextPost.uri)} 36 36 + className="flex gap-1 items-center truncate min-w-0 basis-1/2" 37 37 + > 38 38 + <ArrowRightTiny className="rotate-180 shrink-0" /> 39 39 + <div className="min-w-0 truncate">{nextPost.title}</div> 40 40 + </SpeedyLink> 41 41 + ) : ( 42 42 + <div /> 43 43 + )} 44 44 + {prevPost ? ( 45 45 + <SpeedyLink 46 46 + href={getPostLink(prevPost.uri)} 47 47 + className="flex gap-1 items-center truncate min-w-0 basis-1/2 justify-end" 48 48 + > 49 49 + <div className="min-w-0 truncate">{prevPost.title}</div> 50 50 + <ArrowRightTiny className="shrink-0" /> 51 51 + </SpeedyLink> 52 52 + ) : ( 53 53 + <div /> 54 54 + )} 55 55 + </div> 56 56 + </div> 57 57 + ); 58 58 + };

-28

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

··· 1 1 - "use client"; 2 2 - 3 3 - import { PubLeafletBlocksCode } from "lexicons/api"; 4 4 - import { useLayoutEffect, useState } from "react"; 5 5 - import { codeToHtml, bundledLanguagesInfo, bundledThemesInfo } from "shiki"; 6 6 - 7 7 - export function PubCodeBlock({ 8 8 - block, 9 9 - prerenderedCode, 10 10 - }: { 11 11 - block: PubLeafletBlocksCode.Main; 12 12 - prerenderedCode?: string; 13 13 - }) { 14 14 - const [html, setHTML] = useState<string | null>(prerenderedCode || null); 15 15 - 16 16 - useLayoutEffect(() => { 17 17 - const lang = bundledLanguagesInfo.find((l) => l.id === block.language)?.id || "plaintext"; 18 18 - const theme = bundledThemesInfo.find((t) => t.id === block.syntaxHighlightingTheme)?.id || "github-light"; 19 19 - 20 20 - codeToHtml(block.plaintext, { lang, theme }).then(setHTML); 21 21 - }, [block]); 22 22 - return ( 23 23 - <div 24 24 - className="w-full min-h-[42px] my-2 rounded-md border-border-light outline-border-light selected-outline" 25 25 - dangerouslySetInnerHTML={{ __html: html || "" }} 26 26 - /> 27 27 - ); 28 28 - }

-142

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

··· 1 1 - import { PostView } from "@atproto/api/dist/client/types/app/bsky/feed/defs"; 2 2 - import { useEntitySetContext } from "components/EntitySetProvider"; 3 3 - import { useEffect, useState } from "react"; 4 4 - import { useEntity } from "src/replicache"; 5 5 - import { useUIState } from "src/useUIState"; 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 { Separator } from "components/Layout"; 10 10 - import { useHasPageLoaded } from "components/InitialPageLoadProvider"; 11 11 - import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 12 12 - import { CommentTiny } from "components/Icons/CommentTiny"; 13 13 - import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 14 14 - import { 15 15 - BlueskyEmbed, 16 16 - PostNotAvailable, 17 17 - } from "components/Blocks/BlueskyPostBlock/BlueskyEmbed"; 18 18 - import { BlueskyRichText } from "components/Blocks/BlueskyPostBlock/BlueskyRichText"; 19 19 - 20 20 - export const PubBlueskyPostBlock = (props: { 21 21 - post: PostView; 22 22 - className: string; 23 23 - }) => { 24 24 - let post = props.post; 25 25 - switch (true) { 26 26 - case AppBskyFeedDefs.isBlockedPost(post) || 27 27 - AppBskyFeedDefs.isBlockedAuthor(post) || 28 28 - AppBskyFeedDefs.isNotFoundPost(post): 29 29 - return ( 30 30 - <div className={`w-full`}> 31 31 - <PostNotAvailable /> 32 32 - </div> 33 33 - ); 34 34 - 35 35 - case AppBskyFeedDefs.validatePostView(post).success: 36 36 - let record = post.record as AppBskyFeedDefs.PostView["record"]; 37 37 - let facets = record.facets; 38 38 - 39 39 - // silliness to get the text and timestamp from the record with proper types 40 40 - let text: string | null = null; 41 41 - let timestamp: string | undefined = undefined; 42 42 - if (AppBskyFeedPost.isRecord(record)) { 43 43 - text = (record as AppBskyFeedPost.Record).text; 44 44 - timestamp = (record as AppBskyFeedPost.Record).createdAt; 45 45 - } 46 46 - 47 47 - //getting the url to the post 48 48 - let postId = post.uri.split("/")[4]; 49 49 - let url = `https://bsky.app/profile/${post.author.handle}/post/${postId}`; 50 50 - 51 51 - return ( 52 52 - <div 53 53 - className={` 54 54 - ${props.className} 55 55 - block-border 56 56 - mb-2 57 57 - flex flex-col gap-2 relative w-full overflow-hidden group/blueskyPostBlock sm:p-3 p-2 text-sm text-secondary bg-bg-page 58 58 - `} 59 59 - > 60 60 - {post.author && record && ( 61 61 - <> 62 62 - <div className="bskyAuthor w-full flex items-center gap-2"> 63 63 - {post.author.avatar && ( 64 64 - <img 65 65 - src={post.author?.avatar} 66 66 - alt={`${post.author?.displayName}'s avatar`} 67 67 - className="shink-0 w-8 h-8 rounded-full border border-border-light" 68 68 - /> 69 69 - )} 70 70 - <div className="grow flex flex-col gap-0.5 leading-tight"> 71 71 - <div className=" font-bold text-secondary"> 72 72 - {post.author?.displayName} 73 73 - </div> 74 74 - <a 75 75 - className="text-xs text-tertiary hover:underline" 76 76 - target="_blank" 77 77 - href={`https://bsky.app/profile/${post.author?.handle}`} 78 78 - > 79 79 - @{post.author?.handle} 80 80 - </a> 81 81 - </div> 82 82 - </div> 83 83 - 84 84 - <div className="flex flex-col gap-2 "> 85 85 - <div> 86 86 - <pre className="whitespace-pre-wrap"> 87 87 - {BlueskyRichText({ 88 88 - record: record as AppBskyFeedPost.Record | null, 89 89 - })} 90 90 - </pre> 91 91 - </div> 92 92 - {post.embed && ( 93 93 - <BlueskyEmbed embed={post.embed} postUrl={url} /> 94 94 - )} 95 95 - </div> 96 96 - </> 97 97 - )} 98 98 - <div className="w-full flex gap-2 items-center justify-between"> 99 99 - <ClientDate date={timestamp} /> 100 100 - <div className="flex gap-2 items-center"> 101 101 - {post.replyCount && post.replyCount > 0 && ( 102 102 - <> 103 103 - <a 104 104 - className="flex items-center gap-1 hover:no-underline" 105 105 - target="_blank" 106 106 - href={url} 107 107 - > 108 108 - {post.replyCount} 109 109 - <CommentTiny /> 110 110 - </a> 111 111 - <Separator classname="h-4" /> 112 112 - </> 113 113 - )} 114 114 - 115 115 - <a className="" target="_blank" href={url}> 116 116 - <BlueskyTiny /> 117 117 - </a> 118 118 - </div> 119 119 - </div> 120 120 - </div> 121 121 - ); 122 122 - } 123 123 - }; 124 124 - 125 125 - const ClientDate = (props: { date?: string }) => { 126 126 - let pageLoaded = useHasPageLoaded(); 127 127 - const formattedDate = useLocalizedDate( 128 128 - props.date || new Date().toISOString(), 129 129 - { 130 130 - month: "short", 131 131 - day: "numeric", 132 132 - year: "numeric", 133 133 - hour: "numeric", 134 134 - minute: "numeric", 135 135 - hour12: true, 136 136 - }, 137 137 - ); 138 138 - 139 139 - if (!pageLoaded) return null; 140 140 - 141 141 - return <div className="text-xs text-tertiary">{formattedDate}</div>; 142 142 - };

-331

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

··· 1 1 - "use client"; 2 2 - 3 3 - import { useEntity, useReplicache } from "src/replicache"; 4 4 - import { useUIState } from "src/useUIState"; 5 5 - import { CSSProperties, useContext, useRef } from "react"; 6 6 - import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 7 7 - import { PostContent, Block } from "./PostContent"; 8 8 - import { 9 9 - PubLeafletBlocksHeader, 10 10 - PubLeafletBlocksText, 11 11 - PubLeafletComment, 12 12 - PubLeafletPagesLinearDocument, 13 13 - PubLeafletPagesCanvas, 14 14 - PubLeafletPublication, 15 15 - } from "lexicons/api"; 16 16 - import { AppBskyFeedDefs } from "@atproto/api"; 17 17 - import { TextBlock } from "./TextBlock"; 18 18 - import { PostPageContext } from "./PostPageContext"; 19 19 - import { openPage, useOpenPages } from "./PostPages"; 20 20 - import { 21 21 - openInteractionDrawer, 22 22 - setInteractionState, 23 23 - useInteractionState, 24 24 - } from "./Interactions/Interactions"; 25 25 - import { CommentTiny } from "components/Icons/CommentTiny"; 26 26 - import { QuoteTiny } from "components/Icons/QuoteTiny"; 27 27 - import { CanvasBackgroundPattern } from "components/Canvas"; 28 28 - 29 29 - export function PublishedPageLinkBlock(props: { 30 30 - blocks: PubLeafletPagesLinearDocument.Block[] | PubLeafletPagesCanvas.Block[]; 31 31 - parentPageId: string | undefined; 32 32 - pageId: string; 33 33 - did: string; 34 34 - preview?: boolean; 35 35 - className?: string; 36 36 - prerenderedCodeBlocks?: Map<string, string>; 37 37 - bskyPostData: AppBskyFeedDefs.PostView[]; 38 38 - isCanvas?: boolean; 39 39 - pages?: (PubLeafletPagesLinearDocument.Main | PubLeafletPagesCanvas.Main)[]; 40 40 - }) { 41 41 - //switch to use actually state 42 42 - let openPages = useOpenPages(); 43 43 - let isOpen = openPages.includes(props.pageId); 44 44 - return ( 45 45 - <div 46 46 - className={`w-full cursor-pointer 47 47 - pageLinkBlockWrapper relative group/pageLinkBlock 48 48 - bg-bg-page shadow-sm 49 49 - flex overflow-clip 50 50 - block-border 51 51 - ${isOpen && "!border-tertiary"} 52 52 - ${props.className} 53 53 - `} 54 54 - onClick={(e) => { 55 55 - if (e.isDefaultPrevented()) return; 56 56 - if (e.shiftKey) return; 57 57 - e.preventDefault(); 58 58 - e.stopPropagation(); 59 59 - 60 60 - openPage(props.parentPageId, props.pageId); 61 61 - }} 62 62 - > 63 63 - {props.isCanvas ? ( 64 64 - <CanvasLinkBlock 65 65 - blocks={props.blocks as PubLeafletPagesCanvas.Block[]} 66 66 - did={props.did} 67 67 - pageId={props.pageId} 68 68 - bskyPostData={props.bskyPostData} 69 69 - pages={props.pages || []} 70 70 - /> 71 71 - ) : ( 72 72 - <DocLinkBlock 73 73 - {...props} 74 74 - blocks={props.blocks as PubLeafletPagesLinearDocument.Block[]} 75 75 - /> 76 76 - )} 77 77 - </div> 78 78 - ); 79 79 - } 80 80 - export function DocLinkBlock(props: { 81 81 - blocks: PubLeafletPagesLinearDocument.Block[]; 82 82 - pageId: string; 83 83 - parentPageId?: string; 84 84 - did: string; 85 85 - preview?: boolean; 86 86 - className?: string; 87 87 - prerenderedCodeBlocks?: Map<string, string>; 88 88 - bskyPostData: AppBskyFeedDefs.PostView[]; 89 89 - }) { 90 90 - let [title, description] = props.blocks 91 91 - .map((b) => b.block) 92 92 - .filter( 93 93 - (b) => PubLeafletBlocksText.isMain(b) || PubLeafletBlocksHeader.isMain(b), 94 94 - ); 95 95 - 96 96 - return ( 97 97 - <div 98 98 - style={{ "--list-marker-width": "20px" } as CSSProperties} 99 99 - className={` 100 100 - w-full h-[104px] 101 101 - `} 102 102 - > 103 103 - <> 104 104 - <div className="pageLinkBlockContent w-full flex overflow-clip cursor-pointer h-full"> 105 105 - <div className="my-2 ml-3 grow min-w-0 text-sm bg-transparent overflow-clip flex flex-col "> 106 106 - <div className="grow"> 107 107 - {title && ( 108 108 - <div 109 109 - className={`pageBlockOne outline-none resize-none align-top gap-2 ${title.$type === "pub.leaflet.blocks.header" ? "font-bold text-base" : ""}`} 110 110 - > 111 111 - <TextBlock 112 112 - facets={title.facets} 113 113 - plaintext={title.plaintext} 114 114 - index={[]} 115 115 - preview 116 116 - /> 117 117 - </div> 118 118 - )} 119 119 - {description && ( 120 120 - <div 121 121 - className={`pageBlockLineTwo outline-none resize-none align-top gap-2 ${description.$type === "pub.leaflet.blocks.header" ? "font-bold" : ""}`} 122 122 - > 123 123 - <TextBlock 124 124 - facets={description.facets} 125 125 - plaintext={description.plaintext} 126 126 - index={[]} 127 127 - preview 128 128 - /> 129 129 - </div> 130 130 - )} 131 131 - </div> 132 132 - 133 133 - <Interactions 134 134 - pageId={props.pageId} 135 135 - parentPageId={props.parentPageId} 136 136 - /> 137 137 - </div> 138 138 - {!props.preview && ( 139 139 - <PagePreview blocks={props.blocks} did={props.did} /> 140 140 - )} 141 141 - </div> 142 142 - </> 143 143 - </div> 144 144 - ); 145 145 - } 146 146 - 147 147 - export function PagePreview(props: { 148 148 - did: string; 149 149 - blocks: PubLeafletPagesLinearDocument.Block[]; 150 150 - }) { 151 151 - let previewRef = useRef<HTMLDivElement | null>(null); 152 152 - let { rootEntity } = useReplicache(); 153 153 - let data = useContext(PostPageContext); 154 154 - let theme = data?.theme; 155 155 - let pageWidth = `var(--page-width-unitless)`; 156 156 - let cardBorderHidden = !theme?.showPageBackground; 157 157 - return ( 158 158 - <div 159 159 - ref={previewRef} 160 160 - className={`pageLinkBlockPreview w-[120px] overflow-clip mx-3 mt-3 -mb-2 border rounded-md shrink-0 border-border-light flex flex-col gap-0.5 rotate-[4deg] origin-center ${cardBorderHidden ? "" : "bg-bg-page"}`} 161 161 - > 162 162 - <div 163 163 - className="absolute top-0 left-0 origin-top-left pointer-events-none " 164 164 - style={{ 165 165 - width: `calc(1px * ${pageWidth})`, 166 166 - height: `calc(100vh - 64px)`, 167 167 - transform: `scale(calc((120 / ${pageWidth} )))`, 168 168 - backgroundColor: "rgba(var(--bg-page), var(--bg-page-alpha))", 169 169 - }} 170 170 - > 171 171 - {!cardBorderHidden && ( 172 172 - <div 173 173 - className={`pageLinkBlockBackground 174 174 - absolute top-0 left-0 right-0 bottom-0 175 175 - pointer-events-none 176 176 - `} 177 177 - /> 178 178 - )} 179 179 - <PostContent 180 180 - pollData={[]} 181 181 - pages={[]} 182 182 - did={props.did} 183 183 - blocks={props.blocks} 184 184 - preview 185 185 - bskyPostData={[]} 186 186 - /> 187 187 - </div> 188 188 - </div> 189 189 - ); 190 190 - } 191 191 - 192 192 - const Interactions = (props: { pageId: string; parentPageId?: string }) => { 193 193 - const data = useContext(PostPageContext); 194 194 - const document_uri = data?.uri; 195 195 - if (!document_uri) 196 196 - throw new Error("document_uri not available in PostPageContext"); 197 197 - let comments = data.comments_on_documents.filter( 198 198 - (c) => (c.record as PubLeafletComment.Record)?.onPage === props.pageId, 199 199 - ).length; 200 200 - let quotes = data.document_mentions_in_bsky.filter((q) => 201 201 - q.link.includes(props.pageId), 202 202 - ).length; 203 203 - 204 204 - let { drawerOpen, drawer, pageId } = useInteractionState(document_uri); 205 205 - 206 206 - return ( 207 207 - <div 208 208 - className={`flex gap-2 text-tertiary text-sm absolute bottom-2 bg-bg-page`} 209 209 - > 210 210 - {quotes > 0 && ( 211 211 - <button 212 212 - className={`flex gap-1 items-center`} 213 213 - onClick={(e) => { 214 214 - e.preventDefault(); 215 215 - e.stopPropagation(); 216 216 - openPage(props.parentPageId, props.pageId, { 217 217 - scrollIntoView: false, 218 218 - }); 219 219 - if (!drawerOpen || drawer !== "quotes") 220 220 - openInteractionDrawer("quotes", document_uri, props.pageId); 221 221 - else setInteractionState(document_uri, { drawerOpen: false }); 222 222 - }} 223 223 - > 224 224 - <span className="sr-only">Page quotes</span> 225 225 - <QuoteTiny aria-hidden /> {quotes}{" "} 226 226 - </button> 227 227 - )} 228 228 - {comments > 0 && ( 229 229 - <button 230 230 - className={`flex gap-1 items-center`} 231 231 - onClick={(e) => { 232 232 - e.preventDefault(); 233 233 - e.stopPropagation(); 234 234 - openPage(props.parentPageId, props.pageId, { 235 235 - scrollIntoView: false, 236 236 - }); 237 237 - if (!drawerOpen || drawer !== "comments" || pageId !== props.pageId) 238 238 - openInteractionDrawer("comments", document_uri, props.pageId); 239 239 - else setInteractionState(document_uri, { drawerOpen: false }); 240 240 - }} 241 241 - > 242 242 - <span className="sr-only">Page comments</span> 243 243 - <CommentTiny aria-hidden /> {comments}{" "} 244 244 - </button> 245 245 - )} 246 246 - </div> 247 247 - ); 248 248 - }; 249 249 - 250 250 - const CanvasLinkBlock = (props: { 251 251 - blocks: PubLeafletPagesCanvas.Block[]; 252 252 - did: string; 253 253 - pageId: string; 254 254 - bskyPostData: AppBskyFeedDefs.PostView[]; 255 255 - pages: (PubLeafletPagesLinearDocument.Main | PubLeafletPagesCanvas.Main)[]; 256 256 - }) => { 257 257 - let pageWidth = `var(--page-width-unitless)`; 258 258 - let height = 259 259 - props.blocks.length > 0 ? Math.max(...props.blocks.map((b) => b.y), 0) : 0; 260 260 - 261 261 - return ( 262 262 - <div 263 263 - style={{ contain: "size layout paint" }} 264 264 - className={`pageLinkBlockPreview shrink-0 h-[200px] w-full overflow-clip relative`} 265 265 - > 266 266 - <div 267 267 - className={`absolute top-0 left-0 origin-top-left pointer-events-none w-full`} 268 268 - style={{ 269 269 - width: `calc(1px * ${pageWidth})`, 270 270 - height: "calc(1150px * 2)", 271 271 - transform: `scale(calc(((${pageWidth} - 36) / 1272 )))`, 272 272 - }} 273 273 - > 274 274 - <div 275 275 - style={{ 276 276 - minHeight: height + 512, 277 277 - contain: "size layout paint", 278 278 - }} 279 279 - className="relative h-full w-[1272px]" 280 280 - > 281 281 - <div className="w-full h-full pointer-events-none"> 282 282 - <CanvasBackgroundPattern pattern="grid" /> 283 283 - </div> 284 284 - {props.blocks 285 285 - .sort((a, b) => { 286 286 - if (a.y === b.y) { 287 287 - return a.x - b.x; 288 288 - } 289 289 - return a.y - b.y; 290 290 - }) 291 291 - .map((canvasBlock, index) => { 292 292 - let { x, y, width, rotation } = canvasBlock; 293 293 - let transform = `translate(${x}px, ${y}px)${rotation ? ` rotate(${rotation}deg)` : ""}`; 294 294 - 295 295 - // Wrap the block in a LinearDocument.Block structure for compatibility 296 296 - let linearBlock: PubLeafletPagesLinearDocument.Block = { 297 297 - $type: "pub.leaflet.pages.linearDocument#block", 298 298 - block: canvasBlock.block, 299 299 - }; 300 300 - 301 301 - return ( 302 302 - <div 303 303 - key={index} 304 304 - className="absolute rounded-lg flex items-stretch origin-center p-3" 305 305 - style={{ 306 306 - top: 0, 307 307 - left: 0, 308 308 - width, 309 309 - transform, 310 310 - }} 311 311 - > 312 312 - <div className="contents"> 313 313 - <Block 314 314 - pollData={[]} 315 315 - pageId={props.pageId} 316 316 - pages={props.pages} 317 317 - bskyPostData={props.bskyPostData} 318 318 - block={linearBlock} 319 319 - did={props.did} 320 320 - index={[index]} 321 321 - preview={true} 322 322 - /> 323 323 - </div> 324 324 - </div> 325 325 - ); 326 326 - })} 327 327 - </div> 328 328 - </div> 329 329 - </div> 330 330 - ); 331 331 - };

-346

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

··· 1 1 - "use client"; 2 2 - 3 3 - import { 4 4 - PubLeafletBlocksPoll, 5 5 - PubLeafletPollDefinition, 6 6 - PubLeafletPollVote, 7 7 - } from "lexicons/api"; 8 8 - import { useState, useEffect } from "react"; 9 9 - import { ButtonPrimary, ButtonSecondary } from "components/Buttons"; 10 10 - import { useIdentityData } from "components/IdentityProvider"; 11 11 - import { AtpAgent } from "@atproto/api"; 12 12 - import { voteOnPublishedPoll } from "./voteOnPublishedPoll"; 13 13 - import { PollData } from "./fetchPollData"; 14 14 - import { Popover } from "components/Popover"; 15 15 - import LoginForm from "app/login/LoginForm"; 16 16 - import { BlueskyTiny } from "components/Icons/BlueskyTiny"; 17 17 - import { getVoterIdentities, VoterIdentity } from "./getVoterIdentities"; 18 18 - import { Json } from "supabase/database.types"; 19 19 - import { InfoSmall } from "components/Icons/InfoSmall"; 20 20 - 21 21 - // Helper function to extract the first option from a vote record 22 22 - const getVoteOption = (voteRecord: any): string | null => { 23 23 - try { 24 24 - const record = voteRecord as PubLeafletPollVote.Record; 25 25 - return record.option && record.option.length > 0 ? record.option[0] : null; 26 26 - } catch { 27 27 - return null; 28 28 - } 29 29 - }; 30 30 - 31 31 - export const PublishedPollBlock = (props: { 32 32 - block: PubLeafletBlocksPoll.Main; 33 33 - pollData: PollData; 34 34 - className?: string; 35 35 - }) => { 36 36 - const { identity } = useIdentityData(); 37 37 - const [selectedOption, setSelectedOption] = useState<string | null>(null); 38 38 - const [isVoting, setIsVoting] = useState(false); 39 39 - const [showResults, setShowResults] = useState(false); 40 40 - const [optimisticVote, setOptimisticVote] = useState<{ 41 41 - option: string; 42 42 - voter_did: string; 43 43 - } | null>(null); 44 44 - let pollRecord = props.pollData.record as PubLeafletPollDefinition.Record; 45 45 - let [isClient, setIsClient] = useState(false); 46 46 - useEffect(() => { 47 47 - setIsClient(true); 48 48 - }, []); 49 49 - 50 50 - const handleVote = async () => { 51 51 - if (!selectedOption || !identity?.atp_did) return; 52 52 - 53 53 - setIsVoting(true); 54 54 - 55 55 - // Optimistically add the vote 56 56 - setOptimisticVote({ 57 57 - option: selectedOption, 58 58 - voter_did: identity.atp_did, 59 59 - }); 60 60 - setShowResults(true); 61 61 - 62 62 - try { 63 63 - const result = await voteOnPublishedPoll( 64 64 - props.block.pollRef.uri, 65 65 - props.block.pollRef.cid, 66 66 - selectedOption, 67 67 - ); 68 68 - 69 69 - if (!result.success) { 70 70 - console.error("Failed to vote:", result.error); 71 71 - // Revert optimistic update on failure 72 72 - setOptimisticVote(null); 73 73 - setShowResults(false); 74 74 - } 75 75 - } catch (error) { 76 76 - console.error("Failed to vote:", error); 77 77 - // Revert optimistic update on failure 78 78 - setOptimisticVote(null); 79 79 - setShowResults(false); 80 80 - } finally { 81 81 - setIsVoting(false); 82 82 - } 83 83 - }; 84 84 - 85 85 - const hasVoted = 86 86 - !!identity?.atp_did && 87 87 - (!!props.pollData?.atp_poll_votes.find( 88 88 - (v) => v.voter_did === identity?.atp_did, 89 89 - ) || 90 90 - !!optimisticVote); 91 91 - let isCreator = 92 92 - identity?.atp_did && props.pollData.uri.includes(identity?.atp_did); 93 93 - const displayResults = showResults || hasVoted; 94 94 - 95 95 - return ( 96 96 - <div 97 97 - className={`poll flex flex-col gap-2 p-3 w-full ${props.className} block-border`} 98 98 - style={{ 99 99 - backgroundColor: 100 100 - "color-mix(in oklab, rgb(var(--accent-1)), rgb(var(--bg-page)) 85%)", 101 101 - }} 102 102 - > 103 103 - {displayResults ? ( 104 104 - <> 105 105 - <PollResults 106 106 - pollData={props.pollData} 107 107 - hasVoted={hasVoted} 108 108 - setShowResults={setShowResults} 109 109 - optimisticVote={optimisticVote} 110 110 - /> 111 111 - {!hasVoted && ( 112 112 - <div className="flex justify-start"> 113 113 - <button 114 114 - className="w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 115 115 - onClick={() => setShowResults(false)} 116 116 - > 117 117 - Back to Voting 118 118 - </button> 119 119 - </div> 120 120 - )} 121 121 - </> 122 122 - ) : ( 123 123 - <> 124 124 - {pollRecord.options.map((option, index) => ( 125 125 - <PollOptionButton 126 126 - key={index} 127 127 - option={option} 128 128 - optionIndex={index.toString()} 129 129 - selected={selectedOption === index.toString()} 130 130 - onSelect={() => setSelectedOption(index.toString())} 131 131 - disabled={!identity?.atp_did} 132 132 - /> 133 133 - ))} 134 134 - <div className="flex flex-col-reverse sm:flex-row sm:justify-between gap-2 items-center pt-2"> 135 135 - <div className="text-sm text-tertiary">All votes are public</div> 136 136 - <div className="flex sm:gap-3 sm:flex-row flex-col-reverse sm:justify-end justify-center gap-1 items-center"> 137 137 - <button 138 138 - className="w-fit font-bold text-accent-contrast" 139 139 - onClick={() => setShowResults(!showResults)} 140 140 - > 141 141 - See Results 142 142 - </button> 143 143 - {identity?.atp_did ? ( 144 144 - <ButtonPrimary 145 145 - className="place-self-end" 146 146 - onClick={handleVote} 147 147 - disabled={!selectedOption || isVoting} 148 148 - > 149 149 - {isVoting ? "Voting..." : "Vote!"} 150 150 - </ButtonPrimary> 151 151 - ) : ( 152 152 - <Popover 153 153 - asChild 154 154 - trigger={ 155 155 - <ButtonPrimary className="place-self-center"> 156 156 - <BlueskyTiny /> Login to vote 157 157 - </ButtonPrimary> 158 158 - } 159 159 - > 160 160 - {isClient && ( 161 161 - <LoginForm 162 162 - text="Log in to vote on this poll!" 163 163 - noEmail 164 164 - redirectRoute={window?.location.href + "?refreshAuth"} 165 165 - /> 166 166 - )} 167 167 - </Popover> 168 168 - )} 169 169 - </div> 170 170 - </div> 171 171 - </> 172 172 - )} 173 173 - </div> 174 174 - ); 175 175 - }; 176 176 - 177 177 - const PollOptionButton = (props: { 178 178 - option: PubLeafletPollDefinition.Option; 179 179 - optionIndex: string; 180 180 - selected: boolean; 181 181 - onSelect: () => void; 182 182 - disabled?: boolean; 183 183 - }) => { 184 184 - const ButtonComponent = props.selected ? ButtonPrimary : ButtonSecondary; 185 185 - 186 186 - return ( 187 187 - <div className="flex gap-2 items-center"> 188 188 - <ButtonComponent 189 189 - className="pollOption grow max-w-full flex" 190 190 - onClick={props.onSelect} 191 191 - disabled={props.disabled} 192 192 - > 193 193 - {props.option.text} 194 194 - </ButtonComponent> 195 195 - </div> 196 196 - ); 197 197 - }; 198 198 - 199 199 - const PollResults = (props: { 200 200 - pollData: PollData; 201 201 - hasVoted: boolean; 202 202 - setShowResults: (show: boolean) => void; 203 203 - optimisticVote: { option: string; voter_did: string } | null; 204 204 - }) => { 205 205 - // Merge optimistic vote with actual votes 206 206 - const allVotes = props.optimisticVote 207 207 - ? [ 208 208 - ...props.pollData.atp_poll_votes, 209 209 - { 210 210 - voter_did: props.optimisticVote.voter_did, 211 211 - record: { 212 212 - $type: "pub.leaflet.poll.vote", 213 213 - option: [props.optimisticVote.option], 214 214 - }, 215 215 - }, 216 216 - ] 217 217 - : props.pollData.atp_poll_votes; 218 218 - 219 219 - const totalVotes = allVotes.length || 0; 220 220 - let pollRecord = props.pollData.record as PubLeafletPollDefinition.Record; 221 221 - let optionsWithCount = pollRecord.options.map((o, index) => ({ 222 222 - ...o, 223 223 - votes: allVotes.filter((v) => getVoteOption(v.record) == index.toString()), 224 224 - })); 225 225 - 226 226 - const highestVotes = Math.max(...optionsWithCount.map((o) => o.votes.length)); 227 227 - return ( 228 228 - <> 229 229 - {pollRecord.options.map((option, index) => { 230 230 - const voteRecords = allVotes.filter( 231 231 - (v) => getVoteOption(v.record) === index.toString(), 232 232 - ); 233 233 - const isWinner = totalVotes > 0 && voteRecords.length === highestVotes; 234 234 - 235 235 - return ( 236 236 - <PollResult 237 237 - key={index} 238 238 - option={option} 239 239 - votes={voteRecords.length} 240 240 - voteRecords={voteRecords} 241 241 - totalVotes={totalVotes} 242 242 - winner={isWinner} 243 243 - /> 244 244 - ); 245 245 - })} 246 246 - </> 247 247 - ); 248 248 - }; 249 249 - 250 250 - const VoterListPopover = (props: { 251 251 - votes: number; 252 252 - voteRecords: { voter_did: string; record: Json }[]; 253 253 - }) => { 254 254 - const [voterIdentities, setVoterIdentities] = useState<VoterIdentity[]>([]); 255 255 - const [isLoading, setIsLoading] = useState(false); 256 256 - const [hasFetched, setHasFetched] = useState(false); 257 257 - 258 258 - const handleOpenChange = async () => { 259 259 - if (!hasFetched && props.voteRecords.length > 0) { 260 260 - setIsLoading(true); 261 261 - setHasFetched(true); 262 262 - try { 263 263 - const dids = props.voteRecords.map((v) => v.voter_did); 264 264 - const identities = await getVoterIdentities(dids); 265 265 - setVoterIdentities(identities); 266 266 - } catch (error) { 267 267 - console.error("Failed to fetch voter identities:", error); 268 268 - } finally { 269 269 - setIsLoading(false); 270 270 - } 271 271 - } 272 272 - }; 273 273 - 274 274 - return ( 275 275 - <Popover 276 276 - trigger={ 277 277 - <button 278 278 - className="hover:underline cursor-pointer" 279 279 - disabled={props.votes === 0} 280 280 - > 281 281 - {props.votes} 282 282 - </button> 283 283 - } 284 284 - onOpenChange={handleOpenChange} 285 285 - className="w-64 max-h-80" 286 286 - > 287 287 - {isLoading ? ( 288 288 - <div className="flex justify-center py-4"> 289 289 - <div className="text-sm text-secondary">Loading...</div> 290 290 - </div> 291 291 - ) : ( 292 292 - <div className="flex flex-col gap-1 text-sm py-0.5"> 293 293 - {voterIdentities.map((voter) => ( 294 294 - <a 295 295 - key={voter.did} 296 296 - href={`https://bsky.app/profile/${voter.handle || voter.did}`} 297 297 - target="_blank" 298 298 - rel="noopener noreferrer" 299 299 - className="" 300 300 - > 301 301 - @{voter.handle || voter.did} 302 302 - </a> 303 303 - ))} 304 304 - </div> 305 305 - )} 306 306 - </Popover> 307 307 - ); 308 308 - }; 309 309 - 310 310 - const PollResult = (props: { 311 311 - option: PubLeafletPollDefinition.Option; 312 312 - votes: number; 313 313 - voteRecords: { voter_did: string; record: Json }[]; 314 314 - totalVotes: number; 315 315 - winner: boolean; 316 316 - }) => { 317 317 - return ( 318 318 - <div 319 319 - className={`pollResult relative grow py-0.5 px-2 border-accent-contrast rounded-md overflow-hidden ${props.winner ? "font-bold border-2" : "border"}`} 320 320 - > 321 321 - <div 322 322 - style={{ 323 323 - WebkitTextStroke: `${props.winner ? "6px" : "6px"} rgb(var(--bg-page))`, 324 324 - paintOrder: "stroke fill", 325 325 - }} 326 326 - className="pollResultContent text-accent-contrast relative flex gap-2 justify-between z-10" 327 327 - > 328 328 - <div className="grow max-w-full truncate">{props.option.text}</div> 329 329 - <VoterListPopover votes={props.votes} voteRecords={props.voteRecords} /> 330 330 - </div> 331 331 - <div className="pollResultBG absolute bg-bg-page w-full top-0 bottom-0 left-0 right-0 flex flex-row z-0"> 332 332 - <div 333 333 - className="bg-accent-contrast rounded-[2px] m-0.5" 334 334 - style={{ 335 335 - maskImage: "var(--hatchSVG)", 336 336 - maskRepeat: "repeat repeat", 337 337 - ...(props.votes === 0 338 338 - ? { width: "4px" } 339 339 - : { flexBasis: `${(props.votes / props.totalVotes) * 100}%` }), 340 340 - }} 341 341 - /> 342 342 - <div /> 343 343 - </div> 344 344 - </div> 345 345 - ); 346 346 - };

+3 -2

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

··· 186 186 <BlueskyLinkTiny className="shrink-0" /> 187 187 Bluesky 188 188 </a> 189 189 - <Separator classname="h-4" /> 189 189 + <Separator classname="h-4!" /> 190 190 <button 191 191 id="copy-quote-link" 192 192 className="flex gap-1 items-center hover:font-bold px-1" ··· 211 211 </button> 212 212 {pubRecord?.preferences?.showComments !== false && identity?.atp_did && ( 213 213 <> 214 214 - <Separator classname="h-4" /> 214 214 + <Separator classname="h-4! " /> 215 215 + 215 216 <button 216 217 className="flex gap-1 items-center hover:font-bold px-1" 217 218 onClick={() => {

-20

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

··· 1 1 - import { PubLeafletBlocksMath } from "lexicons/api"; 2 2 - import Katex from "katex"; 3 3 - import "katex/dist/katex.min.css"; 4 4 - 5 5 - export const StaticMathBlock = ({ 6 6 - block, 7 7 - }: { 8 8 - block: PubLeafletBlocksMath.Main; 9 9 - }) => { 10 10 - const html = Katex.renderToString(block.tex, { 11 11 - displayMode: true, 12 12 - output: "html", 13 13 - throwOnError: false, 14 14 - }); 15 15 - return ( 16 16 - <div className="math-block my-2"> 17 17 - <div dangerouslySetInnerHTML={{ __html: html }} /> 18 18 - </div> 19 19 - ); 20 20 - };

+12 -8

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

··· 12 12 PubLeafletPagesLinearDocument, 13 13 } from "lexicons/api"; 14 14 import { blobRefToSrc } from "src/utils/blobRefToSrc"; 15 15 - import { BaseTextBlock } from "./BaseTextBlock"; 16 16 - import { StaticMathBlock } from "./StaticMathBlock"; 15 15 + import { TextBlockCore, TextBlockCoreProps } from "./Blocks/TextBlockCore"; 16 16 + import { StaticMathBlock } from "./Blocks/StaticMathBlock"; 17 17 import { codeToHtml, bundledLanguagesInfo, bundledThemesInfo } from "shiki"; 18 18 + 19 19 + function StaticBaseTextBlock(props: Omit<TextBlockCoreProps, "renderers">) { 20 20 + return <TextBlockCore {...props} />; 21 21 + } 18 22 19 23 export function StaticPostContent({ 20 24 blocks, ··· 47 51 case PubLeafletBlocksBlockquote.isMain(b.block): { 48 52 return ( 49 53 <blockquote className={` blockquote `}> 50 50 - <BaseTextBlock 54 54 + <StaticBaseTextBlock 51 55 facets={b.block.facets} 52 56 plaintext={b.block.plaintext} 53 57 index={[]} ··· 116 120 case PubLeafletBlocksText.isMain(b.block): 117 121 return ( 118 122 <p> 119 119 - <BaseTextBlock 123 123 + <StaticBaseTextBlock 120 124 facets={b.block.facets} 121 125 plaintext={b.block.plaintext} 122 126 index={[]} ··· 127 131 if (b.block.level === 1) 128 132 return ( 129 133 <h1> 130 130 - <BaseTextBlock {...b.block} index={[]} /> 134 134 + <StaticBaseTextBlock {...b.block} index={[]} /> 131 135 </h1> 132 136 ); 133 137 if (b.block.level === 2) 134 138 return ( 135 139 <h2> 136 136 - <BaseTextBlock {...b.block} index={[]} /> 140 140 + <StaticBaseTextBlock {...b.block} index={[]} /> 137 141 </h2> 138 142 ); 139 143 if (b.block.level === 3) 140 144 return ( 141 145 <h3> 142 142 - <BaseTextBlock {...b.block} index={[]} /> 146 146 + <StaticBaseTextBlock {...b.block} index={[]} /> 143 147 </h3> 144 148 ); 145 149 // if (b.block.level === 4) return <h4>{b.block.plaintext}</h4>; 146 150 // if (b.block.level === 5) return <h5>{b.block.plaintext}</h5>; 147 151 return ( 148 152 <h6> 149 149 - <BaseTextBlock {...b.block} index={[]} /> 153 153 + <StaticBaseTextBlock {...b.block} index={[]} /> 150 154 </h6> 151 155 ); 152 156 }

-95

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

··· 1 1 - "use client"; 2 2 - import { UnicodeString } from "@atproto/api"; 3 3 - import { PubLeafletRichtextFacet } from "lexicons/api"; 4 4 - import { useMemo } from "react"; 5 5 - import { useHighlight } from "./useHighlight"; 6 6 - import { BaseTextBlock } from "./BaseTextBlock"; 7 7 - 8 8 - type Facet = PubLeafletRichtextFacet.Main; 9 9 - export function TextBlock(props: { 10 10 - plaintext: string; 11 11 - facets?: Facet[]; 12 12 - index: number[]; 13 13 - preview?: boolean; 14 14 - pageId?: string; 15 15 - }) { 16 16 - let children = []; 17 17 - let highlights = useHighlight(props.index, props.pageId); 18 18 - let facets = useMemo(() => { 19 19 - if (props.preview) return props.facets; 20 20 - let facets = [...(props.facets || [])]; 21 21 - for (let highlight of highlights) { 22 22 - const fragmentId = props.pageId 23 23 - ? `${props.pageId}~${props.index.join(".")}_${highlight.startOffset || 0}` 24 24 - : `${props.index.join(".")}_${highlight.startOffset || 0}`; 25 25 - facets = addFacet( 26 26 - facets, 27 27 - { 28 28 - index: { 29 29 - byteStart: highlight.startOffset 30 30 - ? new UnicodeString( 31 31 - props.plaintext.slice(0, highlight.startOffset), 32 32 - ).length 33 33 - : 0, 34 34 - byteEnd: new UnicodeString( 35 35 - props.plaintext.slice(0, highlight.endOffset ?? undefined), 36 36 - ).length, 37 37 - }, 38 38 - features: [ 39 39 - { $type: "pub.leaflet.richtext.facet#highlight" }, 40 40 - { 41 41 - $type: "pub.leaflet.richtext.facet#id", 42 42 - id: fragmentId, 43 43 - }, 44 44 - ], 45 45 - }, 46 46 - new UnicodeString(props.plaintext).length, 47 47 - ); 48 48 - } 49 49 - return facets; 50 50 - }, [props.plaintext, props.facets, highlights, props.preview, props.pageId]); 51 51 - return <BaseTextBlock {...props} facets={facets} />; 52 52 - } 53 53 - 54 54 - function addFacet(facets: Facet[], newFacet: Facet, length: number) { 55 55 - if (facets.length === 0) { 56 56 - return [newFacet]; 57 57 - } 58 58 - 59 59 - const allFacets = [...facets, newFacet]; 60 60 - 61 61 - // Collect all boundary positions 62 62 - const boundaries = new Set<number>(); 63 63 - boundaries.add(0); 64 64 - boundaries.add(length); 65 65 - 66 66 - for (const facet of allFacets) { 67 67 - boundaries.add(facet.index.byteStart); 68 68 - boundaries.add(facet.index.byteEnd); 69 69 - } 70 70 - 71 71 - const sortedBoundaries = Array.from(boundaries).sort((a, b) => a - b); 72 72 - const result: Facet[] = []; 73 73 - 74 74 - // Process segments between consecutive boundaries 75 75 - for (let i = 0; i < sortedBoundaries.length - 1; i++) { 76 76 - const start = sortedBoundaries[i]; 77 77 - const end = sortedBoundaries[i + 1]; 78 78 - 79 79 - // Find facets that are active at the start position 80 80 - const activeFacets = allFacets.filter( 81 81 - (facet) => facet.index.byteStart <= start && facet.index.byteEnd > start, 82 82 - ); 83 83 - 84 84 - // Only create facet if there are active facets (features present) 85 85 - if (activeFacets.length > 0) { 86 86 - const features = activeFacets.flatMap((f) => f.features); 87 87 - result.push({ 88 88 - index: { byteStart: start, byteEnd: end }, 89 89 - features, 90 90 - }); 91 91 - } 92 92 - } 93 93 - 94 94 - return result; 95 95 - }

+324

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

··· 1 1 + "use client"; 2 2 + import { useEffect, useRef } from "react"; 3 3 + import { AppBskyFeedDefs } from "@atproto/api"; 4 4 + import useSWR from "swr"; 5 5 + import { PageWrapper } from "components/Pages/Page"; 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 10 + import { useThreadState } from "src/useThreadState"; 11 11 + import { BskyPostContent, ClientDate } from "./BskyPostContent"; 12 12 + import { 13 13 + ThreadLink, 14 14 + getThreadKey, 15 15 + fetchThread, 16 16 + prefetchThread, 17 17 + } from "./PostLinks"; 18 18 + 19 19 + // Re-export for backwards compatibility 20 20 + export { ThreadLink, getThreadKey, fetchThread, prefetchThread, ClientDate }; 21 21 + 22 22 + type ThreadViewPost = AppBskyFeedDefs.ThreadViewPost; 23 23 + type NotFoundPost = AppBskyFeedDefs.NotFoundPost; 24 24 + type BlockedPost = AppBskyFeedDefs.BlockedPost; 25 25 + type ThreadType = ThreadViewPost | NotFoundPost | BlockedPost; 26 26 + 27 27 + export function ThreadPage(props: { 28 28 + threadUri: string; 29 29 + pageId: string; 30 30 + pageOptions?: React.ReactNode; 31 31 + hasPageBackground: boolean; 32 32 + }) { 33 33 + const { threadUri, pageId, pageOptions } = props; 34 34 + const drawer = useDrawerOpen(threadUri); 35 35 + 36 36 + const { 37 37 + data: thread, 38 38 + isLoading, 39 39 + error, 40 40 + } = useSWR(threadUri ? getThreadKey(threadUri) : null, () => 41 41 + fetchThread(threadUri), 42 42 + ); 43 43 + 44 44 + return ( 45 45 + <PageWrapper 46 46 + pageType="doc" 47 47 + fullPageScroll={false} 48 48 + id={`post-page-${pageId}`} 49 49 + drawerOpen={!!drawer} 50 50 + pageOptions={pageOptions} 51 51 + > 52 52 + <div className="flex flex-col sm:px-4 px-3 sm:pt-3 pt-2 pb-1 sm:pb-4"> 53 53 + {isLoading ? ( 54 54 + <div className="flex items-center justify-center gap-1 text-tertiary italic text-sm py-8"> 55 55 + <span>loading thread</span> 56 56 + <DotLoader /> 57 57 + </div> 58 58 + ) : error ? ( 59 59 + <div className="text-tertiary italic text-sm text-center py-8"> 60 60 + Failed to load thread 61 61 + </div> 62 62 + ) : thread ? ( 63 63 + <ThreadContent thread={thread} threadUri={threadUri} /> 64 64 + ) : null} 65 65 + </div> 66 66 + </PageWrapper> 67 67 + ); 68 68 + } 69 69 + 70 70 + function ThreadContent(props: { thread: ThreadType; threadUri: string }) { 71 71 + const { thread, threadUri } = props; 72 72 + const mainPostRef = useRef<HTMLDivElement>(null); 73 73 + 74 74 + // Scroll the main post into view when the thread loads 75 75 + useEffect(() => { 76 76 + if (mainPostRef.current) { 77 77 + mainPostRef.current.scrollIntoView({ 78 78 + behavior: "instant", 79 79 + block: "start", 80 80 + }); 81 81 + } 82 82 + }, []); 83 83 + 84 84 + if (AppBskyFeedDefs.isNotFoundPost(thread)) { 85 85 + return <PostNotAvailable />; 86 86 + } 87 87 + 88 88 + if (AppBskyFeedDefs.isBlockedPost(thread)) { 89 89 + return ( 90 90 + <div className="text-tertiary italic text-sm text-center py-8"> 91 91 + This post is blocked 92 92 + </div> 93 93 + ); 94 94 + } 95 95 + 96 96 + if (!AppBskyFeedDefs.isThreadViewPost(thread)) { 97 97 + return <PostNotAvailable />; 98 98 + } 99 99 + 100 100 + // Collect all parent posts in order (oldest first) 101 101 + const parents: ThreadViewPost[] = []; 102 102 + let currentParent = thread.parent; 103 103 + while (currentParent && AppBskyFeedDefs.isThreadViewPost(currentParent)) { 104 104 + parents.unshift(currentParent); 105 105 + currentParent = currentParent.parent; 106 106 + } 107 107 + 108 108 + 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> 120 120 + ))} 121 121 + 122 122 + {/* Main post */} 123 123 + <div ref={mainPostRef}> 124 124 + <ThreadPost 125 125 + post={thread} 126 126 + isMainPost={true} 127 127 + showReplyLine={false} 128 128 + threadUri={threadUri} 129 129 + /> 130 130 + </div> 131 131 + 132 132 + {/* 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> 138 138 + <Replies 139 139 + replies={thread.replies as any[]} 140 140 + threadUri={threadUri} 141 141 + depth={0} 142 142 + parentAuthorDid={thread.post.author.did} 143 143 + /> 144 144 + </div> 145 145 + )} 146 146 + </div> 147 147 + ); 148 148 + } 149 149 + 150 150 + function ThreadPost(props: { 151 151 + post: ThreadViewPost; 152 152 + isMainPost: boolean; 153 153 + showReplyLine: boolean; 154 154 + threadUri: string; 155 155 + }) { 156 156 + const { post, isMainPost, showReplyLine, threadUri } = props; 157 157 + const postView = post.post; 158 158 + const parent = { type: "thread" as const, uri: threadUri }; 159 159 + 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 + )} 166 166 + 167 167 + <BskyPostContent 168 168 + post={postView} 169 169 + parent={parent} 170 170 + linksEnabled={!isMainPost} 171 171 + showBlueskyLink={true} 172 172 + showEmbed={true} 173 173 + /> 174 174 + </div> 175 175 + ); 176 176 + } 177 177 + 178 178 + function Replies(props: { 179 179 + replies: (ThreadViewPost | NotFoundPost | BlockedPost)[]; 180 180 + threadUri: string; 181 181 + depth: number; 182 182 + parentAuthorDid?: string; 183 183 + }) { 184 184 + const { replies, threadUri, depth, parentAuthorDid } = props; 185 185 + const collapsedThreads = useThreadState((s) => s.collapsedThreads); 186 186 + const toggleCollapsed = useThreadState((s) => s.toggleCollapsed); 187 187 + 188 188 + // Sort replies so that replies from the parent author come first 189 189 + const sortedReplies = parentAuthorDid 190 190 + ? [...replies].sort((a, b) => { 191 191 + const aIsAuthor = 192 192 + AppBskyFeedDefs.isThreadViewPost(a) && 193 193 + a.post.author.did === parentAuthorDid; 194 194 + const bIsAuthor = 195 195 + AppBskyFeedDefs.isThreadViewPost(b) && 196 196 + b.post.author.did === parentAuthorDid; 197 197 + if (aIsAuthor && !bIsAuthor) return -1; 198 198 + if (!aIsAuthor && bIsAuthor) return 1; 199 199 + return 0; 200 200 + }) 201 201 + : replies; 202 202 + 203 203 + return ( 204 204 + <div className="flex flex-col gap-0"> 205 205 + {sortedReplies.map((reply, index) => { 206 206 + if (AppBskyFeedDefs.isNotFoundPost(reply)) { 207 207 + return ( 208 208 + <div 209 209 + key={`not-found-${index}`} 210 210 + className="text-tertiary italic text-xs py-2 px-2" 211 211 + > 212 212 + Post not found 213 213 + </div> 214 214 + ); 215 215 + } 216 216 + 217 217 + if (AppBskyFeedDefs.isBlockedPost(reply)) { 218 218 + return ( 219 219 + <div 220 220 + key={`blocked-${index}`} 221 221 + className="text-tertiary italic text-xs py-2 px-2" 222 222 + > 223 223 + Post blocked 224 224 + </div> 225 225 + ); 226 226 + } 227 227 + 228 228 + if (!AppBskyFeedDefs.isThreadViewPost(reply)) { 229 229 + return null; 230 230 + } 231 231 + 232 232 + const hasReplies = reply.replies && reply.replies.length > 0; 233 233 + const isCollapsed = collapsedThreads.has(reply.post.uri); 234 234 + const replyCount = reply.replies?.length ?? 0; 235 235 + 236 236 + 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> 291 291 + ); 292 292 + })} 293 293 + </div> 294 294 + ); 295 295 + } 296 296 + 297 297 + function ReplyPost(props: { 298 298 + post: ThreadViewPost; 299 299 + showReplyLine: boolean; 300 300 + isLast: boolean; 301 301 + threadUri: string; 302 302 + }) { 303 303 + const { post, threadUri } = props; 304 304 + const postView = post.post; 305 305 + const parent = { type: "thread" as const, uri: threadUri }; 306 306 + 307 307 + 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 + /> 322 322 + </div> 323 323 + ); 324 324 + }

+58 -1

app/lish/[did]/[publication]/[rkey]/getPostPageData.ts

··· 10 10 data, 11 11 uri, 12 12 comments_on_documents(*, bsky_profiles(*)), 13 13 - documents_in_publications(publications(*, publication_subscriptions(*))), 13 13 + documents_in_publications(publications(*, 14 14 + documents_in_publications(documents(uri, data)), 15 15 + publication_subscriptions(*)) 16 16 + ), 14 17 document_mentions_in_bsky(*), 15 18 leaflets_in_publications(*) 16 19 `, ··· 51 54 ?.record as PubLeafletPublication.Record 52 55 )?.theme || (document?.data as PubLeafletDocument.Record)?.theme; 53 56 57 57 + // Calculate prev/next documents from the fetched publication documents 58 58 + let prevNext: 59 59 + | { 60 60 + prev?: { uri: string; title: string }; 61 61 + next?: { uri: string; title: string }; 62 62 + } 63 63 + | undefined; 64 64 + 65 65 + const currentPublishedAt = (document.data as PubLeafletDocument.Record) 66 66 + ?.publishedAt; 67 67 + const allDocs = 68 68 + document.documents_in_publications[0]?.publications 69 69 + ?.documents_in_publications; 70 70 + 71 71 + if (currentPublishedAt && allDocs) { 72 72 + // Filter and sort documents by publishedAt 73 73 + const sortedDocs = allDocs 74 74 + .map((dip) => ({ 75 75 + uri: dip?.documents?.uri, 76 76 + title: (dip?.documents?.data as PubLeafletDocument.Record).title, 77 77 + publishedAt: (dip?.documents?.data as PubLeafletDocument.Record) 78 78 + .publishedAt, 79 79 + })) 80 80 + .filter((doc) => doc.publishedAt) // Only include docs with publishedAt 81 81 + .sort( 82 82 + (a, b) => 83 83 + new Date(a.publishedAt!).getTime() - 84 84 + new Date(b.publishedAt!).getTime(), 85 85 + ); 86 86 + 87 87 + // Find current document index 88 88 + const currentIndex = sortedDocs.findIndex((doc) => doc.uri === uri); 89 89 + 90 90 + if (currentIndex !== -1) { 91 91 + prevNext = { 92 92 + prev: 93 93 + currentIndex > 0 94 94 + ? { 95 95 + uri: sortedDocs[currentIndex - 1].uri || "", 96 96 + title: sortedDocs[currentIndex - 1].title, 97 97 + } 98 98 + : undefined, 99 99 + next: 100 100 + currentIndex < sortedDocs.length - 1 101 101 + ? { 102 102 + uri: sortedDocs[currentIndex + 1].uri || "", 103 103 + title: sortedDocs[currentIndex + 1].title, 104 104 + } 105 105 + : undefined, 106 106 + }; 107 107 + } 108 108 + } 109 109 + 54 110 return { 55 111 ...document, 56 112 quotesAndMentions, 57 113 theme, 114 114 + prevNext, 58 115 }; 59 116 } 60 117

+44 -1

app/lish/[did]/[publication]/[rkey]/opengraph-image.ts

··· 1 1 import { getMicroLinkOgImage } from "src/utils/getMicroLinkOgImage"; 2 2 + import { supabaseServerClient } from "supabase/serverClient"; 3 3 + import { AtUri } from "@atproto/syntax"; 4 4 + import { ids } from "lexicons/api/lexicons"; 5 5 + import { PubLeafletDocument } from "lexicons/api"; 6 6 + import { jsonToLex } from "@atproto/lexicon"; 7 7 + import { fetchAtprotoBlob } from "app/api/atproto_images/route"; 2 8 3 3 - export const runtime = "edge"; 4 9 export const revalidate = 60; 5 10 6 11 export default async function OpenGraphImage(props: { 7 12 params: Promise<{ publication: string; did: string; rkey: string }>; 8 13 }) { 9 14 let params = await props.params; 15 15 + let did = decodeURIComponent(params.did); 16 16 + 17 17 + // Try to get the document's cover image 18 18 + let { data: document } = await supabaseServerClient 19 19 + .from("documents") 20 20 + .select("data") 21 21 + .eq("uri", AtUri.make(did, ids.PubLeafletDocument, params.rkey).toString()) 22 22 + .single(); 23 23 + 24 24 + if (document) { 25 25 + let docRecord = jsonToLex(document.data) as PubLeafletDocument.Record; 26 26 + if (docRecord.coverImage) { 27 27 + try { 28 28 + // Get CID from the blob ref (handle both serialized and hydrated forms) 29 29 + let cid = 30 30 + (docRecord.coverImage.ref as unknown as { $link: string })["$link"] || 31 31 + docRecord.coverImage.ref.toString(); 32 32 + 33 33 + let imageResponse = await fetchAtprotoBlob(did, cid); 34 34 + if (imageResponse) { 35 35 + let imageBlob = await imageResponse.blob(); 36 36 + 37 37 + // Return the image with appropriate headers 38 38 + return new Response(imageBlob, { 39 39 + headers: { 40 40 + "Content-Type": imageBlob.type || "image/jpeg", 41 41 + "Cache-Control": "public, max-age=3600", 42 42 + }, 43 43 + }); 44 44 + } 45 45 + } catch (e) { 46 46 + // Fall through to screenshot if cover image fetch fails 47 47 + console.error("Failed to fetch cover image:", e); 48 48 + } 49 49 + } 50 50 + } 51 51 + 52 52 + // Fall back to screenshot 10 53 return getMicroLinkOgImage( 11 54 `/lish/${decodeURIComponent(params.did)}/${decodeURIComponent(params.publication)}/${params.rkey}/`, 12 55 );

+12 -4

app/lish/[did]/[publication]/[rkey]/voteOnPublishedPoll.ts

··· 1 1 "use server"; 2 2 3 3 - import { createOauthClient } from "src/atproto-oauth"; 3 3 + import { 4 4 + restoreOAuthSession, 5 5 + OAuthSessionError, 6 6 + } from "src/atproto-oauth"; 4 7 import { getIdentityData } from "actions/getIdentityData"; 5 8 import { AtpBaseClient, AtUri } from "@atproto/api"; 6 9 import { PubLeafletPollVote } from "lexicons/api"; ··· 12 15 pollUri: string, 13 16 pollCid: string, 14 17 selectedOption: string, 15 15 - ): Promise<{ success: boolean; error?: string }> { 18 18 + ): Promise< 19 19 + { success: true } | { success: false; error: string | OAuthSessionError } 20 20 + > { 16 21 try { 17 22 const identity = await getIdentityData(); 18 23 ··· 20 25 return { success: false, error: "Not authenticated" }; 21 26 } 22 27 23 23 - const oauthClient = await createOauthClient(); 24 24 - const session = await oauthClient.restore(identity.atp_did); 28 28 + const sessionResult = await restoreOAuthSession(identity.atp_did); 29 29 + if (!sessionResult.ok) { 30 30 + return { success: false, error: sessionResult.error }; 31 31 + } 32 32 + const session = sessionResult.value; 25 33 let agent = new AtpBaseClient(session.fetchHandler.bind(session)); 26 34 27 35 const voteRecord: PubLeafletPollVote.Record = {

+2 -3

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

··· 1 1 "use client"; 2 2 3 3 import { NewDraftActionButton } from "./NewDraftButton"; 4 4 - import { PublicationSettingsButton } from "./PublicationSettings"; 4 4 + import { PublicationSettingsButton } from "./settings/PublicationSettings"; 5 5 import { ActionButton } from "components/ActionBar/ActionButton"; 6 6 import { ShareSmall } from "components/Icons/ShareSmall"; 7 7 - import { Menu } from "components/Layout"; 8 8 - import { MenuItem } from "components/Layout"; 7 7 + import { Menu, MenuItem } from "components/Menu"; 9 8 import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 10 9 import { usePublicationData } from "./PublicationSWRProvider"; 11 10 import { useSmoker } from "components/Toast";

-1

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

··· 23 23 searchValue={props.searchValue} 24 24 showPreview={false} 25 25 defaultDisplay="list" 26 26 - cardBorderHidden={!props.showPageBackground} 27 26 leaflets={leaflets_in_publications 28 27 .filter((l) => !l.documents) 29 28 .filter((l) => !l.archived)

-1

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

··· 39 39 return ( 40 40 <DashboardLayout 41 41 id={publication.uri} 42 42 - cardBorderHidden={!!record.theme?.showPageBackground} 43 42 defaultTab="Drafts" 44 43 tabs={{ 45 44 Drafts: {

-132

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

··· 1 1 - "use client"; 2 2 - 3 3 - import { ActionButton } from "components/ActionBar/ActionButton"; 4 4 - import { Popover } from "components/Popover"; 5 5 - import { SettingsSmall } from "components/Icons/SettingsSmall"; 6 6 - import { EditPubForm } from "app/lish/createPub/UpdatePubForm"; 7 7 - import { PubThemeSetter } from "components/ThemeManager/PubThemeSetter"; 8 8 - import { useIsMobile } from "src/hooks/isMobile"; 9 9 - import { useState } from "react"; 10 10 - import { GoBackSmall } from "components/Icons/GoBackSmall"; 11 11 - import { theme } from "tailwind.config"; 12 12 - import { ButtonPrimary } from "components/Buttons"; 13 13 - import { DotLoader } from "components/utils/DotLoader"; 14 14 - import { ArrowRightTiny } from "components/Icons/ArrowRightTiny"; 15 15 - 16 16 - export function PublicationSettingsButton(props: { publication: string }) { 17 17 - let isMobile = useIsMobile(); 18 18 - let [state, setState] = useState<"menu" | "general" | "theme">("menu"); 19 19 - let [loading, setLoading] = useState(false); 20 20 - 21 21 - return ( 22 22 - <Popover 23 23 - asChild 24 24 - onOpenChange={() => setState("menu")} 25 25 - side={isMobile ? "top" : "right"} 26 26 - align={isMobile ? "center" : "start"} 27 27 - className={`max-w-xs w-[1000px] ${state === "theme" && "bg-white!"}`} 28 28 - arrowFill={theme.colors["border-light"]} 29 29 - trigger={ 30 30 - <ActionButton 31 31 - id="pub-settings-button" 32 32 - icon=<SettingsSmall /> 33 33 - label="Settings" 34 34 - /> 35 35 - } 36 36 - > 37 37 - {state === "general" ? ( 38 38 - <EditPubForm 39 39 - backToMenuAction={() => setState("menu")} 40 40 - loading={loading} 41 41 - setLoadingAction={setLoading} 42 42 - /> 43 43 - ) : state === "theme" ? ( 44 44 - <PubThemeSetter 45 45 - backToMenu={() => setState("menu")} 46 46 - loading={loading} 47 47 - setLoading={setLoading} 48 48 - /> 49 49 - ) : ( 50 50 - <PubSettingsMenu 51 51 - state={state} 52 52 - setState={setState} 53 53 - loading={loading} 54 54 - setLoading={setLoading} 55 55 - /> 56 56 - )} 57 57 - </Popover> 58 58 - ); 59 59 - } 60 60 - 61 61 - const PubSettingsMenu = (props: { 62 62 - state: "menu" | "general" | "theme"; 63 63 - setState: (s: typeof props.state) => void; 64 64 - loading: boolean; 65 65 - setLoading: (l: boolean) => void; 66 66 - }) => { 67 67 - let menuItemClassName = 68 68 - "menuItem -mx-[8px] text-left flex items-center justify-between hover:no-underline!"; 69 69 - 70 70 - return ( 71 71 - <div className="flex flex-col gap-0.5"> 72 72 - <PubSettingsHeader 73 73 - loading={props.loading} 74 74 - setLoadingAction={props.setLoading} 75 75 - state={"menu"} 76 76 - /> 77 77 - <button 78 78 - className={menuItemClassName} 79 79 - type="button" 80 80 - onClick={() => { 81 81 - props.setState("general"); 82 82 - }} 83 83 - > 84 84 - Publication Settings 85 85 - <ArrowRightTiny /> 86 86 - </button> 87 87 - <button 88 88 - className={menuItemClassName} 89 89 - type="button" 90 90 - onClick={() => props.setState("theme")} 91 91 - > 92 92 - Publication Theme 93 93 - <ArrowRightTiny /> 94 94 - </button> 95 95 - </div> 96 96 - ); 97 97 - }; 98 98 - 99 99 - export const PubSettingsHeader = (props: { 100 100 - state: "menu" | "general" | "theme"; 101 101 - backToMenuAction?: () => void; 102 102 - loading: boolean; 103 103 - setLoadingAction: (l: boolean) => void; 104 104 - }) => { 105 105 - return ( 106 106 - <div className="flex justify-between font-bold text-secondary bg-border-light -mx-3 -mt-2 px-3 py-2 mb-1"> 107 107 - {props.state === "menu" 108 108 - ? "Settings" 109 109 - : props.state === "general" 110 110 - ? "General" 111 111 - : props.state === "theme" 112 112 - ? "Publication Theme" 113 113 - : ""} 114 114 - {props.state !== "menu" && ( 115 115 - <div className="flex gap-2"> 116 116 - <button 117 117 - type="button" 118 118 - onClick={() => { 119 119 - props.backToMenuAction && props.backToMenuAction(); 120 120 - }} 121 121 - > 122 122 - <GoBackSmall className="text-accent-contrast" /> 123 123 - </button> 124 124 - 125 125 - <ButtonPrimary compact type="submit"> 126 126 - {props.loading ? <DotLoader /> : "Update"} 127 127 - </ButtonPrimary> 128 128 - </div> 129 129 - )} 130 130 - </div> 131 131 - ); 132 132 - };

+2 -1

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

··· 4 4 import { ButtonPrimary } from "components/Buttons"; 5 5 import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 6 6 import { useSmoker } from "components/Toast"; 7 7 - import { Menu, MenuItem, Separator } from "components/Layout"; 7 7 + import { Menu, MenuItem } from "components/Menu"; 8 8 + import { Separator } from "components/Layout"; 8 9 import { MoreOptionsVerticalTiny } from "components/Icons/MoreOptionsVerticalTiny"; 9 10 import { Checkbox } from "components/Checkbox"; 10 11 import { useEffect, useState } from "react";

+2 -1

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

··· 7 7 import { Fragment, useState } from "react"; 8 8 import { useParams } from "next/navigation"; 9 9 import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 10 10 - import { Menu, MenuItem } from "components/Layout"; 10 10 + import { Menu, MenuItem } from "components/Menu"; 11 11 import { deletePost } from "./deletePost"; 12 12 import { ButtonPrimary } from "components/Buttons"; 13 13 import { MoreOptionsVerticalTiny } from "components/Icons/MoreOptionsVerticalTiny"; ··· 140 140 commentsCount={comments} 141 141 tags={tags} 142 142 showComments={pubRecord?.preferences?.showComments} 143 143 + showMentions={pubRecord?.preferences?.showMentions} 143 144 postUrl={`${getPublicationURL(publication)}/${uri.rkey}`} 144 145 /> 145 146 </div>

+50 -13

app/lish/[did]/[publication]/dashboard/deletePost.ts

··· 2 2 3 3 import { AtpBaseClient } from "lexicons/api"; 4 4 import { getIdentityData } from "actions/getIdentityData"; 5 5 - import { createOauthClient } from "src/atproto-oauth"; 5 5 + import { 6 6 + restoreOAuthSession, 7 7 + OAuthSessionError, 8 8 + } from "src/atproto-oauth"; 6 9 import { AtUri } from "@atproto/syntax"; 7 10 import { supabaseServerClient } from "supabase/serverClient"; 8 11 import { revalidatePath } from "next/cache"; 9 12 10 10 - export async function deletePost(document_uri: string) { 13 13 + export async function deletePost( 14 14 + document_uri: string 15 15 + ): Promise<{ success: true } | { success: false; error: OAuthSessionError }> { 11 16 let identity = await getIdentityData(); 12 12 - if (!identity || !identity.atp_did) throw new Error("No Identity"); 17 17 + if (!identity || !identity.atp_did) { 18 18 + return { 19 19 + success: false, 20 20 + error: { 21 21 + type: "oauth_session_expired", 22 22 + message: "Not authenticated", 23 23 + did: "", 24 24 + }, 25 25 + }; 26 26 + } 13 27 14 14 - const oauthClient = await createOauthClient(); 15 15 - let credentialSession = await oauthClient.restore(identity.atp_did); 28 28 + const sessionResult = await restoreOAuthSession(identity.atp_did); 29 29 + if (!sessionResult.ok) { 30 30 + return { success: false, error: sessionResult.error }; 31 31 + } 32 32 + let credentialSession = sessionResult.value; 16 33 let agent = new AtpBaseClient( 17 34 credentialSession.fetchHandler.bind(credentialSession), 18 35 ); 19 36 let uri = new AtUri(document_uri); 20 20 - if (uri.host !== identity.atp_did) return; 37 37 + if (uri.host !== identity.atp_did) { 38 38 + return { success: true }; 39 39 + } 21 40 22 41 await Promise.all([ 23 42 agent.pub.leaflet.document.delete({ ··· 31 50 .eq("doc", document_uri), 32 51 ]); 33 52 34 34 - return revalidatePath("/lish/[did]/[publication]/dashboard", "layout"); 53 53 + revalidatePath("/lish/[did]/[publication]/dashboard", "layout"); 54 54 + return { success: true }; 35 55 } 36 56 37 37 - export async function unpublishPost(document_uri: string) { 57 57 + export async function unpublishPost( 58 58 + document_uri: string 59 59 + ): Promise<{ success: true } | { success: false; error: OAuthSessionError }> { 38 60 let identity = await getIdentityData(); 39 39 - if (!identity || !identity.atp_did) throw new Error("No Identity"); 61 61 + if (!identity || !identity.atp_did) { 62 62 + return { 63 63 + success: false, 64 64 + error: { 65 65 + type: "oauth_session_expired", 66 66 + message: "Not authenticated", 67 67 + did: "", 68 68 + }, 69 69 + }; 70 70 + } 40 71 41 41 - const oauthClient = await createOauthClient(); 42 42 - let credentialSession = await oauthClient.restore(identity.atp_did); 72 72 + const sessionResult = await restoreOAuthSession(identity.atp_did); 73 73 + if (!sessionResult.ok) { 74 74 + return { success: false, error: sessionResult.error }; 75 75 + } 76 76 + let credentialSession = sessionResult.value; 43 77 let agent = new AtpBaseClient( 44 78 credentialSession.fetchHandler.bind(credentialSession), 45 79 ); 46 80 let uri = new AtUri(document_uri); 47 47 - if (uri.host !== identity.atp_did) return; 81 81 + if (uri.host !== identity.atp_did) { 82 82 + return { success: true }; 83 83 + } 48 84 49 85 await Promise.all([ 50 86 agent.pub.leaflet.document.delete({ ··· 53 89 }), 54 90 supabaseServerClient.from("documents").delete().eq("uri", document_uri), 55 91 ]); 56 56 - return revalidatePath("/lish/[did]/[publication]/dashboard", "layout"); 92 92 + revalidatePath("/lish/[did]/[publication]/dashboard", "layout"); 93 93 + return { success: true }; 57 94 }

+108

app/lish/[did]/[publication]/dashboard/settings/PostOptions.tsx

··· 1 1 + import { PubLeafletPublication } from "lexicons/api"; 2 2 + import { usePublicationData } from "../PublicationSWRProvider"; 3 3 + import { PubSettingsHeader } from "./PublicationSettings"; 4 4 + import { useState } from "react"; 5 5 + import { Toggle } from "components/Toggle"; 6 6 + import { updatePublication } from "app/lish/createPub/updatePublication"; 7 7 + import { useToaster } from "components/Toast"; 8 8 + import { mutate } from "swr"; 9 9 + 10 10 + export const PostOptions = (props: { 11 11 + backToMenu: () => void; 12 12 + loading: boolean; 13 13 + setLoading: (l: boolean) => void; 14 14 + }) => { 15 15 + let { data } = usePublicationData(); 16 16 + 17 17 + let { publication: pubData } = data || {}; 18 18 + let record = pubData?.record as PubLeafletPublication.Record; 19 19 + 20 20 + let [showComments, setShowComments] = useState( 21 21 + record?.preferences?.showComments === undefined 22 22 + ? true 23 23 + : record.preferences.showComments, 24 24 + ); 25 25 + let [showMentions, setShowMentions] = useState( 26 26 + record?.preferences?.showMentions === undefined 27 27 + ? true 28 28 + : record.preferences.showMentions, 29 29 + ); 30 30 + let [showPrevNext, setShowPrevNext] = useState( 31 31 + record?.preferences?.showPrevNext === undefined 32 32 + ? true 33 33 + : record.preferences.showPrevNext, 34 34 + ); 35 35 + 36 36 + let toast = useToaster(); 37 37 + return ( 38 38 + <form 39 39 + onSubmit={async (e) => { 40 40 + if (!pubData) return; 41 41 + e.preventDefault(); 42 42 + props.setLoading(true); 43 43 + let data = await updatePublication({ 44 44 + name: record.name, 45 45 + uri: pubData.uri, 46 46 + preferences: { 47 47 + showInDiscover: 48 48 + record?.preferences?.showInDiscover === undefined 49 49 + ? true 50 50 + : record.preferences.showInDiscover, 51 51 + showComments: showComments, 52 52 + showMentions: showMentions, 53 53 + showPrevNext: showPrevNext, 54 54 + }, 55 55 + }); 56 56 + toast({ type: "success", content: <strong>Posts Updated!</strong> }); 57 57 + console.log(record.preferences?.showPrevNext); 58 58 + props.setLoading(false); 59 59 + mutate("publication-data"); 60 60 + }} 61 61 + className="text-primary flex flex-col" 62 62 + > 63 63 + <PubSettingsHeader 64 64 + loading={props.loading} 65 65 + setLoadingAction={props.setLoading} 66 66 + backToMenuAction={props.backToMenu} 67 67 + state={"post-options"} 68 68 + > 69 69 + Post Options 70 70 + </PubSettingsHeader> 71 71 + <h4 className="mb-1">Layout</h4> 72 72 + <Toggle 73 73 + toggle={showPrevNext} 74 74 + onToggle={() => { 75 75 + setShowPrevNext(!showPrevNext); 76 76 + }} 77 77 + > 78 78 + <div className="font-bold">Show Prev/Next Buttons</div> 79 79 + </Toggle> 80 80 + <hr className="my-2 border-border-light" /> 81 81 + <h4 className="mb-1">Interactions</h4> 82 82 + <div className="flex flex-col gap-2"> 83 83 + <Toggle 84 84 + toggle={showComments} 85 85 + onToggle={() => { 86 86 + setShowComments(!showComments); 87 87 + }} 88 88 + > 89 89 + <div className="font-bold">Show Comments</div> 90 90 + </Toggle> 91 91 + 92 92 + <Toggle 93 93 + toggle={showMentions} 94 94 + onToggle={() => { 95 95 + setShowMentions(!showMentions); 96 96 + }} 97 97 + > 98 98 + <div className="flex flex-col justify-start"> 99 99 + <div className="font-bold">Show Mentions</div> 100 100 + <div className="text-tertiary text-sm leading-tight"> 101 101 + Display a list of posts on Bluesky that mention your post 102 102 + </div> 103 103 + </div> 104 104 + </Toggle> 105 105 + </div> 106 106 + </form> 107 107 + ); 108 108 + };

+146

app/lish/[did]/[publication]/dashboard/settings/PublicationSettings.tsx

··· 1 1 + "use client"; 2 2 + 3 3 + import { ActionButton } from "components/ActionBar/ActionButton"; 4 4 + import { Popover } from "components/Popover"; 5 5 + import { SettingsSmall } from "components/Icons/SettingsSmall"; 6 6 + import { EditPubForm } from "app/lish/createPub/UpdatePubForm"; 7 7 + import { PubThemeSetter } from "components/ThemeManager/PubThemeSetter"; 8 8 + import { useIsMobile } from "src/hooks/isMobile"; 9 9 + import { useState } from "react"; 10 10 + import { GoBackSmall } from "components/Icons/GoBackSmall"; 11 11 + import { theme } from "tailwind.config"; 12 12 + import { ButtonPrimary } from "components/Buttons"; 13 13 + import { DotLoader } from "components/utils/DotLoader"; 14 14 + import { ArrowRightTiny } from "components/Icons/ArrowRightTiny"; 15 15 + import { PostOptions } from "./PostOptions"; 16 16 + 17 17 + type menuState = "menu" | "general" | "theme" | "post-options"; 18 18 + 19 19 + export function PublicationSettingsButton(props: { publication: string }) { 20 20 + let isMobile = useIsMobile(); 21 21 + let [state, setState] = useState<menuState>("menu"); 22 22 + let [loading, setLoading] = useState(false); 23 23 + 24 24 + return ( 25 25 + <Popover 26 26 + asChild 27 27 + onOpenChange={() => setState("menu")} 28 28 + side={isMobile ? "top" : "right"} 29 29 + align={isMobile ? "center" : "start"} 30 30 + className={`max-w-xs w-[1000px] ${state === "theme" && "bg-white!"}`} 31 31 + arrowFill={theme.colors["border-light"]} 32 32 + trigger={ 33 33 + <ActionButton 34 34 + id="pub-settings-button" 35 35 + icon=<SettingsSmall /> 36 36 + label="Settings" 37 37 + /> 38 38 + } 39 39 + > 40 40 + {state === "general" ? ( 41 41 + <EditPubForm 42 42 + backToMenuAction={() => setState("menu")} 43 43 + loading={loading} 44 44 + setLoadingAction={setLoading} 45 45 + /> 46 46 + ) : state === "theme" ? ( 47 47 + <PubThemeSetter 48 48 + backToMenu={() => setState("menu")} 49 49 + loading={loading} 50 50 + setLoading={setLoading} 51 51 + /> 52 52 + ) : state === "post-options" ? ( 53 53 + <PostOptions 54 54 + backToMenu={() => setState("menu")} 55 55 + loading={loading} 56 56 + setLoading={setLoading} 57 57 + /> 58 58 + ) : ( 59 59 + <PubSettingsMenu 60 60 + state={state} 61 61 + setState={setState} 62 62 + loading={loading} 63 63 + setLoading={setLoading} 64 64 + /> 65 65 + )} 66 66 + </Popover> 67 67 + ); 68 68 + } 69 69 + 70 70 + const PubSettingsMenu = (props: { 71 71 + state: menuState; 72 72 + setState: (s: menuState) => void; 73 73 + loading: boolean; 74 74 + setLoading: (l: boolean) => void; 75 75 + }) => { 76 76 + let menuItemClassName = 77 77 + "menuItem -mx-[8px] text-left flex items-center justify-between hover:no-underline!"; 78 78 + 79 79 + return ( 80 80 + <div className="flex flex-col gap-0.5"> 81 81 + <PubSettingsHeader 82 82 + loading={props.loading} 83 83 + setLoadingAction={props.setLoading} 84 84 + state={"menu"} 85 85 + > 86 86 + Settings 87 87 + </PubSettingsHeader> 88 88 + <button 89 89 + className={menuItemClassName} 90 90 + type="button" 91 91 + onClick={() => { 92 92 + props.setState("general"); 93 93 + }} 94 94 + > 95 95 + General Settings 96 96 + <ArrowRightTiny /> 97 97 + </button> 98 98 + <button 99 99 + className={menuItemClassName} 100 100 + type="button" 101 101 + onClick={() => props.setState("theme")} 102 102 + > 103 103 + Theme and Layout 104 104 + <ArrowRightTiny /> 105 105 + </button> 106 106 + <button 107 107 + className={menuItemClassName} 108 108 + type="button" 109 109 + onClick={() => props.setState("post-options")} 110 110 + > 111 111 + Post Options 112 112 + <ArrowRightTiny /> 113 113 + </button> 114 114 + </div> 115 115 + ); 116 116 + }; 117 117 + 118 118 + export const PubSettingsHeader = (props: { 119 119 + state: menuState; 120 120 + backToMenuAction?: () => void; 121 121 + loading: boolean; 122 122 + setLoadingAction: (l: boolean) => void; 123 123 + children: React.ReactNode; 124 124 + }) => { 125 125 + return ( 126 126 + <div className="flex justify-between font-bold text-secondary bg-border-light -mx-3 -mt-2 px-3 py-2 mb-1"> 127 127 + {props.children} 128 128 + {props.state !== "menu" && ( 129 129 + <div className="flex gap-2"> 130 130 + <button 131 131 + type="button" 132 132 + onClick={() => { 133 133 + props.backToMenuAction && props.backToMenuAction(); 134 134 + }} 135 135 + > 136 136 + <GoBackSmall className="text-accent-contrast" /> 137 137 + </button> 138 138 + 139 139 + <ButtonPrimary compact type="submit"> 140 140 + {props.loading ? <DotLoader /> : "Update"} 141 141 + </ButtonPrimary> 142 142 + </div> 143 143 + )} 144 144 + </div> 145 145 + ); 146 146 + };

+2 -2

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

··· 12 12 13 13 export async function GET( 14 14 request: NextRequest, 15 15 - props: { params: Promise<{ did: string; publication: string }> } 15 15 + props: { params: Promise<{ did: string; publication: string }> }, 16 16 ) { 17 17 console.log("are we getting here?"); 18 18 const params = await props.params; ··· 43 43 44 44 let identity = await idResolver.did.resolve(did); 45 45 let service = identity?.service?.find((f) => f.id === "#atproto_pds"); 46 46 - if (!service) return null; 46 46 + if (!service) return redirect("/icon.png"); 47 47 let cid = (record.icon.ref as unknown as { $link: string })["$link"]; 48 48 const response = await fetch( 49 49 `${service.serviceEndpoint}/xrpc/com.atproto.sync.getBlob?did=${did}&cid=${cid}`,

+15 -12

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

··· 17 17 import { InteractionPreview } from "components/InteractionsPreview"; 18 18 import { LocalizedDate } from "./LocalizedDate"; 19 19 import { PublicationHomeLayout } from "./PublicationHomeLayout"; 20 20 + import { PublicationAuthor } from "./PublicationAuthor"; 21 21 + import { Separator } from "components/Layout"; 20 22 21 23 export default async function Publication(props: { 22 24 params: Promise<{ publication: string; did: string }>; ··· 91 93 {record?.description}{" "} 92 94 </p> 93 95 {profile && ( 94 94 - <p className="italic text-tertiary sm:text-base text-sm"> 95 95 - <strong className="">by {profile.displayName}</strong>{" "} 96 96 - <a 97 97 - className="text-tertiary" 98 98 - href={`https://bsky.app/profile/${profile.handle}`} 99 99 - > 100 100 - @{profile.handle} 101 101 - </a> 102 102 - </p> 96 96 + <PublicationAuthor 97 97 + did={profile.did} 98 98 + displayName={profile.displayName} 99 99 + handle={profile.handle} 100 100 + /> 103 101 )} 104 102 <div className="sm:pt-4 pt-4"> 105 103 <SubscribeWithBluesky ··· 150 148 </p> 151 149 </SpeedyLink> 152 150 153 153 - <div className="text-sm text-tertiary flex gap-1 flex-wrap pt-2"> 151 151 + <div className="text-sm text-tertiary flex gap-1 flex-wrap pt-2 items-center"> 154 152 <p className="text-sm text-tertiary "> 155 153 {doc_record.publishedAt && ( 156 154 <LocalizedDate ··· 163 161 /> 164 162 )}{" "} 165 163 </p> 166 166 - {comments > 0 || quotes > 0 ? "| " : ""} 164 164 + {comments > 0 || quotes > 0 || tags.length > 0 ? ( 165 165 + <Separator classname="h-4! mx-1" /> 166 166 + ) : ( 167 167 + "" 168 168 + )} 167 169 <InteractionPreview 168 170 quotesCount={quotes} 169 171 commentsCount={comments} 170 172 tags={tags} 171 171 - postUrl="" 173 173 + postUrl={`${getPublicationURL(publication)}/${uri.rkey}`} 172 174 showComments={record?.preferences?.showComments} 175 175 + showMentions={record?.preferences?.showMentions} 173 176 /> 174 177 </div> 175 178 </div>

+22 -6

app/lish/addFeed.tsx

··· 2 2 3 3 import { AppBskyActorDefs, Agent as BskyAgent } from "@atproto/api"; 4 4 import { getIdentityData } from "actions/getIdentityData"; 5 5 - import { createOauthClient } from "src/atproto-oauth"; 5 5 + import { 6 6 + restoreOAuthSession, 7 7 + OAuthSessionError, 8 8 + } from "src/atproto-oauth"; 6 9 const leafletFeedURI = 7 10 "at://did:plc:btxrwcaeyodrap5mnjw2fvmz/app.bsky.feed.generator/subscribedPublications"; 8 11 9 9 - export async function addFeed() { 10 10 - const oauthClient = await createOauthClient(); 12 12 + export async function addFeed(): Promise< 13 13 + { success: true } | { success: false; error: OAuthSessionError } 14 14 + > { 11 15 let identity = await getIdentityData(); 12 16 if (!identity || !identity.atp_did) { 13 13 - throw new Error("Invalid identity data"); 17 17 + return { 18 18 + success: false, 19 19 + error: { 20 20 + type: "oauth_session_expired", 21 21 + message: "Not authenticated", 22 22 + did: "", 23 23 + }, 24 24 + }; 14 25 } 15 26 16 16 - let credentialSession = await oauthClient.restore(identity.atp_did); 27 27 + const sessionResult = await restoreOAuthSession(identity.atp_did); 28 28 + if (!sessionResult.ok) { 29 29 + return { success: false, error: sessionResult.error }; 30 30 + } 31 31 + let credentialSession = sessionResult.value; 17 32 let bsky = new BskyAgent(credentialSession); 18 33 let prefs = await bsky.app.bsky.actor.getPreferences(); 19 34 let savedFeeds = prefs.data.preferences.find( ··· 23 38 let hasFeed = !!savedFeeds.items.find( 24 39 (feed) => feed.value === leafletFeedURI, 25 40 ); 26 26 - if (hasFeed) return; 41 41 + if (hasFeed) return { success: true }; 27 42 28 43 await bsky.addSavedFeeds([ 29 44 { ··· 32 47 type: "feed", 33 48 }, 34 49 ]); 50 50 + return { success: true }; 35 51 }

+42 -13

app/lish/createPub/CreatePubForm.tsx

··· 13 13 import { string } from "zod"; 14 14 import { DotLoader } from "components/utils/DotLoader"; 15 15 import { Checkbox } from "components/Checkbox"; 16 16 + import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError"; 16 17 17 18 type DomainState = 18 19 | { status: "empty" } ··· 32 33 let [domainState, setDomainState] = useState<DomainState>({ 33 34 status: "empty", 34 35 }); 36 36 + let [oauthError, setOauthError] = useState< 37 37 + import("src/atproto-oauth").OAuthSessionError | null 38 38 + >(null); 35 39 let fileInputRef = useRef<HTMLInputElement>(null); 36 40 37 41 let router = useRouter(); ··· 43 47 e.preventDefault(); 44 48 if (!subdomainValidator.safeParse(domainValue).success) return; 45 49 setFormState("loading"); 46 46 - let data = await createPublication({ 50 50 + setOauthError(null); 51 51 + let result = await createPublication({ 47 52 name: nameValue, 48 53 description: descriptionValue, 49 54 iconFile: logoFile, 50 55 subdomain: domainValue, 51 51 - preferences: { showInDiscover, showComments: true }, 56 56 + preferences: { 57 57 + showInDiscover, 58 58 + showComments: true, 59 59 + showMentions: true, 60 60 + showPrevNext: false, 61 61 + }, 52 62 }); 63 63 + 64 64 + if (!result.success) { 65 65 + setFormState("normal"); 66 66 + if (result.error && isOAuthSessionError(result.error)) { 67 67 + setOauthError(result.error); 68 68 + } 69 69 + return; 70 70 + } 71 71 + 53 72 // Show a spinner while this is happening! Maybe a progress bar? 54 73 setTimeout(() => { 55 74 setFormState("normal"); 56 56 - if (data?.publication) 57 57 - router.push(`${getBasePublicationURL(data.publication)}/dashboard`); 75 75 + if (result.publication) 76 76 + router.push( 77 77 + `${getBasePublicationURL(result.publication)}/dashboard`, 78 78 + ); 58 79 }, 500); 59 80 }} 60 81 > ··· 139 160 </Checkbox> 140 161 <hr className="border-border-light" /> 141 162 142 142 - <div className="flex w-full justify-end"> 143 143 - <ButtonPrimary 144 144 - type="submit" 145 145 - disabled={ 146 146 - !nameValue || !domainValue || domainState.status !== "valid" 147 147 - } 148 148 - > 149 149 - {formState === "loading" ? <DotLoader /> : "Create Publication!"} 150 150 - </ButtonPrimary> 163 163 + <div className="flex flex-col gap-2"> 164 164 + <div className="flex w-full justify-end"> 165 165 + <ButtonPrimary 166 166 + type="submit" 167 167 + disabled={ 168 168 + !nameValue || !domainValue || domainState.status !== "valid" 169 169 + } 170 170 + > 171 171 + {formState === "loading" ? <DotLoader /> : "Create Publication!"} 172 172 + </ButtonPrimary> 173 173 + </div> 174 174 + {oauthError && ( 175 175 + <OAuthErrorMessage 176 176 + error={oauthError} 177 177 + className="text-right text-sm text-accent-1" 178 178 + /> 179 179 + )} 151 180 </div> 152 181 </form> 153 182 );

+23 -16

app/lish/createPub/UpdatePubForm.tsx

··· 20 20 import Link from "next/link"; 21 21 import { Checkbox } from "components/Checkbox"; 22 22 import type { GetDomainConfigResponseBody } from "@vercel/sdk/esm/models/getdomainconfigop"; 23 23 - import { PubSettingsHeader } from "../[did]/[publication]/dashboard/PublicationSettings"; 23 23 + import { PubSettingsHeader } from "../[did]/[publication]/dashboard/settings/PublicationSettings"; 24 24 + import { Toggle } from "components/Toggle"; 24 25 25 26 export const EditPubForm = (props: { 26 27 backToMenuAction: () => void; ··· 43 44 ? true 44 45 : record.preferences.showComments, 45 46 ); 47 47 + let showMentions = 48 48 + record?.preferences?.showMentions === undefined 49 49 + ? true 50 50 + : record.preferences.showMentions; 51 51 + let showPrevNext = 52 52 + record?.preferences?.showPrevNext === undefined 53 53 + ? true 54 54 + : record.preferences.showPrevNext; 55 55 + 46 56 let [descriptionValue, setDescriptionValue] = useState( 47 57 record?.description || "", 48 58 ); ··· 74 84 preferences: { 75 85 showInDiscover: showInDiscover, 76 86 showComments: showComments, 87 87 + showMentions: showMentions, 88 88 + showPrevNext: showPrevNext, 77 89 }, 78 90 }); 79 91 toast({ type: "success", content: "Updated!" }); ··· 86 98 setLoadingAction={props.setLoadingAction} 87 99 backToMenuAction={props.backToMenuAction} 88 100 state={"theme"} 89 89 - /> 101 101 + > 102 102 + General Settings 103 103 + </PubSettingsHeader> 90 104 <div className="flex flex-col gap-3 w-[1000px] max-w-full pb-2"> 91 91 - <div className="flex items-center justify-between gap-2 "> 105 105 + <div className="flex items-center justify-between gap-2 mt-2 "> 92 106 <p className="pl-0.5 pb-0.5 text-tertiary italic text-sm font-bold"> 93 107 Logo <span className="font-normal">(optional)</span> 94 108 </p> ··· 158 172 <CustomDomainForm /> 159 173 <hr className="border-border-light" /> 160 174 161 161 - <Checkbox 162 162 - checked={showInDiscover} 163 163 - onChange={(e) => setShowInDiscover(e.target.checked)} 175 175 + <Toggle 176 176 + toggle={showInDiscover} 177 177 + onToggle={() => setShowInDiscover(!showInDiscover)} 164 178 > 165 165 - <div className=" pt-0.5 flex flex-col text-sm italic text-tertiary "> 179 179 + <div className=" pt-0.5 flex flex-col text-sm text-tertiary "> 166 180 <p className="font-bold"> 167 181 Show In{" "} 168 182 <a href="/discover" target="_blank"> ··· 177 191 page. You can change this at any time! 178 192 </p> 179 193 </div> 180 180 - </Checkbox> 194 194 + </Toggle> 181 195 182 182 - <Checkbox 183 183 - checked={showComments} 184 184 - onChange={(e) => setShowComments(e.target.checked)} 185 185 - > 186 186 - <div className=" pt-0.5 flex flex-col text-sm italic text-tertiary "> 187 187 - <p className="font-bold">Show comments on posts</p> 188 188 - </div> 189 189 - </Checkbox> 196 196 + 190 197 </div> 191 198 </form> 192 199 );

+24 -5

app/lish/createPub/createPublication.ts

··· 1 1 "use server"; 2 2 import { TID } from "@atproto/common"; 3 3 import { AtpBaseClient, PubLeafletPublication } from "lexicons/api"; 4 4 - import { createOauthClient } from "src/atproto-oauth"; 4 4 + import { 5 5 + restoreOAuthSession, 6 6 + OAuthSessionError, 7 7 + } from "src/atproto-oauth"; 5 8 import { getIdentityData } from "actions/getIdentityData"; 6 9 import { supabaseServerClient } from "supabase/serverClient"; 7 10 import { Un$Typed } from "@atproto/api"; ··· 18 21 .min(3) 19 22 .max(63) 20 23 .regex(/^[a-z0-9-]+$/); 24 24 + type CreatePublicationResult = 25 25 + | { success: true; publication: any } 26 26 + | { success: false; error?: OAuthSessionError }; 27 27 + 21 28 export async function createPublication({ 22 29 name, 23 30 description, ··· 30 37 iconFile: File | null; 31 38 subdomain: string; 32 39 preferences: Omit<PubLeafletPublication.Preferences, "$type">; 33 33 - }) { 40 40 + }): Promise<CreatePublicationResult> { 34 41 let isSubdomainValid = subdomainValidator.safeParse(subdomain); 35 42 if (!isSubdomainValid.success) { 36 43 return { success: false }; 37 44 } 38 38 - const oauthClient = await createOauthClient(); 39 45 let identity = await getIdentityData(); 40 40 - if (!identity || !identity.atp_did) return; 46 46 + if (!identity || !identity.atp_did) { 47 47 + return { 48 48 + success: false, 49 49 + error: { 50 50 + type: "oauth_session_expired", 51 51 + message: "Not authenticated", 52 52 + did: "", 53 53 + }, 54 54 + }; 55 55 + } 41 56 42 57 let domain = `${subdomain}.leaflet.pub`; 43 58 44 44 - let credentialSession = await oauthClient.restore(identity.atp_did); 59 59 + const sessionResult = await restoreOAuthSession(identity.atp_did); 60 60 + if (!sessionResult.ok) { 61 61 + return { success: false, error: sessionResult.error }; 62 62 + } 63 63 + let credentialSession = sessionResult.value; 45 64 let agent = new AtpBaseClient( 46 65 credentialSession.fetchHandler.bind(credentialSession), 47 66 );

+66 -18

app/lish/createPub/updatePublication.ts

··· 5 5 PubLeafletPublication, 6 6 PubLeafletThemeColor, 7 7 } from "lexicons/api"; 8 8 - import { createOauthClient } from "src/atproto-oauth"; 8 8 + import { restoreOAuthSession, OAuthSessionError } from "src/atproto-oauth"; 9 9 import { getIdentityData } from "actions/getIdentityData"; 10 10 import { supabaseServerClient } from "supabase/serverClient"; 11 11 import { Json } from "supabase/database.types"; 12 12 import { AtUri } from "@atproto/syntax"; 13 13 import { $Typed } from "@atproto/api"; 14 14 + 15 15 + type UpdatePublicationResult = 16 16 + | { success: true; publication: any } 17 17 + | { success: false; error?: OAuthSessionError }; 14 18 15 19 export async function updatePublication({ 16 20 uri, ··· 21 25 }: { 22 26 uri: string; 23 27 name: string; 24 24 - description: string; 25 25 - iconFile: File | null; 28 28 + description?: string; 29 29 + iconFile?: File | null; 26 30 preferences?: Omit<PubLeafletPublication.Preferences, "$type">; 27 27 - }) { 28 28 - const oauthClient = await createOauthClient(); 31 31 + }): Promise<UpdatePublicationResult> { 29 32 let identity = await getIdentityData(); 30 30 - if (!identity || !identity.atp_did) return; 33 33 + if (!identity || !identity.atp_did) { 34 34 + return { 35 35 + success: false, 36 36 + error: { 37 37 + type: "oauth_session_expired", 38 38 + message: "Not authenticated", 39 39 + did: "", 40 40 + }, 41 41 + }; 42 42 + } 31 43 32 32 - let credentialSession = await oauthClient.restore(identity.atp_did); 44 44 + const sessionResult = await restoreOAuthSession(identity.atp_did); 45 45 + if (!sessionResult.ok) { 46 46 + return { success: false, error: sessionResult.error }; 47 47 + } 48 48 + let credentialSession = sessionResult.value; 33 49 let agent = new AtpBaseClient( 34 50 credentialSession.fetchHandler.bind(credentialSession), 35 51 ); ··· 38 54 .select("*") 39 55 .eq("uri", uri) 40 56 .single(); 41 41 - if (!existingPub || existingPub.identity_did !== identity.atp_did) return; 57 57 + if (!existingPub || existingPub.identity_did !== identity.atp_did) { 58 58 + return { success: false }; 59 59 + } 42 60 let aturi = new AtUri(existingPub.uri); 43 61 44 62 let record: PubLeafletPublication.Record = { ··· 94 112 }: { 95 113 uri: string; 96 114 base_path: string; 97 97 - }) { 98 98 - const oauthClient = await createOauthClient(); 115 115 + }): Promise<UpdatePublicationResult> { 99 116 let identity = await getIdentityData(); 100 100 - if (!identity || !identity.atp_did) return; 117 117 + if (!identity || !identity.atp_did) { 118 118 + return { 119 119 + success: false, 120 120 + error: { 121 121 + type: "oauth_session_expired", 122 122 + message: "Not authenticated", 123 123 + did: "", 124 124 + }, 125 125 + }; 126 126 + } 101 127 102 102 - let credentialSession = await oauthClient.restore(identity.atp_did); 128 128 + const sessionResult = await restoreOAuthSession(identity.atp_did); 129 129 + if (!sessionResult.ok) { 130 130 + return { success: false, error: sessionResult.error }; 131 131 + } 132 132 + let credentialSession = sessionResult.value; 103 133 let agent = new AtpBaseClient( 104 134 credentialSession.fetchHandler.bind(credentialSession), 105 135 ); ··· 108 138 .select("*") 109 139 .eq("uri", uri) 110 140 .single(); 111 111 - if (!existingPub || existingPub.identity_did !== identity.atp_did) return; 141 141 + if (!existingPub || existingPub.identity_did !== identity.atp_did) { 142 142 + return { success: false }; 143 143 + } 112 144 let aturi = new AtUri(existingPub.uri); 113 145 114 146 let record: PubLeafletPublication.Record = { ··· 149 181 backgroundImage?: File | null; 150 182 backgroundRepeat?: number | null; 151 183 backgroundColor: Color; 184 184 + pageWidth?: number; 152 185 primary: Color; 153 186 pageBackground: Color; 154 187 showPageBackground: boolean; 155 188 accentBackground: Color; 156 189 accentText: Color; 157 190 }; 158 158 - }) { 159 159 - const oauthClient = await createOauthClient(); 191 191 + }): Promise<UpdatePublicationResult> { 160 192 let identity = await getIdentityData(); 161 161 - if (!identity || !identity.atp_did) return; 193 193 + if (!identity || !identity.atp_did) { 194 194 + return { 195 195 + success: false, 196 196 + error: { 197 197 + type: "oauth_session_expired", 198 198 + message: "Not authenticated", 199 199 + did: "", 200 200 + }, 201 201 + }; 202 202 + } 162 203 163 163 - let credentialSession = await oauthClient.restore(identity.atp_did); 204 204 + const sessionResult = await restoreOAuthSession(identity.atp_did); 205 205 + if (!sessionResult.ok) { 206 206 + return { success: false, error: sessionResult.error }; 207 207 + } 208 208 + let credentialSession = sessionResult.value; 164 209 let agent = new AtpBaseClient( 165 210 credentialSession.fetchHandler.bind(credentialSession), 166 211 ); ··· 169 214 .select("*") 170 215 .eq("uri", uri) 171 216 .single(); 172 172 - if (!existingPub || existingPub.identity_did !== identity.atp_did) return; 217 217 + if (!existingPub || existingPub.identity_did !== identity.atp_did) { 218 218 + return { success: false }; 219 219 + } 173 220 let aturi = new AtUri(existingPub.uri); 174 221 175 222 let oldRecord = existingPub.record as PubLeafletPublication.Record; ··· 197 244 ...theme.backgroundColor, 198 245 } 199 246 : undefined, 247 247 + pageWidth: theme.pageWidth, 200 248 primary: { 201 249 ...theme.primary, 202 250 },

+40 -9

app/lish/subscribeToPublication.ts

··· 3 3 import { AtpBaseClient } from "lexicons/api"; 4 4 import { AppBskyActorDefs, Agent as BskyAgent } from "@atproto/api"; 5 5 import { getIdentityData } from "actions/getIdentityData"; 6 6 - import { createOauthClient } from "src/atproto-oauth"; 6 6 + import { 7 7 + restoreOAuthSession, 8 8 + OAuthSessionError, 9 9 + } from "src/atproto-oauth"; 7 10 import { TID } from "@atproto/common"; 8 11 import { supabaseServerClient } from "supabase/serverClient"; 9 12 import { revalidatePath } from "next/cache"; ··· 21 24 let leafletFeedURI = 22 25 "at://did:plc:btxrwcaeyodrap5mnjw2fvmz/app.bsky.feed.generator/subscribedPublications"; 23 26 let idResolver = new IdResolver(); 27 27 + 28 28 + type SubscribeResult = 29 29 + | { success: true; hasFeed: boolean } 30 30 + | { success: false; error: OAuthSessionError }; 31 31 + 24 32 export async function subscribeToPublication( 25 33 publication: string, 26 34 redirectRoute?: string, 27 27 - ) { 28 28 - const oauthClient = await createOauthClient(); 35 35 + ): Promise<SubscribeResult | never> { 29 36 let identity = await getIdentityData(); 30 37 if (!identity || !identity.atp_did) { 31 38 return redirect( ··· 33 40 ); 34 41 } 35 42 36 36 - let credentialSession = await oauthClient.restore(identity.atp_did); 43 43 + const sessionResult = await restoreOAuthSession(identity.atp_did); 44 44 + if (!sessionResult.ok) { 45 45 + return { success: false, error: sessionResult.error }; 46 46 + } 47 47 + let credentialSession = sessionResult.value; 37 48 let agent = new AtpBaseClient( 38 49 credentialSession.fetchHandler.bind(credentialSession), 39 50 ); ··· 90 101 ) as AppBskyActorDefs.SavedFeedsPrefV2; 91 102 revalidatePath("/lish/[did]/[publication]", "layout"); 92 103 return { 104 104 + success: true, 93 105 hasFeed: !!savedFeeds.items.find((feed) => feed.value === leafletFeedURI), 94 106 }; 95 107 } 96 108 97 97 - export async function unsubscribeToPublication(publication: string) { 98 98 - const oauthClient = await createOauthClient(); 109 109 + type UnsubscribeResult = 110 110 + | { success: true } 111 111 + | { success: false; error: OAuthSessionError }; 112 112 + 113 113 + export async function unsubscribeToPublication( 114 114 + publication: string 115 115 + ): Promise<UnsubscribeResult> { 99 116 let identity = await getIdentityData(); 100 100 - if (!identity || !identity.atp_did) return; 117 117 + if (!identity || !identity.atp_did) { 118 118 + return { 119 119 + success: false, 120 120 + error: { 121 121 + type: "oauth_session_expired", 122 122 + message: "Not authenticated", 123 123 + did: "", 124 124 + }, 125 125 + }; 126 126 + } 101 127 102 102 - let credentialSession = await oauthClient.restore(identity.atp_did); 128 128 + const sessionResult = await restoreOAuthSession(identity.atp_did); 129 129 + if (!sessionResult.ok) { 130 130 + return { success: false, error: sessionResult.error }; 131 131 + } 132 132 + let credentialSession = sessionResult.value; 103 133 let agent = new AtpBaseClient( 104 134 credentialSession.fetchHandler.bind(credentialSession), 105 135 ); ··· 109 139 .eq("identity", identity.atp_did) 110 140 .eq("publication", publication) 111 141 .single(); 112 112 - if (!existingSubscription) return; 142 142 + if (!existingSubscription) return { success: true }; 113 143 await agent.pub.leaflet.graph.subscription.delete({ 114 144 repo: credentialSession.did!, 115 145 rkey: new AtUri(existingSubscription.uri).rkey, ··· 120 150 .eq("identity", identity.atp_did) 121 151 .eq("publication", publication); 122 152 revalidatePath("/lish/[did]/[publication]", "layout"); 153 153 + return { success: true }; 123 154 }

+14 -6

app/lish/uri/[uri]/route.ts

··· 9 9 */ 10 10 export async function GET( 11 11 request: NextRequest, 12 12 - { params }: { params: Promise<{ uri: string }> } 12 12 + { params }: { params: Promise<{ uri: string }> }, 13 13 ) { 14 14 try { 15 15 const { uri: uriParam } = await params; ··· 32 32 const basePath = record.base_path; 33 33 34 34 if (!basePath) { 35 35 - return new NextResponse("Publication has no base_path", { status: 404 }); 35 35 + return new NextResponse("Publication has no base_path", { 36 36 + status: 404, 37 37 + }); 36 38 } 37 39 38 40 // Redirect to the publication's hosted domain (temporary redirect since base_path can change) ··· 47 49 48 50 if (docInPub?.publication && docInPub.publications) { 49 51 // Document is in a publication - redirect to domain/rkey 50 50 - const record = docInPub.publications.record as PubLeafletPublication.Record; 52 52 + const record = docInPub.publications 53 53 + .record as PubLeafletPublication.Record; 51 54 const basePath = record.base_path; 52 55 53 56 if (!basePath) { 54 54 - return new NextResponse("Publication has no base_path", { status: 404 }); 57 57 + return new NextResponse("Publication has no base_path", { 58 58 + status: 404, 59 59 + }); 55 60 } 56 61 57 62 // Ensure basePath ends without trailing slash ··· 60 65 : basePath; 61 66 62 67 // Redirect to the document on the publication's domain (temporary redirect since base_path can change) 63 63 - return NextResponse.redirect(`${cleanBasePath}/${uri.rkey}`, 307); 68 68 + return NextResponse.redirect( 69 69 + `https://${cleanBasePath}/${uri.rkey}`, 70 70 + 307, 71 71 + ); 64 72 } 65 73 66 74 // If not in a publication, check if it's a standalone document ··· 74 82 // Standalone document - redirect to /p/did/rkey (temporary redirect) 75 83 return NextResponse.redirect( 76 84 new URL(`/p/${uri.host}/${uri.rkey}`, request.url), 77 77 - 307 85 85 + 307, 78 86 ); 79 87 } 80 88

+59 -4

app/p/[didOrHandle]/[rkey]/opengraph-image.ts

··· 1 1 import { getMicroLinkOgImage } from "src/utils/getMicroLinkOgImage"; 2 2 + import { supabaseServerClient } from "supabase/serverClient"; 3 3 + import { AtUri } from "@atproto/syntax"; 4 4 + import { ids } from "lexicons/api/lexicons"; 5 5 + import { PubLeafletDocument } from "lexicons/api"; 6 6 + import { jsonToLex } from "@atproto/lexicon"; 7 7 + import { idResolver } from "app/(home-pages)/reader/idResolver"; 8 8 + import { fetchAtprotoBlob } from "app/api/atproto_images/route"; 2 9 3 3 - export const runtime = "edge"; 4 10 export const revalidate = 60; 5 11 6 12 export default async function OpenGraphImage(props: { 7 13 params: Promise<{ rkey: string; didOrHandle: string }>; 8 14 }) { 9 15 let params = await props.params; 10 10 - return getMicroLinkOgImage( 11 11 - `/p/${params.didOrHandle}/${params.rkey}/`, 12 12 - ); 16 16 + let didOrHandle = decodeURIComponent(params.didOrHandle); 17 17 + 18 18 + // Resolve handle to DID if needed 19 19 + let did = didOrHandle; 20 20 + if (!didOrHandle.startsWith("did:")) { 21 21 + try { 22 22 + let resolved = await idResolver.handle.resolve(didOrHandle); 23 23 + if (resolved) did = resolved; 24 24 + } catch (e) { 25 25 + // Fall back to screenshot if handle resolution fails 26 26 + } 27 27 + } 28 28 + 29 29 + if (did) { 30 30 + // Try to get the document's cover image 31 31 + let { data: document } = await supabaseServerClient 32 32 + .from("documents") 33 33 + .select("data") 34 34 + .eq("uri", AtUri.make(did, ids.PubLeafletDocument, params.rkey).toString()) 35 35 + .single(); 36 36 + 37 37 + if (document) { 38 38 + let docRecord = jsonToLex(document.data) as PubLeafletDocument.Record; 39 39 + if (docRecord.coverImage) { 40 40 + try { 41 41 + // Get CID from the blob ref (handle both serialized and hydrated forms) 42 42 + let cid = 43 43 + (docRecord.coverImage.ref as unknown as { $link: string })["$link"] || 44 44 + docRecord.coverImage.ref.toString(); 45 45 + 46 46 + let imageResponse = await fetchAtprotoBlob(did, cid); 47 47 + if (imageResponse) { 48 48 + let imageBlob = await imageResponse.blob(); 49 49 + 50 50 + // Return the image with appropriate headers 51 51 + return new Response(imageBlob, { 52 52 + headers: { 53 53 + "Content-Type": imageBlob.type || "image/jpeg", 54 54 + "Cache-Control": "public, max-age=3600", 55 55 + }, 56 56 + }); 57 57 + } 58 58 + } catch (e) { 59 59 + // Fall through to screenshot if cover image fetch fails 60 60 + console.error("Failed to fetch cover image:", e); 61 61 + } 62 62 + } 63 63 + } 64 64 + } 65 65 + 66 66 + // Fall back to screenshot 67 67 + return getMicroLinkOgImage(`/p/${params.didOrHandle}/${params.rkey}/`); 13 68 }

+9 -7

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

··· 5 5 import { Metadata } from "next"; 6 6 import { idResolver } from "app/(home-pages)/reader/idResolver"; 7 7 import { DocumentPageRenderer } from "app/lish/[did]/[publication]/[rkey]/DocumentPageRenderer"; 8 8 + import { NotFoundLayout } from "components/PageLayouts/NotFoundLayout"; 8 9 9 10 export async function generateMetadata(props: { 10 11 params: Promise<{ didOrHandle: string; rkey: string }>; ··· 34 35 let docRecord = document.data as PubLeafletDocument.Record; 35 36 36 37 // For documents in publications, include publication name 37 37 - let publicationName = document.documents_in_publications[0]?.publications?.name; 38 38 + let publicationName = 39 39 + document.documents_in_publications[0]?.publications?.name; 38 40 39 41 return { 40 42 icons: { ··· 63 65 let resolved = await idResolver.handle.resolve(didOrHandle); 64 66 if (!resolved) { 65 67 return ( 66 66 - <div className="p-4 text-lg text-center flex flex-col gap-4"> 67 67 - <p>Sorry, can&apos;t resolve handle.</p> 68 68 + <NotFoundLayout> 69 69 + <p className="font-bold">Sorry, we can't find this handle!</p> 68 70 <p> 69 71 This may be a glitch on our end. If the issue persists please{" "} 70 72 <a href="mailto:contact@leaflet.pub">send us a note</a>. 71 73 </p> 72 72 - </div> 74 74 + </NotFoundLayout> 73 75 ); 74 76 } 75 77 did = resolved; 76 78 } catch (e) { 77 79 return ( 78 78 - <div className="p-4 text-lg text-center flex flex-col gap-4"> 79 79 - <p>Sorry, can&apos;t resolve handle.</p> 80 80 + <NotFoundLayout> 81 81 + <p className="font-bold">Sorry, we can't find this leaflet!</p> 80 82 <p> 81 83 This may be a glitch on our end. If the issue persists please{" "} 82 84 <a href="mailto:contact@leaflet.pub">send us a note</a>. 83 85 </p> 84 84 - </div> 86 86 + </NotFoundLayout> 85 87 ); 86 88 } 87 89 }

+8 -32

appview/index.ts

··· 20 20 } from "@atproto/api"; 21 21 import { AtUri } from "@atproto/syntax"; 22 22 import { writeFile, readFile } from "fs/promises"; 23 23 - import { createIdentity } from "actions/createIdentity"; 24 24 - import { drizzle } from "drizzle-orm/node-postgres"; 25 23 import { inngest } from "app/api/inngest/client"; 26 26 - import { Client } from "pg"; 27 24 28 25 const cursorFile = process.env.CURSOR_FILE || "/cursor/cursor"; 29 26 ··· 135 132 if (evt.event === "create" || evt.event === "update") { 136 133 let record = PubLeafletPublication.validateRecord(evt.record); 137 134 if (!record.success) return; 138 138 - let { error } = await supabase.from("publications").upsert({ 135 135 + await supabase 136 136 + .from("identities") 137 137 + .upsert({ atp_did: evt.did }, { onConflict: "atp_did" }); 138 138 + await supabase.from("publications").upsert({ 139 139 uri: evt.uri.toString(), 140 140 identity_did: evt.did, 141 141 name: record.value.name, 142 142 record: record.value as Json, 143 143 }); 144 144 - 145 145 - if (error && error.code === "23503") { 146 146 - console.log("creating identity"); 147 147 - let client = new Client({ connectionString: process.env.DB_URL }); 148 148 - let db = drizzle(client); 149 149 - await createIdentity(db, { atp_did: evt.did }); 150 150 - client.end(); 151 151 - await supabase.from("publications").upsert({ 152 152 - uri: evt.uri.toString(), 153 153 - identity_did: evt.did, 154 154 - name: record.value.name, 155 155 - record: record.value as Json, 156 156 - }); 157 157 - } 158 144 } 159 145 if (evt.event === "delete") { 160 146 await supabase ··· 222 208 if (evt.event === "create" || evt.event === "update") { 223 209 let record = PubLeafletGraphSubscription.validateRecord(evt.record); 224 210 if (!record.success) return; 225 225 - let { error } = await supabase.from("publication_subscriptions").upsert({ 211 211 + await supabase 212 212 + .from("identities") 213 213 + .upsert({ atp_did: evt.did }, { onConflict: "atp_did" }); 214 214 + await supabase.from("publication_subscriptions").upsert({ 226 215 uri: evt.uri.toString(), 227 216 identity: evt.did, 228 217 publication: record.value.publication, 229 218 record: record.value as Json, 230 219 }); 231 231 - if (error && error.code === "23503") { 232 232 - console.log("creating identity"); 233 233 - let client = new Client({ connectionString: process.env.DB_URL }); 234 234 - let db = drizzle(client); 235 235 - await createIdentity(db, { atp_did: evt.did }); 236 236 - client.end(); 237 237 - await supabase.from("publication_subscriptions").upsert({ 238 238 - uri: evt.uri.toString(), 239 239 - identity: evt.did, 240 240 - publication: record.value.publication, 241 241 - record: record.value as Json, 242 242 - }); 243 243 - } 244 220 } 245 221 if (evt.event === "delete") { 246 222 await supabase

+3 -3

components/ActionBar/ActionButton.tsx

··· 3 3 import { useContext, useEffect } from "react"; 4 4 import { SidebarContext } from "./Sidebar"; 5 5 import React, { forwardRef, type JSX } from "react"; 6 6 - import { PopoverOpenContext } from "components/Popover"; 6 6 + import { PopoverOpenContext } from "components/Popover/PopoverContext"; 7 7 8 8 type ButtonProps = Omit<JSX.IntrinsicElements["button"], "content">; 9 9 ··· 70 70 > 71 71 <div className="shrink-0">{icon}</div> 72 72 <div 73 73 - className={`flex flex-col pr-1 leading-snug max-w-full min-w-0 ${sidebar.open ? "block" : showLabelOnMobile ? "sm:hidden block" : "hidden"}`} 73 73 + className={`flex flex-col pr-1 ${subtext && "leading-snug"} max-w-full min-w-0 ${sidebar.open ? "block" : showLabelOnMobile ? "sm:hidden block" : "hidden"}`} 74 74 > 75 75 - <div className="truncate text-left pt-[1px]">{label}</div> 75 75 + <div className="truncate text-left">{label}</div> 76 76 {subtext && ( 77 77 <div className="text-xs text-tertiary font-normal text-left"> 78 78 {subtext}

+2 -1

components/ActionBar/Navigation.tsx

··· 25 25 | "discover" 26 26 | "notifications" 27 27 | "looseleafs" 28 28 - | "tag"; 28 28 + | "tag" 29 29 + | "profile"; 29 30 30 31 export const DesktopNavigation = (props: { 31 32 currentPage: navPages;

+1 -1

components/ActionBar/Publications.tsx

··· 193 193 194 194 return props.record.icon ? ( 195 195 <div 196 196 - className={`${iconSizeClassName} ${props.className} relative overflow-hidden`} 196 196 + className={`${iconSizeClassName} ${props.className} relative overflow-hidden shrink-0`} 197 197 > 198 198 <img 199 199 src={`/api/atproto_images?did=${new AtUri(props.uri).host}&cid=${(props.record.icon?.ref as unknown as { $link: string })["$link"]}`}

+2 -2

components/AtMentionLink.tsx

··· 24 24 isPublication || isDocument ? ( 25 25 <img 26 26 src={`/api/pub_icon?at_uri=${encodeURIComponent(atURI)}`} 27 27 - className="inline-block w-5 h-5 rounded-full mr-1 align-text-top" 27 27 + className="inline-block w-4 h-4 rounded-full mr-1 mt-[3px] align-text-top" 28 28 alt="" 29 29 width="20" 30 30 height="20" ··· 37 37 href={atUriToUrl(atURI)} 38 38 target="_blank" 39 39 rel="noopener noreferrer" 40 40 - className={`text-accent-contrast hover:underline cursor-pointer ${isPublication ? "font-bold" : ""} ${isDocument ? "italic" : ""} ${className}`} 40 40 + className={`mention ${isPublication ? "font-bold" : ""} ${isDocument ? "italic" : ""} ${className}`} 41 41 > 42 42 {icon} 43 43 {children}

+4 -1

components/Avatar.tsx

··· 3 3 export const Avatar = (props: { 4 4 src: string | undefined; 5 5 displayName: string | undefined; 6 6 + className?: string; 6 7 tiny?: boolean; 8 8 + large?: boolean; 9 9 + giant?: boolean; 7 10 }) => { 8 11 if (props.src) 9 12 return ( 10 13 <img 11 11 - className={`${props.tiny ? "w-4 h-4" : "w-5 h-5"} rounded-full shrink-0 border border-border-light`} 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}`} 12 15 src={props.src} 13 16 alt={ 14 17 props.displayName

+27 -1

components/Blocks/Block.tsx

··· 10 10 import { useHandleDrop } from "./useHandleDrop"; 11 11 import { useEntitySetContext } from "components/EntitySetProvider"; 12 12 13 13 - import { TextBlock } from "components/Blocks/TextBlock"; 13 13 + import { TextBlock } from "./TextBlock/index"; 14 14 import { ImageBlock } from "./ImageBlock"; 15 15 import { PageLinkBlock } from "./PageLinkBlock"; 16 16 import { ExternalLinkBlock } from "./ExternalLinkBlock"; ··· 381 381 )} 382 382 </> 383 383 ); 384 384 + }; 385 385 + 386 386 + export const BlockLayout = (props: { 387 387 + isSelected?: boolean; 388 388 + children: React.ReactNode; 389 389 + className?: string; 390 390 + hasBackground?: "accent" | "page"; 391 391 + borderOnHover?: boolean; 392 392 + }) => { 393 393 + return ( 394 394 + <div 395 395 + className={`block ${props.className} p-2 sm:p-3 w-full overflow-hidden 396 396 + ${props.isSelected ? "block-border-selected " : "block-border"} 397 397 + ${props.borderOnHover && "hover:border-accent-contrast! hover:outline-accent-contrast! focus-within:border-accent-contrast! focus-within:outline-accent-contrast!"}`} 398 398 + style={{ 399 399 + backgroundColor: 400 400 + props.hasBackground === "accent" 401 401 + ? "var(--accent-light)" 402 402 + : props.hasBackground === "page" 403 403 + ? "rgb(var(--bg-page))" 404 404 + : "transparent", 405 405 + }} 406 406 + > 407 407 + {props.children} 408 408 + </div> 409 409 + ); 384 410 }; 385 411 386 412 export const ListMarker = (

+3 -3

components/Blocks/BlockCommands.tsx

··· 2 2 import { useUIState } from "src/useUIState"; 3 3 4 4 import { generateKeyBetween } from "fractional-indexing"; 5 5 - import { focusPage } from "components/Pages"; 5 5 + import { focusPage } from "src/utils/focusPage"; 6 6 import { v7 } from "uuid"; 7 7 import { Replicache } from "replicache"; 8 8 import { useEditorStates } from "src/state/useEditorState"; 9 9 import { elementId } from "src/utils/elementId"; 10 10 import { UndoManager } from "src/undoManager"; 11 11 import { focusBlock } from "src/utils/focusBlock"; 12 12 - import { usePollBlockUIState } from "./PollBlock"; 13 13 - import { focusElement } from "components/Input"; 12 12 + import { usePollBlockUIState } from "./PollBlock/pollBlockState"; 13 13 + import { focusElement } from "src/utils/focusElement"; 14 14 import { BlockBlueskySmall } from "components/Icons/BlockBlueskySmall"; 15 15 import { BlockButtonSmall } from "components/Icons/BlockButtonSmall"; 16 16 import { BlockCalendarSmall } from "components/Icons/BlockCalendarSmall";

+59 -31

components/Blocks/BlueskyPostBlock/BlueskyEmbed.tsx

··· 23 23 return ( 24 24 <div className="flex flex-wrap rounded-md w-full overflow-hidden"> 25 25 {imageEmbed.images.map( 26 26 - (image: { fullsize: string; alt?: string }, i: number) => ( 27 27 - <img 28 28 - key={i} 29 29 - src={image.fullsize} 30 30 - alt={image.alt || "Post image"} 31 31 - className={` 32 32 - overflow-hidden w-full object-cover 33 33 - ${imageEmbed.images.length === 1 && "h-auto max-h-[800px]"} 34 34 - ${imageEmbed.images.length === 2 && "basis-1/2 aspect-square"} 35 35 - ${imageEmbed.images.length === 3 && "basis-1/3 aspect-2/3"} 26 26 + ( 27 27 + image: { 28 28 + fullsize: string; 29 29 + alt?: string; 30 30 + aspectRatio?: { width: number; height: number }; 31 31 + }, 32 32 + i: number, 33 33 + ) => { 34 34 + const isSingle = imageEmbed.images.length === 1; 35 35 + const aspectRatio = image.aspectRatio 36 36 + ? image.aspectRatio.width / image.aspectRatio.height 37 37 + : undefined; 38 38 + 39 39 + return ( 40 40 + <img 41 41 + key={i} 42 42 + src={image.fullsize} 43 43 + alt={image.alt || "Post image"} 44 44 + style={ 45 45 + isSingle && aspectRatio 46 46 + ? { aspectRatio: String(aspectRatio) } 47 47 + : undefined 48 48 + } 49 49 + className={` 50 50 + overflow-hidden w-full object-cover 51 51 + ${isSingle && "max-h-[800px]"} 52 52 + ${imageEmbed.images.length === 2 && "basis-1/2 aspect-square"} 53 53 + ${imageEmbed.images.length === 3 && "basis-1/3 aspect-2/3"} 36 54 ${ 37 55 imageEmbed.images.length === 4 38 56 ? "basis-1/2 aspect-3/2" 39 39 - : `basis-1/${imageEmbed.images.length} ` 57 57 + : `basis-1/${imageEmbed.images.length}` 40 58 } 41 41 - `} 42 42 - /> 43 43 - ), 59 59 + `} 60 60 + /> 61 61 + ); 62 62 + }, 44 63 )} 45 64 </div> 46 65 ); ··· 49 68 let isGif = externalEmbed.external.uri.includes(".gif"); 50 69 if (isGif) { 51 70 return ( 52 52 - <div className="flex flex-col border border-border-light rounded-md overflow-hidden"> 71 71 + <div className="flex flex-col border border-border-light rounded-md overflow-hidden aspect-video"> 53 72 <img 54 73 src={externalEmbed.external.uri} 55 74 alt={externalEmbed.external.title} 56 56 - className="object-cover" 75 75 + className="w-full h-full object-cover" 57 76 /> 58 77 </div> 59 78 ); ··· 66 85 > 67 86 {externalEmbed.external.thumb === undefined ? null : ( 68 87 <> 69 69 - <img 70 70 - src={externalEmbed.external.thumb} 71 71 - alt={externalEmbed.external.title} 72 72 - className="object-cover" 73 73 - /> 74 74 - 75 75 - <hr className="border-border-light " /> 88 88 + <div className="w-full aspect-[1.91/1] overflow-hidden"> 89 89 + <img 90 90 + src={externalEmbed.external.thumb} 91 91 + alt={externalEmbed.external.title} 92 92 + className="w-full h-full object-cover" 93 93 + /> 94 94 + </div> 95 95 + <hr className="border-border-light" /> 76 96 </> 77 97 )} 78 98 <div className="p-2 flex flex-col gap-1"> ··· 91 111 ); 92 112 case AppBskyEmbedVideo.isView(props.embed): 93 113 let videoEmbed = props.embed; 114 114 + const videoAspectRatio = videoEmbed.aspectRatio 115 115 + ? videoEmbed.aspectRatio.width / videoEmbed.aspectRatio.height 116 116 + : 16 / 9; 94 117 return ( 95 95 - <div className="rounded-md overflow-hidden relative"> 118 118 + <div 119 119 + className="rounded-md overflow-hidden relative w-full" 120 120 + style={{ aspectRatio: String(videoAspectRatio) }} 121 121 + > 96 122 <img 97 123 src={videoEmbed.thumbnail} 98 124 alt={ 99 125 "Thumbnail from embedded video. Go to Bluesky to see the full post." 100 126 } 101 101 - className={`overflow-hidden w-full object-cover`} 127 127 + className="absolute inset-0 w-full h-full object-cover" 102 128 /> 103 103 - <div className="overlay absolute top-0 right-0 left-0 bottom-0 bg-primary opacity-65" /> 129 129 + <div className="overlay absolute inset-0 bg-primary opacity-65" /> 104 130 <div className="absolute w-max top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-border-light rounded-md"> 105 131 <SeePostOnBluesky postUrl={props.postUrl} /> 106 132 </div> ··· 122 148 } 123 149 return ( 124 150 <div 125 125 - className={`flex flex-col gap-1 relative w-full overflow-hidden sm:p-3 p-2 text-xs block-border`} 151 151 + className={`flex flex-col gap-0.5 relative w-full overflow-hidden p-2! text-xs block-border`} 126 152 > 127 127 - <div className="bskyAuthor w-full flex items-center gap-1"> 153 153 + <div className="bskyAuthor w-full flex items-center "> 128 154 {record.author.avatar && ( 129 155 <img 130 156 src={record.author?.avatar} 131 157 alt={`${record.author?.displayName}'s avatar`} 132 132 - className="shink-0 w-6 h-6 rounded-full border border-border-light" 158 158 + className="shink-0 w-6 h-6 rounded-full border border-border-light mr-[6px]" 133 159 /> 134 160 )} 135 135 - <div className=" font-bold text-secondary"> 161 161 + <div className=" font-bold text-secondary mr-1"> 136 162 {record.author?.displayName} 137 163 </div> 138 164 <a ··· 145 171 </div> 146 172 147 173 <div className="flex flex-col gap-2 "> 148 148 - {text && <pre className="whitespace-pre-wrap">{text}</pre>} 174 174 + {text && ( 175 175 + <pre className="whitespace-pre-wrap text-secondary">{text}</pre> 176 176 + )} 149 177 {record.embeds !== undefined 150 178 ? record.embeds.map((embed, index) => ( 151 179 <BlueskyEmbed embed={embed} key={index} />

+9 -12

components/Blocks/BlueskyPostBlock/index.tsx

··· 2 2 import { useEffect, useState } from "react"; 3 3 import { useEntity } from "src/replicache"; 4 4 import { useUIState } from "src/useUIState"; 5 5 - import { BlockProps } from "../Block"; 5 5 + import { BlockProps, BlockLayout } from "../Block"; 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"; ··· 56 56 AppBskyFeedDefs.isBlockedAuthor(post) || 57 57 AppBskyFeedDefs.isNotFoundPost(post): 58 58 return ( 59 59 - <div 60 60 - className={`w-full ${isSelected ? "block-border-selected" : "block-border"}`} 61 61 - > 59 59 + <BlockLayout isSelected={!!isSelected} className="w-full"> 62 60 <PostNotAvailable /> 63 63 - </div> 61 61 + </BlockLayout> 64 62 ); 65 63 66 64 case AppBskyFeedDefs.isThreadViewPost(post): ··· 81 79 let url = `https://bsky.app/profile/${post.post.author.handle}/post/${postId}`; 82 80 83 81 return ( 84 84 - <div 85 85 - className={` 86 86 - flex flex-col gap-2 relative w-full overflow-hidden group/blueskyPostBlock sm:p-3 p-2 text-sm text-secondary bg-bg-page 87 87 - ${isSelected ? "block-border-selected " : "block-border"} 88 88 - `} 82 82 + <BlockLayout 83 83 + isSelected={!!isSelected} 84 84 + hasBackground="page" 85 85 + className="flex flex-col gap-2 relative overflow-hidden group/blueskyPostBlock text-sm text-secondary" 89 86 > 90 87 {post.post.author && record && ( 91 88 <> ··· 130 127 <div className="w-full flex gap-2 items-center justify-between"> 131 128 {timestamp && <PostDate timestamp={timestamp} />} 132 129 <div className="flex gap-2 items-center"> 133 133 - {post.post.replyCount && post.post.replyCount > 0 && ( 130 130 + {post.post.replyCount != null && post.post.replyCount > 0 && ( 134 131 <> 135 132 <a 136 133 className="flex items-center gap-1 hover:no-underline" ··· 149 146 </a> 150 147 </div> 151 148 </div> 152 152 - </div> 149 149 + </BlockLayout> 153 150 ); 154 151 } 155 152 };

+103 -103

components/Blocks/ButtonBlock.tsx

··· 3 3 import { useCallback, useEffect, useState } from "react"; 4 4 import { useEntity, useReplicache } from "src/replicache"; 5 5 import { useUIState } from "src/useUIState"; 6 6 - import { BlockProps } from "./Block"; 6 6 + import { BlockProps, BlockLayout } from "./Block"; 7 7 import { v7 } from "uuid"; 8 8 import { useSmoker } from "components/Toast"; 9 9 ··· 106 106 }; 107 107 108 108 return ( 109 109 - <div className="buttonBlockSettingsWrapper flex flex-col gap-2 w-full"> 109 109 + <div className="buttonBlockSettingsWrapper flex flex-col gap-2 w-full "> 110 110 <ButtonPrimary className="mx-auto"> 111 111 {text !== "" ? text : "Button"} 112 112 </ButtonPrimary> 113 113 - 114 114 - <form 115 115 - className={` 116 116 - buttonBlockSettingsBorder 117 117 - w-full bg-bg-page 118 118 - text-tertiary hover:text-accent-contrast hover:cursor-pointer hover:p-0 119 119 - flex flex-col gap-2 items-center justify-center hover:border-2 border-dashed rounded-lg 120 120 - ${isSelected ? "border-2 border-tertiary p-0" : "border border-border p-px"} 121 121 - `} 122 122 - onSubmit={(e) => { 123 123 - e.preventDefault(); 124 124 - let rect = document 125 125 - .getElementById("button-block-settings") 126 126 - ?.getBoundingClientRect(); 127 127 - if (!textValue) { 128 128 - smoker({ 129 129 - error: true, 130 130 - text: "missing button text!", 131 131 - position: { 132 132 - y: rect ? rect.top : 0, 133 133 - x: rect ? rect.left + 12 : 0, 134 134 - }, 135 135 - }); 136 136 - return; 137 137 - } 138 138 - if (!urlValue) { 139 139 - smoker({ 140 140 - error: true, 141 141 - text: "missing url!", 142 142 - position: { 143 143 - y: rect ? rect.top : 0, 144 144 - x: rect ? rect.left + 12 : 0, 145 145 - }, 146 146 - }); 147 147 - return; 148 148 - } 149 149 - if (!isUrl(urlValue)) { 150 150 - smoker({ 151 151 - error: true, 152 152 - text: "invalid url!", 153 153 - position: { 154 154 - y: rect ? rect.top : 0, 155 155 - x: rect ? rect.left + 12 : 0, 156 156 - }, 157 157 - }); 158 158 - return; 159 159 - } 160 160 - submit(); 161 161 - }} 113 113 + <BlockLayout 114 114 + isSelected={!!isSelected} 115 115 + borderOnHover 116 116 + hasBackground="accent" 117 117 + className="buttonBlockSettings text-tertiar hover:cursor-pointer border-dashed! p-0!" 162 118 > 163 163 - <div className="buttonBlockSettingsContent w-full flex flex-col sm:flex-row gap-2 text-secondary px-2 py-3 sm:pb-3 pb-1"> 164 164 - <div className="buttonBlockSettingsTitleInput flex gap-2 w-full sm:w-52"> 165 165 - <BlockButtonSmall 166 166 - className={`shrink-0 ${isSelected ? "text-tertiary" : "text-border"} `} 167 167 - /> 168 168 - <Separator /> 169 169 - <Input 170 170 - type="text" 171 171 - autoFocus 172 172 - className="w-full grow border-none outline-hidden bg-transparent" 173 173 - placeholder="button text" 174 174 - value={textValue} 175 175 - disabled={isLocked} 176 176 - onChange={(e) => setTextValue(e.target.value)} 177 177 - onKeyDown={(e) => { 178 178 - if ( 179 179 - e.key === "Backspace" && 180 180 - !e.currentTarget.value && 181 181 - urlValue !== "" 182 182 - ) 183 183 - e.preventDefault(); 184 184 - }} 185 185 - /> 186 186 - </div> 187 187 - <div className="buttonBlockSettingsLinkInput grow flex gap-2 w-full"> 188 188 - <LinkSmall 189 189 - className={`shrink-0 ${isSelected ? "text-tertiary" : "text-border"} `} 190 190 - /> 191 191 - <Separator /> 192 192 - <Input 193 193 - type="text" 194 194 - id="button-block-url-input" 195 195 - className="w-full grow border-none outline-hidden bg-transparent" 196 196 - placeholder="www.example.com" 197 197 - value={urlValue} 198 198 - disabled={isLocked} 199 199 - onChange={(e) => setUrlValue(e.target.value)} 200 200 - onKeyDown={(e) => { 201 201 - if (e.key === "Backspace" && !e.currentTarget.value) 202 202 - e.preventDefault(); 203 203 - }} 204 204 - /> 119 119 + <form 120 120 + className={`w-full`} 121 121 + onSubmit={(e) => { 122 122 + e.preventDefault(); 123 123 + let rect = document 124 124 + .getElementById("button-block-settings") 125 125 + ?.getBoundingClientRect(); 126 126 + if (!textValue) { 127 127 + smoker({ 128 128 + error: true, 129 129 + text: "missing button text!", 130 130 + position: { 131 131 + y: rect ? rect.top : 0, 132 132 + x: rect ? rect.left + 12 : 0, 133 133 + }, 134 134 + }); 135 135 + return; 136 136 + } 137 137 + if (!urlValue) { 138 138 + smoker({ 139 139 + error: true, 140 140 + text: "missing url!", 141 141 + position: { 142 142 + y: rect ? rect.top : 0, 143 143 + x: rect ? rect.left + 12 : 0, 144 144 + }, 145 145 + }); 146 146 + return; 147 147 + } 148 148 + if (!isUrl(urlValue)) { 149 149 + smoker({ 150 150 + error: true, 151 151 + text: "invalid url!", 152 152 + position: { 153 153 + y: rect ? rect.top : 0, 154 154 + x: rect ? rect.left + 12 : 0, 155 155 + }, 156 156 + }); 157 157 + return; 158 158 + } 159 159 + submit(); 160 160 + }} 161 161 + > 162 162 + <div className="buttonBlockSettingsContent w-full flex flex-col sm:flex-row gap-2 text-secondary px-2 py-3 sm:pb-3 pb-1"> 163 163 + <div className="buttonBlockSettingsTitleInput flex gap-2 w-full sm:w-52"> 164 164 + <BlockButtonSmall 165 165 + className={`shrink-0 ${isSelected ? "text-tertiary" : "text-border"} `} 166 166 + /> 167 167 + <Separator /> 168 168 + <Input 169 169 + type="text" 170 170 + autoFocus 171 171 + className="w-full grow border-none outline-hidden bg-transparent" 172 172 + placeholder="button text" 173 173 + value={textValue} 174 174 + disabled={isLocked} 175 175 + onChange={(e) => setTextValue(e.target.value)} 176 176 + onKeyDown={(e) => { 177 177 + if ( 178 178 + e.key === "Backspace" && 179 179 + !e.currentTarget.value && 180 180 + urlValue !== "" 181 181 + ) 182 182 + e.preventDefault(); 183 183 + }} 184 184 + /> 185 185 + </div> 186 186 + <div className="buttonBlockSettingsLinkInput grow flex gap-2 w-full"> 187 187 + <LinkSmall 188 188 + className={`shrink-0 ${isSelected ? "text-tertiary" : "text-border"} `} 189 189 + /> 190 190 + <Separator /> 191 191 + <Input 192 192 + type="text" 193 193 + id="button-block-url-input" 194 194 + className="w-full grow border-none outline-hidden bg-transparent" 195 195 + placeholder="www.example.com" 196 196 + value={urlValue} 197 197 + disabled={isLocked} 198 198 + onChange={(e) => setUrlValue(e.target.value)} 199 199 + onKeyDown={(e) => { 200 200 + if (e.key === "Backspace" && !e.currentTarget.value) 201 201 + e.preventDefault(); 202 202 + }} 203 203 + /> 204 204 + </div> 205 205 + <button 206 206 + id="button-block-settings" 207 207 + 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"}`} 209 209 + > 210 210 + <div className="sm:hidden block">Save</div> 211 211 + <CheckTiny /> 212 212 + </button> 205 213 </div> 206 206 - <button 207 207 - id="button-block-settings" 208 208 - type="submit" 209 209 - 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"}`} 210 210 - > 211 211 - <div className="sm:hidden block">Save</div> 212 212 - <CheckTiny /> 213 213 - </button> 214 214 - </div> 215 215 - </form> 214 214 + </form> 215 215 + </BlockLayout> 216 216 </div> 217 217 ); 218 218 };

+17 -6

components/Blocks/CodeBlock.tsx

··· 6 6 } from "shiki"; 7 7 import { useEntity, useReplicache } from "src/replicache"; 8 8 import "katex/dist/katex.min.css"; 9 9 - import { BlockProps } from "./Block"; 9 9 + import { BlockLayout, BlockProps } from "./Block"; 10 10 import { useCallback, useLayoutEffect, useMemo, useState } from "react"; 11 11 import { useUIState } from "src/useUIState"; 12 12 import { BaseTextareaBlock } from "./BaseTextareaBlock"; ··· 119 119 </select> 120 120 </div> 121 121 )} 122 122 - <div className="w-full min-h-[42px] rounded-md border-border-light outline-border-light selected-outline"> 122 122 + 123 123 + <BlockLayout 124 124 + isSelected={focusedBlock} 125 125 + hasBackground="accent" 126 126 + borderOnHover 127 127 + className="p-0! min-h-[48px]" 128 128 + > 123 129 {focusedBlock && permissions.write ? ( 124 130 <BaseTextareaBlock 131 131 + placeholder="write some code…" 125 132 data-editable-block 126 133 data-entityid={props.entityID} 127 134 id={elementId.block(props.entityID).input} ··· 131 138 spellCheck={false} 132 139 autoCapitalize="none" 133 140 autoCorrect="off" 134 134 - className="codeBlockEditor whitespace-nowrap! overflow-auto! font-mono p-2" 141 141 + className="codeBlockEditor whitespace-nowrap! overflow-auto! font-mono p-2 sm:p-3" 135 142 value={content?.data.value} 136 143 onChange={async (e) => { 137 144 // Update the entity with the new value ··· 146 153 <pre 147 154 onClick={onClick} 148 155 onMouseDown={(e) => e.stopPropagation()} 149 149 - className="codeBlockRendered overflow-auto! font-mono p-2 w-full h-full" 156 156 + className="codeBlockRendered overflow-auto! font-mono p-2 sm:p-3 w-full h-full" 150 157 > 151 151 - {content?.data.value} 158 158 + {content?.data.value === "" || content?.data.value === undefined ? ( 159 159 + <div className="text-tertiary italic">write some code…</div> 160 160 + ) : ( 161 161 + content?.data.value 162 162 + )} 152 163 </pre> 153 164 ) : ( 154 165 <div ··· 159 170 dangerouslySetInnerHTML={{ __html: html || "" }} 160 171 /> 161 172 )} 162 162 - </div> 173 173 + </BlockLayout> 163 174 </div> 164 175 ); 165 176 }

+5 -5

components/Blocks/DateTimeBlock.tsx

··· 1 1 import { useEntity, useReplicache } from "src/replicache"; 2 2 - import { BlockProps } from "./Block"; 2 2 + import { BlockProps, BlockLayout } from "./Block"; 3 3 import { ChevronProps, DayPicker } from "react-day-picker"; 4 4 import { Popover } from "components/Popover"; 5 5 import { useEffect, useMemo, useState } from "react"; ··· 121 121 disabled={isLocked || !permissions.write} 122 122 className="w-64 z-10 px-2!" 123 123 trigger={ 124 124 - <div 125 125 - className={`flex flex-row gap-2 group/date w-64 z-1 126 126 - ${isSelected ? "block-border-selected border-transparent!" : "border border-transparent"} 124 124 + <BlockLayout 125 125 + isSelected={!!isSelected} 126 126 + className={`flex flex-row gap-2 group/date w-64 z-1 border-transparent! 127 127 ${alignment === "center" ? "justify-center" : alignment === "right" ? "justify-end" : "justify-start"} 128 128 `} 129 129 > ··· 163 163 </div> 164 164 )} 165 165 </FadeIn> 166 166 - </div> 166 166 + </BlockLayout> 167 167 } 168 168 > 169 169 <div className="flex flex-col gap-3 ">

+2 -120

components/Blocks/DeleteBlock.tsx

··· 1 1 - import { 2 2 - Fact, 3 3 - ReplicacheMutators, 4 4 - useEntity, 5 5 - useReplicache, 6 6 - } from "src/replicache"; 7 7 - import { Replicache } from "replicache"; 8 8 - import { useUIState } from "src/useUIState"; 9 9 - import { scanIndex } from "src/replicache/utils"; 10 10 - import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 11 11 - import { focusBlock } from "src/utils/focusBlock"; 1 1 + import { Fact, useReplicache } from "src/replicache"; 12 2 import { ButtonPrimary } from "components/Buttons"; 13 3 import { CloseTiny } from "components/Icons/CloseTiny"; 4 4 + import { deleteBlock } from "src/utils/deleteBlock"; 14 5 15 6 export const AreYouSure = (props: { 16 7 entityID: string[] | string; ··· 82 73 ); 83 74 }; 84 75 85 85 - export async function deleteBlock( 86 86 - entities: string[], 87 87 - rep: Replicache<ReplicacheMutators>, 88 88 - ) { 89 89 - // get what pagess we need to close as a result of deleting this block 90 90 - let pagesToClose = [] as string[]; 91 91 - for (let entity of entities) { 92 92 - let [type] = await rep.query((tx) => 93 93 - scanIndex(tx).eav(entity, "block/type"), 94 94 - ); 95 95 - if (type.data.value === "card") { 96 96 - let [childPages] = await rep?.query( 97 97 - (tx) => scanIndex(tx).eav(entity, "block/card") || [], 98 98 - ); 99 99 - pagesToClose = [childPages?.data.value]; 100 100 - } 101 101 - if (type.data.value === "mailbox") { 102 102 - let [archive] = await rep?.query( 103 103 - (tx) => scanIndex(tx).eav(entity, "mailbox/archive") || [], 104 104 - ); 105 105 - let [draft] = await rep?.query( 106 106 - (tx) => scanIndex(tx).eav(entity, "mailbox/draft") || [], 107 107 - ); 108 108 - pagesToClose = [archive?.data.value, draft?.data.value]; 109 109 - } 110 110 - } 111 111 - 112 112 - // the next and previous blocks in the block list 113 113 - // if the focused thing is a page and not a block, return 114 114 - let focusedBlock = useUIState.getState().focusedEntity; 115 115 - let parent = 116 116 - focusedBlock?.entityType === "page" 117 117 - ? focusedBlock.entityID 118 118 - : focusedBlock?.parent; 119 119 - 120 120 - if (parent) { 121 121 - let parentType = await rep?.query((tx) => 122 122 - scanIndex(tx).eav(parent, "page/type"), 123 123 - ); 124 124 - if (parentType[0]?.data.value === "canvas") { 125 125 - useUIState 126 126 - .getState() 127 127 - .setFocusedBlock({ entityType: "page", entityID: parent }); 128 128 - useUIState.getState().setSelectedBlocks([]); 129 129 - } else { 130 130 - let siblings = 131 131 - (await rep?.query((tx) => getBlocksWithType(tx, parent))) || []; 132 132 - 133 133 - let selectedBlocks = useUIState.getState().selectedBlocks; 134 134 - let firstSelected = selectedBlocks[0]; 135 135 - let lastSelected = selectedBlocks[entities.length - 1]; 136 136 - 137 137 - let prevBlock = 138 138 - siblings?.[ 139 139 - siblings.findIndex((s) => s.value === firstSelected?.value) - 1 140 140 - ]; 141 141 - let prevBlockType = await rep?.query((tx) => 142 142 - scanIndex(tx).eav(prevBlock?.value, "block/type"), 143 143 - ); 144 144 - 145 145 - let nextBlock = 146 146 - siblings?.[ 147 147 - siblings.findIndex((s) => s.value === lastSelected.value) + 1 148 148 - ]; 149 149 - let nextBlockType = await rep?.query((tx) => 150 150 - scanIndex(tx).eav(nextBlock?.value, "block/type"), 151 151 - ); 152 152 - 153 153 - if (prevBlock) { 154 154 - useUIState.getState().setSelectedBlock({ 155 155 - value: prevBlock.value, 156 156 - parent: prevBlock.parent, 157 157 - }); 158 158 - 159 159 - focusBlock( 160 160 - { 161 161 - value: prevBlock.value, 162 162 - type: prevBlockType?.[0].data.value, 163 163 - parent: prevBlock.parent, 164 164 - }, 165 165 - { type: "end" }, 166 166 - ); 167 167 - } else { 168 168 - useUIState.getState().setSelectedBlock({ 169 169 - value: nextBlock.value, 170 170 - parent: nextBlock.parent, 171 171 - }); 172 172 - 173 173 - focusBlock( 174 174 - { 175 175 - value: nextBlock.value, 176 176 - type: nextBlockType?.[0]?.data.value, 177 177 - parent: nextBlock.parent, 178 178 - }, 179 179 - { type: "start" }, 180 180 - ); 181 181 - } 182 182 - } 183 183 - } 184 184 - 185 185 - pagesToClose.forEach((page) => page && useUIState.getState().closePage(page)); 186 186 - await Promise.all( 187 187 - entities.map((entity) => 188 188 - rep?.mutate.removeBlock({ 189 189 - blockEntity: entity, 190 190 - }), 191 191 - ), 192 192 - ); 193 193 - }

+13 -16

components/Blocks/EmbedBlock.tsx

··· 3 3 import { useCallback, useEffect, useState } from "react"; 4 4 import { useEntity, useReplicache } from "src/replicache"; 5 5 import { useUIState } from "src/useUIState"; 6 6 - import { BlockProps } from "./Block"; 6 6 + import { BlockProps, BlockLayout } from "./Block"; 7 7 import { v7 } from "uuid"; 8 8 import { useSmoker } from "components/Toast"; 9 9 import { Separator } from "components/Layout"; ··· 84 84 <div 85 85 className={`w-full ${heightHandle.dragDelta ? "pointer-events-none" : ""}`} 86 86 > 87 87 - {/* 88 88 - the iframe! 89 89 - can also add 'allow' and 'referrerpolicy' attributes later if needed 90 90 - */} 91 91 - <iframe 92 92 - className={` 93 93 - flex flex-col relative w-full overflow-hidden group/embedBlock 94 94 - ${isSelected ? "block-border-selected " : "block-border"} 95 95 - `} 96 96 - width="100%" 97 97 - height={height + (heightHandle.dragDelta?.y || 0)} 98 98 - src={url?.data.value} 99 99 - allow="fullscreen" 100 100 - loading="lazy" 101 101 - ></iframe> 87 87 + <BlockLayout 88 88 + isSelected={!!isSelected} 89 89 + className="flex flex-col relative w-full overflow-hidden group/embedBlock p-0!" 90 90 + > 91 91 + <iframe 92 92 + width="100%" 93 93 + height={height + (heightHandle.dragDelta?.y || 0)} 94 94 + src={url?.data.value} 95 95 + allow="fullscreen" 96 96 + loading="lazy" 97 97 + ></iframe> 98 98 + </BlockLayout> 102 99 {/* <div className="w-full overflow-x-hidden truncate text-xs italic text-accent-contrast"> 103 100 <a 104 101 href={url?.data.value}

+45 -43

components/Blocks/ExternalLinkBlock.tsx

··· 4 4 import { useEntity, useReplicache } from "src/replicache"; 5 5 import { useUIState } from "src/useUIState"; 6 6 import { addLinkBlock } from "src/utils/addLinkBlock"; 7 7 - import { BlockProps } from "./Block"; 7 7 + import { BlockProps, BlockLayout } from "./Block"; 8 8 import { v7 } from "uuid"; 9 9 import { useSmoker } from "components/Toast"; 10 10 import { Separator } from "components/Layout"; 11 11 - import { focusElement, Input } from "components/Input"; 11 11 + import { Input } from "components/Input"; 12 12 + import { focusElement } from "src/utils/focusElement"; 12 13 import { isUrl } from "src/utils/isURL"; 13 14 import { elementId } from "src/utils/elementId"; 14 15 import { focusBlock } from "src/utils/focusBlock"; ··· 63 64 } 64 65 65 66 return ( 66 66 - <a 67 67 - href={url?.data.value} 68 68 - target="_blank" 69 69 - className={` 70 70 - externalLinkBlock flex relative group/linkBlock 71 71 - h-[104px] w-full bg-bg-page overflow-hidden text-primary hover:no-underline no-underline 72 72 - hover:border-accent-contrast shadow-sm 73 73 - ${isSelected ? "block-border-selected outline-accent-contrast! border-accent-contrast!" : "block-border"} 74 74 - 75 75 - `} 67 67 + <BlockLayout 68 68 + isSelected={!!isSelected} 69 69 + hasBackground="page" 70 70 + borderOnHover 71 71 + className="externalLinkBlock flex relative group/linkBlock h-[104px] p-0!" 76 72 > 77 77 - <div className="pt-2 pb-2 px-3 grow min-w-0"> 78 78 - <div className="flex flex-col w-full min-w-0 h-full grow "> 79 79 - <div 80 80 - className={`linkBlockTitle bg-transparent -mb-0.5 border-none text-base font-bold outline-hidden resize-none align-top border h-[24px] line-clamp-1`} 81 81 - style={{ 82 82 - overflow: "hidden", 83 83 - textOverflow: "ellipsis", 84 84 - wordBreak: "break-all", 85 85 - }} 86 86 - > 87 87 - {title?.data.value} 88 88 - </div> 73 73 + <a 74 74 + href={url?.data.value} 75 75 + target="_blank" 76 76 + className="flex w-full h-full text-primary hover:no-underline no-underline" 77 77 + > 78 78 + <div className="pt-2 pb-2 px-3 grow min-w-0"> 79 79 + <div className="flex flex-col w-full min-w-0 h-full grow "> 80 80 + <div 81 81 + className={`linkBlockTitle bg-transparent -mb-0.5 border-none text-base font-bold outline-hidden resize-none align-top border h-[24px] line-clamp-1`} 82 82 + style={{ 83 83 + overflow: "hidden", 84 84 + textOverflow: "ellipsis", 85 85 + wordBreak: "break-all", 86 86 + }} 87 87 + > 88 88 + {title?.data.value} 89 89 + </div> 89 90 90 90 - <div 91 91 - className={`linkBlockDescription text-sm bg-transparent border-none outline-hidden resize-none align-top grow line-clamp-2`} 92 92 - > 93 93 - {description?.data.value} 94 94 - </div> 95 95 - <div 96 96 - style={{ wordBreak: "break-word" }} // better than tailwind break-all! 97 97 - className={`min-w-0 w-full line-clamp-1 text-xs italic group-hover/linkBlock:text-accent-contrast ${isSelected ? "text-accent-contrast" : "text-tertiary"}`} 98 98 - > 99 99 - {url?.data.value} 91 91 + <div 92 92 + className={`linkBlockDescription text-sm bg-transparent border-none outline-hidden resize-none align-top grow line-clamp-2`} 93 93 + > 94 94 + {description?.data.value} 95 95 + </div> 96 96 + <div 97 97 + style={{ wordBreak: "break-word" }} // better than tailwind break-all! 98 98 + className={`min-w-0 w-full line-clamp-1 text-xs italic group-hover/linkBlock:text-accent-contrast ${isSelected ? "text-accent-contrast" : "text-tertiary"}`} 99 99 + > 100 100 + {url?.data.value} 101 101 + </div> 100 102 </div> 101 103 </div> 102 102 - </div> 103 104 104 104 - <div 105 105 - className={`linkBlockPreview w-[120px] m-2 -mb-2 bg-cover shrink-0 rounded-t-md border border-border rotate-[4deg] origin-center`} 106 106 - style={{ 107 107 - backgroundImage: `url(${previewImage?.data.src})`, 108 108 - backgroundPosition: "center", 109 109 - }} 110 110 - /> 111 111 - </a> 105 105 + <div 106 106 + className={`linkBlockPreview w-[120px] m-2 -mb-2 bg-cover shrink-0 rounded-t-md border border-border rotate-[4deg] origin-center`} 107 107 + style={{ 108 108 + backgroundImage: `url(${previewImage?.data.src})`, 109 109 + backgroundPosition: "center", 110 110 + }} 111 111 + /> 112 112 + </a> 113 113 + </BlockLayout> 112 114 ); 113 115 }; 114 116

+68 -24

components/Blocks/ImageBlock.tsx

··· 1 1 "use client"; 2 2 3 3 import { useEntity, useReplicache } from "src/replicache"; 4 4 - import { BlockProps } from "./Block"; 4 4 + import { BlockProps, BlockLayout } from "./Block"; 5 5 import { useUIState } from "src/useUIState"; 6 6 import Image from "next/image"; 7 7 import { v7 } from "uuid"; ··· 17 17 import { AsyncValueAutosizeTextarea } from "components/utils/AutosizeTextarea"; 18 18 import { set } from "colorjs.io/fn"; 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"; 20 23 21 24 export function ImageBlock(props: BlockProps & { preview?: boolean }) { 22 25 let { rep } = useReplicache(); ··· 61 64 factID: v7(), 62 65 permission_set: entity_set.set, 63 66 type: "text", 64 64 - position: generateKeyBetween( 65 65 - props.position, 66 66 - props.nextPosition, 67 67 - ), 67 67 + position: generateKeyBetween(props.position, props.nextPosition), 68 68 newEntityID: entity, 69 69 }); 70 70 } ··· 82 82 if (!image) { 83 83 if (!entity_set.permissions.write) return null; 84 84 return ( 85 85 - <div className="grow w-full"> 85 85 + <BlockLayout 86 86 + hasBackground="accent" 87 87 + isSelected={!!isSelected && !isLocked} 88 88 + borderOnHover 89 89 + className=" group/image-block text-tertiary hover:text-accent-contrast hover:font-bold h-[104px] border-dashed rounded-lg" 90 90 + > 86 91 <label 87 92 className={` 88 88 - group/image-block 89 89 - w-full h-[104px] hover:cursor-pointer p-2 90 90 - text-tertiary hover:text-accent-contrast hover:font-bold 93 93 + 94 94 + w-full h-full hover:cursor-pointer 91 95 flex flex-col items-center justify-center 92 92 - hover:border-2 border-dashed hover:border-accent-contrast rounded-lg 93 93 - ${isSelected && !isLocked ? "border-2 border-tertiary font-bold" : "border border-border"} 94 96 ${props.pageType === "canvas" && "bg-bg-page"}`} 95 97 onMouseDown={(e) => e.preventDefault()} 96 98 onDragOver={(e) => { ··· 104 106 const files = e.dataTransfer.files; 105 107 if (files && files.length > 0) { 106 108 const file = files[0]; 107 107 - if (file.type.startsWith('image/')) { 109 109 + if (file.type.startsWith("image/")) { 108 110 await handleImageUpload(file); 109 111 } 110 112 } ··· 128 130 }} 129 131 /> 130 132 </label> 131 131 - </div> 133 133 + </BlockLayout> 132 134 ); 133 135 } 134 136 135 135 - let className = isFullBleed 137 137 + let imageClassName = isFullBleed 136 138 ? "" 137 139 : isSelected 138 140 ? "block-border-selected border-transparent! " ··· 140 142 141 143 let isLocalUpload = localImages.get(image.data.src); 142 144 145 145 + let blockClassName = ` 146 146 + relative group/image border-transparent! p-0! w-fit! 147 147 + ${isFullBleed && "-mx-3 sm:-mx-4"} 148 148 + ${isFullBleed ? (isFirst ? "-mt-3 sm:-mt-4" : prevIsFullBleed ? "-mt-1" : "") : ""} 149 149 + ${isFullBleed ? (isLast ? "-mb-4" : nextIsFullBleed ? "-mb-2" : "") : ""} 150 150 + `; 151 151 + 143 152 return ( 144 144 - <div 145 145 - className={`relative group/image 146 146 - ${className} 147 147 - ${isFullBleed && "-mx-3 sm:-mx-4"} 148 148 - ${isFullBleed ? (isFirst ? "-mt-3 sm:-mt-4" : prevIsFullBleed ? "-mt-1" : "") : ""} 149 149 - ${isFullBleed ? (isLast ? "-mb-4" : nextIsFullBleed ? "-mb-2" : "") : ""} `} 150 150 - > 151 151 - {isFullBleed && isSelected ? <FullBleedSelectionIndicator /> : null} 153 153 + <BlockLayout isSelected={!!isSelected} className={blockClassName}> 152 154 {isLocalUpload || image.data.local ? ( 153 155 <img 154 156 loading="lazy" ··· 166 168 } 167 169 height={image?.data.height} 168 170 width={image?.data.width} 169 169 - className={className} 171 171 + className={imageClassName} 170 172 /> 171 173 )} 172 174 {altText !== undefined && !props.preview ? ( 173 175 <ImageAlt entityID={props.value} /> 174 176 ) : null} 175 175 - </div> 177 177 + {!props.preview ? <CoverImageButton entityID={props.value} /> : null} 178 178 + </BlockLayout> 176 179 ); 177 180 } 178 181 ··· 188 191 altEditorOpen: false, 189 192 setAltEditorOpen: (s: boolean) => {}, 190 193 }); 194 194 + 195 195 + const CoverImageButton = (props: { entityID: string }) => { 196 196 + let { rep } = useReplicache(); 197 197 + let entity_set = useEntitySetContext(); 198 198 + let { data: pubData } = useLeafletPublicationData(); 199 199 + let coverImage = useSubscribe(rep, (tx) => 200 200 + tx.get<string | null>("publication_cover_image"), 201 201 + ); 202 202 + let isFocused = useUIState( 203 203 + (s) => s.focusedEntity?.entityID === props.entityID, 204 204 + ); 205 205 + 206 206 + // 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 + ) 213 213 + 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" 219 219 + onClick={async (e) => { 220 220 + e.preventDefault(); 221 221 + e.stopPropagation(); 222 222 + await rep?.mutate.updatePublicationDraft({ 223 223 + cover_image: props.entityID, 224 224 + }); 225 225 + }} 226 226 + > 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> 233 233 + ); 234 234 + }; 191 235 192 236 const ImageAlt = (props: { entityID: string }) => { 193 237 let { rep } = useReplicache();

+81 -95

components/Blocks/MailboxBlock.tsx

··· 1 1 import { ButtonPrimary } from "components/Buttons"; 2 2 import { Popover } from "components/Popover"; 3 3 - import { Menu, MenuItem, Separator } from "components/Layout"; 3 3 + import { MenuItem } from "components/Menu"; 4 4 + import { Separator } from "components/Layout"; 4 5 import { useUIState } from "src/useUIState"; 5 6 import { useState } from "react"; 6 7 import { useSmoker, useToaster } from "components/Toast"; 7 7 - import { BlockProps } from "./Block"; 8 8 + import { BlockProps, BlockLayout } from "./Block"; 8 9 import { useEntity, useReplicache } from "src/replicache"; 9 10 import { useEntitySetContext } from "components/EntitySetProvider"; 10 11 import { subscribeToMailboxWithEmail } from "actions/subscriptions/subscribeToMailboxWithEmail"; 11 12 import { confirmEmailSubscription } from "actions/subscriptions/confirmEmailSubscription"; 12 12 - import { focusPage } from "components/Pages"; 13 13 + import { focusPage } from "src/utils/focusPage"; 13 14 import { v7 } from "uuid"; 14 15 import { sendPostToSubscribers } from "actions/subscriptions/sendPostToSubscribers"; 15 16 import { getBlocksWithType } from "src/hooks/queries/useBlocks"; ··· 45 46 46 47 return ( 47 48 <div className={`mailboxContent relative w-full flex flex-col gap-1`}> 48 48 - <div 49 49 - className={`flex flex-col gap-2 items-center justify-center w-full 50 50 - ${isSelected ? "block-border-selected " : "block-border"} `} 51 51 - style={{ 52 52 - backgroundColor: 53 53 - "color-mix(in oklab, rgb(var(--accent-contrast)), rgb(var(--bg-page)) 85%)", 54 54 - }} 49 49 + <BlockLayout 50 50 + isSelected={!!isSelected} 51 51 + hasBackground={"accent"} 52 52 + className="flex gap-2 items-center justify-center" 55 53 > 56 56 - <div className="flex gap-2 p-4"> 57 57 - <ButtonPrimary 58 58 - onClick={async () => { 59 59 - let entity; 60 60 - if (draft) { 61 61 - entity = draft.data.value; 62 62 - } else { 63 63 - entity = v7(); 64 64 - await rep?.mutate.createDraft({ 65 65 - mailboxEntity: props.entityID, 66 66 - permission_set: entity_set.set, 67 67 - newEntity: entity, 68 68 - firstBlockEntity: v7(), 69 69 - firstBlockFactID: v7(), 70 70 - }); 71 71 - } 72 72 - useUIState.getState().openPage(props.parent, entity); 73 73 - if (rep) focusPage(entity, rep, "focusFirstBlock"); 74 74 - return; 75 75 - }} 76 76 - > 77 77 - {draft ? "Edit Draft" : "Write a Post"} 78 78 - </ButtonPrimary> 79 79 - <MailboxInfo /> 80 80 - </div> 81 81 - </div> 54 54 + <ButtonPrimary 55 55 + onClick={async () => { 56 56 + let entity; 57 57 + if (draft) { 58 58 + entity = draft.data.value; 59 59 + } else { 60 60 + entity = v7(); 61 61 + await rep?.mutate.createDraft({ 62 62 + mailboxEntity: props.entityID, 63 63 + permission_set: entity_set.set, 64 64 + newEntity: entity, 65 65 + firstBlockEntity: v7(), 66 66 + firstBlockFactID: v7(), 67 67 + }); 68 68 + } 69 69 + useUIState.getState().openPage(props.parent, entity); 70 70 + if (rep) focusPage(entity, rep, "focusFirstBlock"); 71 71 + return; 72 72 + }} 73 73 + > 74 74 + {draft ? "Edit Draft" : "Write a Post"} 75 75 + </ButtonPrimary> 76 76 + <MailboxInfo /> 77 77 + </BlockLayout> 82 78 <div className="flex gap-3 items-center justify-between"> 83 79 { 84 80 <> ··· 134 130 let { rep } = useReplicache(); 135 131 return ( 136 132 <div className={`mailboxContent relative w-full flex flex-col gap-1 h-32`}> 137 137 - <div 138 138 - className={`h-full flex flex-col gap-2 items-center justify-center w-full rounded-md border outline ${ 139 139 - isSelected 140 140 - ? "border-border outline-border" 141 141 - : "border-border-light outline-transparent" 142 142 - }`} 143 143 - style={{ 144 144 - backgroundColor: 145 145 - "color-mix(in oklab, rgb(var(--accent-contrast)), rgb(var(--bg-page)) 85%)", 146 146 - }} 133 133 + <BlockLayout 134 134 + isSelected={!!isSelected} 135 135 + hasBackground={"accent"} 136 136 + className="`h-full flex flex-col gap-2 items-center justify-center" 147 137 > 148 148 - <div className="flex flex-col w-full gap-2 p-4"> 149 149 - {!isSubscribed?.confirmed ? ( 150 150 - <> 151 151 - <SubscribeForm 152 152 - entityID={props.entityID} 153 153 - role={"reader"} 154 154 - parent={props.parent} 155 155 - /> 156 156 - </> 157 157 - ) : ( 158 158 - <div className="flex flex-col gap-2 items-center place-self-center"> 159 159 - <div className=" font-bold text-secondary "> 160 160 - You&apos;re Subscribed! 161 161 - </div> 162 162 - <div className="flex flex-col gap-1 items-center place-self-center"> 163 163 - {archive ? ( 164 164 - <ButtonPrimary 165 165 - onMouseDown={(e) => { 166 166 - e.preventDefault(); 167 167 - if (rep) { 168 168 - useUIState 169 169 - .getState() 170 170 - .openPage(props.parent, archive.data.value); 171 171 - focusPage(archive.data.value, rep); 172 172 - } 173 173 - }} 174 174 - > 175 175 - See All Posts 176 176 - </ButtonPrimary> 177 177 - ) : ( 178 178 - <div className="text-tertiary"> 179 179 - Nothing has been posted yet 180 180 - </div> 181 181 - )} 182 182 - <button 183 183 - className="text-accent-contrast hover:underline text-sm" 184 184 - onClick={(e) => { 185 185 - let rect = e.currentTarget.getBoundingClientRect(); 186 186 - unsubscribe(isSubscribed); 187 187 - smoke({ 188 188 - text: "unsubscribed!", 189 189 - position: { x: rect.left, y: rect.top - 8 }, 190 190 - }); 138 138 + {!isSubscribed?.confirmed ? ( 139 139 + <> 140 140 + <SubscribeForm 141 141 + entityID={props.entityID} 142 142 + role={"reader"} 143 143 + parent={props.parent} 144 144 + /> 145 145 + </> 146 146 + ) : ( 147 147 + <div className="flex flex-col gap-2 items-center place-self-center"> 148 148 + <div className=" font-bold text-secondary "> 149 149 + You&apos;re Subscribed! 150 150 + </div> 151 151 + <div className="flex flex-col gap-1 items-center place-self-center"> 152 152 + {archive ? ( 153 153 + <ButtonPrimary 154 154 + onMouseDown={(e) => { 155 155 + e.preventDefault(); 156 156 + if (rep) { 157 157 + useUIState 158 158 + .getState() 159 159 + .openPage(props.parent, archive.data.value); 160 160 + focusPage(archive.data.value, rep); 161 161 + } 191 162 }} 192 163 > 193 193 - unsubscribe 194 194 - </button> 195 195 - </div> 164 164 + See All Posts 165 165 + </ButtonPrimary> 166 166 + ) : ( 167 167 + <div className="text-tertiary">Nothing has been posted yet</div> 168 168 + )} 169 169 + <button 170 170 + className="text-accent-contrast hover:underline text-sm" 171 171 + onClick={(e) => { 172 172 + let rect = e.currentTarget.getBoundingClientRect(); 173 173 + unsubscribe(isSubscribed); 174 174 + smoke({ 175 175 + text: "unsubscribed!", 176 176 + position: { x: rect.left, y: rect.top - 8 }, 177 177 + }); 178 178 + }} 179 179 + > 180 180 + unsubscribe 181 181 + </button> 196 182 </div> 197 197 - )} 198 198 - </div> 199 199 - </div> 183 183 + </div> 184 184 + )} 185 185 + </BlockLayout> 200 186 </div> 201 187 ); 202 188 };

+33 -23

components/Blocks/MathBlock.tsx

··· 1 1 import { useEntity, useReplicache } from "src/replicache"; 2 2 import "katex/dist/katex.min.css"; 3 3 - import { BlockProps } from "./Block"; 3 3 + import { BlockLayout, BlockProps } from "./Block"; 4 4 import Katex from "katex"; 5 5 import { useMemo } from "react"; 6 6 import { useUIState } from "src/useUIState"; ··· 32 32 } 33 33 }, [content?.data.value]); 34 34 return focusedBlock ? ( 35 35 - <BaseTextareaBlock 36 36 - id={elementId.block(props.entityID).input} 37 37 - block={props} 38 38 - spellCheck={false} 39 39 - autoCapitalize="none" 40 40 - autoCorrect="off" 41 41 - className="bg-border-light rounded-md p-2 w-full min-h-[48px] whitespace-nowrap overflow-auto! border-border-light outline-border-light selected-outline" 42 42 - placeholder="write some Tex here..." 43 43 - value={content?.data.value} 44 44 - onChange={async (e) => { 45 45 - // Update the entity with the new value 46 46 - await rep?.mutate.assertFact({ 47 47 - attribute: "block/math", 48 48 - entity: props.entityID, 49 49 - data: { type: "string", value: e.target.value }, 50 50 - }); 51 51 - }} 52 52 - /> 35 35 + <BlockLayout 36 36 + isSelected={focusedBlock} 37 37 + hasBackground="accent" 38 38 + className="min-h-[48px]" 39 39 + > 40 40 + <BaseTextareaBlock 41 41 + id={elementId.block(props.entityID).input} 42 42 + block={props} 43 43 + spellCheck={false} 44 44 + autoCapitalize="none" 45 45 + autoCorrect="off" 46 46 + className="h-full w-full whitespace-nowrap overflow-auto!" 47 47 + placeholder="write some Tex here..." 48 48 + value={content?.data.value} 49 49 + onChange={async (e) => { 50 50 + // Update the entity with the new value 51 51 + await rep?.mutate.assertFact({ 52 52 + attribute: "block/math", 53 53 + entity: props.entityID, 54 54 + data: { type: "string", value: e.target.value }, 55 55 + }); 56 56 + }} 57 57 + /> 58 58 + </BlockLayout> 53 59 ) : html && content?.data.value ? ( 54 60 <div 55 55 - className="text-lg min-h-[66px] w-full border border-transparent" 61 61 + className="text-lg min-h-[48px] w-full border border-transparent" 56 62 dangerouslySetInnerHTML={{ __html: html }} 57 63 /> 58 64 ) : ( 59 59 - <div className="text-tertiary italic rounded-md p-2 w-full min-h-16"> 60 60 - write some Tex here... 61 61 - </div> 65 65 + <BlockLayout 66 66 + isSelected={focusedBlock} 67 67 + hasBackground="accent" 68 68 + className="min-h-[48px]" 69 69 + > 70 70 + <div className="text-tertiary italic w-full ">write some Tex here...</div> 71 71 + </BlockLayout> 62 72 ); 63 73 }

+27 -23

components/Blocks/PageLinkBlock.tsx

··· 1 1 "use client"; 2 2 - import { BlockProps, BaseBlock, ListMarker, Block } from "./Block"; 2 2 + import { BlockProps, ListMarker, Block, BlockLayout } from "./Block"; 3 3 import { focusBlock } from "src/utils/focusBlock"; 4 4 5 5 - import { focusPage } from "components/Pages"; 5 5 + import { focusPage } from "src/utils/focusPage"; 6 6 import { useEntity, useReplicache } from "src/replicache"; 7 7 import { useUIState } from "src/useUIState"; 8 8 import { RenderedTextBlock } from "components/Blocks/TextBlock"; ··· 29 29 30 30 return ( 31 31 <CardThemeProvider entityID={page?.data.value}> 32 32 - <div 33 33 - className={`w-full cursor-pointer 32 32 + <BlockLayout 33 33 + hasBackground="page" 34 34 + isSelected={!!isSelected} 35 35 + className={`cursor-pointer 34 36 pageLinkBlockWrapper relative group/pageLinkBlock 35 35 - bg-bg-page shadow-sm 36 36 - flex overflow-clip 37 37 - ${isSelected ? "block-border-selected " : "block-border"} 38 38 - ${isOpen && "border-tertiary!"} 37 37 + flex overflow-clip p-0! 38 38 + ${isOpen && "border-accent-contrast! outline-accent-contrast!"} 39 39 `} 40 40 - onClick={(e) => { 41 41 - if (!page) return; 42 42 - if (e.isDefaultPrevented()) return; 43 43 - if (e.shiftKey) return; 44 44 - e.preventDefault(); 45 45 - e.stopPropagation(); 46 46 - useUIState.getState().openPage(props.parent, page.data.value); 47 47 - if (rep) focusPage(page.data.value, rep); 48 48 - }} 49 40 > 50 50 - {type === "canvas" && page ? ( 51 51 - <CanvasLinkBlock entityID={page?.data.value} /> 52 52 - ) : ( 53 53 - <DocLinkBlock {...props} /> 54 54 - )} 55 55 - </div> 41 41 + <div 42 42 + className="w-full h-full" 43 43 + onClick={(e) => { 44 44 + if (!page) return; 45 45 + if (e.isDefaultPrevented()) return; 46 46 + if (e.shiftKey) return; 47 47 + e.preventDefault(); 48 48 + e.stopPropagation(); 49 49 + useUIState.getState().openPage(props.parent, page.data.value); 50 50 + if (rep) focusPage(page.data.value, rep); 51 51 + }} 52 52 + > 53 53 + {type === "canvas" && page ? ( 54 54 + <CanvasLinkBlock entityID={page?.data.value} /> 55 55 + ) : ( 56 56 + <DocLinkBlock {...props} /> 57 57 + )} 58 58 + </div> 59 59 + </BlockLayout> 56 60 </CardThemeProvider> 57 61 ); 58 62 }

+498

components/Blocks/PollBlock/index.tsx

··· 1 1 + import { useUIState } from "src/useUIState"; 2 2 + import { BlockProps, BlockLayout } from "../Block"; 3 3 + import { ButtonPrimary, ButtonSecondary } from "components/Buttons"; 4 4 + import { useCallback, useEffect, useState } from "react"; 5 5 + import { Input } from "components/Input"; 6 6 + import { focusElement } from "src/utils/focusElement"; 7 7 + import { Separator } from "components/Layout"; 8 8 + import { useEntitySetContext } from "components/EntitySetProvider"; 9 9 + import { theme } from "tailwind.config"; 10 10 + import { useEntity, useReplicache } from "src/replicache"; 11 11 + import { v7 } from "uuid"; 12 12 + import { 13 13 + useLeafletPublicationData, 14 14 + usePollData, 15 15 + } from "components/PageSWRDataProvider"; 16 16 + import { voteOnPoll } from "actions/pollActions"; 17 17 + import { elementId } from "src/utils/elementId"; 18 18 + import { CheckTiny } from "components/Icons/CheckTiny"; 19 19 + import { CloseTiny } from "components/Icons/CloseTiny"; 20 20 + import { PublicationPollBlock } from "../PublicationPollBlock"; 21 21 + import { usePollBlockUIState } from "./pollBlockState"; 22 22 + 23 23 + export const PollBlock = (props: BlockProps) => { 24 24 + let { data: pub } = useLeafletPublicationData(); 25 25 + if (!pub) return <LeafletPollBlock {...props} />; 26 26 + return <PublicationPollBlock {...props} />; 27 27 + }; 28 28 + 29 29 + export const LeafletPollBlock = (props: BlockProps) => { 30 30 + let isSelected = useUIState((s) => 31 31 + s.selectedBlocks.find((b) => b.value === props.entityID), 32 32 + ); 33 33 + let { permissions } = useEntitySetContext(); 34 34 + 35 35 + let { data: pollData } = usePollData(); 36 36 + let hasVoted = 37 37 + pollData?.voter_token && 38 38 + pollData.polls.find( 39 39 + (v) => 40 40 + v.poll_votes_on_entity.voter_token === pollData.voter_token && 41 41 + v.poll_votes_on_entity.poll_entity === props.entityID, 42 42 + ); 43 43 + 44 44 + let pollState = usePollBlockUIState((s) => s[props.entityID]?.state); 45 45 + if (!pollState) { 46 46 + if (hasVoted) pollState = "results"; 47 47 + else pollState = "voting"; 48 48 + } 49 49 + 50 50 + const setPollState = useCallback( 51 51 + (state: "editing" | "voting" | "results") => { 52 52 + usePollBlockUIState.setState((s) => ({ [props.entityID]: { state } })); 53 53 + }, 54 54 + [], 55 55 + ); 56 56 + 57 57 + let votes = 58 58 + pollData?.polls.filter( 59 59 + (v) => v.poll_votes_on_entity.poll_entity === props.entityID, 60 60 + ) || []; 61 61 + let totalVotes = votes.length; 62 62 + 63 63 + return ( 64 64 + <BlockLayout 65 65 + isSelected={!!isSelected} 66 66 + hasBackground={"accent"} 67 67 + className="poll flex flex-col gap-2 w-full" 68 68 + > 69 69 + {pollState === "editing" ? ( 70 70 + <EditPoll 71 71 + totalVotes={totalVotes} 72 72 + votes={votes.map((v) => v.poll_votes_on_entity)} 73 73 + entityID={props.entityID} 74 74 + close={() => { 75 75 + if (hasVoted) setPollState("results"); 76 76 + else setPollState("voting"); 77 77 + }} 78 78 + /> 79 79 + ) : pollState === "results" ? ( 80 80 + <PollResults 81 81 + entityID={props.entityID} 82 82 + pollState={pollState} 83 83 + setPollState={setPollState} 84 84 + hasVoted={!!hasVoted} 85 85 + /> 86 86 + ) : ( 87 87 + <PollVote 88 88 + entityID={props.entityID} 89 89 + onSubmit={() => setPollState("results")} 90 90 + pollState={pollState} 91 91 + setPollState={setPollState} 92 92 + hasVoted={!!hasVoted} 93 93 + /> 94 94 + )} 95 95 + </BlockLayout> 96 96 + ); 97 97 + }; 98 98 + 99 99 + const PollVote = (props: { 100 100 + entityID: string; 101 101 + onSubmit: () => void; 102 102 + pollState: "editing" | "voting" | "results"; 103 103 + setPollState: (pollState: "editing" | "voting" | "results") => void; 104 104 + hasVoted: boolean; 105 105 + }) => { 106 106 + let { data, mutate } = usePollData(); 107 107 + let { permissions } = useEntitySetContext(); 108 108 + 109 109 + let pollOptions = useEntity(props.entityID, "poll/options"); 110 110 + let currentVotes = data?.voter_token 111 111 + ? data.polls 112 112 + .filter( 113 113 + (p) => 114 114 + p.poll_votes_on_entity.poll_entity === props.entityID && 115 115 + p.poll_votes_on_entity.voter_token === data.voter_token, 116 116 + ) 117 117 + .map((v) => v.poll_votes_on_entity.option_entity) 118 118 + : []; 119 119 + let [selectedPollOptions, setSelectedPollOptions] = 120 120 + useState<string[]>(currentVotes); 121 121 + 122 122 + return ( 123 123 + <> 124 124 + {pollOptions.map((option, index) => ( 125 125 + <PollVoteButton 126 126 + key={option.data.value} 127 127 + selected={selectedPollOptions.includes(option.data.value)} 128 128 + toggleSelected={() => 129 129 + setSelectedPollOptions((s) => 130 130 + s.includes(option.data.value) 131 131 + ? s.filter((s) => s !== option.data.value) 132 132 + : [...s, option.data.value], 133 133 + ) 134 134 + } 135 135 + entityID={option.data.value} 136 136 + /> 137 137 + ))} 138 138 + <div className="flex justify-between items-center"> 139 139 + <div className="flex justify-end gap-2"> 140 140 + {permissions.write && ( 141 141 + <button 142 142 + className="pollEditOptions w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 143 143 + onClick={() => { 144 144 + props.setPollState("editing"); 145 145 + }} 146 146 + > 147 147 + Edit Options 148 148 + </button> 149 149 + )} 150 150 + 151 151 + {permissions.write && <Separator classname="h-6" />} 152 152 + <PollStateToggle 153 153 + setPollState={props.setPollState} 154 154 + pollState={props.pollState} 155 155 + hasVoted={props.hasVoted} 156 156 + /> 157 157 + </div> 158 158 + <ButtonPrimary 159 159 + className="place-self-end" 160 160 + onClick={async () => { 161 161 + await voteOnPoll(props.entityID, selectedPollOptions); 162 162 + mutate((oldState) => { 163 163 + if (!oldState || !oldState.voter_token) return; 164 164 + return { 165 165 + ...oldState, 166 166 + polls: [ 167 167 + ...oldState.polls.filter( 168 168 + (p) => 169 169 + !( 170 170 + p.poll_votes_on_entity.voter_token === 171 171 + oldState.voter_token && 172 172 + p.poll_votes_on_entity.poll_entity == props.entityID 173 173 + ), 174 174 + ), 175 175 + ...selectedPollOptions.map((option_entity) => ({ 176 176 + poll_votes_on_entity: { 177 177 + option_entity, 178 178 + entities: { set: "" }, 179 179 + poll_entity: props.entityID, 180 180 + voter_token: oldState.voter_token!, 181 181 + }, 182 182 + })), 183 183 + ], 184 184 + }; 185 185 + }); 186 186 + props.onSubmit(); 187 187 + }} 188 188 + disabled={ 189 189 + selectedPollOptions.length === 0 || 190 190 + (selectedPollOptions.length === currentVotes.length && 191 191 + selectedPollOptions.every((s) => currentVotes.includes(s))) 192 192 + } 193 193 + > 194 194 + Vote! 195 195 + </ButtonPrimary> 196 196 + </div> 197 197 + </> 198 198 + ); 199 199 + }; 200 200 + const PollVoteButton = (props: { 201 201 + entityID: string; 202 202 + selected: boolean; 203 203 + toggleSelected: () => void; 204 204 + }) => { 205 205 + let optionName = useEntity(props.entityID, "poll-option/name")?.data.value; 206 206 + if (!optionName) return null; 207 207 + if (props.selected) 208 208 + return ( 209 209 + <div className="flex gap-2 items-center"> 210 210 + <ButtonPrimary 211 211 + className={`pollOption grow max-w-full flex`} 212 212 + onClick={() => { 213 213 + props.toggleSelected(); 214 214 + }} 215 215 + > 216 216 + {optionName} 217 217 + </ButtonPrimary> 218 218 + </div> 219 219 + ); 220 220 + return ( 221 221 + <div className="flex gap-2 items-center"> 222 222 + <ButtonSecondary 223 223 + className={`pollOption grow max-w-full flex`} 224 224 + onClick={() => { 225 225 + props.toggleSelected(); 226 226 + }} 227 227 + > 228 228 + {optionName} 229 229 + </ButtonSecondary> 230 230 + </div> 231 231 + ); 232 232 + }; 233 233 + 234 234 + const PollResults = (props: { 235 235 + entityID: string; 236 236 + pollState: "editing" | "voting" | "results"; 237 237 + setPollState: (pollState: "editing" | "voting" | "results") => void; 238 238 + hasVoted: boolean; 239 239 + }) => { 240 240 + let { data } = usePollData(); 241 241 + let { permissions } = useEntitySetContext(); 242 242 + let pollOptions = useEntity(props.entityID, "poll/options"); 243 243 + let pollData = data?.pollVotes.find((p) => p.poll_entity === props.entityID); 244 244 + let votesByOptions = pollData?.votesByOption || {}; 245 245 + let highestVotes = Math.max(...Object.values(votesByOptions)); 246 246 + let winningOptionEntities = Object.entries(votesByOptions).reduce<string[]>( 247 247 + (winningEntities, [entity, votes]) => { 248 248 + if (votes === highestVotes) winningEntities.push(entity); 249 249 + return winningEntities; 250 250 + }, 251 251 + [], 252 252 + ); 253 253 + return ( 254 254 + <> 255 255 + {pollOptions.map((p) => ( 256 256 + <PollResult 257 257 + key={p.id} 258 258 + winner={winningOptionEntities.includes(p.data.value)} 259 259 + entityID={p.data.value} 260 260 + totalVotes={pollData?.unique_votes || 0} 261 261 + votes={pollData?.votesByOption[p.data.value] || 0} 262 262 + /> 263 263 + ))} 264 264 + <div className="flex gap-2"> 265 265 + {permissions.write && ( 266 266 + <button 267 267 + className="pollEditOptions w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 268 268 + onClick={() => { 269 269 + props.setPollState("editing"); 270 270 + }} 271 271 + > 272 272 + Edit Options 273 273 + </button> 274 274 + )} 275 275 + 276 276 + {permissions.write && <Separator classname="h-6" />} 277 277 + <PollStateToggle 278 278 + setPollState={props.setPollState} 279 279 + pollState={props.pollState} 280 280 + hasVoted={props.hasVoted} 281 281 + /> 282 282 + </div> 283 283 + </> 284 284 + ); 285 285 + }; 286 286 + 287 287 + const PollResult = (props: { 288 288 + entityID: string; 289 289 + votes: number; 290 290 + totalVotes: number; 291 291 + winner: boolean; 292 292 + }) => { 293 293 + let optionName = useEntity(props.entityID, "poll-option/name")?.data.value; 294 294 + return ( 295 295 + <div 296 296 + className={`pollResult relative grow py-0.5 px-2 border-accent-contrast rounded-md overflow-hidden ${props.winner ? "font-bold border-2" : "border"}`} 297 297 + > 298 298 + <div 299 299 + style={{ 300 300 + WebkitTextStroke: `${props.winner ? "6px" : "6px"} ${theme.colors["bg-page"]}`, 301 301 + paintOrder: "stroke fill", 302 302 + }} 303 303 + className={`pollResultContent text-accent-contrast relative flex gap-2 justify-between z-10`} 304 304 + > 305 305 + <div className="grow max-w-full truncate">{optionName}</div> 306 306 + <div>{props.votes}</div> 307 307 + </div> 308 308 + <div 309 309 + className={`pollResultBG absolute bg-bg-page w-full top-0 bottom-0 left-0 right-0 flex flex-row z-0`} 310 310 + > 311 311 + <div 312 312 + className={`bg-accent-contrast rounded-[2px] m-0.5`} 313 313 + style={{ 314 314 + maskImage: "var(--hatchSVG)", 315 315 + maskRepeat: "repeat repeat", 316 316 + 317 317 + ...(props.votes === 0 318 318 + ? { width: "4px" } 319 319 + : { flexBasis: `${(props.votes / props.totalVotes) * 100}%` }), 320 320 + }} 321 321 + /> 322 322 + <div /> 323 323 + </div> 324 324 + </div> 325 325 + ); 326 326 + }; 327 327 + 328 328 + const EditPoll = (props: { 329 329 + votes: { option_entity: string }[]; 330 330 + totalVotes: number; 331 331 + entityID: string; 332 332 + close: () => void; 333 333 + }) => { 334 334 + let pollOptions = useEntity(props.entityID, "poll/options"); 335 335 + let { rep } = useReplicache(); 336 336 + let permission_set = useEntitySetContext(); 337 337 + let [localPollOptionNames, setLocalPollOptionNames] = useState<{ 338 338 + [k: string]: string; 339 339 + }>({}); 340 340 + return ( 341 341 + <> 342 342 + {props.totalVotes > 0 && ( 343 343 + <div className="text-sm italic text-tertiary"> 344 344 + You can&apos;t edit options people already voted for! 345 345 + </div> 346 346 + )} 347 347 + 348 348 + {pollOptions.length === 0 && ( 349 349 + <div className="text-center italic text-tertiary text-sm"> 350 350 + no options yet... 351 351 + </div> 352 352 + )} 353 353 + {pollOptions.map((p) => ( 354 354 + <EditPollOption 355 355 + key={p.id} 356 356 + entityID={p.data.value} 357 357 + pollEntity={props.entityID} 358 358 + disabled={!!props.votes.find((v) => v.option_entity === p.data.value)} 359 359 + localNameState={localPollOptionNames[p.data.value]} 360 360 + setLocalNameState={setLocalPollOptionNames} 361 361 + /> 362 362 + ))} 363 363 + 364 364 + <button 365 365 + className="pollAddOption w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 366 366 + onClick={async () => { 367 367 + let pollOptionEntity = v7(); 368 368 + await rep?.mutate.addPollOption({ 369 369 + pollEntity: props.entityID, 370 370 + pollOptionEntity, 371 371 + pollOptionName: "", 372 372 + permission_set: permission_set.set, 373 373 + factID: v7(), 374 374 + }); 375 375 + 376 376 + focusElement( 377 377 + document.getElementById( 378 378 + elementId.block(props.entityID).pollInput(pollOptionEntity), 379 379 + ) as HTMLInputElement | null, 380 380 + ); 381 381 + }} 382 382 + > 383 383 + Add an Option 384 384 + </button> 385 385 + 386 386 + <hr className="border-border" /> 387 387 + <ButtonPrimary 388 388 + className="place-self-end" 389 389 + onClick={async () => { 390 390 + // remove any poll options that have no name 391 391 + // look through the localPollOptionNames object and remove any options that have no name 392 392 + let emptyOptions = Object.entries(localPollOptionNames).filter( 393 393 + ([optionEntity, optionName]) => optionName === "", 394 394 + ); 395 395 + await Promise.all( 396 396 + emptyOptions.map( 397 397 + async ([entity]) => 398 398 + await rep?.mutate.removePollOption({ 399 399 + optionEntity: entity, 400 400 + }), 401 401 + ), 402 402 + ); 403 403 + 404 404 + await rep?.mutate.assertFact( 405 405 + Object.entries(localPollOptionNames) 406 406 + .filter(([, name]) => !!name) 407 407 + .map(([entity, name]) => ({ 408 408 + entity, 409 409 + attribute: "poll-option/name", 410 410 + data: { type: "string", value: name }, 411 411 + })), 412 412 + ); 413 413 + props.close(); 414 414 + }} 415 415 + > 416 416 + Save <CheckTiny /> 417 417 + </ButtonPrimary> 418 418 + </> 419 419 + ); 420 420 + }; 421 421 + 422 422 + const EditPollOption = (props: { 423 423 + entityID: string; 424 424 + pollEntity: string; 425 425 + localNameState: string | undefined; 426 426 + setLocalNameState: ( 427 427 + s: (s: { [k: string]: string }) => { [k: string]: string }, 428 428 + ) => void; 429 429 + disabled: boolean; 430 430 + }) => { 431 431 + let { rep } = useReplicache(); 432 432 + let optionName = useEntity(props.entityID, "poll-option/name")?.data.value; 433 433 + useEffect(() => { 434 434 + props.setLocalNameState((s) => ({ 435 435 + ...s, 436 436 + [props.entityID]: optionName || "", 437 437 + })); 438 438 + }, [optionName, props.setLocalNameState, props.entityID]); 439 439 + 440 440 + return ( 441 441 + <div className="flex gap-2 items-center"> 442 442 + <Input 443 443 + id={elementId.block(props.pollEntity).pollInput(props.entityID)} 444 444 + type="text" 445 445 + className="pollOptionInput w-full input-with-border" 446 446 + placeholder="Option here..." 447 447 + disabled={props.disabled} 448 448 + value={ 449 449 + props.localNameState === undefined ? optionName : props.localNameState 450 450 + } 451 451 + onChange={(e) => { 452 452 + props.setLocalNameState((s) => ({ 453 453 + ...s, 454 454 + [props.entityID]: e.target.value, 455 455 + })); 456 456 + }} 457 457 + onKeyDown={(e) => { 458 458 + if (e.key === "Backspace" && !e.currentTarget.value) { 459 459 + e.preventDefault(); 460 460 + rep?.mutate.removePollOption({ optionEntity: props.entityID }); 461 461 + } 462 462 + }} 463 463 + /> 464 464 + 465 465 + <button 466 466 + tabIndex={-1} 467 467 + disabled={props.disabled} 468 468 + className="text-accent-contrast disabled:text-border" 469 469 + onMouseDown={async () => { 470 470 + await rep?.mutate.removePollOption({ optionEntity: props.entityID }); 471 471 + }} 472 472 + > 473 473 + <CloseTiny /> 474 474 + </button> 475 475 + </div> 476 476 + ); 477 477 + }; 478 478 + 479 479 + const PollStateToggle = (props: { 480 480 + setPollState: (pollState: "editing" | "voting" | "results") => void; 481 481 + hasVoted: boolean; 482 482 + pollState: "editing" | "voting" | "results"; 483 483 + }) => { 484 484 + return ( 485 485 + <button 486 486 + className="text-sm text-accent-contrast " 487 487 + onClick={() => { 488 488 + props.setPollState(props.pollState === "voting" ? "results" : "voting"); 489 489 + }} 490 490 + > 491 491 + {props.pollState === "voting" 492 492 + ? "See Results" 493 493 + : props.hasVoted 494 494 + ? "Change Vote" 495 495 + : "Back to Poll"} 496 496 + </button> 497 497 + ); 498 498 + };

+8

components/Blocks/PollBlock/pollBlockState.ts

··· 1 1 + import { create } from "zustand"; 2 2 + 3 3 + export let usePollBlockUIState = create( 4 4 + () => 5 5 + ({}) as { 6 6 + [entity: string]: { state: "editing" | "voting" | "results" } | undefined; 7 7 + }, 8 8 + );

-507

components/Blocks/PollBlock.tsx

··· 1 1 - import { useUIState } from "src/useUIState"; 2 2 - import { BlockProps } from "./Block"; 3 3 - import { ButtonPrimary, ButtonSecondary } from "components/Buttons"; 4 4 - import { useCallback, useEffect, useState } from "react"; 5 5 - import { focusElement, Input } from "components/Input"; 6 6 - import { Separator } from "components/Layout"; 7 7 - import { useEntitySetContext } from "components/EntitySetProvider"; 8 8 - import { theme } from "tailwind.config"; 9 9 - import { useEntity, useReplicache } from "src/replicache"; 10 10 - import { v7 } from "uuid"; 11 11 - import { 12 12 - useLeafletPublicationData, 13 13 - usePollData, 14 14 - } from "components/PageSWRDataProvider"; 15 15 - import { voteOnPoll } from "actions/pollActions"; 16 16 - import { create } from "zustand"; 17 17 - import { elementId } from "src/utils/elementId"; 18 18 - import { CheckTiny } from "components/Icons/CheckTiny"; 19 19 - import { CloseTiny } from "components/Icons/CloseTiny"; 20 20 - import { PublicationPollBlock } from "./PublicationPollBlock"; 21 21 - 22 22 - export let usePollBlockUIState = create( 23 23 - () => 24 24 - ({}) as { 25 25 - [entity: string]: { state: "editing" | "voting" | "results" } | undefined; 26 26 - }, 27 27 - ); 28 28 - 29 29 - export const PollBlock = (props: BlockProps) => { 30 30 - let { data: pub } = useLeafletPublicationData(); 31 31 - if (!pub) return <LeafletPollBlock {...props} />; 32 32 - return <PublicationPollBlock {...props} />; 33 33 - }; 34 34 - 35 35 - export const LeafletPollBlock = (props: BlockProps) => { 36 36 - let isSelected = useUIState((s) => 37 37 - s.selectedBlocks.find((b) => b.value === props.entityID), 38 38 - ); 39 39 - let { permissions } = useEntitySetContext(); 40 40 - 41 41 - let { data: pollData } = usePollData(); 42 42 - let hasVoted = 43 43 - pollData?.voter_token && 44 44 - pollData.polls.find( 45 45 - (v) => 46 46 - v.poll_votes_on_entity.voter_token === pollData.voter_token && 47 47 - v.poll_votes_on_entity.poll_entity === props.entityID, 48 48 - ); 49 49 - 50 50 - let pollState = usePollBlockUIState((s) => s[props.entityID]?.state); 51 51 - if (!pollState) { 52 52 - if (hasVoted) pollState = "results"; 53 53 - else pollState = "voting"; 54 54 - } 55 55 - 56 56 - const setPollState = useCallback( 57 57 - (state: "editing" | "voting" | "results") => { 58 58 - usePollBlockUIState.setState((s) => ({ [props.entityID]: { state } })); 59 59 - }, 60 60 - [], 61 61 - ); 62 62 - 63 63 - let votes = 64 64 - pollData?.polls.filter( 65 65 - (v) => v.poll_votes_on_entity.poll_entity === props.entityID, 66 66 - ) || []; 67 67 - let totalVotes = votes.length; 68 68 - 69 69 - return ( 70 70 - <div 71 71 - className={`poll flex flex-col gap-2 p-3 w-full 72 72 - ${isSelected ? "block-border-selected " : "block-border"}`} 73 73 - style={{ 74 74 - backgroundColor: 75 75 - "color-mix(in oklab, rgb(var(--accent-1)), rgb(var(--bg-page)) 85%)", 76 76 - }} 77 77 - > 78 78 - {pollState === "editing" ? ( 79 79 - <EditPoll 80 80 - totalVotes={totalVotes} 81 81 - votes={votes.map((v) => v.poll_votes_on_entity)} 82 82 - entityID={props.entityID} 83 83 - close={() => { 84 84 - if (hasVoted) setPollState("results"); 85 85 - else setPollState("voting"); 86 86 - }} 87 87 - /> 88 88 - ) : pollState === "results" ? ( 89 89 - <PollResults 90 90 - entityID={props.entityID} 91 91 - pollState={pollState} 92 92 - setPollState={setPollState} 93 93 - hasVoted={!!hasVoted} 94 94 - /> 95 95 - ) : ( 96 96 - <PollVote 97 97 - entityID={props.entityID} 98 98 - onSubmit={() => setPollState("results")} 99 99 - pollState={pollState} 100 100 - setPollState={setPollState} 101 101 - hasVoted={!!hasVoted} 102 102 - /> 103 103 - )} 104 104 - </div> 105 105 - ); 106 106 - }; 107 107 - 108 108 - const PollVote = (props: { 109 109 - entityID: string; 110 110 - onSubmit: () => void; 111 111 - pollState: "editing" | "voting" | "results"; 112 112 - setPollState: (pollState: "editing" | "voting" | "results") => void; 113 113 - hasVoted: boolean; 114 114 - }) => { 115 115 - let { data, mutate } = usePollData(); 116 116 - let { permissions } = useEntitySetContext(); 117 117 - 118 118 - let pollOptions = useEntity(props.entityID, "poll/options"); 119 119 - let currentVotes = data?.voter_token 120 120 - ? data.polls 121 121 - .filter( 122 122 - (p) => 123 123 - p.poll_votes_on_entity.poll_entity === props.entityID && 124 124 - p.poll_votes_on_entity.voter_token === data.voter_token, 125 125 - ) 126 126 - .map((v) => v.poll_votes_on_entity.option_entity) 127 127 - : []; 128 128 - let [selectedPollOptions, setSelectedPollOptions] = 129 129 - useState<string[]>(currentVotes); 130 130 - 131 131 - return ( 132 132 - <> 133 133 - {pollOptions.map((option, index) => ( 134 134 - <PollVoteButton 135 135 - key={option.data.value} 136 136 - selected={selectedPollOptions.includes(option.data.value)} 137 137 - toggleSelected={() => 138 138 - setSelectedPollOptions((s) => 139 139 - s.includes(option.data.value) 140 140 - ? s.filter((s) => s !== option.data.value) 141 141 - : [...s, option.data.value], 142 142 - ) 143 143 - } 144 144 - entityID={option.data.value} 145 145 - /> 146 146 - ))} 147 147 - <div className="flex justify-between items-center"> 148 148 - <div className="flex justify-end gap-2"> 149 149 - {permissions.write && ( 150 150 - <button 151 151 - className="pollEditOptions w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 152 152 - onClick={() => { 153 153 - props.setPollState("editing"); 154 154 - }} 155 155 - > 156 156 - Edit Options 157 157 - </button> 158 158 - )} 159 159 - 160 160 - {permissions.write && <Separator classname="h-6" />} 161 161 - <PollStateToggle 162 162 - setPollState={props.setPollState} 163 163 - pollState={props.pollState} 164 164 - hasVoted={props.hasVoted} 165 165 - /> 166 166 - </div> 167 167 - <ButtonPrimary 168 168 - className="place-self-end" 169 169 - onClick={async () => { 170 170 - await voteOnPoll(props.entityID, selectedPollOptions); 171 171 - mutate((oldState) => { 172 172 - if (!oldState || !oldState.voter_token) return; 173 173 - return { 174 174 - ...oldState, 175 175 - polls: [ 176 176 - ...oldState.polls.filter( 177 177 - (p) => 178 178 - !( 179 179 - p.poll_votes_on_entity.voter_token === 180 180 - oldState.voter_token && 181 181 - p.poll_votes_on_entity.poll_entity == props.entityID 182 182 - ), 183 183 - ), 184 184 - ...selectedPollOptions.map((option_entity) => ({ 185 185 - poll_votes_on_entity: { 186 186 - option_entity, 187 187 - entities: { set: "" }, 188 188 - poll_entity: props.entityID, 189 189 - voter_token: oldState.voter_token!, 190 190 - }, 191 191 - })), 192 192 - ], 193 193 - }; 194 194 - }); 195 195 - props.onSubmit(); 196 196 - }} 197 197 - disabled={ 198 198 - selectedPollOptions.length === 0 || 199 199 - (selectedPollOptions.length === currentVotes.length && 200 200 - selectedPollOptions.every((s) => currentVotes.includes(s))) 201 201 - } 202 202 - > 203 203 - Vote! 204 204 - </ButtonPrimary> 205 205 - </div> 206 206 - </> 207 207 - ); 208 208 - }; 209 209 - const PollVoteButton = (props: { 210 210 - entityID: string; 211 211 - selected: boolean; 212 212 - toggleSelected: () => void; 213 213 - }) => { 214 214 - let optionName = useEntity(props.entityID, "poll-option/name")?.data.value; 215 215 - if (!optionName) return null; 216 216 - if (props.selected) 217 217 - return ( 218 218 - <div className="flex gap-2 items-center"> 219 219 - <ButtonPrimary 220 220 - className={`pollOption grow max-w-full flex`} 221 221 - onClick={() => { 222 222 - props.toggleSelected(); 223 223 - }} 224 224 - > 225 225 - {optionName} 226 226 - </ButtonPrimary> 227 227 - </div> 228 228 - ); 229 229 - return ( 230 230 - <div className="flex gap-2 items-center"> 231 231 - <ButtonSecondary 232 232 - className={`pollOption grow max-w-full flex`} 233 233 - onClick={() => { 234 234 - props.toggleSelected(); 235 235 - }} 236 236 - > 237 237 - {optionName} 238 238 - </ButtonSecondary> 239 239 - </div> 240 240 - ); 241 241 - }; 242 242 - 243 243 - const PollResults = (props: { 244 244 - entityID: string; 245 245 - pollState: "editing" | "voting" | "results"; 246 246 - setPollState: (pollState: "editing" | "voting" | "results") => void; 247 247 - hasVoted: boolean; 248 248 - }) => { 249 249 - let { data } = usePollData(); 250 250 - let { permissions } = useEntitySetContext(); 251 251 - let pollOptions = useEntity(props.entityID, "poll/options"); 252 252 - let pollData = data?.pollVotes.find((p) => p.poll_entity === props.entityID); 253 253 - let votesByOptions = pollData?.votesByOption || {}; 254 254 - let highestVotes = Math.max(...Object.values(votesByOptions)); 255 255 - let winningOptionEntities = Object.entries(votesByOptions).reduce<string[]>( 256 256 - (winningEntities, [entity, votes]) => { 257 257 - if (votes === highestVotes) winningEntities.push(entity); 258 258 - return winningEntities; 259 259 - }, 260 260 - [], 261 261 - ); 262 262 - return ( 263 263 - <> 264 264 - {pollOptions.map((p) => ( 265 265 - <PollResult 266 266 - key={p.id} 267 267 - winner={winningOptionEntities.includes(p.data.value)} 268 268 - entityID={p.data.value} 269 269 - totalVotes={pollData?.unique_votes || 0} 270 270 - votes={pollData?.votesByOption[p.data.value] || 0} 271 271 - /> 272 272 - ))} 273 273 - <div className="flex gap-2"> 274 274 - {permissions.write && ( 275 275 - <button 276 276 - className="pollEditOptions w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 277 277 - onClick={() => { 278 278 - props.setPollState("editing"); 279 279 - }} 280 280 - > 281 281 - Edit Options 282 282 - </button> 283 283 - )} 284 284 - 285 285 - {permissions.write && <Separator classname="h-6" />} 286 286 - <PollStateToggle 287 287 - setPollState={props.setPollState} 288 288 - pollState={props.pollState} 289 289 - hasVoted={props.hasVoted} 290 290 - /> 291 291 - </div> 292 292 - </> 293 293 - ); 294 294 - }; 295 295 - 296 296 - const PollResult = (props: { 297 297 - entityID: string; 298 298 - votes: number; 299 299 - totalVotes: number; 300 300 - winner: boolean; 301 301 - }) => { 302 302 - let optionName = useEntity(props.entityID, "poll-option/name")?.data.value; 303 303 - return ( 304 304 - <div 305 305 - className={`pollResult relative grow py-0.5 px-2 border-accent-contrast rounded-md overflow-hidden ${props.winner ? "font-bold border-2" : "border"}`} 306 306 - > 307 307 - <div 308 308 - style={{ 309 309 - WebkitTextStroke: `${props.winner ? "6px" : "6px"} ${theme.colors["bg-page"]}`, 310 310 - paintOrder: "stroke fill", 311 311 - }} 312 312 - className={`pollResultContent text-accent-contrast relative flex gap-2 justify-between z-10`} 313 313 - > 314 314 - <div className="grow max-w-full truncate">{optionName}</div> 315 315 - <div>{props.votes}</div> 316 316 - </div> 317 317 - <div 318 318 - className={`pollResultBG absolute bg-bg-page w-full top-0 bottom-0 left-0 right-0 flex flex-row z-0`} 319 319 - > 320 320 - <div 321 321 - className={`bg-accent-contrast rounded-[2px] m-0.5`} 322 322 - style={{ 323 323 - maskImage: "var(--hatchSVG)", 324 324 - maskRepeat: "repeat repeat", 325 325 - 326 326 - ...(props.votes === 0 327 327 - ? { width: "4px" } 328 328 - : { flexBasis: `${(props.votes / props.totalVotes) * 100}%` }), 329 329 - }} 330 330 - /> 331 331 - <div /> 332 332 - </div> 333 333 - </div> 334 334 - ); 335 335 - }; 336 336 - 337 337 - const EditPoll = (props: { 338 338 - votes: { option_entity: string }[]; 339 339 - totalVotes: number; 340 340 - entityID: string; 341 341 - close: () => void; 342 342 - }) => { 343 343 - let pollOptions = useEntity(props.entityID, "poll/options"); 344 344 - let { rep } = useReplicache(); 345 345 - let permission_set = useEntitySetContext(); 346 346 - let [localPollOptionNames, setLocalPollOptionNames] = useState<{ 347 347 - [k: string]: string; 348 348 - }>({}); 349 349 - return ( 350 350 - <> 351 351 - {props.totalVotes > 0 && ( 352 352 - <div className="text-sm italic text-tertiary"> 353 353 - You can&apos;t edit options people already voted for! 354 354 - </div> 355 355 - )} 356 356 - 357 357 - {pollOptions.length === 0 && ( 358 358 - <div className="text-center italic text-tertiary text-sm"> 359 359 - no options yet... 360 360 - </div> 361 361 - )} 362 362 - {pollOptions.map((p) => ( 363 363 - <EditPollOption 364 364 - key={p.id} 365 365 - entityID={p.data.value} 366 366 - pollEntity={props.entityID} 367 367 - disabled={!!props.votes.find((v) => v.option_entity === p.data.value)} 368 368 - localNameState={localPollOptionNames[p.data.value]} 369 369 - setLocalNameState={setLocalPollOptionNames} 370 370 - /> 371 371 - ))} 372 372 - 373 373 - <button 374 374 - className="pollAddOption w-fit flex gap-2 items-center justify-start text-sm text-accent-contrast" 375 375 - onClick={async () => { 376 376 - let pollOptionEntity = v7(); 377 377 - await rep?.mutate.addPollOption({ 378 378 - pollEntity: props.entityID, 379 379 - pollOptionEntity, 380 380 - pollOptionName: "", 381 381 - permission_set: permission_set.set, 382 382 - factID: v7(), 383 383 - }); 384 384 - 385 385 - focusElement( 386 386 - document.getElementById( 387 387 - elementId.block(props.entityID).pollInput(pollOptionEntity), 388 388 - ) as HTMLInputElement | null, 389 389 - ); 390 390 - }} 391 391 - > 392 392 - Add an Option 393 393 - </button> 394 394 - 395 395 - <hr className="border-border" /> 396 396 - <ButtonPrimary 397 397 - className="place-self-end" 398 398 - onClick={async () => { 399 399 - // remove any poll options that have no name 400 400 - // look through the localPollOptionNames object and remove any options that have no name 401 401 - let emptyOptions = Object.entries(localPollOptionNames).filter( 402 402 - ([optionEntity, optionName]) => optionName === "", 403 403 - ); 404 404 - await Promise.all( 405 405 - emptyOptions.map( 406 406 - async ([entity]) => 407 407 - await rep?.mutate.removePollOption({ 408 408 - optionEntity: entity, 409 409 - }), 410 410 - ), 411 411 - ); 412 412 - 413 413 - await rep?.mutate.assertFact( 414 414 - Object.entries(localPollOptionNames) 415 415 - .filter(([, name]) => !!name) 416 416 - .map(([entity, name]) => ({ 417 417 - entity, 418 418 - attribute: "poll-option/name", 419 419 - data: { type: "string", value: name }, 420 420 - })), 421 421 - ); 422 422 - props.close(); 423 423 - }} 424 424 - > 425 425 - Save <CheckTiny /> 426 426 - </ButtonPrimary> 427 427 - </> 428 428 - ); 429 429 - }; 430 430 - 431 431 - const EditPollOption = (props: { 432 432 - entityID: string; 433 433 - pollEntity: string; 434 434 - localNameState: string | undefined; 435 435 - setLocalNameState: ( 436 436 - s: (s: { [k: string]: string }) => { [k: string]: string }, 437 437 - ) => void; 438 438 - disabled: boolean; 439 439 - }) => { 440 440 - let { rep } = useReplicache(); 441 441 - let optionName = useEntity(props.entityID, "poll-option/name")?.data.value; 442 442 - useEffect(() => { 443 443 - props.setLocalNameState((s) => ({ 444 444 - ...s, 445 445 - [props.entityID]: optionName || "", 446 446 - })); 447 447 - }, [optionName, props.setLocalNameState, props.entityID]); 448 448 - 449 449 - return ( 450 450 - <div className="flex gap-2 items-center"> 451 451 - <Input 452 452 - id={elementId.block(props.pollEntity).pollInput(props.entityID)} 453 453 - type="text" 454 454 - className="pollOptionInput w-full input-with-border" 455 455 - placeholder="Option here..." 456 456 - disabled={props.disabled} 457 457 - value={ 458 458 - props.localNameState === undefined ? optionName : props.localNameState 459 459 - } 460 460 - onChange={(e) => { 461 461 - props.setLocalNameState((s) => ({ 462 462 - ...s, 463 463 - [props.entityID]: e.target.value, 464 464 - })); 465 465 - }} 466 466 - onKeyDown={(e) => { 467 467 - if (e.key === "Backspace" && !e.currentTarget.value) { 468 468 - e.preventDefault(); 469 469 - rep?.mutate.removePollOption({ optionEntity: props.entityID }); 470 470 - } 471 471 - }} 472 472 - /> 473 473 - 474 474 - <button 475 475 - tabIndex={-1} 476 476 - disabled={props.disabled} 477 477 - className="text-accent-contrast disabled:text-border" 478 478 - onMouseDown={async () => { 479 479 - await rep?.mutate.removePollOption({ optionEntity: props.entityID }); 480 480 - }} 481 481 - > 482 482 - <CloseTiny /> 483 483 - </button> 484 484 - </div> 485 485 - ); 486 486 - }; 487 487 - 488 488 - const PollStateToggle = (props: { 489 489 - setPollState: (pollState: "editing" | "voting" | "results") => void; 490 490 - hasVoted: boolean; 491 491 - pollState: "editing" | "voting" | "results"; 492 492 - }) => { 493 493 - return ( 494 494 - <button 495 495 - className="text-sm text-accent-contrast sm:hover:underline" 496 496 - onClick={() => { 497 497 - props.setPollState(props.pollState === "voting" ? "results" : "voting"); 498 498 - }} 499 499 - > 500 500 - {props.pollState === "voting" 501 501 - ? "See Results" 502 502 - : props.hasVoted 503 503 - ? "Change Vote" 504 504 - : "Back to Poll"} 505 505 - </button> 506 506 - ); 507 507 - };

+8 -10

components/Blocks/PublicationPollBlock.tsx

··· 1 1 import { useUIState } from "src/useUIState"; 2 2 - import { BlockProps } from "./Block"; 2 2 + import { BlockLayout, BlockProps } from "./Block"; 3 3 import { useMemo } from "react"; 4 4 - import { focusElement, AsyncValueInput } from "components/Input"; 4 4 + import { AsyncValueInput } from "components/Input"; 5 5 + import { focusElement } from "src/utils/focusElement"; 5 6 import { useEntitySetContext } from "components/EntitySetProvider"; 6 7 import { useEntity, useReplicache } from "src/replicache"; 7 8 import { v7 } from "uuid"; ··· 52 53 }, [publicationData, props.entityID]); 53 54 54 55 return ( 55 55 - <div 56 56 - className={`poll flex flex-col gap-2 p-3 w-full 57 57 - ${isSelected ? "block-border-selected " : "block-border"}`} 58 58 - style={{ 59 59 - backgroundColor: 60 60 - "color-mix(in oklab, rgb(var(--accent-1)), rgb(var(--bg-page)) 85%)", 61 61 - }} 56 56 + <BlockLayout 57 57 + className="poll flex flex-col gap-2" 58 58 + hasBackground={"accent"} 59 59 + isSelected={!!isSelected} 62 60 > 63 61 <EditPollForPublication 64 62 entityID={props.entityID} 65 63 isPublished={isPublished} 66 64 /> 67 67 - </div> 65 65 + </BlockLayout> 68 66 ); 69 67 }; 70 68

+6 -8

components/Blocks/RSVPBlock/index.tsx

··· 1 1 "use client"; 2 2 import { Database } from "supabase/database.types"; 3 3 - import { BlockProps } from "components/Blocks/Block"; 3 3 + import { BlockProps, BlockLayout } from "components/Blocks/Block"; 4 4 import { useState } from "react"; 5 5 import { submitRSVP } from "actions/phone_rsvp_to_event"; 6 6 import { useRSVPData } from "components/PageSWRDataProvider"; ··· 29 29 s.selectedBlocks.find((b) => b.value === props.entityID), 30 30 ); 31 31 return ( 32 32 - <div 33 33 - className={`rsvp relative flex flex-col gap-1 border p-3 w-full rounded-lg place-items-center justify-center ${isSelected ? "block-border-selected " : "block-border"}`} 34 34 - style={{ 35 35 - backgroundColor: 36 36 - "color-mix(in oklab, rgb(var(--accent-1)), rgb(var(--bg-page)) 85%)", 37 37 - }} 32 32 + <BlockLayout 33 33 + isSelected={!!isSelected} 34 34 + hasBackground={"accent"} 35 35 + className="rsvp relative flex flex-col gap-1 w-full rounded-lg place-items-center justify-center" 38 36 > 39 37 <RSVPForm entityID={props.entityID} /> 40 40 - </div> 38 38 + </BlockLayout> 41 39 ); 42 40 } 43 41

+16 -45

components/Blocks/TextBlock/RenderYJSFragment.tsx

··· 5 5 import * as base64 from "base64-js"; 6 6 import { didToBlueskyUrl } from "src/utils/mentionUtils"; 7 7 import { AtMentionLink } from "components/AtMentionLink"; 8 8 + import { Delta } from "src/utils/yjsFragmentToString"; 9 9 + import { ProfilePopover } from "components/ProfilePopover"; 8 10 9 9 - type BlockElements = "h1" | "h2" | "h3" | null | "blockquote" | "p"; 11 11 + type BlockElements = "h1" | "h2" | "h3" | null | "blockquote" | "p" | "small"; 10 12 export function RenderYJSFragment({ 11 13 value, 12 14 wrapper, ··· 62 64 ); 63 65 } 64 66 65 65 - if (node.constructor === XmlElement && node.nodeName === "hard_break") { 67 67 + if ( 68 68 + node.constructor === XmlElement && 69 69 + node.nodeName === "hard_break" 70 70 + ) { 66 71 return <br key={index} />; 67 72 } 68 73 69 74 // Handle didMention inline nodes 70 70 - if (node.constructor === XmlElement && node.nodeName === "didMention") { 75 75 + if ( 76 76 + node.constructor === XmlElement && 77 77 + node.nodeName === "didMention" 78 78 + ) { 71 79 const did = node.getAttribute("did") || ""; 72 80 const text = node.getAttribute("text") || ""; 73 81 return ( ··· 76 84 target="_blank" 77 85 rel="noopener noreferrer" 78 86 key={index} 79 79 - className="text-accent-contrast hover:underline cursor-pointer" 87 87 + className="mention" 80 88 > 81 89 {text} 82 90 </a> ··· 84 92 } 85 93 86 94 // Handle atMention inline nodes 87 87 - if (node.constructor === XmlElement && node.nodeName === "atMention") { 95 95 + if ( 96 96 + node.constructor === XmlElement && 97 97 + node.nodeName === "atMention" 98 98 + ) { 88 99 const atURI = node.getAttribute("atURI") || ""; 89 100 const text = node.getAttribute("text") || ""; 90 101 return ( ··· 131 142 } 132 143 }; 133 144 134 134 - export type Delta = { 135 135 - insert: string; 136 136 - attributes?: { 137 137 - strong?: {}; 138 138 - code?: {}; 139 139 - em?: {}; 140 140 - underline?: {}; 141 141 - strikethrough?: {}; 142 142 - highlight?: { color: string }; 143 143 - link?: { href: string }; 144 144 - }; 145 145 - }; 146 146 - 147 145 function attributesToStyle(d: Delta) { 148 146 let props = { 149 147 style: {}, ··· 173 171 174 172 return props; 175 173 } 176 176 - 177 177 - export function YJSFragmentToString( 178 178 - node: XmlElement | XmlText | XmlHook, 179 179 - ): string { 180 180 - if (node.constructor === XmlElement) { 181 181 - // Handle hard_break nodes specially 182 182 - if (node.nodeName === "hard_break") { 183 183 - return "\n"; 184 184 - } 185 185 - // Handle inline mention nodes 186 186 - if (node.nodeName === "didMention" || node.nodeName === "atMention") { 187 187 - return node.getAttribute("text") || ""; 188 188 - } 189 189 - return node 190 190 - .toArray() 191 191 - .map((f) => YJSFragmentToString(f)) 192 192 - .join(""); 193 193 - } 194 194 - if (node.constructor === XmlText) { 195 195 - return (node.toDelta() as Delta[]) 196 196 - .map((d) => { 197 197 - return d.insert; 198 198 - }) 199 199 - .join(""); 200 200 - } 201 201 - return ""; 202 202 - }

+18 -4

components/Blocks/TextBlock/index.tsx

··· 120 120 }) { 121 121 let initialFact = useEntity(props.entityID, "block/text"); 122 122 let headingLevel = useEntity(props.entityID, "block/heading-level"); 123 123 + let textSize = useEntity(props.entityID, "block/text-size"); 123 124 let alignment = 124 125 useEntity(props.entityID, "block/text-alignment")?.data.value || "left"; 125 126 let alignmentClass = { ··· 128 129 center: "text-center", 129 130 justify: "text-justify", 130 131 }[alignment]; 132 132 + let textStyle = 133 133 + textSize?.data.value === "small" 134 134 + ? "text-sm" 135 135 + : textSize?.data.value === "large" 136 136 + ? "text-lg" 137 137 + : ""; 131 138 let { permissions } = useEntitySetContext(); 132 139 133 140 let content = <br />; ··· 159 166 className={` 160 167 ${alignmentClass} 161 168 ${props.type === "blockquote" ? (props.previousBlock?.type === "blockquote" ? `blockquote pt-3 ` : "blockquote") : ""} 162 162 - ${props.type === "heading" ? HeadingStyle[headingLevel?.data.value || 1] : ""} 169 169 + ${props.type === "heading" ? HeadingStyle[headingLevel?.data.value || 1] : textStyle} 163 170 w-full whitespace-pre-wrap outline-hidden ${props.className} `} 164 171 > 165 172 {content} ··· 169 176 170 177 export function BaseTextBlock(props: BlockProps & { className?: string }) { 171 178 let headingLevel = useEntity(props.entityID, "block/heading-level"); 179 179 + let textSize = useEntity(props.entityID, "block/text-size"); 172 180 let alignment = 173 181 useEntity(props.entityID, "block/text-alignment")?.data.value || "left"; 174 182 ··· 184 192 center: "text-center", 185 193 justify: "text-justify", 186 194 }[alignment]; 195 195 + let textStyle = 196 196 + textSize?.data.value === "small" 197 197 + ? "text-sm text-secondary" 198 198 + : textSize?.data.value === "large" 199 199 + ? "text-lg text-primary" 200 200 + : "text-base text-primary"; 187 201 188 202 let editorState = useEditorStates( 189 203 (s) => s.editorStates[props.entityID], ··· 258 272 grow resize-none align-top whitespace-pre-wrap bg-transparent 259 273 outline-hidden 260 274 261 261 - ${props.type === "heading" ? HeadingStyle[headingLevel?.data.value || 1] : ""} 275 275 + ${props.type === "heading" ? HeadingStyle[headingLevel?.data.value || 1] : textStyle} 262 276 ${props.className}`} 263 277 ref={mountRef} 264 278 /> ··· 277 291 // if this is the only block on the page and is empty or is a canvas, show placeholder 278 292 <div 279 293 className={`${props.className} ${alignmentClass} w-full pointer-events-none absolute top-0 left-0 italic text-tertiary flex flex-col 280 280 - ${props.type === "heading" ? HeadingStyle[headingLevel?.data.value || 1] : ""} 294 294 + ${props.type === "heading" ? HeadingStyle[headingLevel?.data.value || 1] : textStyle} 281 295 `} 282 296 > 283 297 {props.type === "text" ··· 496 510 497 511 // Find the relative positioned parent container 498 512 const editorEl = view.dom; 499 499 - const container = editorEl.closest('.relative') as HTMLElement | null; 513 513 + const container = editorEl.closest(".relative") as HTMLElement | null; 500 514 501 515 if (container) { 502 516 const containerRect = container.getBoundingClientRect();

+15 -1

components/Blocks/TextBlock/keymap.ts

··· 17 17 import { schema } from "./schema"; 18 18 import { useUIState } from "src/useUIState"; 19 19 import { setEditorState, useEditorStates } from "src/state/useEditorState"; 20 20 - import { focusPage } from "components/Pages"; 20 20 + import { focusPage } from "src/utils/focusPage"; 21 21 import { v7 } from "uuid"; 22 22 import { scanIndex } from "src/replicache/utils"; 23 23 import { indent, outdent } from "src/utils/list-operations"; ··· 552 552 data: { 553 553 type: "text-alignment-type-union", 554 554 value: propsRef.current.alignment, 555 555 + }, 556 556 + }); 557 557 + } 558 558 + let [textSize] = 559 559 + (await repRef.current?.query((tx) => 560 560 + scanIndex(tx).eav(propsRef.current.entityID, "block/text-size"), 561 561 + )) || []; 562 562 + if (textSize) { 563 563 + await repRef.current?.mutate.assertFact({ 564 564 + entity: newEntityID, 565 565 + attribute: "block/text-size", 566 566 + data: { 567 567 + type: "text-size-union", 568 568 + value: textSize.data.value, 555 569 }, 556 570 }); 557 571 }

+4 -3

components/Blocks/TextBlock/schema.ts

··· 147 147 toDOM(node) { 148 148 // NOTE: This rendering should match the AtMentionLink component in 149 149 // components/AtMentionLink.tsx. If you update one, update the other. 150 150 - let className = "atMention text-accent-contrast"; 150 150 + let className = "atMention mention"; 151 151 let aturi = new AtUri(node.attrs.atURI); 152 152 if (aturi.collection === "pub.leaflet.publication") 153 153 className += " font-bold"; ··· 168 168 "img", 169 169 { 170 170 src: `/api/pub_icon?at_uri=${encodeURIComponent(node.attrs.atURI)}`, 171 171 - class: "inline-block w-5 h-5 rounded-full mr-1 align-text-top", 171 171 + class: 172 172 + "inline-block w-4 h-4 rounded-full mt-[3px] mr-1 align-text-top", 172 173 alt: "", 173 174 width: "16", 174 175 height: "16", ··· 214 215 return [ 215 216 "span", 216 217 { 217 217 - class: "didMention text-accent-contrast", 218 218 + class: "didMention mention", 218 219 "data-did": node.attrs.did, 219 220 }, 220 221 node.attrs.text,

+11

components/Blocks/TextBlock/useHandlePaste.ts

··· 299 299 }, 300 300 }); 301 301 } 302 302 + let textSize = child.getAttribute("data-text-size"); 303 303 + if (textSize && ["default", "small", "large"].includes(textSize)) { 304 304 + rep.mutate.assertFact({ 305 305 + entity: entityID, 306 306 + attribute: "block/text-size", 307 307 + data: { 308 308 + type: "text-size-union", 309 309 + value: textSize as "default" | "small" | "large", 310 310 + }, 311 311 + }); 312 312 + } 302 313 if (child.tagName === "A") { 303 314 let href = child.getAttribute("href"); 304 315 let dataType = child.getAttribute("data-type");

+1 -1

components/Blocks/useBlockKeyboardHandlers.ts

··· 12 12 import { ReplicacheMutators, useEntity, useReplicache } from "src/replicache"; 13 13 import { useEntitySetContext } from "components/EntitySetProvider"; 14 14 import { Replicache } from "replicache"; 15 15 - import { deleteBlock } from "./DeleteBlock"; 15 15 + import { deleteBlock } from "src/utils/deleteBlock"; 16 16 import { entities } from "drizzle/schema"; 17 17 import { scanIndex } from "src/replicache/utils"; 18 18

+1 -1

components/Blocks/useBlockMouseHandlers.ts

··· 1 1 - import { useSelectingMouse } from "components/SelectionManager"; 1 1 + import { useSelectingMouse } from "components/SelectionManager/selectionState"; 2 2 import { MouseEvent, useCallback, useRef } from "react"; 3 3 import { useUIState } from "src/useUIState"; 4 4 import { Block } from "./Block";

+11 -5

components/Buttons.tsx

··· 38 38 ${compact ? "py-0 px-1" : "px-2 py-0.5 "} 39 39 bg-accent-1 disabled:bg-border-light 40 40 border border-accent-1 rounded-md disabled:border-border-light 41 41 - outline outline-transparent outline-offset-1 focus:outline-accent-1 hover:outline-accent-1 41 41 + outline-2 outline-transparent outline-offset-1 focus:outline-accent-1 hover:outline-accent-1 42 42 text-base font-bold text-accent-2 disabled:text-border disabled:hover:text-border 43 43 flex gap-2 items-center justify-center shrink-0 44 44 ${className} ··· 77 77 ${compact ? "py-0 px-1" : "px-2 py-0.5 "} 78 78 bg-bg-page disabled:bg-border-light 79 79 border border-accent-contrast rounded-md 80 80 - outline outline-transparent focus:outline-accent-contrast hover:outline-accent-contrast outline-offset-1 80 80 + outline-2 outline-transparent focus:outline-accent-contrast hover:outline-accent-contrast outline-offset-1 81 81 text-base font-bold text-accent-contrast disabled:text-border disabled:hover:text-border 82 82 flex gap-2 items-center justify-center shrink-0 83 83 ${props.className} ··· 116 116 ${compact ? "py-0 px-1" : "px-2 py-0.5 "} 117 117 bg-transparent hover:bg-[var(--accent-light)] 118 118 border border-transparent rounded-md hover:border-[var(--accent-light)] 119 119 - outline outline-transparent focus:outline-[var(--accent-light)] hover:outline-[var(--accent-light)] outline-offset-1 119 119 + outline-2 outline-transparent focus:outline-[var(--accent-light)] hover:outline-[var(--accent-light)] outline-offset-1 120 120 text-base font-bold text-accent-contrast disabled:text-border 121 121 flex gap-2 items-center justify-center shrink-0 122 122 ${props.className} ··· 165 165 side={props.side ? props.side : undefined} 166 166 sideOffset={6} 167 167 alignOffset={12} 168 168 - className="z-10 bg-border rounded-md py-1 px-[6px] font-bold text-secondary text-sm" 168 168 + className="z-10 rounded-md py-1 px-[6px] font-bold text-secondary text-sm" 169 169 + style={{ 170 170 + backgroundColor: 171 171 + "color-mix(in oklab, rgb(var(--primary)), rgb(var(--bg-page)) 85%)", 172 172 + }} 169 173 > 170 174 {props.tooltipContent} 171 175 <RadixTooltip.Arrow ··· 175 179 viewBox="0 0 16 8" 176 180 > 177 181 <PopoverArrow 178 178 - arrowFill={theme.colors["border"]} 182 182 + arrowFill={ 183 183 + "color-mix(in oklab, rgb(var(--primary)), rgb(var(--bg-page)) 85%)" 184 184 + } 179 185 arrowStroke="transparent" 180 186 /> 181 187 </RadixTooltip.Arrow>

+6 -3

components/Canvas.tsx

··· 170 170 171 171 let pubRecord = pub.publications.record as PubLeafletPublication.Record; 172 172 let showComments = pubRecord.preferences?.showComments; 173 173 + let showMentions = pubRecord.preferences?.showMentions; 173 174 174 175 return ( 175 176 <div className="flex flex-row gap-3 items-center absolute top-6 right-3 sm:top-4 sm:right-4 bg-bg-page border-border-light rounded-md px-2 py-1 h-fit z-20"> ··· 178 179 <CommentTiny className="text-border" /> — 179 180 </div> 180 181 )} 181 181 - <div className="flex gap-1 text-tertiary items-center"> 182 182 - <QuoteTiny className="text-border" /> — 183 183 - </div> 182 182 + {showComments && ( 183 183 + <div className="flex gap-1 text-tertiary items-center"> 184 184 + <QuoteTiny className="text-border" /> — 185 185 + </div> 186 186 + )} 184 187 185 188 {!props.isSubpage && ( 186 189 <>

+14

components/Icons/ImageCoverImage.tsx

··· 1 1 + export const ImageCoverImage = () => ( 2 2 + <svg 3 3 + width="24" 4 4 + height="24" 5 5 + viewBox="0 0 24 24" 6 6 + fill="none" 7 7 + xmlns="http://www.w3.org/2000/svg" 8 8 + > 9 9 + <path 10 10 + d="M20.1631 2.56445C21.8887 2.56481 23.2881 3.96378 23.2881 5.68945V18.3105C23.288 20.0361 21.8886 21.4362 20.1631 21.4365H3.83789C2.11225 21.4365 0.713286 20.0371 0.712891 18.3115V5.68945C0.712891 3.96356 2.112 2.56445 3.83789 2.56445H20.1631ZM1.96289 18.3115C1.96329 19.3467 2.8026 20.1865 3.83789 20.1865H20.1631C21.1982 20.1862 22.038 19.3457 22.0381 18.3105V15.8066H1.96289V18.3115ZM14.4883 17.2578C14.9025 17.2578 15.2382 17.5936 15.2383 18.0078C15.2383 18.422 14.9025 18.7578 14.4883 18.7578H3.81543C3.40138 18.7576 3.06543 18.4219 3.06543 18.0078C3.06546 17.5937 3.4014 17.258 3.81543 17.2578H14.4883ZM19.9775 10.9688C19.5515 11.5175 18.8232 11.7343 18.166 11.5088L16.3213 10.876C16.2238 10.8425 16.1167 10.8506 16.0254 10.8984L15.0215 11.4238C14.4872 11.7037 13.8413 11.6645 13.3447 11.3223L12.6826 10.8652L11.3467 12.2539L11.6924 12.4844C11.979 12.6758 12.0572 13.0635 11.8662 13.3506C11.6751 13.6377 11.2873 13.7151 11 13.5244L10.0312 12.8799L8.81152 12.0654L8.03027 12.8691C7.5506 13.3622 6.78589 13.4381 6.21875 13.0488C6.17033 13.0156 6.10738 13.0112 6.05469 13.0371L4.79883 13.6572C4.25797 13.9241 3.61321 13.8697 3.125 13.5156L2.26172 12.8887L1.96289 13.1572V14.5566H22.0381V10.1299L21.1738 9.42383L19.9775 10.9688ZM4.71094 10.7012L4.70996 10.7002L3.21484 12.0361L3.85938 12.5039C3.97199 12.5854 4.12044 12.5977 4.24512 12.5361L5.50098 11.917C5.95929 11.6908 6.50439 11.7294 6.92578 12.0186C6.99106 12.0633 7.07957 12.0548 7.13477 11.998L7.75488 11.3604L5.58984 9.91504L4.71094 10.7012ZM3.83789 3.81445C2.80236 3.81445 1.96289 4.65392 1.96289 5.68945V11.4805L4.8291 8.91895C5.18774 8.59891 5.70727 8.54436 6.12207 8.77344L6.20312 8.82324L10.2891 11.5498L16.3809 5.22754L16.46 5.15234C16.8692 4.80225 17.4773 4.78945 17.9023 5.13672L22.0381 8.51562V5.68945C22.0381 4.65414 21.1983 3.81481 20.1631 3.81445H3.83789ZM13.5625 9.95312L14.0547 10.293C14.1692 10.3717 14.3182 10.3809 14.4414 10.3164L15.4453 9.79102C15.841 9.58378 16.3051 9.54827 16.7275 9.69336L18.5723 10.3271C18.7238 10.3788 18.8921 10.3286 18.9902 10.2021L20.2061 8.63281L17.2002 6.17676L13.5625 9.95312ZM8.86328 4.8291C9.84255 4.82937 10.6366 5.62324 10.6367 6.60254C10.6365 7.58178 9.8425 8.37571 8.86328 8.37598C7.88394 8.37585 7.09004 7.58186 7.08984 6.60254C7.08997 5.62315 7.88389 4.82923 8.86328 4.8291ZM8.86328 5.8291C8.43618 5.82923 8.08997 6.17544 8.08984 6.60254C8.09004 7.02958 8.43622 7.37585 8.86328 7.37598C9.29022 7.37571 9.63652 7.02949 9.63672 6.60254C9.63659 6.17552 9.29026 5.82937 8.86328 5.8291Z" 11 11 + fill="currentColor" 12 12 + /> 13 13 + </svg> 14 14 + );

+1

components/Icons/ReplyTiny.tsx

··· 8 8 viewBox="0 0 16 16" 9 9 fill="none" 10 10 xmlns="http://www.w3.org/2000/svg" 11 11 + {...props} 11 12 > 12 13 <path 13 14 fillRule="evenodd"

+1 -36

components/Input.tsx

··· 2 2 import { useEffect, useRef, useState, type JSX } from "react"; 3 3 import { onMouseDown } from "src/utils/iosInputMouseDown"; 4 4 import { isIOS } from "src/utils/isDevice"; 5 5 + import { focusElement } from "src/utils/focusElement"; 5 6 6 7 export const Input = ( 7 8 props: { ··· 56 57 }} 57 58 /> 58 59 ); 59 59 - }; 60 60 - 61 61 - export const focusElement = ( 62 62 - el?: HTMLInputElement | HTMLTextAreaElement | null, 63 63 - ) => { 64 64 - if (!isIOS()) { 65 65 - el?.focus(); 66 66 - return; 67 67 - } 68 68 - 69 69 - let fakeInput = document.createElement("input"); 70 70 - fakeInput.setAttribute("type", "text"); 71 71 - fakeInput.style.position = "fixed"; 72 72 - fakeInput.style.height = "0px"; 73 73 - fakeInput.style.width = "0px"; 74 74 - fakeInput.style.fontSize = "16px"; // disable auto zoom 75 75 - document.body.appendChild(fakeInput); 76 76 - fakeInput.focus(); 77 77 - setTimeout(() => { 78 78 - if (!el) return; 79 79 - el.style.transform = "translateY(-2000px)"; 80 80 - el?.focus(); 81 81 - fakeInput.remove(); 82 82 - el.value = " "; 83 83 - el.setSelectionRange(1, 1); 84 84 - requestAnimationFrame(() => { 85 85 - if (el) { 86 86 - el.style.transform = ""; 87 87 - } 88 88 - }); 89 89 - setTimeout(() => { 90 90 - if (!el) return; 91 91 - el.value = ""; 92 92 - el.setSelectionRange(0, 0); 93 93 - }, 50); 94 94 - }, 20); 95 60 }; 96 61 97 62 export const InputWithLabel = (

+7 -5

components/InteractionsPreview.tsx

··· 14 14 tags?: string[]; 15 15 postUrl: string; 16 16 showComments: boolean | undefined; 17 17 + showMentions: boolean | undefined; 18 18 + 17 19 share?: boolean; 18 20 }) => { 19 21 let smoker = useSmoker(); 20 22 let interactionsAvailable = 21 21 - props.quotesCount > 0 || 23 23 + (props.quotesCount > 0 && props.showMentions !== false) || 22 24 (props.showComments !== false && props.commentsCount > 0); 23 25 24 26 const tagsCount = props.tags?.length || 0; ··· 36 38 </> 37 39 )} 38 40 39 39 - {props.quotesCount === 0 ? null : ( 41 41 + {props.showMentions === false || props.quotesCount === 0 ? null : ( 40 42 <SpeedyLink 41 43 aria-label="Post quotes" 42 44 href={`${props.postUrl}?interactionDrawer=quotes`} 43 43 - className="flex flex-row gap-1 text-sm items-center text-accent-contrast!" 45 45 + className="relative flex flex-row gap-1 text-sm items-center hover:text-accent-contrast hover:no-underline! text-tertiary" 44 46 > 45 47 <QuoteTiny /> {props.quotesCount} 46 48 </SpeedyLink> ··· 49 51 <SpeedyLink 50 52 aria-label="Post comments" 51 53 href={`${props.postUrl}?interactionDrawer=comments`} 52 52 - className="relative flex flex-row gap-1 text-sm items-center hover:text-accent-contrast hover:no-underline! text-tertiary" 54 54 + className="relative flex flex-row gap-1 text-sm items-center hover:text-accent-contrast hover:no-underline! text-tertiary" 53 55 > 54 56 <CommentTiny /> {props.commentsCount} 55 57 </SpeedyLink> ··· 93 95 <Popover 94 96 className="p-2! max-w-xs" 95 97 trigger={ 96 96 - <div className="relative flex gap-1 items-center hover:text-accent-contrast "> 98 98 + <div className="relative flex gap-1 items-center hover:text-accent-contrast"> 97 99 <TagTiny /> {props.tags.length} 98 100 </div> 99 101 }

-94

components/Layout.tsx

··· 1 1 - "use client"; 2 2 - import * as DropdownMenu from "@radix-ui/react-dropdown-menu"; 3 3 - import { theme } from "tailwind.config"; 4 4 - import { NestedCardThemeProvider } from "./ThemeManager/ThemeProvider"; 5 5 - import { PopoverArrow } from "./Icons/PopoverArrow"; 6 6 - import { PopoverOpenContext } from "./Popover"; 7 7 - import { useState } from "react"; 8 8 - 9 1 export const Separator = (props: { classname?: string }) => { 10 2 return <div className={`h-full border-r border-border ${props.classname}`} />; 11 11 - }; 12 12 - 13 13 - export const Menu = (props: { 14 14 - open?: boolean; 15 15 - trigger: React.ReactNode; 16 16 - children: React.ReactNode; 17 17 - align?: "start" | "end" | "center" | undefined; 18 18 - alignOffset?: number; 19 19 - side?: "top" | "bottom" | "right" | "left" | undefined; 20 20 - background?: string; 21 21 - border?: string; 22 22 - className?: string; 23 23 - onOpenChange?: (o: boolean) => void; 24 24 - asChild?: boolean; 25 25 - }) => { 26 26 - let [open, setOpen] = useState(props.open || false); 27 27 - return ( 28 28 - <DropdownMenu.Root 29 29 - onOpenChange={(o) => { 30 30 - setOpen(o); 31 31 - props.onOpenChange?.(o); 32 32 - }} 33 33 - open={props.open} 34 34 - > 35 35 - <PopoverOpenContext value={open}> 36 36 - <DropdownMenu.Trigger asChild={props.asChild}> 37 37 - {props.trigger} 38 38 - </DropdownMenu.Trigger> 39 39 - <DropdownMenu.Portal> 40 40 - <NestedCardThemeProvider> 41 41 - <DropdownMenu.Content 42 42 - side={props.side ? props.side : "bottom"} 43 43 - align={props.align ? props.align : "center"} 44 44 - alignOffset={props.alignOffset ? props.alignOffset : undefined} 45 45 - sideOffset={4} 46 46 - collisionPadding={16} 47 47 - className={`dropdownMenu z-20 bg-bg-page flex flex-col p-1 gap-0.5 border border-border rounded-md shadow-md ${props.className}`} 48 48 - > 49 49 - {props.children} 50 50 - <DropdownMenu.Arrow 51 51 - asChild 52 52 - width={16} 53 53 - height={8} 54 54 - viewBox="0 0 16 8" 55 55 - > 56 56 - <PopoverArrow 57 57 - arrowFill={ 58 58 - props.background 59 59 - ? props.background 60 60 - : theme.colors["bg-page"] 61 61 - } 62 62 - arrowStroke={ 63 63 - props.border ? props.border : theme.colors["border"] 64 64 - } 65 65 - /> 66 66 - </DropdownMenu.Arrow> 67 67 - </DropdownMenu.Content> 68 68 - </NestedCardThemeProvider> 69 69 - </DropdownMenu.Portal> 70 70 - </PopoverOpenContext> 71 71 - </DropdownMenu.Root> 72 72 - ); 73 73 - }; 74 74 - 75 75 - export const MenuItem = (props: { 76 76 - children?: React.ReactNode; 77 77 - className?: string; 78 78 - onSelect: (e: Event) => void; 79 79 - id?: string; 80 80 - }) => { 81 81 - return ( 82 82 - <DropdownMenu.Item 83 83 - id={props.id} 84 84 - onSelect={(event) => { 85 85 - props.onSelect(event); 86 86 - }} 87 87 - className={` 88 88 - menuItem 89 89 - z-10 py-1! px-2! 90 90 - flex gap-2 91 91 - ${props.className} 92 92 - `} 93 93 - > 94 94 - {props.children} 95 95 - </DropdownMenu.Item> 96 96 - ); 97 3 }; 98 4 99 5 export const ShortcutKey = (props: { children: React.ReactNode }) => {

+97

components/Menu.tsx

··· 1 1 + "use client"; 2 2 + import * as DropdownMenu from "@radix-ui/react-dropdown-menu"; 3 3 + import { theme } from "tailwind.config"; 4 4 + import { NestedCardThemeProvider } from "./ThemeManager/ThemeProvider"; 5 5 + import { PopoverArrow } from "./Icons/PopoverArrow"; 6 6 + import { PopoverOpenContext } from "./Popover/PopoverContext"; 7 7 + import { useState } from "react"; 8 8 + 9 9 + export const Menu = (props: { 10 10 + open?: boolean; 11 11 + trigger: React.ReactNode; 12 12 + children: React.ReactNode; 13 13 + align?: "start" | "end" | "center" | undefined; 14 14 + alignOffset?: number; 15 15 + side?: "top" | "bottom" | "right" | "left" | undefined; 16 16 + background?: string; 17 17 + border?: string; 18 18 + className?: string; 19 19 + onOpenChange?: (o: boolean) => void; 20 20 + asChild?: boolean; 21 21 + }) => { 22 22 + let [open, setOpen] = useState(props.open || false); 23 23 + 24 24 + return ( 25 25 + <DropdownMenu.Root 26 26 + onOpenChange={(o) => { 27 27 + setOpen(o); 28 28 + props.onOpenChange?.(o); 29 29 + }} 30 30 + open={props.open} 31 31 + > 32 32 + <PopoverOpenContext value={open}> 33 33 + <DropdownMenu.Trigger asChild={props.asChild}> 34 34 + {props.trigger} 35 35 + </DropdownMenu.Trigger> 36 36 + <DropdownMenu.Portal> 37 37 + <NestedCardThemeProvider> 38 38 + <DropdownMenu.Content 39 39 + side={props.side ? props.side : "bottom"} 40 40 + align={props.align ? props.align : "center"} 41 41 + alignOffset={props.alignOffset ? props.alignOffset : undefined} 42 42 + sideOffset={4} 43 43 + collisionPadding={16} 44 44 + className={` 45 45 + dropdownMenu z-20 p-1 46 46 + flex flex-col gap-0.5 47 47 + bg-bg-page 48 48 + border border-border rounded-md shadow-md 49 49 + ${props.className}`} 50 50 + > 51 51 + {props.children} 52 52 + <DropdownMenu.Arrow 53 53 + asChild 54 54 + width={16} 55 55 + height={8} 56 56 + viewBox="0 0 16 8" 57 57 + > 58 58 + <PopoverArrow 59 59 + arrowFill={ 60 60 + props.background 61 61 + ? props.background 62 62 + : theme.colors["bg-page"] 63 63 + } 64 64 + arrowStroke={ 65 65 + props.border ? props.border : theme.colors["border"] 66 66 + } 67 67 + /> 68 68 + </DropdownMenu.Arrow> 69 69 + </DropdownMenu.Content> 70 70 + </NestedCardThemeProvider> 71 71 + </DropdownMenu.Portal> 72 72 + </PopoverOpenContext> 73 73 + </DropdownMenu.Root> 74 74 + ); 75 75 + }; 76 76 + 77 77 + export const MenuItem = (props: { 78 78 + children?: React.ReactNode; 79 79 + className?: string; 80 80 + onSelect: (e: Event) => void; 81 81 + id?: string; 82 82 + }) => { 83 83 + return ( 84 84 + <DropdownMenu.Item 85 85 + id={props.id} 86 86 + onSelect={(event) => { 87 87 + props.onSelect(event); 88 88 + }} 89 89 + className={` 90 90 + menuItem 91 91 + ${props.className} 92 92 + `} 93 93 + > 94 94 + {props.children} 95 95 + </DropdownMenu.Item> 96 96 + ); 97 97 + };

+33

components/OAuthError.tsx

··· 1 1 + "use client"; 2 2 + 3 3 + import { OAuthSessionError } from "src/atproto-oauth"; 4 4 + 5 5 + export function OAuthErrorMessage({ 6 6 + error, 7 7 + className, 8 8 + }: { 9 9 + error: OAuthSessionError; 10 10 + className?: string; 11 11 + }) { 12 12 + const signInUrl = `/api/oauth/login?redirect_url=${encodeURIComponent(window.location.href)}${error.did ? `&handle=${encodeURIComponent(error.did)}` : ""}`; 13 13 + 14 14 + return ( 15 15 + <div className={className}> 16 16 + <span>Your session has expired or is invalid. </span> 17 17 + <a href={signInUrl} className="underline font-bold whitespace-nowrap"> 18 18 + Sign in again 19 19 + </a> 20 20 + </div> 21 21 + ); 22 22 + } 23 23 + 24 24 + export function isOAuthSessionError( 25 25 + error: unknown, 26 26 + ): error is OAuthSessionError { 27 27 + return ( 28 28 + typeof error === "object" && 29 29 + error !== null && 30 30 + "type" in error && 31 31 + (error as OAuthSessionError).type === "oauth_session_expired" 32 32 + ); 33 33 + }

+7 -8

components/PageHeader.tsx

··· 1 1 "use client"; 2 2 import { useState, useEffect } from "react"; 3 3 + import { useCardBorderHidden } from "./Pages/useCardBorderHidden"; 3 4 4 4 - export const Header = (props: { 5 5 - children: React.ReactNode; 6 6 - cardBorderHidden: boolean; 7 7 - }) => { 5 5 + export const Header = (props: { children: React.ReactNode }) => { 6 6 + let cardBorderHidden = useCardBorderHidden(); 8 7 let [scrollPos, setScrollPos] = useState(0); 9 8 10 9 useEffect(() => { ··· 22 21 } 23 22 }, []); 24 23 25 25 - let headerBGColor = props.cardBorderHidden 24 24 + let headerBGColor = !cardBorderHidden 26 25 ? "var(--bg-leaflet)" 27 26 : "var(--bg-page)"; 28 27 ··· 54 53 style={ 55 54 scrollPos < 20 56 55 ? { 57 57 - backgroundColor: props.cardBorderHidden 56 56 + backgroundColor: !cardBorderHidden 58 57 ? `rgba(${headerBGColor}, ${scrollPos / 60 + 0.75})` 59 58 : `rgba(${headerBGColor}, ${scrollPos / 20})`, 60 60 - paddingLeft: props.cardBorderHidden 59 59 + paddingLeft: !cardBorderHidden 61 60 ? "4px" 62 61 : `calc(${scrollPos / 20}*4px)`, 63 63 - paddingRight: props.cardBorderHidden 62 62 + paddingRight: !cardBorderHidden 64 63 ? "8px" 65 64 : `calc(${scrollPos / 20}*8px)`, 66 65 }

+4 -24

components/PageLayouts/DashboardLayout.tsx

··· 25 25 import Link from "next/link"; 26 26 import { ExternalLinkTiny } from "components/Icons/ExternalLinkTiny"; 27 27 import { usePreserveScroll } from "src/hooks/usePreserveScroll"; 28 28 + import { Tab } from "components/Tab"; 28 29 29 30 export type DashboardState = { 30 31 display?: "grid" | "list"; ··· 133 134 }, 134 135 >(props: { 135 136 id: string; 136 136 - cardBorderHidden: boolean; 137 137 tabs: T; 138 138 defaultTab: keyof T; 139 139 currentPage: navPages; ··· 180 180 </div> 181 181 </MediaContents> 182 182 <div 183 183 - className={`w-full h-full flex flex-col gap-2 relative overflow-y-scroll pt-3 pb-12 px-3 sm:pt-8 sm:pb-12 sm:pl-6 sm:pr-4 `} 183 183 + className={`w-full h-full flex flex-col gap-2 relative overflow-y-scroll pt-3 pb-3 px-3 sm:pt-8 sm:pb-3 sm:pl-6 sm:pr-4 `} 184 184 ref={ref} 185 185 id="home-content" 186 186 > 187 187 {Object.keys(props.tabs).length <= 1 && !controls ? null : ( 188 188 <> 189 189 - <Header cardBorderHidden={props.cardBorderHidden}> 189 189 + <Header> 190 190 {headerState === "default" ? ( 191 191 <> 192 192 {Object.keys(props.tabs).length > 1 && ( ··· 355 355 ); 356 356 }; 357 357 358 358 - function Tab(props: { 359 359 - name: string; 360 360 - selected: boolean; 361 361 - onSelect: () => void; 362 362 - href?: string; 363 363 - }) { 364 364 - return ( 365 365 - <div 366 366 - className={`pubTabs px-1 py-0 flex gap-1 items-center rounded-md hover:cursor-pointer ${props.selected ? "text-accent-2 bg-accent-1 font-bold -mb-px" : "text-tertiary"}`} 367 367 - onClick={() => props.onSelect()} 368 368 - > 369 369 - {props.name} 370 370 - {props.href && <ExternalLinkTiny />} 371 371 - </div> 372 372 - ); 373 373 - } 374 374 - 375 375 - const FilterOptions = (props: { 376 376 - hasPubs: boolean; 377 377 - hasArchived: boolean; 378 378 - }) => { 358 358 + const FilterOptions = (props: { hasPubs: boolean; hasArchived: boolean }) => { 379 359 let { filter } = useDashboardState(); 380 360 let setState = useSetDashboardState(); 381 361 let filterCount = Object.values(filter).filter(Boolean).length;

+4 -6

components/Pages/Page.tsx

··· 12 12 import { Blocks } from "components/Blocks"; 13 13 import { PublicationMetadata } from "./PublicationMetadata"; 14 14 import { useCardBorderHidden } from "./useCardBorderHidden"; 15 15 - import { focusPage } from "."; 15 15 + import { focusPage } from "src/utils/focusPage"; 16 16 import { PageOptions } from "./PageOptions"; 17 17 import { CardThemeProvider } from "components/ThemeManager/ThemeProvider"; 18 18 import { useDrawerOpen } from "app/lish/[did]/[publication]/[rkey]/Interactions/InteractionDrawer"; ··· 34 34 return focusedPageID === props.entityID; 35 35 }); 36 36 let pageType = useEntity(props.entityID, "page/type")?.data.value || "doc"; 37 37 - let cardBorderHidden = useCardBorderHidden(props.entityID); 38 37 39 38 let drawerOpen = useDrawerOpen(props.entityID); 40 39 return ( ··· 49 48 }} 50 49 id={elementId.page(props.entityID).container} 51 50 drawerOpen={!!drawerOpen} 52 52 - cardBorderHidden={!!cardBorderHidden} 53 51 isFocused={isFocused} 54 52 fullPageScroll={props.fullPageScroll} 55 53 pageType={pageType} ··· 77 75 id: string; 78 76 children: React.ReactNode; 79 77 pageOptions?: React.ReactNode; 80 80 - cardBorderHidden: boolean; 81 78 fullPageScroll: boolean; 82 79 isFocused?: boolean; 83 80 onClickAction?: (e: React.MouseEvent) => void; 84 81 pageType: "canvas" | "doc"; 85 82 drawerOpen: boolean | undefined; 86 83 }) => { 84 84 + const cardBorderHidden = useCardBorderHidden(); 87 85 let { ref } = usePreserveScroll<HTMLDivElement>(props.id); 88 86 return ( 89 87 // this div wraps the contents AND the page options. ··· 106 104 shrink-0 snap-center 107 105 overflow-y-scroll 108 106 ${ 109 109 - !props.cardBorderHidden && 107 107 + !cardBorderHidden && 110 108 `h-full border 111 109 bg-[rgba(var(--bg-page),var(--bg-page-alpha))] 112 110 ${props.drawerOpen ? "rounded-l-lg " : "rounded-lg"} 113 111 ${props.isFocused ? "shadow-md border-border" : "border-border-light"}` 114 112 } 115 115 - ${props.cardBorderHidden && "sm:h-[calc(100%+48px)] h-[calc(100%+20px)] sm:-my-6 -my-3 sm:pt-6 pt-3"} 113 113 + ${cardBorderHidden && "sm:h-[calc(100%+48px)] h-[calc(100%+20px)] sm:-my-6 -my-3 sm:pt-6 pt-3"} 116 114 ${props.fullPageScroll && "max-w-full "} 117 115 ${props.pageType === "doc" && !props.fullPageScroll && "w-[10000px] sm:mx-0 max-w-[var(--page-width-units)]"} 118 116 ${

+9 -31

components/Pages/PageOptions.tsx

··· 7 7 import { useReplicache } from "src/replicache"; 8 8 9 9 import { Media } from "../Media"; 10 10 - import { MenuItem, Menu } from "../Layout"; 10 10 + import { MenuItem, Menu } from "../Menu"; 11 11 import { PageThemeSetter } from "../ThemeManager/PageThemeSetter"; 12 12 import { PageShareMenu } from "./PageShareMenu"; 13 13 import { useUndoState } from "src/undoManager"; ··· 21 21 export const PageOptionButton = ({ 22 22 children, 23 23 secondary, 24 24 - cardBorderHidden, 25 24 className, 26 25 disabled, 27 26 ...props 28 27 }: { 29 28 children: React.ReactNode; 30 29 secondary?: boolean; 31 31 - cardBorderHidden: boolean | undefined; 32 30 className?: string; 33 31 disabled?: boolean; 34 32 } & Omit<JSX.IntrinsicElements["button"], "content">) => { 33 33 + const cardBorderHidden = useCardBorderHidden(); 35 34 return ( 36 35 <button 37 36 className={` ··· 58 57 first: boolean | undefined; 59 58 isFocused: boolean; 60 59 }) => { 61 61 - let cardBorderHidden = useCardBorderHidden(props.entityID); 62 62 - 63 60 return ( 64 61 <div 65 62 className={`pageOptions w-fit z-10 66 63 ${props.isFocused ? "block" : "sm:hidden block"} 67 67 - absolute sm:-right-[20px] right-3 sm:top-3 top-0 64 64 + absolute sm:-right-[19px] right-3 sm:top-3 top-0 68 65 flex sm:flex-col flex-row-reverse gap-1 items-start`} 69 66 > 70 67 {!props.first && ( 71 68 <PageOptionButton 72 72 - cardBorderHidden={cardBorderHidden} 73 69 secondary 74 70 onClick={() => { 75 71 useUIState.getState().closePage(props.entityID); ··· 78 74 <CloseTiny /> 79 75 </PageOptionButton> 80 76 )} 81 81 - <OptionsMenu 82 82 - entityID={props.entityID} 83 83 - first={!!props.first} 84 84 - cardBorderHidden={cardBorderHidden} 85 85 - /> 86 86 - <UndoButtons cardBorderHidden={cardBorderHidden} /> 77 77 + <OptionsMenu entityID={props.entityID} first={!!props.first} /> 78 78 + <UndoButtons /> 87 79 </div> 88 80 ); 89 81 }; 90 82 91 91 - export const UndoButtons = (props: { 92 92 - cardBorderHidden: boolean | undefined; 93 93 - }) => { 83 83 + export const UndoButtons = () => { 94 84 let undoState = useUndoState(); 95 85 let { undoManager } = useReplicache(); 96 86 return ( 97 87 <Media mobile> 98 88 {undoState.canUndo && ( 99 89 <div className="gap-1 flex sm:flex-col"> 100 100 - <PageOptionButton 101 101 - secondary 102 102 - cardBorderHidden={props.cardBorderHidden} 103 103 - onClick={() => undoManager.undo()} 104 104 - > 90 90 + <PageOptionButton secondary onClick={() => undoManager.undo()}> 105 91 <UndoTiny /> 106 92 </PageOptionButton> 107 93 108 94 <PageOptionButton 109 95 secondary 110 110 - cardBorderHidden={props.cardBorderHidden} 111 96 onClick={() => undoManager.undo()} 112 97 disabled={!undoState.canRedo} 113 98 > ··· 119 104 ); 120 105 }; 121 106 122 122 - export const OptionsMenu = (props: { 123 123 - entityID: string; 124 124 - first: boolean; 125 125 - cardBorderHidden: boolean | undefined; 126 126 - }) => { 107 107 + export const OptionsMenu = (props: { entityID: string; first: boolean }) => { 127 108 let [state, setState] = useState<"normal" | "theme" | "share">("normal"); 128 109 let { permissions } = useEntitySetContext(); 129 110 if (!permissions.write) return null; ··· 138 119 if (!open) setState("normal"); 139 120 }} 140 121 trigger={ 141 141 - <PageOptionButton 142 142 - cardBorderHidden={props.cardBorderHidden} 143 143 - className="!w-8 !h-5 sm:!w-5 sm:!h-8" 144 144 - > 122 122 + <PageOptionButton className="!w-8 !h-5 sm:!w-5 sm:!h-8"> 145 123 <MoreOptionsTiny className="sm:rotate-90" /> 146 124 </PageOptionButton> 147 125 }

+5 -3

components/Pages/PublicationMetadata.tsx

··· 121 121 <Separator classname="h-4!" /> 122 122 </> 123 123 )} 124 124 - <div className="flex gap-1 items-center"> 125 125 - <QuoteTiny />— 126 126 - </div> 124 124 + {pubRecord?.preferences?.showMentions && ( 125 125 + <div className="flex gap-1 items-center"> 126 126 + <QuoteTiny />— 127 127 + </div> 128 128 + )} 127 129 {pubRecord?.preferences?.showComments && ( 128 130 <div className="flex gap-1 items-center"> 129 131 <CommentTiny />—

+2 -75

components/Pages/index.tsx

··· 4 4 import { useUIState } from "src/useUIState"; 5 5 import { useSearchParams } from "next/navigation"; 6 6 7 7 - import { focusBlock } from "src/utils/focusBlock"; 8 8 - import { elementId } from "src/utils/elementId"; 7 7 + import { useEntity } from "src/replicache"; 9 8 10 10 - import { Replicache } from "replicache"; 11 11 - import { Fact, ReplicacheMutators, useEntity } from "src/replicache"; 12 12 - 13 13 - import { scanIndex } from "src/replicache/utils"; 14 14 - import { CardThemeProvider } from "../ThemeManager/ThemeProvider"; 15 15 - import { scrollIntoViewIfNeeded } from "src/utils/scrollIntoViewIfNeeded"; 16 9 import { useCardBorderHidden } from "./useCardBorderHidden"; 17 10 import { BookendSpacer, SandwichSpacer } from "components/LeafletLayout"; 18 11 import { LeafletSidebar } from "app/[leaflet_id]/Sidebar"; ··· 62 55 ); 63 56 } 64 57 65 65 - export async function focusPage( 66 66 - pageID: string, 67 67 - rep: Replicache<ReplicacheMutators>, 68 68 - focusFirstBlock?: "focusFirstBlock", 69 69 - ) { 70 70 - // if this page is already focused, 71 71 - let focusedBlock = useUIState.getState().focusedEntity; 72 72 - // else set this page as focused 73 73 - useUIState.setState(() => ({ 74 74 - focusedEntity: { 75 75 - entityType: "page", 76 76 - entityID: pageID, 77 77 - }, 78 78 - })); 79 79 - 80 80 - setTimeout(async () => { 81 81 - //scroll to page 82 82 - 83 83 - scrollIntoViewIfNeeded( 84 84 - document.getElementById(elementId.page(pageID).container), 85 85 - false, 86 86 - "smooth", 87 87 - ); 88 88 - 89 89 - // if we asked that the function focus the first block, focus the first block 90 90 - if (focusFirstBlock === "focusFirstBlock") { 91 91 - let firstBlock = await rep.query(async (tx) => { 92 92 - let type = await scanIndex(tx).eav(pageID, "page/type"); 93 93 - let blocks = await scanIndex(tx).eav( 94 94 - pageID, 95 95 - type[0]?.data.value === "canvas" ? "canvas/block" : "card/block", 96 96 - ); 97 97 - 98 98 - let firstBlock = blocks[0]; 99 99 - 100 100 - if (!firstBlock) { 101 101 - return null; 102 102 - } 103 103 - 104 104 - let blockType = ( 105 105 - await tx 106 106 - .scan< 107 107 - Fact<"block/type"> 108 108 - >({ indexName: "eav", prefix: `${firstBlock.data.value}-block/type` }) 109 109 - .toArray() 110 110 - )[0]; 111 111 - 112 112 - if (!blockType) return null; 113 113 - 114 114 - return { 115 115 - value: firstBlock.data.value, 116 116 - type: blockType.data.value, 117 117 - parent: firstBlock.entity, 118 118 - position: firstBlock.data.position, 119 119 - }; 120 120 - }); 121 121 - 122 122 - if (firstBlock) { 123 123 - setTimeout(() => { 124 124 - focusBlock(firstBlock, { type: "start" }); 125 125 - }, 500); 126 126 - } 127 127 - } 128 128 - }, 50); 129 129 - } 130 130 - 131 131 - export const blurPage = () => { 58 58 + const blurPage = () => { 132 59 useUIState.setState(() => ({ 133 60 focusedEntity: null, 134 61 selectedBlocks: [],

+3 -18

components/Pages/useCardBorderHidden.ts

··· 1 1 - import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 2 2 - import { PubLeafletPublication } from "lexicons/api"; 3 3 - import { useEntity, useReplicache } from "src/replicache"; 1 1 + import { useCardBorderHiddenContext } from "components/ThemeManager/ThemeProvider"; 4 2 5 5 - export function useCardBorderHidden(entityID: string | null) { 6 6 - let { rootEntity } = useReplicache(); 7 7 - let { data: pub } = useLeafletPublicationData(); 8 8 - let rootCardBorderHidden = useEntity(rootEntity, "theme/card-border-hidden"); 9 9 - 10 10 - let cardBorderHidden = 11 11 - useEntity(entityID, "theme/card-border-hidden") || rootCardBorderHidden; 12 12 - if (!cardBorderHidden && !rootCardBorderHidden) { 13 13 - if (pub?.publications?.record) { 14 14 - let record = pub.publications.record as PubLeafletPublication.Record; 15 15 - return !record.theme?.showPageBackground; 16 16 - } 17 17 - return false; 18 18 - } 19 19 - return (cardBorderHidden || rootCardBorderHidden)?.data.value; 3 3 + export function useCardBorderHidden(entityID?: string | null) { 4 4 + return useCardBorderHiddenContext(); 20 5 }

+3

components/Popover/PopoverContext.ts

··· 1 1 + import { createContext } from "react"; 2 2 + 3 3 + export const PopoverOpenContext = createContext(false);

+87

components/Popover/index.tsx

··· 1 1 + "use client"; 2 2 + import * as RadixPopover from "@radix-ui/react-popover"; 3 3 + import { theme } from "tailwind.config"; 4 4 + import { NestedCardThemeProvider } from "../ThemeManager/ThemeProvider"; 5 5 + import { useEffect, useState } from "react"; 6 6 + import { PopoverArrow } from "../Icons/PopoverArrow"; 7 7 + import { PopoverOpenContext } from "./PopoverContext"; 8 8 + export const Popover = (props: { 9 9 + trigger: React.ReactNode; 10 10 + disabled?: boolean; 11 11 + children: React.ReactNode; 12 12 + align?: "start" | "end" | "center"; 13 13 + side?: "top" | "bottom" | "left" | "right"; 14 14 + sideOffset?: number; 15 15 + background?: string; 16 16 + border?: string; 17 17 + className?: string; 18 18 + open?: boolean; 19 19 + onOpenChange?: (open: boolean) => void; 20 20 + onOpenAutoFocus?: (e: Event) => void; 21 21 + asChild?: boolean; 22 22 + arrowFill?: string; 23 23 + noArrow?: boolean; 24 24 + }) => { 25 25 + let [open, setOpen] = useState(props.open || false); 26 26 + useEffect(() => { 27 27 + if (props.open !== undefined) setOpen(props.open); 28 28 + }, [props.open]); 29 29 + return ( 30 30 + <RadixPopover.Root 31 31 + open={props.open} 32 32 + onOpenChange={(o) => { 33 33 + setOpen(o); 34 34 + props.onOpenChange?.(o); 35 35 + }} 36 36 + > 37 37 + <PopoverOpenContext value={open}> 38 38 + <RadixPopover.Trigger disabled={props.disabled} asChild={props.asChild}> 39 39 + {props.trigger} 40 40 + </RadixPopover.Trigger> 41 41 + <RadixPopover.Portal> 42 42 + <NestedCardThemeProvider> 43 43 + <RadixPopover.Content 44 44 + className={` 45 45 + z-20 bg-bg-page 46 46 + px-3 py-2 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 50 50 + overflow-y-scroll 51 51 + ${props.className} 52 52 + `} 53 53 + side={props.side} 54 54 + align={props.align ? props.align : "center"} 55 55 + sideOffset={props.sideOffset ? props.sideOffset : 4} 56 56 + collisionPadding={16} 57 57 + onOpenAutoFocus={props.onOpenAutoFocus} 58 58 + > 59 59 + {props.children} 60 60 + {!props.noArrow && ( 61 61 + <RadixPopover.Arrow 62 62 + asChild 63 63 + width={16} 64 64 + height={8} 65 65 + viewBox="0 0 16 8" 66 66 + > 67 67 + <PopoverArrow 68 68 + arrowFill={ 69 69 + props.arrowFill 70 70 + ? props.arrowFill 71 71 + : props.background 72 72 + ? props.background 73 73 + : theme.colors["bg-page"] 74 74 + } 75 75 + arrowStroke={ 76 76 + props.border ? props.border : theme.colors["border"] 77 77 + } 78 78 + /> 79 79 + </RadixPopover.Arrow> 80 80 + )} 81 81 + </RadixPopover.Content> 82 82 + </NestedCardThemeProvider> 83 83 + </RadixPopover.Portal> 84 84 + </PopoverOpenContext> 85 85 + </RadixPopover.Root> 86 86 + ); 87 87 + };

-88

components/Popover.tsx

··· 1 1 - "use client"; 2 2 - import * as RadixPopover from "@radix-ui/react-popover"; 3 3 - import { theme } from "tailwind.config"; 4 4 - import { NestedCardThemeProvider } from "./ThemeManager/ThemeProvider"; 5 5 - import { createContext, useEffect, useState } from "react"; 6 6 - import { PopoverArrow } from "./Icons/PopoverArrow"; 7 7 - 8 8 - export const PopoverOpenContext = createContext(false); 9 9 - export const Popover = (props: { 10 10 - trigger: React.ReactNode; 11 11 - disabled?: boolean; 12 12 - children: React.ReactNode; 13 13 - align?: "start" | "end" | "center"; 14 14 - side?: "top" | "bottom" | "left" | "right"; 15 15 - sideOffset?: number; 16 16 - background?: string; 17 17 - border?: string; 18 18 - className?: string; 19 19 - open?: boolean; 20 20 - onOpenChange?: (open: boolean) => void; 21 21 - onOpenAutoFocus?: (e: Event) => void; 22 22 - asChild?: boolean; 23 23 - arrowFill?: string; 24 24 - noArrow?: boolean; 25 25 - }) => { 26 26 - let [open, setOpen] = useState(props.open || false); 27 27 - useEffect(() => { 28 28 - if (props.open !== undefined) setOpen(props.open); 29 29 - }, [props.open]); 30 30 - return ( 31 31 - <RadixPopover.Root 32 32 - open={props.open} 33 33 - onOpenChange={(o) => { 34 34 - setOpen(o); 35 35 - props.onOpenChange?.(o); 36 36 - }} 37 37 - > 38 38 - <PopoverOpenContext value={open}> 39 39 - <RadixPopover.Trigger disabled={props.disabled} asChild={props.asChild}> 40 40 - {props.trigger} 41 41 - </RadixPopover.Trigger> 42 42 - <RadixPopover.Portal> 43 43 - <NestedCardThemeProvider> 44 44 - <RadixPopover.Content 45 45 - className={` 46 46 - z-20 bg-bg-page 47 47 - px-3 py-2 48 48 - max-w-(--radix-popover-content-available-width) 49 49 - max-h-(--radix-popover-content-available-height) 50 50 - border border-border rounded-md shadow-md 51 51 - overflow-y-scroll 52 52 - ${props.className} 53 53 - `} 54 54 - side={props.side} 55 55 - align={props.align ? props.align : "center"} 56 56 - sideOffset={props.sideOffset ? props.sideOffset : 4} 57 57 - collisionPadding={16} 58 58 - onOpenAutoFocus={props.onOpenAutoFocus} 59 59 - > 60 60 - {props.children} 61 61 - {!props.noArrow && ( 62 62 - <RadixPopover.Arrow 63 63 - asChild 64 64 - width={16} 65 65 - height={8} 66 66 - viewBox="0 0 16 8" 67 67 - > 68 68 - <PopoverArrow 69 69 - arrowFill={ 70 70 - props.arrowFill 71 71 - ? props.arrowFill 72 72 - : props.background 73 73 - ? props.background 74 74 - : theme.colors["bg-page"] 75 75 - } 76 76 - arrowStroke={ 77 77 - props.border ? props.border : theme.colors["border"] 78 78 - } 79 79 - /> 80 80 - </RadixPopover.Arrow> 81 81 - )} 82 82 - </RadixPopover.Content> 83 83 - </NestedCardThemeProvider> 84 84 - </RadixPopover.Portal> 85 85 - </PopoverOpenContext> 86 86 - </RadixPopover.Root> 87 87 - ); 88 88 - };

+44 -31

components/PostListing.tsx

··· 13 13 14 14 import Link from "next/link"; 15 15 import { InteractionPreview } from "./InteractionsPreview"; 16 16 + import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 16 17 17 18 export const PostListing = (props: Post) => { 18 18 - let pubRecord = props.publication.pubRecord as PubLeafletPublication.Record; 19 19 + let pubRecord = props.publication?.pubRecord as 20 20 + | PubLeafletPublication.Record 21 21 + | undefined; 19 22 20 23 let postRecord = props.documents.data as PubLeafletDocument.Record; 21 24 let postUri = new AtUri(props.documents.uri); 25 25 + let uri = props.publication ? props.publication?.uri : props.documents.uri; 22 26 23 23 - let theme = usePubTheme(pubRecord.theme); 24 24 - let backgroundImage = pubRecord?.theme?.backgroundImage?.image?.ref 25 25 - ? blobRefToSrc( 26 26 - pubRecord?.theme?.backgroundImage?.image?.ref, 27 27 - new AtUri(props.publication.uri).host, 28 28 - ) 29 29 - : null; 27 27 + // For standalone documents (no publication), pass isStandalone to get correct defaults 28 28 + let isStandalone = !pubRecord; 29 29 + let theme = usePubTheme(pubRecord?.theme || postRecord?.theme, isStandalone); 30 30 + let themeRecord = pubRecord?.theme || postRecord?.theme; 31 31 + let backgroundImage = 32 32 + themeRecord?.backgroundImage?.image?.ref && uri 33 33 + ? blobRefToSrc(themeRecord.backgroundImage.image.ref, new AtUri(uri).host) 34 34 + : null; 30 35 31 31 - let backgroundImageRepeat = pubRecord?.theme?.backgroundImage?.repeat; 32 32 - let backgroundImageSize = pubRecord?.theme?.backgroundImage?.width || 500; 36 36 + let backgroundImageRepeat = themeRecord?.backgroundImage?.repeat; 37 37 + let backgroundImageSize = themeRecord?.backgroundImage?.width || 500; 33 38 34 34 - let showPageBackground = pubRecord.theme?.showPageBackground; 39 39 + let showPageBackground = pubRecord 40 40 + ? pubRecord?.theme?.showPageBackground 41 41 + : postRecord.theme?.showPageBackground ?? true; 35 42 36 43 let quotes = props.documents.document_mentions_in_bsky?.[0]?.count || 0; 37 44 let comments = 38 38 - pubRecord.preferences?.showComments === false 45 45 + pubRecord?.preferences?.showComments === false 39 46 ? 0 40 47 : props.documents.comments_on_documents?.[0]?.count || 0; 41 48 let tags = (postRecord?.tags as string[] | undefined) || []; 42 49 50 50 + // For standalone posts, link directly to the document 51 51 + let postHref = props.publication 52 52 + ? `${props.publication.href}/${postUri.rkey}` 53 53 + : `/p/${postUri.host}/${postUri.rkey}`; 54 54 + 43 55 return ( 44 56 <BaseThemeProvider {...theme} local> 45 57 <div 46 58 style={{ 47 47 - backgroundImage: `url(${backgroundImage})`, 59 59 + backgroundImage: backgroundImage 60 60 + ? `url(${backgroundImage})` 61 61 + : undefined, 48 62 backgroundRepeat: backgroundImageRepeat ? "repeat" : "no-repeat", 49 63 backgroundSize: `${backgroundImageRepeat ? `${backgroundImageSize}px` : "cover"}`, 50 64 }} ··· 55 69 hover:outline-accent-contrast hover:border-accent-contrast 56 70 `} 57 71 > 58 58 - <Link 59 59 - className="h-full w-full absolute top-0 left-0" 60 60 - href={`${props.publication.href}/${postUri.rkey}`} 61 61 - /> 72 72 + <Link className="h-full w-full absolute top-0 left-0" href={postHref} /> 62 73 <div 63 74 className={`${showPageBackground ? "bg-bg-page " : "bg-transparent"} rounded-md w-full px-[10px] pt-2 pb-2`} 64 75 style={{ ··· 71 82 72 83 <p className="text-secondary italic">{postRecord.description}</p> 73 84 <div className="flex flex-col-reverse md:flex-row md gap-2 text-sm text-tertiary items-center justify-start pt-1.5 md:pt-3 w-full"> 74 74 - <PubInfo 75 75 - href={props.publication.href} 76 76 - pubRecord={pubRecord} 77 77 - uri={props.publication.uri} 78 78 - /> 85 85 + {props.publication && pubRecord && ( 86 86 + <PubInfo 87 87 + href={props.publication.href} 88 88 + pubRecord={pubRecord} 89 89 + uri={props.publication.uri} 90 90 + /> 91 91 + )} 79 92 <div className="flex flex-row justify-between gap-2 items-center w-full"> 80 93 <PostInfo publishedAt={postRecord.publishedAt} /> 81 94 <InteractionPreview 82 82 - postUrl={`${props.publication.href}/${postUri.rkey}`} 95 95 + postUrl={postHref} 83 96 quotesCount={quotes} 84 97 commentsCount={comments} 85 98 tags={tags} 86 86 - showComments={pubRecord.preferences?.showComments} 99 99 + showComments={pubRecord?.preferences?.showComments} 100 100 + showMentions={pubRecord?.preferences?.showMentions} 87 101 share 88 102 /> 89 103 </div> ··· 114 128 }; 115 129 116 130 const PostInfo = (props: { publishedAt: string | undefined }) => { 131 131 + let localizedDate = useLocalizedDate(props.publishedAt || "", { 132 132 + year: "numeric", 133 133 + month: "short", 134 134 + day: "numeric", 135 135 + }); 117 136 return ( 118 137 <div className="flex gap-2 items-center shrink-0 self-start"> 119 138 {props.publishedAt && ( 120 139 <> 121 121 - <div className="shrink-0"> 122 122 - {new Date(props.publishedAt).toLocaleDateString("en-US", { 123 123 - year: "numeric", 124 124 - month: "short", 125 125 - day: "numeric", 126 126 - })} 127 127 - </div> 140 140 + <div className="shrink-0">{localizedDate}</div> 128 141 </> 129 142 )} 130 143 </div>

+98

components/ProfilePopover.tsx

··· 1 1 + "use client"; 2 2 + import { Popover } from "./Popover"; 3 3 + import useSWR from "swr"; 4 4 + import { callRPC } from "app/api/rpc/client"; 5 5 + import { useRef, useState } from "react"; 6 6 + import { ProfileHeader } from "app/(home-pages)/p/[didOrHandle]/ProfileHeader"; 7 7 + import { SpeedyLink } from "./SpeedyLink"; 8 8 + import { Tooltip } from "./Tooltip"; 9 9 + import { ProfileViewDetailed } from "@atproto/api/dist/client/types/app/bsky/actor/defs"; 10 10 + 11 11 + export const ProfilePopover = (props: { 12 12 + trigger: React.ReactNode; 13 13 + didOrHandle: string; 14 14 + }) => { 15 15 + const [isOpen, setIsOpen] = useState(false); 16 16 + let [isHovered, setIsHovered] = useState(false); 17 17 + const hoverTimeout = useRef<null | number>(null); 18 18 + 19 19 + const { data, isLoading } = useSWR( 20 20 + isHovered ? ["profile-data", props.didOrHandle] : null, 21 21 + async () => { 22 22 + const response = await callRPC("get_profile_data", { 23 23 + didOrHandle: props.didOrHandle, 24 24 + }); 25 25 + return response.result; 26 26 + }, 27 27 + ); 28 28 + 29 29 + return ( 30 30 + <Tooltip 31 31 + className="max-w-sm p-0! text-center" 32 32 + asChild 33 33 + trigger={ 34 34 + <a 35 35 + className="no-underline" 36 36 + href={`https://leaflet.pub/p/${props.didOrHandle}`} 37 37 + target="_blank" 38 38 + onPointerEnter={(e) => { 39 39 + if (hoverTimeout.current) { 40 40 + window.clearTimeout(hoverTimeout.current); 41 41 + } 42 42 + hoverTimeout.current = window.setTimeout(async () => { 43 43 + setIsHovered(true); 44 44 + }, 150); 45 45 + }} 46 46 + onPointerLeave={() => { 47 47 + if (isHovered) return; 48 48 + if (hoverTimeout.current) { 49 49 + window.clearTimeout(hoverTimeout.current); 50 50 + hoverTimeout.current = null; 51 51 + } 52 52 + setIsHovered(false); 53 53 + }} 54 54 + > 55 55 + {props.trigger} 56 56 + </a> 57 57 + } 58 58 + onOpenChange={setIsOpen} 59 59 + > 60 60 + {isLoading ? ( 61 61 + <div className="text-secondary p-4">Loading...</div> 62 62 + ) : data ? ( 63 63 + <div> 64 64 + <ProfileHeader 65 65 + profile={data.profile} 66 66 + publications={data.publications} 67 67 + popover 68 68 + /> 69 69 + <KnownFollowers viewer={data.profile.viewer} did={data.profile.did} /> 70 70 + </div> 71 71 + ) : ( 72 72 + <div className="text-secondary py-2 px-4">Profile not found</div> 73 73 + )} 74 74 + </Tooltip> 75 75 + ); 76 76 + }; 77 77 + 78 78 + let KnownFollowers = (props: { 79 79 + viewer: ProfileViewDetailed["viewer"]; 80 80 + did: string; 81 81 + }) => { 82 82 + if (!props.viewer?.knownFollowers) return null; 83 83 + let count = props.viewer.knownFollowers.count; 84 84 + return ( 85 85 + <> 86 86 + <hr className="border-border" /> 87 87 + Followed by{" "} 88 88 + <a 89 89 + className="hover:underline" 90 90 + href={`https://bsky.social/profile/${props.did}/known-followers`} 91 91 + target="_blank" 92 92 + > 93 93 + {props.viewer?.knownFollowers?.followers[0]?.displayName}{" "} 94 94 + {count > 1 ? `and ${count - 1} other${count > 2 ? "s" : ""}` : ""} 95 95 + </a> 96 96 + </> 97 97 + ); 98 98 + };

+864

components/SelectionManager/index.tsx

··· 1 1 + "use client"; 2 2 + import { useEffect, useRef, useState } from "react"; 3 3 + import { useReplicache } from "src/replicache"; 4 4 + import { useUIState } from "src/useUIState"; 5 5 + import { scanIndex } from "src/replicache/utils"; 6 6 + import { focusBlock } from "src/utils/focusBlock"; 7 7 + import { useEditorStates } from "src/state/useEditorState"; 8 8 + import { useEntitySetContext } from "../EntitySetProvider"; 9 9 + import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 10 10 + import { indent, outdent, outdentFull } from "src/utils/list-operations"; 11 11 + import { addShortcut, Shortcut } from "src/shortcuts"; 12 12 + import { elementId } from "src/utils/elementId"; 13 13 + import { scrollIntoViewIfNeeded } from "src/utils/scrollIntoViewIfNeeded"; 14 14 + import { copySelection } from "src/utils/copySelection"; 15 15 + import { useIsMobile } from "src/hooks/isMobile"; 16 16 + import { deleteBlock } from "src/utils/deleteBlock"; 17 17 + import { schema } from "../Blocks/TextBlock/schema"; 18 18 + import { MarkType } from "prosemirror-model"; 19 19 + import { useSelectingMouse, getSortedSelection } from "./selectionState"; 20 20 + 21 21 + //How should I model selection? As ranges w/ a start and end? Store *blocks* so that I can just construct ranges? 22 22 + // How does this relate to *when dragging* ? 23 23 + 24 24 + export function SelectionManager() { 25 25 + let moreThanOneSelected = useUIState((s) => s.selectedBlocks.length > 1); 26 26 + let entity_set = useEntitySetContext(); 27 27 + let { rep, undoManager } = useReplicache(); 28 28 + let isMobile = useIsMobile(); 29 29 + useEffect(() => { 30 30 + if (!entity_set.permissions.write || !rep) return; 31 31 + const getSortedSelectionBound = getSortedSelection.bind(null, rep); 32 32 + let shortcuts: Shortcut[] = [ 33 33 + { 34 34 + metaKey: true, 35 35 + key: "ArrowUp", 36 36 + handler: async () => { 37 37 + let [firstBlock] = 38 38 + (await rep?.query((tx) => 39 39 + getBlocksWithType( 40 40 + tx, 41 41 + useUIState.getState().selectedBlocks[0].parent, 42 42 + ), 43 43 + )) || []; 44 44 + if (firstBlock) focusBlock(firstBlock, { type: "start" }); 45 45 + }, 46 46 + }, 47 47 + { 48 48 + metaKey: true, 49 49 + key: "ArrowDown", 50 50 + handler: async () => { 51 51 + let blocks = 52 52 + (await rep?.query((tx) => 53 53 + getBlocksWithType( 54 54 + tx, 55 55 + useUIState.getState().selectedBlocks[0].parent, 56 56 + ), 57 57 + )) || []; 58 58 + let folded = useUIState.getState().foldedBlocks; 59 59 + blocks = blocks.filter( 60 60 + (f) => 61 61 + !f.listData || 62 62 + !f.listData.path.find( 63 63 + (path) => 64 64 + folded.includes(path.entity) && f.value !== path.entity, 65 65 + ), 66 66 + ); 67 67 + let lastBlock = blocks[blocks.length - 1]; 68 68 + if (lastBlock) focusBlock(lastBlock, { type: "end" }); 69 69 + }, 70 70 + }, 71 71 + { 72 72 + metaKey: true, 73 73 + altKey: true, 74 74 + key: ["l", "¬"], 75 75 + handler: async () => { 76 76 + let [sortedBlocks, siblings] = await getSortedSelectionBound(); 77 77 + for (let block of sortedBlocks) { 78 78 + if (!block.listData) { 79 79 + await rep?.mutate.assertFact({ 80 80 + entity: block.value, 81 81 + attribute: "block/is-list", 82 82 + data: { type: "boolean", value: true }, 83 83 + }); 84 84 + } else { 85 85 + outdentFull(block, rep); 86 86 + } 87 87 + } 88 88 + }, 89 89 + }, 90 90 + { 91 91 + metaKey: true, 92 92 + altKey: true, 93 93 + key: ["1", "¡"], 94 94 + handler: async () => { 95 95 + let [sortedBlocks] = await getSortedSelectionBound(); 96 96 + for (let block of sortedBlocks) { 97 97 + await rep?.mutate.assertFact({ 98 98 + entity: block.value, 99 99 + attribute: "block/heading-level", 100 100 + data: { type: "number", value: 1 }, 101 101 + }); 102 102 + await rep?.mutate.assertFact({ 103 103 + entity: block.value, 104 104 + attribute: "block/type", 105 105 + data: { type: "block-type-union", value: "heading" }, 106 106 + }); 107 107 + } 108 108 + }, 109 109 + }, 110 110 + { 111 111 + metaKey: true, 112 112 + altKey: true, 113 113 + key: ["2", "™"], 114 114 + handler: async () => { 115 115 + let [sortedBlocks] = await getSortedSelectionBound(); 116 116 + for (let block of sortedBlocks) { 117 117 + await rep?.mutate.assertFact({ 118 118 + entity: block.value, 119 119 + attribute: "block/heading-level", 120 120 + data: { type: "number", value: 2 }, 121 121 + }); 122 122 + await rep?.mutate.assertFact({ 123 123 + entity: block.value, 124 124 + attribute: "block/type", 125 125 + data: { type: "block-type-union", value: "heading" }, 126 126 + }); 127 127 + } 128 128 + }, 129 129 + }, 130 130 + { 131 131 + metaKey: true, 132 132 + altKey: true, 133 133 + key: ["3", "£"], 134 134 + handler: async () => { 135 135 + let [sortedBlocks] = await getSortedSelectionBound(); 136 136 + for (let block of sortedBlocks) { 137 137 + await rep?.mutate.assertFact({ 138 138 + entity: block.value, 139 139 + attribute: "block/heading-level", 140 140 + data: { type: "number", value: 3 }, 141 141 + }); 142 142 + await rep?.mutate.assertFact({ 143 143 + entity: block.value, 144 144 + attribute: "block/type", 145 145 + data: { type: "block-type-union", value: "heading" }, 146 146 + }); 147 147 + } 148 148 + }, 149 149 + }, 150 150 + { 151 151 + metaKey: true, 152 152 + altKey: true, 153 153 + key: ["0", "º"], 154 154 + handler: async () => { 155 155 + let [sortedBlocks] = await getSortedSelectionBound(); 156 156 + for (let block of sortedBlocks) { 157 157 + // Convert to text block 158 158 + await rep?.mutate.assertFact({ 159 159 + entity: block.value, 160 160 + attribute: "block/type", 161 161 + data: { type: "block-type-union", value: "text" }, 162 162 + }); 163 163 + // Remove heading level if exists 164 164 + let headingLevel = await rep?.query((tx) => 165 165 + scanIndex(tx).eav(block.value, "block/heading-level"), 166 166 + ); 167 167 + if (headingLevel?.[0]) { 168 168 + await rep?.mutate.retractFact({ factID: headingLevel[0].id }); 169 169 + } 170 170 + // Remove text-size to make it default 171 171 + let textSizeFact = await rep?.query((tx) => 172 172 + scanIndex(tx).eav(block.value, "block/text-size"), 173 173 + ); 174 174 + if (textSizeFact?.[0]) { 175 175 + await rep?.mutate.retractFact({ factID: textSizeFact[0].id }); 176 176 + } 177 177 + } 178 178 + }, 179 179 + }, 180 180 + { 181 181 + metaKey: true, 182 182 + altKey: true, 183 183 + key: ["+", "≠"], 184 184 + handler: async () => { 185 185 + let [sortedBlocks] = await getSortedSelectionBound(); 186 186 + for (let block of sortedBlocks) { 187 187 + // Convert to text block 188 188 + await rep?.mutate.assertFact({ 189 189 + entity: block.value, 190 190 + attribute: "block/type", 191 191 + data: { type: "block-type-union", value: "text" }, 192 192 + }); 193 193 + // Remove heading level if exists 194 194 + let headingLevel = await rep?.query((tx) => 195 195 + scanIndex(tx).eav(block.value, "block/heading-level"), 196 196 + ); 197 197 + if (headingLevel?.[0]) { 198 198 + await rep?.mutate.retractFact({ factID: headingLevel[0].id }); 199 199 + } 200 200 + // Set text size to large 201 201 + await rep?.mutate.assertFact({ 202 202 + entity: block.value, 203 203 + attribute: "block/text-size", 204 204 + data: { type: "text-size-union", value: "large" }, 205 205 + }); 206 206 + } 207 207 + }, 208 208 + }, 209 209 + { 210 210 + metaKey: true, 211 211 + altKey: true, 212 212 + key: ["-", "–"], 213 213 + handler: async () => { 214 214 + let [sortedBlocks] = await getSortedSelectionBound(); 215 215 + for (let block of sortedBlocks) { 216 216 + // Convert to text block 217 217 + await rep?.mutate.assertFact({ 218 218 + entity: block.value, 219 219 + attribute: "block/type", 220 220 + data: { type: "block-type-union", value: "text" }, 221 221 + }); 222 222 + // Remove heading level if exists 223 223 + let headingLevel = await rep?.query((tx) => 224 224 + scanIndex(tx).eav(block.value, "block/heading-level"), 225 225 + ); 226 226 + if (headingLevel?.[0]) { 227 227 + await rep?.mutate.retractFact({ factID: headingLevel[0].id }); 228 228 + } 229 229 + // Set text size to small 230 230 + await rep?.mutate.assertFact({ 231 231 + entity: block.value, 232 232 + attribute: "block/text-size", 233 233 + data: { type: "text-size-union", value: "small" }, 234 234 + }); 235 235 + } 236 236 + }, 237 237 + }, 238 238 + { 239 239 + metaKey: true, 240 240 + shift: true, 241 241 + key: ["ArrowDown", "J"], 242 242 + 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 + } 272 272 + }, 273 273 + }, 274 274 + { 275 275 + metaKey: true, 276 276 + shift: true, 277 277 + key: ["ArrowUp", "K"], 278 278 + 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 + } 317 317 + }, 318 318 + }, 319 319 + 320 320 + { 321 321 + metaKey: true, 322 322 + shift: true, 323 323 + key: "Enter", 324 324 + handler: async () => { 325 325 + let [sortedBlocks, siblings] = await getSortedSelectionBound(); 326 326 + if (!sortedBlocks[0].listData) return; 327 327 + useUIState.getState().toggleFold(sortedBlocks[0].value); 328 328 + }, 329 329 + }, 330 330 + ]; 331 331 + if (moreThanOneSelected) 332 332 + shortcuts = shortcuts.concat([ 333 333 + { 334 334 + metaKey: true, 335 335 + key: "u", 336 336 + handler: async () => { 337 337 + let [sortedBlocks] = await getSortedSelectionBound(); 338 338 + toggleMarkInBlocks( 339 339 + sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 340 340 + schema.marks.underline, 341 341 + ); 342 342 + }, 343 343 + }, 344 344 + { 345 345 + metaKey: true, 346 346 + key: "i", 347 347 + handler: async () => { 348 348 + let [sortedBlocks] = await getSortedSelectionBound(); 349 349 + toggleMarkInBlocks( 350 350 + sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 351 351 + schema.marks.em, 352 352 + ); 353 353 + }, 354 354 + }, 355 355 + { 356 356 + metaKey: true, 357 357 + key: "b", 358 358 + handler: async () => { 359 359 + let [sortedBlocks] = await getSortedSelectionBound(); 360 360 + toggleMarkInBlocks( 361 361 + sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 362 362 + schema.marks.strong, 363 363 + ); 364 364 + }, 365 365 + }, 366 366 + { 367 367 + metaAndCtrl: true, 368 368 + key: "h", 369 369 + handler: async () => { 370 370 + let [sortedBlocks] = await getSortedSelectionBound(); 371 371 + toggleMarkInBlocks( 372 372 + sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 373 373 + schema.marks.highlight, 374 374 + { 375 375 + color: useUIState.getState().lastUsedHighlight, 376 376 + }, 377 377 + ); 378 378 + }, 379 379 + }, 380 380 + { 381 381 + metaAndCtrl: true, 382 382 + key: "x", 383 383 + handler: async () => { 384 384 + let [sortedBlocks] = await getSortedSelectionBound(); 385 385 + toggleMarkInBlocks( 386 386 + sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 387 387 + schema.marks.strikethrough, 388 388 + ); 389 389 + }, 390 390 + }, 391 391 + ]); 392 392 + let removeListener = addShortcut( 393 393 + shortcuts.map((shortcut) => ({ 394 394 + ...shortcut, 395 395 + handler: () => undoManager.withUndoGroup(() => shortcut.handler()), 396 396 + })), 397 397 + ); 398 398 + let listener = async (e: KeyboardEvent) => 399 399 + undoManager.withUndoGroup(async () => { 400 400 + //used here and in cut 401 401 + const deleteBlocks = async () => { 402 402 + if (!entity_set.permissions.write) return; 403 403 + if (moreThanOneSelected) { 404 404 + e.preventDefault(); 405 405 + let [sortedBlocks, siblings] = await getSortedSelectionBound(); 406 406 + let selectedBlocks = useUIState.getState().selectedBlocks; 407 407 + let firstBlock = sortedBlocks[0]; 408 408 + 409 409 + await rep?.mutate.removeBlock( 410 410 + selectedBlocks.map((block) => ({ blockEntity: block.value })), 411 411 + ); 412 412 + useUIState.getState().closePage(selectedBlocks.map((b) => b.value)); 413 413 + 414 414 + let nextBlock = 415 415 + siblings?.[ 416 416 + siblings.findIndex((s) => s.value === firstBlock.value) - 1 417 417 + ]; 418 418 + if (nextBlock) { 419 419 + useUIState.getState().setSelectedBlock({ 420 420 + value: nextBlock.value, 421 421 + parent: nextBlock.parent, 422 422 + }); 423 423 + let type = await rep?.query((tx) => 424 424 + scanIndex(tx).eav(nextBlock.value, "block/type"), 425 425 + ); 426 426 + if (!type?.[0]) return; 427 427 + if ( 428 428 + type[0]?.data.value === "text" || 429 429 + type[0]?.data.value === "heading" 430 430 + ) 431 431 + focusBlock( 432 432 + { 433 433 + value: nextBlock.value, 434 434 + type: "text", 435 435 + parent: nextBlock.parent, 436 436 + }, 437 437 + { type: "end" }, 438 438 + ); 439 439 + } 440 440 + } 441 441 + }; 442 442 + if (e.key === "Backspace" || e.key === "Delete") { 443 443 + deleteBlocks(); 444 444 + } 445 445 + if (e.key === "ArrowUp") { 446 446 + let [sortedBlocks, siblings] = await getSortedSelectionBound(); 447 447 + let focusedBlock = useUIState.getState().focusedEntity; 448 448 + if (!e.shiftKey && !e.ctrlKey) { 449 449 + if (e.defaultPrevented) return; 450 450 + if (sortedBlocks.length === 1) return; 451 451 + let firstBlock = sortedBlocks[0]; 452 452 + if (!firstBlock) return; 453 453 + let type = await rep?.query((tx) => 454 454 + scanIndex(tx).eav(firstBlock.value, "block/type"), 455 455 + ); 456 456 + if (!type?.[0]) return; 457 457 + useUIState.getState().setSelectedBlock(firstBlock); 458 458 + focusBlock( 459 459 + { ...firstBlock, type: type[0].data.value }, 460 460 + { type: "start" }, 461 461 + ); 462 462 + } else { 463 463 + if (e.defaultPrevented) return; 464 464 + if ( 465 465 + sortedBlocks.length <= 1 || 466 466 + !focusedBlock || 467 467 + focusedBlock.entityType === "page" 468 468 + ) 469 469 + return; 470 470 + let b = focusedBlock; 471 471 + let focusedBlockIndex = sortedBlocks.findIndex( 472 472 + (s) => s.value == b.entityID, 473 473 + ); 474 474 + if (focusedBlockIndex === 0) { 475 475 + let index = siblings.findIndex((s) => s.value === b.entityID); 476 476 + let nextSelectedBlock = siblings[index - 1]; 477 477 + if (!nextSelectedBlock) return; 478 478 + 479 479 + scrollIntoViewIfNeeded( 480 480 + document.getElementById( 481 481 + elementId.block(nextSelectedBlock.value).container, 482 482 + ), 483 483 + false, 484 484 + ); 485 485 + useUIState.getState().addBlockToSelection({ 486 486 + ...nextSelectedBlock, 487 487 + }); 488 488 + useUIState.getState().setFocusedBlock({ 489 489 + entityType: "block", 490 490 + parent: nextSelectedBlock.parent, 491 491 + entityID: nextSelectedBlock.value, 492 492 + }); 493 493 + } else { 494 494 + let nextBlock = sortedBlocks[sortedBlocks.length - 2]; 495 495 + useUIState.getState().setFocusedBlock({ 496 496 + entityType: "block", 497 497 + parent: b.parent, 498 498 + entityID: nextBlock.value, 499 499 + }); 500 500 + scrollIntoViewIfNeeded( 501 501 + document.getElementById( 502 502 + elementId.block(nextBlock.value).container, 503 503 + ), 504 504 + false, 505 505 + ); 506 506 + if (sortedBlocks.length === 2) { 507 507 + useEditorStates 508 508 + .getState() 509 509 + .editorStates[nextBlock.value]?.view?.focus(); 510 510 + } 511 511 + useUIState 512 512 + .getState() 513 513 + .removeBlockFromSelection(sortedBlocks[focusedBlockIndex]); 514 514 + } 515 515 + } 516 516 + } 517 517 + if (e.key === "ArrowLeft") { 518 518 + let [sortedSelection, siblings] = await getSortedSelectionBound(); 519 519 + if (sortedSelection.length === 1) return; 520 520 + let firstBlock = sortedSelection[0]; 521 521 + if (!firstBlock) return; 522 522 + let type = await rep?.query((tx) => 523 523 + scanIndex(tx).eav(firstBlock.value, "block/type"), 524 524 + ); 525 525 + if (!type?.[0]) return; 526 526 + useUIState.getState().setSelectedBlock(firstBlock); 527 527 + focusBlock( 528 528 + { ...firstBlock, type: type[0].data.value }, 529 529 + { type: "start" }, 530 530 + ); 531 531 + } 532 532 + if (e.key === "ArrowRight") { 533 533 + let [sortedSelection, siblings] = await getSortedSelectionBound(); 534 534 + if (sortedSelection.length === 1) return; 535 535 + let lastBlock = sortedSelection[sortedSelection.length - 1]; 536 536 + if (!lastBlock) return; 537 537 + let type = await rep?.query((tx) => 538 538 + scanIndex(tx).eav(lastBlock.value, "block/type"), 539 539 + ); 540 540 + if (!type?.[0]) return; 541 541 + useUIState.getState().setSelectedBlock(lastBlock); 542 542 + focusBlock( 543 543 + { ...lastBlock, type: type[0].data.value }, 544 544 + { type: "end" }, 545 545 + ); 546 546 + } 547 547 + if (e.key === "Tab") { 548 548 + let [sortedSelection, siblings] = await getSortedSelectionBound(); 549 549 + if (sortedSelection.length <= 1) return; 550 550 + e.preventDefault(); 551 551 + if (e.shiftKey) { 552 552 + for (let i = siblings.length - 1; i >= 0; i--) { 553 553 + let block = siblings[i]; 554 554 + if (!sortedSelection.find((s) => s.value === block.value)) 555 555 + continue; 556 556 + if ( 557 557 + sortedSelection.find((s) => s.value === block.listData?.parent) 558 558 + ) 559 559 + continue; 560 560 + let parentoffset = 1; 561 561 + let previousBlock = siblings[i - parentoffset]; 562 562 + while ( 563 563 + previousBlock && 564 564 + sortedSelection.find((s) => previousBlock.value === s.value) 565 565 + ) { 566 566 + parentoffset += 1; 567 567 + previousBlock = siblings[i - parentoffset]; 568 568 + } 569 569 + if (!block.listData || !previousBlock.listData) continue; 570 570 + outdent(block, previousBlock, rep); 571 571 + } 572 572 + } else { 573 573 + for (let i = 0; i < siblings.length; i++) { 574 574 + let block = siblings[i]; 575 575 + if (!sortedSelection.find((s) => s.value === block.value)) 576 576 + continue; 577 577 + if ( 578 578 + sortedSelection.find((s) => s.value === block.listData?.parent) 579 579 + ) 580 580 + continue; 581 581 + let parentoffset = 1; 582 582 + let previousBlock = siblings[i - parentoffset]; 583 583 + while ( 584 584 + previousBlock && 585 585 + sortedSelection.find((s) => previousBlock.value === s.value) 586 586 + ) { 587 587 + parentoffset += 1; 588 588 + previousBlock = siblings[i - parentoffset]; 589 589 + } 590 590 + if (!block.listData || !previousBlock.listData) continue; 591 591 + indent(block, previousBlock, rep); 592 592 + } 593 593 + } 594 594 + } 595 595 + if (e.key === "ArrowDown") { 596 596 + let [sortedSelection, siblings] = await getSortedSelectionBound(); 597 597 + let focusedBlock = useUIState.getState().focusedEntity; 598 598 + if (!e.shiftKey) { 599 599 + if (sortedSelection.length === 1) return; 600 600 + let lastBlock = sortedSelection[sortedSelection.length - 1]; 601 601 + if (!lastBlock) return; 602 602 + let type = await rep?.query((tx) => 603 603 + scanIndex(tx).eav(lastBlock.value, "block/type"), 604 604 + ); 605 605 + if (!type?.[0]) return; 606 606 + useUIState.getState().setSelectedBlock(lastBlock); 607 607 + focusBlock( 608 608 + { ...lastBlock, type: type[0].data.value }, 609 609 + { type: "end" }, 610 610 + ); 611 611 + } 612 612 + if (e.shiftKey) { 613 613 + if (e.defaultPrevented) return; 614 614 + if ( 615 615 + sortedSelection.length <= 1 || 616 616 + !focusedBlock || 617 617 + focusedBlock.entityType === "page" 618 618 + ) 619 619 + return; 620 620 + let b = focusedBlock; 621 621 + let focusedBlockIndex = sortedSelection.findIndex( 622 622 + (s) => s.value == b.entityID, 623 623 + ); 624 624 + if (focusedBlockIndex === sortedSelection.length - 1) { 625 625 + let index = siblings.findIndex((s) => s.value === b.entityID); 626 626 + let nextSelectedBlock = siblings[index + 1]; 627 627 + if (!nextSelectedBlock) return; 628 628 + useUIState.getState().addBlockToSelection({ 629 629 + ...nextSelectedBlock, 630 630 + }); 631 631 + 632 632 + scrollIntoViewIfNeeded( 633 633 + document.getElementById( 634 634 + elementId.block(nextSelectedBlock.value).container, 635 635 + ), 636 636 + false, 637 637 + ); 638 638 + useUIState.getState().setFocusedBlock({ 639 639 + entityType: "block", 640 640 + parent: nextSelectedBlock.parent, 641 641 + entityID: nextSelectedBlock.value, 642 642 + }); 643 643 + } else { 644 644 + let nextBlock = sortedSelection[1]; 645 645 + useUIState 646 646 + .getState() 647 647 + .removeBlockFromSelection({ value: b.entityID }); 648 648 + scrollIntoViewIfNeeded( 649 649 + document.getElementById( 650 650 + elementId.block(nextBlock.value).container, 651 651 + ), 652 652 + false, 653 653 + ); 654 654 + useUIState.getState().setFocusedBlock({ 655 655 + entityType: "block", 656 656 + parent: b.parent, 657 657 + entityID: nextBlock.value, 658 658 + }); 659 659 + if (sortedSelection.length === 2) { 660 660 + useEditorStates 661 661 + .getState() 662 662 + .editorStates[nextBlock.value]?.view?.focus(); 663 663 + } 664 664 + } 665 665 + } 666 666 + } 667 667 + if ((e.key === "c" || e.key === "x") && (e.metaKey || e.ctrlKey)) { 668 668 + if (!rep) return; 669 669 + if (e.shiftKey || (e.metaKey && e.ctrlKey)) return; 670 670 + let [, , selectionWithFoldedChildren] = 671 671 + await getSortedSelectionBound(); 672 672 + if (!selectionWithFoldedChildren) return; 673 673 + let el = document.activeElement as HTMLElement; 674 674 + if ( 675 675 + el?.tagName === "LABEL" || 676 676 + el?.tagName === "INPUT" || 677 677 + el?.tagName === "TEXTAREA" 678 678 + ) { 679 679 + return; 680 680 + } 681 681 + 682 682 + if ( 683 683 + el.contentEditable === "true" && 684 684 + selectionWithFoldedChildren.length <= 1 685 685 + ) 686 686 + return; 687 687 + e.preventDefault(); 688 688 + await copySelection(rep, selectionWithFoldedChildren); 689 689 + if (e.key === "x") deleteBlocks(); 690 690 + } 691 691 + }); 692 692 + window.addEventListener("keydown", listener); 693 693 + return () => { 694 694 + removeListener(); 695 695 + window.removeEventListener("keydown", listener); 696 696 + }; 697 697 + }, [moreThanOneSelected, rep, entity_set.permissions.write]); 698 698 + 699 699 + let [mouseDown, setMouseDown] = useState(false); 700 700 + let initialContentEditableParent = useRef<null | Node>(null); 701 701 + let savedSelection = useRef<SavedRange[] | null>(undefined); 702 702 + useEffect(() => { 703 703 + if (isMobile) return; 704 704 + if (!entity_set.permissions.write) return; 705 705 + let mouseDownListener = (e: MouseEvent) => { 706 706 + if ((e.target as Element).getAttribute("data-draggable")) return; 707 707 + let contentEditableParent = getContentEditableParent(e.target as Node); 708 708 + if (contentEditableParent) { 709 709 + setMouseDown(true); 710 710 + let entityID = (contentEditableParent as Element).getAttribute( 711 711 + "data-entityid", 712 712 + ); 713 713 + useSelectingMouse.setState({ start: entityID }); 714 714 + } 715 715 + initialContentEditableParent.current = contentEditableParent; 716 716 + }; 717 717 + let mouseUpListener = (e: MouseEvent) => { 718 718 + savedSelection.current = null; 719 719 + if ( 720 720 + initialContentEditableParent.current && 721 721 + !(e.target as Element).getAttribute("data-draggable") && 722 722 + getContentEditableParent(e.target as Node) !== 723 723 + initialContentEditableParent.current 724 724 + ) { 725 725 + setTimeout(() => { 726 726 + window.getSelection()?.removeAllRanges(); 727 727 + }, 5); 728 728 + } 729 729 + initialContentEditableParent.current = null; 730 730 + useSelectingMouse.setState({ start: null }); 731 731 + setMouseDown(false); 732 732 + }; 733 733 + window.addEventListener("mousedown", mouseDownListener); 734 734 + window.addEventListener("mouseup", mouseUpListener); 735 735 + return () => { 736 736 + window.removeEventListener("mousedown", mouseDownListener); 737 737 + window.removeEventListener("mouseup", mouseUpListener); 738 738 + }; 739 739 + }, [entity_set.permissions.write, isMobile]); 740 740 + useEffect(() => { 741 741 + if (!mouseDown) return; 742 742 + if (isMobile) return; 743 743 + let mouseMoveListener = (e: MouseEvent) => { 744 744 + if (e.buttons !== 1) return; 745 745 + if (initialContentEditableParent.current) { 746 746 + if ( 747 747 + initialContentEditableParent.current === 748 748 + getContentEditableParent(e.target as Node) 749 749 + ) { 750 750 + if (savedSelection.current) { 751 751 + restoreSelection(savedSelection.current); 752 752 + } 753 753 + savedSelection.current = null; 754 754 + return; 755 755 + } 756 756 + if (!savedSelection.current) savedSelection.current = saveSelection(); 757 757 + window.getSelection()?.removeAllRanges(); 758 758 + } 759 759 + }; 760 760 + window.addEventListener("mousemove", mouseMoveListener); 761 761 + return () => { 762 762 + window.removeEventListener("mousemove", mouseMoveListener); 763 763 + }; 764 764 + }, [mouseDown, isMobile]); 765 765 + return null; 766 766 + } 767 767 + 768 768 + type SavedRange = { 769 769 + startContainer: Node; 770 770 + startOffset: number; 771 771 + endContainer: Node; 772 772 + endOffset: number; 773 773 + direction: "forward" | "backward"; 774 774 + }; 775 775 + function saveSelection() { 776 776 + let selection = window.getSelection(); 777 777 + if (selection && selection.rangeCount > 0) { 778 778 + let ranges: SavedRange[] = []; 779 779 + for (let i = 0; i < selection.rangeCount; i++) { 780 780 + let range = selection.getRangeAt(i); 781 781 + ranges.push({ 782 782 + startContainer: range.startContainer, 783 783 + startOffset: range.startOffset, 784 784 + endContainer: range.endContainer, 785 785 + endOffset: range.endOffset, 786 786 + direction: 787 787 + selection.anchorNode === range.startContainer && 788 788 + selection.anchorOffset === range.startOffset 789 789 + ? "forward" 790 790 + : "backward", 791 791 + }); 792 792 + } 793 793 + return ranges; 794 794 + } 795 795 + return []; 796 796 + } 797 797 + 798 798 + function restoreSelection(savedRanges: SavedRange[]) { 799 799 + if (savedRanges && savedRanges.length > 0) { 800 800 + let selection = window.getSelection(); 801 801 + if (!selection) return; 802 802 + selection.removeAllRanges(); 803 803 + for (let i = 0; i < savedRanges.length; i++) { 804 804 + let range = document.createRange(); 805 805 + range.setStart(savedRanges[i].startContainer, savedRanges[i].startOffset); 806 806 + range.setEnd(savedRanges[i].endContainer, savedRanges[i].endOffset); 807 807 + 808 808 + selection.addRange(range); 809 809 + 810 810 + // If the direction is backward, collapse the selection to the end and then extend it backward 811 811 + if (savedRanges[i].direction === "backward") { 812 812 + selection.collapseToEnd(); 813 813 + selection.extend( 814 814 + savedRanges[i].startContainer, 815 815 + savedRanges[i].startOffset, 816 816 + ); 817 817 + } 818 818 + } 819 819 + } 820 820 + } 821 821 + 822 822 + function getContentEditableParent(e: Node | null): Node | null { 823 823 + let element: Node | null = e; 824 824 + while (element && element !== document) { 825 825 + if ( 826 826 + (element as HTMLElement).contentEditable === "true" || 827 827 + (element as HTMLElement).getAttribute("data-editable-block") 828 828 + ) { 829 829 + return element; 830 830 + } 831 831 + element = element.parentNode; 832 832 + } 833 833 + return null; 834 834 + } 835 835 + 836 836 + function toggleMarkInBlocks(blocks: string[], mark: MarkType, attrs?: any) { 837 837 + let everyBlockHasMark = blocks.reduce((acc, block) => { 838 838 + let editor = useEditorStates.getState().editorStates[block]; 839 839 + if (!editor) return acc; 840 840 + let { view } = editor; 841 841 + let from = 0; 842 842 + let to = view.state.doc.content.size; 843 843 + let hasMarkInRange = view.state.doc.rangeHasMark(from, to, mark); 844 844 + return acc && hasMarkInRange; 845 845 + }, true); 846 846 + for (let block of blocks) { 847 847 + let editor = useEditorStates.getState().editorStates[block]; 848 848 + if (!editor) return; 849 849 + let { view } = editor; 850 850 + let tr = view.state.tr; 851 851 + 852 852 + let from = 0; 853 853 + let to = view.state.doc.content.size; 854 854 + 855 855 + tr.setMeta("bulkOp", true); 856 856 + if (everyBlockHasMark) { 857 857 + tr.removeMark(from, to, mark); 858 858 + } else { 859 859 + tr.addMark(from, to, mark.create(attrs)); 860 860 + } 861 861 + 862 862 + view.dispatch(tr); 863 863 + } 864 864 + }

+48

components/SelectionManager/selectionState.ts

··· 1 1 + import { create } from "zustand"; 2 2 + import { Replicache } from "replicache"; 3 3 + import { ReplicacheMutators } from "src/replicache"; 4 4 + import { useUIState } from "src/useUIState"; 5 5 + import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 6 6 + 7 7 + export const useSelectingMouse = create(() => ({ 8 8 + start: null as null | string, 9 9 + })); 10 10 + 11 11 + export const getSortedSelection = async ( 12 12 + rep: Replicache<ReplicacheMutators>, 13 13 + ) => { 14 14 + let selectedBlocks = useUIState.getState().selectedBlocks; 15 15 + let foldedBlocks = useUIState.getState().foldedBlocks; 16 16 + if (!selectedBlocks[0]) return [[], []]; 17 17 + let siblings = 18 18 + (await rep?.query((tx) => 19 19 + getBlocksWithType(tx, selectedBlocks[0].parent), 20 20 + )) || []; 21 21 + let sortedBlocks = siblings.filter((s) => { 22 22 + let selected = selectedBlocks.find((sb) => sb.value === s.value); 23 23 + return selected; 24 24 + }); 25 25 + let sortedBlocksWithChildren = siblings.filter((s) => { 26 26 + let selected = selectedBlocks.find((sb) => sb.value === s.value); 27 27 + if (s.listData && !selected) { 28 28 + //Select the children of folded list blocks (in order to copy them) 29 29 + return s.listData.path.find( 30 30 + (p) => 31 31 + selectedBlocks.find((sb) => sb.value === p.entity) && 32 32 + foldedBlocks.includes(p.entity), 33 33 + ); 34 34 + } 35 35 + return selected; 36 36 + }); 37 37 + return [ 38 38 + sortedBlocks, 39 39 + siblings.filter( 40 40 + (f) => 41 41 + !f.listData || 42 42 + !f.listData.path.find( 43 43 + (p) => foldedBlocks.includes(p.entity) && p.entity !== f.value, 44 44 + ), 45 45 + ), 46 46 + sortedBlocksWithChildren, 47 47 + ]; 48 48 + };

-763

components/SelectionManager.tsx

··· 1 1 - "use client"; 2 2 - import { useEffect, useRef, useState } from "react"; 3 3 - import { create } from "zustand"; 4 4 - import { ReplicacheMutators, useReplicache } from "src/replicache"; 5 5 - import { useUIState } from "src/useUIState"; 6 6 - import { scanIndex } from "src/replicache/utils"; 7 7 - import { focusBlock } from "src/utils/focusBlock"; 8 8 - import { useEditorStates } from "src/state/useEditorState"; 9 9 - import { useEntitySetContext } from "./EntitySetProvider"; 10 10 - import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 11 11 - import { v7 } from "uuid"; 12 12 - import { indent, outdent, outdentFull } from "src/utils/list-operations"; 13 13 - import { addShortcut, Shortcut } from "src/shortcuts"; 14 14 - import { htmlToMarkdown } from "src/htmlMarkdownParsers"; 15 15 - import { elementId } from "src/utils/elementId"; 16 16 - import { scrollIntoViewIfNeeded } from "src/utils/scrollIntoViewIfNeeded"; 17 17 - import { copySelection } from "src/utils/copySelection"; 18 18 - import { isTextBlock } from "src/utils/isTextBlock"; 19 19 - import { useIsMobile } from "src/hooks/isMobile"; 20 20 - import { deleteBlock } from "./Blocks/DeleteBlock"; 21 21 - import { Replicache } from "replicache"; 22 22 - import { schema } from "./Blocks/TextBlock/schema"; 23 23 - import { TextSelection } from "prosemirror-state"; 24 24 - import { MarkType } from "prosemirror-model"; 25 25 - export const useSelectingMouse = create(() => ({ 26 26 - start: null as null | string, 27 27 - })); 28 28 - 29 29 - //How should I model selection? As ranges w/ a start and end? Store *blocks* so that I can just construct ranges? 30 30 - // How does this relate to *when dragging* ? 31 31 - 32 32 - export function SelectionManager() { 33 33 - let moreThanOneSelected = useUIState((s) => s.selectedBlocks.length > 1); 34 34 - let entity_set = useEntitySetContext(); 35 35 - let { rep, undoManager } = useReplicache(); 36 36 - let isMobile = useIsMobile(); 37 37 - useEffect(() => { 38 38 - if (!entity_set.permissions.write || !rep) return; 39 39 - const getSortedSelectionBound = getSortedSelection.bind(null, rep); 40 40 - let shortcuts: Shortcut[] = [ 41 41 - { 42 42 - metaKey: true, 43 43 - key: "ArrowUp", 44 44 - handler: async () => { 45 45 - let [firstBlock] = 46 46 - (await rep?.query((tx) => 47 47 - getBlocksWithType( 48 48 - tx, 49 49 - useUIState.getState().selectedBlocks[0].parent, 50 50 - ), 51 51 - )) || []; 52 52 - if (firstBlock) focusBlock(firstBlock, { type: "start" }); 53 53 - }, 54 54 - }, 55 55 - { 56 56 - metaKey: true, 57 57 - key: "ArrowDown", 58 58 - handler: async () => { 59 59 - let blocks = 60 60 - (await rep?.query((tx) => 61 61 - getBlocksWithType( 62 62 - tx, 63 63 - useUIState.getState().selectedBlocks[0].parent, 64 64 - ), 65 65 - )) || []; 66 66 - let folded = useUIState.getState().foldedBlocks; 67 67 - blocks = blocks.filter( 68 68 - (f) => 69 69 - !f.listData || 70 70 - !f.listData.path.find( 71 71 - (path) => 72 72 - folded.includes(path.entity) && f.value !== path.entity, 73 73 - ), 74 74 - ); 75 75 - let lastBlock = blocks[blocks.length - 1]; 76 76 - if (lastBlock) focusBlock(lastBlock, { type: "end" }); 77 77 - }, 78 78 - }, 79 79 - { 80 80 - metaKey: true, 81 81 - altKey: true, 82 82 - key: ["l", "¬"], 83 83 - handler: async () => { 84 84 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 85 85 - for (let block of sortedBlocks) { 86 86 - if (!block.listData) { 87 87 - await rep?.mutate.assertFact({ 88 88 - entity: block.value, 89 89 - attribute: "block/is-list", 90 90 - data: { type: "boolean", value: true }, 91 91 - }); 92 92 - } else { 93 93 - outdentFull(block, rep); 94 94 - } 95 95 - } 96 96 - }, 97 97 - }, 98 98 - { 99 99 - metaKey: true, 100 100 - shift: true, 101 101 - key: ["ArrowDown", "J"], 102 102 - handler: async () => { 103 103 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 104 104 - let block = sortedBlocks[0]; 105 105 - let nextBlock = siblings 106 106 - .slice(siblings.findIndex((s) => s.value === block.value) + 1) 107 107 - .find( 108 108 - (f) => 109 109 - f.listData && 110 110 - block.listData && 111 111 - !f.listData.path.find((f) => f.entity === block.value), 112 112 - ); 113 113 - if ( 114 114 - nextBlock?.listData && 115 115 - block.listData && 116 116 - nextBlock.listData.depth === block.listData.depth - 1 117 117 - ) { 118 118 - if (useUIState.getState().foldedBlocks.includes(nextBlock.value)) 119 119 - useUIState.getState().toggleFold(nextBlock.value); 120 120 - await rep?.mutate.moveBlock({ 121 121 - block: block.value, 122 122 - oldParent: block.listData?.parent, 123 123 - newParent: nextBlock.value, 124 124 - position: { type: "first" }, 125 125 - }); 126 126 - } else { 127 127 - await rep?.mutate.moveBlockDown({ 128 128 - entityID: block.value, 129 129 - parent: block.listData?.parent || block.parent, 130 130 - }); 131 131 - } 132 132 - }, 133 133 - }, 134 134 - { 135 135 - metaKey: true, 136 136 - shift: true, 137 137 - key: ["ArrowUp", "K"], 138 138 - handler: async () => { 139 139 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 140 140 - let block = sortedBlocks[0]; 141 141 - let previousBlock = 142 142 - siblings?.[siblings.findIndex((s) => s.value === block.value) - 1]; 143 143 - if (previousBlock.value === block.listData?.parent) { 144 144 - previousBlock = 145 145 - siblings?.[ 146 146 - siblings.findIndex((s) => s.value === block.value) - 2 147 147 - ]; 148 148 - } 149 149 - 150 150 - if ( 151 151 - previousBlock?.listData && 152 152 - block.listData && 153 153 - block.listData.depth > 1 && 154 154 - !previousBlock.listData.path.find( 155 155 - (f) => f.entity === block.listData?.parent, 156 156 - ) 157 157 - ) { 158 158 - let depth = block.listData.depth; 159 159 - let newParent = previousBlock.listData.path.find( 160 160 - (f) => f.depth === depth - 1, 161 161 - ); 162 162 - if (!newParent) return; 163 163 - if (useUIState.getState().foldedBlocks.includes(newParent.entity)) 164 164 - useUIState.getState().toggleFold(newParent.entity); 165 165 - rep?.mutate.moveBlock({ 166 166 - block: block.value, 167 167 - oldParent: block.listData?.parent, 168 168 - newParent: newParent.entity, 169 169 - position: { type: "end" }, 170 170 - }); 171 171 - } else { 172 172 - rep?.mutate.moveBlockUp({ 173 173 - entityID: block.value, 174 174 - parent: block.listData?.parent || block.parent, 175 175 - }); 176 176 - } 177 177 - }, 178 178 - }, 179 179 - 180 180 - { 181 181 - metaKey: true, 182 182 - shift: true, 183 183 - key: "Enter", 184 184 - handler: async () => { 185 185 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 186 186 - if (!sortedBlocks[0].listData) return; 187 187 - useUIState.getState().toggleFold(sortedBlocks[0].value); 188 188 - }, 189 189 - }, 190 190 - ]; 191 191 - if (moreThanOneSelected) 192 192 - shortcuts = shortcuts.concat([ 193 193 - { 194 194 - metaKey: true, 195 195 - key: "u", 196 196 - handler: async () => { 197 197 - let [sortedBlocks] = await getSortedSelectionBound(); 198 198 - toggleMarkInBlocks( 199 199 - sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 200 200 - schema.marks.underline, 201 201 - ); 202 202 - }, 203 203 - }, 204 204 - { 205 205 - metaKey: true, 206 206 - key: "i", 207 207 - handler: async () => { 208 208 - let [sortedBlocks] = await getSortedSelectionBound(); 209 209 - toggleMarkInBlocks( 210 210 - sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 211 211 - schema.marks.em, 212 212 - ); 213 213 - }, 214 214 - }, 215 215 - { 216 216 - metaKey: true, 217 217 - key: "b", 218 218 - handler: async () => { 219 219 - let [sortedBlocks] = await getSortedSelectionBound(); 220 220 - toggleMarkInBlocks( 221 221 - sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 222 222 - schema.marks.strong, 223 223 - ); 224 224 - }, 225 225 - }, 226 226 - { 227 227 - metaAndCtrl: true, 228 228 - key: "h", 229 229 - handler: async () => { 230 230 - let [sortedBlocks] = await getSortedSelectionBound(); 231 231 - toggleMarkInBlocks( 232 232 - sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 233 233 - schema.marks.highlight, 234 234 - { 235 235 - color: useUIState.getState().lastUsedHighlight, 236 236 - }, 237 237 - ); 238 238 - }, 239 239 - }, 240 240 - { 241 241 - metaAndCtrl: true, 242 242 - key: "x", 243 243 - handler: async () => { 244 244 - let [sortedBlocks] = await getSortedSelectionBound(); 245 245 - toggleMarkInBlocks( 246 246 - sortedBlocks.filter((b) => b.type === "text").map((b) => b.value), 247 247 - schema.marks.strikethrough, 248 248 - ); 249 249 - }, 250 250 - }, 251 251 - ]); 252 252 - let removeListener = addShortcut( 253 253 - shortcuts.map((shortcut) => ({ 254 254 - ...shortcut, 255 255 - handler: () => undoManager.withUndoGroup(() => shortcut.handler()), 256 256 - })), 257 257 - ); 258 258 - let listener = async (e: KeyboardEvent) => 259 259 - undoManager.withUndoGroup(async () => { 260 260 - //used here and in cut 261 261 - const deleteBlocks = async () => { 262 262 - if (!entity_set.permissions.write) return; 263 263 - if (moreThanOneSelected) { 264 264 - e.preventDefault(); 265 265 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 266 266 - let selectedBlocks = useUIState.getState().selectedBlocks; 267 267 - let firstBlock = sortedBlocks[0]; 268 268 - 269 269 - await rep?.mutate.removeBlock( 270 270 - selectedBlocks.map((block) => ({ blockEntity: block.value })), 271 271 - ); 272 272 - useUIState.getState().closePage(selectedBlocks.map((b) => b.value)); 273 273 - 274 274 - let nextBlock = 275 275 - siblings?.[ 276 276 - siblings.findIndex((s) => s.value === firstBlock.value) - 1 277 277 - ]; 278 278 - if (nextBlock) { 279 279 - useUIState.getState().setSelectedBlock({ 280 280 - value: nextBlock.value, 281 281 - parent: nextBlock.parent, 282 282 - }); 283 283 - let type = await rep?.query((tx) => 284 284 - scanIndex(tx).eav(nextBlock.value, "block/type"), 285 285 - ); 286 286 - if (!type?.[0]) return; 287 287 - if ( 288 288 - type[0]?.data.value === "text" || 289 289 - type[0]?.data.value === "heading" 290 290 - ) 291 291 - focusBlock( 292 292 - { 293 293 - value: nextBlock.value, 294 294 - type: "text", 295 295 - parent: nextBlock.parent, 296 296 - }, 297 297 - { type: "end" }, 298 298 - ); 299 299 - } 300 300 - } 301 301 - }; 302 302 - if (e.key === "Backspace" || e.key === "Delete") { 303 303 - deleteBlocks(); 304 304 - } 305 305 - if (e.key === "ArrowUp") { 306 306 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 307 307 - let focusedBlock = useUIState.getState().focusedEntity; 308 308 - if (!e.shiftKey && !e.ctrlKey) { 309 309 - if (e.defaultPrevented) return; 310 310 - if (sortedBlocks.length === 1) return; 311 311 - let firstBlock = sortedBlocks[0]; 312 312 - if (!firstBlock) return; 313 313 - let type = await rep?.query((tx) => 314 314 - scanIndex(tx).eav(firstBlock.value, "block/type"), 315 315 - ); 316 316 - if (!type?.[0]) return; 317 317 - useUIState.getState().setSelectedBlock(firstBlock); 318 318 - focusBlock( 319 319 - { ...firstBlock, type: type[0].data.value }, 320 320 - { type: "start" }, 321 321 - ); 322 322 - } else { 323 323 - if (e.defaultPrevented) return; 324 324 - if ( 325 325 - sortedBlocks.length <= 1 || 326 326 - !focusedBlock || 327 327 - focusedBlock.entityType === "page" 328 328 - ) 329 329 - return; 330 330 - let b = focusedBlock; 331 331 - let focusedBlockIndex = sortedBlocks.findIndex( 332 332 - (s) => s.value == b.entityID, 333 333 - ); 334 334 - if (focusedBlockIndex === 0) { 335 335 - let index = siblings.findIndex((s) => s.value === b.entityID); 336 336 - let nextSelectedBlock = siblings[index - 1]; 337 337 - if (!nextSelectedBlock) return; 338 338 - 339 339 - scrollIntoViewIfNeeded( 340 340 - document.getElementById( 341 341 - elementId.block(nextSelectedBlock.value).container, 342 342 - ), 343 343 - false, 344 344 - ); 345 345 - useUIState.getState().addBlockToSelection({ 346 346 - ...nextSelectedBlock, 347 347 - }); 348 348 - useUIState.getState().setFocusedBlock({ 349 349 - entityType: "block", 350 350 - parent: nextSelectedBlock.parent, 351 351 - entityID: nextSelectedBlock.value, 352 352 - }); 353 353 - } else { 354 354 - let nextBlock = sortedBlocks[sortedBlocks.length - 2]; 355 355 - useUIState.getState().setFocusedBlock({ 356 356 - entityType: "block", 357 357 - parent: b.parent, 358 358 - entityID: nextBlock.value, 359 359 - }); 360 360 - scrollIntoViewIfNeeded( 361 361 - document.getElementById( 362 362 - elementId.block(nextBlock.value).container, 363 363 - ), 364 364 - false, 365 365 - ); 366 366 - if (sortedBlocks.length === 2) { 367 367 - useEditorStates 368 368 - .getState() 369 369 - .editorStates[nextBlock.value]?.view?.focus(); 370 370 - } 371 371 - useUIState 372 372 - .getState() 373 373 - .removeBlockFromSelection(sortedBlocks[focusedBlockIndex]); 374 374 - } 375 375 - } 376 376 - } 377 377 - if (e.key === "ArrowLeft") { 378 378 - let [sortedSelection, siblings] = await getSortedSelectionBound(); 379 379 - if (sortedSelection.length === 1) return; 380 380 - let firstBlock = sortedSelection[0]; 381 381 - if (!firstBlock) return; 382 382 - let type = await rep?.query((tx) => 383 383 - scanIndex(tx).eav(firstBlock.value, "block/type"), 384 384 - ); 385 385 - if (!type?.[0]) return; 386 386 - useUIState.getState().setSelectedBlock(firstBlock); 387 387 - focusBlock( 388 388 - { ...firstBlock, type: type[0].data.value }, 389 389 - { type: "start" }, 390 390 - ); 391 391 - } 392 392 - if (e.key === "ArrowRight") { 393 393 - let [sortedSelection, siblings] = await getSortedSelectionBound(); 394 394 - if (sortedSelection.length === 1) return; 395 395 - let lastBlock = sortedSelection[sortedSelection.length - 1]; 396 396 - if (!lastBlock) return; 397 397 - let type = await rep?.query((tx) => 398 398 - scanIndex(tx).eav(lastBlock.value, "block/type"), 399 399 - ); 400 400 - if (!type?.[0]) return; 401 401 - useUIState.getState().setSelectedBlock(lastBlock); 402 402 - focusBlock( 403 403 - { ...lastBlock, type: type[0].data.value }, 404 404 - { type: "end" }, 405 405 - ); 406 406 - } 407 407 - if (e.key === "Tab") { 408 408 - let [sortedSelection, siblings] = await getSortedSelectionBound(); 409 409 - if (sortedSelection.length <= 1) return; 410 410 - e.preventDefault(); 411 411 - if (e.shiftKey) { 412 412 - for (let i = siblings.length - 1; i >= 0; i--) { 413 413 - let block = siblings[i]; 414 414 - if (!sortedSelection.find((s) => s.value === block.value)) 415 415 - continue; 416 416 - if ( 417 417 - sortedSelection.find((s) => s.value === block.listData?.parent) 418 418 - ) 419 419 - continue; 420 420 - let parentoffset = 1; 421 421 - let previousBlock = siblings[i - parentoffset]; 422 422 - while ( 423 423 - previousBlock && 424 424 - sortedSelection.find((s) => previousBlock.value === s.value) 425 425 - ) { 426 426 - parentoffset += 1; 427 427 - previousBlock = siblings[i - parentoffset]; 428 428 - } 429 429 - if (!block.listData || !previousBlock.listData) continue; 430 430 - outdent(block, previousBlock, rep); 431 431 - } 432 432 - } else { 433 433 - for (let i = 0; i < siblings.length; i++) { 434 434 - let block = siblings[i]; 435 435 - if (!sortedSelection.find((s) => s.value === block.value)) 436 436 - continue; 437 437 - if ( 438 438 - sortedSelection.find((s) => s.value === block.listData?.parent) 439 439 - ) 440 440 - continue; 441 441 - let parentoffset = 1; 442 442 - let previousBlock = siblings[i - parentoffset]; 443 443 - while ( 444 444 - previousBlock && 445 445 - sortedSelection.find((s) => previousBlock.value === s.value) 446 446 - ) { 447 447 - parentoffset += 1; 448 448 - previousBlock = siblings[i - parentoffset]; 449 449 - } 450 450 - if (!block.listData || !previousBlock.listData) continue; 451 451 - indent(block, previousBlock, rep); 452 452 - } 453 453 - } 454 454 - } 455 455 - if (e.key === "ArrowDown") { 456 456 - let [sortedSelection, siblings] = await getSortedSelectionBound(); 457 457 - let focusedBlock = useUIState.getState().focusedEntity; 458 458 - if (!e.shiftKey) { 459 459 - if (sortedSelection.length === 1) return; 460 460 - let lastBlock = sortedSelection[sortedSelection.length - 1]; 461 461 - if (!lastBlock) return; 462 462 - let type = await rep?.query((tx) => 463 463 - scanIndex(tx).eav(lastBlock.value, "block/type"), 464 464 - ); 465 465 - if (!type?.[0]) return; 466 466 - useUIState.getState().setSelectedBlock(lastBlock); 467 467 - focusBlock( 468 468 - { ...lastBlock, type: type[0].data.value }, 469 469 - { type: "end" }, 470 470 - ); 471 471 - } 472 472 - if (e.shiftKey) { 473 473 - if (e.defaultPrevented) return; 474 474 - if ( 475 475 - sortedSelection.length <= 1 || 476 476 - !focusedBlock || 477 477 - focusedBlock.entityType === "page" 478 478 - ) 479 479 - return; 480 480 - let b = focusedBlock; 481 481 - let focusedBlockIndex = sortedSelection.findIndex( 482 482 - (s) => s.value == b.entityID, 483 483 - ); 484 484 - if (focusedBlockIndex === sortedSelection.length - 1) { 485 485 - let index = siblings.findIndex((s) => s.value === b.entityID); 486 486 - let nextSelectedBlock = siblings[index + 1]; 487 487 - if (!nextSelectedBlock) return; 488 488 - useUIState.getState().addBlockToSelection({ 489 489 - ...nextSelectedBlock, 490 490 - }); 491 491 - 492 492 - scrollIntoViewIfNeeded( 493 493 - document.getElementById( 494 494 - elementId.block(nextSelectedBlock.value).container, 495 495 - ), 496 496 - false, 497 497 - ); 498 498 - useUIState.getState().setFocusedBlock({ 499 499 - entityType: "block", 500 500 - parent: nextSelectedBlock.parent, 501 501 - entityID: nextSelectedBlock.value, 502 502 - }); 503 503 - } else { 504 504 - let nextBlock = sortedSelection[1]; 505 505 - useUIState 506 506 - .getState() 507 507 - .removeBlockFromSelection({ value: b.entityID }); 508 508 - scrollIntoViewIfNeeded( 509 509 - document.getElementById( 510 510 - elementId.block(nextBlock.value).container, 511 511 - ), 512 512 - false, 513 513 - ); 514 514 - useUIState.getState().setFocusedBlock({ 515 515 - entityType: "block", 516 516 - parent: b.parent, 517 517 - entityID: nextBlock.value, 518 518 - }); 519 519 - if (sortedSelection.length === 2) { 520 520 - useEditorStates 521 521 - .getState() 522 522 - .editorStates[nextBlock.value]?.view?.focus(); 523 523 - } 524 524 - } 525 525 - } 526 526 - } 527 527 - if ((e.key === "c" || e.key === "x") && (e.metaKey || e.ctrlKey)) { 528 528 - if (!rep) return; 529 529 - if (e.shiftKey || (e.metaKey && e.ctrlKey)) return; 530 530 - let [, , selectionWithFoldedChildren] = 531 531 - await getSortedSelectionBound(); 532 532 - if (!selectionWithFoldedChildren) return; 533 533 - let el = document.activeElement as HTMLElement; 534 534 - if ( 535 535 - el?.tagName === "LABEL" || 536 536 - el?.tagName === "INPUT" || 537 537 - el?.tagName === "TEXTAREA" 538 538 - ) { 539 539 - return; 540 540 - } 541 541 - 542 542 - if ( 543 543 - el.contentEditable === "true" && 544 544 - selectionWithFoldedChildren.length <= 1 545 545 - ) 546 546 - return; 547 547 - e.preventDefault(); 548 548 - await copySelection(rep, selectionWithFoldedChildren); 549 549 - if (e.key === "x") deleteBlocks(); 550 550 - } 551 551 - }); 552 552 - window.addEventListener("keydown", listener); 553 553 - return () => { 554 554 - removeListener(); 555 555 - window.removeEventListener("keydown", listener); 556 556 - }; 557 557 - }, [moreThanOneSelected, rep, entity_set.permissions.write]); 558 558 - 559 559 - let [mouseDown, setMouseDown] = useState(false); 560 560 - let initialContentEditableParent = useRef<null | Node>(null); 561 561 - let savedSelection = useRef<SavedRange[] | null>(undefined); 562 562 - useEffect(() => { 563 563 - if (isMobile) return; 564 564 - if (!entity_set.permissions.write) return; 565 565 - let mouseDownListener = (e: MouseEvent) => { 566 566 - if ((e.target as Element).getAttribute("data-draggable")) return; 567 567 - let contentEditableParent = getContentEditableParent(e.target as Node); 568 568 - if (contentEditableParent) { 569 569 - setMouseDown(true); 570 570 - let entityID = (contentEditableParent as Element).getAttribute( 571 571 - "data-entityid", 572 572 - ); 573 573 - useSelectingMouse.setState({ start: entityID }); 574 574 - } 575 575 - initialContentEditableParent.current = contentEditableParent; 576 576 - }; 577 577 - let mouseUpListener = (e: MouseEvent) => { 578 578 - savedSelection.current = null; 579 579 - if ( 580 580 - initialContentEditableParent.current && 581 581 - !(e.target as Element).getAttribute("data-draggable") && 582 582 - getContentEditableParent(e.target as Node) !== 583 583 - initialContentEditableParent.current 584 584 - ) { 585 585 - setTimeout(() => { 586 586 - window.getSelection()?.removeAllRanges(); 587 587 - }, 5); 588 588 - } 589 589 - initialContentEditableParent.current = null; 590 590 - useSelectingMouse.setState({ start: null }); 591 591 - setMouseDown(false); 592 592 - }; 593 593 - window.addEventListener("mousedown", mouseDownListener); 594 594 - window.addEventListener("mouseup", mouseUpListener); 595 595 - return () => { 596 596 - window.removeEventListener("mousedown", mouseDownListener); 597 597 - window.removeEventListener("mouseup", mouseUpListener); 598 598 - }; 599 599 - }, [entity_set.permissions.write, isMobile]); 600 600 - useEffect(() => { 601 601 - if (!mouseDown) return; 602 602 - if (isMobile) return; 603 603 - let mouseMoveListener = (e: MouseEvent) => { 604 604 - if (e.buttons !== 1) return; 605 605 - if (initialContentEditableParent.current) { 606 606 - if ( 607 607 - initialContentEditableParent.current === 608 608 - getContentEditableParent(e.target as Node) 609 609 - ) { 610 610 - if (savedSelection.current) { 611 611 - restoreSelection(savedSelection.current); 612 612 - } 613 613 - savedSelection.current = null; 614 614 - return; 615 615 - } 616 616 - if (!savedSelection.current) savedSelection.current = saveSelection(); 617 617 - window.getSelection()?.removeAllRanges(); 618 618 - } 619 619 - }; 620 620 - window.addEventListener("mousemove", mouseMoveListener); 621 621 - return () => { 622 622 - window.removeEventListener("mousemove", mouseMoveListener); 623 623 - }; 624 624 - }, [mouseDown, isMobile]); 625 625 - return null; 626 626 - } 627 627 - 628 628 - type SavedRange = { 629 629 - startContainer: Node; 630 630 - startOffset: number; 631 631 - endContainer: Node; 632 632 - endOffset: number; 633 633 - direction: "forward" | "backward"; 634 634 - }; 635 635 - export function saveSelection() { 636 636 - let selection = window.getSelection(); 637 637 - if (selection && selection.rangeCount > 0) { 638 638 - let ranges: SavedRange[] = []; 639 639 - for (let i = 0; i < selection.rangeCount; i++) { 640 640 - let range = selection.getRangeAt(i); 641 641 - ranges.push({ 642 642 - startContainer: range.startContainer, 643 643 - startOffset: range.startOffset, 644 644 - endContainer: range.endContainer, 645 645 - endOffset: range.endOffset, 646 646 - direction: 647 647 - selection.anchorNode === range.startContainer && 648 648 - selection.anchorOffset === range.startOffset 649 649 - ? "forward" 650 650 - : "backward", 651 651 - }); 652 652 - } 653 653 - return ranges; 654 654 - } 655 655 - return []; 656 656 - } 657 657 - 658 658 - export function restoreSelection(savedRanges: SavedRange[]) { 659 659 - if (savedRanges && savedRanges.length > 0) { 660 660 - let selection = window.getSelection(); 661 661 - if (!selection) return; 662 662 - selection.removeAllRanges(); 663 663 - for (let i = 0; i < savedRanges.length; i++) { 664 664 - let range = document.createRange(); 665 665 - range.setStart(savedRanges[i].startContainer, savedRanges[i].startOffset); 666 666 - range.setEnd(savedRanges[i].endContainer, savedRanges[i].endOffset); 667 667 - 668 668 - selection.addRange(range); 669 669 - 670 670 - // If the direction is backward, collapse the selection to the end and then extend it backward 671 671 - if (savedRanges[i].direction === "backward") { 672 672 - selection.collapseToEnd(); 673 673 - selection.extend( 674 674 - savedRanges[i].startContainer, 675 675 - savedRanges[i].startOffset, 676 676 - ); 677 677 - } 678 678 - } 679 679 - } 680 680 - } 681 681 - 682 682 - function getContentEditableParent(e: Node | null): Node | null { 683 683 - let element: Node | null = e; 684 684 - while (element && element !== document) { 685 685 - if ( 686 686 - (element as HTMLElement).contentEditable === "true" || 687 687 - (element as HTMLElement).getAttribute("data-editable-block") 688 688 - ) { 689 689 - return element; 690 690 - } 691 691 - element = element.parentNode; 692 692 - } 693 693 - return null; 694 694 - } 695 695 - 696 696 - export const getSortedSelection = async ( 697 697 - rep: Replicache<ReplicacheMutators>, 698 698 - ) => { 699 699 - let selectedBlocks = useUIState.getState().selectedBlocks; 700 700 - let foldedBlocks = useUIState.getState().foldedBlocks; 701 701 - if (!selectedBlocks[0]) return [[], []]; 702 702 - let siblings = 703 703 - (await rep?.query((tx) => 704 704 - getBlocksWithType(tx, selectedBlocks[0].parent), 705 705 - )) || []; 706 706 - let sortedBlocks = siblings.filter((s) => { 707 707 - let selected = selectedBlocks.find((sb) => sb.value === s.value); 708 708 - return selected; 709 709 - }); 710 710 - let sortedBlocksWithChildren = siblings.filter((s) => { 711 711 - let selected = selectedBlocks.find((sb) => sb.value === s.value); 712 712 - if (s.listData && !selected) { 713 713 - //Select the children of folded list blocks (in order to copy them) 714 714 - return s.listData.path.find( 715 715 - (p) => 716 716 - selectedBlocks.find((sb) => sb.value === p.entity) && 717 717 - foldedBlocks.includes(p.entity), 718 718 - ); 719 719 - } 720 720 - return selected; 721 721 - }); 722 722 - return [ 723 723 - sortedBlocks, 724 724 - siblings.filter( 725 725 - (f) => 726 726 - !f.listData || 727 727 - !f.listData.path.find( 728 728 - (p) => foldedBlocks.includes(p.entity) && p.entity !== f.value, 729 729 - ), 730 730 - ), 731 731 - sortedBlocksWithChildren, 732 732 - ]; 733 733 - }; 734 734 - 735 735 - function toggleMarkInBlocks(blocks: string[], mark: MarkType, attrs?: any) { 736 736 - let everyBlockHasMark = blocks.reduce((acc, block) => { 737 737 - let editor = useEditorStates.getState().editorStates[block]; 738 738 - if (!editor) return acc; 739 739 - let { view } = editor; 740 740 - let from = 0; 741 741 - let to = view.state.doc.content.size; 742 742 - let hasMarkInRange = view.state.doc.rangeHasMark(from, to, mark); 743 743 - return acc && hasMarkInRange; 744 744 - }, true); 745 745 - for (let block of blocks) { 746 746 - let editor = useEditorStates.getState().editorStates[block]; 747 747 - if (!editor) return; 748 748 - let { view } = editor; 749 749 - let tr = view.state.tr; 750 750 - 751 751 - let from = 0; 752 752 - let to = view.state.doc.content.size; 753 753 - 754 754 - tr.setMeta("bulkOp", true); 755 755 - if (everyBlockHasMark) { 756 756 - tr.removeMark(from, to, mark); 757 757 - } else { 758 758 - tr.addMark(from, to, mark.create(attrs)); 759 759 - } 760 760 - 761 761 - view.dispatch(tr); 762 762 - } 763 763 - }

+18

components/Tab.tsx

··· 1 1 + import { ExternalLinkTiny } from "./Icons/ExternalLinkTiny"; 2 2 + 3 3 + export const Tab = (props: { 4 4 + name: string; 5 5 + selected: boolean; 6 6 + onSelect: () => void; 7 7 + href?: string; 8 8 + }) => { 9 9 + return ( 10 10 + <div 11 11 + className={`pubTabs px-1 py-0 flex gap-1 items-center rounded-md hover:cursor-pointer ${props.selected ? "text-accent-2 bg-accent-1 font-bold -mb-px" : "text-tertiary"}`} 12 12 + onClick={() => props.onSelect()} 13 13 + > 14 14 + {props.name} 15 15 + {props.href && <ExternalLinkTiny />} 16 16 + </div> 17 17 + ); 18 18 + };

+1 -1

components/Tags.tsx

··· 18 18 className={`tag flex items-center text-xs rounded-md border ${props.selected ? "bg-accent-1 border-accent-1 font-bold" : "bg-bg-page border-border"} ${props.className}`} 19 19 > 20 20 <Link 21 21 - href={`/tag/${encodeURIComponent(props.name)}`} 21 21 + href={`https://leaflet.pub/tag/${encodeURIComponent(props.name)}`} 22 22 className={`px-1 py-0.5 hover:no-underline! ${props.selected ? "text-accent-2" : "text-tertiary"}`} 23 23 > 24 24 {props.name}{" "}

+4 -5

components/ThemeManager/PageThemeSetter.tsx

··· 3 3 import { pickers, SectionArrow, setColorAttribute } from "./ThemeSetter"; 4 4 5 5 import { 6 6 - PageBackgroundPicker, 6 6 + SubpageBackgroundPicker, 7 7 PageThemePickers, 8 8 } from "./Pickers/PageThemePickers"; 9 9 import { useMemo, useState } from "react"; ··· 54 54 className="pageThemeBG flex flex-col gap-2 h-full text-primary bg-bg-leaflet p-2 rounded-md border border-primary shadow-[0_0_0_1px_rgb(var(--bg-page))]" 55 55 style={{ backgroundColor: "rgba(var(--bg-page), 0.6)" }} 56 56 > 57 57 - <PageBackgroundPicker 57 57 + <SubpageBackgroundPicker 58 58 entityID={props.entityID} 59 59 openPicker={openPicker} 60 60 - setOpenPicker={(pickers) => setOpenPicker(pickers)} 61 61 - setValue={set("theme/card-background")} 60 60 + setOpenPicker={setOpenPicker} 62 61 /> 63 62 </div> 64 63 ··· 147 146 <div 148 147 className={ 149 148 pageBorderHidden 150 150 - ? "py-2 px-0 border border-transparent" 149 149 + ? "relative py-2 px-0 border border-transparent" 151 150 : `relative rounded-t-lg p-2 shadow-md text-primary border border-border border-b-transparent` 152 151 } 153 152 style={

+6

components/ThemeManager/Pickers/ColorPicker.tsx

··· 21 21 22 22 export const ColorPicker = (props: { 23 23 label?: string; 24 24 + helpText?: string; 24 25 value: Color | undefined; 25 26 alpha?: boolean; 26 27 image?: boolean; ··· 116 117 <div className="w-full flex flex-col gap-2 px-1 pb-2"> 117 118 { 118 119 <> 120 120 + {props.helpText && ( 121 121 + <div className="text-sm leading-tight text-tertiary pl-7 -mt-2.5"> 122 122 + {props.helpText} 123 123 + </div> 124 124 + )} 119 125 <ColorArea 120 126 className="w-full h-[128px] rounded-md" 121 127 colorSpace="hsb"

+4 -4

components/ThemeManager/Pickers/ImagePicker.tsx

··· 73 73 }); 74 74 }} 75 75 > 76 76 - <div className="flex flex-col gap-2 w-full"> 76 76 + <div className="flex flex-col w-full"> 77 77 <div className="flex gap-2"> 78 78 <div 79 79 className={`shink-0 grow-0 w-fit z-10 cursor-pointer ${repeat ? "text-[#595959]" : " text-[#969696]"}`} ··· 122 122 }} 123 123 > 124 124 <Slider.Track 125 125 - className={`${repeat ? "bg-[#595959]" : " bg-[#C3C3C3]"} relative grow rounded-full h-[3px]`} 125 125 + className={`${repeat ? "bg-[#595959]" : " bg-[#C3C3C3]"} relative grow rounded-full h-[3px] my-2`} 126 126 ></Slider.Track> 127 127 <Slider.Thumb 128 128 className={` 129 129 flex w-4 h-4 rounded-full border-2 border-white cursor-pointer 130 130 - ${repeat ? "bg-[#595959]" : " bg-[#C3C3C3] "} 131 131 - ${repeat && "shadow-[0_0_0_1px_#8C8C8C,inset_0_0_0_1px_#8C8C8C]"} `} 130 130 + ${repeat ? "bg-[#595959] shadow-[0_0_0_1px_#8C8C8C,inset_0_0_0_1px_#8C8C8C]" : " bg-[#C3C3C3] "} 131 131 + `} 132 132 aria-label="Volume" 133 133 /> 134 134 </Slider.Root>

-162

components/ThemeManager/Pickers/LeafletBGPicker.tsx

··· 1 1 - "use client"; 2 2 - 3 3 - import { 4 4 - ColorPicker as SpectrumColorPicker, 5 5 - parseColor, 6 6 - Color, 7 7 - ColorArea, 8 8 - ColorThumb, 9 9 - ColorSlider, 10 10 - Input, 11 11 - ColorField, 12 12 - SliderTrack, 13 13 - ColorSwatch, 14 14 - } from "react-aria-components"; 15 15 - import { pickers, setColorAttribute } from "../ThemeSetter"; 16 16 - import { thumbStyle } from "./ColorPicker"; 17 17 - import { ImageInput, ImageSettings } from "./ImagePicker"; 18 18 - import { useEntity, useReplicache } from "src/replicache"; 19 19 - import { useColorAttribute } from "components/ThemeManager/useColorAttribute"; 20 20 - import { Separator } from "components/Layout"; 21 21 - import { onMouseDown } from "src/utils/iosInputMouseDown"; 22 22 - import { BlockImageSmall } from "components/Icons/BlockImageSmall"; 23 23 - import { DeleteSmall } from "components/Icons/DeleteSmall"; 24 24 - 25 25 - export const LeafletBGPicker = (props: { 26 26 - entityID: string; 27 27 - openPicker: pickers; 28 28 - thisPicker: pickers; 29 29 - setOpenPicker: (thisPicker: pickers) => void; 30 30 - closePicker: () => void; 31 31 - setValue: (c: Color) => void; 32 32 - }) => { 33 33 - let bgImage = useEntity(props.entityID, "theme/background-image"); 34 34 - let bgRepeat = useEntity(props.entityID, "theme/background-image-repeat"); 35 35 - let bgColor = useColorAttribute(props.entityID, "theme/page-background"); 36 36 - let open = props.openPicker == props.thisPicker; 37 37 - let { rep } = useReplicache(); 38 38 - 39 39 - return ( 40 40 - <> 41 41 - <div className="bgPickerLabel flex justify-between place-items-center "> 42 42 - <div className="bgPickerColorLabel flex gap-2 items-center"> 43 43 - <button 44 44 - onClick={() => { 45 45 - if (props.openPicker === props.thisPicker) { 46 46 - props.setOpenPicker("null"); 47 47 - } else { 48 48 - props.setOpenPicker(props.thisPicker); 49 49 - } 50 50 - }} 51 51 - className="flex gap-2 items-center" 52 52 - > 53 53 - <ColorSwatch 54 54 - color={bgColor} 55 55 - className={`w-6 h-6 rounded-full border-2 border-white shadow-[0_0_0_1px_#8C8C8C]`} 56 56 - style={{ 57 57 - backgroundImage: bgImage?.data.src 58 58 - ? `url(${bgImage.data.src})` 59 59 - : undefined, 60 60 - backgroundSize: "cover", 61 61 - }} 62 62 - /> 63 63 - <strong className={` "text-[#595959]`}>{"Background"}</strong> 64 64 - </button> 65 65 - 66 66 - <div className="flex"> 67 67 - {bgImage ? ( 68 68 - <div className={`"text-[#969696]`}>Image</div> 69 69 - ) : ( 70 70 - <> 71 71 - <ColorField className="w-fit gap-1" value={bgColor}> 72 72 - <Input 73 73 - onMouseDown={onMouseDown} 74 74 - onFocus={(e) => { 75 75 - e.currentTarget.setSelectionRange( 76 76 - 1, 77 77 - e.currentTarget.value.length, 78 78 - ); 79 79 - }} 80 80 - onPaste={(e) => { 81 81 - console.log(e); 82 82 - }} 83 83 - onKeyDown={(e) => { 84 84 - if (e.key === "Enter") { 85 85 - e.currentTarget.blur(); 86 86 - } else return; 87 87 - }} 88 88 - onBlur={(e) => { 89 89 - props.setValue(parseColor(e.currentTarget.value)); 90 90 - }} 91 91 - className={`w-[72px] bg-transparent outline-nonetext-[#595959]`} 92 92 - /> 93 93 - </ColorField> 94 94 - </> 95 95 - )} 96 96 - </div> 97 97 - </div> 98 98 - <div className="flex gap-1 justify-end grow text-[#969696]"> 99 99 - {bgImage && ( 100 100 - <button 101 101 - onClick={() => { 102 102 - if (bgImage) rep?.mutate.retractFact({ factID: bgImage.id }); 103 103 - if (bgRepeat) rep?.mutate.retractFact({ factID: bgRepeat.id }); 104 104 - }} 105 105 - > 106 106 - <DeleteSmall /> 107 107 - </button> 108 108 - )} 109 109 - <label> 110 110 - <BlockImageSmall /> 111 111 - <div className="hidden"> 112 112 - <ImageInput 113 113 - {...props} 114 114 - onChange={() => { 115 115 - props.setOpenPicker(props.thisPicker); 116 116 - }} 117 117 - /> 118 118 - </div> 119 119 - </label> 120 120 - </div> 121 121 - </div> 122 122 - {open && ( 123 123 - <div className="bgImageAndColorPicker w-full flex flex-col gap-2 "> 124 124 - <SpectrumColorPicker 125 125 - value={bgColor} 126 126 - onChange={setColorAttribute( 127 127 - rep, 128 128 - props.entityID, 129 129 - )("theme/page-background")} 130 130 - > 131 131 - {bgImage ? ( 132 132 - <ImageSettings 133 133 - entityID={props.entityID} 134 134 - setValue={props.setValue} 135 135 - /> 136 136 - ) : ( 137 137 - <> 138 138 - <ColorArea 139 139 - className="w-full h-[128px] rounded-md" 140 140 - colorSpace="hsb" 141 141 - xChannel="saturation" 142 142 - yChannel="brightness" 143 143 - > 144 144 - <ColorThumb className={thumbStyle} /> 145 145 - </ColorArea> 146 146 - <ColorSlider 147 147 - colorSpace="hsb" 148 148 - className="w-full " 149 149 - channel="hue" 150 150 - > 151 151 - <SliderTrack className="h-2 w-full rounded-md"> 152 152 - <ColorThumb className={`${thumbStyle} mt-[4px]`} /> 153 153 - </SliderTrack> 154 154 - </ColorSlider> 155 155 - </> 156 156 - )} 157 157 - </SpectrumColorPicker> 158 158 - </div> 159 159 - )} 160 160 - </> 161 161 - ); 162 162 - };

+353 -43

components/ThemeManager/Pickers/PageThemePickers.tsx

··· 51 51 <hr className="border-border-light w-full" /> 52 52 </> 53 53 )} 54 54 - <PageTextPicker 54 54 + <TextPickers 55 55 value={primaryValue} 56 56 setValue={set("theme/primary")} 57 57 openPicker={props.openPicker} ··· 61 61 ); 62 62 }; 63 63 64 64 - export const PageBackgroundPicker = (props: { 64 64 + // Page background picker for subpages - shows Page/Containers color with optional background image 65 65 + export const SubpageBackgroundPicker = (props: { 65 66 entityID: string; 66 66 - setValue: (c: Color) => void; 67 67 openPicker: pickers; 68 68 setOpenPicker: (p: pickers) => void; 69 69 - home?: boolean; 70 69 }) => { 70 70 + let { rep, rootEntity } = useReplicache(); 71 71 + let set = useMemo(() => { 72 72 + return setColorAttribute(rep, props.entityID); 73 73 + }, [rep, props.entityID]); 74 74 + 71 75 let pageValue = useColorAttribute(props.entityID, "theme/card-background"); 72 76 let pageBGImage = useEntity(props.entityID, "theme/card-background-image"); 73 73 - let pageBorderHidden = useEntity(props.entityID, "theme/card-border-hidden"); 77 77 + let rootPageBorderHidden = useEntity(rootEntity, "theme/card-border-hidden"); 78 78 + let entityPageBorderHidden = useEntity( 79 79 + props.entityID, 80 80 + "theme/card-border-hidden", 81 81 + ); 82 82 + let pageBorderHidden = 83 83 + (entityPageBorderHidden || rootPageBorderHidden)?.data.value || false; 84 84 + let hasPageBackground = !pageBorderHidden; 85 85 + 86 86 + // Label is "Page" when page background is visible, "Containers" when hidden 87 87 + let label = hasPageBackground ? "Page" : "Containers"; 88 88 + 89 89 + // If root page border is hidden, only show color picker (no image support) 90 90 + if (!hasPageBackground) { 91 91 + return ( 92 92 + <ColorPicker 93 93 + label={label} 94 94 + helpText={"Affects menus, tooltips and some block backgrounds"} 95 95 + value={pageValue} 96 96 + setValue={set("theme/card-background")} 97 97 + thisPicker="page" 98 98 + openPicker={props.openPicker} 99 99 + setOpenPicker={props.setOpenPicker} 100 100 + closePicker={() => props.setOpenPicker("null")} 101 101 + alpha 102 102 + /> 103 103 + ); 104 104 + } 74 105 75 106 return ( 76 107 <> 77 77 - {pageBGImage && pageBGImage !== null && ( 78 78 - <PageBackgroundImagePicker 79 79 - disabled={pageBorderHidden?.data.value} 108 108 + {pageBGImage && ( 109 109 + <SubpageBackgroundImagePicker 80 110 entityID={props.entityID} 81 81 - thisPicker={"page-background-image"} 82 111 openPicker={props.openPicker} 83 112 setOpenPicker={props.setOpenPicker} 84 84 - closePicker={() => props.setOpenPicker("null")} 85 85 - setValue={props.setValue} 86 86 - home={props.home} 113 113 + setValue={set("theme/card-background")} 87 114 /> 88 115 )} 89 116 <div className="relative"> 90 90 - <PageBackgroundColorPicker 91 91 - label={pageBorderHidden?.data.value ? "Menus" : "Page"} 117 117 + <ColorPicker 118 118 + label={label} 92 119 value={pageValue} 93 93 - setValue={props.setValue} 94 94 - thisPicker={"page"} 120 120 + setValue={set("theme/card-background")} 121 121 + thisPicker="page" 95 122 openPicker={props.openPicker} 96 123 setOpenPicker={props.setOpenPicker} 124 124 + closePicker={() => props.setOpenPicker("null")} 97 125 alpha 98 126 /> 99 99 - {(pageBGImage === null || 100 100 - (!pageBGImage && !pageBorderHidden?.data.value && !props.home)) && ( 101 101 - <label 102 102 - className={` 103 103 - hover:cursor-pointer text-[#969696] shrink-0 104 104 - absolute top-0 right-0 105 105 - `} 106 106 - > 127 127 + {!pageBGImage && ( 128 128 + <label className="text-[#969696] hover:cursor-pointer shrink-0 absolute top-0 right-0"> 107 129 <BlockImageSmall /> 108 130 <div className="hidden"> 109 131 <ImageInput ··· 119 141 ); 120 142 }; 121 143 144 144 + const SubpageBackgroundImagePicker = (props: { 145 145 + entityID: string; 146 146 + openPicker: pickers; 147 147 + setOpenPicker: (p: pickers) => void; 148 148 + setValue: (c: Color) => void; 149 149 + }) => { 150 150 + let { rep } = useReplicache(); 151 151 + let bgImage = useEntity(props.entityID, "theme/card-background-image"); 152 152 + let bgRepeat = useEntity( 153 153 + props.entityID, 154 154 + "theme/card-background-image-repeat", 155 155 + ); 156 156 + let bgColor = useColorAttribute(props.entityID, "theme/card-background"); 157 157 + let bgAlpha = 158 158 + useEntity(props.entityID, "theme/card-background-image-opacity")?.data 159 159 + .value || 1; 160 160 + let alphaColor = useMemo(() => { 161 161 + return parseColor(`rgba(0,0,0,${bgAlpha})`); 162 162 + }, [bgAlpha]); 163 163 + let open = props.openPicker === "page-background-image"; 164 164 + 165 165 + return ( 166 166 + <> 167 167 + <div className="bgPickerColorLabel flex gap-2 items-center"> 168 168 + <button 169 169 + onClick={() => { 170 170 + props.setOpenPicker(open ? "null" : "page-background-image"); 171 171 + }} 172 172 + className="flex gap-2 items-center grow" 173 173 + > 174 174 + <ColorSwatch 175 175 + color={bgColor} 176 176 + className="w-6 h-6 rounded-full border-2 border-white shadow-[0_0_0_1px_#8C8C8C]" 177 177 + style={{ 178 178 + backgroundImage: bgImage?.data.src 179 179 + ? `url(${bgImage.data.src})` 180 180 + : undefined, 181 181 + backgroundPosition: "center", 182 182 + backgroundSize: "cover", 183 183 + }} 184 184 + /> 185 185 + <strong className="text-[#595959]">Page</strong> 186 186 + <div className="italic text-[#8C8C8C]">image</div> 187 187 + </button> 188 188 + 189 189 + <SpectrumColorPicker 190 190 + value={alphaColor} 191 191 + onChange={(c) => { 192 192 + let alpha = c.getChannelValue("alpha"); 193 193 + rep?.mutate.assertFact({ 194 194 + entity: props.entityID, 195 195 + attribute: "theme/card-background-image-opacity", 196 196 + data: { type: "number", value: alpha }, 197 197 + }); 198 198 + }} 199 199 + > 200 200 + <Separator classname="h-4! my-1 border-[#C3C3C3]!" /> 201 201 + <ColorField className="w-fit pl-[6px]" channel="alpha"> 202 202 + <Input 203 203 + onMouseDown={onMouseDown} 204 204 + onFocus={(e) => { 205 205 + e.currentTarget.setSelectionRange( 206 206 + 0, 207 207 + e.currentTarget.value.length - 1, 208 208 + ); 209 209 + }} 210 210 + onKeyDown={(e) => { 211 211 + if (e.key === "Enter") { 212 212 + e.currentTarget.blur(); 213 213 + } else return; 214 214 + }} 215 215 + className="w-[48px] bg-transparent outline-hidden" 216 216 + /> 217 217 + </ColorField> 218 218 + </SpectrumColorPicker> 219 219 + 220 220 + <div className="flex gap-1 text-[#8C8C8C]"> 221 221 + <button 222 222 + onClick={() => { 223 223 + if (bgImage) rep?.mutate.retractFact({ factID: bgImage.id }); 224 224 + if (bgRepeat) rep?.mutate.retractFact({ factID: bgRepeat.id }); 225 225 + }} 226 226 + > 227 227 + <DeleteSmall /> 228 228 + </button> 229 229 + <label className="hover:cursor-pointer"> 230 230 + <BlockImageSmall /> 231 231 + <div className="hidden"> 232 232 + <ImageInput 233 233 + entityID={props.entityID} 234 234 + onChange={() => props.setOpenPicker("page-background-image")} 235 235 + card 236 236 + /> 237 237 + </div> 238 238 + </label> 239 239 + </div> 240 240 + </div> 241 241 + {open && ( 242 242 + <div className="pageImagePicker flex flex-col gap-2"> 243 243 + <ImageSettings 244 244 + entityID={props.entityID} 245 245 + card 246 246 + setValue={props.setValue} 247 247 + /> 248 248 + <div className="flex flex-col gap-2 pr-2 pl-8 -mt-2 mb-2"> 249 249 + <hr className="border-[#DBDBDB]" /> 250 250 + <SpectrumColorPicker 251 251 + value={alphaColor} 252 252 + onChange={(c) => { 253 253 + let alpha = c.getChannelValue("alpha"); 254 254 + rep?.mutate.assertFact({ 255 255 + entity: props.entityID, 256 256 + attribute: "theme/card-background-image-opacity", 257 257 + data: { type: "number", value: alpha }, 258 258 + }); 259 259 + }} 260 260 + > 261 261 + <ColorSlider 262 262 + colorSpace="hsb" 263 263 + className="w-full mt-1 rounded-full" 264 264 + style={{ 265 265 + backgroundImage: `url(/transparent-bg.png)`, 266 266 + backgroundRepeat: "repeat", 267 267 + backgroundSize: "8px", 268 268 + }} 269 269 + channel="alpha" 270 270 + > 271 271 + <SliderTrack className="h-2 w-full rounded-md"> 272 272 + <ColorThumb className={`${thumbStyle} mt-[4px]`} /> 273 273 + </SliderTrack> 274 274 + </ColorSlider> 275 275 + </SpectrumColorPicker> 276 276 + </div> 277 277 + </div> 278 278 + )} 279 279 + </> 280 280 + ); 281 281 + }; 282 282 + 283 283 + // Unified background picker for leaflets - matches structure of BackgroundPicker for publications 284 284 + export const LeafletBackgroundPicker = (props: { 285 285 + entityID: string; 286 286 + openPicker: pickers; 287 287 + setOpenPicker: (p: pickers) => void; 288 288 + }) => { 289 289 + let { rep } = useReplicache(); 290 290 + let set = useMemo(() => { 291 291 + return setColorAttribute(rep, props.entityID); 292 292 + }, [rep, props.entityID]); 293 293 + 294 294 + let leafletBgValue = useColorAttribute( 295 295 + props.entityID, 296 296 + "theme/page-background", 297 297 + ); 298 298 + let pageValue = useColorAttribute(props.entityID, "theme/card-background"); 299 299 + let leafletBGImage = useEntity(props.entityID, "theme/background-image"); 300 300 + let leafletBGRepeat = useEntity( 301 301 + props.entityID, 302 302 + "theme/background-image-repeat", 303 303 + ); 304 304 + let pageBorderHidden = useEntity(props.entityID, "theme/card-border-hidden"); 305 305 + let hasPageBackground = !pageBorderHidden?.data.value; 306 306 + 307 307 + // When page background is hidden and no background image, only show the Background picker 308 308 + let showPagePicker = hasPageBackground || !!leafletBGImage; 309 309 + 310 310 + return ( 311 311 + <> 312 312 + {/* Background color/image picker */} 313 313 + {leafletBGImage ? ( 314 314 + <LeafletBackgroundImagePicker 315 315 + entityID={props.entityID} 316 316 + openPicker={props.openPicker} 317 317 + setOpenPicker={props.setOpenPicker} 318 318 + /> 319 319 + ) : ( 320 320 + <div className="relative"> 321 321 + <ColorPicker 322 322 + label="Background" 323 323 + value={leafletBgValue} 324 324 + setValue={set("theme/page-background")} 325 325 + thisPicker="leaflet" 326 326 + openPicker={props.openPicker} 327 327 + setOpenPicker={props.setOpenPicker} 328 328 + closePicker={() => props.setOpenPicker("null")} 329 329 + /> 330 330 + <label className="text-[#969696] hover:cursor-pointer shrink-0 absolute top-0 right-0"> 331 331 + <BlockImageSmall /> 332 332 + <div className="hidden"> 333 333 + <ImageInput 334 334 + entityID={props.entityID} 335 335 + onChange={() => props.setOpenPicker("leaflet")} 336 336 + /> 337 337 + </div> 338 338 + </label> 339 339 + </div> 340 340 + )} 341 341 + 342 342 + {/* Page/Containers color picker - only shown when page background is visible OR there's a bg image */} 343 343 + {showPagePicker && ( 344 344 + <ColorPicker 345 345 + label={hasPageBackground ? "Page" : "Containers"} 346 346 + helpText={ 347 347 + hasPageBackground 348 348 + ? undefined 349 349 + : "Affects menus, tooltips and some block backgrounds" 350 350 + } 351 351 + value={pageValue} 352 352 + setValue={set("theme/card-background")} 353 353 + thisPicker="page" 354 354 + openPicker={props.openPicker} 355 355 + setOpenPicker={props.setOpenPicker} 356 356 + closePicker={() => props.setOpenPicker("null")} 357 357 + alpha 358 358 + /> 359 359 + )} 360 360 + 361 361 + <hr className="border-[#CCCCCC]" /> 362 362 + 363 363 + {/* Page Background toggle */} 364 364 + <PageBorderHider 365 365 + entityID={props.entityID} 366 366 + openPicker={props.openPicker} 367 367 + setOpenPicker={props.setOpenPicker} 368 368 + /> 369 369 + </> 370 370 + ); 371 371 + }; 372 372 + 373 373 + const LeafletBackgroundImagePicker = (props: { 374 374 + entityID: string; 375 375 + openPicker: pickers; 376 376 + setOpenPicker: (p: pickers) => void; 377 377 + }) => { 378 378 + let { rep } = useReplicache(); 379 379 + let bgImage = useEntity(props.entityID, "theme/background-image"); 380 380 + let bgRepeat = useEntity(props.entityID, "theme/background-image-repeat"); 381 381 + let bgColor = useColorAttribute(props.entityID, "theme/page-background"); 382 382 + let open = props.openPicker === "leaflet"; 383 383 + 384 384 + return ( 385 385 + <> 386 386 + <div className="bgPickerColorLabel flex gap-2 items-center"> 387 387 + <button 388 388 + onClick={() => { 389 389 + props.setOpenPicker(open ? "null" : "leaflet"); 390 390 + }} 391 391 + className="flex gap-2 items-center grow" 392 392 + > 393 393 + <ColorSwatch 394 394 + color={bgColor} 395 395 + className="w-6 h-6 rounded-full border-2 border-white shadow-[0_0_0_1px_#8C8C8C]" 396 396 + style={{ 397 397 + backgroundImage: bgImage?.data.src 398 398 + ? `url(${bgImage.data.src})` 399 399 + : undefined, 400 400 + backgroundPosition: "center", 401 401 + backgroundSize: "cover", 402 402 + }} 403 403 + /> 404 404 + <strong className="text-[#595959]">Background</strong> 405 405 + <div className="italic text-[#8C8C8C]">image</div> 406 406 + </button> 407 407 + <div className="flex gap-1 text-[#8C8C8C]"> 408 408 + <button 409 409 + onClick={() => { 410 410 + if (bgImage) rep?.mutate.retractFact({ factID: bgImage.id }); 411 411 + if (bgRepeat) rep?.mutate.retractFact({ factID: bgRepeat.id }); 412 412 + }} 413 413 + > 414 414 + <DeleteSmall /> 415 415 + </button> 416 416 + <label className="hover:cursor-pointer"> 417 417 + <BlockImageSmall /> 418 418 + <div className="hidden"> 419 419 + <ImageInput 420 420 + entityID={props.entityID} 421 421 + onChange={() => props.setOpenPicker("leaflet")} 422 422 + /> 423 423 + </div> 424 424 + </label> 425 425 + </div> 426 426 + </div> 427 427 + {open && ( 428 428 + <div className="pageImagePicker flex flex-col gap-2"> 429 429 + <ImageSettings entityID={props.entityID} setValue={() => {}} /> 430 430 + </div> 431 431 + )} 432 432 + </> 433 433 + ); 434 434 + }; 435 435 + 122 436 export const PageBackgroundColorPicker = (props: { 123 437 disabled?: boolean; 124 438 label: string; ··· 128 442 setValue: (c: Color) => void; 129 443 value: Color; 130 444 alpha?: boolean; 445 445 + helpText?: string; 131 446 }) => { 132 447 return ( 133 448 <ColorPicker 134 449 disabled={props.disabled} 135 450 label={props.label} 451 451 + helpText={props.helpText} 136 452 value={props.value} 137 453 setValue={props.setValue} 138 454 thisPicker={"page"} ··· 347 663 ); 348 664 }; 349 665 350 350 - export const PageTextPicker = (props: { 666 666 + export const TextPickers = (props: { 351 667 openPicker: pickers; 352 668 setOpenPicker: (thisPicker: pickers) => void; 353 669 value: Color; ··· 394 710 395 711 return ( 396 712 <> 397 397 - <div className="flex gap-2 items-center"> 398 398 - <Toggle 399 399 - toggleOn={!pageBorderHidden} 400 400 - setToggleOn={() => { 401 401 - handleToggle(); 402 402 - }} 403 403 - disabledColor1="#8C8C8C" 404 404 - disabledColor2="#DBDBDB" 405 405 - /> 406 406 - <button 407 407 - className="flex gap-2 items-center" 408 408 - onClick={() => { 409 409 - handleToggle(); 410 410 - }} 411 411 - > 713 713 + <Toggle 714 714 + toggle={!pageBorderHidden} 715 715 + onToggle={() => { 716 716 + handleToggle(); 717 717 + }} 718 718 + disabledColor1="#8C8C8C" 719 719 + disabledColor2="#DBDBDB" 720 720 + > 721 721 + <div className="flex gap-2"> 412 722 <div className="font-bold">Page Background</div> 413 723 <div className="italic text-[#8C8C8C]"> 414 414 - {pageBorderHidden ? "hidden" : ""} 724 724 + {pageBorderHidden ? "none" : ""} 415 725 </div> 416 416 - </button> 417 417 - </div> 726 726 + </div> 727 727 + </Toggle> 418 728 </> 419 729 ); 420 730 };

+215

components/ThemeManager/Pickers/PageWidthSetter.tsx

··· 1 1 + import * as Slider from "@radix-ui/react-slider"; 2 2 + import { Input } from "components/Input"; 3 3 + import { Radio } from "components/Checkbox"; 4 4 + import { useEntity, useReplicache } from "src/replicache"; 5 5 + import { pickers } from "../ThemeSetter"; 6 6 + import { useState, useEffect } from "react"; 7 7 + 8 8 + export const PageWidthSetter = (props: { 9 9 + entityID: string; 10 10 + openPicker: pickers; 11 11 + thisPicker: pickers; 12 12 + setOpenPicker: (thisPicker: pickers) => void; 13 13 + closePicker: () => void; 14 14 + }) => { 15 15 + let { rep } = useReplicache(); 16 16 + 17 17 + let defaultPreset = 624; 18 18 + let widePreset = 768; 19 19 + let pageWidth = useEntity(props.entityID, "theme/page-width")?.data.value; 20 20 + let currentValue = pageWidth || defaultPreset; 21 21 + let [interimValue, setInterimValue] = useState<number>(currentValue); 22 22 + let [selectedPreset, setSelectedPreset] = useState< 23 23 + "default" | "wide" | "custom" 24 24 + >( 25 25 + currentValue === defaultPreset 26 26 + ? "default" 27 27 + : currentValue === widePreset 28 28 + ? "wide" 29 29 + : "custom", 30 30 + ); 31 31 + let min = 320; 32 32 + let max = 1200; 33 33 + 34 34 + let open = props.openPicker == props.thisPicker; 35 35 + 36 36 + // Update interim value when current value changes 37 37 + useEffect(() => { 38 38 + setInterimValue(currentValue); 39 39 + }, [currentValue]); 40 40 + 41 41 + const setPageWidth = (value: number) => { 42 42 + rep?.mutate.assertFact({ 43 43 + entity: props.entityID, 44 44 + attribute: "theme/page-width", 45 45 + data: { 46 46 + type: "number", 47 47 + value: value, 48 48 + }, 49 49 + }); 50 50 + }; 51 51 + 52 52 + return ( 53 53 + <div className="pageWidthSetter flex flex-col gap-2 px-2 py-[6px] border border-[#CCCCCC] rounded-md"> 54 54 + <div className="flex flex-col gap-2"> 55 55 + <div className="flex gap-2 items-center"> 56 56 + <button 57 57 + className="font-bold text-[#000000] shrink-0 grow-0 w-full flex gap-2 items-start text-left" 58 58 + onClick={() => { 59 59 + if (props.openPicker === props.thisPicker) { 60 60 + props.setOpenPicker("null"); 61 61 + } else { 62 62 + props.setOpenPicker(props.thisPicker); 63 63 + } 64 64 + }} 65 65 + > 66 66 + Max Page Width 67 67 + <span className="flex font-normal text-[#969696]"> 68 68 + {currentValue}px 69 69 + </span> 70 70 + </button> 71 71 + </div> 72 72 + {open && ( 73 73 + <div className="flex flex-col gap-1 px-3"> 74 74 + <label htmlFor="default" className="w-full"> 75 75 + <Radio 76 76 + radioCheckedClassName="text-[#595959]!" 77 77 + radioEmptyClassName="text-[#969696]!" 78 78 + type="radio" 79 79 + id="default" 80 80 + name="page-width-options" 81 81 + value="default" 82 82 + checked={selectedPreset === "default"} 83 83 + onChange={(e) => { 84 84 + if (!e.currentTarget.checked) return; 85 85 + setSelectedPreset("default"); 86 86 + setPageWidth(defaultPreset); 87 87 + }} 88 88 + > 89 89 + <div 90 90 + className={`w-full cursor-pointer ${selectedPreset === "default" ? "text-[#595959]" : "text-[#969696]"}`} 91 91 + > 92 92 + default (624px) 93 93 + </div> 94 94 + </Radio> 95 95 + </label> 96 96 + <label htmlFor="wide" className="w-full"> 97 97 + <Radio 98 98 + radioCheckedClassName="text-[#595959]!" 99 99 + radioEmptyClassName="text-[#969696]!" 100 100 + type="radio" 101 101 + id="wide" 102 102 + name="page-width-options" 103 103 + value="wide" 104 104 + checked={selectedPreset === "wide"} 105 105 + onChange={(e) => { 106 106 + if (!e.currentTarget.checked) return; 107 107 + setSelectedPreset("wide"); 108 108 + setPageWidth(widePreset); 109 109 + }} 110 110 + > 111 111 + <div 112 112 + className={`w-full cursor-pointer ${selectedPreset === "wide" ? "text-[#595959]" : "text-[#969696]"}`} 113 113 + > 114 114 + wide (756px) 115 115 + </div> 116 116 + </Radio> 117 117 + </label> 118 118 + <label htmlFor="custom" className="pb-3 w-full"> 119 119 + <Radio 120 120 + type="radio" 121 121 + id="custom" 122 122 + name="page-width-options" 123 123 + value="custom" 124 124 + radioCheckedClassName="text-[#595959]!" 125 125 + radioEmptyClassName="text-[#969696]!" 126 126 + checked={selectedPreset === "custom"} 127 127 + onChange={(e) => { 128 128 + if (!e.currentTarget.checked) return; 129 129 + setSelectedPreset("custom"); 130 130 + if (selectedPreset !== "custom") { 131 131 + setPageWidth(currentValue); 132 132 + setInterimValue(currentValue); 133 133 + } 134 134 + }} 135 135 + > 136 136 + <div className="flex flex-col w-full"> 137 137 + <div className="flex gap-2"> 138 138 + <div 139 139 + className={`shrink-0 grow-0 w-fit z-10 cursor-pointer ${selectedPreset === "custom" ? "text-[#595959]" : "text-[#969696]"}`} 140 140 + > 141 141 + custom 142 142 + </div> 143 143 + <div 144 144 + className={`flex font-normal ${selectedPreset === "custom" ? "text-[#969696]" : "text-[#C3C3C3]"}`} 145 145 + > 146 146 + <Input 147 147 + type="number" 148 148 + className="w-10 text-right appearance-none bg-transparent" 149 149 + max={max} 150 150 + min={min} 151 151 + value={interimValue} 152 152 + onChange={(e) => { 153 153 + setInterimValue(parseInt(e.currentTarget.value)); 154 154 + }} 155 155 + onKeyDown={(e) => { 156 156 + if (e.key === "Enter" || e.key === "Escape") { 157 157 + e.preventDefault(); 158 158 + let clampedValue = interimValue; 159 159 + if (!isNaN(interimValue)) { 160 160 + clampedValue = Math.max( 161 161 + min, 162 162 + Math.min(max, interimValue), 163 163 + ); 164 164 + setInterimValue(clampedValue); 165 165 + } 166 166 + setPageWidth(clampedValue); 167 167 + } 168 168 + }} 169 169 + onBlur={() => { 170 170 + let clampedValue = interimValue; 171 171 + if (!isNaN(interimValue)) { 172 172 + clampedValue = Math.max( 173 173 + min, 174 174 + Math.min(max, interimValue), 175 175 + ); 176 176 + setInterimValue(clampedValue); 177 177 + } 178 178 + setPageWidth(clampedValue); 179 179 + }} 180 180 + /> 181 181 + px 182 182 + </div> 183 183 + </div> 184 184 + <Slider.Root 185 185 + className={`relative grow flex items-center select-none touch-none w-full h-fit px-1`} 186 186 + value={[interimValue]} 187 187 + max={max} 188 188 + min={min} 189 189 + step={16} 190 190 + onValueChange={(value) => { 191 191 + setInterimValue(value[0]); 192 192 + }} 193 193 + onValueCommit={(value) => { 194 194 + setPageWidth(value[0]); 195 195 + }} 196 196 + > 197 197 + <Slider.Track 198 198 + className={`${selectedPreset === "custom" ? "bg-[#595959]" : "bg-[#C3C3C3]"} relative grow rounded-full h-[3px] my-2`} 199 199 + /> 200 200 + <Slider.Thumb 201 201 + className={`flex w-4 h-4 rounded-full border-2 border-white cursor-pointer 202 202 + ${selectedPreset === "custom" ? "bg-[#595959] shadow-[0_0_0_1px_#8C8C8C,inset_0_0_0_1px_#8C8C8C]" : "bg-[#C3C3C3]"} 203 203 + `} 204 204 + aria-label="Max Page Width" 205 205 + /> 206 206 + </Slider.Root> 207 207 + </div> 208 208 + </Radio> 209 209 + </label> 210 210 + </div> 211 211 + )} 212 212 + </div> 213 213 + </div> 214 214 + ); 215 215 + };

+30 -24

components/ThemeManager/PubPickers/PubBackgroundPickers.tsx

··· 24 24 hasPageBackground: boolean; 25 25 setHasPageBackground: (s: boolean) => void; 26 26 }) => { 27 27 + // When showPageBackground is false (hasPageBackground=false) and no background image, show leafletBg picker 28 28 + let showLeafletBgPicker = !props.hasPageBackground && !props.bgImage; 29 29 + 27 30 return ( 28 31 <> 29 32 {props.bgImage && props.bgImage !== null ? ( ··· 83 86 )} 84 87 </div> 85 88 )} 86 86 - <PageBackgroundColorPicker 87 87 - label={"Containers"} 88 88 - value={props.pageBackground} 89 89 - setValue={props.setPageBackground} 90 90 - thisPicker={"page"} 91 91 - openPicker={props.openPicker} 92 92 - setOpenPicker={props.setOpenPicker} 93 93 - alpha={props.hasPageBackground ? true : false} 94 94 - /> 89 89 + {!showLeafletBgPicker && ( 90 90 + // When there's a background image and page background hidden, label should say "Containers" 91 91 + <PageBackgroundColorPicker 92 92 + label={props.hasPageBackground ? "Page" : "Containers"} 93 93 + helpText={ 94 94 + props.hasPageBackground 95 95 + ? undefined 96 96 + : "Affects menus, tooltips and some block backgrounds" 97 97 + } 98 98 + value={props.pageBackground} 99 99 + setValue={props.setPageBackground} 100 100 + thisPicker={"page"} 101 101 + openPicker={props.openPicker} 102 102 + setOpenPicker={props.setOpenPicker} 103 103 + alpha={props.hasPageBackground ? true : false} 104 104 + /> 105 105 + )} 95 106 <hr className="border-border-light" /> 96 107 <div className="flex gap-2 items-center"> 97 108 <Toggle 98 98 - toggleOn={props.hasPageBackground} 99 99 - setToggleOn={() => { 109 109 + toggle={props.hasPageBackground} 110 110 + onToggle={() => { 100 111 props.setHasPageBackground(!props.hasPageBackground); 101 112 props.hasPageBackground && 102 113 props.openPicker === "page" && ··· 104 115 }} 105 116 disabledColor1="#8C8C8C" 106 117 disabledColor2="#DBDBDB" 107 107 - /> 108 108 - <button 109 109 - className="flex gap-2 items-center" 110 110 - onClick={() => { 111 111 - props.setHasPageBackground(!props.hasPageBackground); 112 112 - props.hasPageBackground && props.setOpenPicker("null"); 113 113 - }} 114 118 > 115 115 - <div className="font-bold">Page Background</div> 116 116 - <div className="italic text-[#8C8C8C]"> 117 117 - {props.hasPageBackground ? "" : "hidden"} 119 119 + <div className="flex gap-2"> 120 120 + <div className="font-bold">Page Background</div> 121 121 + <div className="italic text-[#8C8C8C]"> 122 122 + {props.hasPageBackground ? "" : "none"} 123 123 + </div> 118 124 </div> 119 119 - </button> 125 125 + </Toggle> 120 126 </div> 121 127 </> 122 128 ); ··· 250 256 props.setBgImage({ ...props.bgImage, repeat: 500 }); 251 257 }} 252 258 > 253 253 - <div className="flex flex-col gap-2 w-full"> 259 259 + <div className="flex flex-col w-full"> 254 260 <div className="flex gap-2"> 255 261 <div 256 262 className={`shink-0 grow-0 w-fit z-10 cursor-pointer ${props.bgImage?.repeat ? "text-[#595959]" : " text-[#969696]"}`} ··· 289 295 }} 290 296 > 291 297 <Slider.Track 292 292 - className={`${props.bgImage?.repeat ? "bg-[#595959]" : " bg-[#C3C3C3]"} relative grow rounded-full h-[3px]`} 298 298 + className={`${props.bgImage?.repeat ? "bg-[#595959]" : " bg-[#C3C3C3]"} relative grow rounded-full h-[3px] my-2`} 293 299 ></Slider.Track> 294 300 <Slider.Thumb 295 301 className={`

+201

components/ThemeManager/PubPickers/PubPageWidthSetter.tsx

··· 1 1 + import * as Slider from "@radix-ui/react-slider"; 2 2 + import { Input } from "components/Input"; 3 3 + import { Radio } from "components/Checkbox"; 4 4 + import { useState, useEffect } from "react"; 5 5 + import { pickers } from "../ThemeSetter"; 6 6 + 7 7 + export const PubPageWidthSetter = (props: { 8 8 + pageWidth: number | undefined; 9 9 + setPageWidth: (value: number) => void; 10 10 + thisPicker: pickers; 11 11 + openPicker: pickers; 12 12 + setOpenPicker: (p: pickers) => void; 13 13 + }) => { 14 14 + let defaultPreset = 624; 15 15 + let widePreset = 768; 16 16 + 17 17 + let currentValue = props.pageWidth || defaultPreset; 18 18 + let [interimValue, setInterimValue] = useState<number>(currentValue); 19 19 + let [selectedPreset, setSelectedPreset] = useState< 20 20 + "default" | "wide" | "custom" 21 21 + >( 22 22 + currentValue === defaultPreset 23 23 + ? "default" 24 24 + : currentValue === widePreset 25 25 + ? "wide" 26 26 + : "custom", 27 27 + ); 28 28 + let min = 320; 29 29 + let max = 1200; 30 30 + 31 31 + // Update interim value when current value changes 32 32 + useEffect(() => { 33 33 + setInterimValue(currentValue); 34 34 + }, [currentValue]); 35 35 + 36 36 + const setPageWidth = (value: number) => { 37 37 + props.setPageWidth(value); 38 38 + }; 39 39 + 40 40 + let open = props.openPicker == props.thisPicker; 41 41 + 42 42 + return ( 43 43 + <div className="pageWidthSetter flex flex-col gap-2 px-2 py-[6px] border border-[#CCCCCC] rounded-md bg-white"> 44 44 + <button 45 45 + type="button" 46 46 + className="font-bold text-[#000000] shrink-0 grow-0 w-full flex gap-2 text-left items-center" 47 47 + onClick={() => { 48 48 + if (!open) { 49 49 + props.setOpenPicker(props.thisPicker); 50 50 + } else { 51 51 + props.setOpenPicker("null"); 52 52 + } 53 53 + }} 54 54 + > 55 55 + Max Page Width 56 56 + <div className="flex font-normal text-[#969696]">{currentValue}px</div> 57 57 + </button> 58 58 + 59 59 + {open && ( 60 60 + <div className="flex flex-col gap-1 px-3"> 61 61 + <label htmlFor="pub-default" className="w-full"> 62 62 + <Radio 63 63 + radioCheckedClassName="text-[#595959]!" 64 64 + radioEmptyClassName="text-[#969696]!" 65 65 + type="radio" 66 66 + id="pub-default" 67 67 + name="pub-page-width-options" 68 68 + value="default" 69 69 + checked={selectedPreset === "default"} 70 70 + onChange={(e) => { 71 71 + if (!e.currentTarget.checked) return; 72 72 + setSelectedPreset("default"); 73 73 + setPageWidth(defaultPreset); 74 74 + }} 75 75 + > 76 76 + <div 77 77 + className={`w-full cursor-pointer ${selectedPreset === "default" ? "text-[#595959]" : "text-[#969696]"}`} 78 78 + > 79 79 + default (624px) 80 80 + </div> 81 81 + </Radio> 82 82 + </label> 83 83 + <label htmlFor="pub-wide" className="w-full"> 84 84 + <Radio 85 85 + radioCheckedClassName="text-[#595959]!" 86 86 + radioEmptyClassName="text-[#969696]!" 87 87 + type="radio" 88 88 + id="pub-wide" 89 89 + name="pub-page-width-options" 90 90 + value="wide" 91 91 + checked={selectedPreset === "wide"} 92 92 + onChange={(e) => { 93 93 + if (!e.currentTarget.checked) return; 94 94 + setSelectedPreset("wide"); 95 95 + setPageWidth(widePreset); 96 96 + }} 97 97 + > 98 98 + <div 99 99 + className={`w-full cursor-pointer ${selectedPreset === "wide" ? "text-[#595959]" : "text-[#969696]"}`} 100 100 + > 101 101 + wide (756px) 102 102 + </div> 103 103 + </Radio> 104 104 + </label> 105 105 + <label htmlFor="pub-custom" className="pb-3 w-full"> 106 106 + <Radio 107 107 + type="radio" 108 108 + id="pub-custom" 109 109 + name="pub-page-width-options" 110 110 + value="custom" 111 111 + radioCheckedClassName="text-[#595959]!" 112 112 + radioEmptyClassName="text-[#969696]!" 113 113 + checked={selectedPreset === "custom"} 114 114 + onChange={(e) => { 115 115 + if (!e.currentTarget.checked) return; 116 116 + setSelectedPreset("custom"); 117 117 + if (selectedPreset !== "custom") { 118 118 + setPageWidth(currentValue); 119 119 + setInterimValue(currentValue); 120 120 + } 121 121 + }} 122 122 + > 123 123 + <div className="flex flex-col w-full"> 124 124 + <div className="flex gap-2"> 125 125 + <div 126 126 + className={`shrink-0 grow-0 w-fit z-10 cursor-pointer ${selectedPreset === "custom" ? "text-[#595959]" : "text-[#969696]"}`} 127 127 + > 128 128 + custom 129 129 + </div> 130 130 + <div 131 131 + className={`flex font-normal ${selectedPreset === "custom" ? "text-[#969696]" : "text-[#C3C3C3]"}`} 132 132 + > 133 133 + <Input 134 134 + type="number" 135 135 + className="w-10 text-right appearance-none bg-transparent" 136 136 + max={max} 137 137 + min={min} 138 138 + value={interimValue} 139 139 + onChange={(e) => { 140 140 + setInterimValue(parseInt(e.currentTarget.value)); 141 141 + }} 142 142 + onKeyDown={(e) => { 143 143 + if (e.key === "Enter" || e.key === "Escape") { 144 144 + e.preventDefault(); 145 145 + let clampedValue = interimValue; 146 146 + if (!isNaN(interimValue)) { 147 147 + clampedValue = Math.max( 148 148 + min, 149 149 + Math.min(max, interimValue), 150 150 + ); 151 151 + setInterimValue(clampedValue); 152 152 + } 153 153 + setPageWidth(clampedValue); 154 154 + } 155 155 + }} 156 156 + onBlur={() => { 157 157 + let clampedValue = interimValue; 158 158 + if (!isNaN(interimValue)) { 159 159 + clampedValue = Math.max( 160 160 + min, 161 161 + Math.min(max, interimValue), 162 162 + ); 163 163 + setInterimValue(clampedValue); 164 164 + } 165 165 + setPageWidth(clampedValue); 166 166 + }} 167 167 + /> 168 168 + px 169 169 + </div> 170 170 + </div> 171 171 + <Slider.Root 172 172 + className={`relative grow flex items-center select-none touch-none w-full h-fit px-1`} 173 173 + value={[interimValue]} 174 174 + max={max} 175 175 + min={min} 176 176 + step={16} 177 177 + onValueChange={(value) => { 178 178 + setInterimValue(value[0]); 179 179 + }} 180 180 + onValueCommit={(value) => { 181 181 + setPageWidth(value[0]); 182 182 + }} 183 183 + > 184 184 + <Slider.Track 185 185 + className={`${selectedPreset === "custom" ? "bg-[#595959]" : "bg-[#C3C3C3]"} relative grow rounded-full h-[3px] my-2`} 186 186 + /> 187 187 + <Slider.Thumb 188 188 + className={`flex w-4 h-4 rounded-full border-2 border-white cursor-pointer 189 189 + ${selectedPreset === "custom" ? "bg-[#595959] shadow-[0_0_0_1px_#8C8C8C,inset_0_0_0_1px_#8C8C8C]" : "bg-[#C3C3C3]"} 190 190 + `} 191 191 + aria-label="Max Page Width" 192 192 + /> 193 193 + </Slider.Root> 194 194 + </div> 195 195 + </Radio> 196 196 + </label> 197 197 + </div> 198 198 + )} 199 199 + </div> 200 200 + ); 201 201 + };

+2 -2

components/ThemeManager/PubPickers/PubTextPickers.tsx

··· 1 1 import { pickers } from "../ThemeSetter"; 2 2 - import { PageTextPicker } from "../Pickers/PageThemePickers"; 2 2 + import { TextPickers } from "../Pickers/PageThemePickers"; 3 3 import { Color } from "react-aria-components"; 4 4 5 5 export const PagePickers = (props: { ··· 20 20 : "transparent", 21 21 }} 22 22 > 23 23 - <PageTextPicker 23 23 + <TextPickers 24 24 value={props.primary} 25 25 setValue={props.setPrimary} 26 26 openPicker={props.openPicker}

+41 -8

components/ThemeManager/PubThemeSetter.tsx

··· 15 15 import { BackgroundPicker } from "./PubPickers/PubBackgroundPickers"; 16 16 import { PubAccentPickers } from "./PubPickers/PubAcccentPickers"; 17 17 import { Separator } from "components/Layout"; 18 18 - import { PubSettingsHeader } from "app/lish/[did]/[publication]/dashboard/PublicationSettings"; 18 18 + import { PubSettingsHeader } from "app/lish/[did]/[publication]/dashboard/settings/PublicationSettings"; 19 19 import { ColorToRGB, ColorToRGBA } from "./colorToLexicons"; 20 20 + import { useToaster } from "components/Toast"; 21 21 + import { OAuthErrorMessage, isOAuthSessionError } from "components/OAuthError"; 22 22 + import { PubPageWidthSetter } from "./PubPickers/PubPageWidthSetter"; 20 23 21 24 export type ImageState = { 22 25 src: string; ··· 54 57 } 55 58 : null, 56 59 ); 57 57 - 60 60 + let [pageWidth, setPageWidth] = useState<number>( 61 61 + record?.theme?.pageWidth || 624, 62 62 + ); 58 63 let pubBGImage = image?.src || null; 59 64 let leafletBGRepeat = image?.repeat || null; 65 65 + let toaster = useToaster(); 60 66 61 67 return ( 62 62 - <BaseThemeProvider local {...localPubTheme}> 68 68 + <BaseThemeProvider local {...localPubTheme} hasBackgroundImage={!!image}> 63 69 <form 64 70 onSubmit={async (e) => { 65 71 e.preventDefault(); ··· 75 81 : ColorToRGB(localPubTheme.bgLeaflet), 76 82 backgroundRepeat: image?.repeat, 77 83 backgroundImage: image ? image.file : null, 84 84 + pageWidth: pageWidth, 78 85 primary: ColorToRGB(localPubTheme.primary), 79 86 accentBackground: ColorToRGB(localPubTheme.accent1), 80 87 accentText: ColorToRGB(localPubTheme.accent2), 81 88 }, 82 89 }); 90 90 + 91 91 + if (!result.success) { 92 92 + props.setLoading(false); 93 93 + if (result.error && isOAuthSessionError(result.error)) { 94 94 + toaster({ 95 95 + content: <OAuthErrorMessage error={result.error} />, 96 96 + type: "error", 97 97 + }); 98 98 + } else { 99 99 + toaster({ 100 100 + content: "Failed to update theme", 101 101 + type: "error", 102 102 + }); 103 103 + } 104 104 + return; 105 105 + } 106 106 + 83 107 mutate((pub) => { 84 84 - if (result?.publication && pub?.publication) 108 108 + if (result.publication && pub?.publication) 85 109 return { 86 110 ...pub, 87 111 publication: { ...pub.publication, ...result.publication }, ··· 96 120 setLoadingAction={props.setLoading} 97 121 backToMenuAction={props.backToMenu} 98 122 state={"theme"} 99 99 - /> 123 123 + > 124 124 + Theme and Layout 125 125 + </PubSettingsHeader> 100 126 </form> 101 127 102 102 - <div className="themeSetterContent flex flex-col w-full overflow-y-scroll -mb-2 "> 103 103 - <div className="themeBGLeaflet flex"> 128 128 + <div className="themeSetterContent flex flex-col w-full overflow-y-scroll -mb-2 mt-2 "> 129 129 + <PubPageWidthSetter 130 130 + pageWidth={pageWidth} 131 131 + setPageWidth={setPageWidth} 132 132 + thisPicker="page-width" 133 133 + openPicker={openPicker} 134 134 + setOpenPicker={setOpenPicker} 135 135 + /> 136 136 + <div className="themeBGLeaflet flex flex-col"> 104 137 <div 105 105 - className={`bgPicker flex flex-col gap-0 -mb-[6px] z-10 w-full `} 138 138 + className={`themeBgPicker flex flex-col gap-0 -mb-[6px] z-10 w-full `} 106 139 > 107 140 <div className="bgPickerBody w-full flex flex-col gap-2 p-2 mt-1 border border-[#CCCCCC] rounded-md text-[#595959] bg-white"> 108 141 <BackgroundPicker

+23 -12

components/ThemeManager/PublicationThemeProvider.tsx

··· 2 2 import { useMemo, useState } from "react"; 3 3 import { parseColor } from "react-aria-components"; 4 4 import { useEntity } from "src/replicache"; 5 5 - import { getColorContrast } from "./ThemeProvider"; 5 5 + import { getColorDifference } from "./themeUtils"; 6 6 import { useColorAttribute, colorToString } from "./useColorAttribute"; 7 7 - import { BaseThemeProvider } from "./ThemeProvider"; 7 7 + import { BaseThemeProvider, CardBorderHiddenContext } from "./ThemeProvider"; 8 8 import { PubLeafletPublication, PubLeafletThemeColor } from "lexicons/api"; 9 9 import { usePublicationData } from "app/lish/[did]/[publication]/dashboard/PublicationSWRProvider"; 10 10 import { blobRefToSrc } from "src/utils/blobRefToSrc"; ··· 102 102 pub_creator: string; 103 103 isStandalone?: boolean; 104 104 }) { 105 105 - let colors = usePubTheme(props.theme, props.isStandalone); 105 105 + let theme = usePubTheme(props.theme, props.isStandalone); 106 106 + let cardBorderHidden = !theme.showPageBackground; 107 107 + let hasBackgroundImage = !!props.theme?.backgroundImage?.image?.ref; 108 108 + 106 109 return ( 107 107 - <BaseThemeProvider local={props.local} {...colors}> 108 108 - {props.children} 109 109 - </BaseThemeProvider> 110 110 + <CardBorderHiddenContext.Provider value={cardBorderHidden}> 111 111 + <BaseThemeProvider 112 112 + local={props.local} 113 113 + {...theme} 114 114 + hasBackgroundImage={hasBackgroundImage} 115 115 + > 116 116 + {props.children} 117 117 + </BaseThemeProvider> 118 118 + </CardBorderHiddenContext.Provider> 110 119 ); 111 120 } 112 121 ··· 124 133 bgPage = bgLeaflet; 125 134 } 126 135 let showPageBackground = theme?.showPageBackground; 136 136 + let pageWidth = theme?.pageWidth; 127 137 128 138 let primary = useColor(theme, "primary"); 129 139 ··· 144 154 highlight2, 145 155 highlight3, 146 156 showPageBackground, 157 157 + pageWidth, 147 158 }; 148 159 }; 149 160 ··· 163 174 let newAccentContrast; 164 175 let sortedAccents = [newTheme.accent1, newTheme.accent2].sort((a, b) => { 165 176 return ( 166 166 - getColorContrast( 177 177 + getColorDifference( 167 178 colorToString(b, "rgb"), 168 179 colorToString( 169 180 showPageBackground ? newTheme.bgPage : newTheme.bgLeaflet, 170 181 "rgb", 171 182 ), 172 183 ) - 173 173 - getColorContrast( 184 184 + getColorDifference( 174 185 colorToString(a, "rgb"), 175 186 colorToString( 176 187 showPageBackground ? newTheme.bgPage : newTheme.bgLeaflet, ··· 180 191 ); 181 192 }); 182 193 if ( 183 183 - getColorContrast( 194 194 + getColorDifference( 184 195 colorToString(sortedAccents[0], "rgb"), 185 196 colorToString(newTheme.primary, "rgb"), 186 186 - ) < 30 && 187 187 - getColorContrast( 197 197 + ) < 0.15 && 198 198 + getColorDifference( 188 199 colorToString(sortedAccents[1], "rgb"), 189 200 colorToString( 190 201 showPageBackground ? newTheme.bgPage : newTheme.bgLeaflet, 191 202 "rgb", 192 203 ), 193 193 - ) > 12 204 204 + ) > 0.08 194 205 ) { 195 206 newAccentContrast = sortedAccents[1]; 196 207 } else newAccentContrast = sortedAccents[0];

+60 -71

components/ThemeManager/ThemeProvider.tsx

··· 1 1 "use client"; 2 2 3 3 - import { 4 4 - createContext, 5 5 - CSSProperties, 6 6 - useContext, 7 7 - useEffect, 8 8 - useMemo, 9 9 - useState, 10 10 - } from "react"; 3 3 + import { createContext, CSSProperties, useContext, useEffect } from "react"; 4 4 + 5 5 + // Context for cardBorderHidden 6 6 + export const CardBorderHiddenContext = createContext<boolean>(false); 7 7 + 8 8 + export function useCardBorderHiddenContext() { 9 9 + return useContext(CardBorderHiddenContext); 10 10 + } 11 11 import { 12 12 colorToString, 13 13 useColorAttribute, 14 14 useColorAttributeNullable, 15 15 } from "./useColorAttribute"; 16 16 import { Color as AriaColor, parseColor } from "react-aria-components"; 17 17 - import { parse, contrastLstar, ColorSpace, sRGB } from "colorjs.io/fn"; 18 17 19 18 import { useEntity } from "src/replicache"; 20 19 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; ··· 23 22 PublicationThemeProvider, 24 23 } from "./PublicationThemeProvider"; 25 24 import { PubLeafletPublication } from "lexicons/api"; 26 26 - 27 27 - type CSSVariables = { 28 28 - "--bg-leaflet": string; 29 29 - "--bg-page": string; 30 30 - "--primary": string; 31 31 - "--accent-1": string; 32 32 - "--accent-2": string; 33 33 - "--accent-contrast": string; 34 34 - "--highlight-1": string; 35 35 - "--highlight-2": string; 36 36 - "--highlight-3": string; 37 37 - }; 38 38 - 39 39 - // define the color defaults for everything 40 40 - export const ThemeDefaults = { 41 41 - "theme/page-background": "#FDFCFA", 42 42 - "theme/card-background": "#FFFFFF", 43 43 - "theme/primary": "#272727", 44 44 - "theme/highlight-1": "#FFFFFF", 45 45 - "theme/highlight-2": "#EDD280", 46 46 - "theme/highlight-3": "#FFCDC3", 47 47 - 48 48 - //everywhere else, accent-background = accent-1 and accent-text = accent-2. 49 49 - // we just need to create a migration pipeline before we can change this 50 50 - "theme/accent-text": "#FFFFFF", 51 51 - "theme/accent-background": "#0000FF", 52 52 - "theme/accent-contrast": "#0000FF", 53 53 - }; 25 25 + import { getColorDifference } from "./themeUtils"; 54 26 55 27 // define a function to set an Aria Color to a CSS Variable in RGB 56 28 function setCSSVariableToColor( ··· 88 60 }) { 89 61 let bgLeaflet = useColorAttribute(props.entityID, "theme/page-background"); 90 62 let bgPage = useColorAttribute(props.entityID, "theme/card-background"); 91 91 - let showPageBackground = !useEntity( 63 63 + let cardBorderHiddenValue = useEntity( 92 64 props.entityID, 93 65 "theme/card-border-hidden", 94 66 )?.data.value; 67 67 + let showPageBackground = !cardBorderHiddenValue; 68 68 + let backgroundImage = useEntity(props.entityID, "theme/background-image"); 69 69 + let hasBackgroundImage = !!backgroundImage; 95 70 let primary = useColorAttribute(props.entityID, "theme/primary"); 96 71 97 72 let highlight1 = useEntity(props.entityID, "theme/highlight-1"); ··· 101 76 let accent1 = useColorAttribute(props.entityID, "theme/accent-background"); 102 77 let accent2 = useColorAttribute(props.entityID, "theme/accent-text"); 103 78 79 79 + let pageWidth = useEntity(props.entityID, "theme/page-width"); 80 80 + 104 81 return ( 105 105 - <BaseThemeProvider 106 106 - local={props.local} 107 107 - bgLeaflet={bgLeaflet} 108 108 - bgPage={bgPage} 109 109 - primary={primary} 110 110 - highlight2={highlight2} 111 111 - highlight3={highlight3} 112 112 - highlight1={highlight1?.data.value} 113 113 - accent1={accent1} 114 114 - accent2={accent2} 115 115 - showPageBackground={showPageBackground} 116 116 - > 117 117 - {props.children} 118 118 - </BaseThemeProvider> 82 82 + <CardBorderHiddenContext.Provider value={!!cardBorderHiddenValue}> 83 83 + <BaseThemeProvider 84 84 + local={props.local} 85 85 + bgLeaflet={bgLeaflet} 86 86 + bgPage={bgPage} 87 87 + primary={primary} 88 88 + highlight2={highlight2} 89 89 + highlight3={highlight3} 90 90 + highlight1={highlight1?.data.value} 91 91 + accent1={accent1} 92 92 + accent2={accent2} 93 93 + showPageBackground={showPageBackground} 94 94 + pageWidth={pageWidth?.data.value} 95 95 + hasBackgroundImage={hasBackgroundImage} 96 96 + > 97 97 + {props.children} 98 98 + </BaseThemeProvider> 99 99 + </CardBorderHiddenContext.Provider> 119 100 ); 120 101 } 121 102 ··· 123 104 export const BaseThemeProvider = ({ 124 105 local, 125 106 bgLeaflet, 126 126 - bgPage, 107 107 + bgPage: bgPageProp, 127 108 primary, 128 109 accent1, 129 110 accent2, ··· 131 112 highlight2, 132 113 highlight3, 133 114 showPageBackground, 115 115 + pageWidth, 116 116 + hasBackgroundImage, 134 117 children, 135 118 }: { 136 119 local?: boolean; 137 120 showPageBackground?: boolean; 121 121 + hasBackgroundImage?: boolean; 138 122 bgLeaflet: AriaColor; 139 123 bgPage: AriaColor; 140 124 primary: AriaColor; ··· 143 127 highlight1?: string; 144 128 highlight2: AriaColor; 145 129 highlight3: AriaColor; 130 130 + pageWidth?: number; 146 131 children: React.ReactNode; 147 132 }) => { 133 133 + // When showPageBackground is false and there's no background image, 134 134 + // pageBg should inherit from leafletBg 135 135 + const bgPage = 136 136 + !showPageBackground && !hasBackgroundImage ? bgLeaflet : bgPageProp; 148 137 // set accent contrast to the accent color that has the highest contrast with the page background 149 138 let accentContrast; 150 139 151 140 //sorting the accents by contrast on background 152 141 let sortedAccents = [accent1, accent2].sort((a, b) => { 153 142 return ( 154 154 - getColorContrast( 143 143 + getColorDifference( 155 144 colorToString(b, "rgb"), 156 145 colorToString(showPageBackground ? bgPage : bgLeaflet, "rgb"), 157 146 ) - 158 158 - getColorContrast( 147 147 + getColorDifference( 159 148 colorToString(a, "rgb"), 160 149 colorToString(showPageBackground ? bgPage : bgLeaflet, "rgb"), 161 150 ) ··· 167 156 // then use the not contrasty option 168 157 169 158 if ( 170 170 - getColorContrast( 159 159 + getColorDifference( 171 160 colorToString(sortedAccents[0], "rgb"), 172 161 colorToString(primary, "rgb"), 173 173 - ) < 30 && 174 174 - getColorContrast( 162 162 + ) < 0.15 && 163 163 + getColorDifference( 175 164 colorToString(sortedAccents[1], "rgb"), 176 165 colorToString(showPageBackground ? bgPage : bgLeaflet, "rgb"), 177 177 - ) > 12 166 166 + ) > 0.08 178 167 ) { 179 168 accentContrast = sortedAccents[1]; 180 169 } else accentContrast = sortedAccents[0]; ··· 221 210 "--accent-1-is-contrast", 222 211 accentContrast === accent1 ? "1" : "0", 223 212 ); 213 213 + 214 214 + // Set page width CSS variable 215 215 + el?.style.setProperty( 216 216 + "--page-width-setting", 217 217 + (pageWidth || 624).toString(), 218 218 + ); 224 219 }, [ 225 220 local, 226 221 bgLeaflet, ··· 232 227 accent1, 233 228 accent2, 234 229 accentContrast, 230 230 + pageWidth, 235 231 ]); 236 232 return ( 237 233 <div ··· 251 247 : "color-mix(in oklab, rgb(var(--accent-contrast)), rgb(var(--bg-page)) 75%)", 252 248 "--highlight-2": colorToString(highlight2, "rgb"), 253 249 "--highlight-3": colorToString(highlight3, "rgb"), 250 250 + "--page-width-setting": pageWidth || 624, 251 251 + "--page-width-unitless": pageWidth || 624, 252 252 + "--page-width-units": `min(${pageWidth || 624}px, calc(100vw - 12px))`, 254 253 } as CSSProperties 255 254 } 256 255 > ··· 287 286 bgPage && accent1 && accent2 288 287 ? [accent1, accent2].sort((a, b) => { 289 288 return ( 290 290 - getColorContrast( 289 289 + getColorDifference( 291 290 colorToString(b, "rgb"), 292 291 colorToString(bgPage, "rgb"), 293 292 ) - 294 294 - getColorContrast( 293 293 + getColorDifference( 295 294 colorToString(a, "rgb"), 296 295 colorToString(bgPage, "rgb"), 297 296 ) ··· 367 366 </div> 368 367 ); 369 368 }; 370 370 - 371 371 - // used to calculate the contrast between page and accent1, accent2, and determin which is higher contrast 372 372 - export function getColorContrast(color1: string, color2: string) { 373 373 - ColorSpace.register(sRGB); 374 374 - 375 375 - let parsedColor1 = parse(`rgb(${color1})`); 376 376 - let parsedColor2 = parse(`rgb(${color2})`); 377 377 - 378 378 - return contrastLstar(parsedColor1, parsedColor2); 379 379 - }

+21 -35

components/ThemeManager/ThemeSetter.tsx

··· 1 1 "use client"; 2 2 import { Popover } from "components/Popover"; 3 3 - import { theme } from "../../tailwind.config"; 4 3 5 4 import { Color } from "react-aria-components"; 6 5 7 7 - import { LeafletBGPicker } from "./Pickers/LeafletBGPicker"; 8 6 import { 9 9 - PageBackgroundPicker, 10 10 - PageBorderHider, 7 7 + LeafletBackgroundPicker, 11 8 PageThemePickers, 12 9 } from "./Pickers/PageThemePickers"; 10 10 + import { PageWidthSetter } from "./Pickers/PageWidthSetter"; 13 11 import { useMemo, useState } from "react"; 14 12 import { ReplicacheMutators, useEntity, useReplicache } from "src/replicache"; 15 13 import { Replicache } from "replicache"; ··· 35 33 | "highlight-1" 36 34 | "highlight-2" 37 35 | "highlight-3" 38 38 - | "page-background-image"; 36 36 + | "page-background-image" 37 37 + | "page-width"; 39 38 40 39 export function setColorAttribute( 41 40 rep: Replicache<ReplicacheMutators> | null, ··· 75 74 return ( 76 75 <> 77 76 <Popover 78 78 - className="w-80 bg-white" 77 77 + className="w-80 bg-white py-3!" 79 78 arrowFill="#FFFFFF" 80 79 asChild 81 80 side={isMobile ? "top" : "right"} ··· 114 113 if (pub?.publications) return null; 115 114 return ( 116 115 <div className="themeSetterContent flex flex-col w-full overflow-y-scroll no-scrollbar"> 116 116 + {!props.home && ( 117 117 + <PageWidthSetter 118 118 + entityID={props.entityID} 119 119 + thisPicker={"page-width"} 120 120 + openPicker={openPicker} 121 121 + setOpenPicker={setOpenPicker} 122 122 + closePicker={() => setOpenPicker("null")} 123 123 + /> 124 124 + )} 117 125 <div className="themeBGLeaflet flex"> 118 126 <div className={`bgPicker flex flex-col gap-0 -mb-[6px] z-10 w-full `}> 119 127 <div className="bgPickerBody w-full flex flex-col gap-2 p-2 mt-1 border border-[#CCCCCC] rounded-md"> 120 120 - <LeafletBGPicker 121 121 - entityID={props.entityID} 122 122 - thisPicker={"leaflet"} 123 123 - openPicker={openPicker} 124 124 - setOpenPicker={setOpenPicker} 125 125 - closePicker={() => setOpenPicker("null")} 126 126 - setValue={set("theme/page-background")} 127 127 - /> 128 128 - <PageBackgroundPicker 129 129 - entityID={props.entityID} 130 130 - setValue={set("theme/card-background")} 131 131 - openPicker={openPicker} 132 132 - setOpenPicker={setOpenPicker} 133 133 - home={props.home} 134 134 - /> 135 135 - <hr className=" border-[#CCCCCC]" /> 136 136 - <PageBorderHider 128 128 + <LeafletBackgroundPicker 137 129 entityID={props.entityID} 138 130 openPicker={openPicker} 139 131 setOpenPicker={setOpenPicker} ··· 173 165 setOpenPicker={(pickers) => setOpenPicker(pickers)} 174 166 /> 175 167 <SectionArrow 176 176 - fill={theme.colors["accent-2"]} 177 177 - stroke={theme.colors["accent-1"]} 168 168 + fill="rgb(var(--accent-2))" 169 169 + stroke="rgb(var(--accent-1))" 178 170 className="ml-2" 179 171 /> 180 172 </div> ··· 209 201 return ( 210 202 <div className="flex gap-2 items-start mt-0.5"> 211 203 <Toggle 212 212 - toggleOn={!!checked?.data.value} 213 213 - setToggleOn={() => { 204 204 + toggle={!!checked?.data.value} 205 205 + onToggle={() => { 214 206 handleToggle(); 215 207 }} 216 208 disabledColor1="#8C8C8C" 217 209 disabledColor2="#DBDBDB" 218 218 - /> 219 219 - <button 220 220 - className="flex gap-2 items-center -mt-0.5" 221 221 - onClick={() => { 222 222 - handleToggle(); 223 223 - }} 224 210 > 225 225 - <div className="flex flex-col gap-0 items-start"> 211 211 + <div className="flex flex-col gap-0 items-start "> 226 212 <div className="font-bold">Show Leaflet Watermark</div> 227 213 <div className="text-sm text-[#969696]">Help us spread the word!</div> 228 214 </div> 229 229 - </button> 215 215 + </Toggle> 230 216 </div> 231 217 ); 232 218 }

+28

components/ThemeManager/themeUtils.ts

··· 1 1 + import { parse, ColorSpace, sRGB, distance, OKLab } from "colorjs.io/fn"; 2 2 + 3 3 + // define the color defaults for everything 4 4 + export const ThemeDefaults = { 5 5 + "theme/page-background": "#FDFCFA", 6 6 + "theme/card-background": "#FFFFFF", 7 7 + "theme/primary": "#272727", 8 8 + "theme/highlight-1": "#FFFFFF", 9 9 + "theme/highlight-2": "#EDD280", 10 10 + "theme/highlight-3": "#FFCDC3", 11 11 + 12 12 + //everywhere else, accent-background = accent-1 and accent-text = accent-2. 13 13 + // we just need to create a migration pipeline before we can change this 14 14 + "theme/accent-text": "#FFFFFF", 15 15 + "theme/accent-background": "#0000FF", 16 16 + "theme/accent-contrast": "#0000FF", 17 17 + }; 18 18 + 19 19 + // used to calculate the contrast between page and accent1, accent2, and determin which is higher contrast 20 20 + export function getColorDifference(color1: string, color2: string) { 21 21 + ColorSpace.register(sRGB); 22 22 + ColorSpace.register(OKLab); 23 23 + 24 24 + let parsedColor1 = parse(`rgb(${color1})`); 25 25 + let parsedColor2 = parse(`rgb(${color2})`); 26 26 + 27 27 + return distance(parsedColor1, parsedColor2, "oklab"); 28 28 + }

+1 -1

components/ThemeManager/useColorAttribute.ts

··· 2 2 import { Color, parseColor } from "react-aria-components"; 3 3 import { useEntity, useReplicache } from "src/replicache"; 4 4 import { FilterAttributes } from "src/replicache/attributes"; 5 5 - import { ThemeDefaults } from "./ThemeProvider"; 5 5 + import { ThemeDefaults } from "./themeUtils"; 6 6 7 7 export function useColorAttribute( 8 8 entity: string | null,

+32 -20

components/Toggle.tsx

··· 1 1 import { theme } from "tailwind.config"; 2 2 3 3 export const Toggle = (props: { 4 4 - toggleOn: boolean; 5 5 - setToggleOn: (s: boolean) => void; 4 4 + toggle: boolean; 5 5 + onToggle: () => void; 6 6 disabledColor1?: string; 7 7 disabledColor2?: string; 8 8 + children: React.ReactNode; 8 9 }) => { 9 10 return ( 10 11 <button 11 11 - className="toggle selected-outline transparent-outline flex items-center h-[20px] w-6 rounded-md border-border" 12 12 - style={{ 13 13 - border: props.toggleOn 14 14 - ? "1px solid " + theme.colors["accent-2"] 15 15 - : "1px solid " + props.disabledColor2 || theme.colors["border-light"], 16 16 - justifyContent: props.toggleOn ? "flex-end" : "flex-start", 17 17 - background: props.toggleOn 18 18 - ? theme.colors["accent-1"] 19 19 - : props.disabledColor1 || theme.colors["tertiary"], 12 12 + type="button" 13 13 + className="toggle flex gap-2 items-start justify-start text-left" 14 14 + onClick={() => { 15 15 + props.onToggle(); 20 16 }} 21 21 - onClick={() => props.setToggleOn(!props.toggleOn)} 22 17 > 23 23 - <div 24 24 - className="h-[14px] w-[10px] m-0.5 rounded-[2px]" 25 25 - style={{ 26 26 - background: props.toggleOn 27 27 - ? theme.colors["accent-2"] 28 28 - : props.disabledColor2 || theme.colors["border-light"], 29 29 - }} 30 30 - /> 18 18 + <div className="h-6 flex place-items-center"> 19 19 + <div 20 20 + className="selected-outline transparent-outline flex items-center h-[20px] w-6 rounded-md border-border" 21 21 + style={{ 22 22 + border: props.toggle 23 23 + ? "1px solid " + theme.colors["accent-2"] 24 24 + : "1px solid " + props.disabledColor2 || 25 25 + theme.colors["border-light"], 26 26 + justifyContent: props.toggle ? "flex-end" : "flex-start", 27 27 + background: props.toggle 28 28 + ? theme.colors["accent-1"] 29 29 + : props.disabledColor1 || theme.colors["tertiary"], 30 30 + }} 31 31 + > 32 32 + <div 33 33 + className="h-[14px] w-[10px] m-0.5 rounded-[2px]" 34 34 + style={{ 35 35 + background: props.toggle 36 36 + ? theme.colors["accent-2"] 37 37 + : props.disabledColor2 || theme.colors["border-light"], 38 38 + }} 39 39 + /> 40 40 + </div> 41 41 + </div> 42 42 + {props.children} 31 43 </button> 32 44 ); 33 45 };

+15 -19

components/Toolbar/BlockToolbar.tsx

··· 2 2 import { ToolbarButton } from "."; 3 3 import { Separator, ShortcutKey } from "components/Layout"; 4 4 import { metaKey } from "src/utils/metaKey"; 5 5 - import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 6 5 import { useUIState } from "src/useUIState"; 7 6 import { LockBlockButton } from "./LockBlockButton"; 8 7 import { TextAlignmentButton } from "./TextAlignmentToolbar"; 9 9 - import { ImageFullBleedButton, ImageAltTextButton } from "./ImageToolbar"; 8 8 + import { 9 9 + ImageFullBleedButton, 10 10 + ImageAltTextButton, 11 11 + ImageCoverButton, 12 12 + } from "./ImageToolbar"; 10 13 import { DeleteSmall } from "components/Icons/DeleteSmall"; 14 14 + import { getSortedSelection } from "components/SelectionManager/selectionState"; 11 15 12 16 export const BlockToolbar = (props: { 13 17 setToolbarState: ( ··· 37 41 > 38 42 <DeleteSmall /> 39 43 </ToolbarButton> 40 40 - <Separator classname="h-6" /> 44 44 + <Separator classname="h-6!" /> 41 45 <MoveBlockButtons /> 42 46 {blockType === "image" && ( 43 47 <> 44 48 <TextAlignmentButton setToolbarState={props.setToolbarState} /> 45 49 <ImageFullBleedButton /> 46 50 <ImageAltTextButton setToolbarState={props.setToolbarState} /> 51 51 + <ImageCoverButton /> 47 52 {focusedEntityType?.data.value !== "canvas" && ( 48 48 - <Separator classname="h-6" /> 53 53 + <Separator classname="h-6!" /> 49 54 )} 50 55 </> 51 56 )} ··· 53 58 <> 54 59 <TextAlignmentButton setToolbarState={props.setToolbarState} /> 55 60 {focusedEntityType?.data.value !== "canvas" && ( 56 56 - <Separator classname="h-6" /> 61 61 + <Separator classname="h-6!" /> 57 62 )} 58 63 </> 59 64 )} ··· 66 71 67 72 const MoveBlockButtons = () => { 68 73 let { rep } = useReplicache(); 69 69 - const getSortedSelection = async () => { 70 70 - let selectedBlocks = useUIState.getState().selectedBlocks; 71 71 - let siblings = 72 72 - (await rep?.query((tx) => 73 73 - getBlocksWithType(tx, selectedBlocks[0].parent), 74 74 - )) || []; 75 75 - let sortedBlocks = siblings.filter((s) => 76 76 - selectedBlocks.find((sb) => sb.value === s.value), 77 77 - ); 78 78 - return [sortedBlocks, siblings]; 79 79 - }; 80 74 return ( 81 75 <> 82 76 <ToolbarButton 83 77 hiddenOnCanvas 84 78 onClick={async () => { 85 85 - let [sortedBlocks, siblings] = await getSortedSelection(); 79 79 + if (!rep) return; 80 80 + let [sortedBlocks, siblings] = await getSortedSelection(rep); 86 81 if (sortedBlocks.length > 1) return; 87 82 let block = sortedBlocks[0]; 88 83 let previousBlock = ··· 139 134 <ToolbarButton 140 135 hiddenOnCanvas 141 136 onClick={async () => { 142 142 - let [sortedBlocks, siblings] = await getSortedSelection(); 137 137 + if (!rep) return; 138 138 + let [sortedBlocks, siblings] = await getSortedSelection(rep); 143 139 if (sortedBlocks.length > 1) return; 144 140 let block = sortedBlocks[0]; 145 141 let nextBlock = siblings ··· 183 179 > 184 180 <MoveBlockDown /> 185 181 </ToolbarButton> 186 186 - <Separator classname="h-6" /> 182 182 + <Separator classname="h-6!" /> 187 183 </> 188 184 ); 189 185 };

+1 -1

components/Toolbar/HighlightToolbar.tsx

··· 126 126 setLastUsedHightlight={props.setLastUsedHighlight} 127 127 /> 128 128 129 129 - <Separator classname="h-6" /> 129 129 + <Separator classname="h-6!" /> 130 130 <HighlightColorSettings pageID={props.pageID} /> 131 131 </div> 132 132 </div>

+37

components/Toolbar/ImageToolbar.tsx

··· 4 4 import { useUIState } from "src/useUIState"; 5 5 import { Props } from "components/Icons/Props"; 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"; 7 10 8 11 export const ImageFullBleedButton = (props: {}) => { 9 12 let { rep } = useReplicache(); ··· 76 79 ) : ( 77 80 <ImageRemoveAltSmall /> 78 81 )} 82 82 + </ToolbarButton> 83 83 + ); 84 84 + }; 85 85 + 86 86 + export const ImageCoverButton = () => { 87 87 + let { rep } = useReplicache(); 88 88 + let focusedBlock = useUIState((s) => s.focusedEntity)?.entityID || null; 89 89 + let hasSrc = useEntity(focusedBlock, "block/image")?.data; 90 90 + let { data: pubData } = useLeafletPublicationData(); 91 91 + let coverImage = useSubscribe(rep, (tx) => 92 92 + tx.get<string | null>("publication_cover_image"), 93 93 + ); 94 94 + 95 95 + // Only show if in a publication and has an image 96 96 + if (!pubData?.publications || !hasSrc) return null; 97 97 + 98 98 + let isCoverImage = coverImage === focusedBlock; 99 99 + 100 100 + return ( 101 101 + <ToolbarButton 102 102 + active={isCoverImage} 103 103 + onClick={async (e) => { 104 104 + e.preventDefault(); 105 105 + if (rep && focusedBlock) { 106 106 + await rep.mutate.updatePublicationDraft({ 107 107 + cover_image: isCoverImage ? null : focusedBlock, 108 108 + }); 109 109 + } 110 110 + }} 111 111 + tooltipContent={ 112 112 + <div>{isCoverImage ? "Remove Cover Image" : "Set as Cover Image"}</div> 113 113 + } 114 114 + > 115 115 + <ImageCoverImage /> 79 116 </ToolbarButton> 80 117 ); 81 118 };

+1 -1

components/Toolbar/InlineLinkToolbar.tsx

··· 132 132 return ( 133 133 <div className="w-full flex items-center gap-[6px] grow"> 134 134 <LinkSmall /> 135 135 - <Separator classname="h-6" /> 135 135 + <Separator classname="h-6!" /> 136 136 <Input 137 137 autoFocus 138 138 className="w-full grow bg-transparent border-none outline-hidden "

+2 -2

components/Toolbar/ListToolbar.tsx

··· 131 131 > 132 132 <ListIndentIncreaseSmall /> 133 133 </ToolbarButton> 134 134 - <Separator classname="h-6" /> 134 134 + <Separator classname="h-6!" /> 135 135 <ToolbarButton 136 136 disabled={!isList?.data.value} 137 137 tooltipContent=<div className="flex flex-col gap-1 justify-center"> 138 138 <div className="text-center">Add a Checkbox</div> 139 139 <div className="flex gap-1 font-normal"> 140 140 - start line with <ShortcutKey>[</ShortcutKey> 140 140 + <ShortcutKey>[</ShortcutKey> 141 141 <ShortcutKey>]</ShortcutKey> 142 142 </div> 143 143 </div>

+1 -1

components/Toolbar/MultiSelectToolbar.tsx

··· 8 8 import { LockBlockButton } from "./LockBlockButton"; 9 9 import { Props } from "components/Icons/Props"; 10 10 import { TextAlignmentButton } from "./TextAlignmentToolbar"; 11 11 - import { getSortedSelection } from "components/SelectionManager"; 11 11 + import { getSortedSelection } from "components/SelectionManager/selectionState"; 12 12 13 13 export const MultiselectToolbar = (props: { 14 14 setToolbarState: (

+154 -95

components/Toolbar/TextBlockTypeToolbar.tsx

··· 4 4 Header3Small, 5 5 } from "components/Icons/BlockTextSmall"; 6 6 import { Props } from "components/Icons/Props"; 7 7 - import { ShortcutKey } from "components/Layout"; 7 7 + import { ShortcutKey, Separator } from "components/Layout"; 8 8 import { ToolbarButton } from "components/Toolbar"; 9 9 import { TextSelection } from "prosemirror-state"; 10 10 import { useCallback } from "react"; ··· 22 22 focusedBlock?.entityID || null, 23 23 "block/heading-level", 24 24 ); 25 25 + 26 26 + let textSize = useEntity(focusedBlock?.entityID || null, "block/text-size"); 25 27 let { rep } = useReplicache(); 26 28 27 29 let setLevel = useCallback( ··· 51 53 ); 52 54 return ( 53 55 // This Toolbar should close once the user starts typing again 54 54 - <div className="flex w-full justify-between items-center gap-4"> 55 55 - <div className="flex items-center gap-[6px]"> 56 56 - <ToolbarButton 57 57 - className={props.className} 58 58 - onClick={() => { 59 59 - setLevel(1); 60 60 - }} 61 61 - active={ 62 62 - blockType?.data.value === "heading" && 63 63 - headingLevel?.data.value === 1 64 64 - } 65 65 - tooltipContent={ 66 66 - <div className="flex flex-col justify-center"> 67 67 - <div className="font-bold text-center">Title</div> 68 68 - <div className="flex gap-1 font-normal"> 69 69 - start line with 70 70 - <ShortcutKey>#</ShortcutKey> 71 71 - </div> 56 56 + <> 57 57 + <ToolbarButton 58 58 + className={props.className} 59 59 + onClick={() => { 60 60 + setLevel(1); 61 61 + }} 62 62 + active={ 63 63 + blockType?.data.value === "heading" && headingLevel?.data.value === 1 64 64 + } 65 65 + tooltipContent={ 66 66 + <div className="flex flex-col justify-center"> 67 67 + <div className="font-bold text-center">Title</div> 68 68 + <div className="flex gap-1 font-normal"> 69 69 + start line with 70 70 + <ShortcutKey>#</ShortcutKey> 71 71 + </div> 72 72 + </div> 73 73 + } 74 74 + > 75 75 + <Header1Small /> 76 76 + </ToolbarButton> 77 77 + <ToolbarButton 78 78 + className={props.className} 79 79 + onClick={() => { 80 80 + setLevel(2); 81 81 + }} 82 82 + active={ 83 83 + blockType?.data.value === "heading" && headingLevel?.data.value === 2 84 84 + } 85 85 + tooltipContent={ 86 86 + <div className="flex flex-col justify-center"> 87 87 + <div className="font-bold text-center">Heading</div> 88 88 + <div className="flex gap-1 font-normal"> 89 89 + start line with 90 90 + <ShortcutKey>##</ShortcutKey> 72 91 </div> 73 73 - } 74 74 - > 75 75 - <Header1Small /> 76 76 - </ToolbarButton> 77 77 - <ToolbarButton 78 78 - className={props.className} 79 79 - onClick={() => { 80 80 - setLevel(2); 81 81 - }} 82 82 - active={ 83 83 - blockType?.data.value === "heading" && 84 84 - headingLevel?.data.value === 2 85 85 - } 86 86 - tooltipContent={ 87 87 - <div className="flex flex-col justify-center"> 88 88 - <div className="font-bold text-center">Heading</div> 89 89 - <div className="flex gap-1 font-normal"> 90 90 - start line with 91 91 - <ShortcutKey>##</ShortcutKey> 92 92 - </div> 92 92 + </div> 93 93 + } 94 94 + > 95 95 + <Header2Small /> 96 96 + </ToolbarButton> 97 97 + <ToolbarButton 98 98 + className={props.className} 99 99 + onClick={() => { 100 100 + setLevel(3); 101 101 + }} 102 102 + active={ 103 103 + blockType?.data.value === "heading" && headingLevel?.data.value === 3 104 104 + } 105 105 + tooltipContent={ 106 106 + <div className="flex flex-col justify-center"> 107 107 + <div className="font-bold text-center">Subheading</div> 108 108 + <div className="flex gap-1 font-normal"> 109 109 + start line with 110 110 + <ShortcutKey>###</ShortcutKey> 93 111 </div> 112 112 + </div> 113 113 + } 114 114 + > 115 115 + <Header3Small /> 116 116 + </ToolbarButton> 117 117 + <Separator classname="h-6!" /> 118 118 + <ToolbarButton 119 119 + className={`px-[6px] ${props.className}`} 120 120 + onClick={async () => { 121 121 + if (headingLevel) 122 122 + await rep?.mutate.retractFact({ factID: headingLevel.id }); 123 123 + if (textSize) await rep?.mutate.retractFact({ factID: textSize.id }); 124 124 + if (!focusedBlock || !blockType) return; 125 125 + if (blockType.data.value !== "text") { 126 126 + let existingEditor = 127 127 + useEditorStates.getState().editorStates[focusedBlock.entityID]; 128 128 + let selection = existingEditor?.editor.selection; 129 129 + await rep?.mutate.assertFact({ 130 130 + entity: focusedBlock?.entityID, 131 131 + attribute: "block/type", 132 132 + data: { type: "block-type-union", value: "text" }, 133 133 + }); 134 134 + 135 135 + let newEditor = 136 136 + useEditorStates.getState().editorStates[focusedBlock.entityID]; 137 137 + if (!newEditor || !selection) return; 138 138 + newEditor.view?.dispatch( 139 139 + newEditor.editor.tr.setSelection( 140 140 + TextSelection.create(newEditor.editor.doc, selection.anchor), 141 141 + ), 142 142 + ); 143 143 + 144 144 + newEditor.view?.focus(); 94 145 } 95 95 - > 96 96 - <Header2Small /> 97 97 - </ToolbarButton> 98 98 - <ToolbarButton 99 99 - className={props.className} 100 100 - onClick={() => { 101 101 - setLevel(3); 102 102 - }} 103 103 - active={ 104 104 - blockType?.data.value === "heading" && 105 105 - headingLevel?.data.value === 3 106 106 - } 107 107 - tooltipContent={ 108 108 - <div className="flex flex-col justify-center"> 109 109 - <div className="font-bold text-center">Subheading</div> 110 110 - <div className="flex gap-1 font-normal"> 111 111 - start line with 112 112 - <ShortcutKey>###</ShortcutKey> 113 113 - </div> 114 114 - </div> 146 146 + }} 147 147 + active={ 148 148 + blockType?.data.value === "text" && 149 149 + textSize?.data.value !== "small" && 150 150 + textSize?.data.value !== "large" 151 151 + } 152 152 + tooltipContent={<div>Normal Text</div>} 153 153 + > 154 154 + Text 155 155 + </ToolbarButton> 156 156 + <ToolbarButton 157 157 + className={`px-[6px] text-lg ${props.className}`} 158 158 + onClick={async () => { 159 159 + if (!focusedBlock || !blockType) return; 160 160 + if (blockType.data.value !== "text") { 161 161 + // Convert to text block first if it's a heading 162 162 + if (headingLevel) 163 163 + await rep?.mutate.retractFact({ factID: headingLevel.id }); 164 164 + await rep?.mutate.assertFact({ 165 165 + entity: focusedBlock.entityID, 166 166 + attribute: "block/type", 167 167 + data: { type: "block-type-union", value: "text" }, 168 168 + }); 115 169 } 116 116 - > 117 117 - <Header3Small /> 118 118 - </ToolbarButton> 119 119 - <ToolbarButton 120 120 - className={`px-[6px] ${props.className}`} 121 121 - onClick={async () => { 170 170 + // Set text size to large 171 171 + await rep?.mutate.assertFact({ 172 172 + entity: focusedBlock.entityID, 173 173 + attribute: "block/text-size", 174 174 + data: { type: "text-size-union", value: "large" }, 175 175 + }); 176 176 + }} 177 177 + active={ 178 178 + blockType?.data.value === "text" && textSize?.data.value === "large" 179 179 + } 180 180 + tooltipContent={<div>Large Text</div>} 181 181 + > 182 182 + <div className="leading-[1.625rem]">Large</div> 183 183 + </ToolbarButton> 184 184 + <ToolbarButton 185 185 + className={`px-[6px] text-sm text-secondary ${props.className}`} 186 186 + onClick={async () => { 187 187 + if (!focusedBlock || !blockType) return; 188 188 + if (blockType.data.value !== "text") { 189 189 + // Convert to text block first if it's a heading 122 190 if (headingLevel) 123 191 await rep?.mutate.retractFact({ factID: headingLevel.id }); 124 124 - if (!focusedBlock || !blockType) return; 125 125 - if (blockType.data.value !== "text") { 126 126 - let existingEditor = 127 127 - useEditorStates.getState().editorStates[focusedBlock.entityID]; 128 128 - let selection = existingEditor?.editor.selection; 129 129 - await rep?.mutate.assertFact({ 130 130 - entity: focusedBlock?.entityID, 131 131 - attribute: "block/type", 132 132 - data: { type: "block-type-union", value: "text" }, 133 133 - }); 134 134 - 135 135 - let newEditor = 136 136 - useEditorStates.getState().editorStates[focusedBlock.entityID]; 137 137 - if (!newEditor || !selection) return; 138 138 - newEditor.view?.dispatch( 139 139 - newEditor.editor.tr.setSelection( 140 140 - TextSelection.create(newEditor.editor.doc, selection.anchor), 141 141 - ), 142 142 - ); 143 143 - 144 144 - newEditor.view?.focus(); 145 145 - } 146 146 - }} 147 147 - active={blockType?.data.value === "text"} 148 148 - tooltipContent={<div>Paragraph</div>} 149 149 - > 150 150 - Paragraph 151 151 - </ToolbarButton> 152 152 - </div> 153 153 - </div> 192 192 + await rep?.mutate.assertFact({ 193 193 + entity: focusedBlock.entityID, 194 194 + attribute: "block/type", 195 195 + data: { type: "block-type-union", value: "text" }, 196 196 + }); 197 197 + } 198 198 + // Set text size to small 199 199 + await rep?.mutate.assertFact({ 200 200 + entity: focusedBlock.entityID, 201 201 + attribute: "block/text-size", 202 202 + data: { type: "text-size-union", value: "small" }, 203 203 + }); 204 204 + }} 205 205 + active={ 206 206 + blockType?.data.value === "text" && textSize?.data.value === "small" 207 207 + } 208 208 + tooltipContent={<div>Small Text</div>} 209 209 + > 210 210 + <div className="leading-[1.625rem]">Small</div> 211 211 + </ToolbarButton> 212 212 + </> 154 213 ); 155 214 }; 156 215

+3 -3

components/Toolbar/TextToolbar.tsx

··· 74 74 lastUsedHighlight={props.lastUsedHighlight} 75 75 setToolbarState={props.setToolbarState} 76 76 /> 77 77 - <Separator classname="h-6" /> 77 77 + <Separator classname="h-6!" /> 78 78 <LinkButton setToolbarState={props.setToolbarState} /> 79 79 - <Separator classname="h-6" /> 79 79 + <Separator classname="h-6!" /> 80 80 <TextBlockTypeButton setToolbarState={props.setToolbarState} /> 81 81 <TextAlignmentButton setToolbarState={props.setToolbarState} /> 82 82 <ListButton setToolbarState={props.setToolbarState} /> 83 83 - <Separator classname="h-6" /> 83 83 + <Separator classname="h-6!" /> 84 84 85 85 <LockBlockButton /> 86 86 </>

+2 -1

components/Toolbar/index.tsx

··· 13 13 import { TextToolbar } from "./TextToolbar"; 14 14 import { BlockToolbar } from "./BlockToolbar"; 15 15 import { MultiselectToolbar } from "./MultiSelectToolbar"; 16 16 - import { AreYouSure, deleteBlock } from "components/Blocks/DeleteBlock"; 16 16 + import { AreYouSure } from "components/Blocks/DeleteBlock"; 17 17 + import { deleteBlock } from "src/utils/deleteBlock"; 17 18 import { TooltipButton } from "components/Buttons"; 18 19 import { TextAlignmentToolbar } from "./TextAlignmentToolbar"; 19 20 import { useIsMobile } from "src/hooks/isMobile";

+1 -1

components/Tooltip.tsx

··· 26 26 props.skipDelayDuration ? props.skipDelayDuration : 300 27 27 } 28 28 > 29 29 - <RadixTooltip.Root> 29 29 + <RadixTooltip.Root onOpenChange={props.onOpenChange}> 30 30 <RadixTooltip.Trigger disabled={props.disabled} asChild={props.asChild}> 31 31 {props.trigger} 32 32 </RadixTooltip.Trigger>

+2 -2

components/utils/DotLoader.tsx

··· 1 1 import { useEffect, useState } from "react"; 2 2 3 3 - export function DotLoader() { 3 3 + export function DotLoader(props: { className?: string }) { 4 4 let [dots, setDots] = useState(1); 5 5 useEffect(() => { 6 6 let id = setInterval(() => { ··· 11 11 }; 12 12 }, []); 13 13 return ( 14 14 - <div className="w-[26px] h-[24px] text-center text-sm"> 14 14 + <div className={`w-[26px] h-[24px] text-center text-sm ${props.className}`}> 15 15 {".".repeat(dots) + "\u00a0".repeat(3 - dots)} 16 16 </div> 17 17 );

+1 -1

components/utils/UpdateLeafletTitle.tsx

··· 8 8 import { useEntity, useReplicache } from "src/replicache"; 9 9 import * as Y from "yjs"; 10 10 import * as base64 from "base64-js"; 11 11 - import { YJSFragmentToString } from "components/Blocks/TextBlock/RenderYJSFragment"; 11 11 + import { YJSFragmentToString } from "src/utils/yjsFragmentToString"; 12 12 import { useParams, useRouter, useSearchParams } from "next/navigation"; 13 13 import { focusBlock } from "src/utils/focusBlock"; 14 14 import { useIsMobile } from "src/hooks/isMobile";

+22

lexicons/api/lexicons.ts

··· 1246 1246 plaintext: { 1247 1247 type: 'string', 1248 1248 }, 1249 1249 + textSize: { 1250 1250 + type: 'string', 1251 1251 + enum: ['default', 'small', 'large'], 1252 1252 + }, 1249 1253 facets: { 1250 1254 type: 'array', 1251 1255 items: { ··· 1446 1450 type: 'string', 1447 1451 maxLength: 50, 1448 1452 }, 1453 1453 + }, 1454 1454 + coverImage: { 1455 1455 + type: 'blob', 1456 1456 + accept: ['image/png', 'image/jpeg', 'image/webp'], 1457 1457 + maxSize: 1000000, 1449 1458 }, 1450 1459 pages: { 1451 1460 type: 'array', ··· 1801 1810 type: 'boolean', 1802 1811 default: true, 1803 1812 }, 1813 1813 + showMentions: { 1814 1814 + type: 'boolean', 1815 1815 + default: true, 1816 1816 + }, 1817 1817 + showPrevNext: { 1818 1818 + type: 'boolean', 1819 1819 + default: false, 1820 1820 + }, 1804 1821 }, 1805 1822 }, 1806 1823 theme: { ··· 1816 1833 backgroundImage: { 1817 1834 type: 'ref', 1818 1835 ref: 'lex:pub.leaflet.theme.backgroundImage', 1836 1836 + }, 1837 1837 + pageWidth: { 1838 1838 + type: 'integer', 1839 1839 + minimum: 0, 1840 1840 + maximum: 1600, 1819 1841 }, 1820 1842 primary: { 1821 1843 type: 'union',

+1

lexicons/api/types/pub/leaflet/blocks/text.ts

··· 18 18 export interface Main { 19 19 $type?: 'pub.leaflet.blocks.text' 20 20 plaintext: string 21 21 + textSize?: 'default' | 'small' | 'large' 21 22 facets?: PubLeafletRichtextFacet.Main[] 22 23 } 23 24

+1

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

··· 24 24 author: string 25 25 theme?: PubLeafletPublication.Theme 26 26 tags?: string[] 27 27 + coverImage?: BlobRef 27 28 pages: ( 28 29 | $Typed<PubLeafletPagesLinearDocument.Main> 29 30 | $Typed<PubLeafletPagesCanvas.Main>

+3

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

··· 37 37 $type?: 'pub.leaflet.publication#preferences' 38 38 showInDiscover: boolean 39 39 showComments: boolean 40 40 + showMentions: boolean 41 41 + showPrevNext: boolean 40 42 } 41 43 42 44 const hashPreferences = 'preferences' ··· 56 58 | $Typed<PubLeafletThemeColor.Rgb> 57 59 | { $type: string } 58 60 backgroundImage?: PubLeafletThemeBackgroundImage.Main 61 61 + pageWidth?: number 59 62 primary?: 60 63 | $Typed<PubLeafletThemeColor.Rgba> 61 64 | $Typed<PubLeafletThemeColor.Rgb>

+2

lexicons/build.ts

··· 9 9 import * as path from "path"; 10 10 import { PubLeafletRichTextFacet } from "./src/facet"; 11 11 import { PubLeafletComment } from "./src/comment"; 12 12 + import { PubLeafletAuthFullPermissions } from "./src/authFullPermissions"; 12 13 13 14 const outdir = path.join("lexicons", "pub", "leaflet"); 14 15 ··· 21 22 PubLeafletDocument, 22 23 PubLeafletComment, 23 24 PubLeafletRichTextFacet, 25 25 + PubLeafletAuthFullPermissions, 24 26 PageLexicons.PubLeafletPagesLinearDocument, 25 27 PageLexicons.PubLeafletPagesCanvasDocument, 26 28 ...ThemeLexicons,

+44

lexicons/fix-extensions.ts

··· 1 1 + import * as fs from "fs"; 2 2 + import * as path from "path"; 3 3 + 4 4 + /** 5 5 + * Recursively processes all files in a directory and removes .js extensions from imports 6 6 + */ 7 7 + function fixExtensionsInDirectory(dir: string): void { 8 8 + const entries = fs.readdirSync(dir, { withFileTypes: true }); 9 9 + 10 10 + for (const entry of entries) { 11 11 + const fullPath = path.join(dir, entry.name); 12 12 + 13 13 + if (entry.isDirectory()) { 14 14 + fixExtensionsInDirectory(fullPath); 15 15 + } else if (entry.isFile() && (entry.name.endsWith(".ts") || entry.name.endsWith(".js"))) { 16 16 + fixExtensionsInFile(fullPath); 17 17 + } 18 18 + } 19 19 + } 20 20 + 21 21 + /** 22 22 + * Removes .js extensions from import/export statements in a file 23 23 + */ 24 24 + function fixExtensionsInFile(filePath: string): void { 25 25 + const content = fs.readFileSync(filePath, "utf-8"); 26 26 + const fixedContent = content.replace(/\.js'/g, "'"); 27 27 + 28 28 + if (content !== fixedContent) { 29 29 + fs.writeFileSync(filePath, fixedContent, "utf-8"); 30 30 + console.log(`Fixed: ${filePath}`); 31 31 + } 32 32 + } 33 33 + 34 34 + // Get the directory to process from command line arguments 35 35 + const targetDir = process.argv[2] || "./lexicons/api"; 36 36 + 37 37 + if (!fs.existsSync(targetDir)) { 38 38 + console.error(`Directory not found: ${targetDir}`); 39 39 + process.exit(1); 40 40 + } 41 41 + 42 42 + console.log(`Fixing extensions in: ${targetDir}`); 43 43 + fixExtensionsInDirectory(targetDir); 44 44 + console.log("Done!");

+30

lexicons/pub/leaflet/authFullPermissions.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "pub.leaflet.authFullPermissions", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "permission-set", 7 7 + "title": "Full Leaflet Permissions", 8 8 + "detail": "Manage creating and updating leaflet documents and publications and all interactions on them.", 9 9 + "permissions": [ 10 10 + { 11 11 + "type": "permission", 12 12 + "resource": "repo", 13 13 + "action": [ 14 14 + "create", 15 15 + "update", 16 16 + "delete" 17 17 + ], 18 18 + "collection": [ 19 19 + "pub.leaflet.document", 20 20 + "pub.leaflet.publication", 21 21 + "pub.leaflet.comment", 22 22 + "pub.leaflet.poll.definition", 23 23 + "pub.leaflet.poll.vote", 24 24 + "pub.leaflet.graph.subscription" 25 25 + ] 26 26 + } 27 27 + ] 28 28 + } 29 29 + } 30 30 + }

+8

lexicons/pub/leaflet/blocks/text.json

··· 11 11 "plaintext": { 12 12 "type": "string" 13 13 }, 14 14 + "textSize": { 15 15 + "type": "string", 16 16 + "enum": [ 17 17 + "default", 18 18 + "small", 19 19 + "large" 20 20 + ] 21 21 + }, 14 22 "facets": { 15 23 "type": "array", 16 24 "items": {

+9

lexicons/pub/leaflet/document.json

··· 53 53 "maxLength": 50 54 54 } 55 55 }, 56 56 + "coverImage": { 57 57 + "type": "blob", 58 58 + "accept": [ 59 59 + "image/png", 60 60 + "image/jpeg", 61 61 + "image/webp" 62 62 + ], 63 63 + "maxSize": 1000000 64 64 + }, 56 65 "pages": { 57 66 "type": "array", 58 67 "items": {

+13

lexicons/pub/leaflet/publication.json

··· 51 51 "showComments": { 52 52 "type": "boolean", 53 53 "default": true 54 54 + }, 55 55 + "showMentions": { 56 56 + "type": "boolean", 57 57 + "default": true 58 58 + }, 59 59 + "showPrevNext": { 60 60 + "type": "boolean", 61 61 + "default": false 54 62 } 55 63 } 56 64 }, ··· 67 75 "backgroundImage": { 68 76 "type": "ref", 69 77 "ref": "pub.leaflet.theme.backgroundImage" 78 78 + }, 79 79 + "pageWidth": { 80 80 + "type": "integer", 81 81 + "minimum": 0, 82 82 + "maximum": 1600 70 83 }, 71 84 "primary": { 72 85 "type": "union",

+36

lexicons/src/authFullPermissions.ts

··· 1 1 + import { LexiconDoc } from "@atproto/lexicon"; 2 2 + import { PubLeafletDocument } from "./document"; 3 3 + import { 4 4 + PubLeafletPublication, 5 5 + PubLeafletPublicationSubscription, 6 6 + } from "./publication"; 7 7 + import { PubLeafletComment } from "./comment"; 8 8 + import { PubLeafletPollDefinition, PubLeafletPollVote } from "./polls"; 9 9 + 10 10 + export const PubLeafletAuthFullPermissions: LexiconDoc = { 11 11 + lexicon: 1, 12 12 + id: "pub.leaflet.authFullPermissions", 13 13 + defs: { 14 14 + main: { 15 15 + type: "permission-set", 16 16 + title: "Full Leaflet Permissions", 17 17 + detail: 18 18 + "Manage creating and updating leaflet documents and publications and all interactions on them.", 19 19 + permissions: [ 20 20 + { 21 21 + type: "permission", 22 22 + resource: "repo", 23 23 + action: ["create", "update", "delete"], 24 24 + collection: [ 25 25 + PubLeafletDocument.id, 26 26 + PubLeafletPublication.id, 27 27 + PubLeafletComment.id, 28 28 + PubLeafletPollDefinition.id, 29 29 + PubLeafletPollVote.id, 30 30 + PubLeafletPublicationSubscription.id, 31 31 + ], 32 32 + }, 33 33 + ], 34 34 + }, 35 35 + }, 36 36 + };

+1

lexicons/src/blocks.ts

··· 10 10 required: ["plaintext"], 11 11 properties: { 12 12 plaintext: { type: "string" }, 13 13 + textSize: { type: "string", enum: ["default", "small", "large"] }, 13 14 facets: { 14 15 type: "array", 15 16 items: { type: "ref", ref: PubLeafletRichTextFacet.id },

+5

lexicons/src/document.ts

··· 24 24 author: { type: "string", format: "at-identifier" }, 25 25 theme: { type: "ref", ref: "pub.leaflet.publication#theme" }, 26 26 tags: { type: "array", items: { type: "string", maxLength: 50 } }, 27 27 + coverImage: { 28 28 + type: "blob", 29 29 + accept: ["image/png", "image/jpeg", "image/webp"], 30 30 + maxSize: 1000000, 31 31 + }, 27 32 pages: { 28 33 type: "array", 29 34 items: {

+7

lexicons/src/publication.ts

··· 27 27 properties: { 28 28 showInDiscover: { type: "boolean", default: true }, 29 29 showComments: { type: "boolean", default: true }, 30 30 + showMentions: { type: "boolean", default: true }, 31 31 + showPrevNext: { type: "boolean", default: false }, 30 32 }, 31 33 }, 32 34 theme: { ··· 36 38 backgroundImage: { 37 39 type: "ref", 38 40 ref: PubLeafletThemeBackgroundImage.id, 41 41 + }, 42 42 + pageWidth: { 43 43 + type: "integer", 44 44 + minimum: 0, 45 45 + maximum: 1600, 39 46 }, 40 47 primary: ColorUnion, 41 48 pageBackground: ColorUnion,

+1 -1

package.json

··· 7 7 "dev": "TZ=UTC next dev --turbo", 8 8 "publish-lexicons": "tsx lexicons/publish.ts", 9 9 "generate-db-types": "supabase gen types --local > supabase/database.types.ts && drizzle-kit introspect && rm -rf ./drizzle/*.sql ./drizzle/meta", 10 10 - "lexgen": "tsx ./lexicons/build.ts && lex gen-api ./lexicons/api ./lexicons/pub/leaflet/* ./lexicons/pub/leaflet/*/* ./lexicons/com/atproto/*/* ./lexicons/app/bsky/*/* --yes && find './lexicons/api' -type f -exec sed -i 's/\\.js'/'/g' {} \\;", 10 10 + "lexgen": "tsx ./lexicons/build.ts && lex gen-api ./lexicons/api ./lexicons/pub/leaflet/document.json ./lexicons/pub/leaflet/comment.json ./lexicons/pub/leaflet/publication.json ./lexicons/pub/leaflet/*/* ./lexicons/com/atproto/*/* ./lexicons/app/bsky/*/* --yes && tsx ./lexicons/fix-extensions.ts ./lexicons/api", 11 11 "wrangler-dev": "wrangler dev", 12 12 "build-appview": "esbuild appview/index.ts --outfile=appview/dist/index.js --bundle --platform=node", 13 13 "build-feed-service": "esbuild feeds/index.ts --outfile=feeds/dist/index.js --bundle --platform=node",

+27

src/atproto-oauth.ts

··· 3 3 NodeSavedSession, 4 4 NodeSavedState, 5 5 RuntimeLock, 6 6 + OAuthSession, 6 7 } from "@atproto/oauth-client-node"; 7 8 import { JoseKey } from "@atproto/jwk-jose"; 8 9 import { oauth_metadata } from "app/api/oauth/[route]/oauth-metadata"; ··· 10 11 11 12 import Client from "ioredis"; 12 13 import Redlock from "redlock"; 14 14 + import { Result, Ok, Err } from "./result"; 13 15 export async function createOauthClient() { 14 16 let keyset = 15 17 process.env.NODE_ENV === "production" ··· 90 92 .eq("key", key); 91 93 }, 92 94 }; 95 95 + 96 96 + export type OAuthSessionError = { 97 97 + type: "oauth_session_expired"; 98 98 + message: string; 99 99 + did: string; 100 100 + }; 101 101 + 102 102 + export async function restoreOAuthSession( 103 103 + did: string 104 104 + ): Promise<Result<OAuthSession, OAuthSessionError>> { 105 105 + try { 106 106 + const oauthClient = await createOauthClient(); 107 107 + const session = await oauthClient.restore(did); 108 108 + return Ok(session); 109 109 + } catch (error) { 110 110 + return Err({ 111 111 + type: "oauth_session_expired", 112 112 + message: 113 113 + error instanceof Error 114 114 + ? error.message 115 115 + : "OAuth session expired or invalid", 116 116 + did, 117 117 + }); 118 118 + } 119 119 + }

-2

src/hooks/useLocalizedDate.ts

··· 31 31 ? timezone || "UTC" 32 32 : Intl.DateTimeFormat().resolvedOptions().timeZone; 33 33 34 34 - console.log("tz", effectiveTimezone); 35 35 - 36 34 // Apply timezone if available 37 35 if (effectiveTimezone) { 38 36 dateTime = dateTime.setZone(effectiveTimezone);

+12

src/replicache/attributes.ts

··· 71 71 type: "number", 72 72 cardinality: "one", 73 73 }, 74 74 + "block/text-size": { 75 75 + type: "text-size-union", 76 76 + cardinality: "one", 77 77 + }, 74 78 "block/image": { 75 79 type: "image", 76 80 cardinality: "one", ··· 191 195 type: "boolean", 192 196 cardinality: "one", 193 197 }, 198 198 + "theme/page-width": { 199 199 + type: "number", 200 200 + cardinality: "one", 201 201 + }, 194 202 "theme/page-background": { 195 203 type: "color", 196 204 cardinality: "one", ··· 317 325 "text-alignment-type-union": { 318 326 type: "text-alignment-type-union"; 319 327 value: "right" | "left" | "center" | "justify"; 328 328 + }; 329 329 + "text-size-union": { 330 330 + type: "text-size-union"; 331 331 + value: "default" | "small" | "large"; 320 332 }; 321 333 "page-type-union": { type: "page-type-union"; value: "doc" | "canvas" }; 322 334 "block-type-union": {

+30 -1

src/replicache/mutations.ts

··· 319 319 await supabase.storage 320 320 .from("minilink-user-assets") 321 321 .remove([paths[paths.length - 1]]); 322 322 + 323 323 + // Clear cover image if this block is the cover image 324 324 + // First try leaflets_in_publications 325 325 + const { data: pubResult } = await supabase 326 326 + .from("leaflets_in_publications") 327 327 + .update({ cover_image: null }) 328 328 + .eq("leaflet", ctx.permission_token_id) 329 329 + .eq("cover_image", block.blockEntity) 330 330 + .select("leaflet"); 331 331 + 332 332 + // If no rows updated, try leaflets_to_documents 333 333 + if (!pubResult || pubResult.length === 0) { 334 334 + await supabase 335 335 + .from("leaflets_to_documents") 336 336 + .update({ cover_image: null }) 337 337 + .eq("leaflet", ctx.permission_token_id) 338 338 + .eq("cover_image", block.blockEntity); 339 339 + } 322 340 } 323 341 }); 324 324 - await ctx.runOnClient(async () => { 342 342 + await ctx.runOnClient(async ({ tx }) => { 325 343 let cache = await caches.open("minilink-user-assets"); 326 344 if (image) { 327 345 await cache.delete(image.data.src + "?local"); 346 346 + 347 347 + // Clear cover image in client state if this block was the cover image 348 348 + let currentCoverImage = await tx.get("publication_cover_image"); 349 349 + if (currentCoverImage === block.blockEntity) { 350 350 + await tx.set("publication_cover_image", null); 351 351 + } 328 352 } 329 353 }); 330 354 await ctx.deleteEntity(block.blockEntity); ··· 612 636 title?: string; 613 637 description?: string; 614 638 tags?: string[]; 639 639 + cover_image?: string | null; 615 640 }> = async (args, ctx) => { 616 641 await ctx.runOnServer(async (serverCtx) => { 617 642 console.log("updating"); ··· 619 644 description?: string; 620 645 title?: string; 621 646 tags?: string[]; 647 647 + cover_image?: string | null; 622 648 } = {}; 623 649 if (args.description !== undefined) updates.description = args.description; 624 650 if (args.title !== undefined) updates.title = args.title; 625 651 if (args.tags !== undefined) updates.tags = args.tags; 652 652 + if (args.cover_image !== undefined) updates.cover_image = args.cover_image; 626 653 627 654 if (Object.keys(updates).length > 0) { 628 655 // First try to update leaflets_in_publications (for publications) ··· 648 675 if (args.description !== undefined) 649 676 await tx.set("publication_description", args.description); 650 677 if (args.tags !== undefined) await tx.set("publication_tags", args.tags); 678 678 + if (args.cover_image !== undefined) 679 679 + await tx.set("publication_cover_image", args.cover_image); 651 680 }); 652 681 }; 653 682

+8

src/result.ts

··· 1 1 + // Result type - a discriminated union for handling success/error cases 2 2 + export type Result<T, E> = 3 3 + | { ok: true; value: T } 4 4 + | { ok: false; error: E }; 5 5 + 6 6 + // Constructors 7 7 + export const Ok = <T>(value: T): Result<T, never> => ({ ok: true, value }); 8 8 + export const Err = <E>(error: E): Result<never, E> => ({ ok: false, error });

+28

src/useThreadState.ts

··· 1 1 + import { create } from "zustand"; 2 2 + import { combine } from "zustand/middleware"; 3 3 + 4 4 + export const useThreadState = create( 5 5 + combine( 6 6 + { 7 7 + // Set of collapsed thread URIs 8 8 + collapsedThreads: new Set<string>(), 9 9 + }, 10 10 + (set) => ({ 11 11 + toggleCollapsed: (uri: string) => { 12 12 + set((state) => { 13 13 + const newCollapsed = new Set(state.collapsedThreads); 14 14 + if (newCollapsed.has(uri)) { 15 15 + newCollapsed.delete(uri); 16 16 + } else { 17 17 + newCollapsed.add(uri); 18 18 + } 19 19 + return { collapsedThreads: newCollapsed }; 20 20 + }); 21 21 + }, 22 22 + isCollapsed: (uri: string) => { 23 23 + // This is a selector helper, but we'll use the state directly 24 24 + return false; 25 25 + }, 26 26 + }), 27 27 + ), 28 28 + );

+116

src/utils/deleteBlock.ts

··· 1 1 + import { Replicache } from "replicache"; 2 2 + import { ReplicacheMutators } from "src/replicache"; 3 3 + import { useUIState } from "src/useUIState"; 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 + 8 8 + export async function deleteBlock( 9 9 + entities: string[], 10 10 + rep: Replicache<ReplicacheMutators>, 11 11 + ) { 12 12 + // get what pagess we need to close as a result of deleting this block 13 13 + let pagesToClose = [] as string[]; 14 14 + for (let entity of entities) { 15 15 + let [type] = await rep.query((tx) => 16 16 + scanIndex(tx).eav(entity, "block/type"), 17 17 + ); 18 18 + if (type.data.value === "card") { 19 19 + let [childPages] = await rep?.query( 20 20 + (tx) => scanIndex(tx).eav(entity, "block/card") || [], 21 21 + ); 22 22 + pagesToClose = [childPages?.data.value]; 23 23 + } 24 24 + if (type.data.value === "mailbox") { 25 25 + let [archive] = await rep?.query( 26 26 + (tx) => scanIndex(tx).eav(entity, "mailbox/archive") || [], 27 27 + ); 28 28 + let [draft] = await rep?.query( 29 29 + (tx) => scanIndex(tx).eav(entity, "mailbox/draft") || [], 30 30 + ); 31 31 + pagesToClose = [archive?.data.value, draft?.data.value]; 32 32 + } 33 33 + } 34 34 + 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 + let focusedBlock = useUIState.getState().focusedEntity; 38 38 + let parent = 39 39 + focusedBlock?.entityType === "page" 40 40 + ? focusedBlock.entityID 41 41 + : focusedBlock?.parent; 42 42 + 43 43 + if (parent) { 44 44 + let parentType = await rep?.query((tx) => 45 45 + scanIndex(tx).eav(parent, "page/type"), 46 46 + ); 47 47 + if (parentType[0]?.data.value === "canvas") { 48 48 + useUIState 49 49 + .getState() 50 50 + .setFocusedBlock({ entityType: "page", entityID: parent }); 51 51 + useUIState.getState().setSelectedBlocks([]); 52 52 + } else { 53 53 + let siblings = 54 54 + (await rep?.query((tx) => getBlocksWithType(tx, parent))) || []; 55 55 + 56 56 + let selectedBlocks = useUIState.getState().selectedBlocks; 57 57 + let firstSelected = selectedBlocks[0]; 58 58 + let lastSelected = selectedBlocks[entities.length - 1]; 59 59 + 60 60 + let prevBlock = 61 61 + siblings?.[ 62 62 + siblings.findIndex((s) => s.value === firstSelected?.value) - 1 63 63 + ]; 64 64 + let prevBlockType = await rep?.query((tx) => 65 65 + scanIndex(tx).eav(prevBlock?.value, "block/type"), 66 66 + ); 67 67 + 68 68 + let nextBlock = 69 69 + siblings?.[ 70 70 + siblings.findIndex((s) => s.value === lastSelected.value) + 1 71 71 + ]; 72 72 + let nextBlockType = await rep?.query((tx) => 73 73 + scanIndex(tx).eav(nextBlock?.value, "block/type"), 74 74 + ); 75 75 + 76 76 + if (prevBlock) { 77 77 + useUIState.getState().setSelectedBlock({ 78 78 + value: prevBlock.value, 79 79 + parent: prevBlock.parent, 80 80 + }); 81 81 + 82 82 + focusBlock( 83 83 + { 84 84 + value: prevBlock.value, 85 85 + type: prevBlockType?.[0].data.value, 86 86 + parent: prevBlock.parent, 87 87 + }, 88 88 + { type: "end" }, 89 89 + ); 90 90 + } else { 91 91 + useUIState.getState().setSelectedBlock({ 92 92 + value: nextBlock.value, 93 93 + parent: nextBlock.parent, 94 94 + }); 95 95 + 96 96 + focusBlock( 97 97 + { 98 98 + value: nextBlock.value, 99 99 + type: nextBlockType?.[0]?.data.value, 100 100 + parent: nextBlock.parent, 101 101 + }, 102 102 + { type: "start" }, 103 103 + ); 104 104 + } 105 105 + } 106 106 + } 107 107 + 108 108 + pagesToClose.forEach((page) => page && useUIState.getState().closePage(page)); 109 109 + await Promise.all( 110 110 + entities.map((entity) => 111 111 + rep?.mutate.removeBlock({ 112 112 + blockEntity: entity, 113 113 + }), 114 114 + ), 115 115 + ); 116 116 + }

+37

src/utils/focusElement.ts

··· 1 1 + import { isIOS } from "src/utils/isDevice"; 2 2 + 3 3 + export const focusElement = ( 4 4 + el?: HTMLInputElement | HTMLTextAreaElement | null, 5 5 + ) => { 6 6 + if (!isIOS()) { 7 7 + el?.focus(); 8 8 + return; 9 9 + } 10 10 + 11 11 + let fakeInput = document.createElement("input"); 12 12 + fakeInput.setAttribute("type", "text"); 13 13 + fakeInput.style.position = "fixed"; 14 14 + fakeInput.style.height = "0px"; 15 15 + fakeInput.style.width = "0px"; 16 16 + fakeInput.style.fontSize = "16px"; // disable auto zoom 17 17 + document.body.appendChild(fakeInput); 18 18 + fakeInput.focus(); 19 19 + setTimeout(() => { 20 20 + if (!el) return; 21 21 + el.style.transform = "translateY(-2000px)"; 22 22 + el?.focus(); 23 23 + fakeInput.remove(); 24 24 + el.value = " "; 25 25 + el.setSelectionRange(1, 1); 26 26 + requestAnimationFrame(() => { 27 27 + if (el) { 28 28 + el.style.transform = ""; 29 29 + } 30 30 + }); 31 31 + setTimeout(() => { 32 32 + if (!el) return; 33 33 + el.value = ""; 34 34 + el.setSelectionRange(0, 0); 35 35 + }, 50); 36 36 + }, 20); 37 37 + };

+73

src/utils/focusPage.ts

··· 1 1 + import { Replicache } from "replicache"; 2 2 + import { Fact, ReplicacheMutators } from "src/replicache"; 3 3 + import { useUIState } from "src/useUIState"; 4 4 + import { scanIndex } from "src/replicache/utils"; 5 5 + import { scrollIntoViewIfNeeded } from "src/utils/scrollIntoViewIfNeeded"; 6 6 + import { elementId } from "src/utils/elementId"; 7 7 + import { focusBlock } from "src/utils/focusBlock"; 8 8 + 9 9 + export async function focusPage( 10 10 + pageID: string, 11 11 + rep: Replicache<ReplicacheMutators>, 12 12 + focusFirstBlock?: "focusFirstBlock", 13 13 + ) { 14 14 + // if this page is already focused, 15 15 + let focusedBlock = useUIState.getState().focusedEntity; 16 16 + // else set this page as focused 17 17 + useUIState.setState(() => ({ 18 18 + focusedEntity: { 19 19 + entityType: "page", 20 20 + entityID: pageID, 21 21 + }, 22 22 + })); 23 23 + 24 24 + setTimeout(async () => { 25 25 + //scroll to page 26 26 + 27 27 + scrollIntoViewIfNeeded( 28 28 + document.getElementById(elementId.page(pageID).container), 29 29 + false, 30 30 + "smooth", 31 31 + ); 32 32 + 33 33 + // if we asked that the function focus the first block, focus the first block 34 34 + if (focusFirstBlock === "focusFirstBlock") { 35 35 + let firstBlock = await rep.query(async (tx) => { 36 36 + let type = await scanIndex(tx).eav(pageID, "page/type"); 37 37 + let blocks = await scanIndex(tx).eav( 38 38 + pageID, 39 39 + type[0]?.data.value === "canvas" ? "canvas/block" : "card/block", 40 40 + ); 41 41 + 42 42 + let firstBlock = blocks[0]; 43 43 + 44 44 + if (!firstBlock) { 45 45 + return null; 46 46 + } 47 47 + 48 48 + let blockType = ( 49 49 + await tx 50 50 + .scan< 51 51 + Fact<"block/type"> 52 52 + >({ indexName: "eav", prefix: `${firstBlock.data.value}-block/type` }) 53 53 + .toArray() 54 54 + )[0]; 55 55 + 56 56 + if (!blockType) return null; 57 57 + 58 58 + return { 59 59 + value: firstBlock.data.value, 60 60 + type: blockType.data.value, 61 61 + parent: firstBlock.entity, 62 62 + position: firstBlock.data.position, 63 63 + }; 64 64 + }); 65 65 + 66 66 + if (firstBlock) { 67 67 + setTimeout(() => { 68 68 + focusBlock(firstBlock, { type: "start" }); 69 69 + }, 500); 70 70 + } 71 71 + } 72 72 + }, 50); 73 73 + }

+3

src/utils/getBlocksAsHTML.tsx

··· 171 171 }, 172 172 text: async (b, tx, a) => { 173 173 let [value] = await scanIndex(tx).eav(b.value, "block/text"); 174 174 + let [textSize] = await scanIndex(tx).eav(b.value, "block/text-size"); 175 175 + 174 176 return ( 175 177 <RenderYJSFragment 176 178 value={value?.data.value} 177 179 attrs={{ 178 180 "data-alignment": a, 181 181 + "data-text-size": textSize?.data.value, 179 182 }} 180 183 wrapper="p" 181 184 />

+41

src/utils/yjsFragmentToString.ts

··· 1 1 + import { XmlElement, XmlText, XmlHook } from "yjs"; 2 2 + 3 3 + export type Delta = { 4 4 + insert: string; 5 5 + attributes?: { 6 6 + strong?: {}; 7 7 + code?: {}; 8 8 + em?: {}; 9 9 + underline?: {}; 10 10 + strikethrough?: {}; 11 11 + highlight?: { color: string }; 12 12 + link?: { href: string }; 13 13 + }; 14 14 + }; 15 15 + 16 16 + export function YJSFragmentToString( 17 17 + node: XmlElement | XmlText | XmlHook, 18 18 + ): string { 19 19 + if (node.constructor === XmlElement) { 20 20 + // Handle hard_break nodes specially 21 21 + if (node.nodeName === "hard_break") { 22 22 + return "\n"; 23 23 + } 24 24 + // Handle inline mention nodes 25 25 + if (node.nodeName === "didMention" || node.nodeName === "atMention") { 26 26 + return node.getAttribute("text") || ""; 27 27 + } 28 28 + return node 29 29 + .toArray() 30 30 + .map((f) => YJSFragmentToString(f)) 31 31 + .join(""); 32 32 + } 33 33 + if (node.constructor === XmlText) { 34 34 + return (node.toDelta() as Delta[]) 35 35 + .map((d) => { 36 36 + return d.insert; 37 37 + }) 38 38 + .join(""); 39 39 + } 40 40 + return ""; 41 41 + }

+11 -1

supabase/database.types.ts

··· 556 556 atp_did?: string | null 557 557 created_at?: string 558 558 email?: string | null 559 559 - home_page: string 559 559 + home_page?: string 560 560 id?: string 561 561 interface_state?: Json | null 562 562 } ··· 581 581 leaflets_in_publications: { 582 582 Row: { 583 583 archived: boolean | null 584 584 + cover_image: string | null 584 585 description: string 585 586 doc: string | null 586 587 leaflet: string ··· 589 590 } 590 591 Insert: { 591 592 archived?: boolean | null 593 593 + cover_image?: string | null 592 594 description?: string 593 595 doc?: string | null 594 596 leaflet: string ··· 597 599 } 598 600 Update: { 599 601 archived?: boolean | null 602 602 + cover_image?: string | null 600 603 description?: string 601 604 doc?: string | null 602 605 leaflet?: string ··· 629 632 } 630 633 leaflets_to_documents: { 631 634 Row: { 635 635 + cover_image: string | null 632 636 created_at: string 633 637 description: string 634 638 document: string ··· 636 640 title: string 637 641 } 638 642 Insert: { 643 643 + cover_image?: string | null 639 644 created_at?: string 640 645 description?: string 641 646 document: string ··· 643 648 title?: string 644 649 } 645 650 Update: { 651 651 + cover_image?: string | null 646 652 created_at?: string 647 653 description?: string 648 654 document?: string ··· 1112 1118 [_ in never]: never 1113 1119 } 1114 1120 Functions: { 1121 1121 + create_identity_homepage: { 1122 1122 + Args: Record<PropertyKey, never> 1123 1123 + Returns: string 1124 1124 + } 1115 1125 get_facts: { 1116 1126 Args: { 1117 1127 root: string

+2

supabase/migrations/20251223000000_add_cover_image_column.sql

··· 1 1 + alter table "public"."leaflets_in_publications" add column "cover_image" text; 2 2 + alter table "public"."leaflets_to_documents" add column "cover_image" text;

+34

supabase/migrations/20260106183631_add_homepage_default_to_identities.sql

··· 1 1 + -- Function to create homepage infrastructure for new identities 2 2 + -- Replicates the logic from createIdentity TypeScript function 3 3 + -- Returns the permission token ID to be used as home_page 4 4 + CREATE OR REPLACE FUNCTION create_identity_homepage() 5 5 + RETURNS uuid AS $$ 6 6 + DECLARE 7 7 + new_entity_set_id uuid; 8 8 + new_entity_id uuid; 9 9 + new_permission_token_id uuid; 10 10 + BEGIN 11 11 + -- Create a new entity set 12 12 + INSERT INTO entity_sets DEFAULT VALUES 13 13 + RETURNING id INTO new_entity_set_id; 14 14 + 15 15 + -- Create a root entity and add it to that entity set 16 16 + new_entity_id := gen_random_uuid(); 17 17 + INSERT INTO entities (id, set) 18 18 + VALUES (new_entity_id, new_entity_set_id); 19 19 + 20 20 + -- Create a new permission token 21 21 + INSERT INTO permission_tokens (root_entity) 22 22 + VALUES (new_entity_id) 23 23 + RETURNING id INTO new_permission_token_id; 24 24 + 25 25 + -- Give the token full permissions on that entity set 26 26 + INSERT INTO permission_token_rights (token, entity_set, read, write, create_token, change_entity_set) 27 27 + VALUES (new_permission_token_id, new_entity_set_id, true, true, true, true); 28 28 + 29 29 + RETURN new_permission_token_id; 30 30 + END; 31 31 + $$ LANGUAGE plpgsql; 32 32 + 33 33 + -- Set the function as the default value for home_page column 34 34 + ALTER TABLE identities ALTER COLUMN home_page SET DEFAULT create_identity_homepage();

+161

supabase/migrations/20260106190000_add_site_standard_tables.sql

··· 1 1 + -- site_standard_publications table (modeled off publications) 2 2 + create table "public"."site_standard_publications" ( 3 3 + "uri" text not null, 4 4 + "data" jsonb not null, 5 5 + "indexed_at" timestamp with time zone not null default now(), 6 6 + "identity_did" text not null 7 7 + ); 8 8 + alter table "public"."site_standard_publications" enable row level security; 9 9 + 10 10 + -- site_standard_documents table (modeled off documents) 11 11 + create table "public"."site_standard_documents" ( 12 12 + "uri" text not null, 13 13 + "data" jsonb not null, 14 14 + "indexed_at" timestamp with time zone not null default now(), 15 15 + "identity_did" text not null 16 16 + ); 17 17 + alter table "public"."site_standard_documents" enable row level security; 18 18 + 19 19 + -- site_standard_documents_in_publications relation table (modeled off documents_in_publications) 20 20 + create table "public"."site_standard_documents_in_publications" ( 21 21 + "publication" text not null, 22 22 + "document" text not null, 23 23 + "indexed_at" timestamp with time zone not null default now() 24 24 + ); 25 25 + alter table "public"."site_standard_documents_in_publications" enable row level security; 26 26 + 27 27 + -- Primary key indexes 28 28 + CREATE UNIQUE INDEX site_standard_publications_pkey ON public.site_standard_publications USING btree (uri); 29 29 + CREATE UNIQUE INDEX site_standard_documents_pkey ON public.site_standard_documents USING btree (uri); 30 30 + CREATE UNIQUE INDEX site_standard_documents_in_publications_pkey ON public.site_standard_documents_in_publications USING btree (publication, document); 31 31 + 32 32 + -- Add primary key constraints 33 33 + alter table "public"."site_standard_publications" add constraint "site_standard_publications_pkey" PRIMARY KEY using index "site_standard_publications_pkey"; 34 34 + alter table "public"."site_standard_documents" add constraint "site_standard_documents_pkey" PRIMARY KEY using index "site_standard_documents_pkey"; 35 35 + alter table "public"."site_standard_documents_in_publications" add constraint "site_standard_documents_in_publications_pkey" PRIMARY KEY using index "site_standard_documents_in_publications_pkey"; 36 36 + 37 37 + -- Foreign key constraints for identity relations 38 38 + alter table "public"."site_standard_publications" add constraint "site_standard_publications_identity_did_fkey" FOREIGN KEY (identity_did) REFERENCES identities(atp_did) ON DELETE CASCADE not valid; 39 39 + alter table "public"."site_standard_publications" validate constraint "site_standard_publications_identity_did_fkey"; 40 40 + alter table "public"."site_standard_documents" add constraint "site_standard_documents_identity_did_fkey" FOREIGN KEY (identity_did) REFERENCES identities(atp_did) ON DELETE CASCADE not valid; 41 41 + alter table "public"."site_standard_documents" validate constraint "site_standard_documents_identity_did_fkey"; 42 42 + 43 43 + -- Foreign key constraints for relation table 44 44 + alter table "public"."site_standard_documents_in_publications" add constraint "site_standard_documents_in_publications_document_fkey" FOREIGN KEY (document) REFERENCES site_standard_documents(uri) ON DELETE CASCADE not valid; 45 45 + alter table "public"."site_standard_documents_in_publications" validate constraint "site_standard_documents_in_publications_document_fkey"; 46 46 + alter table "public"."site_standard_documents_in_publications" add constraint "site_standard_documents_in_publications_publication_fkey" FOREIGN KEY (publication) REFERENCES site_standard_publications(uri) ON DELETE CASCADE not valid; 47 47 + alter table "public"."site_standard_documents_in_publications" validate constraint "site_standard_documents_in_publications_publication_fkey"; 48 48 + 49 49 + -- Grants for site_standard_publications 50 50 + grant delete on table "public"."site_standard_publications" to "anon"; 51 51 + grant insert on table "public"."site_standard_publications" to "anon"; 52 52 + grant references on table "public"."site_standard_publications" to "anon"; 53 53 + grant select on table "public"."site_standard_publications" to "anon"; 54 54 + grant trigger on table "public"."site_standard_publications" to "anon"; 55 55 + grant truncate on table "public"."site_standard_publications" to "anon"; 56 56 + grant update on table "public"."site_standard_publications" to "anon"; 57 57 + grant delete on table "public"."site_standard_publications" to "authenticated"; 58 58 + grant insert on table "public"."site_standard_publications" to "authenticated"; 59 59 + grant references on table "public"."site_standard_publications" to "authenticated"; 60 60 + grant select on table "public"."site_standard_publications" to "authenticated"; 61 61 + grant trigger on table "public"."site_standard_publications" to "authenticated"; 62 62 + grant truncate on table "public"."site_standard_publications" to "authenticated"; 63 63 + grant update on table "public"."site_standard_publications" to "authenticated"; 64 64 + grant delete on table "public"."site_standard_publications" to "service_role"; 65 65 + grant insert on table "public"."site_standard_publications" to "service_role"; 66 66 + grant references on table "public"."site_standard_publications" to "service_role"; 67 67 + grant select on table "public"."site_standard_publications" to "service_role"; 68 68 + grant trigger on table "public"."site_standard_publications" to "service_role"; 69 69 + grant truncate on table "public"."site_standard_publications" to "service_role"; 70 70 + grant update on table "public"."site_standard_publications" to "service_role"; 71 71 + 72 72 + -- Grants for site_standard_documents 73 73 + grant delete on table "public"."site_standard_documents" to "anon"; 74 74 + grant insert on table "public"."site_standard_documents" to "anon"; 75 75 + grant references on table "public"."site_standard_documents" to "anon"; 76 76 + grant select on table "public"."site_standard_documents" to "anon"; 77 77 + grant trigger on table "public"."site_standard_documents" to "anon"; 78 78 + grant truncate on table "public"."site_standard_documents" to "anon"; 79 79 + grant update on table "public"."site_standard_documents" to "anon"; 80 80 + grant delete on table "public"."site_standard_documents" to "authenticated"; 81 81 + grant insert on table "public"."site_standard_documents" to "authenticated"; 82 82 + grant references on table "public"."site_standard_documents" to "authenticated"; 83 83 + grant select on table "public"."site_standard_documents" to "authenticated"; 84 84 + grant trigger on table "public"."site_standard_documents" to "authenticated"; 85 85 + grant truncate on table "public"."site_standard_documents" to "authenticated"; 86 86 + grant update on table "public"."site_standard_documents" to "authenticated"; 87 87 + grant delete on table "public"."site_standard_documents" to "service_role"; 88 88 + grant insert on table "public"."site_standard_documents" to "service_role"; 89 89 + grant references on table "public"."site_standard_documents" to "service_role"; 90 90 + grant select on table "public"."site_standard_documents" to "service_role"; 91 91 + grant trigger on table "public"."site_standard_documents" to "service_role"; 92 92 + grant truncate on table "public"."site_standard_documents" to "service_role"; 93 93 + grant update on table "public"."site_standard_documents" to "service_role"; 94 94 + 95 95 + -- Grants for site_standard_documents_in_publications 96 96 + grant delete on table "public"."site_standard_documents_in_publications" to "anon"; 97 97 + grant insert on table "public"."site_standard_documents_in_publications" to "anon"; 98 98 + grant references on table "public"."site_standard_documents_in_publications" to "anon"; 99 99 + grant select on table "public"."site_standard_documents_in_publications" to "anon"; 100 100 + grant trigger on table "public"."site_standard_documents_in_publications" to "anon"; 101 101 + grant truncate on table "public"."site_standard_documents_in_publications" to "anon"; 102 102 + grant update on table "public"."site_standard_documents_in_publications" to "anon"; 103 103 + grant delete on table "public"."site_standard_documents_in_publications" to "authenticated"; 104 104 + grant insert on table "public"."site_standard_documents_in_publications" to "authenticated"; 105 105 + grant references on table "public"."site_standard_documents_in_publications" to "authenticated"; 106 106 + grant select on table "public"."site_standard_documents_in_publications" to "authenticated"; 107 107 + grant trigger on table "public"."site_standard_documents_in_publications" to "authenticated"; 108 108 + grant truncate on table "public"."site_standard_documents_in_publications" to "authenticated"; 109 109 + grant update on table "public"."site_standard_documents_in_publications" to "authenticated"; 110 110 + grant delete on table "public"."site_standard_documents_in_publications" to "service_role"; 111 111 + grant insert on table "public"."site_standard_documents_in_publications" to "service_role"; 112 112 + grant references on table "public"."site_standard_documents_in_publications" to "service_role"; 113 113 + grant select on table "public"."site_standard_documents_in_publications" to "service_role"; 114 114 + grant trigger on table "public"."site_standard_documents_in_publications" to "service_role"; 115 115 + grant truncate on table "public"."site_standard_documents_in_publications" to "service_role"; 116 116 + grant update on table "public"."site_standard_documents_in_publications" to "service_role"; 117 117 + 118 118 + -- site_standard_subscriptions table (modeled off publication_subscriptions) 119 119 + create table "public"."site_standard_subscriptions" ( 120 120 + "publication" text not null, 121 121 + "identity" text not null, 122 122 + "created_at" timestamp with time zone not null default now(), 123 123 + "record" jsonb not null, 124 124 + "uri" text not null 125 125 + ); 126 126 + alter table "public"."site_standard_subscriptions" enable row level security; 127 127 + 128 128 + -- Primary key and unique indexes 129 129 + CREATE UNIQUE INDEX site_standard_subscriptions_pkey ON public.site_standard_subscriptions USING btree (publication, identity); 130 130 + CREATE UNIQUE INDEX site_standard_subscriptions_uri_key ON public.site_standard_subscriptions USING btree (uri); 131 131 + 132 132 + -- Add constraints 133 133 + alter table "public"."site_standard_subscriptions" add constraint "site_standard_subscriptions_pkey" PRIMARY KEY using index "site_standard_subscriptions_pkey"; 134 134 + alter table "public"."site_standard_subscriptions" add constraint "site_standard_subscriptions_uri_key" UNIQUE using index "site_standard_subscriptions_uri_key"; 135 135 + alter table "public"."site_standard_subscriptions" add constraint "site_standard_subscriptions_publication_fkey" FOREIGN KEY (publication) REFERENCES site_standard_publications(uri) ON DELETE CASCADE not valid; 136 136 + alter table "public"."site_standard_subscriptions" validate constraint "site_standard_subscriptions_publication_fkey"; 137 137 + alter table "public"."site_standard_subscriptions" add constraint "site_standard_subscriptions_identity_fkey" FOREIGN KEY (identity) REFERENCES identities(atp_did) ON DELETE CASCADE not valid; 138 138 + alter table "public"."site_standard_subscriptions" validate constraint "site_standard_subscriptions_identity_fkey"; 139 139 + 140 140 + -- Grants for site_standard_subscriptions 141 141 + grant delete on table "public"."site_standard_subscriptions" to "anon"; 142 142 + grant insert on table "public"."site_standard_subscriptions" to "anon"; 143 143 + grant references on table "public"."site_standard_subscriptions" to "anon"; 144 144 + grant select on table "public"."site_standard_subscriptions" to "anon"; 145 145 + grant trigger on table "public"."site_standard_subscriptions" to "anon"; 146 146 + grant truncate on table "public"."site_standard_subscriptions" to "anon"; 147 147 + grant update on table "public"."site_standard_subscriptions" to "anon"; 148 148 + grant delete on table "public"."site_standard_subscriptions" to "authenticated"; 149 149 + grant insert on table "public"."site_standard_subscriptions" to "authenticated"; 150 150 + grant references on table "public"."site_standard_subscriptions" to "authenticated"; 151 151 + grant select on table "public"."site_standard_subscriptions" to "authenticated"; 152 152 + grant trigger on table "public"."site_standard_subscriptions" to "authenticated"; 153 153 + grant truncate on table "public"."site_standard_subscriptions" to "authenticated"; 154 154 + grant update on table "public"."site_standard_subscriptions" to "authenticated"; 155 155 + grant delete on table "public"."site_standard_subscriptions" to "service_role"; 156 156 + grant insert on table "public"."site_standard_subscriptions" to "service_role"; 157 157 + grant references on table "public"."site_standard_subscriptions" to "service_role"; 158 158 + grant select on table "public"."site_standard_subscriptions" to "service_role"; 159 159 + grant trigger on table "public"."site_standard_subscriptions" to "service_role"; 160 160 + grant truncate on table "public"."site_standard_subscriptions" to "service_role"; 161 161 + grant update on table "public"."site_standard_subscriptions" to "service_role";