Skip to content

armgit / macro

Public Imported from GitHub
0

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

feat(tasks-view): inline detail with breadcrumbs (#6442)

dev-rb79e0e8f4d304
diff --git a/apps/web/src/components/app/ResponsiveBlockToolbar.tsx b/apps/web/src/components/app/ResponsiveBlockToolbar.tsx
index 8eeb62c5dc..c8e317c927 100644
--- a/apps/web/src/components/app/ResponsiveBlockToolbar.tsx
+++ b/apps/web/src/components/app/ResponsiveBlockToolbar.tsx
@@ -7,8 +7,8 @@ import { type Component, For, type JSX, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { HeaderIsland } from './split-layout/components/HeaderIsland';
import {
+ BlockSplitFileMenu,
type FileOperation,
- SplitFileMenu,
} from './split-layout/components/SplitFileMenu';
import {
SplitHeaderLeft,
@@ -154,7 +154,7 @@ export function ResponsiveBlockToolbar(props: BlockToolbarProps) {
</div>
</SplitHeaderRight>
<SplitTitleFileMenu>
- <SplitFileMenu
+ <BlockSplitFileMenu
id={props.id}
itemType={props.itemType}
name={props.name}
@@ -184,7 +184,7 @@ export function ResponsiveBlockToolbar(props: BlockToolbarProps) {
}
>
<SplitTitleFileMenu>
- <SplitFileMenu
+ <BlockSplitFileMenu
id={props.id}
itemType={props.itemType}
name={props.name}
diff --git a/apps/web/src/components/app/side-panel/SidePanel.tsx b/apps/web/src/components/app/side-panel/SidePanel.tsx
index be719b25b7..f6f64081a4 100644
--- a/apps/web/src/components/app/side-panel/SidePanel.tsx
+++ b/apps/web/src/components/app/side-panel/SidePanel.tsx
@@ -65,29 +65,10 @@ function createWideOpenState(
}
/**
- * Layout root for a block that opts in to a right-side panel.
- *
- * Wraps `props.children` in a horizontal Resize.Zone with a main panel
- * (the children) and a side panel that hosts any `<SidePanel.Section>`
- * descendants registered via context.
- *
- * Two rendering modes based on available width:
- * - Wide (>= NARROW_THRESHOLD_PX, non-mobile): side panel renders as a
- * resizable split next to the main content. Defaults to open unless
- * `defaultOpen` is false.
- * - Narrow (mobile or narrower than threshold): side panel renders as a
- * full-screen overlay covering the main content. Defaults to closed;
- * the main content stays mounted underneath.
- *
- * The side panel is suppressed entirely when no sections are registered.
- *
- * Pass `persistKey` to remember the wide-mode open state across visits (see
- * `createWideOpenState`); without it the panel returns to `defaultOpen` every
- * time the block mounts.
- *
- * Sections are rendered as a Kobalte Accordion in JSX-declared order.
+ * Owns side-panel state so controls and chrome can sit outside the horizontal
+ * Layout row while still operating on the same panel.
*/
-function Layout(
+function Root(
props: ParentProps<{ defaultOpen?: boolean; persistKey?: string }>
) {
const [sections, setSections] = createSignal<SidePanelSectionEntry[]>([]);
@@ -156,29 +137,76 @@ function Layout(
setIsOpen,
toggle,
isNarrow,
+ setIsNarrow,
setOpenSectionIds: setOpenIds,
openSectionIds: openIds,
};
return (
<SidePanelContext.Provider value={ctx}>
- <SidePanelHeaderToggle />
- <Resize.Zone direction="horizontal" gutter={0} resizable={false}>
- <SidePanelLayoutInner
- sections={sections}
- openIds={openIds}
- setOpenIds={setOpenIds}
- isOpen={isOpen}
- setIsOpen={setIsOpen}
- setIsNarrow={setIsNarrow}
- >
- {props.children}
- </SidePanelLayoutInner>
- </Resize.Zone>
+ {props.children}
</SidePanelContext.Provider>
);
}
+/**
+ * Horizontal content row for a block that opts in to a right-side panel.
+ *
+ * The side panel renders beside the main content in wide layouts and as an
+ * overlay in narrow layouts. Sections declared as descendants register with
+ * the nearest `<SidePanel.Root>`. For backwards compatibility, Layout creates
+ * its own Root when one is not already present.
+ */
+function Layout(
+ props: ParentProps<{
+ defaultOpen?: boolean;
+ persistKey?: string;
+ headerToggle?: boolean;
+ }>
+) {
+ const parentContext = useContext(SidePanelContext);
+
+ const Panels = () => {
+ const ctx = useContext(SidePanelContext);
+ if (!ctx) {
+ throw new Error('<SidePanel.Layout> must be inside <SidePanel.Root>');
+ }
+
+ return (
+ <>
+ <Show when={props.headerToggle ?? true}>
+ <SidePanelHeaderToggle />
+ </Show>
+ <Resize.Zone direction="horizontal" gutter={0} resizable={false}>
+ <SidePanelLayoutInner
+ sections={ctx.sections}
+ openIds={ctx.openSectionIds}
+ setOpenIds={ctx.setOpenSectionIds}
+ isOpen={ctx.isOpen}
+ setIsOpen={ctx.setIsOpen}
+ setIsNarrow={ctx.setIsNarrow}
+ >
+ {props.children}
+ </SidePanelLayoutInner>
+ </Resize.Zone>
+ </>
+ );
+ };
+
+ return (
+ <Show
+ when={parentContext}
+ fallback={
+ <Root defaultOpen={props.defaultOpen} persistKey={props.persistKey}>
+ <Panels />
+ </Root>
+ }
+ >
+ <Panels />
+ </Show>
+ );
+}
+
function SidePanelLayoutInner(
props: ParentProps<{
sections: Accessor<SidePanelSectionEntry[]>;
@@ -265,35 +293,46 @@ function SidePanelLayoutInner(
);
}
-function SidePanelHeaderToggle() {
+function Toggle() {
const ctx = useContext(SidePanelContext);
- if (!ctx) return null;
+ if (!ctx) {
+ throw new Error('<SidePanel.Toggle> must be inside <SidePanel.Root>');
+ }
- const ToggleButton = () => (
- <Button
- depth={2}
- variant={isTouchDevice() ? 'ghost' : 'outline'}
- size="icon-sm"
- class={cn(
- !isTouchDevice() && 'bg-surface',
- isTouchDevice() &&
- 'rounded-full border-0 hover:bg-transparent! active:bg-transparent! focus-visible:bg-transparent! active:text-accent',
- isTouchDevice() && ctx.isOpen() && 'text-accent'
- )}
- tooltip={ctx.isOpen() ? 'Hide Side Panel' : 'Show Side Panel'}
- hotkey={TOKENS.block.toggleSidePanel}
- onClick={() => ctx.toggle()}
- >
- <Show
- when={ctx.isNarrow()}
- fallback={<SidePanelIcon class={cn(ctx.isOpen() && 'text-accent')} />}
+ return (
+ <Show when={ctx.hasSections()}>
+ <Button
+ depth={2}
+ variant={isTouchDevice() ? 'ghost' : 'outline'}
+ size="icon-sm"
+ class={cn(
+ !isTouchDevice() && 'bg-surface',
+ isTouchDevice() &&
+ 'rounded-full border-0 hover:bg-transparent! active:bg-transparent! focus-visible:bg-transparent! active:text-accent',
+ isTouchDevice() && ctx.isOpen() && 'text-accent'
+ )}
+ tooltip={ctx.isOpen() ? 'Hide Side Panel' : 'Show Side Panel'}
+ hotkey={TOKENS.block.toggleSidePanel}
+ onClick={() => ctx.toggle()}
>
- <InfoIcon
- class={cn('size-4', !isMobile() && ctx.isOpen() && 'text-accent')}
- />
- </Show>
- </Button>
+ <Show
+ when={ctx.isNarrow()}
+ fallback={<SidePanelIcon class={cn(ctx.isOpen() && 'text-accent')} />}
+ >
+ <InfoIcon
+ class={cn('size-4', !isMobile() && ctx.isOpen() && 'text-accent')}
+ />
+ </Show>
+ </Button>
+ </Show>
);
+}
+
+function SidePanelHeaderToggle() {
+ const ctx = useContext(SidePanelContext);
+ if (!ctx) {
+ throw new Error('<SidePanelHeaderToggle> must be inside <SidePanel.Root>');
+ }
return (
<Show when={ctx.hasSections()}>
@@ -305,7 +344,7 @@ function SidePanelHeaderToggle() {
ctx.isOpen() && 'text-accent'
)}
>
- <ToggleButton />
+ <Toggle />
</HeaderIsland>
</div>
</SplitHeaderRight>
@@ -344,13 +383,13 @@ function SidePanelOutlet(props: {
}
/**
- * A collapsible section that registers itself with the nearest SidePanel.Layout.
+ * A collapsible section that registers itself with the nearest SidePanel.Root.
*
* The section component returns null in place; its children are rendered
* inside the side panel's Accordion. Children evaluate lazily when the
* panel renders the section, so they only mount when the panel is visible.
*
- * Must be a descendant of `<SidePanel.Layout>`.
+ * Must be a descendant of `<SidePanel.Root>`. A standalone Layout creates one.
*/
function Section(
props: ParentProps<{
@@ -369,7 +408,7 @@ function Section(
) {
const ctx = useContext(SidePanelContext);
if (!ctx) {
- throw new Error('<SidePanel.Section> must be inside <SidePanel.Layout>');
+ throw new Error('<SidePanel.Section> must be inside <SidePanel.Root>');
}
onMount(() => {
@@ -541,7 +580,9 @@ function Card(props: ParentProps) {
}
export const SidePanel = {
+ Root,
Layout,
+ Toggle,
Section,
Grid,
Row,
diff --git a/apps/web/src/components/app/side-panel/context.ts b/apps/web/src/components/app/side-panel/context.ts
index 9ab3481375..9392d71dc1 100644
--- a/apps/web/src/components/app/side-panel/context.ts
+++ b/apps/web/src/components/app/side-panel/context.ts
@@ -1,4 +1,4 @@
-import { type Accessor, createContext, type JSX } from 'solid-js';
+import { type Accessor, createContext, type JSX, type Setter } from 'solid-js';
export type SidePanelSectionEntry = {
id: string;
@@ -37,6 +37,7 @@ export type SidePanelContextType = {
* a side-by-side split.
*/
isNarrow: Accessor<boolean>;
+ setIsNarrow: Setter<boolean>;
};
export const SidePanelContext = createContext<SidePanelContextType>();
diff --git a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
index 20763774e2..d47d6f0af8 100644
--- a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx
@@ -13,16 +13,23 @@ import { useFeatureFlag } from '@app/lib/analytics/posthog';
import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
import { MobileDrawer } from '@components/app/mobile/MobileDrawer';
import type { BlockTool } from '@components/app/ResponsiveBlockToolbar';
-import { type BlockName, useBlockAliasedName, useBlockName } from '@core/block';
+import {
+ type BlockAlias,
+ type BlockName,
+ useBlockAliasedName,
+} from '@core/block';
import { useItemOperations } from '@core/component/FileList/useItemOperations';
+import { Permissions } from '@core/component/SharePermissions';
import { toast } from '@core/component/Toast/Toast';
+import { resolveBlockAlias } from '@core/constant/allBlocks';
import { enableReminders } from '@core/constant/featureFlags';
import { useQuickAccess } from '@core/context/quickAccess';
import { useUserId } from '@core/context/user';
import { triggerFocusInput } from '@core/directive/focusInput';
import { type HotkeyToken, TOKENS } from '@core/hotkey/tokens';
+import { getActiveCommandByToken } from '@core/hotkey/utils';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import { useIsDocumentOwner } from '@core/signal/permissions';
+import { useGetPermissions } from '@core/signal/permissions';
import { buildEntityData, type EntityData } from '@entity';
import DotsThree from '@icon/dots-three-large.svg';
import ArrowRight from '@phosphor/arrow-right.svg';
@@ -37,7 +44,7 @@ import Rename from '@phosphor/pencil-line.svg';
import Star from '@phosphor/star.svg';
import Tag from '@phosphor/tag.svg';
import Trash from '@phosphor/trash-simple.svg';
-import { blockNameToItemType, type ItemType } from '@service-storage/itemType';
+import type { ItemType } from '@service-storage/itemType';
import { cn, Dropdown, Hotkey } from '@ui';
import {
type Component,
@@ -101,25 +108,6 @@ export type SplitFileMenuViews = {
onSelect: (value: string) => void;
};
-/**
- * Blocks whose Block.tsx calls useBlockEntityCommands(), registering the
- * block-scoped shortcuts the generic ops advertise. Keep in sync with that
- * hook's callers.
- */
-const BLOCKS_WITH_ENTITY_HOTKEYS: ReadonlySet<BlockName> = new Set<BlockName>([
- 'agent',
- 'canvas',
- 'channel',
- 'chat',
- 'code',
- 'email',
- 'image',
- 'md',
- 'pdf',
- 'project',
- 'video',
-]);
-
function SplitMenuItemContent(
props: Pick<SplitFileMenuAction, 'hotkeyToken' | 'icon' | 'label'> & {
showHotkey?: boolean;
@@ -333,7 +321,7 @@ function MobileRender(
);
}
-export function SplitFileMenu(props: {
+export type SplitFileMenuProps = {
id: string;
itemType: ItemType;
name: string;
@@ -344,21 +332,23 @@ export function SplitFileMenu(props: {
mobileViews?: SplitFileMenuViews;
/**
* Full entity for the menu's entity-gated items. Supply it when the block
- * can build one that generic chrome can't reconstruct from id/name/blockName
+ * can build one that generic chrome can't reconstruct from id/name/entityKind
* alone (e.g. calls need their channelId).
*/
entity?: EntityData;
buttonClass?: string;
-}) {
+ entityKind: BlockName | BlockAlias;
+ permissions: Permissions;
+ onDuplicate?: (id: string) => void;
+ onDelete?: () => void;
+};
+
+export function SplitFileMenu(props: SplitFileMenuProps) {
const ctx = useContext(SplitPanelContext);
if (!ctx)
throw new Error('<SplitFileMenu> must be used in <SplitPanelContext>');
- const isOwner = useIsDocumentOwner();
- const blockName = useBlockName();
- const aliasedBlockName = useBlockAliasedName();
- const itemType = blockNameToItemType(blockName);
- if (!itemType) throw new Error(`Using bad item type for block: ${blockName}`);
+ const blockName = resolveBlockAlias(props.entityKind);
const [open, setOpen] = createSignal(false);
const itemOperations = useItemOperations();
@@ -382,17 +372,15 @@ export function SplitFileMenu(props: {
const addTagAction = makeAddTagAction();
const copyLinkAction = makeCopyLinkAction();
const copyEntityIdAction = makeCopyEntityIdAction();
-
- // Blocks outside BLOCKS_WITH_ENTITY_HOTKEYS never register these
- // shortcuts, so badging them there would advertise dead shortcuts.
- const blockHotkeyToken = (token: HotkeyToken): HotkeyToken | undefined =>
- BLOCKS_WITH_ENTITY_HOTKEYS.has(blockName) ? token : undefined;
+ const activeHotkeyToken = (token: HotkeyToken): HotkeyToken | undefined => {
+ return getActiveCommandByToken(token) ? token : undefined;
+ };
const { replaceOrInsertSplit } = useSplitLayout();
// The entity this menu operates on: the block's own entity when supplied,
// else the quick-access cache (richer data, covers channels/calls), else
- // built from the block's id/name/blockName like the rename/move ops do.
+ // built from the block's id/name/entityKind like the rename/move ops do.
const menuEntity = createMemo<EntityData | undefined>(() => {
if (props.entity) return props.entity;
const item = quickAccess.getById(props.id);
@@ -400,7 +388,7 @@ export function SplitFileMenu(props: {
return buildEntityData({
id: props.id,
name: props.name,
- blockName: aliasedBlockName,
+ blockName: props.entityKind,
});
});
@@ -413,7 +401,7 @@ export function SplitFileMenu(props: {
action: () => {
void favoriteAction.execute([entity]);
},
- hotkeyToken: blockHotkeyToken(TOKENS.entity.action.favorite),
+ hotkeyToken: activeHotkeyToken(TOKENS.entity.action.favorite),
group: 'macro' as const,
};
};
@@ -428,7 +416,7 @@ export function SplitFileMenu(props: {
action: () => {
void muteAction.execute([entity]);
},
- hotkeyToken: blockHotkeyToken(TOKENS.entity.action.mute),
+ hotkeyToken: activeHotkeyToken(TOKENS.entity.action.mute),
group: 'macro' as const,
};
};
@@ -454,7 +442,7 @@ export function SplitFileMenu(props: {
setOpen(false);
createReminderAction.execute([entity]);
},
- hotkeyToken: blockHotkeyToken(TOKENS.entity.action.createReminder),
+ hotkeyToken: activeHotkeyToken(TOKENS.entity.action.createReminder),
group: 'macro' as const,
};
};
@@ -470,7 +458,7 @@ export function SplitFileMenu(props: {
setOpen(false);
addTagAction.execute([entity]);
},
- hotkeyToken: blockHotkeyToken(TOKENS.entity.action.tags),
+ hotkeyToken: activeHotkeyToken(TOKENS.entity.action.tags),
group: 'macro' as const,
};
};
@@ -491,10 +479,10 @@ export function SplitFileMenu(props: {
if (entity) {
void copyLinkAction.execute([entity]);
} else {
- void copyLinkAction.executeByBlock(props.id, aliasedBlockName);
+ void copyLinkAction.executeByBlock(props.id, props.entityKind);
}
},
- hotkeyToken: blockHotkeyToken(TOKENS.entity.action.copyLink),
+ hotkeyToken: activeHotkeyToken(TOKENS.entity.action.copyLink),
group: 'sharing' as const,
};
};
@@ -505,7 +493,7 @@ export function SplitFileMenu(props: {
action: () => {
void copyEntityIdAction.executeById(props.id);
},
- hotkeyToken: blockHotkeyToken(TOKENS.entity.action.copyEntityId),
+ hotkeyToken: activeHotkeyToken(TOKENS.entity.action.copyEntityId),
group: 'sharing' as const,
});
@@ -515,10 +503,7 @@ export function SplitFileMenu(props: {
onCleanup(() => ctx.setTitleFileMenuTrigger(undefined));
});
- const ownsMenuEntity = () =>
- match(props.entity)
- .with(undefined, () => isOwner())
- .otherwise((entity) => entity.ownerId === userId());
+ const ownsMenuEntity = () => props.permissions === Permissions.OWNER;
const ops = createMemo<SplitFileMenuAction[]>(() => {
const mapped = props.ops
@@ -539,7 +524,11 @@ export function SplitFileMenu(props: {
entities: [entity],
onFinish: () => {
toast.success('Deleted');
- returnSplitToRecentListView(ctx.handle);
+ if (props.onDelete) {
+ props.onDelete();
+ } else {
+ returnSplitToRecentListView(ctx.handle);
+ }
},
onError: () => toast.failure('Failed to delete'),
});
@@ -564,7 +553,7 @@ export function SplitFileMenu(props: {
});
},
icon: Rename,
- hotkeyToken: blockHotkeyToken(TOKENS.entity.action.rename),
+ hotkeyToken: activeHotkeyToken(TOKENS.entity.action.rename),
group: 'file' as const,
};
})
@@ -583,7 +572,10 @@ export function SplitFileMenu(props: {
id: props.id,
name: props.name,
});
- if (res) {
+ if (!res) return;
+ if (props.onDuplicate) {
+ props.onDuplicate(res);
+ } else {
replaceOrInsertSplit(
{
id: res,
@@ -598,14 +590,14 @@ export function SplitFileMenu(props: {
};
})
.with('moveToProject', () => {
- if (!isOwner()) return null;
+ if (!ownsMenuEntity()) return null;
return {
label: 'Move to Folder',
action: () => {
const entity = buildEntityData({
id: props.id,
name: props.name,
- blockName: aliasedBlockName,
+ blockName: props.entityKind,
});
if (!entity) return;
setOpen(false);
@@ -617,7 +609,7 @@ export function SplitFileMenu(props: {
});
},
icon: ArrowRight,
- hotkeyToken: blockHotkeyToken(
+ hotkeyToken: activeHotkeyToken(
TOKENS.entity.action.moveToFolder
),
group: 'file' as const,
@@ -710,3 +702,22 @@ export function SplitFileMenu(props: {
</Show>
);
}
+
+export type BlockSplitFileMenuProps = Omit<
+ SplitFileMenuProps,
+ 'entityKind' | 'permissions'
+>;
+
+/** Supplies legacy Block identity, permissions, and registered hotkeys. */
+export function BlockSplitFileMenu(props: BlockSplitFileMenuProps) {
+ const entityKind = useBlockAliasedName();
+ const permissions = useGetPermissions();
+
+ return (
+ <SplitFileMenu
+ {...props}
+ entityKind={entityKind}
+ permissions={permissions()}
+ />
+ );
+}
diff --git a/apps/web/src/components/view-shell/ViewBreadcrumbs.tsx b/apps/web/src/components/view-shell/ViewBreadcrumbs.tsx
new file mode 100644
index 0000000000..f0a236f008
--- /dev/null
+++ b/apps/web/src/components/view-shell/ViewBreadcrumbs.tsx
@@ -0,0 +1,209 @@
+import CaretRightIcon from '@phosphor/caret-right.svg';
+import { cn } from '@ui';
+import {
+ type Accessor,
+ children,
+ createContext,
+ createMemo,
+ createSignal,
+ For,
+ type JSX,
+ onCleanup,
+ onMount,
+ type ParentProps,
+ Show,
+ splitProps,
+ useContext,
+} from 'solid-js';
+
+type RegisteredBreadcrumb = {
+ value: Accessor<string>;
+ order: Accessor<number | undefined>;
+ sequence: number;
+ render: () => JSX.Element;
+};
+
+type ViewBreadcrumbsContextValue = {
+ entries: Accessor<RegisteredBreadcrumb[]>;
+ value: Accessor<string>;
+ onChange: (value: string) => void;
+ register: (entry: Omit<RegisteredBreadcrumb, 'sequence'>) => () => void;
+};
+
+const ViewBreadcrumbsContext = createContext<ViewBreadcrumbsContextValue>();
+
+function useViewBreadcrumbsContext() {
+ const context = useContext(ViewBreadcrumbsContext);
+ if (!context) {
+ throw new Error(
+ 'ViewBreadcrumbs items must be inside <ViewBreadcrumbs.Root>'
+ );
+ }
+ return context;
+}
+
+export type ViewBreadcrumbsRootProps = ParentProps<{
+ value: string;
+ onChange: (value: string) => void;
+}>;
+
+/** Owns the ordered registration context for one breadcrumb path. */
+function Root(props: ViewBreadcrumbsRootProps) {
+ const [entries, setEntries] = createSignal<RegisteredBreadcrumb[]>([]);
+ let sequence = 0;
+
+ const register: ViewBreadcrumbsContextValue['register'] = (entry) => {
+ const registered = { ...entry, sequence: sequence++ };
+ setEntries((current) => [
+ ...current.filter((item) => item.value() !== entry.value()),
+ registered,
+ ]);
+
+ return () => {
+ setEntries((current) => current.filter((item) => item !== registered));
+ };
+ };
+
+ return (
+ <ViewBreadcrumbsContext.Provider
+ value={{
+ entries,
+ value: () => props.value,
+ onChange: (value) => props.onChange(value),
+ register,
+ }}
+ >
+ {props.children}
+ </ViewBreadcrumbsContext.Provider>
+ );
+}
+
+export type ViewBreadcrumbsItemState = {
+ isActive: Accessor<boolean>;
+ onSelect: () => void;
+};
+
+export type ViewBreadcrumbsButtonProps = Omit<
+ JSX.ButtonHTMLAttributes<HTMLButtonElement>,
+ 'aria-current'
+> & {
+ isActive?: boolean;
+};
+
+function BreadcrumbButton(props: ViewBreadcrumbsButtonProps) {
+ const [local, rest] = splitProps(props, [
+ 'children',
+ 'class',
+ 'isActive',
+ 'type',
+ ]);
+
+ return (
+ <button
+ {...rest}
+ type={local.type ?? 'button'}
+ aria-current={local.isActive ? 'page' : undefined}
+ class={cn(
+ 'flex h-7 min-w-0 items-center px-1 font-semibold text-sm tracking-[-0.03em] outline-none transition-colors focus-visible:outline-2 focus-visible:outline-accent motion-reduce:transition-none',
+ local.isActive
+ ? 'shrink text-ink'
+ : 'text-ink-muted hover:text-ink focus-visible:text-ink',
+ local.class
+ )}
+ >
+ {local.children}
+ </button>
+ );
+}
+
+export type ViewBreadcrumbsSeparatorProps = JSX.SvgSVGAttributes<SVGSVGElement>;
+
+function Separator(props: ViewBreadcrumbsSeparatorProps) {
+ const [local, rest] = splitProps(props, ['class']);
+
+ return (
+ <CaretRightIcon
+ {...rest}
+ aria-hidden="true"
+ class={cn('size-3 shrink-0 text-ink-extra-muted', local.class)}
+ />
+ );
+}
+
+export type ViewBreadcrumbsItemProps = {
+ value: string;
+ order?: number;
+ children: JSX.Element | ((state: ViewBreadcrumbsItemState) => JSX.Element);
+};
+
+/**
+ * Registers an arbitrary breadcrumb segment with the nearest Root and removes
+ * it when its owning component unmounts.
+ */
+function Item(props: ViewBreadcrumbsItemProps) {
+ const context = useViewBreadcrumbsContext();
+ const state: ViewBreadcrumbsItemState = {
+ isActive: () => context.value() === props.value,
+ onSelect: () => context.onChange(props.value),
+ };
+ const resolvedChildren = children(() => {
+ const child = props.children;
+ return <>{typeof child === 'function' ? child(state) : child}</>;
+ });
+ let unregister: (() => void) | undefined;
+
+ onMount(() => {
+ unregister = context.register({
+ value: () => props.value,
+ order: () => props.order,
+ render: resolvedChildren,
+ });
+ });
+ onCleanup(() => unregister?.());
+
+ return null;
+}
+
+export type ViewBreadcrumbsOutletProps = JSX.HTMLAttributes<HTMLElement>;
+
+/** Renders all registered items in order with separators between them. */
+function Outlet(props: ViewBreadcrumbsOutletProps) {
+ const context = useViewBreadcrumbsContext();
+ const [local, rest] = splitProps(props, ['children', 'class']);
+ const entries = createMemo(() =>
+ [...context.entries()].sort(
+ (left, right) =>
+ (left.order() ?? Number.MAX_SAFE_INTEGER) -
+ (right.order() ?? Number.MAX_SAFE_INTEGER) ||
+ left.sequence - right.sequence
+ )
+ );
+
+ return (
+ <nav
+ aria-label="Breadcrumb"
+ {...rest}
+ class={cn('flex min-w-0 items-center gap-0.5 text-sm', local.class)}
+ >
+ <For each={entries()}>
+ {(entry, index) => (
+ <>
+ <Show when={index() > 0}>
+ <Separator />
+ </Show>
+ {entry.render()}
+ </>
+ )}
+ </For>
+ {local.children}
+ </nav>
+ );
+}
+
+export const ViewBreadcrumbs = Object.assign(Root, {
+ Root,
+ Button: BreadcrumbButton,
+ Item,
+ Separator,
+ Outlet,
+});
diff --git a/apps/web/src/components/view-shell/index.ts b/apps/web/src/components/view-shell/index.ts
index 5aa353e0f9..409a3e66a4 100644
--- a/apps/web/src/components/view-shell/index.ts
+++ b/apps/web/src/components/view-shell/index.ts
@@ -27,6 +27,15 @@ export {
type UseViewTabHotkeysOptions,
useViewTabHotkeys,
} from './use-view-tab-hotkeys';
+export {
+ ViewBreadcrumbs,
+ type ViewBreadcrumbsButtonProps,
+ type ViewBreadcrumbsItemProps,
+ type ViewBreadcrumbsItemState,
+ type ViewBreadcrumbsOutletProps,
+ type ViewBreadcrumbsRootProps,
+ type ViewBreadcrumbsSeparatorProps,
+} from './ViewBreadcrumbs';
export {
useViewShell,
ViewShell,
diff --git a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
index 612b772120..6b1d91d708 100644
--- a/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
+++ b/apps/web/src/features/block-agent/component/AgentSplitHeader.tsx
@@ -71,7 +71,7 @@ export function AgentSplitHeader(props: {
: session.status.kind,
};
};
- useBlockEntityCommands(entity);
+ useBlockEntityCommands({ resolveEntity: entity });
const [shareOpen, setShareOpen] = createSignal(false);
const shareContext = {
isOpen: shareOpen,
diff --git a/apps/web/src/features/block-automation/component/Automation.tsx b/apps/web/src/features/block-automation/component/Automation.tsx
index 22232571bd..09cc917f30 100644
--- a/apps/web/src/features/block-automation/component/Automation.tsx
+++ b/apps/web/src/features/block-automation/component/Automation.tsx
@@ -1,6 +1,6 @@
import { openBulkEditModal } from '@app/features/entity/bulk-edit/BulkEditEntityModal';
import { HeaderIsland } from '@components/app/split-layout/components/HeaderIsland';
-import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';
+import { BlockSplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';
import { SplitHeaderLeft } from '@components/app/split-layout/components/SplitHeader';
import { SplitTitleFileMenu } from '@components/app/split-layout/components/SplitLabel';
import { useSplitLayout } from '@components/app/split-layout/layout';
@@ -321,7 +321,7 @@ export function Automation() {
</HeaderIsland>
</SplitHeaderLeft>
<SplitTitleFileMenu>
- <SplitFileMenu
+ <BlockSplitFileMenu
id={scheduleId}
itemType="automation"
name={d().name || blockNameToDefaultFile('automation')}
diff --git a/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsx b/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsx
index bc2d8ba88e..9d023cd75a 100644
--- a/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsx
+++ b/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsx
@@ -42,7 +42,7 @@ import {
} from '@channel/Channel/link';
import { ChannelParticipantsTab } from '@channel/Participants/ChannelParticipantsTab';
import { HeaderIsland } from '@components/app/split-layout/components/HeaderIsland';
-import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';
+import { BlockSplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';
import { SplitHeaderRight } from '@components/app/split-layout/components/SplitHeader';
import { SplitTitleFileMenu } from '@components/app/split-layout/components/SplitLabel';
import {
@@ -229,7 +229,7 @@ function NewTop(props: { channelId: string }) {
onTabChange={setActiveTab}
/>
<SplitTitleFileMenu>
- <SplitFileMenu
+ <BlockSplitFileMenu
id={props.channelId}
itemType="channel"
name={channelName() ?? 'New Channel'}
diff --git a/apps/web/src/features/block-email/component/Block.tsx b/apps/web/src/features/block-email/component/Block.tsx
index e0e44df588..22411b0364 100644
--- a/apps/web/src/features/block-email/component/Block.tsx
+++ b/apps/web/src/features/block-email/component/Block.tsx
@@ -40,7 +40,7 @@ export default function BlockEmail() {
});
});
- useBlockEntityCommands(commandEntity);
+ useBlockEntityCommands({ resolveEntity: commandEntity });
// The gate owns the load policy: structural errors are authoritative even
// over cached data, a transport failure over cached data still renders the
diff --git a/apps/web/src/features/block-md/component/Block.tsx b/apps/web/src/features/block-md/component/Block.tsx
index 3471d425b9..d3edb64212 100644
--- a/apps/web/src/features/block-md/component/Block.tsx
+++ b/apps/web/src/features/block-md/component/Block.tsx
@@ -100,15 +100,16 @@ export default function MarkdownBlockAdapter(props: BlockMarkdownProps) {
| undefined;
return value?.__block === 'md' ? value : undefined;
};
+ const source = blockSourceSignal.get;
const documentSource = (): MarkdownDocumentSource => {
const loaded = data();
if (!loaded) return { type: 'loading' };
- const source = blockSourceSignal.get();
- if (source?.type === 'sync-service' && loaded.syncSource) {
+ const loadedSource = source();
+ if (loadedSource?.type === 'sync-service' && loaded.syncSource) {
return { type: 'sync', source: loaded.syncSource };
}
- if (source?.type === 'dss' && loaded.dssFile) {
+ if (loadedSource?.type === 'dss' && loaded.dssFile) {
return { type: 'dss', file: loaded.dssFile };
}
diff --git a/apps/web/src/features/block-md/component/ModalsProvider.tsx b/apps/web/src/features/block-md/component/ModalsProvider.tsx
index 08d2548b9f..a49d028a94 100644
--- a/apps/web/src/features/block-md/component/ModalsProvider.tsx
+++ b/apps/web/src/features/block-md/component/ModalsProvider.tsx
@@ -8,11 +8,21 @@ import {
ShareModal,
} from '@core/component/TopBar/ShareButton';
import { useDocumentMetadataQuery } from '@queries/storage/document-metadata';
-import { createSignal, type ParentProps, Suspense } from 'solid-js';
+import {
+ createSignal,
+ type ParentProps,
+ type Setter,
+ Suspense,
+} from 'solid-js';
import { useMarkdownDocument } from '../context/markdown-document-context';
import { useMarkdownName } from './MarkdownNameProvider';
-export function ModalsProvider(props: ParentProps) {
+export function ModalsProvider(
+ props: ParentProps<{
+ shareOpen?: boolean;
+ onShareOpenChange?: (open: boolean) => void;
+ }>
+) {
const {
documentId,
kind,
@@ -21,7 +31,14 @@ export function ModalsProvider(props: ParentProps) {
const { displayName } = useMarkdownName();
const notificationSource = useGlobalNotificationSource();
const metadataQuery = useDocumentMetadataQuery(documentId);
- const [shareOpen, setShareOpen] = createSignal(false);
+ 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();
diff --git a/apps/web/src/features/block-project/component/TopBar.tsx b/apps/web/src/features/block-project/component/TopBar.tsx
index 38bdf742cd..23369ce497 100644
--- a/apps/web/src/features/block-project/component/TopBar.tsx
+++ b/apps/web/src/features/block-project/component/TopBar.tsx
@@ -13,8 +13,8 @@ import {
import { PreviewButton } from '@components/app/split-layout/components/PreviewButton';
import { useDrawerControl } from '@components/app/split-layout/components/SplitDrawerContext';
import {
+ BlockSplitFileMenu,
type FileOperation,
- SplitFileMenu,
} from '@components/app/split-layout/components/SplitFileMenu';
import {
SplitHeaderLeft,
@@ -132,7 +132,7 @@ export function TopBar() {
</SplitHeaderRight>
<ResponsivePermissionsBadge />
<SplitTitleFileMenu>
- <SplitFileMenu
+ <BlockSplitFileMenu
id={id}
itemType="project"
name={name()}
diff --git a/apps/web/src/features/next-soup/actions/index.ts b/apps/web/src/features/next-soup/actions/index.ts
index d00823432a..bca3a2a69b 100644
--- a/apps/web/src/features/next-soup/actions/index.ts
+++ b/apps/web/src/features/next-soup/actions/index.ts
@@ -38,5 +38,8 @@ export { makeRemoveFromProjectAction } from './make-remove-from-project-action';
export { makeRenameAction } from './make-rename-action';
export { makeSetCompanyPropertyAction } from './make-set-company-property-action';
export { makeShareAction } from './make-share-action';
-export { useBlockEntityCommands } from './use-block-entity-commands';
+export {
+ type UseBlockEntityCommandsOptions,
+ useBlockEntityCommands,
+} from './use-block-entity-commands';
export { useEntityActionHotkeys } from './use-entity-action-hotkeys';
diff --git a/apps/web/src/features/next-soup/actions/make-delete-action.test.ts b/apps/web/src/features/next-soup/actions/make-delete-action.test.ts
index 91a3f30227..0da1cd5bfb 100644
--- a/apps/web/src/features/next-soup/actions/make-delete-action.test.ts
+++ b/apps/web/src/features/next-soup/actions/make-delete-action.test.ts
@@ -61,6 +61,21 @@ describe('makeDeleteAction.execute', () => {
expect(mocks.openBulkEditModal).toHaveBeenCalledOnce();
});
+ it('notifies after a confirmed deletion succeeds', async () => {
+ const onDeleted = vi.fn();
+ const doc = entity('document');
+ const action = makeDeleteAction({ userId: () => ME, onDeleted });
+
+ await action.execute([doc]);
+
+ expect(onDeleted).not.toHaveBeenCalled();
+ const [{ onFinish }] = mocks.openBulkEditModal.mock.calls[0] as unknown as [
+ { onFinish: () => void },
+ ];
+ onFinish();
+ expect(onDeleted).toHaveBeenCalledWith([doc]);
+ });
+
// A mixed selection confirms only the entities the modal actually lists;
// the reminders in it are already gone by then.
it('splits a mixed selection, confirming only the non-reminders', async () => {
diff --git a/apps/web/src/features/next-soup/actions/make-delete-action.ts b/apps/web/src/features/next-soup/actions/make-delete-action.ts
index c8d02af08e..49fcb9f491 100644
--- a/apps/web/src/features/next-soup/actions/make-delete-action.ts
+++ b/apps/web/src/features/next-soup/actions/make-delete-action.ts
@@ -13,6 +13,7 @@ import type { EntityActionListState } from './entity-action-context';
type MakeDeleteOptions = {
userId: () => string | undefined;
+ onDeleted?: (entities: EntityData[]) => void;
};
export const makeDeleteAction = (options: MakeDeleteOptions) => {
@@ -49,6 +50,7 @@ export const makeDeleteAction = (options: MakeDeleteOptions) => {
? `Deleted ${reminders.length} reminders`
: 'Reminder deleted'
);
+ options.onDeleted?.(reminders);
} catch {
// createBulkDeleteDssItemsMutation already toasts and restores the rows.
}
@@ -93,6 +95,7 @@ export const makeDeleteAction = (options: MakeDeleteOptions) => {
toast.success(
rest.length > 1 ? `Deleted ${rest.length} items` : 'Deleted'
);
+ options.onDeleted?.(rest);
},
});
};
diff --git a/apps/web/src/features/next-soup/actions/use-block-entity-commands.ts b/apps/web/src/features/next-soup/actions/use-block-entity-commands.ts
index d8eb94cbbb..3db7f08f16 100644
--- a/apps/web/src/features/next-soup/actions/use-block-entity-commands.ts
+++ b/apps/web/src/features/next-soup/actions/use-block-entity-commands.ts
@@ -7,7 +7,7 @@ import { useAllProperties } from '@app/features/property/editor/hooks/useAllProp
import { openPropertyEditor } from '@app/features/property/editor/state/propertyEditor';
import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
import { useSplitPanel } from '@components/app/split-layout/layoutUtils';
-import { useBlockId } from '@core/block';
+import { useMaybeBlockId } from '@core/block';
import { useQuickAccess } from '@core/context/quickAccess';
import { useUserId } from '@core/context/user';
import { HotkeyTags } from '@core/hotkey/constants';
@@ -49,10 +49,24 @@ import {
* source: `condition()` runs inside command-menu evaluation, where a pending
* query must not suspend.
*/
+export type UseBlockEntityCommandsOptions = {
+ id?: string;
+ scopeId?: string;
+ resolveEntity?: () => EntityData | undefined;
+ onDeleted?: () => void;
+};
+
export const useBlockEntityCommands = (
- resolveEntity?: () => EntityData | undefined
+ options: UseBlockEntityCommandsOptions = {}
) => {
- const blockId = useBlockId();
+ const blockId = options.id ?? useMaybeBlockId();
+
+ if (!blockId) {
+ throw new Error(
+ 'useBlockEntityCommands requires an explicit id or an enclosing block'
+ );
+ }
+
const quickAccess = useQuickAccess();
const userId = useUserId();
const notificationSource = useGlobalNotificationSource();
@@ -64,7 +78,10 @@ export const useBlockEntityCommands = (
notificationSource: () => notificationSource,
});
- const deleteAction = makeDeleteAction({ userId: () => userId() });
+ const deleteAction = makeDeleteAction({
+ userId: () => userId(),
+ onDeleted: options.onDeleted,
+ });
const renameAction = makeRenameAction({ userId: () => userId() });
const copyAction = makeCopyAction();
const moveToProjectAction = makeMoveToProjectAction();
@@ -87,7 +104,7 @@ export const useBlockEntityCommands = (
const assignees = () => propertyById(SYSTEM_PROPERTY_IDS.ASSIGNEES);
const getEntity = (): EntityData | undefined => {
- const provided = resolveEntity?.();
+ const provided = options.resolveEntity?.();
if (provided) return provided;
const item = quickAccess.getById(blockId);
if (item?.kind === 'entity') return item.data;
@@ -205,7 +222,7 @@ export const useBlockEntityCommands = (
};
createEffect(() => {
- const scopeId = blockHotkeyScopeSignal.get();
+ const scopeId = options.scopeId ?? blockHotkeyScopeSignal.get();
if (!scopeId) return;
const group = createHotkeyGroup();
diff --git a/apps/web/src/features/tasks-view/components/TaskDetail.tsx b/apps/web/src/features/tasks-view/components/TaskDetail.tsx
new file mode 100644
index 0000000000..c78165a988
--- /dev/null
+++ b/apps/web/src/features/tasks-view/components/TaskDetail.tsx
@@ -0,0 +1,344 @@
+import { ViewBreadcrumbs } from '@app/components/view-shell';
+import { useBlockEntityCommands } from '@app/features/next-soup/actions';
+import { FindAndReplace } from '@block-md/component/FindAndReplace';
+import {
+ MarkdownDocument,
+ MarkdownDocumentContent,
+} from '@block-md/component/MarkdownDocument';
+import { useMarkdownName } from '@block-md/component/MarkdownNameProvider';
+import { ModalsProvider } from '@block-md/component/ModalsProvider';
+import { MarkdownSidePanelSections } from '@block-md/component/sidepanel/MarkdownSidePanelSections';
+import { useMarkdownDocumentTools } from '@block-md/component/useMarkdownDocumentTools';
+import { useMarkdownDocument } from '@block-md/context/markdown-document-context';
+import { OldOverlay } from '@block-md/history/OldOverlay';
+import { loadMarkdownCachedSnapshot } from '@block-md/queries/markdown-document-operations';
+import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
+import { SidePanel } from '@components/app/side-panel';
+import { SplitFileMenu } from '@components/app/split-layout/components/SplitFileMenu';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import { EntityIcon } from '@core/component/EntityIcon';
+import { Permissions } from '@core/component/SharePermissions';
+import {
+ ShareDialogContext,
+ ShareTrigger,
+} from '@core/component/TopBar/ShareButton';
+import { ENABLE_MARKDOWN_SIDE_PANEL } from '@core/constant/featureFlags';
+import { buildEntityData } from '@entity';
+import { DocumentDebouncedNotificationReadMarker } from '@notifications';
+import SpinnerIcon from '@phosphor/spinner.svg';
+import { Button } from '@ui';
+import {
+ createResource,
+ createSignal,
+ ErrorBoundary,
+ Match,
+ onCleanup,
+ onMount,
+ type Resource,
+ Show,
+ Suspense,
+ Switch,
+} from 'solid-js';
+import { TASK_TABS } from '../constants';
+import {
+ loadTaskDocument,
+ type TaskDocumentData,
+} from '../queries/task-document';
+import { useTasksView } from '../tasks-view-context';
+import type { TaskDetailTarget } from '../types';
+
+const TASK_BREADCRUMB_SKELETON_DELAY_MS = 150;
+
+function TaskViewBreadcrumbItem() {
+ const { state } = useTasksView();
+ const tabName = () =>
+ TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';
+
+ return (
+ <ViewBreadcrumbs.Item value="tasks-view" order={0}>
+ {(item) => (
+ <ViewBreadcrumbs.Button
+ isActive={item.isActive()}
+ onClick={item.onSelect}
+ >
+ <span class="truncate">{tabName()}</span>
+ </ViewBreadcrumbs.Button>
+ )}
+ </ViewBreadcrumbs.Item>
+ );
+}
+
+function TaskBreadcrumbItem(props: {
+ documentId: string;
+ fallbackName: string;
+ ownerId: string;
+ projectId?: string;
+}) {
+ const { closeTask, openTask } = useTasksView();
+ const panel = useSplitPanelOrThrow();
+ const { displayName } = useMarkdownName();
+ const { permissions, state: documentState } = useMarkdownDocument();
+ const { fileOperations, menuTools } = useMarkdownDocumentTools();
+
+ const taskName = () => displayName() ?? props.fallbackName;
+
+ const focusTask = () => documentState.editor.md.editor?.focus();
+
+ const menuPermissions = () => {
+ if (permissions.isOwner()) return Permissions.OWNER;
+ if (permissions.canEdit()) return Permissions.CAN_EDIT;
+ if (permissions.canComment()) return Permissions.CAN_COMMENT;
+ return Permissions.CAN_VIEW;
+ };
+
+ useBlockEntityCommands({
+ id: props.documentId,
+ scopeId: panel.splitHotkeyScope,
+ onDeleted: closeTask,
+ resolveEntity: () =>
+ buildEntityData({
+ id: props.documentId,
+ name: taskName(),
+ blockName: 'task',
+ ownerId: props.ownerId,
+ projectId: props.projectId,
+ }),
+ });
+
+ return (
+ <ViewBreadcrumbs.Item value={`task:${props.documentId}`} order={1}>
+ {(item) => (
+ <div class="flex min-w-0 items-center motion-safe:animate-[dialog-overlay-open_150ms_ease-out]">
+ <ViewBreadcrumbs.Button
+ class="gap-1.5"
+ isActive={item.isActive()}
+ onClick={() => {
+ item.onSelect();
+ focusTask();
+ }}
+ >
+ <EntityIcon targetType="task" size="xs" class="shrink-0" />
+ <span class="truncate">{taskName()}</span>
+ </ViewBreadcrumbs.Button>
+ <div class="shrink-0">
+ <SplitFileMenu
+ id={props.documentId}
+ itemType="document"
+ name={taskName()}
+ ops={fileOperations}
+ tools={menuTools}
+ entityKind="task"
+ permissions={menuPermissions()}
+ onDuplicate={(id) => openTask({ id, fallbackName: taskName() })}
+ onDelete={closeTask}
+ />
+ </div>
+ </div>
+ )}
+ </ViewBreadcrumbs.Item>
+ );
+}
+
+function TaskDetailTopBar(props: {
+ documentId: string;
+ document: Resource<TaskDocumentData>;
+}) {
+ const panel = useSplitPanelOrThrow();
+
+ return (
+ <div class="flex h-12 min-w-0 shrink-0 items-center gap-1 border-edge border-b px-3">
+ <ViewBreadcrumbs.Outlet aria-label="Task location">
+ <Suspense fallback={<TaskBreadcrumbSkeleton />}>
+ {props.document.latest && null}
+ </Suspense>
+ </ViewBreadcrumbs.Outlet>
+ <div class="ml-auto flex shrink-0 items-center gap-2">
+ <ShareTrigger
+ id={props.documentId}
+ blockType="task"
+ hotkeyScope={panel.splitHotkeyScope}
+ />
+ <SidePanel.Toggle />
+ </div>
+ </div>
+ );
+}
+
+function TaskBreadcrumbSkeleton() {
+ const [visible, setVisible] = createSignal(false);
+
+ onMount(() => {
+ const timeoutId = window.setTimeout(
+ () => setVisible(true),
+ TASK_BREADCRUMB_SKELETON_DELAY_MS
+ );
+ onCleanup(() => window.clearTimeout(timeoutId));
+ });
+
+ return (
+ <Show when={visible()}>
+ <ViewBreadcrumbs.Separator />
+ <div
+ aria-hidden="true"
+ class="flex h-7 min-w-0 items-center gap-1.5 px-1"
+ >
+ <span class="skeleton-shimmer size-4 shrink-0 rounded bg-skeleton" />
+ <span class="skeleton-shimmer h-3 w-24 rounded-full bg-skeleton" />
+ </div>
+ </Show>
+ );
+}
+
+function TaskDetailBodyState(props: {
+ error?: unknown;
+ actionLabel?: string;
+ onAction?: () => void;
+}) {
+ const errorText = () => String(props.error);
+
+ return (
+ <div class="grid size-full place-items-center text-ink-muted">
+ <Switch
+ fallback={
+ <SpinnerIcon aria-label="Loading task" class="size-5 animate-spin" />
+ }
+ >
+ <Match when={props.error !== undefined}>
+ <div class="flex max-w-xl flex-col items-center gap-3 px-6 text-center">
+ <span>This task couldn’t be displayed.</span>
+ <pre class="max-h-48 max-w-full overflow-auto whitespace-pre-wrap text-left text-failure text-xs">
+ {errorText()}
+ </pre>
+ <Button variant="outline" size="sm" onClick={props.onAction}>
+ {props.actionLabel ?? 'Reset'}
+ </Button>
+ </div>
+ </Match>
+ </Switch>
+ </div>
+ );
+}
+
+function TaskDetailDocument(props: {
+ task: TaskDetailTarget;
+ data: TaskDocumentData;
+ shareOpen: boolean;
+ onShareOpenChange: (open: boolean) => void;
+}) {
+ const panel = useSplitPanelOrThrow();
+ const notificationSource = useGlobalNotificationSource();
+ const fallbackName = () => props.task.fallbackName ?? 'New Task';
+
+ return (
+ <MarkdownDocument
+ documentId={props.task.id}
+ kind="task"
+ documentSource={{ type: 'sync', source: props.data.source }}
+ permissions={props.data.permissions}
+ persistedName={props.data.metadata.documentName}
+ fallbackName={fallbackName()}
+ >
+ <ModalsProvider
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ >
+ <OldOverlay />
+ <TaskBreadcrumbItem
+ documentId={props.task.id}
+ fallbackName={fallbackName()}
+ ownerId={props.data.metadata.owner}
+ projectId={props.data.metadata.projectId ?? undefined}
+ />
+ <SidePanel.Layout headerToggle={false}>
+ <Show when={ENABLE_MARKDOWN_SIDE_PANEL}>
+ <MarkdownSidePanelSections />
+ </Show>
+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
+ <div class="absolute top-1.5 right-4 z-action-menu flex justify-end">
+ <FindAndReplace hotkeyScope={panel.splitHotkeyScope} />
+ </div>
+ <DocumentDebouncedNotificationReadMarker
+ notificationSource={notificationSource}
+ documentId={props.task.id}
+ />
+ <MarkdownDocumentContent
+ hotkeyScope={panel.splitHotkeyScope}
+ doInitialSync={props.data.doInitialSync}
+ loadCachedSnapshot={() =>
+ loadMarkdownCachedSnapshot(props.task.id)
+ }
+ />
+ </div>
+ </SidePanel.Layout>
+ </ModalsProvider>
+ </MarkdownDocument>
+ );
+}
+
+export function TaskDetail(props: { task: TaskDetailTarget }) {
+ const { closeTask } = useTasksView();
+ const [document, { refetch }] = createResource(
+ () => props.task.id,
+ loadTaskDocument
+ );
+ const [shareOpen, setShareOpen] = createSignal(false);
+
+ return (
+ <ShareDialogContext.Provider
+ value={{
+ isOpen: shareOpen,
+ open: () => setShareOpen(true),
+ close: () => setShareOpen(false),
+ }}
+ >
+ <ViewBreadcrumbs.Root
+ value={`task:${props.task.id}`}
+ onChange={(value) => {
+ if (value === 'tasks-view') closeTask();
+ }}
+ >
+ <TaskViewBreadcrumbItem />
+ <SidePanel.Root>
+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
+ <TaskDetailTopBar documentId={props.task.id} document={document} />
+ <div class="relative min-h-0 min-w-0 flex-1">
+ <Suspense fallback={<TaskDetailBodyState />}>
+ <Switch>
+ <Match when={document.error}>
+ {(error) => (
+ <TaskDetailBodyState
+ error={error()}
+ actionLabel="Try again"
+ onAction={() => void refetch()}
+ />
+ )}
+ </Match>
+ <Match when={document()}>
+ {(data) => (
+ <ErrorBoundary
+ fallback={(error, reset) => (
+ <TaskDetailBodyState
+ error={error}
+ actionLabel="Reset"
+ onAction={reset}
+ />
+ )}
+ >
+ <TaskDetailDocument
+ task={props.task}
+ data={data()}
+ shareOpen={shareOpen()}
+ onShareOpenChange={setShareOpen}
+ />
+ </ErrorBoundary>
+ )}
+ </Match>
+ </Switch>
+ </Suspense>
+ </div>
+ </div>
+ </SidePanel.Root>
+ </ViewBreadcrumbs.Root>
+ </ShareDialogContext.Provider>
+ );
+}
diff --git a/apps/web/src/features/tasks-view/components/TasksControls.tsx b/apps/web/src/features/tasks-view/components/TasksControls.tsx
index cbda901764..d07109ebae 100644
--- a/apps/web/src/features/tasks-view/components/TasksControls.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksControls.tsx
@@ -4,7 +4,6 @@ import {
ListSortDropdown,
useViewControlHotkeys,
} from '@app/components/view-shell';
-import { PreviewButton } from '@components/app/split-layout/components/PreviewButton';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { createSignal, Show } from 'solid-js';
import { TASK_GROUP_OPTIONS, TASK_SORT_OPTIONS } from '../constants';
@@ -86,7 +85,6 @@ export function TasksControls() {
</span>
</Show>
</div>
- <PreviewButton iconOnly class="rounded-lg" />
</div>
);
}
diff --git a/apps/web/src/features/tasks-view/components/TasksHeader.tsx b/apps/web/src/features/tasks-view/components/TasksHeader.tsx
index 36c4acdc8e..e6544f5648 100644
--- a/apps/web/src/features/tasks-view/components/TasksHeader.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksHeader.tsx
@@ -27,7 +27,11 @@ export function TasksTopBar() {
const title = () =>
TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';
- return <ViewShell.TopBar>{title()}</ViewShell.TopBar>;
+ return (
+ <ViewShell.TopBar class="px-3">
+ <span class="px-1">{title()}</span>
+ </ViewShell.TopBar>
+ );
}
export function TasksHeader(props: TasksHeaderProps) {
diff --git a/apps/web/src/features/tasks-view/components/TasksSidebar.tsx b/apps/web/src/features/tasks-view/components/TasksSidebar.tsx
index 84ed8b0cb6..616f98b186 100644
--- a/apps/web/src/features/tasks-view/components/TasksSidebar.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksSidebar.tsx
@@ -61,7 +61,7 @@ export function TasksNavigation(props: { onNavigate?: () => void }) {
function FavoriteRow(props: {
favorite: Favorite;
- onOpen: (favorite: Favorite, event: MouseEvent) => void;
+ onOpen: (favorite: Favorite, name: string, event: MouseEvent) => void;
}) {
const name = useFavoriteDisplayName(props.favorite);
@@ -70,7 +70,7 @@ function FavoriteRow(props: {
<ViewSidebar.Item
class="font-normal"
title={name()}
- onClick={(event) => props.onOpen(props.favorite, event)}
+ onClick={(event) => props.onOpen(props.favorite, name(), event)}
>
<span class="flex size-4 shrink-0 items-center justify-center">
<FavoriteIcon favorite={props.favorite} class="size-4" />
@@ -87,6 +87,7 @@ function TaskFavorites(props: {
}) {
const data = useFavoritesData();
const layout = useSplitLayout();
+ const { openTask } = useTasksView();
const favorites = createMemo(() =>
(data()?.favorites ?? [])
.filter(
@@ -96,10 +97,23 @@ function TaskFavorites(props: {
)
.sort((left, right) => left.sortOrder - right.sortOrder)
);
- const openFavorite = (favorite: Favorite, event: MouseEvent) => {
- layout.openWithSplit(favoriteSplitContent(favorite), {
- referredFrom: 'sidebar',
- preferNewSplit: event.shiftKey,
+ const openFavorite = (
+ favorite: Favorite,
+ fallbackName: string,
+ event: MouseEvent
+ ) => {
+ if (event.shiftKey) {
+ layout.openWithSplit(favoriteSplitContent(favorite), {
+ referredFrom: 'sidebar',
+ preferNewSplit: true,
+ });
+
+ return;
+ }
+
+ openTask({
+ id: favorite.entityId,
+ fallbackName,
});
};
diff --git a/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx b/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx
index 351d4fc4d9..6f691bad2d 100644
--- a/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx
+++ b/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx
@@ -13,7 +13,6 @@ import { openEntityInSplitFromUnifiedList } from '@app/features/next-soup/utils'
import {
MaybeSoupEntityActionDrawerManager,
SoupEntityContextMenu,
- useSoupListNavigationHotkeys,
} from '@app/features/soup';
import { DEBUG_SETTING_KEYS, useDebugSetting } from '@app/lib/debugSettings';
import { makePersistedState } from '@app/lib/persistence';
@@ -45,14 +44,12 @@ import { PROPERTY_OPTION_IDS, SYSTEM_PROPERTY_IDS } from '@property';
import { useTagSets, useTagSetsReady } from '@property/tags/tag-sets-context';
import { useBulkSaveEntityPropertiesMutation } from '@queries/properties/entity';
import { EntityType } from '@service-properties/generated/schemas/entityType';
-import { debounce } from '@solid-primitives/scheduled';
import { Button, cn } from '@ui';
import {
createEffect,
createMemo,
createSignal,
Match,
- onCleanup,
type Setter,
Show,
Suspense,
@@ -108,7 +105,7 @@ export type TaskListProps = {
export function TaskList(props: TaskListProps) {
const panel = useSplitPanelOrThrow();
- const { state, setState } = useTasksView();
+ const { state, setState, openTask } = useTasksView();
const userId = useUserId();
const forceEmptyState = useDebugSetting(
DEBUG_SETTING_KEYS.FORCE_EMPTY_STATES
@@ -149,12 +146,6 @@ export function TaskList(props: TaskListProps) {
});
}
- const previewAfterNavigation = debounce(
- (entity: EntityData) => openEntity(entity, { mergeHistory: true }),
- 150
- );
- onCleanup(() => previewAfterNavigation.clear());
-
function onActivate({
item,
metadata,
@@ -188,14 +179,18 @@ export function TaskList(props: TaskListProps) {
if (sourceRow?.kind !== 'entity') return;
- previewAfterNavigation.clear();
-
const newSplit =
metadata?.newSplit === true || metadata?.event?.shiftKey === true;
- openEntity(sourceRow.entity, {
- openInNewSplit: newSplit,
- replacePreview: metadata?.event?.altKey === true && !newSplit,
+ if (newSplit) {
+ openEntity(sourceRow.entity, { openInNewSplit: true });
+
+ return;
+ }
+
+ openTask({
+ id: sourceRow.entity.id,
+ fallbackName: sourceRow.entity.name,
});
}
@@ -212,21 +207,6 @@ export function TaskList(props: TaskListProps) {
})
);
- withSplitPanelOwner(listOwnedSlotName('navigation-hotkeys'), () => {
- useSoupListNavigationHotkeys({
- splitHotkeyScope: panel.splitHotkeyScope,
- viewId: 'tasks',
- dataSource: source,
- controller: list,
- handle: panel.handle,
- openEntityInSplit: (task, options) => {
- openEntity(task, {
- mergeHistory: options.mergeHistory,
- });
- },
- });
- });
-
const entityActionViewContext = () =>
resolveEntityActionViewContext({
activeListView: panel.handle.content().id,
@@ -329,13 +309,6 @@ export function TaskList(props: TaskListProps) {
enabled: panel.isPanelActive,
navigation: {
onNavigate: (event) => {
- previewAfterNavigation.clear();
-
- const row = event.result?.item;
- if (row?.kind === 'entity' && panel.handle.isControllerSplit()) {
- previewAfterNavigation(row.entity);
- }
-
if (event.kind !== 'move' || event.direction !== 1) return;
if (source.isLoadingMore() || !source.hasMore()) {
return;
@@ -391,10 +364,8 @@ export function TaskList(props: TaskListProps) {
if (nextTab === activeTab) return;
activeTab = nextTab;
- previewAfterNavigation.clear();
listInteractions.selection.clear();
list.focus.clear({ reason: 'programmatic' });
- panel.handle.resetPreview();
setPersistedListState((current) => ({ ...current, scrollOffset: 0 }));
});
@@ -408,10 +379,6 @@ export function TaskList(props: TaskListProps) {
});
if (restored) return;
if (isTouchDevice()) return;
- if (panel.handle.isControllerSplit()) {
- panel.handle.resetPreview();
- return;
- }
list.focus.first({
isNavigable: (row) => row.kind === 'entity',
diff --git a/apps/web/src/features/tasks-view/constants.ts b/apps/web/src/features/tasks-view/constants.ts
index f3e25c8de3..8ae0a27292 100644
--- a/apps/web/src/features/tasks-view/constants.ts
+++ b/apps/web/src/features/tasks-view/constants.ts
@@ -14,7 +14,7 @@ export const PERSONAL_TASK_TABS: TaskTabItem[] = [
];
export const TEAM_TASK_TABS: TaskTabItem[] = [
- { id: 'team-tasks', label: 'Team tasks' },
+ { id: 'team-tasks', label: 'All tasks' },
];
export const TASK_TABS = [...PERSONAL_TASK_TABS, ...TEAM_TASK_TABS];
diff --git a/apps/web/src/features/tasks-view/queries/task-document.ts b/apps/web/src/features/tasks-view/queries/task-document.ts
new file mode 100644
index 0000000000..2c7297dc77
--- /dev/null
+++ b/apps/web/src/features/tasks-view/queries/task-document.ts
@@ -0,0 +1,74 @@
+import {
+ fetchDocumentLocation,
+ waitForDocumentSyncServiceReady,
+} from '@queries/storage/document-location';
+import { fetchDocumentLoadBundle } from '@queries/storage/documentLoad/documentLoadBundle';
+import type { DocumentMetadata } from '@service-storage/generated/schemas/documentMetadata';
+import { createSyncServiceSource } from '@service-sync/source';
+import { match } from 'ts-pattern';
+
+export type TaskDocumentData = ReturnType<typeof createSyncServiceSource> & {
+ metadata: DocumentMetadata;
+ permissions: {
+ canComment: boolean;
+ canEdit: boolean;
+ isOwner: boolean;
+ };
+};
+
+export async function loadTaskDocument(
+ documentId: string
+): Promise<TaskDocumentData> {
+ const [bundleResult, locationResult] = await Promise.all([
+ fetchDocumentLoadBundle(documentId),
+ fetchDocumentLocation({ documentId }),
+ ]);
+
+ if (bundleResult.isErr()) {
+ throw new Error('Unable to load task metadata');
+ }
+ if (locationResult.isErr()) {
+ throw new Error('Unable to load task content');
+ }
+
+ let location = locationResult.value;
+ if (
+ location.type === 'presignedUrl' &&
+ location.content.state === 'pending'
+ ) {
+ location = await waitForDocumentSyncServiceReady({ documentId });
+ }
+ if (location.type !== 'syncServiceContent') {
+ throw new Error('Task content is not available in sync-service');
+ }
+
+ const { documentMetadata, token, userAccessLevel } = bundleResult.value;
+ const permissions = match(userAccessLevel)
+ .with('owner', () => ({
+ canComment: true,
+ canEdit: true,
+ isOwner: true,
+ }))
+ .with('edit', () => ({
+ canComment: true,
+ canEdit: true,
+ isOwner: false,
+ }))
+ .with('comment', () => ({
+ canComment: true,
+ canEdit: false,
+ isOwner: false,
+ }))
+ .with('view', () => ({
+ canComment: false,
+ canEdit: false,
+ isOwner: false,
+ }))
+ .exhaustive();
+
+ return {
+ ...createSyncServiceSource(documentId, token),
+ metadata: documentMetadata,
+ permissions,
+ };
+}
diff --git a/apps/web/src/features/tasks-view/tasks-view-context.tsx b/apps/web/src/features/tasks-view/tasks-view-context.tsx
index 430f0bd543..fbf6adf63a 100644
--- a/apps/web/src/features/tasks-view/tasks-view-context.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view-context.tsx
@@ -5,6 +5,7 @@ import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { createAssertedContextProvider } from '@core/context/createContext';
import { useUserId } from '@core/context/user';
import type { ContextProviderProps } from '@solid-primitives/context';
+import { type Accessor, createSignal } from 'solid-js';
import {
createStore,
produce,
@@ -16,6 +17,7 @@ import { TASK_DEFAULT_GROUP_BY } from './constants';
import { DEFAULT_TASK_FACET_SELECTION } from './filters/task-facets';
import { createTasksViewPersistence } from './persistence';
import type {
+ TaskDetailTarget,
TaskSortId,
TasksViewState,
TasksViewStateOptions,
@@ -29,6 +31,9 @@ type TasksViewProviderProps = ContextProviderProps & {
export type TasksViewContext = {
state: Store<TasksViewState>;
setState: SetStoreFunction<TasksViewState>;
+ selectedTask: Accessor<TaskDetailTarget | undefined>;
+ openTask: (task: TaskDetailTarget) => void;
+ closeTask: () => void;
setTab: (tab: TaskTab) => void;
setFacets: (facets: TasksViewState['facets']) => void;
setPrimarySort: (id: TaskSortId) => void;
@@ -45,6 +50,7 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
const initial = props.initialState ?? {};
const initialTab = initial.tab ?? 'my-tasks';
+ const [selectedTask, setSelectedTask] = createSignal<TaskDetailTarget>();
const [state, setState] = makePersistedState(
createStore<TasksViewState>({
@@ -70,7 +76,11 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
})
);
+ const openTask = (task: TaskDetailTarget) => setSelectedTask(task);
+ const closeTask = () => setSelectedTask();
+
const setTab = (tab: TaskTab) => {
+ closeTask();
if (state.tab === tab) return;
setState(
@@ -84,6 +94,7 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
};
const setFacets = (facets: TasksViewState['facets']) => {
+ closeTask();
setState('facets', reconcile(normalizeFacetSelection(facets)));
};
@@ -106,6 +117,9 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
return {
state,
setState,
+ selectedTask,
+ openTask,
+ closeTask,
setTab,
setFacets,
setPrimarySort,
diff --git a/apps/web/src/features/tasks-view/tasks-view.tsx b/apps/web/src/features/tasks-view/tasks-view.tsx
index 0fc58bba0d..e5bcd52cbc 100644
--- a/apps/web/src/features/tasks-view/tasks-view.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view.tsx
@@ -3,11 +3,12 @@ import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import { SplitPanel } from '@components/app/split-panel';
import { ListEntityMetadataQueryProvider } from '@entity';
import SpinnerIcon from '@phosphor/spinner.svg';
-import { createSignal, onMount, Suspense } from 'solid-js';
+import { createSignal, Match, onMount, Suspense, Switch } from 'solid-js';
+import { TaskDetail } from './components/TaskDetail';
import { TasksHeader, TasksTopBar } from './components/TasksHeader';
import { TasksSidebar } from './components/TasksSidebar';
import { TaskList } from './components/task-list/TaskList';
-import { TasksViewProvider } from './tasks-view-context';
+import { TasksViewProvider, useTasksView } from './tasks-view-context';
import type { TasksViewStateOptions } from './types';
export type TasksViewProps = {
@@ -25,6 +26,7 @@ function TasksListFallback() {
function TasksViewRoot() {
const panel = useSplitPanelOrThrow();
+ const { selectedTask } = useTasksView();
const [listElement, setListElement] = createSignal<HTMLDivElement>();
onMount(() => panel.handle.setDisplayName('Tasks'));
@@ -42,15 +44,24 @@ function TasksViewRoot() {
<TasksSidebar />
</ViewShell.Aside>
<ViewShell.Main>
- <TasksTopBar />
- <ViewShell.Header>
- <TasksHeader onSearchEscape={() => listElement()?.focus()} />
- </ViewShell.Header>
- <ViewShell.Content>
- <Suspense fallback={<TasksListFallback />}>
- <TaskList ref={setListElement} />
- </Suspense>
- </ViewShell.Content>
+ <Switch>
+ <Match when={selectedTask()}>
+ {(task) => <TaskDetail task={task()} />}
+ </Match>
+ <Match when={!selectedTask()}>
+ <TasksTopBar />
+ <ViewShell.Header>
+ <TasksHeader
+ onSearchEscape={() => listElement()?.focus()}
+ />
+ </ViewShell.Header>
+ <ViewShell.Content>
+ <Suspense fallback={<TasksListFallback />}>
+ <TaskList ref={setListElement} />
+ </Suspense>
+ </ViewShell.Content>
+ </Match>
+ </Switch>
</ViewShell.Main>
</ViewShell.Root>
</SplitPanel.Body>
diff --git a/apps/web/src/features/tasks-view/types.ts b/apps/web/src/features/tasks-view/types.ts
index 36bccacd5d..88d3a61885 100644
--- a/apps/web/src/features/tasks-view/types.ts
+++ b/apps/web/src/features/tasks-view/types.ts
@@ -12,6 +12,11 @@ export type TaskGroupBy =
export type TaskSortId = 'updated_at' | 'created_at' | 'viewed_at';
+export type TaskDetailTarget = {
+ id: string;
+ fallbackName?: string;
+};
+
export type TasksViewState = {
tab: TaskTab;
search: string;
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 bb86c16501..ac4eac90d9 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.test.tsx
@@ -16,6 +16,7 @@ const mocks = vi.hoisted(() => ({
getProjectPermissions: vi.fn(),
copyLink: vi.fn(),
blockPermissionsRead: vi.fn(),
+ inBlock: true,
}));
vi.mock('@app/lib/analytics/analytics-context', () => ({
useAnalytics: () => ({ track: vi.fn() }),
@@ -27,7 +28,7 @@ vi.mock('@channel/Input', () => ({
}));
vi.mock('@core/auth', () => ({ useIsAuthenticated: () => () => true }));
vi.mock('@core/block', () => ({
- isInBlock: () => true,
+ isInBlock: () => mocks.inBlock,
useBlockAliasedName: () => 'agent',
useBlockId: () => 'launcher-placeholder',
createBlockEffect: vi.fn(),
@@ -212,6 +213,7 @@ vi.mock('@ui', () => {
});
beforeEach(() => {
vi.clearAllMocks();
+ mocks.inBlock = true;
mocks.mobile = false;
mocks.hasTeam = false;
mocks.updateChatPermissions.mockResolvedValue({ isErr: () => false });
@@ -245,6 +247,21 @@ const share = () =>
fireEvent.click(screen.getByRole('button', { name: 'Share' }));
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>
+ ));
+ fireEvent.click(screen.getByRole('button', { name: 'Copy Share Link' }));
+ expect(mocks.copyLink).toHaveBeenCalledWith(
+ 'https://macro.com/app/task/task-1'
+ );
+ });
+
it('copies the saved session link from the shared header trigger', () => {
const [id, setId] = createSignal('saved-session');
render(() => (
diff --git a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
index b3ad25caeb..42dc1dffb3 100644
--- a/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
+++ b/apps/web/src/lib/core/component/TopBar/ShareButton.tsx
@@ -11,6 +11,8 @@ import {
useBlockAliasedName,
useBlockId,
useBlockName,
+ useMaybeBlockAliasedName,
+ useMaybeBlockId,
} from '@core/block';
import { EntityIcon } from '@core/component/EntityIcon';
import { type TabItem, Tabs } from '@core/component/Tabs';
@@ -1380,54 +1382,77 @@ export function ShareModal(props: ShareModalProps) {
);
}
-export function ShareTrigger(props: { id?: string; copyLink?: () => void }) {
+export function ShareTrigger(props: {
+ id?: string;
+ blockType?: BlockName | BlockAlias;
+ hotkeyScope?: string;
+ copyLink?: () => void;
+}) {
const shareCtx = useShareDialogContext();
const isAuthenticated = useIsAuthenticated();
- const blockType = useBlockAliasedName();
- const blockId = useBlockId();
+ const inBlock = isInBlock();
+ const contextualBlockType = inBlock
+ ? useBlockAliasedName()
+ : useMaybeBlockAliasedName();
+ const contextualBlockId = inBlock ? useBlockId() : useMaybeBlockId();
const analytics = useAnalytics();
+ const blockType = (): BlockName | BlockAlias => {
+ const type = props.blockType ?? contextualBlockType;
+ if (type) return type;
+ throw new Error('<ShareTrigger> requires an explicit block type');
+ };
+ const blockId = (): string => {
+ const id = props.id ?? contextualBlockId;
+ if (id) return id;
+ throw new Error('<ShareTrigger> requires an explicit block id');
+ };
+
onMount(() => {
- const blockScopeId = blockHotkeyScopeSignal.get;
- registerHotkey({
+ const scopeId =
+ props.hotkeyScope ?? (inBlock ? blockHotkeyScopeSignal.get() : undefined);
+ if (!scopeId) return;
+
+ const registration = registerHotkey({
keyDownHandler: () => {
if (!isAuthenticated()) {
openLoginModal();
} else {
- analytics.track('share_menu_open', { blockType });
+ analytics.track('share_menu_open', { blockType: blockType() });
shareCtx.open();
}
return true;
},
hotkeyToken: TOKENS.block.share,
runWithInputFocused: true,
- scopeId: blockScopeId(),
+ scopeId,
description: 'Share',
hotkey: 'cmd+s',
});
+ 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: props.id ?? blockId, type: blockType },
- params
- );
+ return buildSimpleEntityUrl({ id, type }, params);
};
const copyLink = createCallback(() => {
if (props.copyLink) return props.copyLink();
navigator.clipboard.writeText(defaultUrl());
- analytics.track('copy_share_link', { blockType });
+ analytics.track('copy_share_link', { blockType: blockType() });
toast.success('Link copied to clipboard.', {
subtext:
- blockType === 'agent'
+ blockType() === 'agent'
? undefined
: 'Sending this link in a Macro message will automatically update permissions to include recipients.',
});
@@ -1442,7 +1467,7 @@ export function ShareTrigger(props: { id?: string; copyLink?: () => void }) {
}));
const shareStatus = createMemo(() => {
- if (blockType === 'agent') return;
+ if (blockType() === 'agent' || !inBlock) return;
const result = permissionsBlockResource[0].latest;
if (!result || result.isErr()) return;
@@ -1458,9 +1483,11 @@ export function ShareTrigger(props: { id?: string; copyLink?: () => void }) {
<Tooltip
label={
shareStatus()?.tooltip ??
- (blockType === 'agent'
+ (blockType() === 'agent'
? 'Share agent session'
- : 'This item has been shared with you.')
+ : inBlock
+ ? 'This item has been shared with you.'
+ : `Share ${blockType()}`)
}
>
<Button
@@ -1468,7 +1495,7 @@ export function ShareTrigger(props: { id?: string; copyLink?: () => void }) {
if (!isAuthenticated()) {
openLoginModal();
} else {
- analytics.track('share_menu_open', { blockType });
+ analytics.track('share_menu_open', { blockType: blockType() });
shareCtx.open();
}
}}
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index f792d7c1c2..6287f55806 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -91,6 +91,11 @@ Task navigation uses `My Tasks`, `All Tasks`, and `Created by me`. The desktop
sidebar has a full-width `New task` action, a collapsible list of task favorites,
and a collapsible list of tags. Selecting a tag filters the current task view;
selecting it again clears that tag filter. Favorite rows open their tasks.
+Normal row and favorite activation replaces the list with the editable task
+document; its originating-tab breadcrumb returns to the list and its
+header exposes Share and the task Details/Properties panel. Shift-click opens
+the task in a new split instead. Keyboard navigation moves list focus without
+opening a task until activation.
## Email — `/app/component/mail`
diff --git a/docs/AGENT_GUIDE/tasks.md b/docs/AGENT_GUIDE/tasks.md
index 6786470d99..e2daaa61d0 100644
--- a/docs/AGENT_GUIDE/tasks.md
+++ b/docs/AGENT_GUIDE/tasks.md
@@ -3,7 +3,7 @@
## Surface
`Go to Tasks` → `/app/component/tasks`. Tabs: `My tasks`, `Created by me`, and `Team tasks`.
-The desktop toolbar contains search (`Ctrl+F`), `Sort`, `Group`, `Filter`, and `Preview`;
+The desktop toolbar contains search (`Ctrl+F`), `Sort`, `Group`, and `Filter`;
task creation is available from the `New` button in the Tasks sidebar. Below the tabs the
sidebar has a collapsible `Tags` section listing every personal and team tag, with a
`New tag` button beside the heading. Clicking a tag narrows the current tab to tasks
@@ -16,6 +16,12 @@ button, and Search.
New accounts are seeded with three sample tasks (`Intro to tasks`, `Advanced task features`,
`How we use tasks at Macro`).
+Click a task row or favorite to replace the list with the editable task document. Its top
+bar shows the originating task tab as a breadcrumb, the task name and actions, Share, and
+the Details/Properties side-panel toggle. Choose the originating tab breadcrumb, a task tab,
+or a tag to return to the list. Shift-click a row or favorite to open it in a new split
+instead. Keyboard list navigation only moves focus; press Enter to open the focused task.
+
## Create a task
On touch devices, task creation opens in a bottom sheet with a drag handle and