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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.0.0-beta.175",
+  "version": "2.0.0-beta.176",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -45,5 +45,5 @@
     "directory": "packages/core"
   },
   "sideEffects": false,
-  "gitHead": "90e719c711dbccae6a7333956d543fb93789f3d3"
+  "gitHead": "1789af864fe36086df487cf8cd3e578b10de1564"
 }

package/src/Editor.ts

@@ -13,7 +13,7 @@ import { getHTMLFromFragment } from './helpers/getHTMLFromFragment'
 import { getText } from './helpers/getText'
 import { isNodeEmpty } from './helpers/isNodeEmpty'
 import { resolveFocusPosition } from './helpers/resolveFocusPosition'
-import { getTextSeralizersFromSchema } from './helpers/getTextSeralizersFromSchema'
+import { getTextSerializersFromSchema } from './helpers/getTextSerializersFromSchema'
 import { createStyleTag } from './utilities/createStyleTag'
 import { isFunction } from './utilities/isFunction'
 import { CommandManager } from './CommandManager'
@@ -57,6 +57,7 @@ export class Editor extends EventEmitter<EditorEvents> {
     element: document.createElement('div'),
     content: '',
     injectCSS: true,
+    injectNonce: undefined,
     extensions: [],
     autofocus: false,
     editable: true,
@@ -136,7 +137,7 @@ export class Editor extends EventEmitter<EditorEvents> {
    */
   private injectCSS(): void {
     if (this.options.injectCSS && document) {
-      this.css = createStyleTag(style)
+      this.css = createStyleTag(style, this.options.injectNonce)
     }
   }
 
@@ -435,7 +436,7 @@ export class Editor extends EventEmitter<EditorEvents> {
       blockSeparator,
       textSerializers: {
         ...textSerializers,
-        ...getTextSeralizersFromSchema(this.schema),
+        ...getTextSerializersFromSchema(this.schema),
       },
     })
   }

package/src/NodeView.ts

@@ -82,8 +82,12 @@ export class NodeView<
       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 = event.offsetX ?? (event as any).nativeEvent?.offsetX
+      const offsetY = event.offsetY ?? (event as any).nativeEvent?.offsetY
+
+      x = handleBox.x - domBox.x + offsetX
+      y = handleBox.y - domBox.y + offsetY
     }
 
     event.dataTransfer?.setDragImage(this.dom, x, y)

package/src/extensions/clipboardTextSerializer.ts

@@ -1,7 +1,7 @@
 import { Plugin, PluginKey } from 'prosemirror-state'
 import { Extension } from '../Extension'
 import { getTextBetween } from '../helpers/getTextBetween'
-import { getTextSeralizersFromSchema } from '../helpers/getTextSeralizersFromSchema'
+import { getTextSerializersFromSchema } from '../helpers/getTextSerializersFromSchema'
 
 export const ClipboardTextSerializer = Extension.create({
   name: 'clipboardTextSerializer',
@@ -18,7 +18,7 @@ export 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, {

package/src/helpers/generateText.ts

@@ -1,7 +1,7 @@
 import { Node } from 'prosemirror-model'
 import { getSchema } from './getSchema'
 import { Extensions, JSONContent, TextSerializer } from '../types'
-import { getTextSeralizersFromSchema } from './getTextSeralizersFromSchema'
+import { getTextSerializersFromSchema } from './getTextSerializersFromSchema'
 import { getText } from './getText'
 
 export function generateText(
@@ -23,7 +23,7 @@ export function generateText(
     blockSeparator,
     textSerializers: {
       ...textSerializers,
-      ...getTextSeralizersFromSchema(schema),
+      ...getTextSerializersFromSchema(schema),
     },
   })
 }

package/src/helpers/getMarkRange.ts

@@ -29,7 +29,11 @@ export function getMarkRange(
     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
@@ -41,7 +45,7 @@ export function getMarkRange(
     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

package/src/helpers/getTextBetween.ts

@@ -31,6 +31,7 @@ export function getTextBetween(
         pos,
         parent,
         index,
+        range,
       })
     } else if (node.isText) {
       text += node?.text?.slice(Math.max(from, pos) - pos, to - pos)

package/src/helpers/{getTextSeralizersFromSchema.ts → getTextSerializersFromSchema.ts}

@@ -1,7 +1,7 @@
 import { Schema } from 'prosemirror-model'
 import { TextSerializer } from '../types'
 
-export function getTextSeralizersFromSchema(schema: Schema): Record<string, TextSerializer> {
+export function getTextSerializersFromSchema(schema: Schema): Record<string, TextSerializer> {
   return Object.fromEntries(Object
     .entries(schema.nodes)
     .filter(([, node]) => node.spec.toText)

package/src/index.ts

@@ -47,6 +47,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/src/types.ts

@@ -70,6 +70,7 @@ export interface EditorOptions {
   content: Content,
   extensions: Extensions,
   injectCSS: boolean,
+  injectNonce: string | undefined,
   autofocus: FocusPosition,
   editable: boolean,
   editorProps: EditorProps,
@@ -243,6 +244,7 @@ export type TextSerializer = (props: {
   pos: number,
   parent: ProseMirrorNode,
   index: number,
+  range: Range,
 }) => string
 
 export type ExtendedRegExpMatchArray = RegExpMatchArray & {

package/src/utilities/createStyleTag.ts

@@ -1,4 +1,4 @@
-export function createStyleTag(style: string): HTMLStyleElement {
+export function createStyleTag(style: string, nonce?: string): HTMLStyleElement {
   const tipTapStyleTag = (<HTMLStyleElement>document.querySelector('style[data-tiptap-style]'))
 
   if (tipTapStyleTag !== null) {
@@ -7,6 +7,10 @@ export function createStyleTag(style: string): HTMLStyleElement {
 
   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)

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

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