From 1ef72c936a48b34d0d5717f730caafd2c7340b52 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Sat, 2 Apr 2022 17:56:21 +0800 Subject: [PATCH] feat: add comment kit --- .../components/document/comments/index.tsx | 4 +- .../src/components/document/editor/editor.tsx | 4 +- .../src/components/document/editor/index.tsx | 4 ++ .../src/components/document/reader/editor.tsx | 4 +- .../src/components/document/version/index.tsx | 4 +- .../src/components/template/editor/editor.tsx | 4 +- .../src/components/template/reader/editor.tsx | 4 +- packages/client/src/tiptap/basekit.tsx | 37 +++++++++++++++++++ 8 files changed, 53 insertions(+), 12 deletions(-) diff --git a/packages/client/src/components/document/comments/index.tsx b/packages/client/src/components/document/comments/index.tsx index 6a7c2833..03a138cc 100644 --- a/packages/client/src/components/document/comments/index.tsx +++ b/packages/client/src/components/document/comments/index.tsx @@ -2,7 +2,7 @@ import React, { useRef, useState } from 'react'; import { useEditor, EditorContent } from '@tiptap/react'; import { Avatar, Button, Space, Typography, Banner, Pagination } from '@douyinfe/semi-ui'; import { useToggle } from 'hooks/use-toggle'; -import { DEFAULT_EXTENSION, Document, History, CommentMenuBar } from 'tiptap'; +import { CommentKit, Document, History, CommentMenuBar } from 'tiptap'; import { DataRender } from 'components/data-render'; import { useUser } from 'data/user'; import { useComments } from 'data/comment'; @@ -34,7 +34,7 @@ export const CommentEditor: React.FC = ({ documentId }) => { const editor = useEditor({ editable: true, - extensions: [...DEFAULT_EXTENSION, Document, History], + extensions: [...CommentKit, Document, History], }); const openEditor = () => { diff --git a/packages/client/src/components/document/editor/editor.tsx b/packages/client/src/components/document/editor/editor.tsx index c6e86462..904cb6ed 100644 --- a/packages/client/src/components/document/editor/editor.tsx +++ b/packages/client/src/components/document/editor/editor.tsx @@ -7,7 +7,7 @@ import { useToggle } from 'hooks/use-toggle'; import { useNetwork } from 'hooks/use-network'; import { MenuBar, - DEFAULT_EXTENSION, + BaseKit, DocumentWithTitle, getCollaborationExtension, getCollaborationCursorExtension, @@ -54,7 +54,7 @@ export const Editor: React.FC = ({ user, documentId, authority, classNam const editor = useEditor({ editable: authority && authority.editable, extensions: [ - ...DEFAULT_EXTENSION, + ...BaseKit, DocumentWithTitle, getCollaborationExtension(provider), getCollaborationCursorExtension(provider, user), diff --git a/packages/client/src/components/document/editor/index.tsx b/packages/client/src/components/document/editor/index.tsx index 83032317..16d2c675 100644 --- a/packages/client/src/components/document/editor/index.tsx +++ b/packages/client/src/components/document/editor/index.tsx @@ -13,6 +13,8 @@ import { DocumentStar } from 'components/document/star'; import { DocumentCollaboration } from 'components/document/collaboration'; import { DocumentStyle } from 'components/document/style'; import { DocumentVersion } from 'components/document/version'; +import { User } from 'components/user'; +import { Divider } from 'components/divider'; import { useDocumentStyle } from 'hooks/use-document-style'; import { EventEmitter } from 'helpers/event-emitter'; import { Editor } from './editor'; @@ -101,6 +103,8 @@ export const DocumentEditor: React.FC = ({ documentId }) => {