diff --git a/packages/common/env/package.json b/packages/common/env/package.json index a90dbc3513..50e8eeb320 100644 --- a/packages/common/env/package.json +++ b/packages/common/env/package.json @@ -3,8 +3,8 @@ "private": true, "type": "module", "devDependencies": { - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "react": "18.2.0", "react-dom": "18.2.0", "vitest": "0.34.6", diff --git a/packages/common/env/src/global.ts b/packages/common/env/src/global.ts index 0532ff1248..6d37809326 100644 --- a/packages/common/env/src/global.ts +++ b/packages/common/env/src/global.ts @@ -6,7 +6,6 @@ import { isDesktop, isServer } from './constant.js'; import { UaHelper } from './ua-helper.js'; export const blockSuiteFeatureFlags = z.object({ - enable_transformer_clipboard: z.boolean(), enable_expand_database_block: z.boolean(), enable_bultin_ledits: z.boolean(), }); diff --git a/packages/common/infra/package.json b/packages/common/infra/package.json index 8b9c1112b2..0d8efba1d8 100644 --- a/packages/common/infra/package.json +++ b/packages/common/infra/package.json @@ -57,9 +57,9 @@ "@affine/debug": "workspace:*", "@affine/env": "workspace:*", "@affine/sdk": "workspace:*", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "jotai": "^2.5.1", "jotai-effect": "^0.2.3", "tinykeys": "^2.1.0", @@ -68,8 +68,8 @@ "devDependencies": { "@affine-test/fixtures": "workspace:*", "@affine/templates": "workspace:*", - "@blocksuite/lit": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/presets": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/lit": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/presets": "0.11.0-nightly-202312150424-f13b992", "@testing-library/react": "^14.0.0", "async-call-rpc": "^6.3.1", "electron": "link:../../frontend/electron/node_modules/electron", diff --git a/packages/common/sdk/package.json b/packages/common/sdk/package.json index 68929ec186..60feec3228 100644 --- a/packages/common/sdk/package.json +++ b/packages/common/sdk/package.json @@ -22,11 +22,11 @@ "dist" ], "dependencies": { - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/presets": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/presets": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "jotai": "^2.5.1", "zod": "^3.22.4" }, diff --git a/packages/common/sdk/src/entry.ts b/packages/common/sdk/src/entry.ts index 2e4025a229..7421ebeb1e 100644 --- a/packages/common/sdk/src/entry.ts +++ b/packages/common/sdk/src/entry.ts @@ -1,5 +1,5 @@ import type { BaseSelection } from '@blocksuite/block-std'; -import type { EditorContainer } from '@blocksuite/presets'; +import type { AffineEditorContainer } from '@blocksuite/presets'; import type { Page } from '@blocksuite/store'; import type { Workspace } from '@blocksuite/store'; import type { Atom, getDefaultStore } from 'jotai/vanilla'; @@ -10,7 +10,7 @@ export type Part = 'headerItem' | 'editor' | 'setting' | 'formatBar'; export type CallbackMap = { headerItem: (root: HTMLElement) => () => void; - editor: (root: HTMLElement, editor: EditorContainer) => () => void; + editor: (root: HTMLElement, editor: AffineEditorContainer) => () => void; setting: (root: HTMLElement) => () => void; formatBar: ( root: HTMLElement, diff --git a/packages/common/y-indexeddb/package.json b/packages/common/y-indexeddb/package.json index 3c95defa62..086ce9ffb4 100644 --- a/packages/common/y-indexeddb/package.json +++ b/packages/common/y-indexeddb/package.json @@ -37,8 +37,8 @@ "y-provider": "workspace:*" }, "devDependencies": { - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "fake-indexeddb": "^5.0.0", "vite": "^5.0.6", "vite-plugin-dts": "3.6.0", diff --git a/packages/common/y-provider/package.json b/packages/common/y-provider/package.json index fe8cb8abe2..47a026d381 100644 --- a/packages/common/y-provider/package.json +++ b/packages/common/y-provider/package.json @@ -24,7 +24,7 @@ "build": "vite build" }, "devDependencies": { - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "vite": "^5.0.6", "vite-plugin-dts": "3.6.0", "vitest": "0.34.6", diff --git a/packages/frontend/component/package.json b/packages/frontend/component/package.json index 540a3c2fab..337267c996 100644 --- a/packages/frontend/component/package.json +++ b/packages/frontend/component/package.json @@ -71,12 +71,12 @@ "uuid": "^9.0.1" }, "devDependencies": { - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", "@blocksuite/icons": "2.1.36", - "@blocksuite/lit": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/presets": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/lit": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/presets": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@storybook/addon-actions": "^7.5.3", "@storybook/addon-essentials": "^7.5.3", "@storybook/addon-interactions": "^7.5.3", diff --git a/packages/frontend/component/src/components/block-suite-editor/index.jotai.ts b/packages/frontend/component/src/components/block-suite-editor/index.jotai.ts new file mode 100644 index 0000000000..8f3af298e4 --- /dev/null +++ b/packages/frontend/component/src/components/block-suite-editor/index.jotai.ts @@ -0,0 +1,4 @@ +import type { AffineEditorContainer } from '@blocksuite/presets'; +import { atom } from 'jotai'; + +export const editorContainerAtom = atom(null); diff --git a/packages/frontend/component/src/components/block-suite-editor/index.tsx b/packages/frontend/component/src/components/block-suite-editor/index.tsx index e48dcdc89a..43bec257af 100644 --- a/packages/frontend/component/src/components/block-suite-editor/index.tsx +++ b/packages/frontend/component/src/components/block-suite-editor/index.tsx @@ -1,8 +1,9 @@ import { assertExists } from '@blocksuite/global/utils'; -import { EditorContainer } from '@blocksuite/presets'; +import { AffineEditorContainer } from '@blocksuite/presets'; import type { Page } from '@blocksuite/store'; import clsx from 'clsx'; import { use } from 'foxact/use'; +import { useAtom } from 'jotai'; import type { CSSProperties, ReactElement } from 'react'; import { memo, @@ -19,8 +20,11 @@ import { blockSuiteEditorHeaderStyle, blockSuiteEditorStyle, } from './index.css'; +import { editorContainerAtom } from './index.jotai'; import { editorSpecs } from './specs'; +export { editorContainerAtom } from './index.jotai'; + interface BlockElement extends Element { path: string[]; } @@ -31,7 +35,7 @@ export type EditorProps = { defaultSelectedBlockId?: string; onModeChange?: (mode: 'page' | 'edgeless') => void; // on Editor instance instantiated - onLoadEditor?: (editor: EditorContainer) => () => void; + onLoadEditor?: (editor: AffineEditorContainer) => () => void; style?: CSSProperties; className?: string; }; @@ -147,10 +151,11 @@ const BlockSuiteEditorImpl = ({ }: EditorProps): ReactElement => { usePageRoot(page); + const [, setEditorContainer] = useAtom(editorContainerAtom); assertExists(page, 'page should not be null'); - const editorRef = useRef(null); + const editorRef = useRef(null); if (editorRef.current === null) { - editorRef.current = new EditorContainer(); + editorRef.current = new AffineEditorContainer(); editorRef.current.autofocus = true; } const editor = editorRef.current; @@ -193,10 +198,11 @@ const BlockSuiteEditorImpl = ({ return; } container.append(editor); + setEditorContainer(editor); return () => { editor.remove(); }; - }, [editor]); + }, [editor, setEditorContainer]); const blockElement = useBlockElementById( containerRef.current, diff --git a/packages/frontend/core/.webpack/config.ts b/packages/frontend/core/.webpack/config.ts index 7b1be2f05b..f50c833df4 100644 --- a/packages/frontend/core/.webpack/config.ts +++ b/packages/frontend/core/.webpack/config.ts @@ -205,9 +205,15 @@ export const createConfiguration: ( '@blocksuite/store': blocksuiteBaseDir ? join(blocksuiteBaseDir, 'packages', 'store', 'src') : join(workspaceRoot, 'node_modules', '@blocksuite', 'store', 'dist'), - '@blocksuite/virgo': blocksuiteBaseDir - ? join(blocksuiteBaseDir, 'packages', 'virgo', 'src') - : join(workspaceRoot, 'node_modules', '@blocksuite', 'virgo', 'dist'), + '@blocksuite/inline': blocksuiteBaseDir + ? join(blocksuiteBaseDir, 'packages', 'inline', 'src') + : join( + workspaceRoot, + 'node_modules', + '@blocksuite', + 'inline', + 'dist' + ), }, }, diff --git a/packages/frontend/core/.webpack/runtime-config.ts b/packages/frontend/core/.webpack/runtime-config.ts index 459f5ec857..da056b8cff 100644 --- a/packages/frontend/core/.webpack/runtime-config.ts +++ b/packages/frontend/core/.webpack/runtime-config.ts @@ -6,7 +6,6 @@ const require = createRequire(import.meta.url); const packageJson = require('../package.json'); const editorFlags: BlockSuiteFeatureFlags = { - enable_transformer_clipboard: false, enable_expand_database_block: false, enable_bultin_ledits: false, }; diff --git a/packages/frontend/core/package.json b/packages/frontend/core/package.json index b8cda0a078..6ab6ea15f1 100644 --- a/packages/frontend/core/package.json +++ b/packages/frontend/core/package.json @@ -25,14 +25,14 @@ "@affine/i18n": "workspace:*", "@affine/templates": "workspace:*", "@affine/workspace": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", "@blocksuite/icons": "2.1.36", - "@blocksuite/lit": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/presets": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/virgo": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/inline": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/lit": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/presets": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^8.0.0", "@emotion/cache": "^11.11.0", diff --git a/packages/frontend/core/src/bootstrap/plugins/setup.ts b/packages/frontend/core/src/bootstrap/plugins/setup.ts index 8fc87d11b4..64ce979364 100644 --- a/packages/frontend/core/src/bootstrap/plugins/setup.ts +++ b/packages/frontend/core/src/bootstrap/plugins/setup.ts @@ -146,7 +146,7 @@ function createSetupImpl(rootStore: ReturnType) { '@affine/component': import('@affine/component'), '@blocksuite/icons': import('@blocksuite/icons'), '@blocksuite/blocks': import('@blocksuite/blocks'), - '@blocksuite/virgo': import('@blocksuite/virgo'), + '@blocksuite/inline': import('@blocksuite/inline'), '@affine/sdk/entry': { rootStore, currentWorkspaceAtom: currentWorkspaceAtom, @@ -541,7 +541,7 @@ function createSetupImpl(rootStore: ReturnType) { } else if (part === 'formatBar') { const register = (widget: AffineFormatBarWidget) => { const div = document.createElement('div'); - const root = widget.root; + const root = widget.host; const cleanup = (callback as CallbackMap['formatBar'])( div, widget.page, diff --git a/packages/frontend/core/src/bootstrap/register-blocksuite-components.ts b/packages/frontend/core/src/bootstrap/register-blocksuite-components.ts index d5f5b07f84..ce451b8d26 100644 --- a/packages/frontend/core/src/bootstrap/register-blocksuite-components.ts +++ b/packages/frontend/core/src/bootstrap/register-blocksuite-components.ts @@ -1,6 +1,18 @@ -import { registerTOCComponents } from '@blocksuite/blocks'; +import { registerTOCPanelComponents } from '@blocksuite/presets'; +import { registerFramePanelComponents } from '@blocksuite/presets'; -registerTOCComponents(components => { +registerTOCPanelComponents(components => { + for (const compName in components) { + if (window.customElements.get(compName)) continue; + + window.customElements.define( + compName, + components[compName as keyof typeof components] + ); + } +}); + +registerFramePanelComponents(components => { for (const compName in components) { if (window.customElements.get(compName)) continue; diff --git a/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx b/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx index 563d6a346c..25db7b79aa 100644 --- a/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx +++ b/packages/frontend/core/src/components/cloud/share-header-right-item/present.tsx @@ -12,7 +12,7 @@ export const PresentButton = () => { const handlePresent = useCallback(() => { // TODO: use editor Atom - const editorRoot = document.querySelector('block-suite-root'); + const editorRoot = document.querySelector('editor-host'); if (!editorRoot || isPresent) return; // TODO: use surfaceService subAtom @@ -28,7 +28,7 @@ export const PresentButton = () => { if (!isPresent) return; // TODO: use editor Atom - const editorRoot = document.querySelector('block-suite-root'); + const editorRoot = document.querySelector('editor-host'); if (!editorRoot) return; // TODO: use surfaceService subAtom diff --git a/packages/frontend/core/src/components/page-detail-editor.tsx b/packages/frontend/core/src/components/page-detail-editor.tsx index 1d0a13615a..bff8c87f63 100644 --- a/packages/frontend/core/src/components/page-detail-editor.tsx +++ b/packages/frontend/core/src/components/page-detail-editor.tsx @@ -2,7 +2,7 @@ import './page-detail-editor.css'; import { PageNotFoundError } from '@affine/env/constant'; import { assertExists, DisposableGroup } from '@blocksuite/global/utils'; -import type { EditorContainer } from '@blocksuite/presets'; +import type { AffineEditorContainer } from '@blocksuite/presets'; import type { Page, Workspace } from '@blocksuite/store'; import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { useBlockSuiteWorkspacePage } from '@toeverything/hooks/use-block-suite-workspace-page'; @@ -23,10 +23,13 @@ import * as styles from './page-detail-editor.css'; declare global { // eslint-disable-next-line no-var - var currentEditor: EditorContainer | undefined; + var currentEditor: AffineEditorContainer | undefined; } -export type OnLoadEditor = (page: Page, editor: EditorContainer) => () => void; +export type OnLoadEditor = ( + page: Page, + editor: AffineEditorContainer +) => () => void; export interface PageDetailEditorProps { isPublic?: boolean; @@ -93,11 +96,11 @@ const PageDetailEditorMain = memo(function PageDetailEditorMain({ [isPublic, switchToEdgelessMode, pageId, switchToPageMode] ); - const [, setEditor] = useState(); + const [, setEditor] = useState(); const blockId = useRouterHash(); const onLoadEditor = useCallback( - (editor: EditorContainer) => { + (editor: AffineEditorContainer) => { // debug current detail editor globalThis.currentEditor = editor; setEditor(editor); diff --git a/packages/frontend/core/src/hooks/affine/use-export-page.ts b/packages/frontend/core/src/hooks/affine/use-export-page.ts index 9a181fc267..ecaa42937b 100644 --- a/packages/frontend/core/src/hooks/affine/use-export-page.ts +++ b/packages/frontend/core/src/hooks/affine/use-export-page.ts @@ -4,7 +4,11 @@ import { } from '@affine/component/global-loading'; import { pushNotificationAtom } from '@affine/component/notification-center'; import { useAFFiNEI18N } from '@affine/i18n/hooks'; -import type { PageBlockModel } from '@blocksuite/blocks'; +import { + HtmlTransformer, + MarkdownTransformer, + type PageBlockModel, +} from '@blocksuite/blocks'; import { ContentParser } from '@blocksuite/blocks/content-parser'; import type { Page } from '@blocksuite/store'; import { useSetAtom } from 'jotai'; @@ -12,12 +16,6 @@ import { nanoid } from 'nanoid'; import { useCallback } from 'react'; type ExportType = 'pdf' | 'html' | 'png' | 'markdown'; -const typeToContentParserMethodMap = { - pdf: 'exportPdf', - html: 'exportHtml', - png: 'exportPng', - markdown: 'exportMarkdown', -} satisfies Record; const contentParserWeakMap = new WeakMap(); @@ -41,14 +39,26 @@ interface ExportHandlerOptions { } async function exportHandler({ page, type }: ExportHandlerOptions) { - if (type === 'pdf' && environment.isDesktop && page.meta.mode === 'page') { - await window.apis?.export.savePDFFileAs( - (page.root as PageBlockModel).title.toString() - ); - } else { - const contentParser = getContentParser(page); - const method = typeToContentParserMethodMap[type]; - await contentParser[method](); + const contentParser = getContentParser(page); + switch (type) { + case 'html': + await HtmlTransformer.exportPage(page); + break; + case 'markdown': + await MarkdownTransformer.exportPage(page); + break; + case 'pdf': + if (environment.isDesktop && page.meta.mode === 'page') { + await window.apis?.export.savePDFFileAs( + (page.root as PageBlockModel).title.toString() + ); + } else { + await contentParser['exportPdf'](); + } + break; + case 'png': + await contentParser['exportPng'](); + break; } } diff --git a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx index 42f1abd114..6e2e15ade0 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx @@ -8,7 +8,7 @@ import { WorkspaceSubPath } from '@affine/env/workspace'; import { globalBlockSuiteSchema } from '@affine/workspace/manager'; import { SyncEngineStep } from '@affine/workspace/providers'; import { assertExists } from '@blocksuite/global/utils'; -import type { EditorContainer } from '@blocksuite/presets'; +import type { AffineEditorContainer } from '@blocksuite/presets'; import type { Page, Workspace } from '@blocksuite/store'; import { useBlockSuitePageMeta } from '@toeverything/hooks/use-block-suite-page-meta'; import { @@ -131,7 +131,7 @@ const DetailPageImpl = ({ page }: { page: Page }) => { useRegisterBlocksuiteEditorCommands(currentPageId, mode); const onLoad = useCallback( - (page: Page, editor: EditorContainer) => { + (page: Page, editor: AffineEditorContainer) => { try { // todo(joooye34): improve the following migration code const surfaceBlock = page.getBlockByFlavour('affine:surface')[0]; diff --git a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/atoms.ts b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/atoms.ts index 19ef0adcd4..1685e5c088 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/atoms.ts +++ b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/atoms.ts @@ -3,12 +3,16 @@ import { assertExists } from '@blocksuite/global/utils'; import { atom } from 'jotai'; import { selectAtom } from 'jotai/utils'; +import { framePanelExtension } from './extensions/frame'; import { outlineExtension } from './extensions/outline'; import type { EditorExtension, EditorExtensionName } from './types'; // the list of all possible extensions in affine. // order matters (determines the order of the tabs) -export const extensions: EditorExtension[] = [outlineExtension]; +export const extensions: EditorExtension[] = [ + outlineExtension, + framePanelExtension, +]; export interface EditorSidebarState { isOpen: boolean; diff --git a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/editor-sidebar.css.ts b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/editor-sidebar.css.ts index 5c9fd6fa13..c46789683a 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/editor-sidebar.css.ts +++ b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/editor-sidebar.css.ts @@ -6,5 +6,5 @@ export const root = style({ flex: 1, overflow: 'auto', width: '100%', - minWidth: '300px', + minWidth: '320px', }); diff --git a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx index 9ac1705446..1a661bd18b 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/frame.tsx @@ -1,41 +1,43 @@ -import { TOCNotesPanel } from '@blocksuite/blocks'; +import { editorContainerAtom } from '@affine/component/block-suite-editor'; import { assertExists } from '@blocksuite/global/utils'; import { FrameIcon } from '@blocksuite/icons'; +import { FramePanel } from '@blocksuite/presets'; +import { useAtom } from 'jotai'; import { useCallback, useRef } from 'react'; -import { useCurrentPage } from '../../../../../hooks/current/use-current-page'; import type { EditorExtension } from '../types'; import * as styles from './frame.css'; -// A wrapper for TOCNotesPanel -const EditorOutline = () => { - const tocPanelRef = useRef(null); - const currentPage = useCurrentPage(); +// A wrapper for FramePanel +const EditorFramePanel = () => { + const framePanelRef = useRef(null); + const [editorContainer] = useAtom(editorContainerAtom); const onRefChange = useCallback((container: HTMLDivElement | null) => { if (container) { - assertExists(tocPanelRef.current, 'toc panel should be initialized'); - container.append(tocPanelRef.current); + assertExists(framePanelRef.current, 'frame panel should be initialized'); + container.append(framePanelRef.current); } }, []); - if (!currentPage) { + if (!editorContainer) { return; } - if (!tocPanelRef.current) { - tocPanelRef.current = new TOCNotesPanel(); + if (!framePanelRef.current) { + framePanelRef.current = new FramePanel(); } - if (currentPage !== tocPanelRef.current?.page) { - (tocPanelRef.current as TOCNotesPanel).page = currentPage; + if (editorContainer !== framePanelRef.current?.editor) { + (framePanelRef.current as FramePanel).editor = editorContainer; + (framePanelRef.current as FramePanel).fitPadding = [20, 20, 20, 20]; } return
; }; -export const frameExtension: EditorExtension = { +export const framePanelExtension: EditorExtension = { name: 'frame', icon: , - Component: EditorOutline, + Component: EditorFramePanel, }; diff --git a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx index eaa2f3cac1..f28c281760 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx +++ b/packages/frontend/core/src/pages/workspace/detail-page/editor-sidebar/extensions/outline.tsx @@ -1,16 +1,17 @@ -import { TOCNotesPanel } from '@blocksuite/blocks'; +import { editorContainerAtom } from '@affine/component/block-suite-editor'; import { assertExists } from '@blocksuite/global/utils'; import { TocIcon } from '@blocksuite/icons'; +import { TOCPanel } from '@blocksuite/presets'; +import { useAtom } from 'jotai'; import { useCallback, useRef } from 'react'; -import { useCurrentPage } from '../../../../../hooks/current/use-current-page'; import type { EditorExtension } from '../types'; import * as styles from './outline.css'; // A wrapper for TOCNotesPanel const EditorOutline = () => { - const tocPanelRef = useRef(null); - const currentPage = useCurrentPage(); + const tocPanelRef = useRef(null); + const [editorContainer] = useAtom(editorContainerAtom); const onRefChange = useCallback((container: HTMLDivElement | null) => { if (container) { @@ -19,16 +20,17 @@ const EditorOutline = () => { } }, []); - if (!currentPage) { + if (!editorContainer) { return; } if (!tocPanelRef.current) { - tocPanelRef.current = new TOCNotesPanel(); + tocPanelRef.current = new TOCPanel(); } - if (currentPage !== tocPanelRef.current?.page) { - (tocPanelRef.current as TOCNotesPanel).page = currentPage; + if (editorContainer !== tocPanelRef.current?.editor) { + (tocPanelRef.current as TOCPanel).editor = editorContainer; + (tocPanelRef.current as TOCPanel).fitPadding = [20, 20, 20, 20]; } return
; diff --git a/packages/frontend/electron/package.json b/packages/frontend/electron/package.json index cfaf0433ea..7b197b789b 100644 --- a/packages/frontend/electron/package.json +++ b/packages/frontend/electron/package.json @@ -32,10 +32,10 @@ "@affine/sdk": "workspace:*", "@affine/templates": "workspace:*", "@affine/vue-hello-world-plugin": "workspace:*", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/lit": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/presets": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/lit": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/presets": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@electron-forge/cli": "^7.2.0", "@electron-forge/core": "^7.2.0", "@electron-forge/core-utils": "^7.2.0", diff --git a/packages/frontend/hooks/package.json b/packages/frontend/hooks/package.json index 3aa5502d4a..fed403260d 100644 --- a/packages/frontend/hooks/package.json +++ b/packages/frontend/hooks/package.json @@ -20,12 +20,12 @@ "devDependencies": { "@affine/debug": "workspace:*", "@affine/env": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/lit": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/presets": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/lit": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/presets": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@testing-library/react": "^14.0.0", "@toeverything/infra": "workspace:*", "@types/image-blob-reduce": "^4.1.3", diff --git a/packages/plugins/image-preview/src/component/index.tsx b/packages/plugins/image-preview/src/component/index.tsx index b0ff6ef467..c34f0804cc 100644 --- a/packages/plugins/image-preview/src/component/index.tsx +++ b/packages/plugins/image-preview/src/component/index.tsx @@ -191,7 +191,7 @@ const ImagePreviewModalImpl = ( const block = page.getBlockById(blockId) as ImageBlockModel; assertExists(block); const store = block.page.blob; - const url = store?.get(block.sourceId); + const url = store?.get(block.sourceId as string); const img = await url; if (!img) { return; @@ -260,7 +260,7 @@ const ImagePreviewModalImpl = ( assertExists(page); const block = page.getBlockById(blockId) as ImageBlockModel; assertExists(block); - return props.workspace.blob.get(block?.sourceId); + return props.workspace.blob.get(block?.sourceId as string); }, suspense: true, } diff --git a/packages/plugins/outline/src/atom.ts b/packages/plugins/outline/src/atom.ts deleted file mode 100644 index 3a2f13a39f..0000000000 --- a/packages/plugins/outline/src/atom.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { atom } from 'jotai'; - -export const blocksuiteRootAtom = atom(() => - document.querySelector('block-suite-root') -); diff --git a/scripts/bump-blocksuite.sh b/scripts/bump-blocksuite.sh index c76ee4feae..4ecc8ead63 100755 --- a/scripts/bump-blocksuite.sh +++ b/scripts/bump-blocksuite.sh @@ -9,4 +9,4 @@ yarn up "@blocksuite/presets@${LATEST_NIGHTLY}" yarn up "@blocksuite/global@${LATEST_NIGHTLY}" yarn up "@blocksuite/block-std@${LATEST_NIGHTLY}" yarn up "@blocksuite/lit@${LATEST_NIGHTLY}" -yarn up "@blocksuite/virgo@${LATEST_NIGHTLY}" +yarn up "@blocksuite/inline@${LATEST_NIGHTLY}" diff --git a/scripts/setup/lottie-web.ts b/scripts/setup/lottie-web.ts index 4c68a3719b..19d5beb6c7 100644 --- a/scripts/setup/lottie-web.ts +++ b/scripts/setup/lottie-web.ts @@ -5,7 +5,7 @@ vi.mock('lottie-web', () => ({ })); vi.mock('@blocksuite/presets', () => ({ - EditorContainer: vi.fn(), + AffineEditorContainer: vi.fn(), })); if (typeof window !== 'undefined' && HTMLCanvasElement) { diff --git a/tests/affine-legacy/0.6.1-beta.1/package.json b/tests/affine-legacy/0.6.1-beta.1/package.json index e0bf99b415..6c0e7da47e 100644 --- a/tests/affine-legacy/0.6.1-beta.1/package.json +++ b/tests/affine-legacy/0.6.1-beta.1/package.json @@ -9,10 +9,10 @@ "devDependencies": { "@affine-test/fixtures": "workspace:*", "@affine-test/kit": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@playwright/test": "^1.39.0", "express": "^4.18.2", "http-proxy-middleware": "^3.0.0-beta.1", diff --git a/tests/affine-legacy/0.7.0-canary.18/package.json b/tests/affine-legacy/0.7.0-canary.18/package.json index 14f78aac10..1ab38d4ea9 100644 --- a/tests/affine-legacy/0.7.0-canary.18/package.json +++ b/tests/affine-legacy/0.7.0-canary.18/package.json @@ -9,10 +9,10 @@ "devDependencies": { "@affine-test/fixtures": "workspace:*", "@affine-test/kit": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@playwright/test": "^1.39.0", "express": "^4.18.2", "http-proxy-middleware": "^3.0.0-beta.1", diff --git a/tests/affine-legacy/0.8.0-canary.7/package.json b/tests/affine-legacy/0.8.0-canary.7/package.json index 4194514dad..df7e7f3fdc 100644 --- a/tests/affine-legacy/0.8.0-canary.7/package.json +++ b/tests/affine-legacy/0.8.0-canary.7/package.json @@ -9,10 +9,10 @@ "devDependencies": { "@affine-test/fixtures": "workspace:*", "@affine-test/kit": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@playwright/test": "^1.39.0", "express": "^4.18.2", "http-proxy-middleware": "^3.0.0-beta.1", diff --git a/tests/affine-legacy/0.8.4/package.json b/tests/affine-legacy/0.8.4/package.json index ef157edf9a..051b25bf10 100644 --- a/tests/affine-legacy/0.8.4/package.json +++ b/tests/affine-legacy/0.8.4/package.json @@ -9,10 +9,10 @@ "devDependencies": { "@affine-test/fixtures": "workspace:*", "@affine-test/kit": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@playwright/test": "^1.39.0", "express": "^4.18.2", "http-proxy-middleware": "^3.0.0-beta.1", diff --git a/tests/affine-local/e2e/quick-search.spec.ts b/tests/affine-local/e2e/quick-search.spec.ts index 27032c866c..6c21cc9e1c 100644 --- a/tests/affine-local/e2e/quick-search.spec.ts +++ b/tests/affine-local/e2e/quick-search.spec.ts @@ -400,7 +400,7 @@ test('can use cmdk to search page content and scroll to it, then the block will await page.keyboard.press('Enter', { delay: 10 }); } await page.keyboard.insertText('123456'); - const textBlock = page.locator('editor-container').getByText('123456'); + const textBlock = page.locator('affine-editor-container').getByText('123456'); await expect(textBlock).toBeVisible(); await clickSideBarAllPageButton(page); await openQuickSearchByShortcut(page); @@ -414,7 +414,7 @@ test('can use cmdk to search page content and scroll to it, then the block will await waitForScrollToFinish(page); const isVisitable = await checkElementIsInView( page, - page.locator('editor-container').getByText('123456') + page.locator('affine-editor-container').getByText('123456') ); expect(isVisitable).toBe(true); const selectionElement = page.locator('affine-block-selection'); diff --git a/tests/affine-migration/package.json b/tests/affine-migration/package.json index 1fd5ec53fe..6da3cdb8c3 100644 --- a/tests/affine-migration/package.json +++ b/tests/affine-migration/package.json @@ -7,10 +7,10 @@ "devDependencies": { "@affine-test/fixtures": "workspace:*", "@affine-test/kit": "workspace:*", - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@playwright/test": "^1.39.0" }, "version": "0.10.3-canary.2" diff --git a/tests/storybook/package.json b/tests/storybook/package.json index 08d61b449b..95535515a3 100644 --- a/tests/storybook/package.json +++ b/tests/storybook/package.json @@ -31,14 +31,14 @@ "wait-on": "^7.2.0" }, "devDependencies": { - "@blocksuite/block-std": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/blocks": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/global": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/block-std": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/blocks": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/global": "0.11.0-nightly-202312150424-f13b992", "@blocksuite/icons": "2.1.36", - "@blocksuite/lit": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/presets": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/store": "0.11.0-nightly-202312120309-2b3d2ba", - "@blocksuite/virgo": "0.11.0-nightly-202312120309-2b3d2ba", + "@blocksuite/inline": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/lit": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/presets": "0.11.0-nightly-202312150424-f13b992", + "@blocksuite/store": "0.11.0-nightly-202312150424-f13b992", "@dnd-kit/sortable": "^8.0.0", "@tomfreudenberg/next-auth-mock": "^0.5.6", "chromatic": "^9.1.0", diff --git a/yarn.lock b/yarn.lock index 88d7a70ac4..916f620c64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,10 +25,10 @@ __metadata: dependencies: "@affine-test/fixtures": "workspace:*" "@affine-test/kit": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@playwright/test": "npm:^1.39.0" express: "npm:^4.18.2" http-proxy-middleware: "npm:^3.0.0-beta.1" @@ -42,10 +42,10 @@ __metadata: dependencies: "@affine-test/fixtures": "workspace:*" "@affine-test/kit": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@playwright/test": "npm:^1.39.0" express: "npm:^4.18.2" http-proxy-middleware: "npm:^3.0.0-beta.1" @@ -59,10 +59,10 @@ __metadata: dependencies: "@affine-test/fixtures": "workspace:*" "@affine-test/kit": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@playwright/test": "npm:^1.39.0" express: "npm:^4.18.2" http-proxy-middleware: "npm:^3.0.0-beta.1" @@ -76,10 +76,10 @@ __metadata: dependencies: "@affine-test/fixtures": "workspace:*" "@affine-test/kit": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@playwright/test": "npm:^1.39.0" express: "npm:^4.18.2" http-proxy-middleware: "npm:^3.0.0-beta.1" @@ -138,10 +138,10 @@ __metadata: dependencies: "@affine-test/fixtures": "workspace:*" "@affine-test/kit": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@playwright/test": "npm:^1.39.0" languageName: unknown linkType: soft @@ -222,12 +222,12 @@ __metadata: "@affine/graphql": "workspace:*" "@affine/i18n": "workspace:*" "@affine/workspace": "workspace:*" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" "@blocksuite/icons": "npm:2.1.36" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/presets": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/presets": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@dnd-kit/core": "npm:^6.0.8" "@dnd-kit/modifiers": "npm:^7.0.0" "@dnd-kit/sortable": "npm:^8.0.0" @@ -350,14 +350,14 @@ __metadata: "@affine/templates": "workspace:*" "@affine/workspace": "workspace:*" "@aws-sdk/client-s3": "npm:3.433.0" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" "@blocksuite/icons": "npm:2.1.36" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/presets": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/virgo": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/inline": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/presets": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@dnd-kit/core": "npm:^6.0.8" "@dnd-kit/sortable": "npm:^8.0.0" "@emotion/cache": "npm:^11.11.0" @@ -463,10 +463,10 @@ __metadata: "@affine/sdk": "workspace:*" "@affine/templates": "workspace:*" "@affine/vue-hello-world-plugin": "workspace:*" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/presets": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/presets": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@electron-forge/cli": "npm:^7.2.0" "@electron-forge/core": "npm:^7.2.0" "@electron-forge/core-utils": "npm:^7.2.0" @@ -515,8 +515,8 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/env@workspace:packages/common/env" dependencies: - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" lit: "npm:^3.0.2" react: "npm:18.2.0" react-dom: "npm:18.2.0" @@ -707,11 +707,11 @@ __metadata: version: 0.0.0-use.local resolution: "@affine/sdk@workspace:packages/common/sdk" dependencies: - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/presets": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/presets": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" jotai: "npm:^2.5.1" vite: "npm:^5.0.6" vite-plugin-dts: "npm:3.6.0" @@ -836,14 +836,14 @@ __metadata: dependencies: "@affine/component": "workspace:*" "@affine/i18n": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" "@blocksuite/icons": "npm:2.1.36" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/presets": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/virgo": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/inline": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/presets": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@dnd-kit/sortable": "npm:^8.0.0" "@storybook/addon-actions": "npm:^7.5.3" "@storybook/addon-essentials": "npm:^7.5.3" @@ -4230,29 +4230,29 @@ __metadata: languageName: node linkType: hard -"@blocksuite/block-std@npm:0.11.0-nightly-202312120309-2b3d2ba": - version: 0.11.0-nightly-202312120309-2b3d2ba - resolution: "@blocksuite/block-std@npm:0.11.0-nightly-202312120309-2b3d2ba" +"@blocksuite/block-std@npm:0.11.0-nightly-202312150424-f13b992": + version: 0.11.0-nightly-202312150424-f13b992 + resolution: "@blocksuite/block-std@npm:0.11.0-nightly-202312150424-f13b992" dependencies: - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" lz-string: "npm:^1.5.0" w3c-keyname: "npm:^2.2.8" zod: "npm:^3.22.4" peerDependencies: - "@blocksuite/store": 0.11.0-nightly-202312120309-2b3d2ba - checksum: 0bfdfb84e3d39cdc28a36e66c5f426b7459880d1c29b3abb605ffd3d8ca21fa62ef1faf3634a5403425303f15f3b3b8df0ab7e03307bdb6ce29da62db358d60e + "@blocksuite/store": 0.11.0-nightly-202312150424-f13b992 + checksum: 405b49a9eb6eccc782a124af99178c085d3119c36ee0d20881cac29dc50cca96512a362cd6eeb0039e203ef271540057c747ef86ff9b4d75eabc56d1653241a5 languageName: node linkType: hard -"@blocksuite/blocks@npm:0.11.0-nightly-202312120309-2b3d2ba": - version: 0.11.0-nightly-202312120309-2b3d2ba - resolution: "@blocksuite/blocks@npm:0.11.0-nightly-202312120309-2b3d2ba" +"@blocksuite/blocks@npm:0.11.0-nightly-202312150424-f13b992": + version: 0.11.0-nightly-202312150424-f13b992 + resolution: "@blocksuite/blocks@npm:0.11.0-nightly-202312150424-f13b992" dependencies: - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/virgo": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/inline": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@floating-ui/dom": "npm:^1.5.3" "@toeverything/theme": "npm:^0.7.27" "@types/hast": "npm:^3.0.3" @@ -4286,16 +4286,16 @@ __metadata: unified: "npm:^11.0.4" webfontloader: "npm:^1.6.28" zod: "npm:^3.22.4" - checksum: a6f0359486e305b80e466be3f23edde2559cf82cee35075001ba55160d243ab82c217cda89ad5ee7d3594b4eee943f48bdd489c8cb28365ef3d40db97bda0427 + checksum: 0b775648a9a3151b0a14a7483e5080ea319aeede19112e6be738696da1cb578f22362fe9bc824e2310f12f3a4ea8e737db4073a0573c3503c841e22d606ea709 languageName: node linkType: hard -"@blocksuite/global@npm:0.11.0-nightly-202312120309-2b3d2ba": - version: 0.11.0-nightly-202312120309-2b3d2ba - resolution: "@blocksuite/global@npm:0.11.0-nightly-202312120309-2b3d2ba" +"@blocksuite/global@npm:0.11.0-nightly-202312150424-f13b992": + version: 0.11.0-nightly-202312150424-f13b992 + resolution: "@blocksuite/global@npm:0.11.0-nightly-202312150424-f13b992" dependencies: zod: "npm:^3.22.4" - checksum: c9d000d63e97776866045961affeae98c5f80f6336a643a5ae1d26b4e7c3de866482b97f545a86c9043d0c02653a50de7d4a1ef43cc0a60e0af2f5cc928f83be + checksum: 60a9e65f9bdd837e3dc9f342c1ff145565baca0bcb03abf43d1cb051a5697e2d439f3046ede79d53e2795fbd4cf8a4734f1b2bedac0357c40d873368aab5c83c languageName: node linkType: hard @@ -4309,41 +4309,55 @@ __metadata: languageName: node linkType: hard -"@blocksuite/lit@npm:0.11.0-nightly-202312120309-2b3d2ba": - version: 0.11.0-nightly-202312120309-2b3d2ba - resolution: "@blocksuite/lit@npm:0.11.0-nightly-202312120309-2b3d2ba" +"@blocksuite/inline@npm:0.11.0-nightly-202312150424-f13b992": + version: 0.11.0-nightly-202312150424-f13b992 + resolution: "@blocksuite/inline@npm:0.11.0-nightly-202312150424-f13b992" dependencies: - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/virgo": "npm:0.11.0-nightly-202312120309-2b3d2ba" - lit: "npm:^3.1.0" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + zod: "npm:^3.22.4" peerDependencies: - "@blocksuite/block-std": 0.11.0-nightly-202312120309-2b3d2ba - "@blocksuite/store": 0.11.0-nightly-202312120309-2b3d2ba - checksum: d41f336b485c1fe84b0879dfada2d0e92eb31ea94ecf5bf192e2253b7693103a52d648b91261285c9dc19eff68d964b4c62d9ddbcab688f019413937a1609256 + lit: ^3.0.2 + yjs: ^13 + checksum: 2eca53507377adca1aae286438ea02de05510c645eceb181649fe0ad7385239c09089860a0beb45c6fb4a6409a84492a7546daa13659a678624e29d19a15e140 languageName: node linkType: hard -"@blocksuite/presets@npm:0.11.0-nightly-202312120309-2b3d2ba": - version: 0.11.0-nightly-202312120309-2b3d2ba - resolution: "@blocksuite/presets@npm:0.11.0-nightly-202312120309-2b3d2ba" +"@blocksuite/lit@npm:0.11.0-nightly-202312150424-f13b992": + version: 0.11.0-nightly-202312150424-f13b992 + resolution: "@blocksuite/lit@npm:0.11.0-nightly-202312150424-f13b992" dependencies: - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/inline": "npm:0.11.0-nightly-202312150424-f13b992" + lit: "npm:^3.1.0" + peerDependencies: + "@blocksuite/block-std": 0.11.0-nightly-202312150424-f13b992 + "@blocksuite/store": 0.11.0-nightly-202312150424-f13b992 + checksum: a5ef79d2d0e130e83b8922f8fe8b42cb70df6962f8cd4a03f03c6eb81397b499df9f26a4146f5ebe5c6b8001aceb2718bb2924379a323ad1a9db100c893894ea + languageName: node + linkType: hard + +"@blocksuite/presets@npm:0.11.0-nightly-202312150424-f13b992": + version: 0.11.0-nightly-202312150424-f13b992 + resolution: "@blocksuite/presets@npm:0.11.0-nightly-202312150424-f13b992" + dependencies: + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@toeverything/theme": "npm:^0.7.27" lit: "npm:^3.1.0" openai: "npm:^4.20.1" - checksum: b7b17f5193f9ad28c5c2c5e1cf9c261f20dea766f31338317716ec3bf4d9e126e1875a86076a121b01cfd0187abf63b8e5a1321afaf861721ed18ed3365af1b8 + checksum: f7e9a9df282d653a1a976cd0b686a8b4d5eb34533c572e7d4f9c4ae4c2d1957c757330952c17ba5621d79c4f57e019ec0c753537ae2710a1f5a9b1e393965fef languageName: node linkType: hard -"@blocksuite/store@npm:0.11.0-nightly-202312120309-2b3d2ba": - version: 0.11.0-nightly-202312120309-2b3d2ba - resolution: "@blocksuite/store@npm:0.11.0-nightly-202312120309-2b3d2ba" +"@blocksuite/store@npm:0.11.0-nightly-202312150424-f13b992": + version: 0.11.0-nightly-202312150424-f13b992 + resolution: "@blocksuite/store@npm:0.11.0-nightly-202312150424-f13b992" dependencies: - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/virgo": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/inline": "npm:0.11.0-nightly-202312150424-f13b992" "@types/flexsearch": "npm:^0.7.3" flexsearch: "npm:0.7.21" idb-keyval: "npm:^6.2.1" @@ -4356,20 +4370,7 @@ __metadata: peerDependencies: async-call-rpc: ^6 yjs: ^13 - checksum: 4c2bd4db3ffa4a0eee3eba2895817ee03fade556bd78f3dac13baf3cd20f1a2d65c3d7066204559b6f7b2371c66eb254da565bbcb9f55c2cd837d16e1d5ab0f0 - languageName: node - linkType: hard - -"@blocksuite/virgo@npm:0.11.0-nightly-202312120309-2b3d2ba": - version: 0.11.0-nightly-202312120309-2b3d2ba - resolution: "@blocksuite/virgo@npm:0.11.0-nightly-202312120309-2b3d2ba" - dependencies: - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - zod: "npm:^3.22.4" - peerDependencies: - lit: ^3.0.2 - yjs: ^13 - checksum: 004f43a72f6bec6d8d4049337dd8307031da0f4d0a745bdecc7b9dd7fe6dc26c9b3209bcbb414cd5207bb7d1d932abf03d2c9d9a9c2f8533d2a51c8f3c6c7375 + checksum: 051f13964001676af77157b85ca411024979ed1df28453cf61d8490b9b4e4e2c189bf3204a56572dfb6565e18a48b8657d0c726c8a83976062d8cac819716401 languageName: node linkType: hard @@ -14108,12 +14109,12 @@ __metadata: dependencies: "@affine/debug": "workspace:*" "@affine/env": "workspace:*" - "@blocksuite/block-std": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/presets": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/block-std": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/presets": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@testing-library/react": "npm:^14.0.0" "@toeverything/infra": "workspace:*" "@types/image-blob-reduce": "npm:^4.1.3" @@ -14165,11 +14166,11 @@ __metadata: "@affine/env": "workspace:*" "@affine/sdk": "workspace:*" "@affine/templates": "workspace:*" - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/global": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/lit": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/presets": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/global": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/lit": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/presets": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" "@testing-library/react": "npm:^14.0.0" async-call-rpc: "npm:^6.3.1" electron: "link:../../frontend/electron/node_modules/electron" @@ -14218,8 +14219,8 @@ __metadata: version: 0.0.0-use.local resolution: "@toeverything/y-indexeddb@workspace:packages/common/y-indexeddb" dependencies: - "@blocksuite/blocks": "npm:0.11.0-nightly-202312120309-2b3d2ba" - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/blocks": "npm:0.11.0-nightly-202312150424-f13b992" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" fake-indexeddb: "npm:^5.0.0" idb: "npm:^8.0.0" nanoid: "npm:^5.0.3" @@ -37474,7 +37475,7 @@ __metadata: version: 0.0.0-use.local resolution: "y-provider@workspace:packages/common/y-provider" dependencies: - "@blocksuite/store": "npm:0.11.0-nightly-202312120309-2b3d2ba" + "@blocksuite/store": "npm:0.11.0-nightly-202312150424-f13b992" vite: "npm:^5.0.6" vite-plugin-dts: "npm:3.6.0" vitest: "npm:0.34.6"