@tiptap/core 2.0.0-beta.141 → 2.0.0-beta.145

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.0.0-beta.141",
+  "version": "2.0.0-beta.145",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -44,5 +44,5 @@
     "url": "https://github.com/ueberdosis/tiptap",
     "directory": "packages/core"
   },
-  "gitHead": "53f6ad47bcb6c6f718faef6245061fe023c94d61"
+  "gitHead": "90b092967220b507726fc7a8624198ddd710c598"
 }

package/src/Extension.ts

@@ -352,20 +352,13 @@ export class Extension<Options = any, Storage = any> {
       console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${extension.name}".`)
     }
 
-    // TODO: remove `addOptions` fallback
-    extension.options = extendedConfig.defaultOptions
-      ? extendedConfig.defaultOptions
-      : extension.parent.options
-
-    if (extendedConfig.addOptions) {
-      extension.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
-        extension,
-        'addOptions',
-        {
-          name: extension.name,
-        },
-      ))
-    }
+    extension.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
+      extension,
+      'addOptions',
+      {
+        name: extension.name,
+      },
+    ))
 
     extension.storage = callOrReturn(getExtensionField<AnyConfig['addStorage']>(
       extension,

package/src/Mark.ts

@@ -466,20 +466,13 @@ export class Mark<Options = any, Storage = any> {
       console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${extension.name}".`)
     }
 
-    // TODO: remove `addOptions` fallback
-    extension.options = extendedConfig.defaultOptions
-      ? extendedConfig.defaultOptions
-      : extension.parent.options
-
-    if (extendedConfig.addOptions) {
-      extension.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
-        extension,
-        'addOptions',
-        {
-          name: extension.name,
-        },
-      ))
-    }
+    extension.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
+      extension,
+      'addOptions',
+      {
+        name: extension.name,
+      },
+    ))
 
     extension.storage = callOrReturn(getExtensionField<AnyConfig['addStorage']>(
       extension,

package/src/Node.ts

@@ -546,20 +546,13 @@ export class Node<Options = any, Storage = any> {
       console.warn(`[tiptap warn]: BREAKING CHANGE: "defaultOptions" is deprecated. Please use "addOptions" instead. Found in extension: "${extension.name}".`)
     }
 
-    // TODO: remove `addOptions` fallback
-    extension.options = extendedConfig.defaultOptions
-      ? extendedConfig.defaultOptions
-      : extension.parent.options
-
-    if (extendedConfig.addOptions) {
-      extension.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
-        extension,
-        'addOptions',
-        {
-          name: extension.name,
-        },
-      ))
-    }
+    extension.options = callOrReturn(getExtensionField<AnyConfig['addOptions']>(
+      extension,
+      'addOptions',
+      {
+        name: extension.name,
+      },
+    ))
 
     extension.storage = callOrReturn(getExtensionField<AnyConfig['addStorage']>(
       extension,

package/src/commands/focus.ts

@@ -44,17 +44,27 @@ declare module '@tiptap/core' {
       /**
        * Focus the editor at the given position.
        */
-      focus: (position?: FocusPosition) => ReturnType,
+      focus: (
+        position?: FocusPosition,
+        options?: {
+          scrollIntoView?: boolean,
+        },
+      ) => ReturnType,
     }
   }
 }
 
-export const focus: RawCommands['focus'] = (position = null) => ({
+export const focus: RawCommands['focus'] = (position = null, options) => ({
   editor,
   view,
   tr,
   dispatch,
 }) => {
+  options = {
+    scrollIntoView: true,
+    ...options,
+  }
+
   const delayedFocus = () => {
     // focus within `requestAnimationFrame` breaks focus on iOS
     // so we have to call this
@@ -67,7 +77,10 @@ export const focus: RawCommands['focus'] = (position = null) => ({
     requestAnimationFrame(() => {
       if (!editor.isDestroyed) {
         view.focus()
-        editor.commands.scrollIntoView()
+
+        if (options?.scrollIntoView) {
+          editor.commands.scrollIntoView()
+        }
       }
     })
   }

package/src/helpers/defaultBlockAt.ts

@@ -0,0 +1,13 @@
+import { ContentMatch, NodeType } from 'prosemirror-model'
+
+export default function defaultBlockAt(match: ContentMatch): NodeType | null {
+  for (let i = 0; i < match.edgeCount; i += 1) {
+    const { type } = match.edge(i)
+
+    if (type.isTextblock && !type.hasRequiredAttrs()) {
+      return type
+    }
+  }
+
+  return null
+}

package/src/index.ts

@@ -23,6 +23,7 @@ export { default as textPasteRule } from './pasteRules/textPasteRule'
 export { default as callOrReturn } from './utilities/callOrReturn'
 export { default as mergeAttributes } from './utilities/mergeAttributes'
 
+export { default as defaultBlockAt } from './helpers/defaultBlockAt'
 export { default as getExtensionField } from './helpers/getExtensionField'
 export { default as findChildren } from './helpers/findChildren'
 export { default as findChildrenInRange } from './helpers/findChildrenInRange'

package/src/utilities/isPlainObject.ts

@@ -5,6 +5,9 @@ function getType(value: any): string {
 }
 
 export default function isPlainObject(value: any): value is Record<string, any> {
-  if (getType(value) !== 'Object') return false
+  if (getType(value) !== 'Object') {
+    return false
+  }
+
   return value.constructor === Object && Object.getPrototypeOf(value) === Object.prototype
 }