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(navigation-stack): add navigation stack primitive and entity detail (#6473)

dev-rbbae0460106a7
diff --git a/apps/web/src/components/entity-detail/EntityDetail.tsx b/apps/web/src/components/entity-detail/EntityDetail.tsx
new file mode 100644
index 0000000000..0e99cd61ca
--- /dev/null
+++ b/apps/web/src/components/entity-detail/EntityDetail.tsx
@@ -0,0 +1,32 @@
+import { useGlobalBlockOrchestrator } from '@components/app/GlobalAppState';
+import { PreviewPanel } from '@components/app/PreviewPanel';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import { Match, Switch } from 'solid-js';
+import type { EntityDetailTarget } from './EntityDetailNavigationStack';
+
+export type EntityDetailProps = {
+ target: EntityDetailTarget;
+};
+
+function PreviewPanelEntityDetail(props: EntityDetailProps) {
+ const orchestrator = useGlobalBlockOrchestrator();
+ const panel = useSplitPanelOrThrow();
+
+ return (
+ <PreviewPanel
+ selectedEntity={props.target}
+ orchestrator={orchestrator}
+ splitPanelContext={panel}
+ />
+ );
+}
+
+export function EntityDetail(props: EntityDetailProps) {
+ return (
+ <Switch>
+ <Match when={true}>
+ <PreviewPanelEntityDetail target={props.target} />
+ </Match>
+ </Switch>
+ );
+}
diff --git a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx
new file mode 100644
index 0000000000..9fa1fe2b4d
--- /dev/null
+++ b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx
@@ -0,0 +1,122 @@
+import {
+ NavigationStack,
+ type NavigationStackEntry,
+ type NavigationStackOutletProps,
+ type NavigationStackRootProps,
+ useMaybeNavigationStack,
+ useNavigationStack,
+} from '@app/components/navigation-stack/NavigationStack';
+import type { PreviewPanelSelection } from '@components/app/PreviewPanel';
+
+export type EntityDetailTarget = PreviewPanelSelection & {
+ fallbackName?: string;
+};
+
+type DocumentSelection = Extract<PreviewPanelSelection, { type: 'document' }>;
+
+export type EntityDetailDocumentTargetInput = Omit<
+ DocumentSelection,
+ 'type'
+> & {
+ fallbackName?: string;
+};
+
+export type EntityDetailChannelMessageTargetInput = {
+ channelId: string;
+ messageId: string;
+ threadId?: string;
+ fallbackName?: string;
+};
+
+export function createEntityDetailTarget<
+ TSelection extends PreviewPanelSelection,
+>(
+ selection: TSelection,
+ fallbackName?: string
+): TSelection & { fallbackName?: string } {
+ return {
+ ...selection,
+ ...(fallbackName !== undefined ? { fallbackName } : {}),
+ };
+}
+
+export const entityDetailTarget = {
+ fromSelection: createEntityDetailTarget,
+ document(input: EntityDetailDocumentTargetInput): EntityDetailTarget {
+ const { fallbackName, ...selection } = input;
+ return createEntityDetailTarget(
+ { ...selection, type: 'document' },
+ fallbackName
+ );
+ },
+ channelMessage(
+ input: EntityDetailChannelMessageTargetInput
+ ): EntityDetailTarget {
+ return createEntityDetailTarget(
+ {
+ id: input.messageId,
+ type: 'channel_message',
+ channelId: input.channelId,
+ messageId: input.messageId,
+ threadId: input.threadId,
+ target: {
+ messageId: input.messageId,
+ threadId: input.threadId,
+ },
+ },
+ input.fallbackName
+ );
+ },
+};
+
+export type EntityDetailNavigationOptions = {
+ event?: KeyboardEvent | MouseEvent;
+};
+
+export type EntityDetailNavigationStackEntry =
+ NavigationStackEntry<EntityDetailTarget>;
+
+export type EntityDetailNavigationStackRootProps = NavigationStackRootProps<
+ EntityDetailTarget,
+ EntityDetailNavigationOptions
+>;
+
+export type EntityDetailNavigationStackOutletProps = NavigationStackOutletProps<
+ EntityDetailTarget,
+ EntityDetailNavigationOptions
+>;
+
+function Root(props: EntityDetailNavigationStackRootProps) {
+ return (
+ <NavigationStack.Root<EntityDetailTarget, EntityDetailNavigationOptions>
+ {...props}
+ />
+ );
+}
+
+function Outlet(props: EntityDetailNavigationStackOutletProps) {
+ return (
+ <NavigationStack.Outlet<EntityDetailTarget, EntityDetailNavigationOptions>
+ {...props}
+ />
+ );
+}
+
+export function useEntityDetailNavigationStack() {
+ return useNavigationStack<
+ EntityDetailTarget,
+ EntityDetailNavigationOptions
+ >();
+}
+
+export function useMaybeEntityDetailNavigationStack() {
+ return useMaybeNavigationStack<
+ EntityDetailTarget,
+ EntityDetailNavigationOptions
+ >();
+}
+
+export const EntityDetailNavigationStack = Object.assign(Root, {
+ Root,
+ Outlet,
+});
diff --git a/apps/web/src/components/navigation-stack/NavigationStack.test.tsx b/apps/web/src/components/navigation-stack/NavigationStack.test.tsx
new file mode 100644
index 0000000000..0d5eb4e622
--- /dev/null
+++ b/apps/web/src/components/navigation-stack/NavigationStack.test.tsx
@@ -0,0 +1,120 @@
+import { cleanup, render, screen } from '@solidjs/testing-library';
+import { onCleanup, onMount } from 'solid-js';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import {
+ NavigationStack,
+ type NavigationStackEntry,
+ type NavigationStackState,
+ useNavigationStack,
+} from './NavigationStack';
+
+afterEach(cleanup);
+
+describe('NavigationStack', () => {
+ it('unmounts the inactive entry when the path advances', () => {
+ const mounted = vi.fn();
+ const unmounted = vi.fn();
+ let state: NavigationStackState<string> | undefined;
+
+ function CaptureState() {
+ state = useNavigationStack<string>();
+ return null;
+ }
+
+ function Content(props: { name: string }) {
+ onMount(() => mounted(props.name));
+ onCleanup(() => unmounted(props.name));
+ return <span>{props.name}</span>;
+ }
+
+ render(() => (
+ <NavigationStack.Root defaultValue={['Task']}>
+ <CaptureState />
+ <NavigationStack.Outlet<string>>
+ {(entry) => <Content name={entry.data} />}
+ </NavigationStack.Outlet>
+ </NavigationStack.Root>
+ ));
+
+ expect(screen.getByText('Task')).not.toBeNull();
+ expect(state?.navigate('Document')).toBe(true);
+
+ expect(screen.queryByText('Task')).toBeNull();
+ expect(screen.getByText('Document')).not.toBeNull();
+ expect(mounted).toHaveBeenCalledWith('Document');
+ expect(unmounted).toHaveBeenCalledWith('Task');
+ });
+
+ it('truncates the path to a selected ancestor', () => {
+ let state: NavigationStackState<string> | undefined;
+
+ function CaptureState() {
+ state = useNavigationStack<string>();
+ return null;
+ }
+
+ render(() => (
+ <NavigationStack.Root>
+ <CaptureState />
+ </NavigationStack.Root>
+ ));
+
+ const first = state?.push('Task');
+ state?.push('Document');
+ state?.push('Channel');
+ if (!first) throw new Error('Navigation stack state was not captured');
+
+ state?.popTo(first.value);
+
+ expect(state?.entries.map(({ data }) => data)).toEqual(['Task']);
+ expect(state?.active()?.data).toBe('Task');
+ });
+
+ it('notifies with a distinct path snapshot after each change', () => {
+ let state: NavigationStackState<string> | undefined;
+ const snapshots: Array<readonly NavigationStackEntry<string>[]> = [];
+
+ function CaptureState() {
+ state = useNavigationStack<string>();
+ return null;
+ }
+
+ render(() => (
+ <NavigationStack.Root<string>
+ onChange={(entries) => {
+ snapshots.push(entries);
+ }}
+ >
+ <CaptureState />
+ </NavigationStack.Root>
+ ));
+
+ state?.push('Task');
+ state?.push('Document');
+
+ expect(snapshots[0]).not.toBe(snapshots[1]);
+ expect(snapshots[0]?.map(({ data }) => data)).toEqual(['Task']);
+ expect(snapshots[1]?.map(({ data }) => data)).toEqual(['Task', 'Document']);
+ });
+
+ it('only handles navigation accepted by the root', () => {
+ let state: NavigationStackState<string, { blocked?: boolean }> | undefined;
+
+ function CaptureState() {
+ state = useNavigationStack<string, { blocked?: boolean }>();
+ return null;
+ }
+
+ render(() => (
+ <NavigationStack.Root<string, { blocked?: boolean }>
+ shouldNavigate={(_, options) => options?.blocked !== true}
+ >
+ <CaptureState />
+ </NavigationStack.Root>
+ ));
+
+ expect(state?.navigate('Blocked', { blocked: true })).toBe(false);
+ expect(state?.navigate('Handled')).toBe(true);
+ expect(state?.entries.map(({ data }) => data)).toEqual(['Handled']);
+ });
+});
diff --git a/apps/web/src/components/navigation-stack/NavigationStack.tsx b/apps/web/src/components/navigation-stack/NavigationStack.tsx
new file mode 100644
index 0000000000..c02e605ef7
--- /dev/null
+++ b/apps/web/src/components/navigation-stack/NavigationStack.tsx
@@ -0,0 +1,188 @@
+import {
+ createContext,
+ createUniqueId,
+ type JSX,
+ type ParentProps,
+ Show,
+ useContext,
+} from 'solid-js';
+import { createStore, produce, type Store } from 'solid-js/store';
+
+export type NavigationStackEntry<TData> = {
+ value: string;
+ data: TData;
+};
+
+export type NavigationStackState<TData, TNavigateOptions = unknown> = {
+ entries: Store<NavigationStackEntry<TData>[]>;
+ active: () => NavigationStackEntry<TData> | undefined;
+ navigate: (data: TData, options?: TNavigateOptions) => boolean;
+ push: (data: TData) => NavigationStackEntry<TData>;
+ replace: (data: TData) => NavigationStackEntry<TData>;
+ reset: (data: TData) => NavigationStackEntry<TData>;
+ pop: () => void;
+ popTo: (value: string) => void;
+ clear: () => void;
+};
+
+type NavigationStackContextValue = NavigationStackState<unknown, unknown>;
+
+const NavigationStackContext = createContext<NavigationStackContextValue>();
+
+export function useMaybeNavigationStack<
+ TData = unknown,
+ TNavigateOptions = unknown,
+>() {
+ return useContext(NavigationStackContext) as
+ | NavigationStackState<TData, TNavigateOptions>
+ | undefined;
+}
+
+export function useNavigationStack<
+ TData = unknown,
+ TNavigateOptions = unknown,
+>() {
+ const context = useMaybeNavigationStack<TData, TNavigateOptions>();
+ if (!context) {
+ throw new Error('NavigationStack must be inside <NavigationStack.Root>');
+ }
+ return context;
+}
+
+export type NavigationStackRootProps<
+ TData = unknown,
+ TNavigateOptions = unknown,
+> = ParentProps<{
+ defaultValue?: readonly TData[];
+ shouldNavigate?: (data: TData, options?: TNavigateOptions) => boolean;
+ onChange?: (entries: readonly NavigationStackEntry<TData>[]) => void;
+}>;
+
+/** Owns one arbitrary-depth navigation path. */
+function Root<TData = unknown, TNavigateOptions = unknown>(
+ props: NavigationStackRootProps<TData, TNavigateOptions>
+) {
+ const rootId = createUniqueId();
+ let sequence = 0;
+ const createEntry = (data: TData): NavigationStackEntry<TData> => ({
+ value: `${rootId}:${sequence++}`,
+ data,
+ });
+ const [entries, setEntries] = createStore<NavigationStackEntry<TData>[]>(
+ props.defaultValue?.map(createEntry) ?? []
+ );
+ const active = () => entries.at(-1);
+ const notifyChange = () => props.onChange?.([...entries]);
+
+ const push = (data: TData) => {
+ const entry = createEntry(data);
+ setEntries(entries.length, entry);
+ notifyChange();
+ return entry;
+ };
+
+ const navigate = (data: TData, options?: TNavigateOptions) => {
+ if (props.shouldNavigate?.(data, options) === false) return false;
+ push(data);
+ return true;
+ };
+
+ const replace = (data: TData) => {
+ if (entries.length === 0) return push(data);
+
+ const entry = createEntry(data);
+ setEntries(
+ produce((draft) => {
+ draft[draft.length - 1] = entry;
+ })
+ );
+ notifyChange();
+ return entry;
+ };
+
+ const reset = (data: TData) => {
+ const entry = createEntry(data);
+ setEntries(
+ produce((draft) => {
+ draft.splice(0, draft.length, entry);
+ })
+ );
+ notifyChange();
+ return entry;
+ };
+
+ const pop = () => {
+ if (entries.length === 0) return;
+ setEntries(
+ produce((draft) => {
+ draft.pop();
+ })
+ );
+ notifyChange();
+ };
+
+ const popTo = (value: string) => {
+ const index = entries.findIndex((entry) => entry.value === value);
+ if (index < 0 || index === entries.length - 1) return;
+ setEntries(
+ produce((draft) => {
+ draft.splice(index + 1);
+ })
+ );
+ notifyChange();
+ };
+
+ const clear = () => {
+ if (entries.length === 0) return;
+ setEntries(
+ produce((draft) => {
+ draft.splice(0);
+ })
+ );
+ notifyChange();
+ };
+
+ return (
+ <NavigationStackContext.Provider
+ value={{
+ entries: entries as Store<NavigationStackEntry<unknown>[]>,
+ active: active as () => NavigationStackEntry<unknown> | undefined,
+ navigate: navigate as (data: unknown, options?: unknown) => boolean,
+ push: push as (data: unknown) => NavigationStackEntry<unknown>,
+ replace: replace as (data: unknown) => NavigationStackEntry<unknown>,
+ reset: reset as (data: unknown) => NavigationStackEntry<unknown>,
+ pop,
+ popTo,
+ clear,
+ }}
+ >
+ {props.children}
+ </NavigationStackContext.Provider>
+ );
+}
+
+export type NavigationStackOutletProps<TData, TNavigateOptions = unknown> = {
+ children: (
+ entry: NavigationStackEntry<TData>,
+ state: NavigationStackState<TData, TNavigateOptions>
+ ) => JSX.Element;
+ fallback?: JSX.Element;
+};
+
+/** Keyed rendering disposes the previous entry before mounting the next. */
+function Outlet<TData, TNavigateOptions = unknown>(
+ props: NavigationStackOutletProps<TData, TNavigateOptions>
+) {
+ const state = useNavigationStack<TData, TNavigateOptions>();
+
+ return (
+ <Show keyed when={state.active()} fallback={props.fallback}>
+ {(entry) => <>{props.children(entry, state)}</>}
+ </Show>
+ );
+}
+
+export const NavigationStack = Object.assign(Root, {
+ Root,
+ Outlet,
+});
diff --git a/apps/web/src/components/view-shell/ViewBreadcrumbs.tsx b/apps/web/src/components/view-shell/ViewBreadcrumbs.tsx
index f0a236f008..821fcc9240 100644
--- a/apps/web/src/components/view-shell/ViewBreadcrumbs.tsx
+++ b/apps/web/src/components/view-shell/ViewBreadcrumbs.tsx
@@ -5,7 +5,6 @@ import {
children,
createContext,
createMemo,
- createSignal,
For,
type JSX,
onCleanup,
@@ -15,19 +14,23 @@ import {
splitProps,
useContext,
} from 'solid-js';
+import { createStore, produce, type Store } from 'solid-js/store';
-type RegisteredBreadcrumb = {
+export type ViewBreadcrumbsEntry<TMetadata> = {
value: Accessor<string>;
+ metadata: Accessor<TMetadata>;
order: Accessor<number | undefined>;
sequence: number;
render: () => JSX.Element;
};
type ViewBreadcrumbsContextValue = {
- entries: Accessor<RegisteredBreadcrumb[]>;
+ entries: Store<ViewBreadcrumbsEntry<unknown>[]>;
value: Accessor<string>;
onChange: (value: string) => void;
- register: (entry: Omit<RegisteredBreadcrumb, 'sequence'>) => () => void;
+ register: (
+ entry: Omit<ViewBreadcrumbsEntry<unknown>, 'sequence'>
+ ) => () => void;
};
const ViewBreadcrumbsContext = createContext<ViewBreadcrumbsContextValue>();
@@ -47,20 +50,34 @@ export type ViewBreadcrumbsRootProps = ParentProps<{
onChange: (value: string) => void;
}>;
-/** Owns the ordered registration context for one breadcrumb path. */
+/** Owns mounted breadcrumb item registrations. */
function Root(props: ViewBreadcrumbsRootProps) {
- const [entries, setEntries] = createSignal<RegisteredBreadcrumb[]>([]);
+ const [entries, setEntries] = createStore<ViewBreadcrumbsEntry<unknown>[]>(
+ []
+ );
let sequence = 0;
const register: ViewBreadcrumbsContextValue['register'] = (entry) => {
const registered = { ...entry, sequence: sequence++ };
- setEntries((current) => [
- ...current.filter((item) => item.value() !== entry.value()),
- registered,
- ]);
+ setEntries(
+ produce((draft) => {
+ const previous = draft.findIndex(
+ (item) => item.value() === entry.value()
+ );
+ if (previous >= 0) draft.splice(previous, 1);
+ draft.push(registered);
+ })
+ );
return () => {
- setEntries((current) => current.filter((item) => item !== registered));
+ setEntries(
+ produce((draft) => {
+ const index = draft.findIndex(
+ (item) => item.sequence === registered.sequence
+ );
+ if (index >= 0) draft.splice(index, 1);
+ })
+ );
};
};
@@ -130,17 +147,15 @@ function Separator(props: ViewBreadcrumbsSeparatorProps) {
);
}
-export type ViewBreadcrumbsItemProps = {
+export type ViewBreadcrumbsItemProps<TMetadata = unknown> = {
value: string;
+ metadata: TMetadata;
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) {
+/** Registers a breadcrumb item and removes it with its owning component. */
+function Item<TMetadata = unknown>(props: ViewBreadcrumbsItemProps<TMetadata>) {
const context = useViewBreadcrumbsContext();
const state: ViewBreadcrumbsItemState = {
isActive: () => context.value() === props.value,
@@ -155,6 +170,7 @@ function Item(props: ViewBreadcrumbsItemProps) {
onMount(() => {
unregister = context.register({
value: () => props.value,
+ metadata: () => props.metadata,
order: () => props.order,
render: resolvedChildren,
});
@@ -164,20 +180,28 @@ function Item(props: ViewBreadcrumbsItemProps) {
return null;
}
-export type ViewBreadcrumbsOutletProps = JSX.HTMLAttributes<HTMLElement>;
+export type ViewBreadcrumbsOutletProps = Omit<
+ JSX.HTMLAttributes<HTMLElement>,
+ 'children'
+> & {
+ children?: JSX.Element;
+ fallback?: JSX.Element;
+};
-/** Renders all registered items in order with separators between them. */
+/** Renders mounted breadcrumb items in order. */
function Outlet(props: ViewBreadcrumbsOutletProps) {
const context = useViewBreadcrumbsContext();
- const [local, rest] = splitProps(props, ['children', 'class']);
+ const [local, rest] = splitProps(props, ['children', 'class', 'fallback']);
const entries = createMemo(() =>
- [...context.entries()].sort(
+ [...context.entries].sort(
(left, right) =>
(left.order() ?? Number.MAX_SAFE_INTEGER) -
(right.order() ?? Number.MAX_SAFE_INTEGER) ||
left.sequence - right.sequence
)
);
+ const hasActiveItem = () =>
+ entries().some((entry) => entry.value() === context.value());
return (
<nav
@@ -195,6 +219,7 @@ function Outlet(props: ViewBreadcrumbsOutletProps) {
</>
)}
</For>
+ <Show when={!hasActiveItem()}>{local.fallback}</Show>
{local.children}
</nav>
);
diff --git a/apps/web/src/components/view-shell/index.ts b/apps/web/src/components/view-shell/index.ts
index 409a3e66a4..a002ae2773 100644
--- a/apps/web/src/components/view-shell/index.ts
+++ b/apps/web/src/components/view-shell/index.ts
@@ -30,6 +30,7 @@ export {
export {
ViewBreadcrumbs,
type ViewBreadcrumbsButtonProps,
+ type ViewBreadcrumbsEntry,
type ViewBreadcrumbsItemProps,
type ViewBreadcrumbsItemState,
type ViewBreadcrumbsOutletProps,
diff --git a/apps/web/src/features/tasks-view/components/TaskDetail.tsx b/apps/web/src/features/tasks-view/components/TaskDetail.tsx
index c78165a988..82e218154e 100644
--- a/apps/web/src/features/tasks-view/components/TaskDetail.tsx
+++ b/apps/web/src/features/tasks-view/components/TaskDetail.tsx
@@ -1,195 +1,46 @@
-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,
+ type JSX,
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));
- });
+export type TaskDetailContext = {
+ data: TaskDocumentData;
+};
- 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>
- );
-}
+export type TaskDetailProps = {
+ task: TaskDetailTarget;
+ shareOpen: boolean;
+ onShareOpenChange: (open: boolean) => void;
+ children?: (context: TaskDetailContext) => JSX.Element;
+};
-function TaskDetailBodyState(props: {
+export function TaskDetailBodyState(props: {
error?: unknown;
actionLabel?: string;
onAction?: () => void;
@@ -219,11 +70,12 @@ function TaskDetailBodyState(props: {
);
}
-function TaskDetailDocument(props: {
+function TaskDetailContent(props: {
task: TaskDetailTarget;
data: TaskDocumentData;
shareOpen: boolean;
onShareOpenChange: (open: boolean) => void;
+ children?: (context: TaskDetailContext) => JSX.Element;
}) {
const panel = useSplitPanelOrThrow();
const notificationSource = useGlobalNotificationSource();
@@ -243,12 +95,7 @@ function TaskDetailDocument(props: {
onShareOpenChange={props.onShareOpenChange}
>
<OldOverlay />
- <TaskBreadcrumbItem
- documentId={props.task.id}
- fallbackName={fallbackName()}
- ownerId={props.data.metadata.owner}
- projectId={props.data.metadata.projectId ?? undefined}
- />
+ {props.children?.({ data: props.data })}
<SidePanel.Layout headerToggle={false}>
<Show when={ENABLE_MARKDOWN_SIDE_PANEL}>
<MarkdownSidePanelSections />
@@ -275,70 +122,47 @@ function TaskDetailDocument(props: {
);
}
-export function TaskDetail(props: { task: TaskDetailTarget }) {
- const { closeTask } = useTasksView();
+/** Renders one task document without owning view navigation or breadcrumbs. */
+export function TaskDetail(props: TaskDetailProps) {
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>
+ <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}
+ />
+ )}
+ >
+ <TaskDetailContent
+ task={props.task}
+ data={data()}
+ shareOpen={props.shareOpen}
+ onShareOpenChange={props.onShareOpenChange}
+ children={props.children}
+ />
+ </ErrorBoundary>
+ )}
+ </Match>
+ </Switch>
+ </Suspense>
);
}
diff --git a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
new file mode 100644
index 0000000000..fdb87d5624
--- /dev/null
+++ b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
@@ -0,0 +1,361 @@
+import { EntityDetail } from '@app/components/entity-detail/EntityDetail';
+import {
+ EntityDetailNavigationStack,
+ type EntityDetailNavigationStackEntry,
+ type EntityDetailTarget,
+ useEntityDetailNavigationStack,
+} from '@app/components/entity-detail/EntityDetailNavigationStack';
+import { ViewBreadcrumbs } from '@app/components/view-shell';
+import { useBlockEntityCommands } from '@app/features/next-soup/actions';
+import { useMarkdownName } from '@block-md/component/MarkdownNameProvider';
+import { useMarkdownDocumentTools } from '@block-md/component/useMarkdownDocumentTools';
+import { useMarkdownDocument } from '@block-md/context/markdown-document-context';
+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,
+ type EntityIconSelector,
+} from '@core/component/EntityIcon';
+import { Permissions } from '@core/component/SharePermissions';
+import {
+ ShareDialogContext,
+ ShareTrigger,
+} from '@core/component/TopBar/ShareButton';
+import { fileTypeToBlockName } from '@core/constant/allBlocks';
+import { buildEntityData } from '@entity';
+import {
+ createSignal,
+ ErrorBoundary,
+ For,
+ Match,
+ onCleanup,
+ onMount,
+ Show,
+ Switch,
+} from 'solid-js';
+import { TASK_TABS } from '../constants';
+import { useTasksView } from '../tasks-view-context';
+import type { TaskDetailTarget } from '../types';
+import { TaskDetail, TaskDetailBodyState } from './TaskDetail';
+
+const TASK_BREADCRUMB_SKELETON_DELAY_MS = 150;
+type EntityDetailEntry = EntityDetailNavigationStackEntry;
+
+function TaskViewBreadcrumbItem() {
+ const { state } = useTasksView();
+ const tabName = () =>
+ TASK_TABS.find((tab) => tab.id === state.tab)?.label ?? 'Tasks';
+
+ return (
+ <ViewBreadcrumbs.Item
+ value="tasks-view"
+ metadata={{ type: 'tasks' }}
+ order={0}
+ >
+ {(item) => (
+ <ViewBreadcrumbs.Button
+ isActive={item.isActive()}
+ onClick={item.onSelect}
+ >
+ <span class="truncate">{tabName()}</span>
+ </ViewBreadcrumbs.Button>
+ )}
+ </ViewBreadcrumbs.Item>
+ );
+}
+
+function detailBreadcrumbIcon(target: EntityDetailTarget): EntityIconSelector {
+ if (target.type === 'document') {
+ return (target.subType?.type ??
+ target.fileType ??
+ 'unknown') as EntityIconSelector;
+ }
+ if (
+ target.type === 'channel' ||
+ target.type === 'channel_message' ||
+ target.type === 'channel_thread'
+ ) {
+ return 'channel';
+ }
+ return fileTypeToBlockName(target.type, true);
+}
+
+function detailBreadcrumbName(target: EntityDetailTarget) {
+ if (target.fallbackName) return target.fallbackName;
+
+ if (target.type === 'document' && target.subType?.type === 'task') {
+ return 'New Task';
+ }
+ if (
+ target.type === 'channel' ||
+ target.type === 'channel_message' ||
+ target.type === 'channel_thread'
+ ) {
+ return 'Channel';
+ }
+ return 'Untitled';
+}
+
+function DetailBreadcrumbItem(props: {
+ entry: EntityDetailEntry;
+ order: number;
+}) {
+ return (
+ <ViewBreadcrumbs.Item
+ value={props.entry.value}
+ metadata={props.entry.data}
+ order={props.order}
+ >
+ {(item) => (
+ <ViewBreadcrumbs.Button
+ class="gap-1.5"
+ isActive={item.isActive()}
+ onClick={item.onSelect}
+ >
+ <EntityIcon
+ targetType={detailBreadcrumbIcon(props.entry.data)}
+ size="xs"
+ class="shrink-0"
+ />
+ <span class="truncate">{detailBreadcrumbName(props.entry.data)}</span>
+ </ViewBreadcrumbs.Button>
+ )}
+ </ViewBreadcrumbs.Item>
+ );
+}
+
+function TaskDetailAncestorBreadcrumbs() {
+ const navigationStack = useEntityDetailNavigationStack();
+ const ancestors = () => navigationStack.entries.slice(0, -1);
+
+ return (
+ <For each={ancestors()}>
+ {(entry, index) => (
+ <DetailBreadcrumbItem entry={entry} order={index() + 1} />
+ )}
+ </For>
+ );
+}
+
+function TaskBreadcrumbItem(props: {
+ entry: EntityDetailEntry;
+ order: number;
+ task: TaskDetailTarget;
+ 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.task.fallbackName ?? 'New Task';
+ 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.task.id,
+ scopeId: panel.splitHotkeyScope,
+ onDeleted: closeTask,
+ resolveEntity: () =>
+ buildEntityData({
+ id: props.task.id,
+ name: taskName(),
+ blockName: 'task',
+ ownerId: props.ownerId,
+ projectId: props.projectId,
+ }),
+ });
+
+ return (
+ <ViewBreadcrumbs.Item
+ value={props.entry.value}
+ metadata={props.entry.data}
+ order={props.order}
+ >
+ {(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.task.id}
+ 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 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 TaskDetailTopBar(props: {
+ documentId: string;
+ showTaskActions: boolean;
+}) {
+ 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"
+ fallback={<TaskBreadcrumbSkeleton />}
+ />
+ <div class="ml-auto flex shrink-0 items-center gap-2">
+ <Show when={props.showTaskActions}>
+ <ShareTrigger
+ id={props.documentId}
+ blockType="task"
+ hotkeyScope={panel.splitHotkeyScope}
+ />
+ </Show>
+ <SidePanel.Toggle />
+ </div>
+ </div>
+ );
+}
+
+function StackEntityDetail(props: { entry: EntityDetailEntry; order: number }) {
+ return (
+ <>
+ <DetailBreadcrumbItem entry={props.entry} order={props.order} />
+ <EntityDetail target={props.entry.data} />
+ </>
+ );
+}
+
+export function TasksDetailView(props: { task: TaskDetailTarget }) {
+ const { closeTask } = useTasksView();
+ const navigationStack = useEntityDetailNavigationStack();
+ const [shareOpen, setShareOpen] = createSignal(false);
+ const taskEntry = () =>
+ navigationStack.entries.find(
+ (entry) =>
+ entry.data.type === 'document' && entry.data.id === props.task.id
+ );
+ const isTaskActive = () =>
+ navigationStack.active()?.value === taskEntry()?.value;
+
+ return (
+ <ShareDialogContext.Provider
+ value={{
+ isOpen: shareOpen,
+ open: () => setShareOpen(true),
+ close: () => setShareOpen(false),
+ }}
+ >
+ <ViewBreadcrumbs.Root
+ value={navigationStack.active()?.value ?? 'tasks-view'}
+ onChange={(value) => {
+ if (value === 'tasks-view') {
+ closeTask();
+ return;
+ }
+ navigationStack.popTo(value);
+ }}
+ >
+ <TaskViewBreadcrumbItem />
+ <TaskDetailAncestorBreadcrumbs />
+ <SidePanel.Root>
+ <div class="flex size-full min-h-0 min-w-0 flex-col overflow-hidden">
+ <TaskDetailTopBar
+ documentId={props.task.id}
+ showTaskActions={isTaskActive()}
+ />
+ <div class="relative min-h-0 min-w-0 flex-1">
+ <EntityDetailNavigationStack.Outlet>
+ {(entry, state) => (
+ <Switch>
+ <Match when={entry.value === taskEntry()?.value}>
+ <TaskDetail
+ task={props.task}
+ shareOpen={shareOpen()}
+ onShareOpenChange={setShareOpen}
+ >
+ {(context) => (
+ <TaskBreadcrumbItem
+ entry={entry}
+ order={state.entries.length}
+ task={props.task}
+ ownerId={context.data.metadata.owner}
+ projectId={
+ context.data.metadata.projectId ?? undefined
+ }
+ />
+ )}
+ </TaskDetail>
+ </Match>
+ <Match when={true}>
+ <ErrorBoundary
+ fallback={(error, reset) => (
+ <TaskDetailBodyState
+ error={error}
+ actionLabel="Reset"
+ onAction={reset}
+ />
+ )}
+ >
+ <StackEntityDetail
+ entry={entry}
+ order={state.entries.length}
+ />
+ </ErrorBoundary>
+ </Match>
+ </Switch>
+ )}
+ </EntityDetailNavigationStack.Outlet>
+ </div>
+ </div>
+ </SidePanel.Root>
+ </ViewBreadcrumbs.Root>
+ </ShareDialogContext.Provider>
+ );
+}
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 fbf6adf63a..d1f86e9a48 100644
--- a/apps/web/src/features/tasks-view/tasks-view-context.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view-context.tsx
@@ -1,3 +1,7 @@
+import {
+ entityDetailTarget,
+ useEntityDetailNavigationStack,
+} from '@app/components/entity-detail/EntityDetailNavigationStack';
import { setSidebarSectionCollapsed } from '@app/components/view-shell';
import { normalizeFacetSelection } from '@app/features/soup';
import { makePersistedState } from '@app/lib/persistence';
@@ -5,7 +9,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 type { Accessor } from 'solid-js';
import {
createStore,
produce,
@@ -46,11 +50,11 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
TasksViewProviderProps
>('TasksView', (props) => {
const panel = useSplitPanelOrThrow();
+ const navigationStack = useEntityDetailNavigationStack();
const userId = useUserId();
const initial = props.initialState ?? {};
const initialTab = initial.tab ?? 'my-tasks';
- const [selectedTask, setSelectedTask] = createSignal<TaskDetailTarget>();
const [state, setState] = makePersistedState(
createStore<TasksViewState>({
@@ -76,8 +80,36 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
})
);
- const openTask = (task: TaskDetailTarget) => setSelectedTask(task);
- const closeTask = () => setSelectedTask();
+ const selectedTask = (): TaskDetailTarget | undefined => {
+ const taskEntry = navigationStack.entries.find(
+ (entry) =>
+ entry.data.type === 'document' && entry.data.subType?.type === 'task'
+ );
+ if (!taskEntry) return undefined;
+
+ if (
+ taskEntry.data.type !== 'document' ||
+ taskEntry.data.subType?.type !== 'task'
+ ) {
+ return undefined;
+ }
+ return {
+ id: taskEntry.data.id,
+ fallbackName: taskEntry.data.fallbackName,
+ };
+ };
+
+ const openTask = (task: TaskDetailTarget) => {
+ navigationStack.reset(
+ entityDetailTarget.document({
+ id: task.id,
+ fileType: 'md',
+ subType: { type: 'task' },
+ fallbackName: task.fallbackName,
+ })
+ );
+ };
+ const closeTask = navigationStack.clear;
const setTab = (tab: TaskTab) => {
closeTask();
diff --git a/apps/web/src/features/tasks-view/tasks-view.tsx b/apps/web/src/features/tasks-view/tasks-view.tsx
index e5bcd52cbc..afeda9afdb 100644
--- a/apps/web/src/features/tasks-view/tasks-view.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view.tsx
@@ -1,10 +1,11 @@
+import { EntityDetailNavigationStack } from '@app/components/entity-detail/EntityDetailNavigationStack';
import { ViewShell } from '@app/components/view-shell';
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, Match, onMount, Suspense, Switch } from 'solid-js';
-import { TaskDetail } from './components/TaskDetail';
+import { TasksDetailView } from './components/TasksDetailView';
import { TasksHeader, TasksTopBar } from './components/TasksHeader';
import { TasksSidebar } from './components/TasksSidebar';
import { TaskList } from './components/task-list/TaskList';
@@ -46,7 +47,7 @@ function TasksViewRoot() {
<ViewShell.Main>
<Switch>
<Match when={selectedTask()}>
- {(task) => <TaskDetail task={task()} />}
+ {(task) => <TasksDetailView task={task()} />}
</Match>
<Match when={!selectedTask()}>
<TasksTopBar />
@@ -73,8 +74,12 @@ function TasksViewRoot() {
/** Production Tasks view. */
export function TasksView(props: TasksViewProps) {
return (
- <TasksViewProvider initialState={props.initialState}>
- <TasksViewRoot />
- </TasksViewProvider>
+ <EntityDetailNavigationStack.Root
+ shouldNavigate={(_, options) => options?.event?.shiftKey !== true}
+ >
+ <TasksViewProvider initialState={props.initialState}>
+ <TasksViewRoot />
+ </TasksViewProvider>
+ </EntityDetailNavigationStack.Root>
);
}