@tiptap/core 2.0.0-beta.164 → 2.0.0-beta.168

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.0.0-beta.164",
+  "version": "2.0.0-beta.168",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -30,14 +30,14 @@
     "@types/prosemirror-schema-list": "^1.0.3",
     "@types/prosemirror-state": "^1.2.8",
     "@types/prosemirror-transform": "^1.1.5",
-    "@types/prosemirror-view": "^1.19.2",
-    "prosemirror-commands": "^1.1.12",
+    "@types/prosemirror-view": "^1.23.1",
+    "prosemirror-commands": "^1.2.1",
     "prosemirror-keymap": "^1.1.5",
     "prosemirror-model": "^1.16.1",
     "prosemirror-schema-list": "^1.1.6",
     "prosemirror-state": "^1.3.4",
     "prosemirror-transform": "^1.3.3",
-    "prosemirror-view": "^1.23.5"
+    "prosemirror-view": "^1.23.6"
   },
   "repository": {
     "type": "git",
@@ -45,5 +45,5 @@
     "directory": "packages/core"
   },
   "sideEffects": false,
-  "gitHead": "9e48f8c23960198b166b23804c094f2ddccc3927"
+  "gitHead": "31efb0802e77e32c8c1b65e1a8456a5d3262b0ae"
 }

package/src/commands/blur.ts

@@ -15,6 +15,10 @@ export const blur: RawCommands['blur'] = () => ({ editor, view }) => {
   requestAnimationFrame(() => {
     if (!editor.isDestroyed) {
       (view.dom as HTMLElement).blur()
+
+      // Browsers should remove the caret on blur but safari does not.
+      // See: https://github.com/ueberdosis/tiptap/issues/2405
+      window?.getSelection()?.removeAllRanges()
     }
   })
 

package/src/commands/insertContentAt.ts

@@ -53,6 +53,7 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
       ? { from: position, to: position }
       : position
 
+    let isOnlyTextContent = true
     let isOnlyBlockContent = true
     const nodes = isFragment(content)
       ? content
@@ -62,6 +63,10 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
       // check if added node is valid
       node.check()
 
+      isOnlyTextContent = isOnlyTextContent
+        ? node.isText && node.marks.length === 0
+        : false
+
       isOnlyBlockContent = isOnlyBlockContent
         ? node.isBlock
         : false
@@ -84,7 +89,13 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
       }
     }
 
