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.

refactor(sharing): open global share modal via openDialog (#7004)

dev-rbd1fa31f9be3f
diff --git a/apps/web/src/components/app/Layout.tsx b/apps/web/src/components/app/Layout.tsx
index 3f2491b851..162f084732 100644
--- a/apps/web/src/components/app/Layout.tsx
+++ b/apps/web/src/components/app/Layout.tsx
@@ -30,7 +30,6 @@ import { ReminderComposerModal } from '@app/features/reminders/ReminderComposerM
import { MobileSettingsProvider } from '@app/features/settings/context/mobile-settings';
import { MobileSettings } from '@app/features/settings/MobileSettings';
import { useOnboardingV4Flag } from '@app/features/setup/flow/useOnboardingV4Flag';
-import { GlobalShareModal } from '@app/features/sharing/global-share-modal/GlobalShareModal';
import { IosShareSheet } from '@app/features/sharing/ios-share-sheet/IosShareSheet';
import { ShowFeatureFlag } from '@app/lib/analytics/posthog';
import { mountGlobalFocusListener } from '@app/signal/focus';
@@ -467,7 +466,6 @@ function LayoutInner(props: RouteSectionProps) {
<PropertyEditorModal />
</Suspense>
<GlobalBulkEditEntityModal />
- <GlobalShareModal />
<IosShareSheet />
<MacroMcpSetupModal />
<CreateChannelModal />
diff --git a/apps/web/src/components/entity-detail/EntityDetail.tsx b/apps/web/src/components/entity-detail/EntityDetail.tsx
index 0befc7d3c7..a10e470358 100644
--- a/apps/web/src/components/entity-detail/EntityDetail.tsx
+++ b/apps/web/src/components/entity-detail/EntityDetail.tsx
@@ -65,8 +65,6 @@ export type EntityDetailContext =
export type EntityDetailProps = {
target: EntityDetailTarget;
- shareOpen?: boolean;
- onShareOpenChange?: (open: boolean) => void;
previewHeaderLeading?: JSX.Element;
navigationRequest?: number;
children?: (context: EntityDetailContext) => JSX.Element;
@@ -198,64 +196,38 @@ export function EntityDetail(props: EntityDetailProps) {
documentId={target().id}
kind={markdownKind(blockType()!)}
fallbackName={target().fallbackName}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
>
{(context) => <>{renderChildren(context)}</>}
</MarkdownDetail>
)}
</Match>
<Match when={blockType() === 'code' || blockType() === 'csv'}>
- <CodeDetail
- documentId={props.target.id}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
- >
+ <CodeDetail documentId={props.target.id}>
{(context) => <>{renderChildren(context)}</>}
</CodeDetail>
</Match>
<Match when={blockType() === 'canvas'}>
- <CanvasDetail
- documentId={props.target.id}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
- >
+ <CanvasDetail documentId={props.target.id}>
{(context) => <>{renderChildren(context)}</>}
</CanvasDetail>
</Match>
<Match when={blockType() === 'image'}>
- <ImageDetail
- documentId={props.target.id}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
- >
+ <ImageDetail documentId={props.target.id}>
{(context) => <>{renderChildren(context)}</>}
</ImageDetail>
</Match>
<Match when={blockType() === 'video'}>
- <VideoDetail
- documentId={props.target.id}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
- >
+ <VideoDetail documentId={props.target.id}>
{(context) => <>{renderChildren(context)}</>}
</VideoDetail>
</Match>
<Match when={blockType() === 'pdf'}>
- <PdfDetail
- documentId={props.target.id}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
- >
+ <PdfDetail documentId={props.target.id}>
{(context) => <>{renderChildren(context)}</>}
</PdfDetail>
</Match>
<Match when={blockType() === 'unknown'}>
- <UnknownDetail
- documentId={props.target.id}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
- >
+ <UnknownDetail documentId={props.target.id}>
{(context) => <>{renderChildren(context)}</>}
</UnknownDetail>
</Match>
diff --git a/apps/web/src/features/agents-view/components/AgentSessionPane.tsx b/apps/web/src/features/agents-view/components/AgentSessionPane.tsx
index 3be4b65ef5..d72c8535d0 100644
--- a/apps/web/src/features/agents-view/components/AgentSessionPane.tsx
+++ b/apps/web/src/features/agents-view/components/AgentSessionPane.tsx
@@ -35,11 +35,8 @@ import {
import { EntityIcon } from '@core/component/EntityIcon';
import { LoadErrorPanel } from '@core/component/EntityLoadGate';
import { Permissions } from '@core/component/SharePermissions';
-import {
- ShareDialogContext,
- ShareModal,
- ShareTrigger,
-} from '@core/component/TopBar/ShareButton';
+import { ShareTrigger } from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { useUserId } from '@core/context/user';
import { openExternalUrl } from '@core/util/url';
import type { AgentSessionEntity } from '@entity';
@@ -48,7 +45,7 @@ import type { NotificationSource } from '@notifications/notification-source';
import ArrowSquareOut from '@phosphor/arrow-square-out.svg';
import GitBranch from '@phosphor/git-branch.svg';
import { EmptyStatePanel } from '@ui';
-import { createSignal, onCleanup, Show, Suspense } from 'solid-js';
+import { onCleanup, Show } from 'solid-js';
import { ChatSessionInput } from './ChatComposer';
import { SessionModelSelector } from './ModelSelector';
import { Topbar } from './Topbar';
@@ -82,7 +79,6 @@ function SessionContent(props: {
startupError,
} = useAgentSession();
const panel = useSplitPanelOrThrow();
- const [shareOpen, setShareOpen] = createSignal(false);
const userId = useUserId();
const title = () => agentSessionTitle(session(), metadata()?.title);
@@ -108,14 +104,21 @@ function SessionContent(props: {
: current.status.kind,
};
};
+ const openShare = useShareModal(() => {
+ const current = session();
+ const id = sessionId();
+ if (!current || !id) return;
+ return {
+ id,
+ name: title(),
+ owner: current.ownerId,
+ itemType: 'agent_session',
+ blockAlias: 'agent',
+ userPermissions: permissions(),
+ };
+ });
return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
+ <>
<AgentSessionReadMarker
sessionId={!loadFailed() && session() ? sessionId() : undefined}
active={panel.isPanelActive()}
@@ -198,7 +201,7 @@ function SessionContent(props: {
{
label: 'Share',
icon: ShareIcon,
- action: () => setShareOpen(true),
+ action: openShare,
},
]}
/>
@@ -215,6 +218,7 @@ function SessionContent(props: {
<Show when={sessionId()}>
{(id) => (
<ShareTrigger
+ onClick={openShare}
id={id()}
blockType="agent"
hotkeyScope={panel.splitHotkeyScope}
@@ -284,24 +288,7 @@ function SessionContent(props: {
</SidePanel.Layout>
</div>
</SidePanel.Root>
-
- <Show when={sessionId() && session()}>
- {(_) => (
- <Suspense>
- <ShareModal
- id={sessionId() ?? ''}
- name={title()}
- owner={session()?.ownerId ?? ''}
- itemType="agent_session"
- blockAlias="agent"
- userPermissions={permissions()}
- isSharePermOpen={shareOpen()}
- setIsSharePermOpen={setShareOpen}
- />
- </Suspense>
- )}
- </Show>
- </ShareDialogContext.Provider>
+ </>
);
}
diff --git a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
index 0a0cd52a7b..c544263b7c 100644
--- a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
+++ b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
@@ -13,11 +13,8 @@ import {
import { StaticSplitLabel } from '@components/app/split-layout/components/SplitLabel';
import { ProviderIcon } from '@core/component/AI/component/ProviderIcon';
import { Permissions } from '@core/component/SharePermissions';
-import {
- ShareDialogContext,
- ShareModal,
- ShareTrigger,
-} from '@core/component/TopBar/ShareButton';
+import { ShareTrigger } from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { isMobile } from '@core/mobile/isMobile';
import { openExternalUrl } from '@core/util/url';
import type { AgentSessionEntity } from '@entity';
@@ -25,7 +22,7 @@ import ShareIcon from '@icon/share.svg';
import ArrowSquareOut from '@phosphor/arrow-square-out.svg';
import GitBranch from '@phosphor/git-branch.svg';
import type { AgentSessionResponse } from '@service-agent-harness/generated/schemas';
-import { createSignal, For, Show, Suspense } from 'solid-js';
+import { For, Show } from 'solid-js';
import { useAgentSession } from '../context/AgentSessionContext';
import { AgentPullRequestChip } from './AgentPullRequestChip';
import {
@@ -89,20 +86,28 @@ export function AgentSplitHeader(props: {
};
};
useBlockEntityCommands({ resolveEntity: entity });
- const [shareOpen, setShareOpen] = createSignal(false);
- const shareContext = {
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- };
+ const openShare = useShareModal(() => {
+ const session = entity();
+ if (!session) return;
+ return {
+ id: session.id,
+ name: title(),
+ owner: session.ownerId,
+ itemType: 'agent_session',
+ blockAlias: 'agent',
+ userPermissions: permissions(),
+ };
+ });
const shareTools: BlockTool[] = [
{
label: 'Share',
icon: ShareIcon,
- action: () => setShareOpen(true),
+ action: openShare,
condition: () => Boolean(entity()),
- buttonComponent: () => <ShareTrigger id={sessionId()} />,
+ buttonComponent: () => (
+ <ShareTrigger onClick={openShare} id={sessionId()} />
+ ),
},
];
@@ -138,7 +143,7 @@ export function AgentSplitHeader(props: {
];
return (
- <ShareDialogContext.Provider value={shareContext}>
+ <>
<SplitHeaderLeft>
<StaticSplitLabel
icon={
@@ -173,23 +178,6 @@ export function AgentSplitHeader(props: {
</div>
</SplitHeaderRight>
- <Show when={entity()}>
- {(session) => (
- <Suspense>
- <ShareModal
- id={session().id}
- name={title()}
- owner={session().ownerId}
- itemType="agent_session"
- blockAlias="agent"
- userPermissions={permissions()}
- isSharePermOpen={shareOpen()}
- setIsSharePermOpen={setShareOpen}
- />
- </Suspense>
- )}
- </Show>
-
<ResponsiveBlockToolbar
tools={shareTools}
menuTools={tools}
@@ -200,6 +188,6 @@ export function AgentSplitHeader(props: {
permissions={permissions()}
name={title()}
/>
- </ShareDialogContext.Provider>
+ </>
);
}
diff --git a/apps/web/src/features/block-agent/component/session-read-hosts.test.tsx b/apps/web/src/features/block-agent/component/session-read-hosts.test.tsx
index e7ad262ee2..8f361f48c1 100644
--- a/apps/web/src/features/block-agent/component/session-read-hosts.test.tsx
+++ b/apps/web/src/features/block-agent/component/session-read-hosts.test.tsx
@@ -88,12 +88,11 @@ vi.mock('@core/component/AI/component/ProviderIcon', () => ({
}));
vi.mock('@core/component/SharePermissions', () => ({ Permissions: {} }));
vi.mock('@core/component/TopBar/ShareButton', () => ({
- ShareDialogContext: {
- Provider: (props: { children: JSX.Element }) => props.children,
- },
- ShareModal: () => null,
ShareTrigger: () => null,
}));
+vi.mock('@core/component/TopBar/shareModal', () => ({
+ useShareModal: () => () => {},
+}));
vi.mock('@components/app/mobile/float-regions/FloatRegion', () => ({
FloatRegionOrInline: (props: { children: JSX.Element }) => props.children,
}));
diff --git a/apps/web/src/features/block-call/component/CallBlockAdapter.tsx b/apps/web/src/features/block-call/component/CallBlockAdapter.tsx
index acb7deaf19..e55fac5e67 100644
--- a/apps/web/src/features/block-call/component/CallBlockAdapter.tsx
+++ b/apps/web/src/features/block-call/component/CallBlockAdapter.tsx
@@ -14,7 +14,6 @@ import { useSearchParams } from '@solidjs/router';
import { createSignal, Show } from 'solid-js';
import { CallRecordingBody } from './CallRecording/CallRecordingBody';
import { CallRecordingSplitHeader } from './CallRecording/CallRecordingSplitHeader';
-import { ModalsProvider } from './ModalsProvider';
import { CallSidePanelSections } from './sidepanel/CallSidePanelSections';
export function CallBlockAdapter(props: CallBlockProps) {
@@ -57,24 +56,22 @@ export function CallBlockAdapter(props: CallBlockProps) {
return (
<DocumentBlockContainer>
<div class="h-full flex flex-col @container">
- <ModalsProvider>
- <Show when={callRecord.isPending ? undefined : callRecord.data}>
- {(data) => (
- <SidePanel.Layout>
- <CallSidePanelSections record={data()} callId={callId} />
- <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden @container">
- <CallRecordingSplitHeader record={data()} />
- <CallRecordingBody
- record={data()}
- callId={callId}
- transcriptTarget={transcriptTarget()}
- showOverlayHeaderGap
- />
- </div>
- </SidePanel.Layout>
- )}
- </Show>
- </ModalsProvider>
+ <Show when={callRecord.isPending ? undefined : callRecord.data}>
+ {(data) => (
+ <SidePanel.Layout>
+ <CallSidePanelSections record={data()} callId={callId} />
+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden @container">
+ <CallRecordingSplitHeader record={data()} />
+ <CallRecordingBody
+ record={data()}
+ callId={callId}
+ transcriptTarget={transcriptTarget()}
+ showOverlayHeaderGap
+ />
+ </div>
+ </SidePanel.Layout>
+ )}
+ </Show>
</div>
</DocumentBlockContainer>
);
diff --git a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
index e254b75c35..a6a64c9354 100644
--- a/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
+++ b/apps/web/src/features/block-call/component/CallRecording/CallRecordingSplitHeader.tsx
@@ -19,9 +19,11 @@ import { BlockLiveIndicators } from '@core/component/LiveIndicators';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { isMobile } from '@core/mobile/isMobile';
+import { blockMetadataSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import { buildEntityData } from '@entity';
import IconShared from '@icon/share.svg';
import PhoneCallIcon from '@phosphor/phone-call.svg';
@@ -50,8 +52,16 @@ export function CallRecordingSplitHeaderLoading() {
export function CallRecordingSplitHeader(props: { record: CallRecord }) {
const record = () => props.record;
const blockId = useBlockId();
- const shareCtx = useShareDialogContext();
const callName = () => record().customName ?? record().channelName ?? 'Call';
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: blockId,
+ blockAlias: 'call',
+ itemType: 'call',
+ name: callName(),
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
const { canCallAgain, callAgain } = useCallAgain(
() => record().callId,
() => record().channelId
@@ -60,8 +70,8 @@ export function CallRecordingSplitHeader(props: { record: CallRecord }) {
const shareTool: BlockTool = {
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: openShare,
+ buttonComponent: () => <ShareTrigger onClick={openShare} />,
focusTarget: getShareDrawerRecipientInput,
};
diff --git a/apps/web/src/features/block-call/component/ModalsProvider.tsx b/apps/web/src/features/block-call/component/ModalsProvider.tsx
deleted file mode 100644
index b5c8846656..0000000000
--- a/apps/web/src/features/block-call/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { createSignal, type ParentProps } from 'solid-js';
-
-export function ModalsProvider(props: ParentProps) {
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <ShareBlockModal />
- </ShareDialogContext.Provider>
- );
-}
diff --git a/apps/web/src/features/block-call/views/CallDetailView.tsx b/apps/web/src/features/block-call/views/CallDetailView.tsx
index c1360c4a72..ca71b5fef0 100644
--- a/apps/web/src/features/block-call/views/CallDetailView.tsx
+++ b/apps/web/src/features/block-call/views/CallDetailView.tsx
@@ -4,11 +4,8 @@ import { SidePanel } from '@components/app/side-panel';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { SplitPanel } from '@components/app/split-panel';
import { getPermissions } from '@core/component/SharePermissions';
-import {
- ShareDialogContext,
- ShareModal,
- ShareTrigger,
-} from '@core/component/TopBar/ShareButton';
+import { ShareTrigger } from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { isMobile } from '@core/mobile/isMobile';
import PhoneCallIcon from '@phosphor/phone-call.svg';
import SpinnerIcon from '@phosphor/spinner.svg';
@@ -23,7 +20,6 @@ import { Button } from '@ui';
import {
type Accessor,
createMemo,
- createSignal,
Match,
onMount,
type ParentProps,
@@ -57,19 +53,26 @@ export function useCallDetail(callId: Accessor<string>) {
export function CallDetailActions(props: {
callId: string;
- channelId?: string | null;
+ record: CallRecord;
name: string;
- isActive: boolean;
}) {
const panel = useSplitPanelOrThrow();
const { canCallAgain, callAgain } = useCallAgain(
() => props.callId,
- () => props.channelId
+ () => props.record.channelId
);
+ const openShare = useShareModal(() => ({
+ id: props.callId,
+ blockAlias: 'call',
+ itemType: 'call',
+ name: props.name,
+ userPermissions: getPermissions(props.record.userAccessLevel ?? undefined),
+ owner: props.record.createdBy,
+ }));
return (
<div class="ml-auto flex shrink-0 items-center gap-2">
- <Show when={!isMobile() && !props.isActive && canCallAgain()}>
+ <Show when={!isMobile() && !props.record.isActive && canCallAgain()}>
<Button variant="outline" size="sm" onClick={callAgain}>
<PhoneCallIcon class="size-4" />
Call Again
@@ -84,6 +87,7 @@ export function CallDetailActions(props: {
}}
/>
<ShareTrigger
+ onClick={openShare}
id={props.callId}
blockType="call"
hotkeyScope={panel.splitHotkeyScope}
@@ -93,41 +97,12 @@ export function CallDetailActions(props: {
);
}
-/** Keep sharing and side-panel state alive across call-record query updates. */
-export function CallDetailRoot(
- props: ParentProps<{ callId: string; data?: CallDetailData }>
-) {
- const [shareOpen, setShareOpen] = createSignal(false);
+/** Keep side-panel state alive across call-record query updates. */
+export function CallDetailRoot(props: ParentProps<{ callId: string }>) {
return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- <SidePanel.Root persistKey={`call:${props.callId}`}>
- {props.children}
- </SidePanel.Root>
- <Show when={props.data}>
- {(data) => (
- <Suspense>
- <ShareModal
- isSharePermOpen={shareOpen()}
- setIsSharePermOpen={setShareOpen}
- id={props.callId}
- blockAlias="call"
- itemType="call"
- name={data().name}
- userPermissions={getPermissions(
- data().record.userAccessLevel ?? undefined
- )}
- owner={data().record.createdBy}
- />
- </Suspense>
- )}
- </Show>
- </ShareDialogContext.Provider>
+ <SidePanel.Root persistKey={`call:${props.callId}`}>
+ {props.children}
+ </SidePanel.Root>
);
}
@@ -231,7 +206,7 @@ export function StandaloneCallDetail(props: {
}) {
const detail = useCallDetail(() => props.callId);
return (
- <CallDetailRoot callId={props.callId} data={detail.data()}>
+ <CallDetailRoot callId={props.callId}>
<div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden @container">
<ViewShell.TopBar class="touch:flex">
<SplitPanel.CloseButton class="hidden shrink-0 touch:flex" />
@@ -243,9 +218,8 @@ export function StandaloneCallDetail(props: {
{(data) => (
<CallDetailActions
callId={props.callId}
- channelId={data().record.channelId}
+ record={data().record}
name={data().name}
- isActive={data().record.isActive}
/>
)}
</Show>
diff --git a/apps/web/src/features/block-canvas/component/Block.tsx b/apps/web/src/features/block-canvas/component/Block.tsx
index 0d3812ccc6..1382ec9982 100644
--- a/apps/web/src/features/block-canvas/component/Block.tsx
+++ b/apps/web/src/features/block-canvas/component/Block.tsx
@@ -14,7 +14,6 @@ import { useSearchParams } from '@solidjs/router';
import { Show } from 'solid-js';
import type { CanvasView } from '../context/canvas-document-context';
import { CanvasDocument, type CanvasDocumentMethods } from './CanvasDocument';
-import { ModalsProvider } from './ModalsProvider';
import { TopBar } from './TopBar';
export type BlockCanvasProps = {
@@ -59,17 +58,15 @@ export default function BlockCanvas(props: BlockCanvasProps) {
if (isNested) event.stopPropagation();
}}
>
- <ModalsProvider>
- <Show when={!isNested} fallback={content}>
- <SidePanel.Layout defaultOpen={false}>
- <FileSidePanelSections />
- <div class="flex size-full min-w-0 flex-col overflow-hidden">
- <TopBar />
- {content}
- </div>
- </SidePanel.Layout>
- </Show>
- </ModalsProvider>
+ <Show when={!isNested} fallback={content}>
+ <SidePanel.Layout defaultOpen={false}>
+ <FileSidePanelSections />
+ <div class="flex size-full min-w-0 flex-col overflow-hidden">
+ <TopBar />
+ {content}
+ </div>
+ </SidePanel.Layout>
+ </Show>
</div>
)}
</CanvasDocument>
diff --git a/apps/web/src/features/block-canvas/component/ModalsProvider.tsx b/apps/web/src/features/block-canvas/component/ModalsProvider.tsx
deleted file mode 100644
index d0851727b8..0000000000
--- a/apps/web/src/features/block-canvas/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-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 fileName = useBlockDocumentName('Unknown Filename');
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <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 bc25fe4ac7..e02904b982 100644
--- a/apps/web/src/features/block-canvas/component/TopBar.tsx
+++ b/apps/web/src/features/block-canvas/component/TopBar.tsx
@@ -16,18 +16,19 @@ import {
import { BlockItemSplitLabel } from '@components/app/split-layout/components/SplitLabel';
import { useBlockId } from '@core/block';
import { BlockLiveIndicators } from '@core/component/LiveIndicators';
-import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { blockFileSignal } from '@core/signal/load';
+import { useShareModal } from '@core/component/TopBar/shareModal';
+import { blockFileSignal, blockMetadataSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import {
useBlockDocumentDownloadName,
useBlockDocumentName,
} from '@core/util/currentBlockDocumentName';
import { buildSimpleEntityUrl } from '@core/util/url';
+import { useCopyLink } from '@core/util/useCopyLink';
import { downloadFile } from '@filesystem/download';
import IconShared from '@icon/share.svg';
import DownloadSimple from '@phosphor/download-simple.svg';
@@ -50,7 +51,16 @@ export function TopBar() {
const downloadName = useBlockDocumentDownloadName('Unknown Filename');
const canvasFile = blockFileSignal.get;
- const shareCtx = useShareDialogContext();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: documentId,
+ blockAlias: 'canvas',
+ itemType: 'document',
+ name: fileName() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
+ const copyEntityLink = useCopyLink();
let ref!: HTMLDivElement;
onMount(() => {
@@ -72,19 +82,9 @@ export function TopBar() {
[URL_PARAMS.y]: location.y.toString(),
[URL_PARAMS.s]: location.s.toString(),
};
- const url = buildSimpleEntityUrl(
- {
- type: 'canvas',
- id: documentId,
- },
- params
+ copyEntityLink(
+ buildSimpleEntityUrl({ type: 'canvas', id: documentId }, params)
);
- if (!url) {
- toast.failure('failed to copy url');
- return;
- }
- navigator.clipboard.writeText(url);
- toast.success('Link copied to clipboard');
analytics.track('copy_share_link', { blockType: 'canvas' });
};
@@ -117,9 +117,11 @@ export function TopBar() {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
+ action: openShare,
condition: () => !!canvasFile(),
- buttonComponent: () => <ShareTrigger copyLink={copyLink} />,
+ buttonComponent: () => (
+ <ShareTrigger onClick={openShare} copyLink={copyLink} />
+ ),
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/block-chat/component/Block.tsx b/apps/web/src/features/block-chat/component/Block.tsx
index bcd410f007..73acb4f867 100644
--- a/apps/web/src/features/block-chat/component/Block.tsx
+++ b/apps/web/src/features/block-chat/component/Block.tsx
@@ -9,7 +9,6 @@ import { DebouncedNotificationReadMarker } from '@notifications';
import { Show } from 'solid-js';
import { chatBlockData } from '../signal/chatBlockData';
import { Chat } from './Chat';
-import { ModalsProvider } from './ModalsProvider';
import { ChatSidePanelSections } from './sidepanel/ChatSidePanelSections';
export default function ChatBlock() {
@@ -25,14 +24,10 @@ export default function ChatBlock() {
notificationSource={notificationSource}
entity={{ type: 'chat', id: blockId }}
/>
- <ModalsProvider>
- <SidePanel.Layout defaultOpen={false}>
- <ChatSidePanelSections />
- <Show when={chatBlockData()}>
- {(data) => <Chat data={data()} />}
- </Show>
- </SidePanel.Layout>
- </ModalsProvider>
+ <SidePanel.Layout defaultOpen={false}>
+ <ChatSidePanelSections />
+ <Show when={chatBlockData()}>{(data) => <Chat data={data()} />}</Show>
+ </SidePanel.Layout>
</div>
</DocumentBlockContainer>
);
diff --git a/apps/web/src/features/block-chat/component/ModalsProvider.tsx b/apps/web/src/features/block-chat/component/ModalsProvider.tsx
deleted file mode 100644
index b5c8846656..0000000000
--- a/apps/web/src/features/block-chat/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { createSignal, type ParentProps } from 'solid-js';
-
-export function ModalsProvider(props: ParentProps) {
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <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 ac1fbc69c7..3cbff4d12b 100644
--- a/apps/web/src/features/block-chat/component/TopBar.tsx
+++ b/apps/web/src/features/block-chat/component/TopBar.tsx
@@ -14,9 +14,11 @@ import { useOpenInstructionsMd } from '@core/component/AI/util/instructions';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { DEV_MODE_ENV } from '@core/constant/featureFlags';
+import { blockMetadataSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import IconShared from '@icon/share.svg';
import ChatDebugIcon from '@phosphor/chat-text.svg';
@@ -35,7 +37,15 @@ export function TopBar(props: {
const openInstructions = useOpenInstructionsMd();
- const shareCtx = useShareDialogContext();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: blockId,
+ blockAlias: 'chat',
+ itemType: 'chat',
+ name: name() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
const ops: FileOperation[] = [
{
@@ -65,8 +75,8 @@ export function TopBar(props: {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: openShare,
+ buttonComponent: () => <ShareTrigger onClick={openShare} />,
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/block-code/component/Block.tsx b/apps/web/src/features/block-code/component/Block.tsx
index 72311a5fa0..7ebb7400ce 100644
--- a/apps/web/src/features/block-code/component/Block.tsx
+++ b/apps/web/src/features/block-code/component/Block.tsx
@@ -21,7 +21,6 @@ import { saveCodeDocument } from '../queries/code-document';
import { isHtmlFileType } from '../util/fileMode';
import { type CodeBlockMode, CodeContent } from './CodeContent';
import { CodeMarkdown } from './CodeMarkdown';
-import { ModalsProvider } from './ModalsProvider';
import { TopBar } from './TopBar';
const UploadedWorkbook = lazy(
@@ -57,39 +56,37 @@ export default function BlockCode() {
<DocumentBlockContainer usesCenterBar>
<Show when={!isNestedBlock} fallback={<CodeMarkdown />}>
<div class="size-full select-none overscroll-none overflow-hidden flex flex-col items-end relative">
- <ModalsProvider>
- <SidePanel.Layout defaultOpen={false}>
- <FileSidePanelSections />
- <div class="flex size-full min-w-0 flex-col items-end overflow-hidden">
- <TopBar
- isHtmlFile={isHtmlFile()}
- mode={mode()}
- onModeChange={setMode}
- />
- <Show
- when={spreadsheet()}
+ <SidePanel.Layout defaultOpen={false}>
+ <FileSidePanelSections />
+ <div class="flex size-full min-w-0 flex-col items-end overflow-hidden">
+ <TopBar
+ isHtmlFile={isHtmlFile()}
+ mode={mode()}
+ onModeChange={setMode}
+ />
+ <Show
+ when={spreadsheet()}
+ fallback={
+ <CodeContent
+ text={blockText() ?? ''}
+ fileType={blockMetadata()?.fileType}
+ readOnly={readOnly()}
+ mode={mode()}
+ onTextChange={setBlockText}
+ onSave={(text) => saveCodeDocument(documentId, text)}
+ />
+ }
+ >
+ <Suspense
fallback={
- <CodeContent
- text={blockText() ?? ''}
- fileType={blockMetadata()?.fileType}
- readOnly={readOnly()}
- mode={mode()}
- onTextChange={setBlockText}
- onSave={(text) => saveCodeDocument(documentId, text)}
- />
+ <div class="p-6 text-ink-muted">Opening spreadsheet…</div>
}
>
- <Suspense
- fallback={
- <div class="p-6 text-ink-muted">Opening spreadsheet…</div>
- }
- >
- <UploadedWorkbook />
- </Suspense>
- </Show>
- </div>
- </SidePanel.Layout>
- </ModalsProvider>
+ <UploadedWorkbook />
+ </Suspense>
+ </Show>
+ </div>
+ </SidePanel.Layout>
</div>
</Show>
</DocumentBlockContainer>
diff --git a/apps/web/src/features/block-code/component/ModalsProvider.tsx b/apps/web/src/features/block-code/component/ModalsProvider.tsx
deleted file mode 100644
index b5c8846656..0000000000
--- a/apps/web/src/features/block-code/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { createSignal, type ParentProps } from 'solid-js';
-
-export function ModalsProvider(props: ParentProps) {
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <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 da5cae03c2..cf4a9ba62e 100644
--- a/apps/web/src/features/block-code/component/TopBar.tsx
+++ b/apps/web/src/features/block-code/component/TopBar.tsx
@@ -8,14 +8,15 @@ import type { FileOperation } from '@components/app/split-layout/components/Spli
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 { useBlockId } from '@core/block';
+import { useBlockAliasedName, useBlockId } from '@core/block';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { isMobile } from '@core/mobile/isMobile';
-import { blockTextSignal } from '@core/signal/load';
+import { blockMetadataSignal, blockTextSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import {
useBlockDocumentDownloadName,
useBlockDocumentName,
@@ -42,7 +43,16 @@ export const TopBar: Component<{
const name = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
- const shareCtx = useShareDialogContext();
+ const blockAlias = useBlockAliasedName();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: blockId,
+ blockAlias,
+ itemType: 'document',
+ name: name() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
const downloadDocument = createCallback(() => {
const content = text();
@@ -70,8 +80,8 @@ export const TopBar: Component<{
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: openShare,
+ buttonComponent: () => <ShareTrigger onClick={openShare} />,
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/block-email/EmailThreadHostView.tsx b/apps/web/src/features/block-email/EmailThreadHostView.tsx
index 57ef3252f8..c9403f8908 100644
--- a/apps/web/src/features/block-email/EmailThreadHostView.tsx
+++ b/apps/web/src/features/block-email/EmailThreadHostView.tsx
@@ -14,7 +14,6 @@ import { buildMentionMarkdownString } from '@macro-inc/lexical-core';
import type { Accessor, JSX } from 'solid-js';
import { Show } from 'solid-js';
import { EmailTaskButton } from './component/EmailTaskButton';
-import { ModalsProvider } from './component/ModalsProvider';
import { EmailSidePanelSections } from './component/sidepanel/EmailSidePanelSections';
export type EmailThreadHostViewContext = {
@@ -29,8 +28,6 @@ export type EmailThreadHostViewProps = {
host: EmailThreadHost;
topBar?: (context: EmailThreadHostViewContext) => JSX.Element;
sidePanelHeaderToggle?: boolean;
- shareOpen?: boolean;
- onShareOpenChange?: (open: boolean) => void;
};
/**
@@ -68,23 +65,16 @@ export function EmailThreadHostView(props: EmailThreadHostViewProps) {
header={props.topBar?.({ createTask })}
actions={<ThreadActions title={props.title} onCreateTask={createTask} />}
frame={(content) => (
- <ModalsProvider
- threadId={props.threadId()}
- subject={props.title}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
+ <SidePanel.Layout
+ defaultOpen={false}
+ headerToggle={props.sidePanelHeaderToggle}
>
- <SidePanel.Layout
- defaultOpen={false}
- headerToggle={props.sidePanelHeaderToggle}
- >
- {content()}
- <EmailSidePanelSections
- threadId={props.threadId()}
- title={props.title}
- />
- </SidePanel.Layout>
- </ModalsProvider>
+ {content()}
+ <EmailSidePanelSections
+ threadId={props.threadId()}
+ title={props.title}
+ />
+ </SidePanel.Layout>
)}
/>
);
diff --git a/apps/web/src/features/block-email/component/ModalsProvider.tsx b/apps/web/src/features/block-email/component/ModalsProvider.tsx
deleted file mode 100644
index 035977c0fc..0000000000
--- a/apps/web/src/features/block-email/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { useEmailThreadState } from '@app/features/email-thread/context/email-thread-state-context';
-import { getPermissions } from '@core/component/SharePermissions';
-import {
- ShareDialogContext,
- ShareModal,
-} from '@core/component/TopBar/ShareButton';
-import { ENABLE_EMAIL_SHARING } from '@core/constant/featureFlags';
-import {
- createSignal,
- type ParentProps,
- type Setter,
- Show,
- Suspense,
-} from 'solid-js';
-
-export function ModalsProvider(
- props: ParentProps<{
- threadId: string;
- subject?: string;
- shareOpen?: boolean;
- onShareOpenChange?: (open: boolean) => void;
- }>
-) {
- const email = useEmailThreadState();
- const [localShareOpen, setLocalShareOpen] = createSignal(false);
- const shareOpen = () => props.shareOpen ?? localShareOpen();
- const setShareOpen: Setter<boolean> = (next) => {
- const open = typeof next === 'function' ? next(shareOpen()) : next;
- props.onShareOpenChange?.(open);
- if (props.shareOpen === undefined) setLocalShareOpen(() => open);
- return open;
- };
-
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <Show when={ENABLE_EMAIL_SHARING}>
- <Suspense>
- <ShareModal
- isSharePermOpen={shareOpen()}
- setIsSharePermOpen={setShareOpen}
- id={props.threadId}
- blockAlias="email"
- itemType="email"
- name={props.subject ?? ''}
- userPermissions={getPermissions(email.thread()?.access_level)}
- />
- </Suspense>
- </Show>
- </ShareDialogContext.Provider>
- );
-}
diff --git a/apps/web/src/features/block-email/component/TopBar.tsx b/apps/web/src/features/block-email/component/TopBar.tsx
index 707594b467..d8487f607b 100644
--- a/apps/web/src/features/block-email/component/TopBar.tsx
+++ b/apps/web/src/features/block-email/component/TopBar.tsx
@@ -20,12 +20,13 @@ import {
SplitHeaderBadge,
StaticSplitLabel,
} from '@components/app/split-layout/components/SplitLabel';
+import { getPermissions } from '@core/component/SharePermissions';
import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { ENABLE_EMAIL_SHARING } from '@core/constant/featureFlags';
import { TOKENS } from '@core/hotkey/tokens';
import { getActiveCommandByToken, runCommand } from '@core/hotkey/utils';
@@ -53,8 +54,18 @@ export function TopBar(props: {
isDraft?: boolean;
onCreateTask?: () => void;
}) {
- const shareCtx = useShareDialogContext();
const emailCtx = useEmailThreadState();
+ const openShare = useShareModal(() => {
+ const thread = emailCtx.thread();
+ if (!thread) return;
+ return {
+ id: props.id,
+ blockAlias: 'email',
+ itemType: 'email',
+ name: props.title,
+ userPermissions: getPermissions(thread.access_level),
+ };
+ });
const soup = useMaybeSoup();
const linksQuery = useEmailLinksQuery();
const moveToProjectAction = makeMoveToProjectAction();
@@ -167,9 +178,11 @@ export function TopBar(props: {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
+ action: openShare,
condition: () => ENABLE_EMAIL_SHARING,
- buttonComponent: () => <ShareTrigger id={props.id} blockType="email" />,
+ buttonComponent: () => (
+ <ShareTrigger onClick={openShare} id={props.id} blockType="email" />
+ ),
focusTarget: getShareDrawerRecipientInput,
};
diff --git a/apps/web/src/features/block-image/component/Block.tsx b/apps/web/src/features/block-image/component/Block.tsx
index 926a90b48c..505e0d4329 100644
--- a/apps/web/src/features/block-image/component/Block.tsx
+++ b/apps/web/src/features/block-image/component/Block.tsx
@@ -6,7 +6,6 @@ import { blockFileSignal, blockMetadataSignal } from '@core/signal/load';
import { setCopiedItem } from '@core/state/clipboard';
import { onCleanup, onMount, Show } from 'solid-js';
import { ImageContent } from './ImageContent';
-import { ModalsProvider } from './ModalsProvider';
import { TopBar } from './TopBar';
export default function BlockImage() {
@@ -31,29 +30,27 @@ export default function BlockImage() {
return (
<DocumentBlockContainer>
<div class="size-full select-none overscroll-none overflow-hidden flex flex-col">
- <ModalsProvider>
- <SidePanel.Layout defaultOpen={false}>
- <FileSidePanelSections />
- <div class="flex size-full min-w-0 flex-col overflow-hidden">
- <TopBar />
- <Show
- when={blockFileSignal()}
- fallback={
- <div class="flex size-full items-center justify-center">
- {/* Loading state handled by DocumentBlockContainer */}
- </div>
- }
- >
- {(file) => (
- <ImageContent
- file={file()}
- alt={blockMetadataSignal()?.documentName || 'Image'}
- />
- )}
- </Show>
- </div>
- </SidePanel.Layout>
- </ModalsProvider>
+ <SidePanel.Layout defaultOpen={false}>
+ <FileSidePanelSections />
+ <div class="flex size-full min-w-0 flex-col overflow-hidden">
+ <TopBar />
+ <Show
+ when={blockFileSignal()}
+ fallback={
+ <div class="flex size-full items-center justify-center">
+ {/* Loading state handled by DocumentBlockContainer */}
+ </div>
+ }
+ >
+ {(file) => (
+ <ImageContent
+ file={file()}
+ alt={blockMetadataSignal()?.documentName || 'Image'}
+ />
+ )}
+ </Show>
+ </div>
+ </SidePanel.Layout>
</div>
</DocumentBlockContainer>
);
diff --git a/apps/web/src/features/block-image/component/ModalsProvider.tsx b/apps/web/src/features/block-image/component/ModalsProvider.tsx
deleted file mode 100644
index b5c8846656..0000000000
--- a/apps/web/src/features/block-image/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { createSignal, type ParentProps } from 'solid-js';
-
-export function ModalsProvider(props: ParentProps) {
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <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 8bda97a561..3a0cabd611 100644
--- a/apps/web/src/features/block-image/component/TopBar.tsx
+++ b/apps/web/src/features/block-image/component/TopBar.tsx
@@ -12,9 +12,10 @@ import { FileTypeChip } from '@core/component/FileTypeChip';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
-import { blockFileSignal } from '@core/signal/load';
+import { useShareModal } from '@core/component/TopBar/shareModal';
+import { blockFileSignal, blockMetadataSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import {
useBlockDocumentDownloadName,
useBlockDocumentName,
@@ -30,7 +31,15 @@ export function TopBar() {
const name = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
- const shareCtx = useShareDialogContext();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: blockId,
+ blockAlias: 'image',
+ itemType: 'document',
+ name: name() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
const downloadDocument = createCallback(async () => {
const file = imageFile();
@@ -56,8 +65,8 @@ export function TopBar() {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: openShare,
+ buttonComponent: () => <ShareTrigger onClick={openShare} />,
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/block-md/component/ModalsProvider.tsx b/apps/web/src/features/block-md/component/ModalsProvider.tsx
index 1a72481968..51753c99cf 100644
--- a/apps/web/src/features/block-md/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-md/component/ModalsProvider.tsx
@@ -1,87 +1,19 @@
import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
import { NotificationsDrawer } from '@core/component/NotificationsModal';
-import { Permissions } from '@core/component/SharePermissions';
-import {
- ShareDialogContext,
- ShareModal,
-} from '@core/component/TopBar/ShareButton';
-import { queryReadyGate } from '@queries/gate';
-import { useDocumentMetadataQuery } from '@queries/storage/document-metadata';
-import {
- createSignal,
- type ParentProps,
- type Setter,
- Suspense,
- useContext,
-} from 'solid-js';
+import type { ParentProps } from 'solid-js';
import { useMarkdownDocument } from '../context/markdown-document-context';
-import { useMarkdownName } from './MarkdownNameProvider';
-export function ModalsProvider(
- props: ParentProps<{
- shareOpen?: boolean;
- onShareOpenChange?: (open: boolean) => void;
- }>
-) {
- const {
- documentId,
- kind,
- permissions: documentPermissions,
- } = useMarkdownDocument();
- const { displayName } = useMarkdownName();
+export function ModalsProvider(props: ParentProps) {
+ const { documentId } = useMarkdownDocument();
const notificationSource = useGlobalNotificationSource();
- const metadataQuery = useDocumentMetadataQuery(documentId);
- const parentShareContext = useContext(ShareDialogContext);
- const [localShareOpen, setLocalShareOpen] = createSignal(false);
- const shareOpen = () => props.shareOpen ?? localShareOpen();
- const setShareOpen: Setter<boolean> = (next) => {
- const open = typeof next === 'function' ? next(shareOpen()) : next;
- props.onShareOpenChange?.(open);
- if (props.shareOpen === undefined) setLocalShareOpen(() => open);
- return open;
- };
-
- const blockAlias = (): 'md' | 'task' | 'snippet' | 'skill' => {
- const documentKind = kind();
- return documentKind === 'document' ? 'md' : documentKind;
- };
- const permissions = () => {
- if (documentPermissions.isOwner()) return Permissions.OWNER;
- if (documentPermissions.canEdit()) return Permissions.CAN_EDIT;
- if (documentPermissions.canComment()) {
- return Permissions.CAN_COMMENT;
- }
- return Permissions.CAN_VIEW;
- };
return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- copyLink: parentShareContext?.copyLink,
- }}
- >
+ <>
{props.children}
<NotificationsDrawer
entity={{ id: documentId(), type: 'document' }}
notificationSource={notificationSource}
/>
- <Suspense>
- <ShareModal
- isSharePermOpen={shareOpen()}
- setIsSharePermOpen={setShareOpen}
- id={documentId()}
- blockAlias={blockAlias()}
- itemType="document"
- name={displayName() ?? ''}
- userPermissions={permissions()}
- owner={
- queryReadyGate(metadataQuery) ? metadataQuery.data.owner : undefined
- }
- />
- </Suspense>
- </ShareDialogContext.Provider>
+ </>
);
}
diff --git a/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx b/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx
index fb2c3e0940..f8fdc7406e 100644
--- a/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx
+++ b/apps/web/src/features/block-md/component/useMarkdownDocumentTools.tsx
@@ -5,17 +5,20 @@ import {
} from '@app/features/chat/ChatWithAgentButton';
import type { BlockTool } from '@components/app/ResponsiveBlockToolbar';
import type { FileOperation } from '@components/app/split-layout/components/SplitFileMenu';
+import { Permissions } from '@core/component/SharePermissions';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { isMobile } from '@core/mobile/isMobile';
import { copyBranchNameToClipboard } from '@core/util/branchName';
import Download from '@phosphor/download.svg';
import GitBranch from '@phosphor/git-branch.svg';
import IconLink from '@phosphor/link.svg';
import TerminalWindowIcon from '@phosphor/terminal-window.svg';
+import { queryReadyGate } from '@queries/gate';
+import { useDocumentMetadataQuery } from '@queries/storage/document-metadata';
import { useMarkdownDocument } from '../context/markdown-document-context';
import {
DispatchAgentButton,
@@ -24,11 +27,38 @@ import {
import { useMarkdownName } from './MarkdownNameProvider';
import { useDownloadDocumentAsMarkdownText } from './useMarkdownDocumentDownload';
+function useMarkdownShareModal() {
+ const { documentId, kind, permissions } = useMarkdownDocument();
+ const { displayName } = useMarkdownName();
+ const metadataQuery = useDocumentMetadataQuery(documentId);
+
+ const userPermissions = () => {
+ if (permissions.isOwner()) return Permissions.OWNER;
+ if (permissions.canEdit()) return Permissions.CAN_EDIT;
+ if (permissions.canComment()) return Permissions.CAN_COMMENT;
+ return Permissions.CAN_VIEW;
+ };
+
+ return useShareModal(() => {
+ const documentKind = kind();
+ return {
+ id: documentId(),
+ blockAlias: documentKind === 'document' ? 'md' : documentKind,
+ itemType: 'document',
+ name: displayName() ?? '',
+ userPermissions: userPermissions(),
+ owner: queryReadyGate(metadataQuery)
+ ? metadataQuery.data.owner
+ : undefined,
+ };
+ });
+}
+
export function useMarkdownDocumentTools() {
const { documentId, kind } = useMarkdownDocument();
const { displayName } = useMarkdownName();
const downloadAsMarkdownText = useDownloadDocumentAsMarkdownText();
- const shareDialog = useShareDialogContext();
+ const openShare = useMarkdownShareModal();
const dispatchAgentActions = useDispatchAgentSplitFileActions();
const isTask = kind() === 'task';
@@ -81,8 +111,8 @@ export function useMarkdownDocumentTools() {
group: 'sharing',
label: 'Share',
icon: IconLink,
- action: () => shareDialog.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: openShare,
+ buttonComponent: () => <ShareTrigger onClick={openShare} />,
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/block-pdf/component/Block.tsx b/apps/web/src/features/block-pdf/component/Block.tsx
index b99d1c7884..e70773eb76 100644
--- a/apps/web/src/features/block-pdf/component/Block.tsx
+++ b/apps/web/src/features/block-pdf/component/Block.tsx
@@ -15,7 +15,6 @@ import { Show } from 'solid-js';
import { usePdfDocument } from '../context/pdf-document-context';
import type { PdfBlockData } from '../definition';
import { type LocationSearchParams, URL_PARAMS } from '../signal/location';
-import { ModalsProvider } from './ModalsProvider';
import {
PdfDocument,
PdfDocumentContent,
@@ -70,24 +69,22 @@ function PdfBlockContent() {
const pdf = usePdfDocument();
return (
- <ModalsProvider>
- <Show when={!pdf.isNested()} fallback={<PdfDocumentContent />}>
- <SidePanel.Layout>
- <PdfSidePanelSections />
- <div class="flex size-full min-w-0 flex-col overflow-hidden">
- <TopBar />
- <Show when={pdf.tabs.isVisible()}>
- <div class="flex px-2 justify-between min-h-11 items-center gap-2">
- <div class="overflow-x-auto overflow-y-hidden grow customScrollbar w-0">
- <Tabs />
- </div>
+ <Show when={!pdf.isNested()} fallback={<PdfDocumentContent />}>
+ <SidePanel.Layout>
+ <PdfSidePanelSections />
+ <div class="flex size-full min-w-0 flex-col overflow-hidden">
+ <TopBar />
+ <Show when={pdf.tabs.isVisible()}>
+ <div class="flex px-2 justify-between min-h-11 items-center gap-2">
+ <div class="overflow-x-auto overflow-y-hidden grow customScrollbar w-0">
+ <Tabs />
</div>
- </Show>
- <PdfDocumentContent />
- </div>
- </SidePanel.Layout>
- </Show>
- </ModalsProvider>
+ </div>
+ </Show>
+ <PdfDocumentContent />
+ </div>
+ </SidePanel.Layout>
+ </Show>
);
}
diff --git a/apps/web/src/features/block-pdf/component/ModalsProvider.tsx b/apps/web/src/features/block-pdf/component/ModalsProvider.tsx
deleted file mode 100644
index d0851727b8..0000000000
--- a/apps/web/src/features/block-pdf/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-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 fileName = useBlockDocumentName('Unknown Filename');
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <ShareBlockModal name={fileName()} />
- </ShareDialogContext.Provider>
- );
-}
diff --git a/apps/web/src/features/block-pdf/component/PageOverlay.tsx b/apps/web/src/features/block-pdf/component/PageOverlay.tsx
index 1860f93645..d45ec33807 100644
--- a/apps/web/src/features/block-pdf/component/PageOverlay.tsx
+++ b/apps/web/src/features/block-pdf/component/PageOverlay.tsx
@@ -13,6 +13,7 @@ import { getHighlightsFromSelection } from '@block-pdf/util/pdfjsUtils';
import { useIsAuthenticated } from '@core/auth';
import type { ThreadId } from '@core/comments/commentType';
import { openLoginModal } from '@core/component/TopBar/LoginButton';
+import { useCopyLink } from '@core/util/useCopyLink';
import { cn } from '@ui';
import { detect } from 'detect-browser';
import type { PageViewport } from 'pdfjs-dist';
@@ -385,9 +386,10 @@ export function PageOverlay(props: IPageOverlayProps) {
});
const createShareUrl = useCreateShareUrl();
+ const copyLink = useCopyLink();
const shareLinkProps = () => ({
share: () => {
- createShareUrl(LocationType.Annotation);
+ copyLink(createShareUrl(LocationType.Annotation), { silent: true });
},
});
diff --git a/apps/web/src/features/block-pdf/component/TopBar.tsx b/apps/web/src/features/block-pdf/component/TopBar.tsx
index be23084bfe..e54cc3be33 100644
--- a/apps/web/src/features/block-pdf/component/TopBar.tsx
+++ b/apps/web/src/features/block-pdf/component/TopBar.tsx
@@ -24,15 +24,16 @@ 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 { toast } from '@core/component/Toast/Toast';
import { openLoginModal } from '@core/component/TopBar/LoginButton';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { blockMetadataSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
+import { useCopyLink } from '@core/util/useCopyLink';
import IconShared from '@icon/share.svg';
import DownloadIcon from '@phosphor/download-simple.svg';
import Printer from '@phosphor/printer.svg';
@@ -52,19 +53,25 @@ export function TopBar() {
const hasComments = useHasComments();
const fileName = useBlockDocumentName('Unknown Filename');
- const shareCtx = useShareDialogContext();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: documentId,
+ blockAlias: 'pdf',
+ itemType: 'document',
+ name: fileName() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
const createShareUrl = useCreateShareUrl();
+ const copyEntityLink = useCopyLink();
const itemType = blockNameToItemType(blockName);
if (!itemType) return null;
const fileType = blockMetadataSignal()?.fileType;
- const copyLink = () => {
- createShareUrl(LocationType.General);
- toast.success('Link copied to clipboard');
- };
+ const copyLink = () => copyEntityLink(createShareUrl(LocationType.General));
const fileActionAuth = () => ({
isAuthenticated: !!isAuth(),
@@ -151,8 +158,10 @@ export function TopBar() {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
- buttonComponent: () => <ShareTrigger copyLink={copyLink} />,
+ action: openShare,
+ buttonComponent: () => (
+ <ShareTrigger onClick={openShare} copyLink={copyLink} />
+ ),
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/block-pdf/signal/location.ts b/apps/web/src/features/block-pdf/signal/location.ts
index e62f5b5db2..4b54e97587 100644
--- a/apps/web/src/features/block-pdf/signal/location.ts
+++ b/apps/web/src/features/block-pdf/signal/location.ts
@@ -5,7 +5,6 @@ import {
type IUpdateFindControlStateEvent,
} from '@block-pdf/PdfViewer/EventBus';
import type { FindController } from '@block-pdf/PdfViewer/FindController';
-import { useReferralCode } from '@core/context/user';
import { buildSimpleEntityUrl } from '@core/util/url';
import { waitForSignal } from '@core/util/waitForSignal';
import { createCallback } from '@solid-primitives/rootless';
@@ -182,15 +181,12 @@ export function selectLocationForFidelity(
return validLocations[0]?.[1];
}
+/** Builds a link to the PDF at the most precise location for `fidelity`. */
export function useCreateShareUrl() {
const pdf = usePdfDocument();
const rootViewer = usePdfViewer().root;
- const referralCode = useReferralCode();
- const createShareUrl = (
- fidelity: PdfLocationType,
- copy: boolean = true
- ): string => {
+ const createShareUrl = (fidelity: PdfLocationType): string => {
const shareLocation = pdf.shareLocation();
const locations = {
general: {
@@ -205,21 +201,7 @@ export function useCreateShareUrl() {
const selectedLocation = selectLocationForFidelity(fidelity, locations);
const url = locationToUrl(selectedLocation);
const params = Object.fromEntries(new URL(url).searchParams);
- const code = referralCode();
- if (code) {
- params.referral_code = code;
- }
- const updatedUrl = buildSimpleEntityUrl(
- {
- type: 'pdf',
- id: pdf.documentId(),
- },
- params
- );
- if (copy && updatedUrl) {
- navigator.clipboard.writeText(updatedUrl);
- }
- return url;
+ return buildSimpleEntityUrl({ type: 'pdf', id: pdf.documentId() }, params);
};
return createCallback(createShareUrl);
}
diff --git a/apps/web/src/features/block-project/component/Block.tsx b/apps/web/src/features/block-project/component/Block.tsx
index 467781cb49..1a94ebc753 100644
--- a/apps/web/src/features/block-project/component/Block.tsx
+++ b/apps/web/src/features/block-project/component/Block.tsx
@@ -25,7 +25,6 @@ import {
import { refetchSoupEntity } from '@queries/soup/cache';
import { refetchResources } from '@service-storage/util/refetchResources';
import { type Component, createSignal, Show } from 'solid-js';
-import { ModalsProvider } from './ModalsProvider';
import { ProjectSidePanelSections } from './sidepanel/ProjectSidePanelSections';
import { TopBar } from './TopBar';
@@ -112,26 +111,24 @@ const Block: Component = () => {
disabled: isSpecialProject,
}}
>
- <ModalsProvider>
- <Show when={isDragging() && !isSpecialProject}>
- <FileDropOverlay>Upload to this folder</FileDropOverlay>
+ <Show when={isDragging() && !isSpecialProject}>
+ <FileDropOverlay>Upload to this folder</FileDropOverlay>
+ </Show>
+ <SidePanel.Layout defaultOpen={false}>
+ <Show when={!isSpecialProject}>
+ <ProjectSidePanelSections />
</Show>
- <SidePanel.Layout defaultOpen={false}>
- <Show when={!isSpecialProject}>
- <ProjectSidePanelSections />
- </Show>
- <div class="flex size-full min-w-0 flex-col overflow-hidden">
- <TopBar />
- <ProjectEntityList
- projectId={projectId}
- soup={projectSoup}
- // Scope is already attached by the block container so we can use that
- // Change this when we remove blocks
- scopeId={blockHotkeyScopeSignal.get()}
- />
- </div>
- </SidePanel.Layout>
- </ModalsProvider>
+ <div class="flex size-full min-w-0 flex-col overflow-hidden">
+ <TopBar />
+ <ProjectEntityList
+ projectId={projectId}
+ soup={projectSoup}
+ // Scope is already attached by the block container so we can use that
+ // Change this when we remove blocks
+ scopeId={blockHotkeyScopeSignal.get()}
+ />
+ </div>
+ </SidePanel.Layout>
</div>
</DocumentBlockContainer>
);
diff --git a/apps/web/src/features/block-project/component/ModalsProvider.tsx b/apps/web/src/features/block-project/component/ModalsProvider.tsx
deleted file mode 100644
index 830de06d73..0000000000
--- a/apps/web/src/features/block-project/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { getIsSpecialProject } from '@block-project/isSpecial';
-import { useBlockId } from '@core/block';
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { ENABLE_PROJECT_SHARING } from '@core/constant/featureFlags';
-import { createSignal, type ParentProps, Show } from 'solid-js';
-import { projectBlockDataSignal } from '../signal/projectBlockData';
-
-export function ModalsProvider(props: ParentProps) {
- const id = useBlockId();
- const isSpecialProject = getIsSpecialProject(id);
- const name = () => projectBlockDataSignal()?.projectMetadata.name;
- const owner = () => projectBlockDataSignal()?.projectMetadata.userId;
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <Show when={ENABLE_PROJECT_SHARING && !isSpecialProject}>
- <ShareBlockModal name={name()} owner={owner()} />
- </Show>
- </ShareDialogContext.Provider>
- );
-}
diff --git a/apps/web/src/features/block-project/component/TopBar.tsx b/apps/web/src/features/block-project/component/TopBar.tsx
index c6f73afe92..c83cfa8972 100644
--- a/apps/web/src/features/block-project/component/TopBar.tsx
+++ b/apps/web/src/features/block-project/component/TopBar.tsx
@@ -27,16 +27,20 @@ import {
SplitToolbarRight,
} from '@components/app/split-layout/components/SplitToolbar';
import { useBlockId } from '@core/block';
-import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { ENABLE_PROJECT_SHARING } from '@core/constant/featureFlags';
import { isMobile } from '@core/mobile/isMobile';
-import { useCanEdit, useIsDocumentOwner } from '@core/signal/permissions';
+import {
+ useCanEdit,
+ useGetPermissions,
+ useIsDocumentOwner,
+} from '@core/signal/permissions';
import { buildSimpleEntityUrl } from '@core/util/url';
+import { useCopyLink } from '@core/util/useCopyLink';
import IconShared from '@icon/share.svg';
import { createMemo, For, Show } from 'solid-js';
import { ProjectCreateMenu, useProjectCreateTools } from './ProjectCreateMenu';
@@ -53,17 +57,18 @@ export function TopBar() {
() => projectBlockDataSignal()?.projectMetadata.name ?? ''
);
- const shareCtx = useShareDialogContext();
-
- function handleCopyLink() {
- navigator.clipboard.writeText(
- buildSimpleEntityUrl({
- type: 'project',
- id,
- })
- );
- toast.success('Link copied to clipboard');
- }
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id,
+ blockAlias: 'project',
+ itemType: 'project',
+ name: name(),
+ userPermissions: permissions(),
+ owner: projectBlockDataSignal()?.projectMetadata.userId,
+ }));
+ const copyLink = useCopyLink();
+ const handleCopyLink = () =>
+ copyLink(buildSimpleEntityUrl({ type: 'project', id }));
const ops = createMemo<FileOperation[]>(() => [
...(isOwner() && !isSpecialProject
@@ -95,9 +100,11 @@ export function TopBar() {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
+ action: openShare,
condition: () => ENABLE_PROJECT_SHARING && !isSpecialProject,
- buttonComponent: () => <ShareTrigger copyLink={handleCopyLink} />,
+ buttonComponent: () => (
+ <ShareTrigger onClick={openShare} copyLink={handleCopyLink} />
+ ),
focusTarget: getShareDrawerRecipientInput,
},
];
@@ -112,7 +119,7 @@ export function TopBar() {
<SplitHeaderRight>
<div class="order-[1000] flex items-center gap-1">
<Show when={showShare()}>
- <ShareTrigger copyLink={handleCopyLink} />
+ <ShareTrigger onClick={openShare} copyLink={handleCopyLink} />
</Show>
</div>
</SplitHeaderRight>
diff --git a/apps/web/src/features/block-spreadsheet/README.md b/apps/web/src/features/block-spreadsheet/README.md
index 0993ae2524..de20b30218 100644
--- a/apps/web/src/features/block-spreadsheet/README.md
+++ b/apps/web/src/features/block-spreadsheet/README.md
@@ -36,7 +36,7 @@ frontend feature layers:
| `views/SpreadsheetEditor.tsx` | Compose the editor and load the calculation engine. |
The editor fills its split beneath the shared document title bar. Saved documents
-use `ShareTrigger` and `ShareBlockModal`, including existing document permissions,
+use `ShareTrigger` and `useShareModal`, including existing document permissions,
copy links, and the Share keyboard shortcut. The local sample also has a Share
action: it creates a native document, saves the sample's Loro operations, waits for
the sync acknowledgement, then opens the saved document's sharing dialog. Failed
diff --git a/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx b/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx
index 7b18693deb..924197f832 100644
--- a/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx
+++ b/apps/web/src/features/block-spreadsheet/SpreadsheetBlock.tsx
@@ -15,16 +15,17 @@ import { BlockLiveIndicators } from '@core/component/LiveIndicators';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { useUserId } from '@core/context/user';
import { blockDataSignal } from '@core/internal/BlockLoader';
-import { useCanEdit } from '@core/signal/permissions';
+import { blockMetadataSignal } from '@core/signal/load';
+import { useCanEdit, useGetPermissions } from '@core/signal/permissions';
import { getDisplayName, tryMacroId } from '@core/user';
import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { downloadFile } from '@filesystem/download';
import IconShared from '@icon/share.svg';
-import { Show } from 'solid-js';
+import { onMount, Show } from 'solid-js';
import { spreadsheetChatContext } from './core/chat-context';
import type { SpreadsheetData } from './definition';
import { createSpreadsheetStore } from './primitives/create-spreadsheet-store';
@@ -33,7 +34,6 @@ import { createSpreadsheetSession } from './queries/spreadsheet-session';
import { SpreadsheetComments } from './SpreadsheetComments';
import { spreadsheetMentions } from './spreadsheet-mentions';
import { SpreadsheetEditor } from './views/SpreadsheetEditor';
-import { SpreadsheetModalsProvider } from './views/SpreadsheetModalsProvider';
export default function SpreadsheetBlock(props: { share?: string }) {
const enabled = useSpreadsheetAccess();
@@ -46,20 +46,29 @@ export default function SpreadsheetBlock(props: { share?: string }) {
</div>
}
>
- <SpreadsheetModalsProvider share={props.share}>
- <SpreadsheetBlockContent />
- </SpreadsheetModalsProvider>
+ <SpreadsheetBlockContent share={props.share} />
</Show>
);
}
-function SpreadsheetBlockContent() {
+function SpreadsheetBlockContent(props: { share?: string }) {
useBlockEntityCommands();
const documentId = useBlockId();
const name = useBlockDocumentName('New Spreadsheet');
const canEdit = useCanEdit();
const userId = useUserId();
- const share = useShareDialogContext();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: documentId,
+ blockAlias: 'spreadsheet',
+ itemType: 'document',
+ name: name() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
+ onMount(() => {
+ if (props.share === 'true') openShare();
+ });
const data = () => {
const value = blockDataSignal.get() as
| (SpreadsheetData & { __block?: string })
@@ -92,8 +101,8 @@ function SpreadsheetBlockContent() {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => share.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: openShare,
+ buttonComponent: () => <ShareTrigger onClick={openShare} />,
focusTarget: getShareDrawerRecipientInput,
},
]}
diff --git a/apps/web/src/features/block-spreadsheet/views/SpreadsheetModalsProvider.tsx b/apps/web/src/features/block-spreadsheet/views/SpreadsheetModalsProvider.tsx
deleted file mode 100644
index 654a6aa813..0000000000
--- a/apps/web/src/features/block-spreadsheet/views/SpreadsheetModalsProvider.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
-import { createSignal, type ParentProps } from 'solid-js';
-
-export function SpreadsheetModalsProvider(
- props: ParentProps<{ share?: string }>
-) {
- const name = useBlockDocumentName();
- const [shareOpen, setShareOpen] = createSignal(props.share === 'true');
-
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <ShareBlockModal name={name()} />
- </ShareDialogContext.Provider>
- );
-}
diff --git a/apps/web/src/features/block-unknown/component/Block.tsx b/apps/web/src/features/block-unknown/component/Block.tsx
index adabfff00b..eb69371ea9 100644
--- a/apps/web/src/features/block-unknown/component/Block.tsx
+++ b/apps/web/src/features/block-unknown/component/Block.tsx
@@ -1,8 +1,10 @@
import { FileSidePanelSections, SidePanel } from '@components/app/side-panel';
+import { useBlockId } from '@core/block';
import { DocumentBlockContainer } from '@core/component/DocumentBlockContainer';
import { toast } from '@core/component/Toast/Toast';
-import { useShareDialogContext } from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { blockMetadataSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import {
useBlockDocumentDownloadName,
useBlockDocumentName,
@@ -13,7 +15,6 @@ import { lazy, Show, Suspense } from 'solid-js';
import { isUploadedWorkbook } from '../../block-spreadsheet/core/uploaded-workbook';
import { useSpreadsheetAccess } from '../../block-spreadsheet/primitives/use-spreadsheet-access';
import { useGetFileBlob } from '../signal/blockData';
-import { ModalsProvider } from './ModalsProvider';
import { TopBar } from './TopBar';
import { UnknownContent } from './UnknownContent';
@@ -25,9 +26,7 @@ export default function BlockUnknown() {
return (
<DocumentBlockContainer>
<div class="size-full select-none overscroll-none overflow-hidden flex flex-col relative">
- <ModalsProvider>
- <BlockUnknownContent />
- </ModalsProvider>
+ <BlockUnknownContent />
</div>
</DocumentBlockContainer>
);
@@ -39,7 +38,16 @@ function BlockUnknownContent() {
enabled() && isUploadedWorkbook(blockMetadataSignal.get()?.fileType);
const fileName = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
- const shareCtx = useShareDialogContext();
+ const blockId = useBlockId();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: blockId,
+ blockAlias: 'unknown',
+ itemType: 'document',
+ name: fileName() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
const getBlob = useGetFileBlob();
const downloadDocument = createCallback(async () => {
@@ -57,7 +65,7 @@ function BlockUnknownContent() {
<FileSidePanelSections />
<div class="flex size-full min-w-0 flex-col overflow-hidden">
<div class="relative">
- <TopBar />
+ <TopBar onShare={openShare} />
</div>
<div class="w-full grow relative overflow-hidden">
<Show
@@ -65,7 +73,7 @@ function BlockUnknownContent() {
fallback={
<UnknownContent
fileName={fileName()}
- onShare={shareCtx.open}
+ onShare={openShare}
onDownload={() => void downloadDocument()}
/>
}
diff --git a/apps/web/src/features/block-unknown/component/ModalsProvider.tsx b/apps/web/src/features/block-unknown/component/ModalsProvider.tsx
deleted file mode 100644
index b5c8846656..0000000000
--- a/apps/web/src/features/block-unknown/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { createSignal, type ParentProps } from 'solid-js';
-
-export function ModalsProvider(props: ParentProps) {
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <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 b191774e2f..abc1e340aa 100644
--- a/apps/web/src/features/block-unknown/component/TopBar.tsx
+++ b/apps/web/src/features/block-unknown/component/TopBar.tsx
@@ -13,7 +13,6 @@ import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
import {
useBlockDocumentDownloadName,
@@ -25,14 +24,12 @@ import DownloadSimple from '@phosphor/download-simple.svg';
import { createCallback } from '@solid-primitives/rootless';
import { useGetFileBlob } from '../signal/blockData';
-export function TopBar() {
+export function TopBar(props: { onShare: () => void }) {
const blockId = useBlockId();
const fileName = useBlockDocumentName();
const downloadName = useBlockDocumentDownloadName();
const getBlob = useGetFileBlob();
- const shareCtx = useShareDialogContext();
-
const downloadDocument = createCallback(async () => {
try {
const blob = await getBlob();
@@ -61,8 +58,8 @@ export function TopBar() {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: props.onShare,
+ buttonComponent: () => <ShareTrigger onClick={props.onShare} />,
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/block-video/component/Block.tsx b/apps/web/src/features/block-video/component/Block.tsx
index d5eacf915b..3602431c50 100644
--- a/apps/web/src/features/block-video/component/Block.tsx
+++ b/apps/web/src/features/block-video/component/Block.tsx
@@ -2,7 +2,6 @@ import { useBlockEntityCommands } from '@app/features/next-soup/actions';
import { FileSidePanelSections, SidePanel } from '@components/app/side-panel';
import { DocumentBlockContainer } from '@core/component/DocumentBlockContainer';
import { blockData } from '../signal/blockData';
-import { ModalsProvider } from './ModalsProvider';
import { TopBar } from './TopBar';
import { VideoContent } from './VideoContent';
@@ -11,22 +10,20 @@ export default function BlockVideo() {
return (
<DocumentBlockContainer>
<div class="size-full select-none overscroll-none overflow-hidden flex flex-col relative">
- <ModalsProvider>
- <SidePanel.Layout defaultOpen={false}>
- <FileSidePanelSections />
- <div class="flex size-full min-w-0 flex-col overflow-hidden">
- <div class="relative">
- <TopBar />
- </div>
- <div class="w-full grow relative overflow-hidden">
- <VideoContent
- videoUrl={blockData()?.videoUrl}
- fileType={blockData()?.documentMetadata.fileType}
- />
- </div>
+ <SidePanel.Layout defaultOpen={false}>
+ <FileSidePanelSections />
+ <div class="flex size-full min-w-0 flex-col overflow-hidden">
+ <div class="relative">
+ <TopBar />
</div>
- </SidePanel.Layout>
- </ModalsProvider>
+ <div class="w-full grow relative overflow-hidden">
+ <VideoContent
+ videoUrl={blockData()?.videoUrl}
+ fileType={blockData()?.documentMetadata.fileType}
+ />
+ </div>
+ </div>
+ </SidePanel.Layout>
</div>
</DocumentBlockContainer>
);
diff --git a/apps/web/src/features/block-video/component/ModalsProvider.tsx b/apps/web/src/features/block-video/component/ModalsProvider.tsx
deleted file mode 100644
index b5c8846656..0000000000
--- a/apps/web/src/features/block-video/component/ModalsProvider.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
- ShareBlockModal,
- ShareDialogContext,
-} from '@core/component/TopBar/ShareButton';
-import { createSignal, type ParentProps } from 'solid-js';
-
-export function ModalsProvider(props: ParentProps) {
- const [shareOpen, setShareOpen] = createSignal(false);
- return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- {props.children}
- <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 752c04011f..2a94409f6a 100644
--- a/apps/web/src/features/block-video/component/TopBar.tsx
+++ b/apps/web/src/features/block-video/component/TopBar.tsx
@@ -12,8 +12,10 @@ import { toast } from '@core/component/Toast/Toast';
import {
getShareDrawerRecipientInput,
ShareTrigger,
- useShareDialogContext,
} from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
+import { blockMetadataSignal } from '@core/signal/load';
+import { useGetPermissions } from '@core/signal/permissions';
import {
useBlockDocumentDownloadName,
useBlockDocumentName,
@@ -32,7 +34,15 @@ export function TopBar() {
const downloadName = useBlockDocumentDownloadName();
const getBlob = useGetFileBlob();
- const shareCtx = useShareDialogContext();
+ const permissions = useGetPermissions();
+ const openShare = useShareModal(() => ({
+ id: blockId,
+ blockAlias: 'video',
+ itemType: 'document',
+ name: name() ?? '',
+ userPermissions: permissions(),
+ owner: blockMetadataSignal()?.owner,
+ }));
const downloadDocument = createCallback(async () => {
const fileName = downloadName();
@@ -78,8 +88,8 @@ export function TopBar() {
group: 'sharing',
label: 'Share',
icon: IconShared,
- action: () => shareCtx.open(),
- buttonComponent: () => <ShareTrigger />,
+ action: openShare,
+ buttonComponent: () => <ShareTrigger onClick={openShare} />,
focusTarget: getShareDrawerRecipientInput,
},
];
diff --git a/apps/web/src/features/drive-view/components/DriveDetailView.tsx b/apps/web/src/features/drive-view/components/DriveDetailView.tsx
index 144a481c5a..a534788bba 100644
--- a/apps/web/src/features/drive-view/components/DriveDetailView.tsx
+++ b/apps/web/src/features/drive-view/components/DriveDetailView.tsx
@@ -14,20 +14,10 @@ import { MarkdownDetailBreadcrumbItem } from '@block-md/component/MarkdownDetail
import type { MarkdownDocumentKind } from '@block-md/types';
import { SidePanel } from '@components/app/side-panel';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
-import { toast } from '@core/component/Toast/Toast';
-import {
- ShareDialogContext,
- ShareTrigger,
-} from '@core/component/TopBar/ShareButton';
-import { useReferralCode } from '@core/context/user';
-import {
- createSignal,
- ErrorBoundary,
- For,
- Match,
- Show,
- Switch,
-} from 'solid-js';
+import { ShareTrigger } from '@core/component/TopBar/ShareButton';
+import { useDocumentShareModal } from '@core/component/TopBar/shareModal';
+import { useCopyLink } from '@core/util/useCopyLink';
+import { ErrorBoundary, For, Match, Show, Switch } from 'solid-js';
import { useDriveView } from '../context/drive-context';
import { driveLocationBreadcrumbs } from '../core/breadcrumbs';
import { useDriveDetailNavigation } from '../drive-detail-navigation';
@@ -65,6 +55,8 @@ function markdownKind(target: DocumentDetailTarget): MarkdownDocumentKind {
function DriveDetailTopBar() {
const navigationStack = useDriveDetailNavigation();
const panel = useSplitPanelOrThrow();
+ const copyViewLink = useCopyLink();
+ const copyLink = () => copyViewLink(window.location.href);
const activeDetail = () => {
const target = navigationStack.active()?.data;
const blockType = target ? entityDetailBlockType(target) : undefined;
@@ -72,6 +64,15 @@ function DriveDetailTopBar() {
? { target, blockType }
: undefined;
};
+ const openShare = useDocumentShareModal(() => {
+ const detail = activeDetail();
+ if (!detail) return;
+ return {
+ documentId: detail.target.id,
+ blockAlias: detail.blockType,
+ copyLink,
+ };
+ });
return (
<ViewShell.TopBar class="touch:flex">
@@ -83,9 +84,11 @@ function DriveDetailTopBar() {
<Show when={activeDetail()}>
{(detail) => (
<ShareTrigger
+ onClick={openShare}
id={detail().target.id}
blockType={detail().blockType}
hotkeyScope={panel.splitHotkeyScope}
+ copyLink={copyLink}
/>
)}
</Show>
@@ -98,8 +101,6 @@ function DriveDetailTopBar() {
function StackEntityDetail(props: {
entry: EntityDetailNavigationEntry;
order: number;
- shareOpen: boolean;
- onShareOpenChange: (open: boolean) => void;
}) {
const navigationStack = useDriveDetailNavigation();
const markdownTarget = () => {
@@ -124,8 +125,6 @@ function StackEntityDetail(props: {
documentId={target().id}
kind={kind()}
fallbackName={target().fallbackName}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
>
{(context) => (
<MarkdownDetailBreadcrumbItem
@@ -160,8 +159,6 @@ function StackEntityDetail(props: {
</Show>
<EntityDetail
target={props.entry.data}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
previewHeaderLeading={
<Show
when={entityDetailBlockType(props.entry.data) === 'spreadsheet'}
@@ -213,16 +210,7 @@ export function DriveDetailView() {
const { state, sidebar } = useDriveView();
const breadcrumbOrderOffset = () =>
driveLocationBreadcrumbs(state.value().location, sidebar.folders()).length;
- const [shareOpen, setShareOpen] = createSignal(false);
const navigationStack = useDriveDetailNavigation();
- const referralCode = useReferralCode();
- const copyLink = () => {
- const url = new URL(window.location.href);
- const code = referralCode();
- if (code) url.searchParams.set('referral_code', code);
- void navigator.clipboard.writeText(url.toString());
- toast.success('Link copied to clipboard.');
- };
// Spreadsheets use their live block in PreviewPanel, which supplies its own
// header, sharing controls and the enclosing ViewShell's sidebar toggle.
const hasBlockHeader = () => {
@@ -231,14 +219,7 @@ export function DriveDetailView() {
};
return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- copyLink,
- }}
- >
+ <>
<DriveDetailAncestorBreadcrumbs orderOffset={breadcrumbOrderOffset()} />
<SidePanel.Root>
<div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
@@ -264,8 +245,6 @@ export function DriveDetailView() {
navigationStack.entries().length -
1
}
- shareOpen={shareOpen()}
- onShareOpenChange={setShareOpen}
/>
</ErrorBoundary>
)}
@@ -273,6 +252,6 @@ export function DriveDetailView() {
</div>
</div>
</SidePanel.Root>
- </ShareDialogContext.Provider>
+ </>
);
}
diff --git a/apps/web/src/features/drive-view/components/FileDetail.tsx b/apps/web/src/features/drive-view/components/FileDetail.tsx
index cb689ee424..b6b6cdf384 100644
--- a/apps/web/src/features/drive-view/components/FileDetail.tsx
+++ b/apps/web/src/features/drive-view/components/FileDetail.tsx
@@ -2,98 +2,51 @@ import {
DocumentFileSidePanelSections,
SidePanel,
} from '@components/app/side-panel';
-import type { BlockAlias, BlockName } from '@core/block';
import {
getPermissions,
hasPermissions,
Permissions,
} from '@core/component/SharePermissions';
-import {
- ShareDialogContext,
- ShareModal,
-} from '@core/component/TopBar/ShareButton';
import SpinnerIcon from '@phosphor/spinner.svg';
import type { AccessLevel } from '@service-storage/generated/schemas/accessLevel';
import type { DocumentMetadata } from '@service-storage/generated/schemas/documentMetadata';
import { Button } from '@ui';
import {
createResource,
- createSignal,
ErrorBoundary,
type JSX,
Match,
type ParentProps,
- type Setter,
Suspense,
Switch,
- useContext,
} from 'solid-js';
-export type FileDetailShareProps = {
- shareOpen?: boolean;
- onShareOpenChange?: (open: boolean) => void;
-};
-
-export type FileDetailLayoutProps = ParentProps<
- FileDetailShareProps & {
- documentId: string;
- documentMetadata: DocumentMetadata;
- userAccessLevel: AccessLevel;
- blockType: BlockName | BlockAlias;
- defaultSidePanelOpen?: boolean;
- }
->;
+export type FileDetailLayoutProps = ParentProps<{
+ documentId: string;
+ documentMetadata: DocumentMetadata;
+ userAccessLevel: AccessLevel;
+ defaultSidePanelOpen?: boolean;
+}>;
export function FileDetailLayout(props: FileDetailLayoutProps) {
- const parentShareContext = useContext(ShareDialogContext);
- const [localShareOpen, setLocalShareOpen] = createSignal(false);
- const shareOpen = () => props.shareOpen ?? localShareOpen();
- const setShareOpen: Setter<boolean> = (next) => {
- const open = typeof next === 'function' ? next(shareOpen()) : next;
- props.onShareOpenChange?.(open);
- if (props.shareOpen === undefined) setLocalShareOpen(() => open);
- return open;
- };
const permissions = () => getPermissions(props.userAccessLevel);
const canEdit = () => hasPermissions(permissions(), Permissions.CAN_EDIT);
- const documentName = () => props.documentMetadata.documentName;
return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- copyLink: parentShareContext?.copyLink,
- }}
+ <SidePanel.Layout
+ defaultOpen={props.defaultSidePanelOpen ?? false}
+ persistKey={`file:${props.documentId}`}
+ headerToggle={false}
>
- <SidePanel.Layout
- defaultOpen={props.defaultSidePanelOpen ?? false}
- persistKey={`file:${props.documentId}`}
- headerToggle={false}
- >
- <DocumentFileSidePanelSections
- documentId={props.documentId}
- documentName={documentName()}
- canEdit={canEdit()}
- />
- <div class="relative size-full min-h-0 min-w-0 overflow-hidden">
- {props.children}
- </div>
- </SidePanel.Layout>
- <Suspense>
- <ShareModal
- isSharePermOpen={shareOpen()}
- setIsSharePermOpen={setShareOpen}
- id={props.documentId}
- blockAlias={props.blockType}
- itemType="document"
- name={documentName()}
- userPermissions={permissions()}
- owner={props.documentMetadata.owner}
- />
- </Suspense>
- </ShareDialogContext.Provider>
+ <DocumentFileSidePanelSections
+ documentId={props.documentId}
+ documentName={props.documentMetadata.documentName}
+ canEdit={canEdit()}
+ />
+ <div class="relative size-full min-h-0 min-w-0 overflow-hidden">
+ {props.children}
+ </div>
+ </SidePanel.Layout>
);
}
diff --git a/apps/web/src/features/drive-view/views/CanvasDetail.tsx b/apps/web/src/features/drive-view/views/CanvasDetail.tsx
index 304bb96e71..4099cf107e 100644
--- a/apps/web/src/features/drive-view/views/CanvasDetail.tsx
+++ b/apps/web/src/features/drive-view/views/CanvasDetail.tsx
@@ -10,11 +10,7 @@ import {
import { downloadFile } from '@filesystem/download';
import { useSearchParams } from '@solidjs/router';
import type { JSX } from 'solid-js';
-import {
- FileDetailLayout,
- FileDetailLoadGate,
- type FileDetailShareProps,
-} from '../components/FileDetail';
+import { FileDetailLayout, FileDetailLoadGate } from '../components/FileDetail';
import { downloadFileOperation } from '../components/file-detail-operations';
import {
type CanvasDocumentData,
@@ -58,13 +54,11 @@ function CanvasDetailContent(props: {
);
}
-export function CanvasDetailDocument(
- props: FileDetailShareProps & {
- documentId: string;
- data: CanvasDocumentData;
- children?: (context: CanvasDetailContext) => JSX.Element;
- }
-) {
+export function CanvasDetailDocument(props: {
+ documentId: string;
+ data: CanvasDocumentData;
+ children?: (context: CanvasDetailContext) => JSX.Element;
+}) {
const panel = useSplitPanelOrThrow();
const [searchParams] = useSearchParams();
const canEdit = () =>
@@ -78,9 +72,6 @@ export function CanvasDetailDocument(
documentId={props.documentId}
documentMetadata={props.data.documentMetadata}
userAccessLevel={props.data.userAccessLevel}
- blockType="canvas"
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
>
<CanvasDocument
documentId={props.documentId}
@@ -102,12 +93,10 @@ export function CanvasDetailDocument(
);
}
-export function CanvasDetail(
- props: FileDetailShareProps & {
- documentId: string;
- children?: (context: CanvasDetailContext) => JSX.Element;
- }
-) {
+export function CanvasDetail(props: {
+ documentId: string;
+ children?: (context: CanvasDetailContext) => JSX.Element;
+}) {
return (
<FileDetailLoadGate
documentId={props.documentId}
@@ -118,8 +107,6 @@ export function CanvasDetail(
<CanvasDetailDocument
documentId={props.documentId}
data={data}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
)}
diff --git a/apps/web/src/features/drive-view/views/CodeDetail.tsx b/apps/web/src/features/drive-view/views/CodeDetail.tsx
index aa75b3e6be..478d9a5c67 100644
--- a/apps/web/src/features/drive-view/views/CodeDetail.tsx
+++ b/apps/web/src/features/drive-view/views/CodeDetail.tsx
@@ -14,11 +14,7 @@ import {
type Setter,
Show,
} from 'solid-js';
-import {
- FileDetailLayout,
- FileDetailLoadGate,
- type FileDetailShareProps,
-} from '../components/FileDetail';
+import { FileDetailLayout, FileDetailLoadGate } from '../components/FileDetail';
import { downloadFileOperation } from '../components/file-detail-operations';
import {
type CodeDocumentData,
@@ -102,26 +98,16 @@ function CodeDetailSession(props: {
);
}
-export function CodeDetailDocument(
- props: FileDetailShareProps & {
- documentId: string;
- data: CodeDocumentData;
- children?: (context: CodeDetailContext) => JSX.Element;
- }
-) {
- const blockType = () =>
- props.data.documentMetadata.fileType?.toLowerCase() === 'csv'
- ? 'csv'
- : 'code';
-
+export function CodeDetailDocument(props: {
+ documentId: string;
+ data: CodeDocumentData;
+ children?: (context: CodeDetailContext) => JSX.Element;
+}) {
return (
<FileDetailLayout
documentId={props.documentId}
documentMetadata={props.data.documentMetadata}
userAccessLevel={props.data.userAccessLevel}
- blockType={blockType()}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
>
<Rerun
on={() =>
@@ -140,12 +126,10 @@ export function CodeDetailDocument(
);
}
-export function CodeDetail(
- props: FileDetailShareProps & {
- documentId: string;
- children?: (context: CodeDetailContext) => JSX.Element;
- }
-) {
+export function CodeDetail(props: {
+ documentId: string;
+ children?: (context: CodeDetailContext) => JSX.Element;
+}) {
return (
<FileDetailLoadGate
documentId={props.documentId}
@@ -156,8 +140,6 @@ export function CodeDetail(
<CodeDetailDocument
documentId={props.documentId}
data={data}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
)}
diff --git a/apps/web/src/features/drive-view/views/DriveCallDetail.tsx b/apps/web/src/features/drive-view/views/DriveCallDetail.tsx
index cce5ecbf1e..e0087eba93 100644
--- a/apps/web/src/features/drive-view/views/DriveCallDetail.tsx
+++ b/apps/web/src/features/drive-view/views/DriveCallDetail.tsx
@@ -61,7 +61,7 @@ export function DriveCallDetail(props: {
});
return (
- <CallDetailRoot callId={props.callId} data={detail.data()}>
+ <CallDetailRoot callId={props.callId}>
<div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden @container">
<ViewShell.TopBar class="touch:flex">
<SplitPanel.CloseButton class="hidden shrink-0 touch:flex" />
@@ -73,9 +73,8 @@ export function DriveCallDetail(props: {
{(data) => (
<CallDetailActions
callId={props.callId}
- channelId={data().record.channelId}
+ record={data().record}
name={data().name}
- isActive={data().record.isActive}
/>
)}
</Show>
diff --git a/apps/web/src/features/drive-view/views/ImageDetail.tsx b/apps/web/src/features/drive-view/views/ImageDetail.tsx
index d988fea296..bcd7010084 100644
--- a/apps/web/src/features/drive-view/views/ImageDetail.tsx
+++ b/apps/web/src/features/drive-view/views/ImageDetail.tsx
@@ -1,11 +1,7 @@
import { ImageContent } from '@block-image/component/ImageContent';
import { downloadFile } from '@filesystem/download';
import type { JSX } from 'solid-js';
-import {
- FileDetailLayout,
- FileDetailLoadGate,
- type FileDetailShareProps,
-} from '../components/FileDetail';
+import { FileDetailLayout, FileDetailLoadGate } from '../components/FileDetail';
import { downloadFileOperation } from '../components/file-detail-operations';
import {
type ImageDocumentData,
@@ -16,13 +12,11 @@ import type { FileDetailContext } from '../util/file-detail-context';
export type ImageDetailContext = FileDetailContext<ImageDocumentData>;
-export function ImageDetailDocument(
- props: FileDetailShareProps & {
- documentId: string;
- data: ImageDocumentData;
- children?: (context: ImageDetailContext) => JSX.Element;
- }
-) {
+export function ImageDetailDocument(props: {
+ documentId: string;
+ data: ImageDocumentData;
+ children?: (context: ImageDetailContext) => JSX.Element;
+}) {
const operations = [
downloadFileOperation(() => {
downloadFile(
@@ -37,9 +31,6 @@ export function ImageDetailDocument(
documentId={props.documentId}
documentMetadata={props.data.documentMetadata}
userAccessLevel={props.data.userAccessLevel}
- blockType="image"
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
>
{props.children?.({
data: props.data,
@@ -55,12 +46,10 @@ export function ImageDetailDocument(
);
}
-export function ImageDetail(
- props: FileDetailShareProps & {
- documentId: string;
- children?: (context: ImageDetailContext) => JSX.Element;
- }
-) {
+export function ImageDetail(props: {
+ documentId: string;
+ children?: (context: ImageDetailContext) => JSX.Element;
+}) {
return (
<FileDetailLoadGate
documentId={props.documentId}
@@ -71,8 +60,6 @@ export function ImageDetail(
<ImageDetailDocument
documentId={props.documentId}
data={data}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
)}
diff --git a/apps/web/src/features/drive-view/views/MarkdownDetail.tsx b/apps/web/src/features/drive-view/views/MarkdownDetail.tsx
index c29449497b..dc54d3f9b2 100644
--- a/apps/web/src/features/drive-view/views/MarkdownDetail.tsx
+++ b/apps/web/src/features/drive-view/views/MarkdownDetail.tsx
@@ -42,8 +42,6 @@ export type MarkdownDetailProps = {
documentId: string;
kind?: MarkdownDocumentKind;
fallbackName?: string;
- shareOpen?: boolean;
- onShareOpenChange?: (open: boolean) => void;
children?: (context: MarkdownDetailContext) => JSX.Element;
};
@@ -86,8 +84,6 @@ function MarkdownDetailContent(props: {
kind: MarkdownDocumentKind;
fallbackName: string;
data: MarkdownDocumentData;
- shareOpen?: boolean;
- onShareOpenChange?: (open: boolean) => void;
children?: (context: MarkdownDetailContext) => JSX.Element;
}) {
const panel = useSplitPanelOrThrow();
@@ -114,10 +110,7 @@ function MarkdownDetailContent(props: {
persistedName={props.data.metadata.documentName}
fallbackName={props.fallbackName}
>
- <ModalsProvider
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
- >
+ <ModalsProvider>
<OldOverlay />
{props.children?.({
data: props.data,
@@ -190,8 +183,6 @@ export function MarkdownDetail(props: MarkdownDetailProps) {
kind={props.kind ?? 'document'}
fallbackName={props.fallbackName ?? 'Untitled'}
data={data()}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
</ErrorBoundary>
diff --git a/apps/web/src/features/drive-view/views/PdfDetail.tsx b/apps/web/src/features/drive-view/views/PdfDetail.tsx
index 2ca88da1be..e1dac8b15a 100644
--- a/apps/web/src/features/drive-view/views/PdfDetail.tsx
+++ b/apps/web/src/features/drive-view/views/PdfDetail.tsx
@@ -32,11 +32,7 @@ import Printer from '@phosphor/printer.svg';
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 { FileDetailLayout, FileDetailLoadGate } from '../components/FileDetail';
import { loadPdfDocument, type PdfDocumentData } from '../queries/pdf-document';
import type { FileDetailContext } from '../util/file-detail-context';
@@ -130,13 +126,11 @@ function PdfDetailContent(props: {
);
}
-export function PdfDetailDocument(
- props: FileDetailShareProps & {
- documentId: string;
- data: PdfDocumentData;
- children?: (context: PdfDetailContext) => JSX.Element;
- }
-) {
+export function PdfDetailDocument(props: {
+ documentId: string;
+ data: PdfDocumentData;
+ children?: (context: PdfDetailContext) => JSX.Element;
+}) {
const [searchParams] = useSearchParams();
const permissions = () => getPermissions(props.data.userAccessLevel);
@@ -145,9 +139,6 @@ export function PdfDetailDocument(
documentId={props.documentId}
documentMetadata={props.data.documentMetadata}
userAccessLevel={props.data.userAccessLevel}
- blockType="pdf"
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
>
<PdfDocument
documentId={props.documentId}
@@ -172,12 +163,10 @@ export function PdfDetailDocument(
);
}
-export function PdfDetail(
- props: FileDetailShareProps & {
- documentId: string;
- children?: (context: PdfDetailContext) => JSX.Element;
- }
-) {
+export function PdfDetail(props: {
+ documentId: string;
+ children?: (context: PdfDetailContext) => JSX.Element;
+}) {
return (
<FileDetailLoadGate
documentId={props.documentId}
@@ -188,8 +177,6 @@ export function PdfDetail(
<PdfDetailDocument
documentId={props.documentId}
data={data}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
)}
diff --git a/apps/web/src/features/drive-view/views/UnknownDetail.tsx b/apps/web/src/features/drive-view/views/UnknownDetail.tsx
index 79e85448da..b8a008e81f 100644
--- a/apps/web/src/features/drive-view/views/UnknownDetail.tsx
+++ b/apps/web/src/features/drive-view/views/UnknownDetail.tsx
@@ -1,12 +1,10 @@
import { UnknownContent } from '@block-unknown/component/UnknownContent';
+import { getPermissions } from '@core/component/SharePermissions';
import { toast } from '@core/component/Toast/Toast';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { downloadFile } from '@filesystem/download';
-import { createSignal, type JSX } from 'solid-js';
-import {
- FileDetailLayout,
- FileDetailLoadGate,
- type FileDetailShareProps,
-} from '../components/FileDetail';
+import type { JSX } from 'solid-js';
+import { FileDetailLayout, FileDetailLoadGate } from '../components/FileDetail';
import { downloadFileOperation } from '../components/file-detail-operations';
import { getFileDocumentBlob } from '../queries/file-document';
import {
@@ -18,19 +16,19 @@ import type { FileDetailContext } from '../util/file-detail-context';
export type UnknownDetailContext = FileDetailContext<UnknownDocumentData>;
-export function UnknownDetailDocument(
- props: FileDetailShareProps & {
- documentId: string;
- data: UnknownDocumentData;
- children?: (context: UnknownDetailContext) => JSX.Element;
- }
-) {
- const [localShareOpen, setLocalShareOpen] = createSignal(false);
- const shareOpen = () => props.shareOpen ?? localShareOpen();
- const setShareOpen = (open: boolean) => {
- props.onShareOpenChange?.(open);
- if (props.shareOpen === undefined) setLocalShareOpen(open);
- };
+export function UnknownDetailDocument(props: {
+ documentId: string;
+ data: UnknownDocumentData;
+ children?: (context: UnknownDetailContext) => JSX.Element;
+}) {
+ const openShare = useShareModal(() => ({
+ id: props.documentId,
+ blockAlias: 'unknown',
+ itemType: 'document',
+ name: props.data.documentMetadata.documentName,
+ userPermissions: getPermissions(props.data.userAccessLevel),
+ owner: props.data.documentMetadata.owner,
+ }));
const downloadName = () => documentDownloadName(props.data.documentMetadata);
const downloadDocument = async () => {
@@ -52,10 +50,7 @@ export function UnknownDetailDocument(
documentId={props.documentId}
documentMetadata={props.data.documentMetadata}
userAccessLevel={props.data.userAccessLevel}
- blockType="unknown"
defaultSidePanelOpen
- shareOpen={shareOpen()}
- onShareOpenChange={setShareOpen}
>
{props.children?.({
data: props.data,
@@ -65,19 +60,17 @@ export function UnknownDetailDocument(
})}
<UnknownContent
fileName={props.data.documentMetadata.documentName}
- onShare={() => setShareOpen(true)}
+ onShare={openShare}
onDownload={() => void downloadDocument()}
/>
</FileDetailLayout>
);
}
-export function UnknownDetail(
- props: FileDetailShareProps & {
- documentId: string;
- children?: (context: UnknownDetailContext) => JSX.Element;
- }
-) {
+export function UnknownDetail(props: {
+ documentId: string;
+ children?: (context: UnknownDetailContext) => JSX.Element;
+}) {
return (
<FileDetailLoadGate
documentId={props.documentId}
@@ -88,8 +81,6 @@ export function UnknownDetail(
<UnknownDetailDocument
documentId={props.documentId}
data={data}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
)}
diff --git a/apps/web/src/features/drive-view/views/VideoDetail.tsx b/apps/web/src/features/drive-view/views/VideoDetail.tsx
index 34f8b547ee..534312c49f 100644
--- a/apps/web/src/features/drive-view/views/VideoDetail.tsx
+++ b/apps/web/src/features/drive-view/views/VideoDetail.tsx
@@ -1,10 +1,6 @@
import { VideoContent } from '@block-video/component/VideoContent';
import type { JSX } from 'solid-js';
-import {
- FileDetailLayout,
- FileDetailLoadGate,
- type FileDetailShareProps,
-} from '../components/FileDetail';
+import { FileDetailLayout, FileDetailLoadGate } from '../components/FileDetail';
import { downloadFileOperation } from '../components/file-detail-operations';
import { getFileDocumentBlob } from '../queries/file-document';
import {
@@ -17,13 +13,11 @@ import type { FileDetailContext } from '../util/file-detail-context';
export type VideoDetailContext = FileDetailContext<VideoDocumentData>;
-export function VideoDetailDocument(
- props: FileDetailShareProps & {
- documentId: string;
- data: VideoDocumentData;
- children?: (context: VideoDetailContext) => JSX.Element;
- }
-) {
+export function VideoDetailDocument(props: {
+ documentId: string;
+ data: VideoDocumentData;
+ children?: (context: VideoDetailContext) => JSX.Element;
+}) {
const operations = [
downloadFileOperation(() => {
const fileName = documentDownloadName(props.data.documentMetadata);
@@ -44,10 +38,7 @@ export function VideoDetailDocument(
documentId={props.documentId}
documentMetadata={props.data.documentMetadata}
userAccessLevel={props.data.userAccessLevel}
- blockType="video"
defaultSidePanelOpen
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
>
{props.children?.({
data: props.data,
@@ -64,12 +55,10 @@ export function VideoDetailDocument(
);
}
-export function VideoDetail(
- props: FileDetailShareProps & {
- documentId: string;
- children?: (context: VideoDetailContext) => JSX.Element;
- }
-) {
+export function VideoDetail(props: {
+ documentId: string;
+ children?: (context: VideoDetailContext) => JSX.Element;
+}) {
return (
<FileDetailLoadGate
documentId={props.documentId}
@@ -80,8 +69,6 @@ export function VideoDetail(
<VideoDetailDocument
documentId={props.documentId}
data={data}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
)}
diff --git a/apps/web/src/features/email-view/components/EmailDetailView.tsx b/apps/web/src/features/email-view/components/EmailDetailView.tsx
index dc9020314b..70cb88e0ce 100644
--- a/apps/web/src/features/email-view/components/EmailDetailView.tsx
+++ b/apps/web/src/features/email-view/components/EmailDetailView.tsx
@@ -16,10 +16,9 @@ import {
} from '@components/app/split-layout/layoutUtils';
import { EntityIcon } from '@core/component/EntityIcon';
import { toEntityLoadError } from '@core/component/EntityLoadGate';
-import {
- ShareDialogContext,
- ShareTrigger,
-} from '@core/component/TopBar/ShareButton';
+import { getPermissions } from '@core/component/SharePermissions';
+import { ShareTrigger } from '@core/component/TopBar/ShareButton';
+import { useShareModal } from '@core/component/TopBar/shareModal';
import { ENABLE_EMAIL_SHARING } from '@core/constant/featureFlags';
import { TOKENS } from '@core/hotkey/tokens';
import { registerScopeSignalHotkey } from '@core/hotkey/utils';
@@ -27,7 +26,7 @@ import { isTouchDevice } from '@core/mobile/isTouchDevice';
import { buildEntityData } from '@entity';
import { useThreadQuery } from '@queries/email/thread';
import { representativeThreadMessage } from '@queries/email/thread-subject';
-import { createEffect, createMemo, createSignal, Show } from 'solid-js';
+import { createEffect, createMemo, Show } from 'solid-js';
import { emailDetailSearch } from '../email-route';
import { useEmailView } from '../email-view-context';
import { emailThreadRoute } from '../route';
@@ -71,7 +70,6 @@ export function EmailDetailView(props: {
const panel = useSplitPanelOrThrow();
const notificationSource = useGlobalNotificationSource();
const canAutofocus = useCanAutofocusSplitContent();
- const [shareOpen, setShareOpen] = createSignal(false);
const threadId = () => props.thread.id;
const threadQuery = useThreadQuery(threadId, () => ({
enabled: !!threadId(),
@@ -92,6 +90,17 @@ export function EmailDetailView(props: {
'Email'
);
};
+ const openShare = useShareModal(() => {
+ const thread = threadData()?.thread;
+ if (!thread) return;
+ return {
+ id: props.thread.id,
+ blockAlias: 'email',
+ itemType: 'email',
+ name: title(),
+ userPermissions: getPermissions(thread.access_level),
+ };
+ });
const commandEntity = createMemo(() => {
if (!threadQuery.isSuccess) return undefined;
const thread = threadQuery.data?.thread;
@@ -161,13 +170,7 @@ export function EmailDetailView(props: {
};
return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
+ <>
<EmailThreadBreadcrumb
value={breadcrumbValue()}
title={title()}
@@ -184,6 +187,7 @@ export function EmailDetailView(props: {
<div class="ml-auto flex shrink-0 items-center gap-2">
<Show when={ENABLE_EMAIL_SHARING}>
<ShareTrigger
+ onClick={openShare}
id={props.thread.id}
blockType="email"
hotkeyScope={panel.splitHotkeyScope}
@@ -212,14 +216,12 @@ export function EmailDetailView(props: {
threadTransport={() => threadQuery.transport}
host={host}
sidePanelHeaderToggle={false}
- shareOpen={shareOpen()}
- onShareOpenChange={setShareOpen}
/>
</EmailThreadLoadGate>
</div>
</div>
</SidePanel.Root>
- </ShareDialogContext.Provider>
+ </>
);
}
diff --git a/apps/web/src/features/sharing/global-share-modal/GlobalShareModal.tsx b/apps/web/src/features/sharing/global-share-modal/GlobalShareModal.tsx
index 5f1e4dc7ec..29d0b03035 100644
--- a/apps/web/src/features/sharing/global-share-modal/GlobalShareModal.tsx
+++ b/apps/web/src/features/sharing/global-share-modal/GlobalShareModal.tsx
@@ -1,83 +1,28 @@
-import type { BlockAlias, BlockName } from '@core/block';
import { Permissions } from '@core/component/SharePermissions';
-import { ShareModal } from '@core/component/TopBar/ShareButton';
+import { openShareModal } from '@core/component/TopBar/shareModal';
import { itemToBlockName } from '@core/constant/allBlocks';
-import { createControlledOpenSignal } from '@core/util/createControlledOpenSignal';
-import type { ItemType } from '@service-storage/client';
-import { createSignal, Show } from 'solid-js';
+import type { DialogHandle } from '@ui';
import {
isShareableEntityType,
type ShareableEntityData,
} from './shareable-entity';
-type GlobalShareModalProps = {
+/** Opens the share modal for an entity outside of its block. */
+export const openGlobalShareModal = (props: {
entity: ShareableEntityData;
- onClose?: () => void;
-};
-
-const [globalModalProps, setGlobalModalProps] =
- createSignal<GlobalShareModalProps | null>(null);
-const [modalOpen, setModalOpen] = createControlledOpenSignal(false, {
- id: 'global-share',
-});
-
-const getEntityBlockAlias = (
- entity: ShareableEntityData
-): BlockName | BlockAlias => {
- return itemToBlockName(entity) ?? 'unknown';
-};
-
-const getEntityItemType = (entity: ShareableEntityData): ItemType => {
- return entity.type;
-};
-
-export const openGlobalShareModal = (props: GlobalShareModalProps) => {
- if (!isShareableEntityType(props.entity.type)) {
- console.warn(
- `Cannot share entity of type ${props.entity.type} - not supported`
- );
+}): DialogHandle | undefined => {
+ const { entity } = props;
+ if (!isShareableEntityType(entity.type)) {
+ console.warn(`Cannot share entity of type ${entity.type} - not supported`);
return;
}
- setGlobalModalProps(props);
- setModalOpen(true);
-};
-
-const closeGlobalShareModal = () => {
- const props = globalModalProps();
- setModalOpen(false);
- setGlobalModalProps(null);
- props?.onClose?.();
-};
-
-/**
- * Global share modal component - should be mounted once at the app level
- */
-export const GlobalShareModal = () => {
- const handleSetIsOpen = (isOpen: boolean) => {
- if (!isOpen) {
- closeGlobalShareModal();
- }
- setModalOpen(isOpen);
- };
-
- return (
- <Show when={globalModalProps()}>
- {(propsAccessor) => {
- const entity = () => propsAccessor().entity;
- return (
- <ShareModal
- isSharePermOpen={modalOpen()}
- setIsSharePermOpen={handleSetIsOpen}
- id={entity().id}
- blockAlias={getEntityBlockAlias(entity())}
- itemType={getEntityItemType(entity())}
- name={entity().name}
- userPermissions={Permissions.OWNER}
- owner={entity().ownerId}
- />
- );
- }}
- </Show>
- );
+ return openShareModal({
+ id: entity.id,
+ blockAlias: itemToBlockName(entity) ?? 'unknown',
+ itemType: entity.type,
+ name: entity.name,
+ userPermissions: Permissions.OWNER,
+ owner: entity.ownerId,
+ });
};
diff --git a/apps/web/src/features/tasks-view/components/TaskDetail.tsx b/apps/web/src/features/tasks-view/components/TaskDetail.tsx
index 3728e03319..5af9999461 100644
--- a/apps/web/src/features/tasks-view/components/TaskDetail.tsx
+++ b/apps/web/src/features/tasks-view/components/TaskDetail.tsx
@@ -10,8 +10,6 @@ export type TaskDetailContext = MarkdownDetailContext;
export type TaskDetailProps = {
task: TaskDetailTarget;
- shareOpen: boolean;
- onShareOpenChange: (open: boolean) => void;
children?: (context: TaskDetailContext) => JSX.Element;
};
@@ -30,8 +28,6 @@ export function TaskDetail(props: TaskDetailProps) {
documentId={props.task.id}
kind="task"
fallbackName={props.task.fallbackName ?? 'New Task'}
- shareOpen={props.shareOpen}
- onShareOpenChange={props.onShareOpenChange}
children={props.children}
/>
);
diff --git a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
index 1fe70f8c6d..1d46ac8498 100644
--- a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
@@ -8,11 +8,8 @@ import { MarkdownDetailBreadcrumbItem } from '@block-md/component/MarkdownDetail
import { SidePanel } from '@components/app/side-panel';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { toast } from '@core/component/Toast/Toast';
-import {
- ShareDialogContext,
- ShareTrigger,
-} from '@core/component/TopBar/ShareButton';
-import { createSignal } from 'solid-js';
+import { ShareTrigger } from '@core/component/TopBar/ShareButton';
+import { useDocumentShareModal } from '@core/component/TopBar/shareModal';
import { taskDetailRoute } from '../route';
import { useTasksView } from '../tasks-view-context';
import type { TaskDetailTarget } from '../types';
@@ -20,6 +17,10 @@ import { TaskDetail } from './TaskDetail';
function TaskDetailTopBar(props: { documentId: string }) {
const panel = useSplitPanelOrThrow();
+ const openShare = useDocumentShareModal(() => ({
+ documentId: props.documentId,
+ blockAlias: 'task',
+ }));
return (
<ViewShell.TopBar class="touch:flex">
@@ -29,6 +30,7 @@ function TaskDetailTopBar(props: { documentId: string }) {
/>
<div class="ml-auto flex shrink-0 items-center gap-2">
<ShareTrigger
+ onClick={openShare}
id={props.documentId}
blockType="task"
hotkeyScope={panel.splitHotkeyScope}
@@ -42,7 +44,6 @@ function TaskDetailTopBar(props: { documentId: string }) {
export function TasksDetailView(props: { task: TaskDetailTarget }) {
const { source, openTask, closeTask, selectedTask } = useTasksView();
const panel = useSplitPanelOrThrow();
- const [shareOpen, setShareOpen] = createSignal(false);
const listNavigation = useListDetailNavigation({
currentId: () => props.task.id,
source,
@@ -73,43 +74,29 @@ export function TasksDetailView(props: { task: TaskDetailTarget }) {
});
return (
- <ShareDialogContext.Provider
- value={{
- isOpen: shareOpen,
- open: () => setShareOpen(true),
- close: () => setShareOpen(false),
- }}
- >
- <SidePanel.Root>
- <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
- <TaskDetailTopBar documentId={props.task.id} />
- <div class="relative min-h-0 min-w-0 flex-1">
- <TaskDetail
- task={props.task}
- shareOpen={shareOpen()}
- onShareOpenChange={setShareOpen}
- >
- {(context) => (
- <MarkdownDetailBreadcrumbItem
- value={breadcrumbValue()}
- metadata={metadata()}
- order={1}
- documentId={props.task.id}
- kind="task"
- fallbackName={props.task.fallbackName}
- ownerId={context.data.metadata.owner}
- projectId={context.data.metadata.projectId ?? undefined}
- onClose={closeTask}
- onDuplicate={(id, name) =>
- openTask({ id, fallbackName: name })
- }
- />
- )}
- </TaskDetail>
- </div>
+ <SidePanel.Root>
+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
+ <TaskDetailTopBar documentId={props.task.id} />
+ <div class="relative min-h-0 min-w-0 flex-1">
+ <TaskDetail task={props.task}>
+ {(context) => (
+ <MarkdownDetailBreadcrumbItem
+ value={breadcrumbValue()}
+ metadata={metadata()}
+ order={1}
+ documentId={props.task.id}
+ kind="task"
+ fallbackName={props.task.fallbackName}
+ ownerId={context.data.metadata.owner}
+ projectId={context.data.metadata.projectId ?? undefined}
+ onClose={closeTask}
+ onDuplicate={(id, name) => openTask({ id, fallbackName: name })}
+ />
+ )}
+ </TaskDetail>
</div>
- </SidePanel.Root>
- </ShareDialogContext.Provider>
+ </div>
+ </SidePanel.Root>
);
}
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
index 3b5e765ee7..61284eff85 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
@@ -4,12 +4,7 @@ import { ok } from 'neverthrow';
import { createSignal, For, type JSX } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { Permissions } from '../SharePermissions';
-import {
- ShareDialogContext,
- ShareModal,
- ShareOptions,
- ShareTrigger,
-} from './ShareButton';
+import { ShareModal, ShareOptions, ShareTrigger } from './ShareButton';
const mocks = vi.hoisted(() => ({
sendToChannel: vi.fn(),
@@ -356,8 +351,8 @@ function mountShare(isOwner: boolean) {
itemType="agent_session"
blockAlias="agent"
userPermissions={Permissions.OWNER}
- isSharePermOpen
- setIsSharePermOpen={onOpenChange}
+ open
+ onOpenChange={onOpenChange}
/>
));
return { onOpenChange, onCopyLink };
@@ -512,11 +507,7 @@ describe('agent session sharing', () => {
it('uses explicit identity outside a block', () => {
mocks.inBlock = false;
render(() => (
- <ShareDialogContext.Provider
- value={{ isOpen: () => false, open: vi.fn(), close: vi.fn() }}
- >
- <ShareTrigger id="task-1" blockType="task" />
- </ShareDialogContext.Provider>
+ <ShareTrigger onClick={vi.fn()} id="task-1" blockType="task" />
));
fireEvent.click(screen.getByRole('button', { name: 'Copy Share Link' }));
expect(mocks.copyLink).toHaveBeenCalledWith(
@@ -524,20 +515,27 @@ describe('agent session sharing', () => {
);
});
+ it('opens sharing through the provided handler', () => {
+ mocks.inBlock = false;
+ const onClick = vi.fn();
+ render(() => (
+ <ShareTrigger onClick={onClick} id="task-1" blockType="task" />
+ ));
+
+ fireEvent.click(screen.getByRole('button', { name: 'Share' }));
+ expect(onClick).toHaveBeenCalledOnce();
+ });
+
it('uses a host view contextual link when provided', () => {
mocks.inBlock = false;
const copyContextLink = vi.fn();
render(() => (
- <ShareDialogContext.Provider
- value={{
- isOpen: () => false,
- open: vi.fn(),
- close: vi.fn(),
- copyLink: copyContextLink,
- }}
- >
- <ShareTrigger id="task-1" blockType="task" />
- </ShareDialogContext.Provider>
+ <ShareTrigger
+ onClick={vi.fn()}
+ id="task-1"
+ blockType="task"
+ copyLink={copyContextLink}
+ />
));
fireEvent.click(screen.getByRole('button', { name: 'Copy Share Link' }));
@@ -548,25 +546,17 @@ describe('agent session sharing', () => {
it('uses the host view contextual link inside the share modal', () => {
const copyContextLink = vi.fn();
render(() => (
- <ShareDialogContext.Provider
- value={{
- isOpen: () => true,
- open: vi.fn(),
- close: vi.fn(),
- copyLink: copyContextLink,
- }}
- >
- <ShareModal
- id="persisted-session"
- name="Fix the menu"
- owner="someone-else"
- itemType="agent_session"
- blockAlias="agent"
- userPermissions={Permissions.CAN_VIEW}
- isSharePermOpen
- setIsSharePermOpen={vi.fn()}
- />
- </ShareDialogContext.Provider>
+ <ShareModal
+ id="persisted-session"
+ name="Fix the menu"
+ owner="someone-else"
+ itemType="agent_session"
+ blockAlias="agent"
+ userPermissions={Permissions.CAN_VIEW}
+ open
+ onOpenChange={vi.fn()}
+ copyLink={copyContextLink}
+ />
));
fireEvent.click(screen.getByRole('button', { name: 'Copy Link' }));
@@ -576,13 +566,7 @@ describe('agent session sharing', () => {
it('copies the saved session link from the shared header trigger', () => {
const [id, setId] = createSignal('saved-session');
- render(() => (
- <ShareDialogContext.Provider
- value={{ isOpen: () => false, open: vi.fn(), close: vi.fn() }}
- >
- <ShareTrigger id={id()} />
- </ShareDialogContext.Provider>
- ));
+ render(() => <ShareTrigger onClick={vi.fn()} id={id()} />);
setId('current-session');
fireEvent.click(screen.getByRole('button', { name: 'Copy Share Link' }));
expect(mocks.copyLink).toHaveBeenCalledWith(
@@ -729,8 +713,8 @@ function mountChatShare() {
itemType="chat"
blockAlias="chat"
userPermissions={Permissions.OWNER}
- isSharePermOpen
- setIsSharePermOpen={vi.fn()}
+ open
+ onOpenChange={vi.fn()}
/>
));
}
@@ -755,8 +739,8 @@ function mountCallShare() {
itemType="call"
blockAlias="call"
userPermissions={Permissions.OWNER}
- isSharePermOpen
- setIsSharePermOpen={vi.fn()}
+ open
+ onOpenChange={vi.fn()}
/>
));
}
@@ -945,8 +929,8 @@ function mountProjectShare() {
itemType="project"
blockAlias="project"
userPermissions={Permissions.OWNER}
- isSharePermOpen
- setIsSharePermOpen={vi.fn()}
+ open
+ onOpenChange={vi.fn()}
/>
));
}
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
index d2437e6033..7f512a6e45 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
@@ -18,24 +18,18 @@ import { EntityIcon } from '@core/component/EntityIcon';
import { type TabItem, Tabs } from '@core/component/Tabs';
import { UserIcon } from '@core/component/UserIcon';
import { ENABLE_MARKDOWN_COMMENTS } from '@core/constant/featureFlags';
-import { useReferralCode, useUserId } from '@core/context/user';
+import { useUserId } from '@core/context/user';
import clickOutside from '@core/directive/clickOutside';
import { registerHotkey } from '@core/hotkey/hotkeys';
import { TOKENS } from '@core/hotkey/tokens';
import { isMobile } from '@core/mobile/isMobile';
import { blockHotkeyScopeSignal } from '@core/signal/blockElement';
-import {
- blockEditPermissionEnabledSignal,
- blockMetadataSignal,
-} from '@core/signal/load';
-import {
- useGetPermissions,
- useIsDocumentOwner,
-} from '@core/signal/permissions';
+import { blockEditPermissionEnabledSignal } from '@core/signal/load';
+import { useIsDocumentOwner } from '@core/signal/permissions';
import { idToEmail } from '@core/user';
-import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import type { ResultError } from '@core/util/result';
import { buildSimpleEntityUrl } from '@core/util/url';
+import { useCopyLink } from '@core/util/useCopyLink';
import IconShared from '@icon/share.svg';
import { Dialog } from '@kobalte/core/dialog';
import ChevronDownIcon from '@phosphor/caret-down.svg';
@@ -70,11 +64,17 @@ import type { LinkShare } from '@service-storage/generated/schemas/linkShare';
import type { SharePermissionV2ChannelSharePermissions } from '@service-storage/generated/schemas/sharePermissionV2ChannelSharePermissions';
import { createCallback } from '@solid-primitives/rootless';
import { useNavigate } from '@solidjs/router';
-import { Button, cn, Dropdown, Panel, SegmentedControl, Tooltip } from '@ui';
+import {
+ Button,
+ cn,
+ Dropdown,
+ type ManagedDialogProps,
+ Panel,
+ SegmentedControl,
+ Tooltip,
+} from '@ui';
import type { Result } from 'neverthrow';
import {
- type Accessor,
- createContext,
createMemo,
createResource,
createSignal,
@@ -83,9 +83,7 @@ import {
onCleanup,
onMount,
Show,
- Suspense,
Switch,
- useContext,
} from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { CustomScrollbar } from '../CustomScrollbar';
@@ -136,28 +134,12 @@ async function fetchSharePermissions(id: string, itemType: ItemType) {
}
}
+const SHARE_LINK_SUBTEXT =
+ 'Sending this link in a Macro message will automatically update permissions to include recipients.';
+
const agentSessionShareDescription =
'Only the owner can share access to this session. You can copy a link for people who already have access.';
-interface IShareDialogContext {
- isOpen: Accessor<boolean>;
- open: () => void;
- close: () => void;
- /** Override the entity-only URL with a host view's contextual URL. */
- copyLink?: () => void;
-}
-
-export const ShareDialogContext = createContext<IShareDialogContext>();
-
-export function useShareDialogContext() {
- const ctx = useContext(ShareDialogContext);
- if (!ctx)
- throw new Error(
- 'useShareDialogContext must be used within a ShareDialogContext.Provider'
- );
- return ctx;
-}
-
const permissionsBlockResource = createBlockResource(
() => {
const isOwner = useIsDocumentOwner();
@@ -215,15 +197,15 @@ export function getShareDrawerRecipientInput(): HTMLElement | null {
);
}
-interface ShareModalProps {
- setIsSharePermOpen: (value: boolean) => void;
+interface ShareModalProps extends ManagedDialogProps {
userPermissions: Permissions;
- isSharePermOpen: boolean;
blockAlias: BlockName | BlockAlias;
itemType: ItemType;
owner?: string;
name: string;
id: string;
+ /** Override the entity-only URL with a host view's contextual URL. */
+ copyLink?: () => void;
}
function DmRecipientIcon(props: { channelId: string }) {
@@ -697,7 +679,6 @@ function MobileShareDrawer(props: MobileShareDrawerProps) {
export function ShareModal(props: ShareModalProps) {
const navigate = useNavigate();
const analytics = useAnalytics();
- const shareContext = useContext(ShareDialogContext);
const currentTeamQuery = useCurrentTeamQuery();
const callRecordQuery = useCallRecordQuery(() =>
props.itemType === 'call' ? props.id : ''
@@ -736,31 +717,17 @@ export function ShareModal(props: ShareModalProps) {
const [recipientScrollRef, setRecipientScrollRef] =
createSignal<HTMLElement>();
- const referralCode = useReferralCode();
+ const copyEntityLink = useCopyLink();
const copyLink = createCallback(() => {
- const contextualCopyLink = shareContext?.copyLink;
- if (contextualCopyLink) return contextualCopyLink();
-
- const params: Record<string, string> = {};
- const code = referralCode();
- if (code) {
- params.referral_code = code;
- }
- const url = buildSimpleEntityUrl(
+ if (props.copyLink) return props.copyLink();
+ copyEntityLink(
+ buildSimpleEntityUrl({ type: props.blockAlias, id: props.id }),
{
- type: props.blockAlias,
- id: props.id,
- },
- params
+ subtext:
+ props.itemType === 'agent_session' ? undefined : SHARE_LINK_SUBTEXT,
+ }
);
- navigator.clipboard.writeText(url);
- toast.success('Link copied to clipboard.', {
- subtext:
- props.itemType === 'agent_session'
- ? undefined
- : 'Sending this link in a Macro message will automatically update permissions to include recipients.',
- });
});
const [channelNamesResource] = createResource(
@@ -815,7 +782,7 @@ export function ShareModal(props: ShareModalProps) {
// Function to navigate to a channel
const navigateToChannel = createCallback((channelId: string) => {
navigate(`/channel/${channelId}`);
- props.setIsSharePermOpen(false); // Close the dialog after navigation
+ props.onOpenChange(false); // Close the dialog after navigation
});
const removeChannelAccess = createCallback(async (channelId: string) => {
@@ -1216,8 +1183,8 @@ export function ShareModal(props: ShareModalProps) {
<MobileShareDrawer
editPermissionEnabled={editPermissionEnabled()}
canForward={canForward()}
- isOpen={props.isSharePermOpen}
- setIsOpen={props.setIsSharePermOpen}
+ isOpen={props.open}
+ setIsOpen={props.onOpenChange}
blockAlias={props.blockAlias}
name={props.name}
id={props.id}
@@ -1240,10 +1207,7 @@ export function ShareModal(props: ShareModalProps) {
/>
}
>
- <Dialog
- onOpenChange={props.setIsSharePermOpen}
- open={props.isSharePermOpen}
- >
+ <Dialog onOpenChange={props.onOpenChange} open={props.open}>
<Dialog.Portal>
<Dialog.Overlay class="z-modal fixed inset-0 scrim-glass" />
<div class="z-modal fixed inset-0">
@@ -1279,8 +1243,8 @@ export function ShareModal(props: ShareModalProps) {
userPermissions: userPermissions(),
channelSharePermissions: recipients(),
}}
- onSubmit={() => props.setIsSharePermOpen(false)}
- onCancel={() => props.setIsSharePermOpen(false)}
+ onSubmit={() => props.onOpenChange(false)}
+ onCancel={() => props.onOpenChange(false)}
refetch={refetch}
name={props.name}
hideAccessLevelSelector={props.itemType === 'email'}
@@ -1477,12 +1441,12 @@ export function ShareModal(props: ShareModalProps) {
}
export function ShareTrigger(props: {
+ onClick: () => void;
id?: string;
blockType?: BlockName | BlockAlias;
hotkeyScope?: string;
copyLink?: () => void;
}) {
- const shareCtx = useShareDialogContext();
const isAuthenticated = useIsAuthenticated();
const inBlock = isInBlock();
const contextualBlockType =
@@ -1521,7 +1485,7 @@ export function ShareTrigger(props: {
openLoginModal();
} else {
analytics.track('share_menu_open', { blockType: blockType() });
- shareCtx.open();
+ props.onClick();
}
return true;
},
@@ -1534,31 +1498,14 @@ export function ShareTrigger(props: {
onCleanup(() => registration.dispose());
});
- const referralCode = useReferralCode();
-
- const defaultUrl = () => {
- const id = blockId();
- const type = blockType();
-
- const params: Record<string, string> = {};
- const code = referralCode();
- if (code) {
- params.referral_code = code;
- }
- return buildSimpleEntityUrl({ id, type }, params);
- };
+ const copyEntityLink = useCopyLink();
const copyLink = createCallback(() => {
if (props.copyLink) return props.copyLink();
- if (shareCtx.copyLink) return shareCtx.copyLink();
- navigator.clipboard.writeText(defaultUrl());
- analytics.track('copy_share_link', { blockType: blockType() });
- toast.success('Link copied to clipboard.', {
- subtext:
- blockType() === 'agent'
- ? undefined
- : 'Sending this link in a Macro message will automatically update permissions to include recipients.',
+ copyEntityLink(buildSimpleEntityUrl({ id: blockId(), type: blockType() }), {
+ subtext: blockType() === 'agent' ? undefined : SHARE_LINK_SUBTEXT,
});
+ analytics.track('copy_share_link', { blockType: blockType() });
});
const ShareLinkAction = createMemo(() => ({
@@ -1602,7 +1549,7 @@ export function ShareTrigger(props: {
openLoginModal();
} else {
analytics.track('share_menu_open', { blockType: blockType() });
- shareCtx.open();
+ props.onClick();
}
}}
>
@@ -1624,38 +1571,6 @@ export function ShareTrigger(props: {
);
}
-export function ShareBlockModal(props: {
- name?: string;
- userPermissions?: Permissions;
- owner?: string;
-}) {
- const ctx = useShareDialogContext();
- const id = useBlockId();
- const blockAlias = useBlockAliasedName();
- const blockName = useBlockName();
- const itemType = blockNameToItemType(blockName);
- const documentName = useBlockDocumentName();
- const permissions = useGetPermissions();
- const ownerDerived = () => blockMetadataSignal()?.owner;
-
- if (!itemType) return null;
-
- return (
- <Suspense>
- <ShareModal
- isSharePermOpen={ctx.isOpen()}
- setIsSharePermOpen={(v) => (v ? ctx.open() : ctx.close())}
- id={id}
- blockAlias={blockAlias}
- itemType={itemType}
- name={props.name ?? documentName() ?? ''}
- userPermissions={props.userPermissions ?? permissions()}
- owner={props.owner ?? ownerDerived()}
- />
- </Suspense>
- );
-}
-
const PERMISSION_ICONS = {
comment: IconComment,
view: IconEye,
diff --git a/apps/web/src/lib/core/component/TopBar/shareModal.test.tsx b/apps/web/src/lib/core/component/TopBar/shareModal.test.tsx
new file mode 100644
index 0000000000..9581e763b0
--- /dev/null
+++ b/apps/web/src/lib/core/component/TopBar/shareModal.test.tsx
@@ -0,0 +1,43 @@
+import { render, screen } from '@solidjs/testing-library';
+import { ImperativeDialogHost } from '@ui';
+import { createSignal } from 'solid-js';
+import { describe, expect, it, vi } from 'vitest';
+import { Permissions } from '../SharePermissions';
+import { useShareModal } from './shareModal';
+
+vi.mock('./ShareButton', () => ({
+ ShareModal: (props: { name: string }) => (
+ <div data-testid="share-modal">{props.name}</div>
+ ),
+}));
+vi.mock('@queries/storage/document-metadata', () => ({
+ useDocumentAccessLevelQuery: vi.fn(),
+ useDocumentMetadataQuery: vi.fn(),
+}));
+
+describe('useShareModal', () => {
+ it('waits for share data before opening', async () => {
+ const [ready, setReady] = createSignal(false);
+ let openShare!: () => void;
+ render(() => {
+ openShare = useShareModal(() =>
+ ready()
+ ? {
+ id: 'doc-1',
+ blockAlias: 'md',
+ itemType: 'document',
+ name: 'Plan',
+ userPermissions: Permissions.OWNER,
+ }
+ : undefined
+ );
+ return <ImperativeDialogHost />;
+ });
+
+ openShare();
+ expect(screen.queryByTestId('share-modal')).toBeNull();
+
+ setReady(true);
+ expect((await screen.findByTestId('share-modal')).textContent).toBe('Plan');
+ });
+});
diff --git a/apps/web/src/lib/core/component/TopBar/shareModal.tsx b/apps/web/src/lib/core/component/TopBar/shareModal.tsx
new file mode 100644
index 0000000000..c58500bb9f
--- /dev/null
+++ b/apps/web/src/lib/core/component/TopBar/shareModal.tsx
@@ -0,0 +1,108 @@
+import type { BlockAlias, BlockName } from '@core/block';
+import { queryReadyGate } from '@queries/gate';
+import {
+ useDocumentAccessLevelQuery,
+ useDocumentMetadataQuery,
+} from '@queries/storage/document-metadata';
+import {
+ type DialogHandle,
+ type ManagedDialogInput,
+ openDialog,
+ useImperativeDialog,
+} from '@ui';
+import {
+ type Accessor,
+ type ComponentProps,
+ createEffect,
+ createSignal,
+ Suspense,
+} from 'solid-js';
+import { getPermissions } from '../SharePermissions';
+import { ShareModal } from './ShareButton';
+
+type ShareModalProps = ComponentProps<typeof ShareModal>;
+
+/** Props callers provide when opening the share modal. */
+export type ShareModalInput = ManagedDialogInput<ShareModalProps>;
+
+function SuspendedShareModal(props: ShareModalProps) {
+ return (
+ <Suspense>
+ <ShareModal {...props} />
+ </Suspense>
+ );
+}
+
+/** Opens the share modal outside of any component, e.g. from a list action. */
+export function openShareModal(props: ShareModalInput): DialogHandle {
+ return openDialog(SuspendedShareModal, props);
+}
+
+/**
+ * Returns an opener for a share modal owned by the calling component. The
+ * modal follows `props` while open and closes when the component unmounts.
+ * Return `undefined` from `props` until the share data has loaded; opening
+ * before then waits for it, so the modal never shows placeholder permissions.
+ */
+export function useShareModal(
+ props: Accessor<ShareModalInput | undefined>
+): () => void {
+ const dialog = useImperativeDialog(SuspendedShareModal);
+ const [pending, setPending] = createSignal(false);
+
+ const openWith = (initial: ShareModalInput) => {
+ setPending(false);
+ dialog.open(() => props() ?? initial);
+ };
+
+ createEffect(() => {
+ if (!pending()) return;
+ const initial = props();
+ if (initial) openWith(initial);
+ });
+
+ return () => {
+ const initial = props();
+ if (initial) openWith(initial);
+ else setPending(true);
+ };
+}
+
+/**
+ * Returns an opener for a document's share modal when only its id is known,
+ * e.g. from a view header outside the document.
+ */
+export function useDocumentShareModal(
+ target: Accessor<
+ | {
+ documentId: string;
+ blockAlias: BlockName | BlockAlias;
+ copyLink?: () => void;
+ }
+ | undefined
+ >
+): () => void {
+ const documentId = () => target()?.documentId ?? '';
+ const metadataQuery = useDocumentMetadataQuery(documentId);
+ const accessLevelQuery = useDocumentAccessLevelQuery(documentId);
+
+ return useShareModal(() => {
+ const current = target();
+ if (
+ !current ||
+ !queryReadyGate(metadataQuery) ||
+ !queryReadyGate(accessLevelQuery)
+ ) {
+ return;
+ }
+ return {
+ id: current.documentId,
+ blockAlias: current.blockAlias,
+ itemType: 'document',
+ name: metadataQuery.data.documentName,
+ owner: metadataQuery.data.owner,
+ userPermissions: getPermissions(accessLevelQuery.data),
+ copyLink: current.copyLink,
+ };
+ });
+}
diff --git a/apps/web/src/lib/core/util/useCopyLink.ts b/apps/web/src/lib/core/util/useCopyLink.ts
new file mode 100644
index 0000000000..0a644c8833
--- /dev/null
+++ b/apps/web/src/lib/core/util/useCopyLink.ts
@@ -0,0 +1,27 @@
+import { toast } from '@core/component/Toast/Toast';
+import { useReferralCode } from '@core/context/user';
+
+export type CopyLinkOptions = {
+ /** Extra toast detail shown under the confirmation. */
+ subtext?: string;
+ /** Skip the toast when the caller confirms the copy itself. */
+ silent?: boolean;
+};
+
+/**
+ * Returns a function that copies a link tagged with the user's referral code
+ * and confirms it with a toast.
+ */
+export function useCopyLink() {
+ const referralCode = useReferralCode();
+
+ return (link: string, options: CopyLinkOptions = {}) => {
+ const url = new URL(link);
+ const code = referralCode();
+ if (code) url.searchParams.set('referral_code', code);
+ void navigator.clipboard.writeText(url.toString());
+ if (!options.silent) {
+ toast.success('Link copied to clipboard.', { subtext: options.subtext });
+ }
+ };
+}