@seorii/tiptap 0.4.6 → 0.4.8

package/dist/plugin/command/emoji.d.ts

@@ -2,5 +2,5 @@ import { type SlashItem } from './stores.svelte';
 import { type SuggestionOptions } from '@tiptap/suggestion';
 import type { Editor } from '@tiptap/core';
 export declare const emoji: Omit<SuggestionOptions<SlashItem>, 'editor'>;
-declare const _default: (editor: Editor) => import("prosemirror-state").Plugin<any>;
+declare const _default: (editor: Editor) => import("@tiptap/pm/state").Plugin<any>;
 export default _default;

package/dist/plugin/command/suggest.d.ts

@@ -4,5 +4,5 @@ import { type SuggestionOptions } from '@tiptap/suggestion';
 type DetailInput = Exclude<SlashDetail, null | 'emoji'>;
 export declare function getDetail(editor: Editor, range: Range, option: DetailInput): void;
 export declare const suggest: Omit<SuggestionOptions<SlashGroup>, 'editor'>;
-declare const _default: (editor: Editor) => import("prosemirror-state").Plugin<any>;
+declare const _default: (editor: Editor) => import("@tiptap/pm/state").Plugin<any>;
 export default _default;

package/dist/plugin/image/dragdrop.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from 'prosemirror-state';
-import type { EditorView } from 'prosemirror-view';
+import { Plugin } from '@tiptap/pm/state';
+import type { EditorView } from '@tiptap/pm/view';
 export type UploadFn = (image: File) => Promise<string>;
 export declare const fallbackUpload: (image: File) => Promise<string>;
 export declare const releaseObjectUrlOnImageSettled: (view: EditorView, src: string) => void;

package/dist/plugin/image/dragdrop.js

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { Plugin } from '@tiptap/pm/state';
 import { insertUploadSkeleton } from '../upload/skeleton';
 export const fallbackUpload = async (image) => URL.createObjectURL(image);
 const OBJECT_URL_PREFIX = 'blob:';

package/dist/plugin/indent.js

@@ -2,7 +2,7 @@
 // https://github.com/ueberdosis/tiptap/issues/1036#issuecomment-981094752
 // https://github.com/django-tiptap/django_tiptap/blob/main/django_tiptap/templates/forms/tiptap_textarea.html#L453-L602
 import { Extension, isList } from '@tiptap/core';