-    tr.replaceWith(from, to, content)
+    // if there is only plain text we have to use `insertText`
+    // because this will keep the current marks
+    if (isOnlyTextContent) {
+      tr.insertText(value as string, from, to)
+    } else {
+      tr.replaceWith(from, to, content)
+    }
 
     // set cursor at end of inserted content
     if (options.updateSelection) {

package/src/commands/keyboardShortcut.ts

@@ -1,6 +1,6 @@
 import { RawCommands } from '../types'
-
-const mac = typeof navigator !== 'undefined' ? /Mac/.test(navigator.platform) : false
+import { isiOS } from '../utilities/isiOS'
+import { isMacOS } from '../utilities/isMacOS'
 
 function normalizeKeyName(name: string) {
   const parts = name.split(/-(?!$)/)
@@ -27,7 +27,7 @@ function normalizeKeyName(name: string) {
     } else if (/^s(hift)?$/i.test(mod)) {
       shift = true
     } else if (/^mod$/i.test(mod)) {
-      if (mac) {
+      if (isiOS() || isMacOS()) {
         meta = true
       } else {
         ctrl = true

package/src/commands/selectTextblockEnd.ts

@@ -0,0 +1,19 @@
+// @ts-ignore
+// TODO: add types to @types/prosemirror-commands
+import { selectTextblockEnd as originalSelectTextblockEnd } from 'prosemirror-commands'
+import { RawCommands } from '../types'
+
+declare module '@tiptap/core' {
+  interface Commands<ReturnType> {
+    selectTextblockEnd: {
+      /**
+       * Moves the cursor to the end of current text block.
+       */
+      selectTextblockEnd: () => ReturnType,
+    }
+  }
+}
+
+export const selectTextblockEnd: RawCommands['selectTextblockEnd'] = () => ({ state, dispatch }) => {
+  return originalSelectTextblockEnd(state, dispatch)
+}

package/src/commands/selectTextblockStart.ts

@@ -0,0 +1,19 @@
+// @ts-ignore
+// TODO: add types to @types/prosemirror-commands
+import { selectTextblockStart as originalSelectTextblockStart } from 'prosemirror-commands'
+import { RawCommands } from '../types'
+
+declare module '@tiptap/core' {
+  interface Commands<ReturnType> {
+    selectTextblockStart: {
+      /**
+       * Moves the cursor to the start of current text block.
+       */
+      selectTextblockStart: () => ReturnType,
+    }
+  }
+}
+
+export const selectTextblockStart: RawCommands['selectTextblockStart'] = () => ({ state, dispatch }) => {
+  return originalSelectTextblockStart(state, dispatch)
+}

package/src/extensions/commands.ts

@@ -28,6 +28,8 @@ import * as selectAll from '../commands/selectAll'
 import * as selectNodeBackward from '../commands/selectNodeBackward'
 import * as selectNodeForward from '../commands/selectNodeForward'
 import * as selectParentNode from '../commands/selectParentNode'
+import * as selectTextblockEnd from '../commands/selectTextblockEnd'
+import * as selectTextblockStart from '../commands/selectTextblockStart'
 import * as setContent from '../commands/setContent'
 import * as setMark from '../commands/setMark'
 import * as setMeta from '../commands/setMeta'
@@ -77,6 +79,8 @@ export { selectAll }
 export { selectNodeBackward }
 export { selectNodeForward }
 export { selectParentNode }
+export { selectTextblockEnd }
+export { selectTextblockStart }
 export { setContent }
 export { setMark }
 export { setMeta }
@@ -131,6 +135,8 @@ export const Commands = Extension.create({
       ...selectNodeBackward,
       ...selectNodeForward,
       ...selectParentNode,
+      ...selectTextblockEnd,
+      ...selectTextblockStart,
       ...setContent,
       ...setMark,
       ...setMeta,

package/src/extensions/keymap.ts

@@ -1,5 +1,7 @@
 import { Plugin, PluginKey, Selection } from 'prosemirror-state'
 import { createChainableState } from '../helpers/createChainableState'
+import { isiOS } from '../utilities/isiOS'
+import { isMacOS } from '../utilities/isMacOS'
 import { CommandManager } from '../CommandManager'
 import { Extension } from '../Extension'
 
@@ -38,13 +40,15 @@ export const Keymap = Extension.create({
       () => commands.selectNodeForward(),
     ])
 
-    return {
-      Enter: () => this.editor.commands.first(({ commands }) => [
-        () => commands.newlineInCode(),
-        () => commands.createParagraphNear(),
-        () => commands.liftEmptyBlock(),
-        () => commands.splitBlock(),
-      ]),
+    const handleEnter = () => this.editor.commands.first(({ commands }) => [
+      () => commands.newlineInCode(),
+      () => commands.createParagraphNear(),
+      () => commands.liftEmptyBlock(),
+      () => commands.splitBlock(),
+    ])
+
+    const baseKeymap = {
+      Enter: handleEnter,
       'Mod-Enter': () => this.editor.commands.exitCode(),
       Backspace: handleBackspace,
       'Mod-Backspace': handleBackspace,
@@ -53,6 +57,30 @@ export const Keymap = Extension.create({
       'Mod-Delete': handleDelete,
       'Mod-a': () => this.editor.commands.selectAll(),
     }
+
+    const pcKeymap = {
+      ...baseKeymap,
+      Home: () => this.editor.commands.selectTextblockStart(),
+      End: () => this.editor.commands.selectTextblockStart(),
+    }
+
+    const macKeymap = {
+      ...baseKeymap,
+      'Ctrl-h': handleBackspace,
+      'Alt-Backspace': handleBackspace,
+      'Ctrl-d': handleDelete,
+      'Ctrl-Alt-Backspace': handleDelete,
+      'Alt-Delete': handleDelete,
+      'Alt-d': handleDelete,
+      'Ctrl-a': () => this.editor.commands.selectTextblockStart(),
+      'Ctrl-e': () => this.editor.commands.selectTextblockEnd(),
+    }
+
+    if (isiOS() || isMacOS()) {
+      return macKeymap
+    }
+
+    return pcKeymap
   },
 
   addProseMirrorPlugins() {

package/src/helpers/injectExtensionAttributesToParseRule.ts

@@ -25,26 +25,20 @@ export function injectExtensionAttributesToParseRule(parseRule: ParseRule, exten
         return false
       }
 
-      const newAttributes = extensionAttributes
-        .filter(item => item.attribute.rendered)
-        .reduce((items, item) => {
-          const value = item.attribute.parseHTML
-            ? item.attribute.parseHTML(node as HTMLElement)
-            : fromString((node as HTMLElement).getAttribute(item.name))
-
-          if (isObject(value)) {
-            console.warn(`[tiptap warn]: BREAKING CHANGE: "parseHTML" for your attribute "${item.name}" returns an object but should return the value itself. If this is expected you can ignore this message. This warning will be removed in one of the next releases. Further information: https://github.com/ueberdosis/tiptap/issues/1863`)
-          }
-
-          if (value === null || value === undefined) {
-            return items
-          }
-
-          return {
-            ...items,
-            [item.name]: value,
-          }
-        }, {})
+      const newAttributes = extensionAttributes.reduce((items, item) => {
+        const value = item.attribute.parseHTML
+          ? item.attribute.parseHTML(node as HTMLElement)
+          : fromString((node as HTMLElement).getAttribute(item.name))
+
+        if (value === null || value === undefined) {
+          return items
+        }
+
+        return {
+          ...items,
+          [item.name]: value,
+        }
+      }, {})
 
       return { ...oldAttributes, ...newAttributes }
     },

package/src/utilities/isMacOS.ts

@@ -0,0 +1,5 @@
+export function isMacOS(): boolean {
+  return typeof navigator !== 'undefined'
+    ? /Mac/.test(navigator.platform)
+    : false
+}