Ensure viewport mode updates stay in sync so toggling auto-merge no longer blanks the dashboard. - update useViewportMode to initialize safely and react consistently to viewport/media-query changes - add focused hook coverage for initial mode detection and transition behavior - add dashboard/app regression tests to confirm the board remains rendered after auto-merge toggles - add a changeset for @runfusion/fusion patch release Files changed: .changeset/fn-5817-auto-merge-toggle-mobile.md | 5 ++ .../app/components/__tests__/App.test.tsx | 66 ++++++++++++++++++++++ .../__tests__/board-mobile-initial-render.test.tsx | 30 ++++++++++ .../app/hooks/__tests__/useViewportMode.test.ts | 34 +++++++++++ packages/dashboard/app/hooks/useViewportMode.ts | 28 +++++++-- 5 files changed, 159 insertions(+), 4 deletions(-) Fusion-Task-Id: FN-5817 Fusion-Task-Lineage: 2fc044b1-5f37-44de-b70e-c60364a3d69c
220 lines
6.5 KiB
TypeScript
220 lines
6.5 KiB
TypeScript
import React from "react";
|
|
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
|
import { render, cleanup, act } from "@testing-library/react";
|
|
import { Board } from "../Board";
|
|
import { loadAllAppCss } from "../../test/cssFixture";
|
|
|
|
vi.mock("../../api", () => ({
|
|
fetchWorkflowSteps: vi.fn().mockResolvedValue([]),
|
|
}));
|
|
|
|
vi.mock("../../hooks/useBlockerFanout", () => ({
|
|
useBlockerFanout: () => new Map(),
|
|
}));
|
|
|
|
vi.mock("../Column", () => ({
|
|
Column: React.memo(({ column }: { column: string }) => (
|
|
<div data-testid={`column-${column}`} />
|
|
)),
|
|
}));
|
|
|
|
function ensureMatchMedia() {
|
|
if (!window.matchMedia) {
|
|
Object.defineProperty(window, "matchMedia", {
|
|
writable: true,
|
|
value: vi.fn(),
|
|
});
|
|
}
|
|
}
|
|
|
|
function mockViewport(width: number) {
|
|
ensureMatchMedia();
|
|
Object.defineProperty(window, "innerWidth", { value: width, configurable: true });
|
|
return vi.spyOn(window, "matchMedia").mockImplementation((query: string) => ({
|
|
matches: query === "(max-width: 768px)" || query === "(max-width: 768px), (max-height: 480px)" ? width <= 768 : false,
|
|
media: query,
|
|
onchange: null,
|
|
addListener: vi.fn(),
|
|
removeListener: vi.fn(),
|
|
addEventListener: vi.fn(),
|
|
removeEventListener: vi.fn(),
|
|
dispatchEvent: vi.fn(),
|
|
}));
|
|
}
|
|
|
|
function extractMobileMediaBlocks(content: string): string {
|
|
const blocks: string[] = [];
|
|
const regex = /@media[^{]*\(max-width: 768px\)[^{]*\{/g;
|
|
let match;
|
|
|
|
while ((match = regex.exec(content)) !== null) {
|
|
const startIdx = match.index + match[0].length;
|
|
let braceCount = 1;
|
|
let endIdx = startIdx;
|
|
while (braceCount > 0 && endIdx < content.length) {
|
|
if (content[endIdx] === "{") braceCount++;
|
|
if (content[endIdx] === "}") braceCount--;
|
|
endIdx++;
|
|
}
|
|
if (braceCount === 0) blocks.push(content.slice(startIdx, endIdx - 1));
|
|
}
|
|
|
|
return blocks.join("\n");
|
|
}
|
|
|
|
const boardProps = {
|
|
tasks: [],
|
|
maxConcurrent: 2,
|
|
onMoveTask: vi.fn(async () => ({} as any)),
|
|
onOpenDetail: vi.fn(),
|
|
addToast: vi.fn(),
|
|
onQuickCreate: vi.fn(async () => ({} as any)),
|
|
onNewTask: vi.fn(),
|
|
autoMerge: true,
|
|
onToggleAutoMerge: vi.fn(),
|
|
globalPaused: false,
|
|
};
|
|
|
|
describe("Board mobile initial render stabilization (FN-4574)", () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
vi.useFakeTimers();
|
|
});
|
|
|
|
afterEach(() => {
|
|
cleanup();
|
|
vi.useRealTimers();
|
|
vi.unstubAllGlobals();
|
|
});
|
|
|
|
it("normalizes scrollLeft to 0 on initial mobile render and keeps snap style in CSS, not inline", () => {
|
|
const viewportSpy = mockViewport(375);
|
|
const raf = vi.fn<(cb: FrameRequestCallback) => number>((cb) => {
|
|
setTimeout(() => cb(0), 0);
|
|
return 1;
|
|
});
|
|
vi.stubGlobal("requestAnimationFrame", raf);
|
|
vi.stubGlobal("cancelAnimationFrame", vi.fn());
|
|
|
|
render(<Board {...boardProps} />);
|
|
|
|
const board = document.querySelector("main.board") as HTMLElement;
|
|
expect(board).not.toBeNull();
|
|
board.scrollLeft = 500;
|
|
|
|
act(() => {
|
|
vi.runAllTimers();
|
|
});
|
|
expect(board.scrollLeft).toBe(0);
|
|
expect(raf).toHaveBeenCalled();
|
|
expect(board.style.scrollSnapType).toBe("");
|
|
|
|
viewportSpy.mockRestore();
|
|
});
|
|
|
|
it("re-anchors on pageshow persisted restore for mobile", () => {
|
|
const viewportSpy = mockViewport(375);
|
|
vi.stubGlobal("requestAnimationFrame", (cb: FrameRequestCallback) => {
|
|
setTimeout(() => cb(0), 0);
|
|
return 1;
|
|
});
|
|
vi.stubGlobal("cancelAnimationFrame", vi.fn());
|
|
|
|
render(<Board {...boardProps} />);
|
|
|
|
const board = document.querySelector("main.board") as HTMLElement;
|
|
act(() => {
|
|
vi.runAllTimers();
|
|
});
|
|
expect(board.scrollLeft).toBe(0);
|
|
|
|
board.scrollLeft = 500;
|
|
const pageShow = new Event("pageshow") as PageTransitionEvent;
|
|
Object.defineProperty(pageShow, "persisted", { configurable: true, value: true });
|
|
window.dispatchEvent(pageShow);
|
|
|
|
act(() => {
|
|
vi.runAllTimers();
|
|
});
|
|
expect(board.scrollLeft).toBe(0);
|
|
|
|
viewportSpy.mockRestore();
|
|
});
|
|
|
|
it("does not throw when visualViewport resize listener lacks removeEventListener (Android seam)", () => {
|
|
const viewportSpy = mockViewport(375);
|
|
const visualViewportResizeListeners: Array<() => void> = [];
|
|
|
|
vi.stubGlobal("requestAnimationFrame", (cb: FrameRequestCallback) => {
|
|
setTimeout(() => cb(0), 0);
|
|
return 1;
|
|
});
|
|
vi.stubGlobal("cancelAnimationFrame", vi.fn());
|
|
Object.defineProperty(window, "visualViewport", {
|
|
configurable: true,
|
|
value: {
|
|
scale: 1,
|
|
addEventListener: (_event: string, listener: () => void) => {
|
|
visualViewportResizeListeners.push(listener);
|
|
},
|
|
},
|
|
});
|
|
|
|
render(<Board {...boardProps} />);
|
|
|
|
expect(visualViewportResizeListeners).toHaveLength(1);
|
|
|
|
expect(() => {
|
|
visualViewportResizeListeners[0]();
|
|
}).not.toThrow();
|
|
|
|
viewportSpy.mockRestore();
|
|
});
|
|
|
|
it("is a desktop no-op and does not force pageshow re-anchor", () => {
|
|
const viewportSpy = mockViewport(1280);
|
|
const addEventListenerSpy = vi.spyOn(window, "addEventListener");
|
|
|
|
render(<Board {...boardProps} />);
|
|
const board = document.querySelector("main.board") as HTMLElement;
|
|
board.scrollLeft = 500;
|
|
|
|
const pageShow = new Event("pageshow") as PageTransitionEvent;
|
|
Object.defineProperty(pageShow, "persisted", { configurable: true, value: true });
|
|
window.dispatchEvent(pageShow);
|
|
|
|
act(() => {
|
|
vi.runAllTimers();
|
|
});
|
|
expect(board.scrollLeft).toBe(500);
|
|
expect(addEventListenerSpy).not.toHaveBeenCalledWith("pageshow", expect.any(Function));
|
|
|
|
viewportSpy.mockRestore();
|
|
});
|
|
|
|
it("preserves FN-001 mobile board invariants and avoids button-rule mutations in .board mobile block", () => {
|
|
const cssContent = loadAllAppCss();
|
|
const mobileCss = extractMobileMediaBlocks(cssContent);
|
|
const boardBlock = mobileCss.match(/\.board\s*\{[^}]*\}/)?.[0] ?? "";
|
|
|
|
expect(boardBlock).toContain("scroll-snap-type: x proximity");
|
|
expect(boardBlock).toContain("overflow-anchor: none");
|
|
expect(boardBlock).not.toContain("scroll-snap-type: x mandatory");
|
|
|
|
const forbiddenBoardSelectors = [
|
|
/\.board[^\{]*\.btn\s*\{/,
|
|
/\.board[^\{]*\.btn-icon\s*\{/,
|
|
/\.board[^\{]*\.modal-close\s*\{/,
|
|
/\.board[^\{]*\.card-[^\s\{]*\s*\{/,
|
|
/\.board[^\{]*\.btn[^\{]*min-height\s*:/,
|
|
/\.board[^\{]*\.btn-icon[^\{]*min-height\s*:/,
|
|
/\.board[^\{]*\.modal-close[^\{]*min-height\s*:/,
|
|
/\.board[^\{]*\.card-[^\{]*min-height\s*:/,
|
|
];
|
|
|
|
for (const forbiddenSelector of forbiddenBoardSelectors) {
|
|
expect(mobileCss).not.toMatch(forbiddenSelector);
|
|
}
|
|
});
|
|
});
|