mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-15 05:37:32 +00:00
### What's Changed! #### Added Manage various types of toolbars uniformly in one place. * `affine-toolbar-widget` * `ToolbarRegistryExtension` The toolbar currently supports and handles several scenarios: 1. Select blocks: `BlockSelection` 2. Select text: `TextSelection` or `NativeSelection` 3. Hover a link: `affine-link` and `affine-reference` #### Removed Remove redundant toolbar implementations. * `attachment` toolbar * `bookmark` toolbar * `embed` toolbar * `formatting` toolbar * `affine-link` toolbar * `affine-reference` toolbar ### How to migrate? Here is an example that can help us migrate some unrefactored toolbars: Check out the more detailed types of [`ToolbarModuleConfig`](c178debf2d/blocksuite/affine/shared/src/services/toolbar-service/config.ts). 1. Add toolbar configuration file to a block type, such as bookmark block: [`config.ts`](c178debf2d/blocksuite/affine/block-bookmark/src/configs/toolbar.ts) ```ts export const builtinToolbarConfig = { actions: [ { id: 'a.preview', content(ctx) { const model = ctx.getCurrentModelBy(BlockSelection, BookmarkBlockModel); if (!model) return null; const { url } = model; return html`<affine-link-preview .url=${url}></affine-link-preview>`; }, }, { id: 'b.conversions', actions: [ { id: 'inline', label: 'Inline view', run(ctx) { }, }, { id: 'card', label: 'Card view', disabled: true, }, { id: 'embed', label: 'Embed view', disabled(ctx) { }, run(ctx) { }, }, ], content(ctx) { }, } satisfies ToolbarActionGroup<ToolbarAction>, { id: 'c.style', actions: [ { id: 'horizontal', label: 'Large horizontal style', }, { id: 'list', label: 'Small horizontal style', }, ], content(ctx) { }, } satisfies ToolbarActionGroup<ToolbarAction>, { id: 'd.caption', tooltip: 'Caption', icon: CaptionIcon(), run(ctx) { }, }, { placement: ActionPlacement.More, id: 'a.clipboard', actions: [ { id: 'copy', label: 'Copy', icon: CopyIcon(), run(ctx) { }, }, { id: 'duplicate', label: 'Duplicate', icon: DuplicateIcon(), run(ctx) { }, }, ], }, { placement: ActionPlacement.More, id: 'b.refresh', label: 'Reload', icon: ResetIcon(), run(ctx) { }, }, { placement: ActionPlacement.More, id: 'c.delete', label: 'Delete', icon: DeleteIcon(), variant: 'destructive', run(ctx) { }, }, ], } as const satisfies ToolbarModuleConfig; ``` 2. Add configuration extension to a block spec: [bookmark's spec](c178debf2d/blocksuite/affine/block-bookmark/src/bookmark-spec.ts) ```ts const flavour = BookmarkBlockSchema.model.flavour; export const BookmarkBlockSpec: ExtensionType[] = [ ..., ToolbarModuleExtension({ id: BlockFlavourIdentifier(flavour), config: builtinToolbarConfig, }), ].flat(); ``` 3. If the bock type already has a toolbar configuration built in, we can customize it in the following ways: Check out the [editor's config](c178debf2d/packages/frontend/core/src/blocksuite/extensions/editor-config/index.ts (L51C4-L54C8)) file. ```ts // Defines a toolbar configuration for the bookmark block type const customBookmarkToolbarConfig = { actions: [ ... ] } as const satisfies ToolbarModuleConfig; // Adds it into the editor's config ToolbarModuleExtension({ id: BlockFlavourIdentifier('custom:affine:bookmark'), config: customBookmarkToolbarConfig, }), ``` 4. If we want to extend the global: ```ts // Defines a toolbar configuration const customWildcardToolbarConfig = { actions: [ ... ] } as const satisfies ToolbarModuleConfig; // Adds it into the editor's config ToolbarModuleExtension({ id: BlockFlavourIdentifier('custom:affine:*'), config: customWildcardToolbarConfig, }), ``` Currently, only most toolbars in page mode have been refactored. Next is edgeless mode.
444 lines
13 KiB
TypeScript
444 lines
13 KiB
TypeScript
import { test } from '@affine-test/kit/playwright';
|
|
import { locateFormatBar } from '@affine-test/kit/utils/editor';
|
|
import {
|
|
pressEnter,
|
|
pressShiftTab,
|
|
pressTab,
|
|
selectAllByKeyboard,
|
|
undoByKeyboard,
|
|
} from '@affine-test/kit/utils/keyboard';
|
|
import { openHomePage } from '@affine-test/kit/utils/load-page';
|
|
import {
|
|
clickNewPageButton,
|
|
type,
|
|
waitForEditorLoad,
|
|
} from '@affine-test/kit/utils/page-logic';
|
|
import type { ParagraphBlockComponent } from '@blocksuite/affine-block-paragraph';
|
|
import { expect } from '@playwright/test';
|
|
|
|
test.beforeEach(async ({ page }) => {
|
|
await openHomePage(page);
|
|
await clickNewPageButton(page, 'Paragraph Test');
|
|
await waitForEditorLoad(page);
|
|
});
|
|
|
|
test('heading icon should be updated after change heading level', async ({
|
|
page,
|
|
}) => {
|
|
await page.keyboard.press('Enter');
|
|
await page.keyboard.type('Hello');
|
|
// Hello|
|
|
// empty paragraph
|
|
|
|
const paragraph = page.locator('affine-note affine-paragraph').nth(0);
|
|
|
|
await selectAllByKeyboard(page);
|
|
const formatBar = locateFormatBar(page);
|
|
await formatBar.getByLabel('Conversions').click();
|
|
await formatBar.getByLabel('Heading 1').click();
|
|
|
|
await paragraph.hover();
|
|
await expect(page.getByTestId('heading-icon-1')).toBeVisible();
|
|
|
|
await selectAllByKeyboard(page);
|
|
await formatBar.getByLabel('Conversions').click();
|
|
await formatBar.getByLabel('Heading 2').click();
|
|
|
|
await paragraph.hover();
|
|
await expect(page.getByTestId('heading-icon-1')).toBeHidden();
|
|
await expect(page.getByTestId('heading-icon-2')).toBeVisible();
|
|
});
|
|
|
|
test('basic heading collapsed', async ({ page }) => {
|
|
await pressEnter(page);
|
|
|
|
/**
|
|
* # aaa
|
|
* bbb
|
|
* ## ccc
|
|
* ddd
|
|
* ### eee
|
|
* fff
|
|
* ## ggg
|
|
* hhh
|
|
* # iii
|
|
* jjj
|
|
*/
|
|
await type(
|
|
page,
|
|
'# aaa\nbbb\n## ccc\nddd\n### eee\nfff\n## ggg\nhhh\n# iii\njjj'
|
|
);
|
|
const a = page.locator('affine-note affine-paragraph').nth(0);
|
|
const b = page.locator('affine-note affine-paragraph').nth(1);
|
|
const c = page.locator('affine-note affine-paragraph').nth(2);
|
|
const d = page.locator('affine-note affine-paragraph').nth(3);
|
|
const e = page.locator('affine-note affine-paragraph').nth(4);
|
|
const f = page.locator('affine-note affine-paragraph').nth(5);
|
|
const g = page.locator('affine-note affine-paragraph').nth(6);
|
|
const h = page.locator('affine-note affine-paragraph').nth(7);
|
|
const i = page.locator('affine-note affine-paragraph').nth(8);
|
|
const j = page.locator('affine-note affine-paragraph').nth(9);
|
|
|
|
const assertInitState = async () => {
|
|
expect(await a.isVisible()).toBeTruthy();
|
|
expect(await b.isVisible()).toBeTruthy();
|
|
expect(await c.isVisible()).toBeTruthy();
|
|
expect(await d.isVisible()).toBeTruthy();
|
|
expect(await e.isVisible()).toBeTruthy();
|
|
expect(await f.isVisible()).toBeTruthy();
|
|
expect(await g.isVisible()).toBeTruthy();
|
|
expect(await h.isVisible()).toBeTruthy();
|
|
expect(await i.isVisible()).toBeTruthy();
|
|
expect(await j.isVisible()).toBeTruthy();
|
|
};
|
|
await assertInitState();
|
|
|
|
// fold h1 aaa
|
|
await a.hover();
|
|
await page.waitForTimeout(100);
|
|
await a.locator('blocksuite-toggle-button .toggle-icon').click();
|
|
expect(await a.isVisible()).toBeTruthy();
|
|
expect(await b.isVisible()).toBeFalsy();
|
|
expect(await c.isVisible()).toBeFalsy();
|
|
expect(await d.isVisible()).toBeFalsy();
|
|
expect(await e.isVisible()).toBeFalsy();
|
|
expect(await f.isVisible()).toBeFalsy();
|
|
expect(await g.isVisible()).toBeFalsy();
|
|
expect(await h.isVisible()).toBeFalsy();
|
|
expect(await i.isVisible()).toBeTruthy();
|
|
expect(await j.isVisible()).toBeTruthy();
|
|
await undoByKeyboard(page);
|
|
await assertInitState();
|
|
|
|
// fold h2 ccc
|
|
await c.hover();
|
|
await page.waitForTimeout(100);
|
|
await c.locator('blocksuite-toggle-button .toggle-icon').click();
|
|
expect(await a.isVisible()).toBeTruthy();
|
|
expect(await b.isVisible()).toBeTruthy();
|
|
expect(await c.isVisible()).toBeTruthy();
|
|
expect(await d.isVisible()).toBeFalsy();
|
|
expect(await e.isVisible()).toBeFalsy();
|
|
expect(await f.isVisible()).toBeFalsy();
|
|
expect(await g.isVisible()).toBeTruthy();
|
|
expect(await h.isVisible()).toBeTruthy();
|
|
expect(await i.isVisible()).toBeTruthy();
|
|
expect(await j.isVisible()).toBeTruthy();
|
|
await undoByKeyboard(page);
|
|
await assertInitState();
|
|
|
|
// fold h3 eee
|
|
await e.hover();
|
|
await page.waitForTimeout(100);
|
|
await e.locator('blocksuite-toggle-button .toggle-icon').click();
|
|
expect(await a.isVisible()).toBeTruthy();
|
|
expect(await b.isVisible()).toBeTruthy();
|
|
expect(await c.isVisible()).toBeTruthy();
|
|
expect(await d.isVisible()).toBeTruthy();
|
|
expect(await e.isVisible()).toBeTruthy();
|
|
expect(await f.isVisible()).toBeFalsy();
|
|
expect(await g.isVisible()).toBeTruthy();
|
|
expect(await h.isVisible()).toBeTruthy();
|
|
expect(await i.isVisible()).toBeTruthy();
|
|
expect(await j.isVisible()).toBeTruthy();
|
|
await undoByKeyboard(page);
|
|
await assertInitState();
|
|
|
|
// fold h2 ggg
|
|
await g.hover();
|
|
await page.waitForTimeout(100);
|
|
await g.locator('blocksuite-toggle-button .toggle-icon').click();
|
|
expect(await a.isVisible()).toBeTruthy();
|
|
expect(await b.isVisible()).toBeTruthy();
|
|
expect(await c.isVisible()).toBeTruthy();
|
|
expect(await d.isVisible()).toBeTruthy();
|
|
expect(await e.isVisible()).toBeTruthy();
|
|
expect(await f.isVisible()).toBeTruthy();
|
|
expect(await g.isVisible()).toBeTruthy();
|
|
expect(await j.isVisible()).toBeTruthy();
|
|
});
|
|
|
|
test('add new heading when press enter at the end of collapsed heading', async ({
|
|
page,
|
|
}) => {
|
|
await pressEnter(page);
|
|
await type(page, '# aaa');
|
|
await page.keyboard.press('ArrowDown');
|
|
await type(page, 'bbb');
|
|
await page.keyboard.press('ArrowUp');
|
|
await page.keyboard.press('ArrowRight');
|
|
|
|
const paragraph = page.locator('affine-note affine-paragraph');
|
|
|
|
expect(
|
|
await paragraph
|
|
.nth(1)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.text.toString() === 'bbb'
|
|
)
|
|
).toBeTruthy();
|
|
await pressEnter(page);
|
|
expect(
|
|
await paragraph
|
|
.nth(1)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'text' && block.model.text.toString() === ''
|
|
)
|
|
).toBeTruthy();
|
|
expect(
|
|
await paragraph
|
|
.nth(2)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.text.toString() === 'bbb'
|
|
)
|
|
).toBeTruthy();
|
|
|
|
await undoByKeyboard(page);
|
|
expect(
|
|
await paragraph
|
|
.nth(1)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.text.toString() === 'bbb'
|
|
)
|
|
).toBeTruthy();
|
|
expect(await paragraph.nth(1).isVisible()).toBeTruthy();
|
|
await paragraph
|
|
.nth(0)
|
|
.locator('blocksuite-toggle-button .toggle-icon')
|
|
.click();
|
|
expect(await paragraph.nth(1).isVisible()).toBeFalsy();
|
|
|
|
await paragraph.nth(0).click();
|
|
expect(await paragraph.count()).toBe(2);
|
|
await pressEnter(page);
|
|
expect(await paragraph.count()).toBe(3);
|
|
expect(
|
|
await paragraph
|
|
.nth(2)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'h1' && block.model.text.toString() === ''
|
|
)
|
|
).toBeTruthy();
|
|
});
|
|
|
|
test('unfold collapsed heading when some block indented to be its child', async ({
|
|
page,
|
|
}) => {
|
|
await pressEnter(page);
|
|
await type(page, '# aaa\nbbb\n# ccc');
|
|
const paragraph = page.locator('affine-note affine-paragraph');
|
|
await paragraph
|
|
.nth(0)
|
|
.locator('blocksuite-toggle-button .toggle-icon')
|
|
.click();
|
|
expect(await paragraph.nth(1).isVisible()).toBeFalsy();
|
|
await paragraph.nth(2).click();
|
|
await pressTab(page);
|
|
expect(await paragraph.nth(1).isVisible()).toBeTruthy();
|
|
});
|
|
|
|
test('unfold collapsed heading when its siblings changed to text type from heading type', async ({
|
|
page,
|
|
}) => {
|
|
await pressEnter(page);
|
|
await type(page, '# aaa\nbbb\n# ccc');
|
|
const paragraph = page.locator('affine-note affine-paragraph');
|
|
await paragraph
|
|
.nth(0)
|
|
.locator('blocksuite-toggle-button .toggle-icon')
|
|
.click();
|
|
expect(await paragraph.nth(1).isVisible()).toBeFalsy();
|
|
await paragraph.nth(2).click();
|
|
await page.keyboard.press('ArrowLeft');
|
|
await page.keyboard.press('ArrowLeft');
|
|
await page.keyboard.press('ArrowLeft');
|
|
expect(
|
|
await paragraph
|
|
.nth(2)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'h1' && block.model.text.toString() === 'ccc'
|
|
)
|
|
).toBeTruthy();
|
|
await page.keyboard.press('Backspace');
|
|
expect(
|
|
await paragraph
|
|
.nth(2)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'text' && block.model.text.toString() === 'ccc'
|
|
)
|
|
).toBeTruthy();
|
|
expect(await paragraph.nth(1).isVisible()).toBeTruthy();
|
|
});
|
|
|
|
test('also move children when dedent collapsed heading', async ({ page }) => {
|
|
await pressEnter(page);
|
|
await type(page, 'aaa');
|
|
await page.keyboard.press('ArrowDown');
|
|
await pressTab(page);
|
|
await type(page, '# bbb\nccc');
|
|
|
|
const paragraph = page.locator('affine-note affine-paragraph');
|
|
const subParagraph = paragraph.nth(0).locator('affine-paragraph');
|
|
expect(await subParagraph.count()).toBe(2);
|
|
expect(
|
|
await subParagraph
|
|
.nth(0)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'h1' && block.model.text.toString() === 'bbb'
|
|
)
|
|
).toBeTruthy();
|
|
expect(
|
|
await subParagraph
|
|
.nth(1)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'text' && block.model.text.toString() === 'ccc'
|
|
)
|
|
).toBeTruthy();
|
|
|
|
expect(await subParagraph.nth(1).isVisible()).toBeTruthy();
|
|
await subParagraph
|
|
.nth(0)
|
|
.locator('blocksuite-toggle-button .toggle-icon')
|
|
.click();
|
|
expect(await subParagraph.nth(1).isVisible()).toBeFalsy();
|
|
|
|
await subParagraph.nth(0).click();
|
|
await pressShiftTab(page);
|
|
expect(await subParagraph.count()).toBe(0);
|
|
expect(
|
|
await paragraph
|
|
.nth(1)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'h1' && block.model.text.toString() === 'bbb'
|
|
)
|
|
).toBeTruthy();
|
|
expect(
|
|
await paragraph
|
|
.nth(2)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'text' && block.model.text.toString() === 'ccc'
|
|
)
|
|
).toBeTruthy();
|
|
|
|
expect(await paragraph.nth(2).isVisible()).toBeFalsy();
|
|
await paragraph
|
|
.nth(1)
|
|
.locator('blocksuite-toggle-button .toggle-icon')
|
|
.click({
|
|
position: {
|
|
x: 5,
|
|
y: 5,
|
|
},
|
|
});
|
|
expect(await paragraph.nth(2).isVisible()).toBeTruthy();
|
|
});
|
|
|
|
test('also move collapsed siblings when indent collapsed heading', async ({
|
|
page,
|
|
}) => {
|
|
await pressEnter(page);
|
|
await type(page, 'aaa');
|
|
await page.keyboard.press('ArrowDown');
|
|
await type(page, '# bbb\nccc');
|
|
await page.keyboard.press('ArrowUp');
|
|
|
|
const paragraph = page.locator('affine-note affine-paragraph');
|
|
expect(await paragraph.nth(0).locator('affine-paragraph').count()).toBe(0);
|
|
await pressTab(page);
|
|
expect(await paragraph.nth(0).locator('affine-paragraph').count()).toBe(1);
|
|
expect(
|
|
await paragraph
|
|
.nth(0)
|
|
.locator('affine-paragraph')
|
|
.nth(0)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'h1' && block.model.text.toString() === 'bbb'
|
|
)
|
|
).toBeTruthy();
|
|
await undoByKeyboard(page);
|
|
|
|
expect(await paragraph.nth(2).isVisible()).toBeTruthy();
|
|
await paragraph
|
|
.nth(1)
|
|
.locator('blocksuite-toggle-button .toggle-icon')
|
|
.click();
|
|
expect(await paragraph.nth(2).isVisible()).toBeFalsy();
|
|
await paragraph.nth(1).click();
|
|
await pressTab(page);
|
|
expect(await paragraph.nth(2).isVisible()).toBeFalsy();
|
|
expect(await paragraph.nth(0).locator('affine-paragraph').count()).toBe(2);
|
|
expect(
|
|
await paragraph
|
|
.nth(0)
|
|
.locator('affine-paragraph')
|
|
.nth(0)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'h1' && block.model.text.toString() === 'bbb'
|
|
)
|
|
).toBeTruthy();
|
|
expect(
|
|
await paragraph
|
|
.nth(0)
|
|
.locator('affine-paragraph')
|
|
.nth(1)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'text' && block.model.text.toString() === 'ccc'
|
|
)
|
|
).toBeTruthy();
|
|
});
|
|
|
|
test('unfold collapsed heading when its other blocks indented to be its sibling', async ({
|
|
page,
|
|
}) => {
|
|
await pressEnter(page);
|
|
await type(page, 'aaa');
|
|
await page.keyboard.press('ArrowDown');
|
|
await type(page, '# bbb\nddd');
|
|
await page.keyboard.press('ArrowUp');
|
|
await pressTab(page);
|
|
await page.keyboard.press('ArrowRight');
|
|
await pressEnter(page);
|
|
await type(page, 'ccc');
|
|
|
|
/**
|
|
* aaa
|
|
* # bbb
|
|
* ccc
|
|
* ddd
|
|
*/
|
|
|
|
const paragraph = page.locator('affine-note affine-paragraph');
|
|
expect(await paragraph.nth(2).isVisible()).toBeTruthy();
|
|
expect(
|
|
await paragraph
|
|
.nth(2)
|
|
.evaluate(
|
|
(block: ParagraphBlockComponent) =>
|
|
block.model.type === 'text' && block.model.text.toString() === 'ccc'
|
|
)
|
|
).toBeTruthy();
|
|
await paragraph.locator('blocksuite-toggle-button .toggle-icon').click();
|
|
expect(await paragraph.nth(2).isVisible()).toBeFalsy();
|
|
|
|
await paragraph.nth(3).click(); // ddd
|
|
expect(await paragraph.nth(2).isVisible()).toBeFalsy();
|
|
expect(await paragraph.nth(0).locator('affine-paragraph').count()).toBe(2);
|
|
await pressTab(page);
|
|
expect(await paragraph.nth(0).locator('affine-paragraph').count()).toBe(3);
|
|
expect(await paragraph.nth(2).isVisible()).toBeTruthy();
|
|
});
|