From 93f82f11134766feed7190a8e5a7f2fa4b7936c2 Mon Sep 17 00:00:00 2001 From: fantasticit Date: Sat, 19 Nov 2022 12:23:15 +0800 Subject: [PATCH] resolve extensions --- .../core/extensions/scroll-into-view.ts | 52 ------------------- .../src/tiptap/editor/collaboration/kit.ts | 4 +- .../client/src/tiptap/editor/comment/kit.ts | 2 - 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 packages/client/src/tiptap/core/extensions/scroll-into-view.ts diff --git a/packages/client/src/tiptap/core/extensions/scroll-into-view.ts b/packages/client/src/tiptap/core/extensions/scroll-into-view.ts deleted file mode 100644 index 28f2cb0d..00000000 --- a/packages/client/src/tiptap/core/extensions/scroll-into-view.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Editor, Extension } from '@tiptap/core'; -import { throttle } from 'helpers/throttle'; -import { Plugin, PluginKey, Transaction } from 'prosemirror-state'; - -export const scrollIntoViewPluginKey = new PluginKey('scrollIntoViewPlugin'); - -type TransactionWithScroll = Transaction & { scrolledIntoView: boolean }; - -interface IScrollIntoViewOptions { - /** - * - * 滚动编辑器 - */ - onScroll: (editor: Editor) => void; -} - -export const ScrollIntoView = Extension.create({ - name: 'scrollIntoView', - - addOptions() { - return { - onScroll: () => {}, - }; - }, - - addProseMirrorPlugins() { - const { editor } = this; - - const onScroll = this.options.onScroll ? throttle(this.options.onScroll, 200) : (editor) => {}; - - return [ - new Plugin({ - key: scrollIntoViewPluginKey, - appendTransaction: (transactions, oldState, newState) => { - if (!transactions.length || !editor.isEditable) { - return; - } - const tr = transactions[0] as TransactionWithScroll; - if ( - (tr.docChanged || tr.storedMarksSet) && - !tr.scrolledIntoView && - tr.getMeta('scrollIntoView') !== false && - tr.getMeta('addToHistory') !== false - ) { - onScroll(editor); - return newState.tr.scrollIntoView(); - } - }, - }), - ]; - }, -}); diff --git a/packages/client/src/tiptap/editor/collaboration/kit.ts b/packages/client/src/tiptap/editor/collaboration/kit.ts index eec143dc..6a4d64b3 100644 --- a/packages/client/src/tiptap/editor/collaboration/kit.ts +++ b/packages/client/src/tiptap/editor/collaboration/kit.ts @@ -47,7 +47,6 @@ import { Paragraph } from 'tiptap/core/extensions/paragraph'; import { Paste } from 'tiptap/core/extensions/paste'; import { Placeholder } from 'tiptap/core/extensions/placeholder'; import { QuickInsert } from 'tiptap/core/extensions/quick-insert'; -import { ScrollIntoView } from 'tiptap/core/extensions/scroll-into-view'; import { SearchNReplace } from 'tiptap/core/extensions/search'; import { SelectionExtension } from 'tiptap/core/extensions/selection'; import { Status } from 'tiptap/core/extensions/status'; @@ -138,8 +137,7 @@ export const CollaborationKit = [ ListItem, Loading, OrderedList, - SelectionExtension, - ScrollIntoView, + // SelectionExtension, Strike, Subscript, Superscript, diff --git a/packages/client/src/tiptap/editor/comment/kit.ts b/packages/client/src/tiptap/editor/comment/kit.ts index 0ca7319b..ab9038bd 100644 --- a/packages/client/src/tiptap/editor/comment/kit.ts +++ b/packages/client/src/tiptap/editor/comment/kit.ts @@ -30,7 +30,6 @@ import { OrderedList } from 'tiptap/core/extensions/ordered-list'; import { Paragraph } from 'tiptap/core/extensions/paragraph'; import { Paste } from 'tiptap/core/extensions/paste'; import { Placeholder } from 'tiptap/core/extensions/placeholder'; -import { ScrollIntoView } from 'tiptap/core/extensions/scroll-into-view'; import { Strike } from 'tiptap/core/extensions/strike'; import { Subscript } from 'tiptap/core/extensions/subscript'; import { Superscript } from 'tiptap/core/extensions/superscript'; @@ -93,7 +92,6 @@ export const CommentKit = [ showOnlyWhenEditable: true, }), Strike, - ScrollIntoView, Subscript, Superscript, Table,