@tiptap/core 2.0.0-beta.204 → 2.0.0-beta.206

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.0.0-beta.204",
+  "version": "2.0.0-beta.206",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -31,7 +31,16 @@
     "src",
     "dist"
   ],
-  "dependencies": {
+  "peerDependencies": {
+    "prosemirror-commands": "^1.3.1",
+    "prosemirror-keymap": "^1.2.0",
+    "prosemirror-model": "^1.18.1",
+    "prosemirror-schema-list": "^1.2.2",
+    "prosemirror-state": "^1.4.1",
+    "prosemirror-transform": "^1.7.0",
+    "prosemirror-view": "^1.28.2"
+  },
+  "devDependencies": {
     "prosemirror-commands": "^1.3.1",
     "prosemirror-keymap": "^1.2.0",
     "prosemirror-model": "^1.18.1",

package/src/commands/deleteCurrentNode.ts

@@ -0,0 +1,41 @@
+import { RawCommands } from '../types'
+
+declare module '@tiptap/core' {
+  interface Commands<ReturnType> {
+    deleteCurrentNode: {
+      /**
+       * Delete the node that currently has the selection anchor.
+       */
+      deleteCurrentNode: () => ReturnType,
+    }
+  }
+}
+
+export const deleteCurrentNode: RawCommands['deleteCurrentNode'] = () => ({ tr, dispatch }) => {
+  const { selection } = tr
+  const currentNode = selection.$anchor.node()
+
+  // if there is content inside the current node, break out of this command
+  if (currentNode.content.size > 0) {
+    return false
+  }
+
+  const $pos = tr.selection.$anchor
+
+  for (let depth = $pos.depth; depth > 0; depth -= 1) {
+    const node = $pos.node(depth)
+
+    if (node.type === currentNode.type) {
+      if (dispatch) {
+        const from = $pos.before(depth)
+        const to = $pos.after(depth)
+
+        tr.delete(from, to).scrollIntoView()
+      }
+
+      return true
+    }
+  }
+
+  return false
+}

package/src/commands/index.ts

@@ -3,6 +3,7 @@ export * from './clearContent'
 export * from './clearNodes'
 export * from './command'
 export * from './createParagraphNear'
+export * from './deleteCurrentNode'
 export * from './deleteNode'
 export * from './deleteRange'
 export * from './deleteSelection'
@@ -14,8 +15,7 @@ export * from './focus'
 export * from './forEach'
 export * from './insertContent'
 export * from './insertContentAt'
-export * from './joinBackward'
-export * from './joinForward'
+export * from './join'
 export * from './keyboardShortcut'
 export * from './lift'
 export * from './liftEmptyBlock'

package/src/commands/join.ts

@@ -0,0 +1,50 @@
+import {
+  joinBackward as originalJoinBackward, joinDown as originalJoinDown, joinForward as originalJoinForward, joinUp as originalJoinUp,
+} from 'prosemirror-commands'
+
+import { RawCommands } from '../types'
+
+declare module '@tiptap/core' {
+  interface Commands<ReturnType> {
+    joinUp: {
+      /**
+       * Join two nodes Up.
+       */
+      joinUp: () => ReturnType,
+    }
+    joinDown: {
+      /**
+       * Join two nodes Down.
+       */
+      joinDown: () => ReturnType,
+    }
+    joinBackward: {
+      /**
+       * Join two nodes Backwards.
+       */
+      joinBackward: () => ReturnType,
+    }
+    joinForward: {
+      /**
+       * Join two nodes Forwards.
+       */
+      joinForward: () => ReturnType,
+    }
+  }
+}
+
+export const joinUp: RawCommands['joinUp'] = () => ({ state, dispatch }) => {
+  return originalJoinUp(state, dispatch)
+}
+
+export const joinDown: RawCommands['joinDown'] = () => ({ state, dispatch }) => {
+  return originalJoinDown(state, dispatch)
+}
+
+export const joinBackward: RawCommands['joinBackward'] = () => ({ state, dispatch }) => {
+  return originalJoinBackward(state, dispatch)
+}
+
+export const joinForward: RawCommands['joinForward'] = () => ({ state, dispatch }) => {
+  return originalJoinForward(state, dispatch)
+}

package/src/extensions/keymap.ts

@@ -37,6 +37,7 @@ export const Keymap = Extension.create({
 
     const handleDelete = () => this.editor.commands.first(({ commands }) => [
       () => commands.deleteSelection(),
+      () => commands.deleteCurrentNode(),
       () => commands.joinForward(),
       () => commands.selectNodeForward(),
     ])

package/src/types.ts

@@ -252,3 +252,5 @@ export type TextSerializer = (props: {
 export type ExtendedRegExpMatchArray = RegExpMatchArray & {
   data?: Record<string, any>,
 }
+
+export type Dispatch = ((args?: any) => any) | undefined

package/dist/packages/core/src/commands/joinBackward.d.ts

@@ -1,12 +0,0 @@
-import { RawCommands } from '../types';
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        joinBackward: {
-            /**
-             * Join two nodes backward.
-             */
-            joinBackward: () => ReturnType;
-        };
-    }
-}
-export declare const joinBackward: RawCommands['joinBackward'];

package/dist/packages/core/src/commands/joinForward.d.ts

@@ -1,12 +0,0 @@
-import { RawCommands } from '../types';
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        joinForward: {
-            /**
-             * Join two nodes forward.
-             */
-            joinForward: () => ReturnType;
-        };
-    }
-}
-export declare const joinForward: RawCommands['joinForward'];

package/src/commands/joinBackward.ts

@@ -1,18 +0,0 @@
-import { joinBackward as originalJoinBackward } from 'prosemirror-commands'
-
-import { RawCommands } from '../types'
-
-declare module '@tiptap/core' {
-  interface Commands<ReturnType> {
-    joinBackward: {
-      /**
-       * Join two nodes backward.
-       */
-      joinBackward: () => ReturnType,
-    }
-  }
-}
-
-export const joinBackward: RawCommands['joinBackward'] = () => ({ state, dispatch }) => {
-  return originalJoinBackward(state, dispatch)
-}

package/src/commands/joinForward.ts

@@ -1,18 +0,0 @@
-import { joinForward as originalJoinForward } from 'prosemirror-commands'
-
-import { RawCommands } from '../types'
-
-declare module '@tiptap/core' {
-  interface Commands<ReturnType> {
-    joinForward: {
-      /**
-       * Join two nodes forward.
-       */
-      joinForward: () => ReturnType,
-    }
-  }
-}
-
-export const joinForward: RawCommands['joinForward'] = () => ({ state, dispatch }) => {
-  return originalJoinForward(state, dispatch)
-}