Skip to content

armgit / macro

Public Imported from GitHub
0

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

refactor(web): remove unused entity detail navigation stack (#7001)

dev-rbcfd7b4f7fc80
diff --git a/apps/web/src/components/entity-detail/EntityDetail.tsx b/apps/web/src/components/entity-detail/EntityDetail.tsx
index 353ffae860..0befc7d3c7 100644
--- a/apps/web/src/components/entity-detail/EntityDetail.tsx
+++ b/apps/web/src/components/entity-detail/EntityDetail.tsx
@@ -48,7 +48,7 @@ import {
Switch,
untrack,
} from 'solid-js';
-import type { EntityDetailTarget } from './EntityDetailNavigationStack';
+import type { EntityDetailTarget } from './entity-detail-target';
type DocumentDetailContext =
| MarkdownDetailContext
diff --git a/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsx b/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsx
index 879333117a..30bb08b432 100644
--- a/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsx
+++ b/apps/web/src/components/entity-detail/EntityDetailBreadcrumbItem.tsx
@@ -8,9 +8,9 @@ import { useItemRawName } from '@queries/preview';
import type { ItemEntity } from '@queries/preview/types';
import { Show } from 'solid-js';
import type {
- EntityDetailNavigationStackEntry,
+ EntityDetailNavigationEntry,
EntityDetailTarget,
-} from './EntityDetailNavigationStack';
+} from './entity-detail-target';
function breadcrumbIcon(target: EntityDetailTarget): EntityIconSelector {
if (target.type === 'document') {
@@ -45,7 +45,7 @@ function fallbackBreadcrumbName(target: EntityDetailTarget) {
}
function BreadcrumbItem(props: {
- entry: EntityDetailNavigationStackEntry;
+ entry: EntityDetailNavigationEntry;
order: number;
name: string;
}) {
@@ -75,7 +75,7 @@ function BreadcrumbItem(props: {
}
function LiveBreadcrumbItem(props: {
- entry: EntityDetailNavigationStackEntry;
+ entry: EntityDetailNavigationEntry;
order: number;
previewItem: ItemEntity;
}) {
@@ -93,7 +93,7 @@ function LiveBreadcrumbItem(props: {
}
export function EntityDetailBreadcrumbItem(props: {
- entry: EntityDetailNavigationStackEntry;
+ entry: EntityDetailNavigationEntry;
order: number;
}) {
return (
diff --git a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.test.tsx b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.test.tsx
deleted file mode 100644
index df92b1f79d..0000000000
--- a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.test.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { cleanup, render } from '@solidjs/testing-library';
-import { afterEach, beforeEach, expect, it, vi } from 'vitest';
-import {
- EntityDetailNavigationStack,
- type EntityDetailNavigationStackRootProps,
- type EntityDetailTarget,
- useEntityDetailNavigationStack,
-} from './EntityDetailNavigationStack';
-
-const touch = vi.hoisted(() => ({ value: false }));
-vi.mock('@core/mobile/isTouchDevice', () => ({
- isTouchDevice: () => touch.value,
-}));
-vi.mock('@components/app/createPreviewSelectionGuard', () => ({
- createPreviewSelectionGuard: () => () => true,
-}));
-
-const target: EntityDetailTarget = { type: 'email', id: 'thread' };
-const click = (init: MouseEventInit) => ({
- event: new MouseEvent('click', init),
-});
-
-function mount(props: EntityDetailNavigationStackRootProps = {}) {
- let stack!: ReturnType<typeof useEntityDetailNavigationStack>;
- function Capture() {
- stack = useEntityDetailNavigationStack();
- return null;
- }
- const view = render(() => (
- <EntityDetailNavigationStack.Root {...props}>
- <Capture />
- </EntityDetailNavigationStack.Root>
- ));
- return { stack, ...view };
-}
-
-beforeEach(() => {
- touch.value = false;
-});
-afterEach(cleanup);
-
-it('opens inline for plain activation and defers modifier clicks to a split', () => {
- const { stack } = mount();
-
- expect(stack.shouldNavigate(target)).toBe(true);
- expect(stack.shouldNavigate(target, click({}))).toBe(true);
- expect(stack.shouldNavigate(target, click({ shiftKey: true }))).toBe(false);
- expect(stack.shouldNavigate(target, click({ metaKey: true }))).toBe(false);
- expect(stack.shouldNavigate(target, click({ ctrlKey: true }))).toBe(false);
- expect(stack.navigate(target, click({ altKey: true }))).toBe(false);
- expect(stack.entries).toHaveLength(0);
-});
-
-it('never opens inline on touch layouts', () => {
- touch.value = true;
- const { stack } = mount();
-
- expect(stack.shouldNavigate(target)).toBe(false);
- expect(stack.navigate(target)).toBe(false);
- expect(stack.entries).toHaveLength(0);
-});
-
-it('lets a view replace the default policy', () => {
- touch.value = true;
- const { stack } = mount({ shouldNavigate: () => true });
-
- expect(stack.shouldNavigate(target, click({ shiftKey: true }))).toBe(true);
- expect(stack.navigate(target)).toBe(true);
- expect(stack.entries).toHaveLength(1);
-});
diff --git a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx
deleted file mode 100644
index c80cf90089..0000000000
--- a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import {
- NavigationStack,
- type NavigationStackEntry,
- type NavigationStackOutletProps,
- type NavigationStackRootProps,
- useMaybeNavigationStack,
- useNavigationStack,
-} from '@app/components/navigation-stack/NavigationStack';
-import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';
-import type { PreviewPanelSelection } from '@components/app/previewTarget';
-import { isTouchDevice } from '@core/mobile/isTouchDevice';
-
-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
->;
-
-/**
- * Inline detail is a desktop affordance. Touch layouts open every entity in
- * the split, and a modifier click asks for a split explicitly. A view passes
- * `shouldNavigate` to replace this policy.
- */
-function opensInline(options?: EntityDetailNavigationOptions) {
- const event = options?.event;
- return (
- !isTouchDevice() &&
- !(event?.shiftKey || event?.metaKey || event?.ctrlKey || event?.altKey)
- );
-}
-
-function Root(props: EntityDetailNavigationStackRootProps) {
- const selectPreview = createPreviewSelectionGuard();
- return (
- <NavigationStack.Root<EntityDetailTarget, EntityDetailNavigationOptions>
- {...props}
- beforeChange={(target, reason) =>
- props.beforeChange?.(target, reason) !== false &&
- selectPreview(target, reason)
- }
- shouldNavigate={(target, options) =>
- props.shouldNavigate
- ? props.shouldNavigate(target, options)
- : opensInline(options)
- }
- />
- );
-}
-
-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/entity-detail/entity-detail-target.ts b/apps/web/src/components/entity-detail/entity-detail-target.ts
new file mode 100644
index 0000000000..46f28358ce
--- /dev/null
+++ b/apps/web/src/components/entity-detail/entity-detail-target.ts
@@ -0,0 +1,71 @@
+import type { PreviewPanelSelection } from '@components/app/previewTarget';
+
+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 EntityDetailNavigationEntry = {
+ value: string;
+ data: EntityDetailTarget;
+};
diff --git a/apps/web/src/features/drive-view/components/DriveDetailView.tsx b/apps/web/src/features/drive-view/components/DriveDetailView.tsx
index 21eee54fbf..144a481c5a 100644
--- a/apps/web/src/features/drive-view/components/DriveDetailView.tsx
+++ b/apps/web/src/features/drive-view/components/DriveDetailView.tsx
@@ -5,10 +5,10 @@ import {
import { EntityDetailBreadcrumbItem } from '@app/components/entity-detail/EntityDetailBreadcrumbItem';
import { EntityDetailBreadcrumbSkeleton } from '@app/components/entity-detail/EntityDetailBreadcrumbSkeleton';
import {
- type EntityDetailNavigationStackEntry,
+ type EntityDetailNavigationEntry,
type EntityDetailTarget,
entityDetailTarget,
-} from '@app/components/entity-detail/EntityDetailNavigationStack';
+} from '@app/components/entity-detail/entity-detail-target';
import { ViewBreadcrumbs, ViewShell } from '@app/components/view-shell';
import { MarkdownDetailBreadcrumbItem } from '@block-md/component/MarkdownDetailBreadcrumbItem';
import type { MarkdownDocumentKind } from '@block-md/types';
@@ -96,7 +96,7 @@ function DriveDetailTopBar() {
}
function StackEntityDetail(props: {
- entry: EntityDetailNavigationStackEntry;
+ entry: EntityDetailNavigationEntry;
order: number;
shareOpen: boolean;
onShareOpenChange: (open: boolean) => void;
diff --git a/apps/web/src/features/drive-view/drive-detail-navigation.tsx b/apps/web/src/features/drive-view/drive-detail-navigation.tsx
index c5e1d1373f..265b2507e8 100644
--- a/apps/web/src/features/drive-view/drive-detail-navigation.tsx
+++ b/apps/web/src/features/drive-view/drive-detail-navigation.tsx
@@ -1,9 +1,9 @@
import { entityDetailBlockType } from '@app/components/entity-detail/EntityDetail';
import type {
+ EntityDetailNavigationEntry,
EntityDetailNavigationOptions,
- EntityDetailNavigationStackEntry,
EntityDetailTarget,
-} from '@app/components/entity-detail/EntityDetailNavigationStack';
+} from '@app/components/entity-detail/entity-detail-target';
import { useNavigate, useParams, useRouteState } from '@app/split-router';
import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
@@ -37,8 +37,8 @@ type DriveDetailRootOptions = EntityDetailNavigationOptions & {
};
type DriveDetailNavigation = {
- entries: Accessor<readonly EntityDetailNavigationStackEntry[]>;
- active: Accessor<EntityDetailNavigationStackEntry | undefined>;
+ entries: Accessor<readonly EntityDetailNavigationEntry[]>;
+ active: Accessor<EntityDetailNavigationEntry | undefined>;
navigate: (
target: EntityDetailTarget,
options?: EntityDetailNavigationOptions
@@ -93,7 +93,7 @@ export function DriveDetailNavigationProvider(
return [target];
};
- const entries = createMemo<EntityDetailNavigationStackEntry[]>(() =>
+ const entries = createMemo<EntityDetailNavigationEntry[]>(() =>
trail().map((target, index) => ({
value: `drive-detail:${index}:${documentRouteFromTarget(target).type}:${target.id}`,
data: target,
diff --git a/apps/web/src/features/drive-view/drive-host-actions.ts b/apps/web/src/features/drive-view/drive-host-actions.ts
index 5fa7934364..13a608a2da 100644
--- a/apps/web/src/features/drive-view/drive-host-actions.ts
+++ b/apps/web/src/features/drive-view/drive-host-actions.ts
@@ -1,4 +1,4 @@
-import { entityDetailTarget } from '@app/components/entity-detail/EntityDetailNavigationStack';
+import { entityDetailTarget } from '@app/components/entity-detail/entity-detail-target';
import { makeShareAction } from '@app/features/next-soup/actions';
import {
markReminderSeenOnOpen,
diff --git a/apps/web/src/features/email-view/email-view-context.tsx b/apps/web/src/features/email-view/email-view-context.tsx
index 9d0cad64ab..6b137b2e29 100644
--- a/apps/web/src/features/email-view/email-view-context.tsx
+++ b/apps/web/src/features/email-view/email-view-context.tsx
@@ -1,4 +1,4 @@
-import type { EntityDetailNavigationOptions } from '@app/components/entity-detail/EntityDetailNavigationStack';
+import type { EntityDetailNavigationOptions } from '@app/components/entity-detail/entity-detail-target';
import {
createListController,
type ListActivation,
diff --git a/apps/web/src/features/inbox-view/components/InboxEntityDetailRouteView.tsx b/apps/web/src/features/inbox-view/components/InboxEntityDetailRouteView.tsx
index 9e837bbe0b..66588c005b 100644
--- a/apps/web/src/features/inbox-view/components/InboxEntityDetailRouteView.tsx
+++ b/apps/web/src/features/inbox-view/components/InboxEntityDetailRouteView.tsx
@@ -1,5 +1,5 @@
import { EntityDetail } from '@app/components/entity-detail/EntityDetail';
-import type { EntityDetailTarget } from '@app/components/entity-detail/EntityDetailNavigationStack';
+import type { EntityDetailTarget } from '@app/components/entity-detail/entity-detail-target';
import { ViewBreadcrumbs, ViewShell } from '@app/components/view-shell';
import { useParams } from '@app/lib/split-router';
import { URL_PARAMS as CHANNEL_URL_PARAMS } from '@block-channel/constants';
diff --git a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
index 7dca6671e7..1fe70f8c6d 100644
--- a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
@@ -1,5 +1,5 @@
import { EntityDetailBreadcrumbSkeleton } from '@app/components/entity-detail/EntityDetailBreadcrumbSkeleton';
-import type { EntityDetailTarget } from '@app/components/entity-detail/EntityDetailNavigationStack';
+import type { EntityDetailTarget } from '@app/components/entity-detail/entity-detail-target';
import { useListNavigationHotkeys } from '@app/components/entity-detail/use-list-navigation-hotkeys';
import { useListDetailNavigation } from '@app/components/list';
import { ViewBreadcrumbs, ViewShell } from '@app/components/view-shell';
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 c6ff0004e5..e7750f065c 100644
--- a/apps/web/src/features/tasks-view/tasks-view-context.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view-context.tsx
@@ -1,4 +1,4 @@
-import type { EntityDetailNavigationOptions } from '@app/components/entity-detail/EntityDetailNavigationStack';
+import type { EntityDetailNavigationOptions } from '@app/components/entity-detail/entity-detail-target';
import {
createListController,
type ListActivation,