-import { TextSelection, Transaction } from 'prosemirror-state';
+import { TextSelection, Transaction } from '@tiptap/pm/state';
 export const Indent = Extension.create({
     name: 'indent',
     addOptions() {

package/dist/plugin/mathPaste.d.ts

@@ -0,0 +1,3 @@
+import { Extension } from '@tiptap/core';
+declare const _default: Extension<any, any>;
+export default _default;

package/dist/plugin/mathPaste.js

@@ -0,0 +1,147 @@
+import { Extension } from '@tiptap/core';
+import { Fragment, Slice } from '@tiptap/pm/model';
+import { Plugin, PluginKey } from '@tiptap/pm/state';
+export default Extension.create({
+    name: 'mathPaste',
+    addProseMirrorPlugins() {
+        return [
+            new Plugin({
+                key: new PluginKey('mathPaste'),
+                props: {
+                    transformPasted: (slice, view) => {
+                        const { schema } = view.state;
+                        const mathInline = schema.nodes.math_inline;
+                        const mathDisplay = schema.nodes.math_display;
+                        if (!mathInline && !mathDisplay)
+                            return slice;
+                        let changed = false;
+                        let blockChanged = false;
+                        const transformFragment = (fragment, parent) => {
+                            const nodes = [];
+                            for (let index = 0; index < fragment.childCount; index++) {
+                                const node = fragment.child(index);
+                                if (parent?.type.spec.code ||
+                                    node.type.spec.code ||
+                                    node.type.name.startsWith('math_')) {
+                                    nodes.push(node);
+                                    continue;
+                                }
+                                if (mathDisplay && node.isTextblock && node.textContent.trim() === '$$') {
+                                    const source = [];
+                                    let endIndex = -1;
+                                    for (let offset = index + 1; offset < fragment.childCount; offset++) {
+                                        const candidate = fragment.child(offset);
+                                        if (candidate.type.spec.code ||
+                                            candidate.type.name.startsWith('math_') ||
+                                            !candidate.isTextblock) {
+                                            break;
+                                        }
+                                        const text = candidate.textContent;
+                                        if (text.trim() === '$$') {
+                                            endIndex = offset;
+                                            break;
+                                        }
+                                        source.push(text);
+                                    }
+                                    const text = source.join('\n').trim();
+                                    if (endIndex > -1 && text.length) {
+                                        nodes.push(mathDisplay.create(null, schema.text(text)));
+                                        index = endIndex;
+                                        changed = true;
+                                        blockChanged = true;
+                                        continue;
+                                    }
+                                }
+                                if (mathDisplay && node.isTextblock) {
+                                    const match = /^\s*\$\$([\s\S]*?)\$\$\s*$/.exec(node.textContent);
+                                    const text = match?.[1]?.trim();
+                                    if (text) {
+                                        nodes.push(mathDisplay.create(null, schema.text(text)));
+                                        changed = true;
+                                        blockChanged = true;
+                                        continue;
+                                    }
+                                }
+                                if (node.isText) {
+                                    if (!mathInline || node.marks.some((mark) => mark.type.spec.code)) {
+                                        nodes.push(node);
+                                        continue;
+                                    }
+                                    const text = node.text || '';
+                                    const inlineNodes = [];
+                                    let cursor = 0;
+                                    let searchFrom = 0;
+                                    while (searchFrom < text.length) {
+                                        const open = text.indexOf('$', searchFrom);
+                                        if (open === -1)
+                                            break;
+                                        const beforeOpen = text[open - 1];
+                                        const afterOpen = text[open + 1];
+                                        if (beforeOpen === '\\' ||
+                                            beforeOpen === '$' ||
+                                            afterOpen === '$' ||
+                                            !afterOpen ||
+                                            /\s/.test(afterOpen)) {
+                                            searchFrom = open + 1;
+                                            continue;
+                                        }
+                                        let close = open + 1;
+                                        while (close < text.length) {
+                                            close = text.indexOf('$', close);
+                                            if (close === -1)
+                                                break;
+                                            const beforeClose = text[close - 1];
+                                            const afterClose = text[close + 1];
+                                            if (beforeClose === '\\' ||
+                                                beforeClose === '$' ||
+                                                afterClose === '$' ||
+                                                /\s/.test(beforeClose)) {
+                                                close++;
+                                                continue;
+                                            }
+                                            break;
+                                        }
+                                        if (close === -1)
+                                            break;
+                                        const source = text.slice(open + 1, close);
+                                        if (!source.trim()) {
+                                            searchFrom = close + 1;
+                                            continue;
+                                        }
+                                        if (open > cursor)
+                                            inlineNodes.push(schema.text(text.slice(cursor, open), node.marks));
+                                        inlineNodes.push(mathInline.create(null, schema.text(source), node.marks));
+                                        cursor = close + 1;
+                                        searchFrom = cursor;
+                                    }
+                                    if (!inlineNodes.length) {
+                                        nodes.push(node);
+                                        continue;
+                                    }
+                                    if (cursor < text.length)
+                                        inlineNodes.push(schema.text(text.slice(cursor), node.marks));
+                                    nodes.push(...inlineNodes);
+                                    changed = true;
+                                    continue;
+                                }
+                                if (!node.content.size) {
+                                    nodes.push(node);
+                                    continue;
+                                }
+                                const content = transformFragment(node.content, node);
+                                nodes.push(content.eq(node.content) ? node : node.copy(content));
+                            }
+                            return Fragment.fromArray(nodes);
+                        };
+                        const content = transformFragment(slice.content, null);
+                        if (!changed)
+                            return slice;
+                        return blockChanged
+                            ? new Slice(content, 0, 0)
+                            : new Slice(content, slice.openStart, slice.openEnd);
+                    }
+                }
+            })
+        ];
+    }
+});

package/dist/plugin/orderedlist/toggleList.js

@@ -1,4 +1,4 @@
-import { canJoin } from 'prosemirror-transform';
+import { canJoin } from '@tiptap/pm/transform';
 import { getNodeType, findParentNode, isList } from '@tiptap/core';
 const joinListBackwards = (tr, listType) => {
     const list = findParentNode((node) => node.type === listType)(tr.selection);

package/dist/plugin/table/deleteTable.js

@@ -1,5 +1,5 @@
 import { isColumnSelected, isRowSelected, isTableSelected } from './util';
-import { TableMap } from 'prosemirror-tables';
+import { TableMap } from '@tiptap/pm/tables';
 export const deleteTable = ({ editor }) => {
     const { selection } = editor.state;
     if (!selection || !selection.$anchorCell)

package/dist/plugin/table/index.js

@@ -1,7 +1,7 @@
 import { Table as BuiltInTable } from '@tiptap/extension-table';
-import { Plugin } from 'prosemirror-state';
-import { tableEditing, columnResizing } from 'prosemirror-tables';
-import { Decoration, DecorationSet } from 'prosemirror-view';
+import { Plugin } from '@tiptap/pm/state';
+import { tableEditing, columnResizing } from '@tiptap/pm/tables';
+import { Decoration, DecorationSet } from '@tiptap/pm/view';
 import deleteTable from './deleteTable';
 import './style.css';
 const resolveTableElement = (view, pos) => {

package/dist/plugin/table/tableCell/index.js

@@ -1,6 +1,6 @@
 import { TableCell as BuiltInTableCell } from '@tiptap/extension-table-cell';
-import { Plugin } from 'prosemirror-state';
-import { Decoration, DecorationSet } from 'prosemirror-view';
+import { Plugin } from '@tiptap/pm/state';
+import { Decoration, DecorationSet } from '@tiptap/pm/view';
 import { getCellsInColumn, isRowSelected, isTableSelected, selectRow, selectTable } from '../util';
 export default BuiltInTableCell.extend({
     addAttributes() {

package/dist/plugin/table/tableHeader/index.js

@@ -1,6 +1,6 @@
 import { TableHeader as BuiltInTableHeader } from '@tiptap/extension-table-header';
-import { Plugin } from 'prosemirror-state';
-import { Decoration, DecorationSet } from 'prosemirror-view';
+import { Plugin } from '@tiptap/pm/state';
+import { Decoration, DecorationSet } from '@tiptap/pm/view';
 import { getCellsInRow, isColumnSelected, selectColumn } from '../util';
 export default BuiltInTableHeader.extend({
     addAttributes() {

package/dist/plugin/table/util.d.ts

@@ -1,6 +1,6 @@
-import type { Node, ResolvedPos } from 'prosemirror-model';
-import type { EditorState, Selection, Transaction } from 'prosemirror-state';
-import { CellSelection, type TableRect } from 'prosemirror-tables';
+import type { Node, ResolvedPos } from '@tiptap/pm/model';
+import type { EditorState, Selection, Transaction } from '@tiptap/pm/state';
+import { CellSelection, type TableRect } from '@tiptap/pm/tables';
 export declare const isRectSelected: (rect: any) => (selection: CellSelection) => boolean;
 export declare const findTable: (selection: Selection) => {
     pos: number;

package/dist/plugin/table/util.js

@@ -1,5 +1,5 @@
 import { findParentNode } from '@tiptap/core';
-import { CellSelection, selectionCell, TableMap } from 'prosemirror-tables';
+import { CellSelection, selectionCell, TableMap } from '@tiptap/pm/tables';
 export const isRectSelected = (rect) => (selection) => {
     const map = TableMap.get(selection.$anchorCell.node(-1));
     const start = selection.$anchorCell.start(-1);

package/dist/plugin/youtube.js

@@ -1,5 +1,5 @@
 import { Node, mergeAttributes } from '@tiptap/core';
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { Plugin, PluginKey } from '@tiptap/pm/state';
 const youtubeRegExp = /^(?:(?:https?:)?\/\/)?(?:www\.)?(?:m\.)?(?:youtu(?:be)?\.com\/(?:v\/|embed\/|watch(?:\/|\?v=))|youtu\.be\/)((?:\w|-){11})(?:\S+)?$/;
 const youtubeExtractId = (url) => {
     const match = youtubeRegExp.exec(url.trim());

package/dist/tiptap/TipTap.svelte

@@ -94,6 +94,7 @@
 			allowedTags: sanitizeHtml.defaults.allowedTags.concat([
 				'img',
 				'math-inline',
+				'math-display',
 				'math-node',
 				'iframe',
 				'lite-youtube',

package/dist/tiptap/tiptap.js

@@ -1,9 +1,22 @@
 import { Editor, Extension, mergeAttributes } from '@tiptap/core';
 import { CodeBlockLowlight } from '@tiptap/extension-code-block-lowlight';
 import { all, createLowlight } from 'lowlight';
+import { Blockquote } from '@tiptap/extension-blockquote';
+import { Bold } from '@tiptap/extension-bold';
+import { BulletList } from '@tiptap/extension-bullet-list';
 import Code from '@tiptap/extension-code';
+import { Document } from '@tiptap/extension-document';
+import { Gapcursor } from '@tiptap/extension-gapcursor';
+import { HardBreak } from '@tiptap/extension-hard-break';
+import { Heading } from '@tiptap/extension-heading';
+import { History } from '@tiptap/extension-history';
+import { HorizontalRule } from '@tiptap/extension-horizontal-rule';
+import { Italic } from '@tiptap/extension-italic';
+import { ListItem } from '@tiptap/extension-list-item';
+import { Paragraph } from '@tiptap/extension-paragraph';
+import { Strike } from '@tiptap/extension-strike';
+import { Text } from '@tiptap/extension-text';
 import Image from '../plugin/image';
-import StarterKit from '@tiptap/starter-kit';
 import Underline from '@tiptap/extension-underline';
 import Highlight from '@tiptap/extension-highlight';
 import Link from '@tiptap/extension-link';
@@ -24,6 +37,7 @@ import Embed from '../plugin/embed';
 import UploadSkeleton from '../plugin/upload/skeleton';
 // @ts-ignore
 import { MathInline, MathBlock } from '@seorii/prosemirror-math/tiptap';
+import MathPaste from '../plugin/mathPaste';
 import Youtube from '../plugin/youtube';
 import Placeholder from '@tiptap/extension-placeholder';
 import columns from '../plugin/columns';
@@ -213,54 +227,79 @@ const CodeBlockWithLanguageSelect = CodeBlockLowlight.extend({
         };
     }
 });
-const extensions = (placeholder, plugins, crossorigin, codeBlockLanguageLabels) => [
-    CodeBlockWithLanguageSelect.configure({
-        lowlight: lowlight(),
-        languageLabelMap: codeBlockLanguageLabels
-    }),
-    slashKeymap,
-    Image(crossorigin),
-    Youtube,
-    StarterKit,
-    Underline,
-    Highlight.configure({ multicolor: true }),
-    Link.configure({
-        openOnClick: true,
-        protocols: [
-            'ftp',
-            'mailto',
-            {
-                scheme: 'tel',
-                optionalSlashes: true
+const extensions = (placeholder, plugins, crossorigin, codeBlockLanguageLabels) => {
+    const pluginNames = new Set(plugins
+        .map((plugin) => plugin?.name)
+        .filter((name) => typeof name === 'string'));
+    const baseExtensions = [
+        Bold,
+        Blockquote,
+        BulletList,
+        Code.extend({
+            renderHTML({ HTMLAttributes }) {
+                return ['code', mergeAttributes(HTMLAttributes, { class: 'inline' })];
             }
-        ]
-    }),
-    TextAlign.configure({ types: ['heading', 'paragraph', 'image'] }),
-    DropCursor,
-    orderedlist,
-    MathInline,
-    MathBlock,
-    ...columns,
-    table,
-    tableHeader,
-    tableRow,
-    tableCell,
-    Superscript,
-    Subscript,
-    Indent,
-    Color,
-    TextStyle,
-    UploadSkeleton,
-    Iframe,
-    Embed,
-    Code.extend({
-        renderHTML({ HTMLAttributes }) {
-            return ['code', mergeAttributes(HTMLAttributes, { class: 'inline' })];
-        }
-    }),
-    Placeholder.configure({ placeholder }),
-    ...plugins
-];
+        }),
+        CodeBlockWithLanguageSelect.configure({
+            lowlight: lowlight(),
+            languageLabelMap: codeBlockLanguageLabels
+        }),
+        Document,
+        DropCursor,
+        Gapcursor,
+        HardBreak,
+        Heading,
+        History,
+        HorizontalRule,
+        Italic,
+        ListItem,
+        orderedlist,
+        Paragraph,
+        Strike,
+        Text,
+        slashKeymap,
+        Image(crossorigin),
+        Youtube,
+        Underline,
+        Highlight.configure({ multicolor: true }),
+        Link.configure({
+            openOnClick: true,
+            protocols: [
+                'ftp',
+                'mailto',
+                {
+                    scheme: 'tel',
+                    optionalSlashes: true
+                }
+            ]
+        }),
+        TextAlign.configure({ types: ['heading', 'paragraph', 'image'] }),
+        MathInline,
+        MathBlock,
+        MathPaste,
+        ...columns,
+        table,
+        tableHeader,
+        tableRow,
+        tableCell,
+        Superscript,
+        Subscript,
+        Indent,
+        Color,
+        TextStyle,
+        UploadSkeleton,
+        Iframe,
+        Embed,
+        Placeholder.configure({ placeholder })
+    ];
+    return [
+        ...baseExtensions.filter((extension) => {
+            const name = extension?.name;
+            return typeof name !== 'string' || !pluginNames.has(name);
+        }),
+        ...plugins
+    ];
+};
 export default (element, content, { placeholder = i18n('placeholder'), plugins = [], crossorigin, codeBlockLanguageLabels = {}, ...props } = {}) => {
     const tt = new Editor({
         element,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@seorii/tiptap",
-	"version": "0.4.6",
+	"version": "0.4.8",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "svelte-kit sync && svelte-package",
@@ -45,41 +45,52 @@
 	"type": "module",
 	"dependencies": {
 		"@justinribeiro/lite-youtube": "^1.9.0",
-		"@seorii/prosemirror-math": "^0.4.2",
+		"@seorii/prosemirror-math": "^0.5.0",
 		"@tiptap/core": "^2",
+		"@tiptap/extension-blockquote": "^2",
+		"@tiptap/extension-bold": "^2",
+		"@tiptap/extension-bullet-list": "^2",
 		"@tiptap/extension-code": "^2",
 		"@tiptap/extension-code-block": "^2",
 		"@tiptap/extension-code-block-lowlight": "^2",
 		"@tiptap/extension-color": "^2",
+		"@tiptap/extension-document": "^2",
 		"@tiptap/extension-dropcursor": "^2",
+		"@tiptap/extension-gapcursor": "^2",
+		"@tiptap/extension-hard-break": "^2",
+		"@tiptap/extension-heading": "^2",
 		"@tiptap/extension-highlight": "^2",
+		"@tiptap/extension-history": "^2",
+		"@tiptap/extension-horizontal-rule": "^2",
 		"@tiptap/extension-image": "^2",
+		"@tiptap/extension-italic": "^2",
 		"@tiptap/extension-link": "^2",
+		"@tiptap/extension-list-item": "^2",
 		"@tiptap/extension-ordered-list": "^2",
+		"@tiptap/extension-paragraph": "^2",
 		"@tiptap/extension-placeholder": "^2",
+		"@tiptap/extension-strike": "^2",
 		"@tiptap/extension-subscript": "^2",
 		"@tiptap/extension-superscript": "^2",
 		"@tiptap/extension-table": "^2",
 		"@tiptap/extension-table-cell": "^2",
 		"@tiptap/extension-table-header": "^2",
 		"@tiptap/extension-table-row": "^2",
+		"@tiptap/extension-text": "^2",
 		"@tiptap/extension-text-align": "^2",
 		"@tiptap/extension-text-style": "^2",
 		"@tiptap/extension-underline": "^2",
-		"@tiptap/html": "^2",
 		"@tiptap/pm": "^2",
-		"@tiptap/starter-kit": "^2",
 		"@tiptap/suggestion": "^2",
 		"emojis-keywords": "2.0.0",
 		"emojis-list": "3.0.0",
 		"lowlight": "^3.3.0",
 		"nunui": "2.0.0-next.51",
-		"prosemirror-commands": "^1.7.1",
-		"prosemirror-model": "^1.25.4",
-		"prosemirror-state": "^1.4.4",
-		"prosemirror-tables": "^1.8.5",
-		"prosemirror-transform": "^1.11.0",
-		"prosemirror-view": "^1.41.6",
+		"prosemirror-commands": "1.7.1",
+		"prosemirror-model": "1.25.4",
+		"prosemirror-state": "1.4.4",
+		"prosemirror-transform": "1.11.0",
+		"prosemirror-view": "1.41.6",
 		"sanitize-html": "^2.17.1",
 		"svelte-awesome-color-picker": "^4.1.2",
 		"svelte-tiptap": "^2",