Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(drive-view): pdf and canvas detail views (#6541)

dev-rbad97b77ce89d
diff --git a/apps/web/src/components/app/side-panel/SidePanel.tsx b/apps/web/src/components/app/side-panel/SidePanel.tsx
index 035811c66a..62c5713831 100644
--- a/apps/web/src/components/app/side-panel/SidePanel.tsx
+++ b/apps/web/src/components/app/side-panel/SidePanel.tsx
@@ -10,7 +10,6 @@ import ArrowLeft from '@phosphor/arrow-left.svg';
import CaretRight from '@phosphor/caret-right.svg';
import CircleDashedEmpty from '@phosphor/circle-dashed.svg';
import InfoIcon from '@phosphor/info.svg';
-import ListIcon from '@phosphor/list.svg';
import SidePanelIcon from '@phosphor/sidebar-simple.svg';
import { Button, Panel, Scroll } from '@ui';
import { cn } from '@ui/utils/classname';
@@ -31,10 +30,7 @@ import {
useContext,
} from 'solid-js';
import { HeaderIsland } from '../split-layout/components/HeaderIsland';
-import {
- SplitHeaderLeft,
- SplitHeaderRight,
-} from '../split-layout/components/SplitHeader';
+import { SplitHeaderRight } from '../split-layout/components/SplitHeader';
import { useSplitPanel } from '../split-layout/layoutUtils';
import {
SidePanelContext,
@@ -261,17 +257,6 @@ function SidePanelLayoutInner(
index={1}
>
<div class="relative flex size-full min-h-0 flex-col z-split-panel-chrome">
- <div class="flex h-12 shrink-0 items-center justify-between border-b border-edge-muted px-4">
- <span class="text-sm font-semibold text-ink">Details</span>
- <Button
- variant="ghost"
- size="icon-sm"
- label="Hide side panel"
- onClick={() => props.setIsOpen(false)}
- >
- <SidePanelIcon class="size-4" />
- </Button>
- </div>
<SidePanelOutlet
sections={props.sections}
openIds={props.openIds}
@@ -358,21 +343,12 @@ function SidePanelHeaderToggle() {
return (
<Show when={ctx.hasSections()}>
- <Show when={!isTouchDevice() && !panel?.isInlinePreview && !ctx.isOpen()}>
- <SplitHeaderLeft>
- <div class="order-first flex shrink-0 items-center">
- <Button
- variant="ghost"
- size="icon-sm"
- label="Show side panel"
- aria-label="Show side panel"
- aria-expanded={false}
- onClick={() => ctx.setIsOpen(true)}
- >
- <ListIcon class="size-4" />
- </Button>
+ <Show when={!isTouchDevice() && !panel?.isInlinePreview}>
+ <SplitHeaderRight>
+ <div class="order-[1001] flex shrink-0 items-center">
+ <Toggle />
</div>
- </SplitHeaderLeft>
+ </SplitHeaderRight>
</Show>
<Show when={isTouchDevice() || panel?.isInlinePreview}>
<SplitHeaderRight>
diff --git a/apps/web/src/components/entity-detail/EntityDetail.tsx b/apps/web/src/components/entity-detail/EntityDetail.tsx
index 54a45db2e7..f58a1b426e 100644
--- a/apps/web/src/components/entity-detail/EntityDetail.tsx
+++ b/apps/web/src/components/entity-detail/EntityDetail.tsx
@@ -1,6 +1,8 @@
+import { CanvasDetail } from '@app/features/drive-view/views/CanvasDetail';
import { CodeDetail } from '@app/features/drive-view/views/CodeDetail';
import { ImageDetail } from '@app/features/drive-view/views/ImageDetail';
import { MarkdownDetail } from '@app/features/drive-view/views/MarkdownDetail';
+import { PdfDetail } from '@app/features/drive-view/views/PdfDetail';
import { UnknownDetail } from '@app/features/drive-view/views/UnknownDetail';
import { VideoDetail } from '@app/features/drive-view/views/VideoDetail';
import type { MarkdownDocumentKind } from '@block-md/types';
@@ -61,9 +63,11 @@ export function entityDetailBlockType(
blockType === 'task' ||
blockType === 'snippet' ||
blockType === 'skill' ||
+ blockType === 'canvas' ||
blockType === 'code' ||
blockType === 'csv' ||
blockType === 'image' ||
+ blockType === 'pdf' ||
blockType === 'video' ||
blockType === 'unknown'
) {
@@ -128,6 +132,20 @@ export function EntityDetail(props: EntityDetailProps) {
}
</CodeDetail>
</Match>
+ <Match when={blockType() === 'canvas'}>
+ <CanvasDetail
+ documentId={props.target.id}
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ >
+ {(context) =>
+ renderChildren(
+ context.data.documentMetadata,
+ context.data.userAccessLevel
+ )
+ }
+ </CanvasDetail>
+ </Match>
<Match when={blockType() === 'image'}>
<ImageDetail
documentId={props.target.id}
@@ -156,6 +174,20 @@ export function EntityDetail(props: EntityDetailProps) {
}
</VideoDetail>
</Match>
+ <Match when={blockType() === 'pdf'}>
+ <PdfDetail
+ documentId={props.target.id}
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ >
+ {(context) =>
+ renderChildren(
+ context.data.documentMetadata,
+ context.data.userAccessLevel
+ )
+ }
+ </PdfDetail>
+ </Match>
<Match when={blockType() === 'unknown'}>
<UnknownDetail
documentId={props.target.id}
diff --git a/apps/web/src/features/block-call/component/ModalsProvider.tsx b/apps/web/src/features/block-call/component/ModalsProvider.tsx
index f1add6f334..b5c8846656 100644
--- a/apps/web/src/features/block-call/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-call/component/ModalsProvider.tsx
@@ -1,5 +1,3 @@
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
import {
ShareBlockModal,
ShareDialogContext,
@@ -7,7 +5,6 @@ import {
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const blockId = useBlockId();
const [shareOpen, setShareOpen] = createSignal(false);
return (
<ShareDialogContext.Provider
@@ -18,7 +15,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <DetailsDrawer documentId={blockId} />
<ShareBlockModal />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-canvas/component/ModalsProvider.tsx b/apps/web/src/features/block-canvas/component/ModalsProvider.tsx
index 600b59a1dc..d0851727b8 100644
--- a/apps/web/src/features/block-canvas/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-canvas/component/ModalsProvider.tsx
@@ -1,6 +1,3 @@
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
ShareBlockModal,
ShareDialogContext,
@@ -9,7 +6,6 @@ import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const documentId = useBlockId();
const fileName = useBlockDocumentName('Unknown Filename');
const [shareOpen, setShareOpen] = createSignal(false);
return (
@@ -21,8 +17,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <ReferencesDrawer documentId={documentId} documentName={fileName()} />
- <DetailsDrawer documentId={documentId} />
<ShareBlockModal name={fileName()} />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-canvas/component/TopBar.tsx b/apps/web/src/features/block-canvas/component/TopBar.tsx
index 6cd2691379..ae253afa83 100644
--- a/apps/web/src/features/block-canvas/component/TopBar.tsx
+++ b/apps/web/src/features/block-canvas/component/TopBar.tsx
@@ -8,28 +8,20 @@ import {
ResponsiveBlockToolbar,
ResponsivePermissionsBadge,
} from '@components/app/ResponsiveBlockToolbar';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
import {
SplitHeaderLeft,
SplitHeaderRight,
} from '@components/app/split-layout/components/SplitHeader';
import { BlockItemSplitLabel } from '@components/app/split-layout/components/SplitLabel';
-import { useIsAuthenticated } from '@core/auth';
import { useBlockId } from '@core/block';
-import { DETAILS_DRAWER_ID } from '@core/component/DetailsDrawer';
import { BlockLiveIndicators } from '@core/component/LiveIndicators';
-import {
- REFERENCES_DRAWER_ID,
- ReferencesButton,
-} from '@core/component/ReferencesModal';
import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { ENABLE_REFERENCES_MODAL } from '@core/constant/featureFlags';
import { blockFileSignal } from '@core/signal/load';
import {
useBlockDocumentDownloadName,
@@ -38,8 +30,6 @@ import {
import { buildSimpleEntityUrl } from '@core/util/url';
import { downloadFile } from '@filesystem/download';
import DownloadSimple from '@phosphor/download-simple.svg';
-import Info from '@phosphor/info.svg';
-import Quotes from '@phosphor/quotes.svg';
import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import { onMount } from 'solid-js';
@@ -51,8 +41,6 @@ import { useRenderState } from '../store/RenderState';
export function TopBar() {
const analytics = useAnalytics();
- const isAuth = useIsAuthenticated();
-
const toolManager = useToolManager();
const { getLocation } = useRenderState();
const [getCurrentSavedFile] =
@@ -62,8 +50,6 @@ export function TopBar() {
const downloadName = useBlockDocumentDownloadName('Unknown Filename');
const canvasFile = blockFileSignal.get;
- const referencesControl = useDrawerControl(REFERENCES_DRAWER_ID);
- const detailsControl = useDrawerControl(DETAILS_DRAWER_ID);
const shareCtx = useShareDialogContext();
let ref!: HTMLDivElement;
@@ -103,11 +89,6 @@ export function TopBar() {
};
const ops: FileOperation[] = [
- {
- label: 'Details',
- icon: Info,
- action: detailsControl.toggle,
- },
{ op: 'copy' },
{ op: 'rename' },
{ op: 'moveToProject' },
@@ -132,19 +113,6 @@ export function TopBar() {
fileType: 'canvas',
}),
},
- {
- label: 'References',
- icon: Quotes,
- action: referencesControl.toggle,
- condition: () => !!isAuth() && ENABLE_REFERENCES_MODAL,
- buttonComponent: () => (
- <ReferencesButton
- documentId={documentId}
- documentName={fileName()}
- buttonSize="sm"
- />
- ),
- },
{
group: 'sharing',
label: 'Share',
diff --git a/apps/web/src/features/block-chat/component/ModalsProvider.tsx b/apps/web/src/features/block-chat/component/ModalsProvider.tsx
index 8fdf2bf308..b5c8846656 100644
--- a/apps/web/src/features/block-chat/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-chat/component/ModalsProvider.tsx
@@ -1,17 +1,10 @@
-import { DEFAULT_CHAT_NAME } from '@block-chat/definition';
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
ShareBlockModal,
ShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const blockId = useBlockId();
- const name = useBlockDocumentName(DEFAULT_CHAT_NAME);
const [shareOpen, setShareOpen] = createSignal(false);
return (
<ShareDialogContext.Provider
@@ -22,12 +15,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <ReferencesDrawer
- documentId={blockId}
- documentName={name()}
- entityType="chat"
- />
- <DetailsDrawer chatId={blockId} />
<ShareBlockModal />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-chat/component/TopBar.tsx b/apps/web/src/features/block-chat/component/TopBar.tsx
index 4fc38fff0a..d247e75591 100644
--- a/apps/web/src/features/block-chat/component/TopBar.tsx
+++ b/apps/web/src/features/block-chat/component/TopBar.tsx
@@ -4,7 +4,6 @@ import {
ResponsiveBlockToolbar,
ResponsivePermissionsBadge,
} from '@components/app/ResponsiveBlockToolbar';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';
import { BlockItemSplitLabel } from '@components/app/split-layout/components/SplitLabel';
@@ -12,7 +11,6 @@ import { useBlockId } from '@core/block';
import { ProviderIcon } from '@core/component/AI/component/ProviderIcon';
import { useChatInputContext } from '@core/component/AI/context';
import { useOpenInstructionsMd } from '@core/component/AI/util/instructions';
-import { DETAILS_DRAWER_ID } from '@core/component/DetailsDrawer';
import {
getShareDrawerRecipientInput,
ShareTrigger,
@@ -21,7 +19,6 @@ import {
import { DEV_MODE_ENV } from '@core/constant/featureFlags';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import ChatDebugIcon from '@phosphor/chat-text.svg';
-import Info from '@phosphor/info.svg';
import Notepad from '@phosphor/notepad.svg';
import IconShared from '@phosphor/share.svg';
import type { Accessor } from 'solid-js';
@@ -38,15 +35,9 @@ export function TopBar(props: {
const openInstructions = useOpenInstructionsMd();
- const detailsControl = useDrawerControl(DETAILS_DRAWER_ID);
const shareCtx = useShareDialogContext();
const ops: FileOperation[] = [
- {
- label: 'Details',
- icon: Info,
- action: detailsControl.toggle,
- },
{
label: 'Edit AI Instructions',
icon: Notepad,
diff --git a/apps/web/src/features/block-code/component/ModalsProvider.tsx b/apps/web/src/features/block-code/component/ModalsProvider.tsx
index 433b135a9a..b5c8846656 100644
--- a/apps/web/src/features/block-code/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-code/component/ModalsProvider.tsx
@@ -1,16 +1,10 @@
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
ShareBlockModal,
ShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const blockId = useBlockId();
- const name = useBlockDocumentName();
const [shareOpen, setShareOpen] = createSignal(false);
return (
<ShareDialogContext.Provider
@@ -21,8 +15,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <ReferencesDrawer documentId={blockId} documentName={name()} />
- <DetailsDrawer documentId={blockId} />
<ShareBlockModal />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-code/component/TopBar.tsx b/apps/web/src/features/block-code/component/TopBar.tsx
index 0f77b8b65d..d6ac76e252 100644
--- a/apps/web/src/features/block-code/component/TopBar.tsx
+++ b/apps/web/src/features/block-code/component/TopBar.tsx
@@ -4,24 +4,16 @@ import {
ResponsiveBlockToolbar,
ResponsivePermissionsBadge,
} from '@components/app/ResponsiveBlockToolbar';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';
import { BlockItemSplitLabel } from '@components/app/split-layout/components/SplitLabel';
import { SplitToolbarRight } from '@components/app/split-layout/components/SplitToolbar';
-import { useIsAuthenticated } from '@core/auth';
import { useBlockId } from '@core/block';
-import { DETAILS_DRAWER_ID } from '@core/component/DetailsDrawer';
-import {
- REFERENCES_DRAWER_ID,
- ReferencesButton,
-} from '@core/component/ReferencesModal';
import {
getShareDrawerRecipientInput,
ShareTrigger,
useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { ENABLE_REFERENCES_MODAL } from '@core/constant/featureFlags';
import { isMobile } from '@core/mobile/isMobile';
import { blockTextSignal } from '@core/signal/load';
import {
@@ -30,8 +22,6 @@ import {
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
import Download from '@phosphor/download-simple.svg';
-import Info from '@phosphor/info.svg';
-import Quotes from '@phosphor/quotes.svg';
import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import type { Component } from 'solid-js';
@@ -47,15 +37,11 @@ export const TopBar: Component<{
}> = (props) => {
const analytics = useAnalytics();
- const isAuth = useIsAuthenticated();
-
const blockId = useBlockId();
const text = blockTextSignal.get;
const name = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
- const referencesControl = useDrawerControl(REFERENCES_DRAWER_ID);
- const detailsControl = useDrawerControl(DETAILS_DRAWER_ID);
const shareCtx = useShareDialogContext();
const downloadDocument = createCallback(() => {
@@ -67,11 +53,6 @@ export const TopBar: Component<{
});
const ops: FileOperation[] = [
- {
- label: 'Details',
- icon: Info,
- action: detailsControl.toggle,
- },
{ op: 'rename' },
{ op: 'copy' },
{ op: 'moveToProject' },
@@ -85,19 +66,6 @@ export const TopBar: Component<{
];
const tools: BlockTool[] = [
- {
- label: 'References',
- icon: Quotes,
- action: referencesControl.toggle,
- condition: () => !!isAuth() && ENABLE_REFERENCES_MODAL,
- buttonComponent: () => (
- <ReferencesButton
- documentId={blockId}
- documentName={name()}
- buttonSize="sm"
- />
- ),
- },
{
group: 'sharing',
label: 'Share',
diff --git a/apps/web/src/features/block-image/component/ModalsProvider.tsx b/apps/web/src/features/block-image/component/ModalsProvider.tsx
index 433b135a9a..b5c8846656 100644
--- a/apps/web/src/features/block-image/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-image/component/ModalsProvider.tsx
@@ -1,16 +1,10 @@
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
ShareBlockModal,
ShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const blockId = useBlockId();
- const name = useBlockDocumentName();
const [shareOpen, setShareOpen] = createSignal(false);
return (
<ShareDialogContext.Provider
@@ -21,8 +15,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <ReferencesDrawer documentId={blockId} documentName={name()} />
- <DetailsDrawer documentId={blockId} />
<ShareBlockModal />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-image/component/TopBar.tsx b/apps/web/src/features/block-image/component/TopBar.tsx
index eb5bccea68..184a96e516 100644
--- a/apps/web/src/features/block-image/component/TopBar.tsx
+++ b/apps/web/src/features/block-image/component/TopBar.tsx
@@ -3,25 +3,17 @@ import {
ResponsiveBlockToolbar,
ResponsivePermissionsBadge,
} from '@components/app/ResponsiveBlockToolbar';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';
import { BlockItemSplitLabel } from '@components/app/split-layout/components/SplitLabel';
-import { useIsAuthenticated } from '@core/auth';
import { useBlockId } from '@core/block';
-import { DETAILS_DRAWER_ID } from '@core/component/DetailsDrawer';
import { FileTypeChip } from '@core/component/FileTypeChip';
-import {
- REFERENCES_DRAWER_ID,
- ReferencesButton,
-} from '@core/component/ReferencesModal';
import {
getShareDrawerRecipientInput,
ShareTrigger,
useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { ENABLE_REFERENCES_MODAL } from '@core/constant/featureFlags';
import { blockFileSignal } from '@core/signal/load';
import {
useBlockDocumentDownloadName,
@@ -29,20 +21,15 @@ import {
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
import Download from '@phosphor/download.svg';
-import Info from '@phosphor/info.svg';
-import Quotes from '@phosphor/quotes.svg';
import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
export function TopBar() {
- const isAuth = useIsAuthenticated();
const blockId = useBlockId();
const imageFile = blockFileSignal.get;
const name = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
- const referencesControl = useDrawerControl(REFERENCES_DRAWER_ID);
- const detailsControl = useDrawerControl(DETAILS_DRAWER_ID);
const shareCtx = useShareDialogContext();
const downloadDocument = createCallback(async () => {
@@ -52,11 +39,6 @@ export function TopBar() {
});
const ops: FileOperation[] = [
- {
- label: 'Details',
- icon: Info,
- action: detailsControl.toggle,
- },
{ op: 'rename' },
{ op: 'copy' },
{ op: 'moveToProject' },
@@ -70,19 +52,6 @@ export function TopBar() {
];
const tools: BlockTool[] = [
- {
- label: 'References',
- icon: Quotes,
- action: referencesControl.toggle,
- condition: () => !!isAuth() && ENABLE_REFERENCES_MODAL,
- buttonComponent: () => (
- <ReferencesButton
- documentId={blockId}
- documentName={name()}
- buttonSize="sm"
- />
- ),
- },
{
group: 'sharing',
label: 'Share',
diff --git a/apps/web/src/features/block-md/component/ModalsProvider.tsx b/apps/web/src/features/block-md/component/ModalsProvider.tsx
index a49d028a94..ab548a2c6e 100644
--- a/apps/web/src/features/block-md/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-md/component/ModalsProvider.tsx
@@ -1,7 +1,5 @@
import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
import { NotificationsDrawer } from '@core/component/NotificationsModal';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import { Permissions } from '@core/component/SharePermissions';
import {
ShareDialogContext,
@@ -66,11 +64,6 @@ export function ModalsProvider(
entity={{ id: documentId(), type: 'document' }}
notificationSource={notificationSource}
/>
- <ReferencesDrawer
- documentId={documentId()}
- documentName={displayName()}
- />
- <DetailsDrawer documentId={documentId()} />
<Suspense>
<ShareModal
isSharePermOpen={shareOpen()}
diff --git a/apps/web/src/features/block-pdf/component/ModalsProvider.tsx b/apps/web/src/features/block-pdf/component/ModalsProvider.tsx
index 600b59a1dc..d0851727b8 100644
--- a/apps/web/src/features/block-pdf/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-pdf/component/ModalsProvider.tsx
@@ -1,6 +1,3 @@
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
ShareBlockModal,
ShareDialogContext,
@@ -9,7 +6,6 @@ import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const documentId = useBlockId();
const fileName = useBlockDocumentName('Unknown Filename');
const [shareOpen, setShareOpen] = createSignal(false);
return (
@@ -21,8 +17,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <ReferencesDrawer documentId={documentId} documentName={fileName()} />
- <DetailsDrawer documentId={documentId} />
<ShareBlockModal name={fileName()} />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx b/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx
index e1b256fb9f..6f4a80a501 100644
--- a/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx
+++ b/apps/web/src/features/block-pdf/component/PdfSplitToolbar.tsx
@@ -10,7 +10,7 @@ import { usePdfDocument } from '../context/pdf-document-context';
import { MarkupToolbar } from './MarkupToolbar';
import { PageNumberInput } from './PageNumberInput';
-function TabsToggle() {
+export function PdfTabsToggle() {
const pdf = usePdfDocument();
const canEdit = pdf.permissions.canEdit;
const [showTabBar, setShowTabBar] = pdf.state.signals.showTabBar;
@@ -31,21 +31,27 @@ function TabsToggle() {
);
}
+export function PdfToolbarControls() {
+ return (
+ <div class="flex items-center gap-2">
+ <PageNumberInput />
+ <Show when={ENABLE_PDF_MARKUP}>
+ <div class="h-5 w-px bg-edge" />
+ <MarkupToolbar />
+ </Show>
+ </div>
+ );
+}
+
export function PdfSplitToolbar() {
const [documentProxy] = usePdfDocument().state.signals.documentProxy;
return (
<Show when={documentProxy()}>
<SplitToolbarLeft>
- <div class="flex items-center gap-2">
- <PageNumberInput />
- <Show when={ENABLE_PDF_MARKUP}>
- <div class="h-5 w-px bg-edge" />
- <MarkupToolbar />
- </Show>
- </div>
+ <PdfToolbarControls />
</SplitToolbarLeft>
<SplitToolbarRight>
- <TabsToggle />
+ <PdfTabsToggle />
</SplitToolbarRight>
</Show>
);
diff --git a/apps/web/src/features/block-pdf/component/TopBar.tsx b/apps/web/src/features/block-pdf/component/TopBar.tsx
index 24de60a93e..47caad1085 100644
--- a/apps/web/src/features/block-pdf/component/TopBar.tsx
+++ b/apps/web/src/features/block-pdf/component/TopBar.tsx
@@ -12,7 +12,6 @@ import {
ResponsiveBlockToolbar,
ResponsivePermissionsBadge,
} from '@components/app/ResponsiveBlockToolbar';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
import {
SplitHeaderLeft,
@@ -22,10 +21,6 @@ import { BlockItemSplitLabel } from '@components/app/split-layout/components/Spl
import { useIsAuthenticated } from '@core/auth';
import { useBlockId, useBlockName } from '@core/block';
import { BlockLiveIndicators } from '@core/component/LiveIndicators';
-import {
- REFERENCES_DRAWER_ID,
- ReferencesButton,
-} from '@core/component/ReferencesModal';
import { toast } from '@core/component/Toast/Toast';
import { openLoginModal } from '@core/component/TopBar/LoginButton';
import {
@@ -33,14 +28,12 @@ import {
ShareTrigger,
useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { ENABLE_REFERENCES_MODAL } from '@core/constant/featureFlags';
import { blockMetadataSignal } from '@core/signal/load';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { platformFetch } from '@core/util/platformFetch';
import { downloadFile } from '@filesystem/download';
import DownloadIcon from '@phosphor/download-simple.svg';
import Printer from '@phosphor/printer.svg';
-import Quotes from '@phosphor/quotes.svg';
import IconShared from '@phosphor/share.svg';
import {
blockNameToItemType,
@@ -61,7 +54,6 @@ export function TopBar() {
const hasComments = useHasComments();
const fileName = useBlockDocumentName('Unknown Filename');
- const referencesControl = useDrawerControl(REFERENCES_DRAWER_ID);
const shareCtx = useShareDialogContext();
const createShareUrl = useCreateShareUrl();
@@ -183,19 +175,6 @@ export function TopBar() {
];
const tools: BlockTool[] = [
- {
- label: 'References',
- icon: Quotes,
- action: referencesControl.toggle,
- condition: () => !!isAuth() && ENABLE_REFERENCES_MODAL,
- buttonComponent: () => (
- <ReferencesButton
- documentId={documentId}
- documentName={fileName()}
- buttonSize="sm"
- />
- ),
- },
{
label: 'Chat',
icon: ChatWithAgentIcon,
diff --git a/apps/web/src/features/block-project/component/ModalsProvider.tsx b/apps/web/src/features/block-project/component/ModalsProvider.tsx
index f6fff30f71..830de06d73 100644
--- a/apps/web/src/features/block-project/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-project/component/ModalsProvider.tsx
@@ -1,6 +1,5 @@
import { getIsSpecialProject } from '@block-project/isSpecial';
import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
import {
ShareBlockModal,
ShareDialogContext,
@@ -24,7 +23,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <DetailsDrawer projectId={id} />
<Show when={ENABLE_PROJECT_SHARING && !isSpecialProject}>
<ShareBlockModal name={name()} owner={owner()} />
</Show>
diff --git a/apps/web/src/features/block-project/component/TopBar.tsx b/apps/web/src/features/block-project/component/TopBar.tsx
index 268070005d..3fdadc5bc1 100644
--- a/apps/web/src/features/block-project/component/TopBar.tsx
+++ b/apps/web/src/features/block-project/component/TopBar.tsx
@@ -11,7 +11,6 @@ import {
ToolButton,
} from '@components/app/ResponsiveBlockToolbar';
import { PreviewButton } from '@components/app/split-layout/components/PreviewButton';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import {
BlockSplitFileMenu,
type FileOperation,
@@ -29,7 +28,6 @@ import {
SplitToolbarRight,
} from '@components/app/split-layout/components/SplitToolbar';
import { useBlockId } from '@core/block';
-import { DETAILS_DRAWER_ID } from '@core/component/DetailsDrawer';
import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
@@ -40,7 +38,6 @@ import { ENABLE_PROJECT_SHARING } from '@core/constant/featureFlags';
import { isMobile } from '@core/mobile/isMobile';
import { useCanEdit, useIsDocumentOwner } from '@core/signal/permissions';
import { buildSimpleEntityUrl } from '@core/util/url';
-import Info from '@phosphor/info.svg';
import IconShared from '@phosphor/share.svg';
import { createMemo, For, Show } from 'solid-js';
import { ProjectCreateMenu, useProjectCreateTools } from './ProjectCreateMenu';
@@ -57,7 +54,6 @@ export function TopBar() {
() => projectBlockDataSignal()?.projectMetadata.name ?? ''
);
- const detailsControl = useDrawerControl(DETAILS_DRAWER_ID);
const shareCtx = useShareDialogContext();
function handleCopyLink() {
@@ -71,15 +67,6 @@ export function TopBar() {
}
const ops = createMemo<FileOperation[]>(() => [
- ...(!isSpecialProject
- ? [
- {
- label: 'Details',
- icon: Info,
- action: detailsControl.toggle,
- },
- ]
- : []),
...(isOwner() && !isSpecialProject
? [
{ op: 'rename' as const },
diff --git a/apps/web/src/features/block-unknown/component/ModalsProvider.tsx b/apps/web/src/features/block-unknown/component/ModalsProvider.tsx
index 01916276e3..b5c8846656 100644
--- a/apps/web/src/features/block-unknown/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-unknown/component/ModalsProvider.tsx
@@ -1,16 +1,10 @@
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
ShareBlockModal,
ShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const blockId = useBlockId();
- const fileName = useBlockDocumentName();
const [shareOpen, setShareOpen] = createSignal(false);
return (
<ShareDialogContext.Provider
@@ -21,8 +15,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <ReferencesDrawer documentId={blockId} documentName={fileName()} />
- <DetailsDrawer documentId={blockId} />
<ShareBlockModal />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-unknown/component/TopBar.tsx b/apps/web/src/features/block-unknown/component/TopBar.tsx
index db83975496..863b0ee81f 100644
--- a/apps/web/src/features/block-unknown/component/TopBar.tsx
+++ b/apps/web/src/features/block-unknown/component/TopBar.tsx
@@ -3,47 +3,34 @@ import {
ResponsiveBlockToolbar,
ResponsivePermissionsBadge,
} from '@components/app/ResponsiveBlockToolbar';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';
import { BlockItemSplitLabel } from '@components/app/split-layout/components/SplitLabel';
-import { useIsAuthenticated } from '@core/auth';
import { useBlockId } from '@core/block';
-import { DETAILS_DRAWER_ID } from '@core/component/DetailsDrawer';
import { FileTypeChip } from '@core/component/FileTypeChip';
-import {
- REFERENCES_DRAWER_ID,
- ReferencesButton,
-} from '@core/component/ReferencesModal';
import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { ENABLE_REFERENCES_MODAL } from '@core/constant/featureFlags';
import {
useBlockDocumentDownloadName,
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
import DownloadSimple from '@phosphor/download-simple.svg';
-import Info from '@phosphor/info.svg';
-import Quotes from '@phosphor/quotes.svg';
import IconShared from '@phosphor/share.svg';
import { createCallback } from '@solid-primitives/rootless';
import { useGetFileBlob } from '../signal/blockData';
export function TopBar() {
- const isAuth = useIsAuthenticated();
const blockId = useBlockId();
const fileName = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
const getBlob = useGetFileBlob();
- const referencesControl = useDrawerControl(REFERENCES_DRAWER_ID);
- const detailsControl = useDrawerControl(DETAILS_DRAWER_ID);
const shareCtx = useShareDialogContext();
const downloadDocument = createCallback(async () => {
@@ -57,11 +44,6 @@ export function TopBar() {
});
const ops: FileOperation[] = [
- {
- label: 'Details',
- icon: Info,
- action: detailsControl.toggle,
- },
{ op: 'rename' },
{ op: 'copy' },
{ op: 'moveToProject' },
@@ -75,19 +57,6 @@ export function TopBar() {
];
const tools: BlockTool[] = [
- {
- label: 'References',
- icon: Quotes,
- action: referencesControl.toggle,
- condition: () => !!isAuth() && ENABLE_REFERENCES_MODAL,
- buttonComponent: () => (
- <ReferencesButton
- documentId={blockId}
- documentName={fileName()}
- buttonSize="sm"
- />
- ),
- },
{
group: 'sharing',
label: 'Share',
diff --git a/apps/web/src/features/block-video/component/ModalsProvider.tsx b/apps/web/src/features/block-video/component/ModalsProvider.tsx
index 01916276e3..b5c8846656 100644
--- a/apps/web/src/features/block-video/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-video/component/ModalsProvider.tsx
@@ -1,16 +1,10 @@
-import { useBlockId } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
ShareBlockModal,
ShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { createSignal, type ParentProps } from 'solid-js';
export function ModalsProvider(props: ParentProps) {
- const blockId = useBlockId();
- const fileName = useBlockDocumentName();
const [shareOpen, setShareOpen] = createSignal(false);
return (
<ShareDialogContext.Provider
@@ -21,8 +15,6 @@ export function ModalsProvider(props: ParentProps) {
}}
>
{props.children}
- <ReferencesDrawer documentId={blockId} documentName={fileName()} />
- <DetailsDrawer documentId={blockId} />
<ShareBlockModal />
</ShareDialogContext.Provider>
);
diff --git a/apps/web/src/features/block-video/component/TopBar.tsx b/apps/web/src/features/block-video/component/TopBar.tsx
index 3c5ec3c23f..6a7fcb7f08 100644
--- a/apps/web/src/features/block-video/component/TopBar.tsx
+++ b/apps/web/src/features/block-video/component/TopBar.tsx
@@ -3,33 +3,23 @@ import {
ResponsiveBlockToolbar,
ResponsivePermissionsBadge,
} from '@components/app/ResponsiveBlockToolbar';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';
import { BlockItemSplitLabel } from '@components/app/split-layout/components/SplitLabel';
-import { useIsAuthenticated } from '@core/auth';
import { useBlockId } from '@core/block';
-import { DETAILS_DRAWER_ID } from '@core/component/DetailsDrawer';
-import {
- REFERENCES_DRAWER_ID,
- ReferencesButton,
-} from '@core/component/ReferencesModal';
import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { ENABLE_REFERENCES_MODAL } from '@core/constant/featureFlags';
import {
useBlockDocumentDownloadName,
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
import Download from '@phosphor/download.svg';
-import Info from '@phosphor/info.svg';
-import Quotes from '@phosphor/quotes.svg';
import IconShared from '@phosphor/share.svg';
import Spinner from '@phosphor/spinner.svg';
import { createCallback } from '@solid-primitives/rootless';
@@ -37,14 +27,11 @@ import { createSignal } from 'solid-js';
import { useGetFileBlob } from '../signal/blockData';
export function TopBar() {
- const isAuth = useIsAuthenticated();
const blockId = useBlockId();
const name = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
const getBlob = useGetFileBlob();
- const referencesControl = useDrawerControl(REFERENCES_DRAWER_ID);
- const detailsControl = useDrawerControl(DETAILS_DRAWER_ID);
const shareCtx = useShareDialogContext();
const downloadDocument = createCallback(async () => {
@@ -74,11 +61,6 @@ export function TopBar() {
});
const ops: FileOperation[] = [
- {
- label: 'Details',
- icon: Info,
- action: detailsControl.toggle,
- },
{ op: 'rename' },
{ op: 'copy' },
{ op: 'moveToProject' },
@@ -92,19 +74,6 @@ export function TopBar() {
];
const tools: BlockTool[] = [
- {
- label: 'References',
- icon: Quotes,
- action: referencesControl.toggle,
- condition: () => !!isAuth() && ENABLE_REFERENCES_MODAL,
- buttonComponent: () => (
- <ReferencesButton
- documentId={blockId}
- documentName={name()}
- buttonSize="sm"
- />
- ),
- },
{
group: 'sharing',
label: 'Share',
diff --git a/apps/web/src/features/drive-view/components/FileDetail.tsx b/apps/web/src/features/drive-view/components/FileDetail.tsx
index 79e0049438..176286ee3c 100644
--- a/apps/web/src/features/drive-view/components/FileDetail.tsx
+++ b/apps/web/src/features/drive-view/components/FileDetail.tsx
@@ -3,8 +3,6 @@ import {
SidePanel,
} from '@components/app/side-panel';
import type { BlockAlias, BlockName } from '@core/block';
-import { DetailsDrawer } from '@core/component/DetailsDrawer';
-import { ReferencesDrawer } from '@core/component/ReferencesModal';
import {
getPermissions,
hasPermissions,
@@ -80,11 +78,6 @@ export function FileDetailLayout(props: FileDetailLayoutProps) {
{props.children}
</div>
</SidePanel.Layout>
- <ReferencesDrawer
- documentId={props.documentId}
- documentName={documentName()}
- />
- <DetailsDrawer documentId={props.documentId} />
<Suspense>
<ShareModal
isSharePermOpen={shareOpen()}
diff --git a/apps/web/src/features/drive-view/queries/canvas-document.ts b/apps/web/src/features/drive-view/queries/canvas-document.ts
new file mode 100644
index 0000000000..3abcc3037a
--- /dev/null
+++ b/apps/web/src/features/drive-view/queries/canvas-document.ts
@@ -0,0 +1,24 @@
+import { throwOnErr } from '@core/util/result';
+import { fetchBinaryDocumentData } from '@queries/storage/binary-document';
+import type { AccessLevel } from '@service-storage/generated/schemas/accessLevel';
+import type { DocumentMetadata } from '@service-storage/generated/schemas/documentMetadata';
+import { fetchBinary } from '@service-storage/util/fetchBinary';
+
+export type CanvasDocumentData = {
+ documentMetadata: DocumentMetadata;
+ userAccessLevel: AccessLevel;
+ file: Blob;
+};
+
+export async function loadCanvasDocument(
+ documentId: string
+): Promise<CanvasDocumentData> {
+ const data = await throwOnErr(() => fetchBinaryDocumentData(documentId));
+ const file = await throwOnErr(() => fetchBinary(data.blobUrl, 'blob'));
+
+ return {
+ documentMetadata: data.documentMetadata,
+ userAccessLevel: data.userAccessLevel,
+ file,
+ };
+}
diff --git a/apps/web/src/features/drive-view/queries/pdf-document.ts b/apps/web/src/features/drive-view/queries/pdf-document.ts
new file mode 100644
index 0000000000..128a0f6c32
--- /dev/null
+++ b/apps/web/src/features/drive-view/queries/pdf-document.ts
@@ -0,0 +1,38 @@
+import PdfJsWorker from '@block-pdf/PdfViewer/pdfjs-worker?worker';
+import { throwOnErr } from '@core/util/result';
+import { fetchBinaryDocumentData } from '@queries/storage/binary-document';
+import type { AccessLevel } from '@service-storage/generated/schemas/accessLevel';
+import type { DocumentMetadata } from '@service-storage/generated/schemas/documentMetadata';
+import type { GetDocumentResponseDataViewLocation } from '@service-storage/generated/schemas/getDocumentResponseDataViewLocation';
+import { fetchBinary } from '@service-storage/util/fetchBinary';
+import type { PDFDocumentProxy } from 'pdfjs-dist/types/src/display/api';
+
+export type PdfDocumentData = {
+ documentMetadata: DocumentMetadata;
+ userAccessLevel: AccessLevel;
+ documentProxy: PDFDocumentProxy;
+ viewLocation?: GetDocumentResponseDataViewLocation;
+};
+
+export async function loadPdfDocument(
+ documentId: string
+): Promise<PdfDocumentData> {
+ const { getDocument, GlobalWorkerOptions } = await import('pdfjs-dist');
+ if (!GlobalWorkerOptions.workerPort) {
+ GlobalWorkerOptions.workerPort = new PdfJsWorker();
+ }
+
+ const data = await throwOnErr(() => fetchBinaryDocumentData(documentId));
+ const blob = await throwOnErr(() => fetchBinary(data.blobUrl, 'blob'));
+ const task = getDocument({
+ data: new Uint8Array(await blob.arrayBuffer()),
+ isEvalSupported: false,
+ });
+
+ return {
+ documentMetadata: data.documentMetadata,
+ userAccessLevel: data.userAccessLevel,
+ documentProxy: await task.promise,
+ viewLocation: data.viewLocation,
+ };
+}
diff --git a/apps/web/src/features/drive-view/views/CanvasDetail.tsx b/apps/web/src/features/drive-view/views/CanvasDetail.tsx
new file mode 100644
index 0000000000..876c7ce67f
--- /dev/null
+++ b/apps/web/src/features/drive-view/views/CanvasDetail.tsx
@@ -0,0 +1,90 @@
+import { CanvasDocument } from '@block-canvas/component/CanvasDocument';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import {
+ getPermissions,
+ hasPermissions,
+ Permissions,
+} from '@core/component/SharePermissions';
+import { useSearchParams } from '@solidjs/router';
+import type { JSX } from 'solid-js';
+import {
+ FileDetailLayout,
+ FileDetailLoadGate,
+ type FileDetailShareProps,
+} from '../components/FileDetail';
+import {
+ type CanvasDocumentData,
+ loadCanvasDocument,
+} from '../queries/canvas-document';
+
+export type CanvasDetailContext = {
+ data: CanvasDocumentData;
+};
+
+export function CanvasDetailDocument(
+ props: FileDetailShareProps & {
+ documentId: string;
+ data: CanvasDocumentData;
+ children?: (context: CanvasDetailContext) => JSX.Element;
+ }
+) {
+ const panel = useSplitPanelOrThrow();
+ const [searchParams] = useSearchParams();
+ const canEdit = () =>
+ hasPermissions(
+ getPermissions(props.data.userAccessLevel),
+ Permissions.CAN_EDIT
+ );
+
+ return (
+ <FileDetailLayout
+ documentId={props.documentId}
+ documentMetadata={props.data.documentMetadata}
+ userAccessLevel={props.data.userAccessLevel}
+ blockType="canvas"
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ >
+ {props.children?.({ data: props.data })}
+ <CanvasDocument
+ documentId={props.documentId}
+ file={props.data.file}
+ canEdit={canEdit()}
+ hotkeyScope={panel.splitHotkeyScope}
+ portalScope="split"
+ locationParams={searchParams}
+ >
+ {(content) => (
+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
+ {content}
+ </div>
+ )}
+ </CanvasDocument>
+ </FileDetailLayout>
+ );
+}
+
+export function CanvasDetail(
+ props: FileDetailShareProps & {
+ documentId: string;
+ children?: (context: CanvasDetailContext) => JSX.Element;
+ }
+) {
+ return (
+ <FileDetailLoadGate
+ documentId={props.documentId}
+ label="canvas"
+ load={loadCanvasDocument}
+ >
+ {(data) => (
+ <CanvasDetailDocument
+ documentId={props.documentId}
+ data={data}
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ children={props.children}
+ />
+ )}
+ </FileDetailLoadGate>
+ );
+}
diff --git a/apps/web/src/features/drive-view/views/PdfDetail.tsx b/apps/web/src/features/drive-view/views/PdfDetail.tsx
new file mode 100644
index 0000000000..31e347dbdd
--- /dev/null
+++ b/apps/web/src/features/drive-view/views/PdfDetail.tsx
@@ -0,0 +1,153 @@
+import {
+ PdfDocument,
+ PdfDocumentContent,
+} from '@block-pdf/component/PdfDocument';
+import {
+ PdfTabsToggle,
+ PdfToolbarControls,
+} from '@block-pdf/component/PdfSplitToolbar';
+import { Tabs } from '@block-pdf/component/Tabs';
+import { usePdfDocument } from '@block-pdf/context/pdf-document-context';
+import {
+ type LocationSearchParams,
+ URL_PARAMS,
+} from '@block-pdf/signal/location';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import {
+ getPermissions,
+ hasPermissions,
+ Permissions,
+} from '@core/component/SharePermissions';
+import { useSearchParams } from '@solidjs/router';
+import type { JSX } from 'solid-js';
+import { Show } from 'solid-js';
+import {
+ FileDetailLayout,
+ FileDetailLoadGate,
+ type FileDetailShareProps,
+} from '../components/FileDetail';
+import { loadPdfDocument, type PdfDocumentData } from '../queries/pdf-document';
+
+export type PdfDetailContext = {
+ data: PdfDocumentData;
+};
+
+function PdfDetailContent() {
+ const pdf = usePdfDocument();
+ const [documentProxy] = pdf.state.signals.documentProxy;
+ const [showTabBar] = pdf.state.signals.showTabBar;
+
+ return (
+ <>
+ <Show when={documentProxy()}>
+ <div class="flex min-h-11 shrink-0 items-center gap-2 border-edge-muted border-b px-2">
+ <PdfToolbarControls />
+ <div class="ml-auto">
+ <PdfTabsToggle />
+ </div>
+ </div>
+ </Show>
+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
+ <Show when={showTabBar()}>
+ <div class="flex min-h-11 items-center justify-between gap-2 px-2">
+ <div class="customScrollbar w-0 grow overflow-x-auto overflow-y-hidden">
+ <Tabs />
+ </div>
+ </div>
+ </Show>
+ <PdfDocumentContent />
+ </div>
+ </>
+ );
+}
+
+export function PdfDetailDocument(
+ props: FileDetailShareProps & {
+ documentId: string;
+ data: PdfDocumentData;
+ children?: (context: PdfDetailContext) => JSX.Element;
+ }
+) {
+ const panel = useSplitPanelOrThrow();
+ const [searchParams] = useSearchParams();
+ const permissions = () => getPermissions(props.data.userAccessLevel);
+
+ return (
+ <FileDetailLayout
+ documentId={props.documentId}
+ documentMetadata={props.data.documentMetadata}
+ userAccessLevel={props.data.userAccessLevel}
+ blockType="pdf"
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ >
+ {props.children?.({ data: props.data })}
+ <PdfDocument
+ documentId={props.documentId}
+ documentVersionId={props.data.documentMetadata.documentVersionId}
+ documentName={
+ props.data.documentMetadata.documentName ?? 'Unknown Filename'
+ }
+ documentProxy={props.data.documentProxy}
+ viewLocation={props.data.viewLocation}
+ modificationData={props.data.documentMetadata.modificationData}
+ hotkeyScope={panel.splitHotkeyScope}
+ portalScope="split"
+ permissions={{
+ canComment: hasPermissions(permissions(), Permissions.CAN_COMMENT),
+ canEdit: hasPermissions(permissions(), Permissions.CAN_EDIT),
+ isOwner: props.data.userAccessLevel === 'owner',
+ }}
+ locationParams={getLocationParams(searchParams)}
+ >
+ <PdfDetailContent />
+ </PdfDocument>
+ </FileDetailLayout>
+ );
+}
+
+export function PdfDetail(
+ props: FileDetailShareProps & {
+ documentId: string;
+ children?: (context: PdfDetailContext) => JSX.Element;
+ }
+) {
+ return (
+ <FileDetailLoadGate
+ documentId={props.documentId}
+ label="PDF"
+ load={loadPdfDocument}
+ >
+ {(data) => (
+ <PdfDetailDocument
+ documentId={props.documentId}
+ data={data}
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ children={props.children}
+ />
+ )}
+ </FileDetailLoadGate>
+ );
+}
+
+function getLocationParams(
+ params: Partial<Record<string, string | string[] | undefined>>
+): LocationSearchParams {
+ const value = (key: string) => {
+ const param = params[key];
+ return Array.isArray(param) ? param[0] : param;
+ };
+ return {
+ annotationId: value(URL_PARAMS.annotationId),
+ searchPage: value(URL_PARAMS.searchPage),
+ searchSnippet: value(URL_PARAMS.searchSnippet),
+ searchRawQuery: value(URL_PARAMS.searchRawQuery),
+ highlightTerms: value(URL_PARAMS.searchHighlightTerms),
+ pageNumber: value(URL_PARAMS.pageNumber),
+ yPos: value(URL_PARAMS.yPos),
+ x: value(URL_PARAMS.x),
+ width: value(URL_PARAMS.width),
+ height: value(URL_PARAMS.height),
+ };
+}
diff --git a/apps/web/src/lib/core/component/DetailsDrawer.tsx b/apps/web/src/lib/core/component/DetailsDrawer.tsx
deleted file mode 100644
index b9c90b038e..0000000000
--- a/apps/web/src/lib/core/component/DetailsDrawer.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import { SplitDrawer } from '@components/app/split-layout/components/SplitDrawer';
-import { EntityIcon } from '@core/component/EntityIcon';
-import { openDocument } from '@core/component/LexicalMarkdown/component/core/BlockLink';
-import { UserIcon } from '@core/component/UserIcon';
-import { getDisplayName, tryMacroId } from '@core/user';
-import { type DateValue, formatDate } from '@core/util/date';
-import { useSplitNavigationHandler } from '@core/util/useSplitNavigationHandler';
-import { useChatDataQuery } from '@queries/cognition/chat-data';
-import { useDocumentMetadataQuery } from '@queries/storage/document-metadata';
-import { useProjectDataQuery } from '@queries/storage/project-data';
-import { createCallback } from '@solid-primitives/rootless';
-import { createMemo, type JSX, Match, Show, Suspense, Switch } from 'solid-js';
-
-export const DETAILS_DRAWER_ID = 'details';
-
-type DetailsTarget =
- | { documentId: string }
- | { projectId: string }
- | { chatId: string };
-
-export function DetailsDrawer(props: DetailsTarget) {
- return (
- <SplitDrawer id={DETAILS_DRAWER_ID} side="left" size={360} title="Details">
- <Suspense fallback={<DetailsLoading />}>
- <Switch>
- <Match when={'projectId' in props ? props.projectId : undefined}>
- {(projectId) => <ProjectDetails projectId={projectId()} />}
- </Match>
- <Match when={'chatId' in props ? props.chatId : undefined}>
- {(chatId) => <ChatDetails chatId={chatId()} />}
- </Match>
- <Match when={'documentId' in props ? props.documentId : undefined}>
- {(documentId) => <DocumentDetails documentId={documentId()} />}
- </Match>
- </Switch>
- </Suspense>
- </SplitDrawer>
- );
-}
-
-function DetailsLoading() {
- return (
- <div class="flex justify-center items-center py-8">
- <div class="animate-spin rounded-full size-6 border-b-2 border-ink-muted" />
- </div>
- );
-}
-
-function DocumentDetails(props: { documentId: string }) {
- const query = useDocumentMetadataQuery(() => props.documentId);
- const metadata = createMemo(() => query.data);
-
- return (
- <DetailsGrid
- owner={() => metadata()?.owner}
- folder={() => {
- const id = metadata()?.projectId;
- const name = metadata()?.projectName;
- return id && name ? { id, name } : undefined;
- }}
- createdAt={() => metadata()?.createdAt}
- updatedAt={() => metadata()?.updatedAt}
- />
- );
-}
-
-function ProjectDetails(props: { projectId: string }) {
- const query = useProjectDataQuery(() => props.projectId);
- const metadata = createMemo(() => query.data);
-
- return (
- <DetailsGrid
- owner={() => metadata()?.userId}
- folder={() => undefined}
- createdAt={() => metadata()?.createdAt}
- updatedAt={() => metadata()?.updatedAt}
- />
- );
-}
-
-function ChatDetails(props: { chatId: string }) {
- const query = useChatDataQuery(() => props.chatId);
- const chat = createMemo(() => query.data);
- const projectQuery = useProjectDataQuery(
- () => chat()?.projectId ?? undefined
- );
-
- return (
- <DetailsGrid
- owner={() => chat()?.userId}
- folder={() => {
- const id = chat()?.projectId;
- const name = projectQuery.data?.name;
- return id && name ? { id, name } : undefined;
- }}
- createdAt={() => chat()?.createdAt}
- updatedAt={() => chat()?.updatedAt}
- />
- );
-}
-
-function DetailsGrid(props: {
- owner: () => string | undefined;
- folder: () => { id: string; name: string } | undefined;
- createdAt: () => DateValue | null | undefined;
- updatedAt: () => DateValue | null | undefined;
-}) {
- return (
- <div class="grid grid-cols-[auto_1fr] gap-x-4 gap-y-3 items-center text-sm px-2 py-1">
- <Show when={props.owner()}>
- {(ownerId) => (
- <Row label="Owner">
- <OwnerValue ownerId={ownerId()} />
- </Row>
- )}
- </Show>
- <Show when={props.folder()}>
- {(folder) => (
- <Row label="Folder">
- <FolderLink projectId={folder().id} projectName={folder().name} />
- </Row>
- )}
- </Show>
- <Show when={props.createdAt()}>
- {(created) => (
- <Row label="Created">
- <span>{formatDate(created(), { showTime: true })}</span>
- </Row>
- )}
- </Show>
- <Show when={props.updatedAt()}>
- {(updated) => (
- <Row label="Last updated">
- <span>{formatDate(updated(), { showTime: true })}</span>
- </Row>
- )}
- </Show>
- </div>
- );
-}
-
-function Row(props: { label: string; children: JSX.Element }) {
- return (
- <>
- <span class="text-xs text-ink-muted">{props.label}</span>
- <div class="flex items-center gap-2 min-w-0">{props.children}</div>
- </>
- );
-}
-
-function FolderLink(props: { projectId: string; projectName: string }) {
- const open = createCallback(() => {
- openDocument('project', props.projectId, undefined, true);
- });
- const navHandlers = useSplitNavigationHandler<HTMLSpanElement>(open);
- return (
- <span
- {...navHandlers}
- class="pointer-events-auto min-w-0 truncate py-0.5 rounded-xs hover:bg-hover focus:bg-active"
- >
- <span class="relative top-[0.125em] size-[1em] inline-flex mx-1">
- <EntityIcon targetType="project" size="fill" />
- </span>
- <span class="underline decoration-current/20 decoration-[max(1px,0.1em)] underline-offset-2">
- {props.projectName}
- </span>
- </span>
- );
-}
-
-function OwnerValue(props: { ownerId: string }) {
- const displayName = () => getDisplayName(tryMacroId(props.ownerId));
- return (
- <>
- <UserIcon id={props.ownerId} size="sm" showTooltip suppressClick />
- <span class="truncate">{displayName()}</span>
- </>
- );
-}
diff --git a/apps/web/src/lib/core/component/ReferencesModal.tsx b/apps/web/src/lib/core/component/ReferencesModal.tsx
deleted file mode 100644
index b2b761596b..0000000000
--- a/apps/web/src/lib/core/component/ReferencesModal.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { SplitDrawer } from '@components/app/split-layout/components/SplitDrawer';
-import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
-import clickOutside from '@core/directive/clickOutside';
-import Quotes from '@phosphor/quotes.svg';
-import { useAttachmentReferencesQuery } from '@queries/storage/attachment-references';
-import type { ItemType } from '@service-storage/client';
-import { Button, Tooltip } from '@ui';
-import { Suspense } from 'solid-js';
-import { References } from './References';
-
-false && clickOutside;
-export const REFERENCES_DRAWER_ID = 'references';
-
-export function ReferencesButton(props: {
- documentId: string;
- documentName?: string;
- entityType?: ItemType;
- buttonSize?: 'sm';
- onOpenChange?: (open: boolean) => void;
-}) {
- const drawerControl = useDrawerControl(REFERENCES_DRAWER_ID);
- return (
- <Button
- size="icon-sm"
- variant="ghost"
- onClick={() => {
- props.onOpenChange?.(!drawerControl.isOpen());
- drawerControl.toggle();
- }}
- >
- <Quotes />
- </Button>
- );
-}
-
-export function ReferencesDrawer(props: {
- documentId: string;
- documentName?: string;
- entityType?: ItemType;
-}) {
- const title = () => {
- if (!props.documentName) return 'References';
- return (
- <>
- References
- <span class="text-ink-extra-muted">
- {' - '}
- {props.documentName}
- </span>
- </>
- );
- };
- return (
- <SplitDrawer
- id={REFERENCES_DRAWER_ID}
- side="right"
- size={768}
- title={title()}
- >
- <Suspense
- fallback={
- <div class="flex justify-center py-8">
- <div class="animate-spin rounded-full size-6 border-b-2 border-ink-muted"></div>
- </div>
- }
- >
- <References
- documentId={props.documentId}
- entityType={props.entityType}
- />
- </Suspense>
- </SplitDrawer>
- );
-}
-
-type ReferencesModalProps = {
- documentId: string;
- documentName?: string;
- buttonSize?: 'sm';
- entityType?: ItemType;
-};
-
-function _ReferencesModal(props: ReferencesModalProps) {
- const drawerControl = useDrawerControl(REFERENCES_DRAWER_ID);
- const references = useAttachmentReferencesQuery(
- () => props.documentId,
- () => props.entityType ?? 'document'
- );
- const referenceCount = () => references.data?.length ?? 0;
-
- const title = () => {
- if (!props.documentName) return 'References';
- return (
- <>
- References
- <span class="text-ink-extra-muted">
- {' - '}
- {props.documentName}
- </span>
- </>
- );
- };
- return (
- <>
- <Tooltip label={'View References'}>
- <div
- class="flex items-center gap-1 py-1 font-mono text-xs text-ink-disabled hover:bg-hover relative"
- tabIndex={0}
- onClick={drawerControl.toggle}
- role="button"
- >
- <Quotes class="size-4 text-ink" />
- <Suspense fallback={<div class="text-xs">0</div>}>
- <span class="text-xs">{referenceCount()}</span>
- </Suspense>
- </div>
- </Tooltip>
- <SplitDrawer
- id={REFERENCES_DRAWER_ID}
- side="right"
- size={768}
- title={title()}
- >
- <Suspense
- fallback={
- <div class="flex justify-center py-8">
- <div class="animate-spin rounded-full size-6 border-b-2 border-ink-muted"></div>
- </div>
- }
- >
- <References
- documentId={props.documentId}
- entityType={props.entityType}
- />
- </Suspense>
- </SplitDrawer>
- </>
- );
-}
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index fd734b38c7..b76f9101c0 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -422,13 +422,12 @@ is restricted to your own files. Recent offers only file-scope filtering.
Recent uses the viewer's own interaction order and does not offer a sort override.
The New menu and drag/drop uploads target the selected folder. File rows retain
selection and context menus; ordinary folder clicks and Enter browse inside Drive,
-while Markdown, code/CSV, image, video, and unrecognized file clicks and Enter
-replace the list with a breadcrumbed detail. Choose the current location
+while Markdown, code/CSV, image, video, PDF/DOCX, canvas, and unrecognized file
+clicks and Enter replace the list with a breadcrumbed detail. Choose the current location
breadcrumb to return to the list; choosing an ancestor file drops newer detail
entries. Opening a list row or sidebar favorite starts a new detail path; only
-navigation originating inside a detail appends to that path. Modified clicks and
-file types without a dedicated detail, including PDF and canvas, retain existing
-split navigation. On narrow layouts, use `Select Drive view` for tabs, favorites,
+navigation originating inside a detail appends to that path. Modified clicks
+retain existing split navigation. On narrow layouts, use `Select Drive view` for tabs, favorites,
and folders. Navigation state and expanded folders are restored when returning
from an opened file.