@tiptap/core 2.2.0-rc.3 → 2.2.0-rc.5

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

@@ -18,16 +18,20 @@ export declare class PasteRule {
         commands: SingleCommands;
         chain: () => ChainedCommands;
         can: () => CanCommands;
+        pasteEvent: ClipboardEvent;
+        dropEvent: DragEvent;
     }) => void | null;
     constructor(config: {
         find: PasteRuleFinder;
         handler: (props: {
-            state: EditorState;
-            range: Range;
-            match: ExtendedRegExpMatchArray;
-            commands: SingleCommands;
-            chain: () => ChainedCommands;
             can: () => CanCommands;
+            chain: () => ChainedCommands;
+            commands: SingleCommands;
+            dropEvent: DragEvent;
+            match: ExtendedRegExpMatchArray;
+            pasteEvent: ClipboardEvent;
+            range: Range;
+            state: EditorState;
         }) => void | null;
     });
 }

package/dist/packages/core/src/pasteRules/markPasteRule.d.ts

@@ -8,5 +8,5 @@ import { ExtendedRegExpMatchArray } from '../types.js';
 export declare function markPasteRule(config: {
     find: PasteRuleFinder;
     type: MarkType;
-    getAttributes?: Record<string, any> | ((match: ExtendedRegExpMatchArray) => Record<string, any>) | false | null;
+    getAttributes?: Record<string, any> | ((match: ExtendedRegExpMatchArray, event: ClipboardEvent) => Record<string, any>) | false | null;
 }): PasteRule;

package/dist/packages/core/src/pasteRules/nodePasteRule.d.ts

@@ -8,5 +8,5 @@ import { ExtendedRegExpMatchArray } from '../types.js';
 export declare function nodePasteRule(config: {
     find: PasteRuleFinder;
     type: NodeType;
-    getAttributes?: Record<string, any> | ((match: ExtendedRegExpMatchArray) => Record<string, any>) | false | null;
+    getAttributes?: Record<string, any> | ((match: ExtendedRegExpMatchArray, event: ClipboardEvent) => Record<string, any>) | false | null;
 }): PasteRule;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.2.0-rc.3",
