@tiptap/core 2.0.0-beta.174 → 2.0.0-beta.179

package/src/commands/setNodeSelection.ts

@@ -1,6 +1,7 @@
-import { Selection, NodeSelection } from 'prosemirror-state'
-import { minMax } from '../utilities/minMax'
+import { NodeSelection, Selection } from 'prosemirror-state'
+
 import { RawCommands } from '../types'
+import { minMax } from '../utilities/minMax'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/setTextSelection.ts

@@ -1,6 +1,7 @@
 import { TextSelection } from 'prosemirror-state'
+
+import { Range, RawCommands } from '../types'
 import { minMax } from '../utilities/minMax'
-import { RawCommands, Range } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/sinkListItem.ts

@@ -1,7 +1,8 @@
-import { sinkListItem as originalSinkListItem } from 'prosemirror-schema-list'
 import { NodeType } from 'prosemirror-model'
-import { RawCommands } from '../types'
+import { sinkListItem as originalSinkListItem } from 'prosemirror-schema-list'
+
 import { getNodeType } from '../helpers/getNodeType'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/splitBlock.ts

@@ -1,8 +1,9 @@
-import { canSplit } from 'prosemirror-transform'
 import { ContentMatch } from 'prosemirror-model'
 import { EditorState, NodeSelection, TextSelection } from 'prosemirror-state'
-import { RawCommands } from '../types'
+import { canSplit } from 'prosemirror-transform'
+
 import { getSplittedAttributes } from '../helpers/getSplittedAttributes'
