fix(RouterProvider): 将 goBack 重命名为 goHome,修复跨窗同步 merge 不一致
API 命名与实际行为(返回 dashboard)对齐;storage.onChanged 同步 visiblePages/pageOrder 时应用 mergeWithDefaults,与初始化逻辑保持一致。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -41,7 +41,7 @@ React.StrictMode
|
||||
导出:
|
||||
|
||||
- `RouterProvider` 组件
|
||||
- `useRouter()` Hook — 获取 `currentPage`、`visiblePages`、`pageOrder`、`navigateTo`、`goBack` 等
|
||||
- `useRouter()` Hook — 获取 `currentPage`、`visiblePages`、`pageOrder`、`navigateTo`、`goHome` 等
|
||||
|
||||
## ThemeModeProvider.tsx
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ interface RouterContextType {
|
||||
recentlyUsedTools: PageType[];
|
||||
isLoaded: boolean;
|
||||
navigateTo: (page: PageType) => void;
|
||||
goBack: () => void;
|
||||
goHome: () => void;
|
||||
setVisiblePages: (pages: PageType[]) => void;
|
||||
setPageOrder: (pages: PageType[]) => void;
|
||||
}
|
||||
@@ -274,13 +274,13 @@ export function RouterProvider({
|
||||
if (changes[visiblePagesKey as string]) {
|
||||
const newPages = changes[visiblePagesKey as string].newValue;
|
||||
if (isValidPageList(newPages)) {
|
||||
setVisiblePages(newPages);
|
||||
setVisiblePages(mergeWithDefaults(newPages, getDefaultVisibleFeatureKeys()));
|
||||
}
|
||||
}
|
||||
if (changes[pageOrderKey as string]) {
|
||||
const newOrder = changes[pageOrderKey as string].newValue;
|
||||
if (isValidPageList(newOrder)) {
|
||||
setPageOrder(newOrder);
|
||||
setPageOrder(mergeWithDefaults(newOrder, getDefaultPageOrder()));
|
||||
}
|
||||
}
|
||||
if (changes['app/recentlyUsedTools']) {
|
||||
@@ -316,7 +316,7 @@ export function RouterProvider({
|
||||
});
|
||||
};
|
||||
|
||||
const goBack = () => {
|
||||
const goHome = () => {
|
||||
setCurrentPage('dashboard');
|
||||
};
|
||||
|
||||
@@ -329,7 +329,7 @@ export function RouterProvider({
|
||||
recentlyUsedTools,
|
||||
isLoaded,
|
||||
navigateTo,
|
||||
goBack,
|
||||
goHome,
|
||||
setVisiblePages,
|
||||
setPageOrder,
|
||||
}}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
|
||||
import { browser } from 'wxt/browser';
|
||||
import { RouterProvider, useRouter } from '@/providers/RouterProvider';
|
||||
import { storageUtil } from '@/utils/chromeStorage';
|
||||
|
||||
@@ -224,6 +225,58 @@ describe('RouterProvider', () => {
|
||||
expect(pageOrder).toBeDefined();
|
||||
});
|
||||
|
||||
it('storage.onChanged 同步 visiblePages 时应合并缺失的新功能', async () => {
|
||||
(storageUtil.get as any).mockImplementation((_key: string, defaultValue: unknown) =>
|
||||
Promise.resolve(defaultValue),
|
||||
);
|
||||
|
||||
render(
|
||||
<RouterProvider visiblePagesKey="app/popupVisiblePages" pageOrderKey="app/popupPageOrder">
|
||||
<TestComponent />
|
||||
</RouterProvider>,
|
||||
);
|
||||
|
||||
await waitFor(() => {
|
||||
expect(browser.storage.onChanged.addListener).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
const storageChangeHandler = vi.mocked(browser.storage.onChanged.addListener).mock
|
||||
.calls[0][0] as (changes: Record<string, { newValue?: unknown }>) => void;
|
||||
|
||||
const oldVisiblePages = [
|
||||
'dashboard',
|
||||
'timestamp',
|
||||
'storageCleaner',
|
||||
'qrCode',
|
||||
'textStatistics',
|
||||
'jwt',
|
||||
'jsonDiff',
|
||||
];
|
||||
const oldPageOrder = [
|
||||
'timestamp',
|
||||
'storageCleaner',
|
||||
'qrCode',
|
||||
'textStatistics',
|
||||
'jwt',
|
||||
'jsonDiff',
|
||||
];
|
||||
|
||||
await act(async () => {
|
||||
storageChangeHandler({
|
||||
'app/popupVisiblePages': { newValue: oldVisiblePages },
|
||||
'app/popupPageOrder': { newValue: oldPageOrder },
|
||||
});
|
||||
});
|
||||
|
||||
await waitFor(() => {
|
||||
const visiblePages = screen.getByTestId('visible-pages').textContent!;
|
||||
const pageOrder = screen.getByTestId('page-order').textContent!;
|
||||
|
||||
expect(visiblePages.startsWith('dashboard,timestamp')).toBe(true);
|
||||
expect(pageOrder.startsWith('timestamp,storageCleaner')).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
it('组件卸载时不应设置 isLoaded 状态(竞态条件防护)', async () => {
|
||||
let resolveStorage: (value: unknown) => void;
|
||||
const storagePromise = new Promise((resolve) => {
|
||||
|
||||
Reference in New Issue
Block a user