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

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

@@ -5,7 +5,9 @@ declare module '@tiptap/core' {
             /**
              * Focus the editor at the given position.
              */
-            focus: (position?: FocusPosition) => ReturnType;
+            focus: (position?: FocusPosition, options?: {
+                scrollIntoView?: boolean;
+            }) => ReturnType;
         };
     }
 }

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

@@ -0,0 +1,2 @@
+import { ContentMatch, NodeType } from 'prosemirror-model';
+export default function defaultBlockAt(match: ContentMatch): NodeType | null;

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

@@ -19,6 +19,7 @@ export { default as markPasteRule } from './pasteRules/markPasteRule';
 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/dist/tiptap-core.cjs.js

@@ -15,8 +15,9 @@ function getType(value) {
     return Object.prototype.toString.call(value).slice(8, -1);
 }
 function isPlainObject(value) {
-    if (getType(value) !== 'Object')
+    if (getType(value) !== 'Object') {
         return false;
+    }
     return value.constructor === Object && Object.getPrototypeOf(value) === Object.prototype;
 }
 
@@ -131,15 +132,9 @@ class Extension {
         if (extendedConfig.defaultOptions) {
             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(extension, 'addOptions', {
-                name: extension.name,
-            }));
-        }
+        extension.options = callOrReturn(getExtensionField(extension, 'addOptions', {
+            name: extension.name,
+        }));
         extension.storage = callOrReturn(getExtensionField(extension, 'addStorage', {
             name: extension.name,
             options: extension.options,
@@ -531,7 +526,11 @@ function resolveSelection(state, position = null) {
         to: position,
     };
 }
-const focus = (position = null) => ({ editor, view, tr, dispatch, }) => {
+const 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
@@ -543,7 +542,9 @@ const focus = (position = null) => ({ editor, view, tr, dispatch, }) => {
         requestAnimationFrame(() => {
             if (!editor.isDestroyed) {
                 view.focus();
-                editor.commands.scrollIntoView();
+                if (options === null || options === void 0 ? void 0 : options.scrollIntoView) {
+                    editor.commands.scrollIntoView();
+                }
             }
         });
     };
@@ -1183,7 +1184,7 @@ function getSplittedAttributes(extensionAttributes, typeName, attributes) {
     }));
 }
 
-function defaultBlockAt(match) {
+function defaultBlockAt$1(match) {
     for (let i = 0; i < match.edgeCount; i += 1) {
         const { type } = match.edge(i);
         if (type.isTextblock && !type.hasRequiredAttrs()) {
@@ -1227,7 +1228,7 @@ const splitBlock = ({ keepMarks = true } = {}) => ({ tr, state, dispatch, editor
         }
         const deflt = $from.depth === 0
             ? undefined
-            : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)));
+            : defaultBlockAt$1($from.node(-1).contentMatchAt($from.indexAfter(-1)));
         let types = atEnd && deflt
             ? [{
                     type: deflt,
@@ -3421,15 +3422,9 @@ class Node {
         if (extendedConfig.defaultOptions) {
             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(extension, 'addOptions', {
-                name: extension.name,
-            }));
-        }
+        extension.options = callOrReturn(getExtensionField(extension, 'addOptions', {
+            name: extension.name,
+        }));
         extension.storage = callOrReturn(getExtensionField(extension, 'addStorage', {
             name: extension.name,
             options: extension.options,
@@ -3492,15 +3487,9 @@ class Mark {
         if (extendedConfig.defaultOptions) {
             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(extension, 'addOptions', {
-                name: extension.name,
-            }));
-        }
+        extension.options = callOrReturn(getExtensionField(extension, 'addOptions', {
+            name: extension.name,
+        }));
         extension.storage = callOrReturn(getExtensionField(extension, 'addStorage', {
             name: extension.name,
             options: extension.options,
@@ -3964,6 +3953,16 @@ function textPasteRule(config) {
     });
 }
 
+function defaultBlockAt(match) {
+    for (let i = 0; i < match.edgeCount; i += 1) {
+        const { type } = match.edge(i);
+        if (type.isTextblock && !type.hasRequiredAttrs()) {
+            return type;
+        }
+    }
+    return null;
+}
+
 function findChildren(node, predicate) {
     const nodesWithPos = [];
     node.descendants((child, pos) => {
@@ -4112,6 +4111,7 @@ exports.NodeView = NodeView;
 exports.PasteRule = PasteRule;
 exports.Tracker = Tracker;
 exports.callOrReturn = callOrReturn;
+exports.defaultBlockAt = defaultBlockAt;
 exports.extensions = extensions;
 exports.findChildren = findChildren;
 exports.findChildrenInRange = findChildrenInRange;