+import { RawCommands } from '../types'
 
 function defaultBlockAt(match: ContentMatch) {
   for (let i = 0; i < match.edgeCount; i += 1) {

package/src/commands/splitListItem.ts

@@ -1,14 +1,15 @@
 import {
-  NodeType,
-  Node as ProseMirrorNode,
   Fragment,
+  Node as ProseMirrorNode,
+  NodeType,
   Slice,
 } from 'prosemirror-model'
-import { canSplit } from 'prosemirror-transform'
 import { TextSelection } from 'prosemirror-state'
-import { RawCommands } from '../types'
+import { canSplit } from 'prosemirror-transform'
+
 import { getNodeType } from '../helpers/getNodeType'
 import { getSplittedAttributes } from '../helpers/getSplittedAttributes'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/toggleList.ts

@@ -1,10 +1,11 @@
 import { NodeType } from 'prosemirror-model'
 import { Transaction } from 'prosemirror-state'
 import { canJoin } from 'prosemirror-transform'
-import { RawCommands } from '../types'
-import { getNodeType } from '../helpers/getNodeType'
+
 import { findParentNode } from '../helpers/findParentNode'
+import { getNodeType } from '../helpers/getNodeType'
 import { isList } from '../helpers/isList'
+import { RawCommands } from '../types'
 
 const joinListBackwards = (tr: Transaction, listType: NodeType): boolean => {
   const list = findParentNode(node => node.type === listType)(tr.selection)

package/src/commands/toggleMark.ts

@@ -1,7 +1,8 @@
 import { MarkType } from 'prosemirror-model'
-import { RawCommands } from '../types'
+
 import { getMarkType } from '../helpers/getMarkType'
 import { isMarkActive } from '../helpers/isMarkActive'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/toggleNode.ts

@@ -1,7 +1,8 @@
 import { NodeType } from 'prosemirror-model'
-import { RawCommands } from '../types'
-import { isNodeActive } from '../helpers/isNodeActive'
+
 import { getNodeType } from '../helpers/getNodeType'
+import { isNodeActive } from '../helpers/isNodeActive'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/toggleWrap.ts

@@ -1,7 +1,8 @@
 import { NodeType } from 'prosemirror-model'
-import { RawCommands } from '../types'
-import { isNodeActive } from '../helpers/isNodeActive'
+
 import { getNodeType } from '../helpers/getNodeType'
+import { isNodeActive } from '../helpers/isNodeActive'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/unsetMark.ts

@@ -1,7 +1,8 @@
 import { MarkType } from 'prosemirror-model'
-import { RawCommands } from '../types'
-import { getMarkType } from '../helpers/getMarkType'
+
 import { getMarkRange } from '../helpers/getMarkRange'
+import { getMarkType } from '../helpers/getMarkType'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/updateAttributes.ts

@@ -1,6 +1,7 @@
-import { NodeType, MarkType } from 'prosemirror-model'
-import { getNodeType } from '../helpers/getNodeType'
+import { MarkType, NodeType } from 'prosemirror-model'
+
 import { getMarkType } from '../helpers/getMarkType'
+import { getNodeType } from '../helpers/getNodeType'
 import { getSchemaTypeNameByName } from '../helpers/getSchemaTypeNameByName'
 import { RawCommands } from '../types'
 

package/src/commands/wrapIn.ts

@@ -1,7 +1,8 @@
 import { wrapIn as originalWrapIn } from 'prosemirror-commands'
 import { NodeType } from 'prosemirror-model'
-import { RawCommands } from '../types'
+
 import { getNodeType } from '../helpers/getNodeType'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/commands/wrapInList.ts

@@ -1,7 +1,8 @@
-import { wrapInList as originalWrapInList } from 'prosemirror-schema-list'
 import { NodeType } from 'prosemirror-model'
-import { RawCommands } from '../types'
+import { wrapInList as originalWrapInList } from 'prosemirror-schema-list'
+
 import { getNodeType } from '../helpers/getNodeType'
+import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {

package/src/extensions/clipboardTextSerializer.ts

@@ -1,7 +1,8 @@
 import { Plugin, PluginKey } from 'prosemirror-state'
+
 import { Extension } from '../Extension'
 import { getTextBetween } from '../helpers/getTextBetween'
-import { getTextSeralizersFromSchema } from '../helpers/getTextSeralizersFromSchema'
+import { getTextSerializersFromSchema } from '../helpers/getTextSerializersFromSchema'
 
 export const ClipboardTextSerializer = Extension.create({
   name: 'clipboardTextSerializer',
@@ -18,7 +19,7 @@ export const ClipboardTextSerializer = Extension.create({
             const { ranges } = selection
             const from = Math.min(...ranges.map(range => range.$from.pos))
             const to = Math.max(...ranges.map(range => range.$to.pos))
-            const textSerializers = getTextSeralizersFromSchema(schema)
+            const textSerializers = getTextSerializersFromSchema(schema)
             const range = { from, to }
 
             return getTextBetween(doc, range, {

package/src/extensions/commands.ts

@@ -1,161 +1,14 @@
+import * as commands from '../commands'
 import { Extension } from '../Extension'
-import * as blur from '../commands/blur'
-import * as clearContent from '../commands/clearContent'
-import * as clearNodes from '../commands/clearNodes'
-import * as command from '../commands/command'
-import * as createParagraphNear from '../commands/createParagraphNear'
-import * as deleteNode from '../commands/deleteNode'
-import * as deleteRange from '../commands/deleteRange'
-import * as deleteSelection from '../commands/deleteSelection'
-import * as enter from '../commands/enter'
-import * as exitCode from '../commands/exitCode'
-import * as extendMarkRange from '../commands/extendMarkRange'
-import * as first from '../commands/first'
-import * as focus from '../commands/focus'
-import * as forEach from '../commands/forEach'
-import * as insertContent from '../commands/insertContent'
-import * as insertContentAt from '../commands/insertContentAt'
-import * as joinBackward from '../commands/joinBackward'
-import * as joinForward from '../commands/joinForward'
-import * as keyboardShortcut from '../commands/keyboardShortcut'
-import * as lift from '../commands/lift'
-import * as liftEmptyBlock from '../commands/liftEmptyBlock'
-import * as liftListItem from '../commands/liftListItem'
-import * as newlineInCode from '../commands/newlineInCode'
-import * as resetAttributes from '../commands/resetAttributes'
-import * as scrollIntoView from '../commands/scrollIntoView'
-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'
-import * as setNode from '../commands/setNode'
-import * as setNodeSelection from '../commands/setNodeSelection'
-import * as setTextSelection from '../commands/setTextSelection'
-import * as sinkListItem from '../commands/sinkListItem'
-import * as splitBlock from '../commands/splitBlock'
-import * as splitListItem from '../commands/splitListItem'
-import * as toggleList from '../commands/toggleList'
-import * as toggleMark from '../commands/toggleMark'
-import * as toggleNode from '../commands/toggleNode'
-import * as toggleWrap from '../commands/toggleWrap'
-import * as undoInputRule from '../commands/undoInputRule'
-import * as unsetAllMarks from '../commands/unsetAllMarks'
-import * as unsetMark from '../commands/unsetMark'
-import * as updateAttributes from '../commands/updateAttributes'
-import * as wrapIn from '../commands/wrapIn'
-import * as wrapInList from '../commands/wrapInList'
 
-export { blur }
-export { clearContent }
-export { clearNodes }
-export { command }
-export { createParagraphNear }
-export { deleteNode }
-export { deleteRange }
-export { deleteSelection }
-export { enter }
-export { exitCode }
-export { extendMarkRange }
-export { first }
-export { focus }
-export { forEach }
-export { insertContent }
-export { insertContentAt }
-export { joinBackward }
-export { joinForward }
-export { keyboardShortcut }
-export { lift }
-export { liftEmptyBlock }
-export { liftListItem }
-export { newlineInCode }
-export { resetAttributes }
-export { scrollIntoView }
-export { selectAll }
-export { selectNodeBackward }
-export { selectNodeForward }
-export { selectParentNode }
-export { selectTextblockEnd }
-export { selectTextblockStart }
-export { setContent }
-export { setMark }
-export { setMeta }
-export { setNode }
-export { setNodeSelection }
-export { setTextSelection }
-export { sinkListItem }
-export { splitBlock }
-export { splitListItem }
-export { toggleList }
-export { toggleMark }
-export { toggleNode }
-export { toggleWrap }
-export { undoInputRule }
-export { unsetAllMarks }
-export { unsetMark }
-export { updateAttributes }
-export { wrapIn }
-export { wrapInList }
+export * from '../commands'
 
 export const Commands = Extension.create({
   name: 'commands',
 
   addCommands() {
     return {
-      ...blur,
-      ...clearContent,
-      ...clearNodes,
-      ...command,
-      ...createParagraphNear,
-      ...deleteNode,
-      ...deleteRange,
-      ...deleteSelection,
-      ...enter,
-      ...exitCode,
-      ...extendMarkRange,
-      ...first,
-      ...focus,
-      ...forEach,
-      ...insertContent,
-      ...insertContentAt,
-      ...joinBackward,
-      ...joinForward,
-      ...keyboardShortcut,
-      ...lift,
-      ...liftEmptyBlock,
-      ...liftListItem,
-      ...newlineInCode,
-      ...resetAttributes,
-      ...scrollIntoView,
-      ...selectAll,
-      ...selectNodeBackward,
-      ...selectNodeForward,
-      ...selectParentNode,
-      ...selectTextblockEnd,
-      ...selectTextblockStart,
-      ...setContent,
-      ...setMark,
-      ...setMeta,
-      ...setNode,
-      ...setNodeSelection,
-      ...setTextSelection,
-      ...sinkListItem,
-      ...splitBlock,
-      ...splitListItem,
-      ...toggleList,
-      ...toggleMark,
-      ...toggleNode,
-      ...toggleWrap,
-      ...undoInputRule,
-      ...unsetAllMarks,
-      ...unsetMark,
-      ...updateAttributes,
-      ...wrapIn,
-      ...wrapInList,
+      ...commands,
     }
   },
 })

package/src/extensions/editable.ts

@@ -1,4 +1,5 @@
 import { Plugin, PluginKey } from 'prosemirror-state'
+
 import { Extension } from '../Extension'
 
 export const Editable = Extension.create({

package/src/extensions/focusEvents.ts

@@ -1,4 +1,5 @@
 import { Plugin, PluginKey } from 'prosemirror-state'
+
 import { Extension } from '../Extension'
 
 export const FocusEvents = Extension.create({

package/src/extensions/keymap.ts

@@ -1,9 +1,10 @@
 import { Plugin, PluginKey, Selection } from 'prosemirror-state'
+
+import { CommandManager } from '../CommandManager'
+import { Extension } from '../Extension'
 import { createChainableState } from '../helpers/createChainableState'
 import { isiOS } from '../utilities/isiOS'
 import { isMacOS } from '../utilities/isMacOS'
-import { CommandManager } from '../CommandManager'
-import { Extension } from '../Extension'
 
 export const Keymap = Extension.create({
   name: 'keymap',
@@ -60,8 +61,6 @@ export const Keymap = Extension.create({
 
     const pcKeymap = {
       ...baseKeymap,
-      Home: () => this.editor.commands.selectTextblockStart(),
-      End: () => this.editor.commands.selectTextblockEnd(),
     }
 
     const macKeymap = {

package/src/extensions/tabindex.ts

@@ -1,4 +1,5 @@
 import { Plugin, PluginKey } from 'prosemirror-state'
+
 import { Extension } from '../Extension'
 
 export const Tabindex = Extension.create({

package/src/helpers/createDocument.ts

@@ -1,4 +1,5 @@
-import { Schema, Node as ProseMirrorNode, ParseOptions } from 'prosemirror-model'
+import { Node as ProseMirrorNode, ParseOptions, Schema } from 'prosemirror-model'
+
 import { Content } from '../types'
 import { createNodeFromContent } from './createNodeFromContent'
 

package/src/helpers/createNodeFromContent.ts

@@ -1,12 +1,13 @@
 import {
-  Schema,
   DOMParser,
-  Node as ProseMirrorNode,
   Fragment,
+  Node as ProseMirrorNode,
   ParseOptions,
+  Schema,
 } from 'prosemirror-model'
-import { elementFromString } from '../utilities/elementFromString'
+
 import { Content } from '../types'
+import { elementFromString } from '../utilities/elementFromString'
 
 export type CreateNodeFromContentOptions = {
   slice?: boolean,

package/src/helpers/findChildren.ts

@@ -1,5 +1,6 @@
 import { Node as ProseMirrorNode } from 'prosemirror-model'
-import { Predicate, NodeWithPos } from '../types'
+
+import { NodeWithPos, Predicate } from '../types'
 
 export function findChildren(node: ProseMirrorNode, predicate: Predicate): NodeWithPos[] {
   const nodesWithPos: NodeWithPos[] = []

package/src/helpers/findChildrenInRange.ts

@@ -1,5 +1,6 @@
 import { Node as ProseMirrorNode } from 'prosemirror-model'
-import { Predicate, Range, NodeWithPos } from '../types'
+
+import { NodeWithPos, Predicate, Range } from '../types'
 
 /**
  * Same as `findChildren` but searches only within a `range`.

package/src/helpers/findParentNode.ts

@@ -1,6 +1,7 @@
 import { Selection } from 'prosemirror-state'
-import { findParentNodeClosestToPos } from './findParentNodeClosestToPos'
+
 import { Predicate } from '../types'
+import { findParentNodeClosestToPos } from './findParentNodeClosestToPos'
 
 export function findParentNode(predicate: Predicate) {
   return (selection: Selection) => findParentNodeClosestToPos(selection.$from, predicate)

package/src/helpers/findParentNodeClosestToPos.ts

@@ -1,4 +1,5 @@
-import { ResolvedPos, Node as ProseMirrorNode } from 'prosemirror-model'
+import { Node as ProseMirrorNode, ResolvedPos } from 'prosemirror-model'
+
 import { Predicate } from '../types'
 
 export function findParentNodeClosestToPos($pos: ResolvedPos, predicate: Predicate): ({

package/src/helpers/generateHTML.ts

@@ -1,7 +1,8 @@
 import { Node } from 'prosemirror-model'
-import { getSchema } from './getSchema'
-import { getHTMLFromFragment } from './getHTMLFromFragment'
+
 import { Extensions, JSONContent } from '../types'
+import { getHTMLFromFragment } from './getHTMLFromFragment'
+import { getSchema } from './getSchema'
 
 export function generateHTML(doc: JSONContent, extensions: Extensions): string {
   const schema = getSchema(extensions)

package/src/helpers/generateJSON.ts

@@ -1,7 +1,8 @@
 import { DOMParser } from 'prosemirror-model'
-import { getSchema } from './getSchema'
-import { elementFromString } from '../utilities/elementFromString'
+
 import { Extensions } from '../types'
+import { elementFromString } from '../utilities/elementFromString'
+import { getSchema } from './getSchema'
 
 export function generateJSON(html: string, extensions: Extensions): Record<string, any> {
   const schema = getSchema(extensions)

package/src/helpers/generateText.ts

@@ -1,8 +1,9 @@
 import { Node } from 'prosemirror-model'
-import { getSchema } from './getSchema'
+
 import { Extensions, JSONContent, TextSerializer } from '../types'
-import { getTextSeralizersFromSchema } from './getTextSeralizersFromSchema'
+import { getSchema } from './getSchema'
 import { getText } from './getText'
+import { getTextSerializersFromSchema } from './getTextSerializersFromSchema'
 
 export function generateText(
   doc: JSONContent,
@@ -23,7 +24,7 @@ export function generateText(
     blockSeparator,
     textSerializers: {
       ...textSerializers,
-      ...getTextSeralizersFromSchema(schema),
+      ...getTextSerializersFromSchema(schema),
     },
   })
 }

package/src/helpers/getAttributes.ts

@@ -1,8 +1,9 @@
 import { MarkType, NodeType } from 'prosemirror-model'
 import { EditorState } from 'prosemirror-state'
-import { getSchemaTypeNameByName } from './getSchemaTypeNameByName'
-import { getNodeAttributes } from './getNodeAttributes'
+
 import { getMarkAttributes } from './getMarkAttributes'
+import { getNodeAttributes } from './getNodeAttributes'
+import { getSchemaTypeNameByName } from './getSchemaTypeNameByName'
 
 export function getAttributes(
   state: EditorState,

package/src/helpers/getAttributesFromExtensions.ts

@@ -1,14 +1,14 @@
-import { splitExtensions } from './splitExtensions'
-import { getExtensionField } from './getExtensionField'
+import { MarkConfig, NodeConfig } from '..'
 import {
-  Extensions,
-  GlobalAttributes,
-  Attributes,
+  AnyConfig,
   Attribute,
+  Attributes,
   ExtensionAttribute,
-  AnyConfig,
+  Extensions,
+  GlobalAttributes,
 } from '../types'
-import { NodeConfig, MarkConfig } from '..'
+import { getExtensionField } from './getExtensionField'
+import { splitExtensions } from './splitExtensions'
 
 /**
  * Get a list of all extension attributes defined in `addAttribute` and `addGlobalAttribute`.
@@ -24,6 +24,7 @@ export function getAttributesFromExtensions(extensions: Extensions): ExtensionAt
     renderHTML: null,
     parseHTML: null,
     keepOnSplit: true,
+    isRequired: false,
   }
 
   extensions.forEach(extension => {
@@ -87,13 +88,19 @@ export function getAttributesFromExtensions(extensions: Extensions): ExtensionAt
     Object
       .entries(attributes)
       .forEach(([name, attribute]) => {
+        const mergedAttr = {
+          ...defaultAttribute,
+          ...attribute,
+        }
+
+        if (attribute.isRequired && attribute.default === undefined) {
+          delete mergedAttr.default
+        }
+
         extensionAttributes.push({
           type: extension.name,
           name,
-          attribute: {
-            ...defaultAttribute,
-            ...attribute,
-          },
+          attribute: mergedAttr,
         })
       })
   })

package/src/helpers/getChangedRanges.ts

@@ -1,4 +1,5 @@
-import { Transform, Step } from 'prosemirror-transform'
+import { Step, Transform } from 'prosemirror-transform'
+
 import { Range } from '../types'
 import { removeDuplicates } from '../utilities/removeDuplicates'
 

package/src/helpers/getDebugJSON.ts

@@ -1,4 +1,5 @@
 import { Node as ProseMirrorNode } from 'prosemirror-model'
+
 import { JSONContent } from '../types'
 
 interface DebugJSONContent extends JSONContent {

package/src/helpers/getExtensionField.ts

@@ -1,4 +1,4 @@
-import { AnyExtension, RemoveThis, MaybeThisParameterType } from '../types'
+import { AnyExtension, MaybeThisParameterType, RemoveThis } from '../types'
 
 export function getExtensionField<T = any>(
   extension: AnyExtension,

package/src/helpers/getHTMLFromFragment.ts

@@ -1,4 +1,4 @@
-import { DOMSerializer, Schema, Fragment } from 'prosemirror-model'
+import { DOMSerializer, Fragment, Schema } from 'prosemirror-model'
 
 export function getHTMLFromFragment(fragment: Fragment, schema: Schema): string {
   const documentFragment = DOMSerializer

package/src/helpers/getMarkAttributes.ts

@@ -1,5 +1,6 @@
-import { EditorState } from 'prosemirror-state'
 import { Mark, MarkType } from 'prosemirror-model'
+import { EditorState } from 'prosemirror-state'
+
 import { getMarkType } from './getMarkType'
 
 export function getMarkAttributes(state: EditorState, typeOrName: string | MarkType): Record<string, any> {

package/src/helpers/getMarkRange.ts

@@ -1,6 +1,7 @@
 import { Mark as ProseMirrorMark, MarkType, ResolvedPos } from 'prosemirror-model'
-import { objectIncludes } from '../utilities/objectIncludes'
+
 import { Range } from '../types'
+import { objectIncludes } from '../utilities/objectIncludes'
 
 function findMarkInSet(
   marks: ProseMirrorMark[],
@@ -29,7 +30,11 @@ export function getMarkRange(
     return
   }
 
-  const start = $pos.parent.childAfter($pos.parentOffset)
+  let start = $pos.parent.childAfter($pos.parentOffset)
+
+  if ($pos.parentOffset === start.offset && start.offset !== 0) {
+    start = $pos.parent.childBefore($pos.parentOffset)
+  }
 
   if (!start.node) {
     return
@@ -41,7 +46,7 @@ export function getMarkRange(
     return
   }
 
-  let startIndex = $pos.index()
+  let startIndex = start.index
   let startPos = $pos.start() + start.offset
   let endIndex = startIndex + 1
   let endPos = startPos + start.node.nodeSize

package/src/helpers/getMarksBetween.ts

@@ -1,4 +1,5 @@
 import { Node as ProseMirrorNode } from 'prosemirror-model'
+
 import { MarkRange } from '../types'
 import { getMarkRange } from './getMarkRange'
 

package/src/helpers/getNodeAttributes.ts

@@ -1,5 +1,6 @@
-import { EditorState } from 'prosemirror-state'
 import { Node, NodeType } from 'prosemirror-model'
+import { EditorState } from 'prosemirror-state'
+
 import { getNodeType } from './getNodeType'
 
 export function getNodeAttributes(state: EditorState, typeOrName: string | NodeType): Record<string, any> {