a tool for shared writing and social publishing

Merge branch 'feature/page-blocks' into feature/atp-canvas-blocks

+6 -3
+2 -1
app/lish/[did]/[publication]/[rkey]/PostPages.tsx
··· 21 useDrawerOpen, 22 } from "./Interactions/InteractionDrawer"; 23 import { BookendSpacer, SandwichSpacer } from "components/LeafletLayout"; 24 - import { CSS } from "@react-spring/web"; 25 import { PageOptionButton } from "components/Pages/PageOptions"; 26 import { CloseTiny } from "components/Icons/CloseTiny"; 27 import { PageWrapper } from "components/Pages/Page"; ··· 139 <> 140 {!fullPageScroll && <BookendSpacer />} 141 <PageWrapper 142 fullPageScroll={fullPageScroll} 143 cardBorderHidden={!hasPageBackground} 144 id={"post-page"} ··· 225 <SandwichSpacer /> 226 {/*JARED TODO : drawerOpen here is checking whether the drawer is open on the first page, rather than if it's open on this page. Please rewire this when you add drawers per page!*/} 227 <PageWrapper 228 cardBorderHidden={!hasPageBackground} 229 id={`post-page-${p}`} 230 fullPageScroll={false}
··· 21 useDrawerOpen, 22 } from "./Interactions/InteractionDrawer"; 23 import { BookendSpacer, SandwichSpacer } from "components/LeafletLayout"; 24 import { PageOptionButton } from "components/Pages/PageOptions"; 25 import { CloseTiny } from "components/Icons/CloseTiny"; 26 import { PageWrapper } from "components/Pages/Page"; ··· 138 <> 139 {!fullPageScroll && <BookendSpacer />} 140 <PageWrapper 141 + pageType="doc" 142 fullPageScroll={fullPageScroll} 143 cardBorderHidden={!hasPageBackground} 144 id={"post-page"} ··· 225 <SandwichSpacer /> 226 {/*JARED TODO : drawerOpen here is checking whether the drawer is open on the first page, rather than if it's open on this page. Please rewire this when you add drawers per page!*/} 227 <PageWrapper 228 + pageType="doc" 229 cardBorderHidden={!hasPageBackground} 230 id={`post-page-${p}`} 231 fullPageScroll={false}
+3 -1
app/lish/[did]/[publication]/[rkey]/PublishedPageBlock.tsx
··· 186 let { drawerOpen, drawer, pageId } = useInteractionState(document_uri); 187 188 return ( 189 - <div className={`flex gap-2 text-tertiary text-sm`}> 190 {quotes > 0 && ( 191 <button 192 className={`flex gap-1 items-center`}
··· 186 let { drawerOpen, drawer, pageId } = useInteractionState(document_uri); 187 188 return ( 189 + <div 190 + className={`flex gap-2 text-tertiary text-sm absolute bottom-2 bg-bg-page`} 191 + > 192 {quotes > 0 && ( 193 <button 194 className={`flex gap-1 items-center`}
+1 -1
components/Pages/Page.tsx
··· 83 fullPageScroll: boolean; 84 isFocused?: boolean; 85 onClickAction?: (e: React.MouseEvent) => void; 86 - pageType?: "canvas" | "doc"; 87 canvasNarrow?: boolean | undefined; 88 drawerOpen: boolean | undefined; 89 }) => {
··· 83 fullPageScroll: boolean; 84 isFocused?: boolean; 85 onClickAction?: (e: React.MouseEvent) => void; 86 + pageType: "canvas" | "doc"; 87 canvasNarrow?: boolean | undefined; 88 drawerOpen: boolean | undefined; 89 }) => {