From 6497691b907a8d5a0f8f6cc259dabd84f254c8c0 Mon Sep 17 00:00:00 2001 From: QiShaoXuan Date: Mon, 24 Oct 2022 16:14:44 +0800 Subject: [PATCH 1/2] feat: modify theme color --- packages/app/src/styles/theme.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app/src/styles/theme.ts b/packages/app/src/styles/theme.ts index e07b9a33d4..2539466320 100644 --- a/packages/app/src/styles/theme.ts +++ b/packages/app/src/styles/theme.ts @@ -65,9 +65,9 @@ export const darkTheme: AffineTheme = { linkColor: '#7D91FF', linkColor2: '#6880FF', linkVisitedColor: '#505FAB', - popoverColor: '#A9B1C6', + popoverColor: '#C6CBD9', codeColor: '#BDDBFD', - quoteColor: '#A9B1C6', + quoteColor: '#C6CBD9', placeHolderColor: '#C7C7C7', selectedColor: 'rgba(240, 242, 255, 0.8)', borderColor: '#4D4C53', From c9a7007542c8b18a15b2ef4605f685a38758e5ac Mon Sep 17 00:00:00 2001 From: QiShaoXuan Date: Mon, 24 Oct 2022 16:42:29 +0800 Subject: [PATCH 2/2] feat: update editor version --- packages/app/package.json | 5 ++--- packages/app/src/components/editor.tsx | 3 --- pnpm-lock.yaml | 28 ++++++++++++-------------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 783dcfae73..b96709cb27 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -10,9 +10,8 @@ "lint": "next lint" }, "dependencies": { - "@blocksuite/blocks": "^0.2.15", - "@blocksuite/editor": "^0.2.15", - "@blocksuite/store": "^0.2.15", + "@blocksuite/blocks": "^0.2.16", + "@blocksuite/editor": "^0.2.16", "@emotion/css": "^11.10.0", "@emotion/react": "^11.10.4", "@emotion/server": "^11.10.0", diff --git a/packages/app/src/components/editor.tsx b/packages/app/src/components/editor.tsx index 1dfce1378c..0f8a526d97 100644 --- a/packages/app/src/components/editor.tsx +++ b/packages/app/src/components/editor.tsx @@ -1,6 +1,5 @@ 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'; @@ -18,8 +17,6 @@ export const Editor = () => { title: 'Welcome to the AFFiNE Alpha', }); const groupId = store.addBlock({ flavour: 'group' }, pageId); - // const text = new Text(store, 'Legend from here...'); - // store.addBlock({ flavour: 'paragraph', text }, groupId); editorRef.current!.clipboard.importMarkdown(exampleMarkdown, `${groupId}`); store.resetHistory(); }, [setEditor]); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 441783e378..820934ab1f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,9 +18,8 @@ importers: packages/app: specifiers: - '@blocksuite/blocks': ^0.2.15 - '@blocksuite/editor': ^0.2.15 - '@blocksuite/store': ^0.2.15 + '@blocksuite/blocks': ^0.2.16 + '@blocksuite/editor': ^0.2.16 '@emotion/css': ^11.10.0 '@emotion/react': ^11.10.4 '@emotion/server': ^11.10.0 @@ -48,9 +47,8 @@ importers: react-dom: 18.2.0 typescript: 4.8.3 dependencies: - '@blocksuite/blocks': 0.2.15 - '@blocksuite/editor': 0.2.15 - '@blocksuite/store': 0.2.15 + '@blocksuite/blocks': 0.2.16 + '@blocksuite/editor': 0.2.16 '@emotion/css': 11.10.0 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/server': 11.10.0_@emotion+css@11.10.0 @@ -166,10 +164,10 @@ packages: to-fast-properties: 2.0.0 dev: false - /@blocksuite/blocks/0.2.15: - resolution: {integrity: sha512-out76i3+ykhIyM/QJglDocGZ8zcnbWLhY73+I/CKEKlbG5Ujj9bsnPGbXRz1gWB0XDjDUqw/dZJPIQGUu5qieA==} + /@blocksuite/blocks/0.2.16: + resolution: {integrity: sha512-WJn7EQRlT/llQmFVmp3kgSx2+yCy0ogs0eUZZRR0Hlp6igk6LxVZnHW70QMJOPXVTmMMeDEvoNQvDmDnA+kryw==} dependencies: - '@blocksuite/store': 0.2.15 + '@blocksuite/store': 0.2.16 hotkeys-js: 3.10.0 lit: 2.4.0 quill: 1.3.7 @@ -180,11 +178,11 @@ packages: - utf-8-validate dev: false - /@blocksuite/editor/0.2.15: - resolution: {integrity: sha512-Q8Tdf50MuPvyzwriHd78nUhiX3iImmNsQWZOPvEB1wwW6hPz/bAJzxYy7SshVFC5Nq++xeNO20CyqSqT4zUpbQ==} + /@blocksuite/editor/0.2.16: + resolution: {integrity: sha512-Ccw2dHaJF/GKqSa22dDZ3LrHH1NzOpgGBonaqf0/KooBuQs0vlvpnyfFL2iqBHwLQ4rFNN77jUfUbd/VYAjxhQ==} dependencies: - '@blocksuite/blocks': 0.2.15 - '@blocksuite/store': 0.2.15 + '@blocksuite/blocks': 0.2.16 + '@blocksuite/store': 0.2.16 lit: 2.4.0 marked: 4.1.1 turndown: 7.1.1 @@ -194,8 +192,8 @@ packages: - utf-8-validate dev: false - /@blocksuite/store/0.2.15: - resolution: {integrity: sha512-KM2//LBT5UrfdAN5ByKngALxayileBcknYbvhdjPtPUoyjkTPa0O8LFMUc5fkV8lowDdwgjyS8zu+MG7rd2sdw==} + /@blocksuite/store/0.2.16: + resolution: {integrity: sha512-80ksZF5rWXrPYw2znk2HyNs5KPCrnE31pv6IishndR8hXn/JUA0nj60ZS7GnL19hgnwG8naqh8aQSoxPGqyF/A==} dependencies: lib0: 0.2.52 y-protocols: 1.0.5