+  "version": "2.2.0-rc.5",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -32,7 +32,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/pm": "^2.2.0-rc.3"
+    "@tiptap/pm": "^2.2.0-rc.5"
   },
   "peerDependencies": {
     "@tiptap/pm": "^2.0.0"

package/src/Extension.ts

@@ -357,7 +357,7 @@ export class Extension<Options = any, Storage = any> {
   extend<ExtendedOptions = Options, ExtendedStorage = Storage>(
     extendedConfig: Partial<ExtensionConfig<ExtendedOptions, ExtendedStorage>> = {},
   ) {
-    const extension = new Extension<ExtendedOptions, ExtendedStorage>(extendedConfig)
+    const extension = new Extension<ExtendedOptions, ExtendedStorage>({ ...this.config, ...extendedConfig })
 
     extension.parent = this
 

package/src/Mark.ts

@@ -489,7 +489,7 @@ export class Mark<Options = any, Storage = any> {
   extend<ExtendedOptions = Options, ExtendedStorage = Storage>(
     extendedConfig: Partial<MarkConfig<ExtendedOptions, ExtendedStorage>> = {},
   ) {
-    const extension = new Mark<ExtendedOptions, ExtendedStorage>(extendedConfig)
+    const extension = new Mark<ExtendedOptions, ExtendedStorage>({ ...this.config, ...extendedConfig })
 
     extension.parent = this
 

package/src/Node.ts

@@ -598,7 +598,7 @@ export class Node<Options = any, Storage = any> {
   extend<ExtendedOptions = Options, ExtendedStorage = Storage>(
     extendedConfig: Partial<NodeConfig<ExtendedOptions, ExtendedStorage>> = {},
   ) {
-    const extension = new Node<ExtendedOptions, ExtendedStorage>(extendedConfig)
+    const extension = new Node<ExtendedOptions, ExtendedStorage>({ ...this.config, ...extendedConfig })
 
     extension.parent = this
 

package/src/PasteRule.ts

@@ -33,17 +33,21 @@ export class PasteRule {
     commands: SingleCommands
     chain: () => ChainedCommands
     can: () => CanCommands
+    pasteEvent: ClipboardEvent
+    dropEvent: DragEvent
   }) => void | null
 
   constructor(config: {
     find: PasteRuleFinder
     handler: (props: {
-      state: EditorState
-      range: Range
-      match: ExtendedRegExpMatchArray
-      commands: SingleCommands
-      chain: () => ChainedCommands
       can: () => CanCommands
+      chain: () => ChainedCommands
+      commands: SingleCommands
+      dropEvent: DragEvent
+      match: ExtendedRegExpMatchArray
+      pasteEvent: ClipboardEvent
+      range: Range
+      state: EditorState
     }) => void | null
   }) {
     this.find = config.find
@@ -92,9 +96,11 @@ function run(config: {
   from: number
   to: number
   rule: PasteRule
+  pasteEvent: ClipboardEvent
+  dropEvent: DragEvent
 }): boolean {
   const {
-    editor, state, from, to, rule,
+    editor, state, from, to, rule, pasteEvent, dropEvent,
   } = config
 
   const { commands, chain, can } = new CommandManager({
@@ -134,6 +140,8 @@ function run(config: {
         commands,
         chain,
         can,
+        pasteEvent,
+        dropEvent,
       })
 
       handlers.push(handler)
@@ -155,6 +163,8 @@ export function pasteRulesPlugin(props: { editor: Editor; rules: PasteRule[] }):
   let dragSourceElement: Element | null = null
   let isPastedFromProseMirror = false
   let isDroppedFromProseMirror = false
+  let pasteEvent = new ClipboardEvent('paste')
+  let dropEvent = new DragEvent('drop')
 
   const plugins = rules.map(rule => {
     return new Plugin({
@@ -177,15 +187,18 @@ export function pasteRulesPlugin(props: { editor: Editor; rules: PasteRule[] }):
 
       props: {
         handleDOMEvents: {
-          drop: view => {
+          drop: (view, event: Event) => {
             isDroppedFromProseMirror = dragSourceElement === view.dom.parentElement
+            dropEvent = event as DragEvent
 
             return false
           },
 
-          paste: (view, event: Event) => {
+          paste: (_view, event: Event) => {
             const html = (event as ClipboardEvent).clipboardData?.getData('text/html')
 
+            pasteEvent = event as ClipboardEvent
+
             isPastedFromProseMirror = !!html?.includes('data-pm-slice')
 
             return false
@@ -224,6 +237,8 @@ export function pasteRulesPlugin(props: { editor: Editor; rules: PasteRule[] }):
           from: Math.max(from - 1, 0),
           to: to.b - 1,
           rule,
+          pasteEvent,
+          dropEvent,
         })
 
         // stop if there are no changes
@@ -231,6 +246,9 @@ export function pasteRulesPlugin(props: { editor: Editor; rules: PasteRule[] }):
           return
         }
 
+        dropEvent = new DragEvent('drop')
+        pasteEvent = new ClipboardEvent('paste')
+
         return tr
       },
     })

package/src/pasteRules/markPasteRule.ts

@@ -14,14 +14,16 @@ export function markPasteRule(config: {
   type: MarkType
   getAttributes?:
     | Record<string, any>
-    | ((match: ExtendedRegExpMatchArray) => Record<string, any>)
+    | ((match: ExtendedRegExpMatchArray, event: ClipboardEvent) => Record<string, any>)
     | false
     | null
 }) {
   return new PasteRule({
     find: config.find,
-    handler: ({ state, range, match }) => {
-      const attributes = callOrReturn(config.getAttributes, undefined, match)
+    handler: ({
+      state, range, match, pasteEvent,
+    }) => {
+      const attributes = callOrReturn(config.getAttributes, undefined, match, pasteEvent)
 
       if (attributes === false || attributes === null) {
         return null

package/src/pasteRules/nodePasteRule.ts

@@ -13,14 +13,16 @@ export function nodePasteRule(config: {
   type: NodeType
   getAttributes?:
     | Record<string, any>
-    | ((match: ExtendedRegExpMatchArray) => Record<string, any>)
+    | ((match: ExtendedRegExpMatchArray, event: ClipboardEvent) => Record<string, any>)
     | false
     | null
 }) {
   return new PasteRule({
     find: config.find,
-    handler({ match, chain, range }) {
-      const attributes = callOrReturn(config.getAttributes, undefined, match)
+    handler({
+      match, chain, range, pasteEvent,
+    }) {
+      const attributes = callOrReturn(config.getAttributes, undefined, match, pasteEvent)
 
       if (attributes === false || attributes === null) {
         return null