From 5320993d7a89b2da6689ddc0db0a9f61b03a4af1 Mon Sep 17 00:00:00 2001 From: QiShaoXuan Date: Thu, 13 Oct 2022 14:38:57 +0800 Subject: [PATCH] feat: update blocksuit & adpat it --- next.config.js | 2 +- package.json | 6 ++-- pnpm-lock.yaml | 51 ++++++++++++++++++++------------- src/components/Header/index.tsx | 4 +-- src/components/editor.tsx | 26 +++++++++++++++-- 5 files changed, 61 insertions(+), 28 deletions(-) diff --git a/next.config.js b/next.config.js index 3d3bc9990d..56239b84be 100644 --- a/next.config.js +++ b/next.config.js @@ -1,6 +1,6 @@ /** @type {import('next').NextConfig} */ const nextConfig = { - reactStrictMode: true, + reactStrictMode: false, swcMinify: true, }; diff --git a/package.json b/package.json index 8f2c29177e..a75ccb5e07 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "lint": "next lint" }, "dependencies": { - "@blocksuite/blocks": "^0.2.1", - "@blocksuite/editor": "^0.2.1", - "@blocksuite/shared": "^0.2.1", + "@blocksuite/blocks": "^0.2.4", + "@blocksuite/editor": "^0.2.4", + "@blocksuite/store": "^0.2.4", "@emotion/css": "^11.10.0", "@emotion/react": "^11.10.4", "@emotion/server": "^11.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9d4f7bb37..c46df0f690 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,9 +1,9 @@ lockfileVersion: 5.4 specifiers: - '@blocksuite/blocks': ^0.2.1 - '@blocksuite/editor': ^0.2.1 - '@blocksuite/shared': ^0.2.1 + '@blocksuite/blocks': ^0.2.4 + '@blocksuite/editor': ^0.2.4 + '@blocksuite/store': ^0.2.4 '@emotion/css': ^11.10.0 '@emotion/react': ^11.10.4 '@emotion/server': ^11.10.0 @@ -25,9 +25,9 @@ specifiers: typescript: 4.8.3 dependencies: - '@blocksuite/blocks': 0.2.1 - '@blocksuite/editor': 0.2.1 - '@blocksuite/shared': 0.2.1 + '@blocksuite/blocks': 0.2.4 + '@blocksuite/editor': 0.2.4 + '@blocksuite/store': 0.2.4 '@emotion/css': 11.10.0 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/server': 11.10.0_@emotion+css@11.10.0 @@ -122,11 +122,11 @@ packages: to-fast-properties: 2.0.0 dev: false - /@blocksuite/blocks/0.2.1: - resolution: {integrity: sha512-IBUsuc+GeG12KGHXwY7tqA4QDWDnn33sIllWPCnDgnRcBnklAC4b8D+C3Iltn5LGkJ6/y5sujO563i8HTdWqFA==} + /@blocksuite/blocks/0.2.4: + resolution: {integrity: sha512-d8mBKt3Skk/fHR1i8tLzEYfkXUblEuuJXtQ6GrAdaU/yHwiM7R7+ZdO6AFOnJYPszX17AxQ4428ERe5qRhCDCA==} dependencies: - '@blocksuite/shared': 0.2.1 - '@blocksuite/store': 0.2.1 + '@blocksuite/shared': 0.2.4 + '@blocksuite/store': 0.2.4 lit: 2.3.1 quill: 1.3.7 quill-cursors: 4.0.0 @@ -136,24 +136,25 @@ packages: - utf-8-validate dev: false - /@blocksuite/editor/0.2.1: - resolution: {integrity: sha512-OUHRojBGprVFfadWEy8qoKo8C53uCDjuCGQX1Ek3BjwznQFeaw8qiJ1EKzVxtJZw2v1tb1ZB1vQ6Oo8oRZSkOA==} + /@blocksuite/editor/0.2.4: + resolution: {integrity: sha512-f+BpetqzeTwZAxXfwKdH86xZw3XOnKokfhsOMVkK3PJnaWiNn2Kn9jJ0DkqAAwltWscReK5PQW7/D32gdsj7OA==} dependencies: - '@blocksuite/blocks': 0.2.1 - '@blocksuite/shared': 0.2.1 - '@blocksuite/store': 0.2.1 + '@blocksuite/blocks': 0.2.4 + '@blocksuite/shared': 0.2.4 + '@blocksuite/store': 0.2.4 lit: 2.3.1 marked: 4.1.1 + turndown: 7.1.1 transitivePeerDependencies: - bufferutil - supports-color - utf-8-validate dev: false - /@blocksuite/shared/0.2.1: - resolution: {integrity: sha512-wdSfYIVj1sT5T9UxwgiECNEbkQVJnDonyoyz/3O8zznPvwB9wknLBEfvI5w/K0Orr9Nypzc7gaErz1bck7aECQ==} + /@blocksuite/shared/0.2.4: + resolution: {integrity: sha512-lc9J+Lty61V6w9xZ/KEj3CrMMRzwL2OfKQfAyrUErnzaTOUQj13CF1+yIfLSW4Ymu0BchU7mXDzMZIToeDOnEQ==} dependencies: - '@blocksuite/store': 0.2.1 + '@blocksuite/store': 0.2.4 hotkeys-js: 3.10.0 transitivePeerDependencies: - bufferutil @@ -161,8 +162,8 @@ packages: - utf-8-validate dev: false - /@blocksuite/store/0.2.1: - resolution: {integrity: sha512-EagjMW7YRZ6Tj4ipr/Z+kcXU7B3k22OC0WatRml+Pu/p1vyHVPMUsRynh5PLx+EmLkigI26P8bP1aJ70W9ilOw==} + /@blocksuite/store/0.2.4: + resolution: {integrity: sha512-SuUCvxzXaUWa5CLkRhXCbHRLYQo8r1G4VG4aKlhX3P4krrzAa5x77VxZ5qnvi9OHOxSHkeJ+oZdFbh1avtfHgw==} dependencies: lib0: 0.2.52 y-protocols: 1.0.5 @@ -948,6 +949,10 @@ packages: esutils: 2.0.3 dev: true + /domino/2.1.6: + resolution: {integrity: sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==} + dev: false + /duplexer2/0.1.4: resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==} dependencies: @@ -2488,6 +2493,12 @@ packages: typescript: 4.8.3 dev: true + /turndown/7.1.1: + resolution: {integrity: sha512-BEkXaWH7Wh7e9bd2QumhfAXk5g34+6QUmmWx+0q6ThaVOLuLUqsnkq35HQ5SBHSaxjSfSM7US5o4lhJNH7B9MA==} + dependencies: + domino: 2.1.6 + dev: false + /type-check/0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx index 61f368cab7..2e57a49167 100644 --- a/src/components/Header/index.tsx +++ b/src/components/Header/index.tsx @@ -90,11 +90,11 @@ export const Header = () => { useEffect(() => { setTimeout(() => { const editor = window.editor; - setTitle(editor.model.title); + setTitle(editor.model.title || ''); editor.model.propsUpdated.on(() => { setTitle(editor.model.title); }); - }, 1000); + }, 500); }, []); return ( diff --git a/src/components/editor.tsx b/src/components/editor.tsx index 65666a2468..6a15be8d57 100644 --- a/src/components/editor.tsx +++ b/src/components/editor.tsx @@ -1,4 +1,6 @@ +import { Suspense, useEffect, useRef } from 'react'; import type { EditorContainer } from '@blocksuite/editor'; +import { Text } from '@blocksuite/store'; import '@blocksuite/blocks'; import '@blocksuite/editor'; import '@blocksuite/blocks/style'; @@ -8,9 +10,29 @@ declare global { editor: EditorContainer; } } - export const Editor = () => { - return ; + const editorRef = useRef(); + + useEffect(() => { + const { store } = editorRef.current as EditorContainer; + + const pageId = store.addBlock({ + flavour: 'page', + title: 'Blocksuite live demo', + }); + const groupId = store.addBlock({ flavour: 'group' }, pageId); + + const text = new Text('Legend from here ...'); + store.addBlock({ flavour: 'paragraph', text }, groupId); + + store._history.clear(); + }, []); + + return ( + Error!}> + + + ); }; declare global {