feat: upgrade to latest tiptap, pm type import from tiptap/pm

Leecason · Oct 26, 2023 · bcfdf40 · bcfdf40
1 parent d96dcea
commit bcfdf40
Show file tree

Hide file tree

Showing 8 changed files with 361 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -53,7 +53,8 @@
     "@tiptap/extension-text-align": "^2.0.0-beta.29",
     "@tiptap/extension-text-style": "^2.0.0-beta.23",
     "@tiptap/extension-underline": "^2.0.0-beta.22",
-    "@tiptap/vue-3": "^2.0.0-beta.90",
+    "@tiptap/pm": "^2.1.12",
+    "@tiptap/vue-3": "^2.1.12",
     "core-js": "^3.4.3"
   },
   "devDependencies": {

diff --git a/src/components/MenuBubble/index.vue b/src/components/MenuBubble/index.vue
@@ -38,7 +38,7 @@
 import { defineComponent, inject } from 'vue';
 import { Editor, BubbleMenu } from '@tiptap/vue-3';
 import { getMarkRange } from '@tiptap/core';
-import { TextSelection, AllSelection, Selection } from 'prosemirror-state';
+import { TextSelection, AllSelection, Selection } from '@tiptap/pm/state';
 import VIcon from '../Icon/Icon.vue';
 import LinkBubbleMenu from './LinkBubbleMenu.vue';
 

diff --git a/src/extensions/link.ts b/src/extensions/link.ts
@@ -1,8 +1,8 @@
 import { getMarkRange } from '@tiptap/core';
 import type { Editor } from '@tiptap/core';
 import TiptapLink from '@tiptap/extension-link';
-import { Plugin, TextSelection } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
+import { Plugin, TextSelection } from '@tiptap/pm/state';
+import { EditorView } from '@tiptap/pm/view';
 import AddLinkCommandButton from '@/components/MenuCommands/Link/AddLinkCommandButton.vue';
 
 const Link = TiptapLink.extend({

diff --git a/src/utils/indent.ts b/src/utils/indent.ts
@@ -1,6 +1,6 @@
 import type { Command, Editor } from '@tiptap/core';
 import { isList } from '@tiptap/core';
-import { TextSelection, AllSelection, Transaction } from 'prosemirror-state';
+import { TextSelection, AllSelection, Transaction } from '@tiptap/pm/state';
 import { clamp } from './shared';
 
 export const enum IndentProps {

diff --git a/src/utils/line-height.ts b/src/utils/line-height.ts
@@ -3,8 +3,8 @@ import {
   AllSelection,
   EditorState,
   Transaction,
-} from 'prosemirror-state';
-import { Node as ProsemirrorNode, NodeType } from 'prosemirror-model';
+} from '@tiptap/pm/state';
+import { Node as ProsemirrorNode, NodeType } from '@tiptap/pm/model';
 import { LINE_HEIGHT_100, DEFAULT_LINE_HEIGHT } from '@/constants';
 import type { Command } from '@tiptap/core';
 

diff --git a/src/utils/print.ts b/src/utils/print.ts
@@ -1,19 +1,25 @@
-import { EditorView } from 'prosemirror-view';
+import { EditorView } from '@tiptap/pm/view';
 import Logger from './logger';
 
 function printHtml(dom: Element) {
-  const style :string = Array.from(document.querySelectorAll('style, link'))
-    .reduce((str, style) => str + style.outerHTML, '');
+  const style: string = Array.from(
+    document.querySelectorAll('style, link')
+  ).reduce((str, style) => str + style.outerHTML, '');
 
   const content: string = style + dom.outerHTML;
 
   const iframe: HTMLIFrameElement = document.createElement('iframe');
   iframe.id = 'el-tiptap-iframe';
-  iframe.setAttribute('style', 'position: absolute; width: 0; height: 0; top: -10px; left: -10px;');
+  iframe.setAttribute(
+    'style',
+    'position: absolute; width: 0; height: 0; top: -10px; left: -10px;'
+  );
   document.body.appendChild(iframe);
 
   const frameWindow = iframe.contentWindow;
-  const doc = iframe.contentDocument || (iframe.contentWindow && iframe.contentWindow.document);
+  const doc =
+    iframe.contentDocument ||
+    (iframe.contentWindow && iframe.contentWindow.document);
 
   if (doc) {
     doc.open();
@@ -22,7 +28,7 @@ function printHtml(dom: Element) {
   }
 
   if (frameWindow) {
-    iframe.onload = function() {
+    iframe.onload = function () {
       try {
         setTimeout(() => {
           frameWindow.focus();
@@ -39,7 +45,7 @@ function printHtml(dom: Element) {
         Logger.error(err);
       }
 
-      setTimeout(function() {
+      setTimeout(function () {
         document.body.removeChild(iframe);
       }, 100);
     };

diff --git a/src/utils/table.ts b/src/utils/table.ts
@@ -1,5 +1,5 @@
-import { mergeCells, splitCell } from 'prosemirror-tables';
-import { EditorState } from 'prosemirror-state';
+import { mergeCells, splitCell } from '@tiptap/pm/tables';
+import { EditorState } from '@tiptap/pm/state';
 
 export function isTableActive(state: EditorState): boolean {
   const { selection, doc } = state;
@@ -12,7 +12,10 @@ export function isTableActive(state: EditorState): boolean {
     const name = node.type.name;
     if (
       keepLooking &&
-      (name === 'table' || name === 'table_row' || name === 'table_column' || name === 'table_cell')
+      (name === 'table' ||
+        name === 'table_row' ||
+        name === 'table_column' ||
+        name === 'table_cell')
     ) {
       keepLooking = false;
       active = true;