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

package/dist/tiptap-core.umd.js

@@ -155,6 +155,7 @@
                   pos,
                   parent,
                   index,
+                  range,
               });
           }
           else if (node.isText) {
@@ -169,7 +170,7 @@
       return text;
   }
 
-  function getTextSeralizersFromSchema(schema) {
+  function getTextSerializersFromSchema(schema) {
       return Object.fromEntries(Object
           .entries(schema.nodes)
           .filter(([, node]) => node.spec.toText)
@@ -190,7 +191,7 @@
                           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,
@@ -402,7 +403,10 @@
       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;
       }
@@ -410,7 +414,7 @@
       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;
@@ -506,21 +510,20 @@
       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, }) => {
@@ -1192,7 +1195,7 @@
               ? { 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);
@@ -2097,8 +2100,6 @@
           };
           const pcKeymap = {
               ...baseKeymap,
-              Home: () => this.editor.commands.selectTextblockStart(),
-              End: () => this.editor.commands.selectTextblockEnd(),
           };
           const macKeymap = {
               ...baseKeymap,
@@ -2257,12 +2258,15 @@
       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);
@@ -3218,6 +3222,7 @@ img.ProseMirror-separator {
               element: document.createElement('div'),
               content: '',
               injectCSS: true,
+              injectNonce: undefined,
               extensions: [],
               autofocus: false,
               editable: true,
@@ -3289,7 +3294,7 @@ img.ProseMirror-separator {
        */
       injectCSS() {
           if (this.options.injectCSS && document) {
-              this.css = createStyleTag(style);
+              this.css = createStyleTag(style, this.options.injectNonce);
           }
       }
       /**
@@ -3520,7 +3525,7 @@ img.ProseMirror-separator {
               blockSeparator,
               textSerializers: {
                   ...textSerializers,
-                  ...getTextSeralizersFromSchema(this.schema),
+                  ...getTextSerializersFromSchema(this.schema),
               },
           });
       }
@@ -3716,7 +3721,7 @@ img.ProseMirror-separator {
           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
@@ -3735,10 +3740,13 @@ img.ProseMirror-separator {
           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());
@@ -4256,7 +4264,7 @@ img.ProseMirror-separator {
           blockSeparator,
           textSerializers: {
               ...textSerializers,
-              ...getTextSeralizersFromSchema(schema),
+              ...getTextSerializersFromSchema(schema),
           },
       });
   }
@@ -4446,6 +4454,7 @@ img.ProseMirror-separator {
   exports.getSchema = getSchema;
   exports.getText = getText;
   exports.getTextBetween = getTextBetween;
+  exports.getTextSerializersFromSchema = getTextSerializersFromSchema;
   exports.inputRulesPlugin = inputRulesPlugin;
   exports.isActive = isActive;
   exports.isList = isList;