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.

fix(web): prevent preview claim navigation loop (#6855)

dev-rb462249aee559
diff --git a/apps/web/src/components/app/createPreviewSelectionGuard.test.tsx b/apps/web/src/components/app/createPreviewSelectionGuard.test.tsx
index 56ad7adea4..c361f6d30f 100644
--- a/apps/web/src/components/app/createPreviewSelectionGuard.test.tsx
+++ b/apps/web/src/components/app/createPreviewSelectionGuard.test.tsx
@@ -4,7 +4,13 @@ import {
} from '@app/components/navigation-stack/NavigationStack';
import { toast } from '@core/component/Toast/Toast';
import { render } from '@solidjs/testing-library';
-import { createMemo, createRoot, type ParentProps } from 'solid-js';
+import {
+ createEffect,
+ createMemo,
+ createRoot,
+ createSignal,
+ type ParentProps,
+} from 'solid-js';
import { beforeEach, expect, it, vi } from 'vitest';
import { createPreviewSelectionGuard } from './createPreviewSelectionGuard';
import type { PreviewPanelSelection } from './previewTarget';
@@ -184,6 +190,35 @@ it('blocks breadcrumbs back to content opened elsewhere without changing history
first.unmount();
});
+it('does not subscribe a calling effect to its internal claim', () => {
+ let setSelection!: (selection: PreviewPanelSelection | undefined) => void;
+ let runs = 0;
+
+ function App() {
+ const selectPreview = createPreviewSelectionGuard();
+ const [selection, set] = createSignal<PreviewPanelSelection>();
+ setSelection = set;
+ createEffect(() => {
+ runs += 1;
+ selectPreview(selection());
+ });
+ return null;
+ }
+
+ const view = render(() => (
+ <Layout>
+ <App />
+ </Layout>
+ ));
+ expect(runs).toBe(1);
+
+ const channel = { type: 'channel', id: 'channel' } as const;
+ setSelection(channel);
+ expect(runs).toBe(2);
+ expect(manager.findOpenView(channel)).toBeDefined();
+ view.unmount();
+});
+
it('preflights without claiming the requested selection', () => {
const first = setup();
const second = setup();
diff --git a/apps/web/src/components/app/createPreviewSelectionGuard.ts b/apps/web/src/components/app/createPreviewSelectionGuard.ts
index 84f26e5831..54a455ce07 100644
--- a/apps/web/src/components/app/createPreviewSelectionGuard.ts
+++ b/apps/web/src/components/app/createPreviewSelectionGuard.ts
@@ -1,6 +1,6 @@
import type { NavigationStackChangeReason } from '@app/components/navigation-stack/NavigationStack';
import { toast } from '@core/component/Toast/Toast';
-import { createSignal, onCleanup, useContext } from 'solid-js';
+import { createSignal, onCleanup, untrack, useContext } from 'solid-js';
import {
type PreviewPanelSelection,
previewBlockTarget,
@@ -39,18 +39,19 @@ export function createPreviewSelectionGuard(): PreviewSelectionGuard {
const target = selection && previewBlockTarget(selection);
return target && { type: target.blockType, id: target.blockId };
};
- const canSelect: SelectPreview = (selection, reason = 'navigate') => {
- const next = identity(selection);
- const existing = next && manager.findOpenView(next);
- if (existing && existing.owner !== owner) {
- if (reason === 'navigate') {
- existing.activate?.();
- toast.alert('Content already open');
+ const canSelect: SelectPreview = (selection, reason = 'navigate') =>
+ untrack(() => {
+ const next = identity(selection);
+ const existing = next && manager.findOpenView(next);
+ if (existing && existing.owner !== owner) {
+ if (reason === 'navigate') {
+ existing.activate?.();
+ toast.alert('Content already open');
+ }
+ return false;
}
- return false;
- }
- return true;
- };
+ return true;
+ });
const select: SelectPreview = (selection, reason) => {
if (!canSelect(selection, reason)) return false;
setCurrent(identity(selection));
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 b115d73aa4..8600a83154 100644
--- a/apps/web/src/features/drive-view/drive-detail-navigation.tsx
+++ b/apps/web/src/features/drive-view/drive-detail-navigation.tsx
@@ -18,6 +18,7 @@ import {
createContext,
createEffect,
createMemo,
+ on,
type ParentProps,
useContext,
} from 'solid-js';
@@ -114,9 +115,7 @@ export function DriveDetailNavigationProvider(
const selectPreview = createPreviewSelectionGuard();
const activeTarget = createMemo(() => targetFromParams(params));
- createEffect(() => {
- selectPreview(activeTarget());
- });
+ createEffect(on(activeTarget, (target) => selectPreview(target)));
const entries = createMemo<DriveDetailHistoryEntry[]>(() => {
const snapshot = history();