@tiptap/core 2.0.0-beta.173 → 2.0.0-beta.176

package/dist/packages/core/src/helpers/getTextSerializersFromSchema.d.ts

@@ -0,0 +1,3 @@
+import { Schema } from 'prosemirror-model';
+import { TextSerializer } from '../types';
+export declare function getTextSerializersFromSchema(schema: Schema): Record<string, TextSerializer>;

package/dist/packages/core/src/index.d.ts

@@ -43,6 +43,7 @@ export * from './helpers/getNodeAttributes';
 export * from './helpers/getNodeType';
 export * from './helpers/getText';
 export * from './helpers/getTextBetween';
+export * from './helpers/getTextSerializersFromSchema';
 export * from './helpers/isActive';
 export * from './helpers/isList';
 export * from './helpers/isMarkActive';

package/dist/packages/core/src/types.d.ts

@@ -53,6 +53,7 @@ export interface EditorOptions {
     content: Content;
     extensions: Extensions;
     injectCSS: boolean;
+    injectNonce: string | undefined;
     autofocus: FocusPosition;
     editable: boolean;
     editorProps: EditorProps;
@@ -204,6 +205,7 @@ export declare type TextSerializer = (props: {
     pos: number;
     parent: ProseMirrorNode;
     index: number;
+    range: Range;
 }) => string;
 export declare type ExtendedRegExpMatchArray = RegExpMatchArray & {
     data?: Record<string, any>;

package/dist/packages/core/src/utilities/createStyleTag.d.ts

@@ -1 +1 @@
-export declare function createStyleTag(style: string): HTMLStyleElement;
+export declare function createStyleTag(style: string, nonce?: string): HTMLStyleElement;

package/dist/tiptap-core.cjs.js

@@ -161,6 +161,7 @@ function getTextBetween(startNode, range, options) {
                 pos,
                 parent,
                 index,
+                range,
             });
         }
         else if (node.isText) {
@@ -175,7 +176,7 @@ function getTextBetween(startNode, range, options) {
     return text;
 }
 
-function getTextSeralizersFromSchema(schema) {
+function getTextSerializersFromSchema(schema) {
     return Object.fromEntries(Object
         .entries(schema.nodes)
         .filter(([, node]) => node.spec.toText)
@@ -196,7 +197,7 @@ const ClipboardTextSerializer = Extension.create({
                         const { ranges } = selection;
                         const from = Math.min(...ranges.map(range => range.$from.pos));
                         const to = Math.max(...ranges.map(range => range.$to.pos));
-                        const textSerializers = getTextSeralizersFromSchema(schema);
+                        const textSerializers = getTextSerializersFromSchema(schema);
                         const range = { from, to };
                         return getTextBetween(doc, range, {
                             textSerializers,
@@ -408,7 +409,10 @@ function getMarkRange($pos, type, attributes = {}) {
     if (!$pos || !type) {
         return;
     }
-    const start = $pos.parent.childAfter($pos.parentOffset);
+    let start = $pos.parent.childAfter($pos.parentOffset);
+    if ($pos.parentOffset === start.offset && start.offset !== 0) {
+        start = $pos.parent.childBefore($pos.parentOffset);
+    }
     if (!start.node) {
         return;
     }
@@ -416,7 +420,7 @@ function getMarkRange($pos, type, attributes = {}) {
     if (!mark) {
         return;
     }
-    let startIndex = $pos.index();
+    let startIndex = start.index;
     let startPos = $pos.start() + start.offset;
     let endIndex = startIndex + 1;
     let endPos = startPos + start.node.nodeSize;
@@ -512,21 +516,20 @@ function resolveFocusPosition(doc, position = null) {
     if (!position) {
         return null;
     }
+    const selectionAtStart = prosemirrorState.Selection.atStart(doc);
+    const selectionAtEnd = prosemirrorState.Selection.atEnd(doc);
     if (position === 'start' || position === true) {
-        return prosemirrorState.Selection.atStart(doc);
+        return selectionAtStart;
     }
     if (position === 'end') {
-        return prosemirrorState.Selection.atEnd(doc);
+        return selectionAtEnd;
     }
+    const minPos = selectionAtStart.from;
+    const maxPos = selectionAtEnd.to;
     if (position === 'all') {
-        return prosemirrorState.TextSelection.create(doc, 0, doc.content.size);
-    }
-    // Check if `position` is in bounds of the doc if `position` is a number.
-    const minPos = prosemirrorState.Selection.atStart(doc).from;
-    const maxPos = prosemirrorState.Selection.atEnd(doc).to;
-    const resolvedFrom = minMax(position, minPos, maxPos);
-    const resolvedEnd = minMax(position, minPos, maxPos);
-    return prosemirrorState.TextSelection.create(doc, resolvedFrom, resolvedEnd);
+        return prosemirrorState.TextSelection.create(doc, minMax(0, minPos, maxPos), minMax(doc.content.size, minPos, maxPos));
+    }
+    return prosemirrorState.TextSelection.create(doc, minMax(position, minPos, maxPos), minMax(position, minPos, maxPos));
 }
 
 const focus = (position = null, options) => ({ editor, view, tr, dispatch, }) => {
@@ -1198,7 +1201,7 @@ const setTextSelection = position => ({ tr, dispatch }) => {
             ? { from: position, to: position }
             : position;
         const minPos = prosemirrorState.TextSelection.atStart(doc).from;
-        const maxPos = doc.content.size;
+        const maxPos = prosemirrorState.TextSelection.atEnd(doc).to;
         const resolvedFrom = minMax(from, minPos, maxPos);
         const resolvedEnd = minMax(to, minPos, maxPos);
         const selection = prosemirrorState.TextSelection.create(doc, resolvedFrom, resolvedEnd);
@@ -2103,8 +2106,6 @@ const Keymap = Extension.create({
         };
         const pcKeymap = {
             ...baseKeymap,
-            Home: () => this.editor.commands.selectTextblockStart(),
-            End: () => this.editor.commands.selectTextblockEnd(),
         };
         const macKeymap = {
             ...baseKeymap,
@@ -2263,12 +2264,15 @@ function isNodeEmpty(node) {
     return JSON.stringify(defaultContent) === JSON.stringify(content);
 }
 
-function createStyleTag(style) {
+function createStyleTag(style, nonce) {
     const tipTapStyleTag = document.querySelector('style[data-tiptap-style]');
     if (tipTapStyleTag !== null) {
         return tipTapStyleTag;
     }
     const styleNode = document.createElement('style');
+    if (nonce) {
+        styleNode.setAttribute('nonce', nonce);
+    }
     styleNode.setAttribute('data-tiptap-style', '');
     styleNode.innerHTML = style;
     document.getElementsByTagName('head')[0].appendChild(styleNode);
@@ -3224,6 +3228,7 @@ class Editor extends EventEmitter {
             element: document.createElement('div'),
             content: '',
             injectCSS: true,
+            injectNonce: undefined,
             extensions: [],
             autofocus: false,
             editable: true,
@@ -3295,7 +3300,7 @@ class Editor extends EventEmitter {
      */
     injectCSS() {
         if (this.options.injectCSS && document) {
-            this.css = createStyleTag(style);
+            this.css = createStyleTag(style, this.options.injectNonce);
         }
     }
     /**
@@ -3526,7 +3531,7 @@ class Editor extends EventEmitter {
             blockSeparator,
             textSerializers: {
                 ...textSerializers,
-                ...getTextSeralizersFromSchema(this.schema),
+                ...getTextSerializersFromSchema(this.schema),
             },
         });
     }
@@ -3722,7 +3727,7 @@ class NodeView {
         return null;
     }
     onDragStart(event) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g;
         const { view } = this.editor;
         const target = event.target;
         // get the drag handle element
@@ -3741,10 +3746,13 @@ class NodeView {
         if (this.dom !== dragHandle) {
             const domBox = this.dom.getBoundingClientRect();
             const handleBox = dragHandle.getBoundingClientRect();
-            x = handleBox.x - domBox.x + event.offsetX;
-            y = handleBox.y - domBox.y + event.offsetY;
+            // In React, we have to go through nativeEvent to reach offsetX/offsetY.
+            const offsetX = (_c = event.offsetX) !== null && _c !== void 0 ? _c : (_d = event.nativeEvent) === null || _d === void 0 ? void 0 : _d.offsetX;
+            const offsetY = (_e = event.offsetY) !== null && _e !== void 0 ? _e : (_f = event.nativeEvent) === null || _f === void 0 ? void 0 : _f.offsetY;
+            x = handleBox.x - domBox.x + offsetX;
+            y = handleBox.y - domBox.y + offsetY;
         }
-        (_c = event.dataTransfer) === null || _c === void 0 ? void 0 : _c.setDragImage(this.dom, x, y);
+        (_g = event.dataTransfer) === null || _g === void 0 ? void 0 : _g.setDragImage(this.dom, x, y);
         // we need to tell ProseMirror that we want to move the whole node
         // so we create a NodeSelection
         const selection = prosemirrorState.NodeSelection.create(view.state.doc, this.getPos());
@@ -4262,7 +4270,7 @@ function generateText(doc, extensions, options) {
         blockSeparator,
         textSerializers: {
             ...textSerializers,
-            ...getTextSeralizersFromSchema(schema),
+            ...getTextSerializersFromSchema(schema),
         },
     });
 }
@@ -4452,6 +4460,7 @@ exports.getNodeType = getNodeType;
 exports.getSchema = getSchema;
 exports.getText = getText;
 exports.getTextBetween = getTextBetween;
+exports.getTextSerializersFromSchema = getTextSerializersFromSchema;
 exports.inputRulesPlugin = inputRulesPlugin;
 exports.isActive = isActive;
 exports.isList = isList;