Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-25 02:13:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: bump blocksuite (#5953)

Browse Source
This commit is contained in:
regischen
2024-02-29 14:33:50 +08:00
committed by GitHub
parent fa534869e1
commit d1e6b23e1a
121 changed files with 665 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/affine-cloud/e2e/collaboration.spec.ts
View File

@@ -89,7 +89,7 @@ test('share page with default edgeless', async ({ page, browser }) => {
await page.keyboard.press('Enter', { delay: 50 });
await page.keyboard.type('TEST CONTENT', { delay: 50 });
await clickEdgelessModeButton(page);
await expect(page.locator('affine-edgeless-page')).toBeVisible({
await expect(page.locator('affine-edgeless-root')).toBeVisible({
timeout: 1000,
});
await page.getByTestId('cloud-share-menu-button').click();
@@ -106,7 +106,7 @@ test('share page with default edgeless', async ({ page, browser }) => {
const page2 = await context.newPage();
await page2.goto(url);
await waitForEditorLoad(page2);
await expect(page.locator('affine-edgeless-page')).toBeVisible({
await expect(page.locator('affine-edgeless-root')).toBeVisible({
timeout: 1000,
});
expect(await page2.textContent('affine-paragraph')).toContain(

6
tests/affine-cloud/e2e/migration.spec.ts
View File

@@ -104,10 +104,4 @@ test.skip('migration', async ({ page, browser }) => {
await page.waitForTimeout(5000);
await page.reload();
await waitForEditorLoad(page);
// click edgeless switch button is flaky in e2e
// await clickEdgelessModeButton(page);
// await expect(page.locator('affine-edgeless-page')).toBeVisible({
// timeout: 1000,
// });
});

2
tests/affine-local/e2e/all-page.spec.ts
View File

@@ -66,7 +66,7 @@ test('all page can create new edgeless page', async ({ page }) => {
await waitForEditorLoad(page);
await clickSideBarAllPageButton(page);
await clickNewEdgelessDropdown();
await expect(page.locator('affine-edgeless-page')).toBeVisible();
await expect(page.locator('affine-edgeless-root')).toBeVisible();
});
test('allow creation of filters by favorite', async ({ page }) => {

4
tests/affine-local/e2e/change-page-mode.spec.ts
View File

@@ -32,7 +32,7 @@ test('Switch to edgeless by switch edgeless item', async ({ page }) => {
const count = await getCount();
expect(count).toBe(1);
}
const edgeless = page.locator('affine-edgeless-page');
const edgeless = page.locator('affine-edgeless-root');
await expect(edgeless).toBeVisible();
const editorWrapperPadding = await page
@@ -62,7 +62,7 @@ test('Convert to edgeless by editor header items', async ({ page }) => {
await clickPageMoreActions(page);
const menusEdgelessItem = page.getByTestId('editor-option-menu-edgeless');
await menusEdgelessItem.click({ delay: 100 });
const edgeless = page.locator('affine-edgeless-page');
const edgeless = page.locator('affine-edgeless-root');
await expect(edgeless).toBeVisible();
});

4
tests/affine-local/e2e/quick-search.spec.ts
View File

@@ -44,7 +44,7 @@ const commandsIsVisible = async (page: Page, label: string) => {
};
async function assertTitle(page: Page, text: string) {
const edgeless = page.locator('affine-edgeless-page');
const edgeless = page.locator('affine-edgeless-root');
if (!edgeless) {
const locator = getBlockSuiteEditorTitle(page);
const actual = await locator.inputValue();
@@ -97,7 +97,7 @@ async function assertResultList(page: Page, texts: string[]) {
}
async function titleIsFocused(page: Page) {
const edgeless = page.locator('affine-edgeless-page');
const edgeless = page.locator('affine-edgeless-root');
if (!edgeless) {
const title = getBlockSuiteEditorTitle(page);
await expect(title).toBeVisible();

4
tests/affine-migration/e2e/basic.spec.ts
View File

@@ -85,7 +85,7 @@ test('v3 to v4, surface migration', async ({ page }) => {
// check edgeless mode is correct
await clickEdgelessModeButton(page);
await expect(page.locator('.edgeless-toolbar-container')).toBeVisible();
await expect(page.locator('affine-edgeless-page')).toBeVisible();
await expect(page.locator('affine-edgeless-root')).toBeVisible();
});
test('v0 to v4, subdoc migration', async ({ page }) => {
@@ -112,5 +112,5 @@ test('v0 to v4, subdoc migration', async ({ page }) => {
// check edgeless mode is correct
await clickEdgelessModeButton(page);
await expect(page.locator('.edgeless-toolbar-container')).toBeVisible();
await expect(page.locator('affine-edgeless-page')).toBeVisible();
await expect(page.locator('affine-edgeless-root')).toBeVisible();
});

14
tests/storybook/package.json
View File

@@ -22,14 +22,14 @@
"storybook-addon-react-router-v6": "^2.0.10"
},
"devDependencies": {
"@blocksuite/block-std": "0.12.0-canary-202402220729-0868ac6",
"@blocksuite/blocks": "0.12.0-canary-202402220729-0868ac6",
"@blocksuite/global": "0.12.0-canary-202402220729-0868ac6",
"@blocksuite/block-std": "0.12.0-canary-202402271448-6d3a709",
"@blocksuite/blocks": "0.12.0-canary-202402271448-6d3a709",
"@blocksuite/global": "0.12.0-canary-202402271448-6d3a709",
"@blocksuite/icons": "2.1.44",
"@blocksuite/inline": "0.12.0-canary-202402220729-0868ac6",
"@blocksuite/lit": "0.12.0-canary-202402220729-0868ac6",
"@blocksuite/presets": "0.12.0-canary-202402220729-0868ac6",
"@blocksuite/store": "0.12.0-canary-202402220729-0868ac6",
"@blocksuite/inline": "0.12.0-canary-202402271448-6d3a709",
"@blocksuite/lit": "0.12.0-canary-202402271448-6d3a709",
"@blocksuite/presets": "0.12.0-canary-202402271448-6d3a709",
"@blocksuite/store": "0.12.0-canary-202402271448-6d3a709",
"@storybook/addon-actions": "^7.6.17",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",

2
tests/storybook/src/stories/blocksuite-editor.stories.tsx
View File

@@ -13,7 +13,7 @@ async function createAndInitPage(
title: string,
preview: string
) {
const page = workspace.createPage();
const page = workspace.createDoc();
initEmptyPage(page, title);
page.getBlockByFlavour('affine:paragraph').at(0)?.text?.insert(preview, 0);
return page;

12
tests/storybook/src/stories/image-preview-modal.stories.tsx
View File

@@ -1,7 +1,7 @@
import { BlockSuiteEditor } from '@affine/core/components/blocksuite/block-suite-editor';
import { ImagePreviewModal } from '@affine/core/components/image-preview';
import type { Meta } from '@storybook/react';
import type { Page } from '@toeverything/infra';
import type { Doc } from '@toeverything/infra';
import {
PageManager,
ServiceProviderContext,
@@ -21,13 +21,13 @@ export const Default = () => {
const workspace = useService(Workspace);
const pageManager = useService(PageManager);
const [page, setPage] = useState<Page | null>(null);
const [page, setPage] = useState<Doc | null>(null);
useEffect(() => {
const bsPage = workspace.blockSuiteWorkspace.createPage('page0');
const bsPage = workspace.blockSuiteWorkspace.createDoc('page0');
initEmptyPage(bsPage);
const { page, release } = pageManager.open(bsPage.meta.id);
const { page, release } = pageManager.open(bsPage.meta!.id);
fetch(new URL('@affine-test/fixtures/large-image.png', import.meta.url))
.then(res => res.arrayBuffer())
@@ -76,11 +76,11 @@ export const Default = () => {
overflow: 'auto',
}}
>
<BlockSuiteEditor mode="page" page={page.blockSuitePage} />
<BlockSuiteEditor mode="page" page={page.blockSuiteDoc} />
{createPortal(
<ImagePreviewModal
pageId={page.id}
workspace={page.blockSuitePage.workspace}
workspace={page.blockSuiteDoc.workspace}
/>,
document.body
)}

6
tests/storybook/src/stories/page-info-properties.stories.tsx
View File

@@ -13,7 +13,7 @@ async function createAndInitPage(
title: string,
preview: string
) {
const page = workspace.createPage();
const page = workspace.createDoc();
initEmptyPage(page, title);
page.getBlockByFlavour('affine:paragraph').at(0)?.text?.insert(preview, 0);
return page;
@@ -53,7 +53,9 @@ PageInfoProperties.loaders = [
'Hello World from page 1'
);
page.meta.updatedDate = Date.now();
if (page.meta) {
page.meta.updatedDate = Date.now();
}
return {
page,

14
tests/storybook/src/stories/page-list.stories.tsx
View File

@@ -230,7 +230,7 @@ async function createAndInitPage(
title: string,
preview: string
) {
const page = workspace.createPage();
const page = workspace.createDoc();
initEmptyPage(page, title);
page.getBlockByFlavour('affine:paragraph').at(0)?.text?.insert(preview, 0);
return page;
@@ -273,16 +273,16 @@ PageListStory.loaders = [
'Hello World from page 3Hello World from page 3Hello World from page 3Hello World from page 3Hello World from page 3'
);
page1.meta.createDate = new Date('2021-01-01').getTime();
page2.meta.createDate = page2.meta.createDate - 3600 * 1000 * 24;
page3.meta.createDate = page3.meta.createDate - 3600 * 1000 * 24 * 7;
page1.meta!.createDate = new Date('2021-01-01').getTime();
page2.meta!.createDate = page2.meta!.createDate - 3600 * 1000 * 24;
page3.meta!.createDate = page3.meta!.createDate - 3600 * 1000 * 24 * 7;
workspace.meta.pageMetas[3].tags = testTags.slice(0, 3).map(t => t.id);
workspace.meta.pageMetas[2].tags = testTags.slice(0, 12).map(t => t.id);
workspace.meta.docMetas[3].tags = testTags.slice(0, 3).map(t => t.id);
workspace.meta.docMetas[2].tags = testTags.slice(0, 12).map(t => t.id);
return {
blockSuiteWorkspace: workspace,
pages: workspace.meta.pages,
pages: workspace.meta.docs,
};
},
];

4
tests/storybook/src/stories/quick-search/quick-search-main.stories.tsx
View File

@@ -6,7 +6,7 @@ import {
import { CMDKQuickSearchModal } from '@affine/core/components/pure/cmdk';
import { HighlightLabel } from '@affine/core/components/pure/cmdk/highlight';
import { useAFFiNEI18N } from '@affine/i18n/hooks';
import type { Page } from '@blocksuite/store';
import type { Doc } from '@blocksuite/store';
import type { Meta, StoryFn } from '@storybook/react';
import { useStore } from 'jotai';
import { useEffect, useState } from 'react';
@@ -23,7 +23,7 @@ const createMockedPage = () => {
return {
id: 'test-page',
waitForLoaded: () => Promise.resolve(),
} as any as Page;
} as any as Doc;
};
function useRegisterCommands() {

10
tests/storybook/src/stories/share-menu.stories.tsx
View File

@@ -2,7 +2,7 @@ import { toast } from '@affine/component';
import { PublicLinkDisableModal } from '@affine/component/disable-public-link';
import { ShareMenu } from '@affine/core/components/affine/share-page-modal/share-menu';
import { WorkspaceFlavour } from '@affine/env/workspace';
import { type Page } from '@blocksuite/store';
import { type Doc } from '@blocksuite/store';
import { expect } from '@storybook/jest';
import type { Meta, StoryFn } from '@storybook/react';
import { Workspace } from '@toeverything/infra';
@@ -26,10 +26,10 @@ async function unimplemented() {
export const Basic: StoryFn = () => {
const workspace = useService(Workspace);
const [page, setPage] = useState<Page | null>(null);
const [page, setPage] = useState<Doc | null>(null);
useEffect(() => {
const page = workspace.blockSuiteWorkspace.createPage(nanoid());
const page = workspace.blockSuiteWorkspace.createDoc(nanoid());
initEmptyPage(page);
setPage(page);
@@ -68,10 +68,10 @@ Basic.play = async ({ canvasElement }) => {
export const AffineBasic: StoryFn = () => {
const workspace = useService(Workspace);
const [page, setPage] = useState<Page | null>(null);
const [page, setPage] = useState<Doc | null>(null);
useEffect(() => {
const page = workspace.blockSuiteWorkspace.createPage(nanoid());
const page = workspace.blockSuiteWorkspace.createDoc(nanoid());
initEmptyPage(page);
setPage(page);