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

package/src/helpers/getRenderedAttributes.ts

@@ -1,4 +1,5 @@
-import { Node, Mark } from 'prosemirror-model'
+import { Mark, Node } from 'prosemirror-model'
+
 import { ExtensionAttribute } from '../types'
 import { mergeAttributes } from '../utilities/mergeAttributes'
 

package/src/helpers/getSchema.ts

@@ -1,7 +1,8 @@
 import { Schema } from 'prosemirror-model'
-import { getSchemaByResolvedExtensions } from './getSchemaByResolvedExtensions'
+
 import { ExtensionManager } from '../ExtensionManager'
 import { Extensions } from '../types'
+import { getSchemaByResolvedExtensions } from './getSchemaByResolvedExtensions'
 
 export function getSchema(extensions: Extensions): Schema {
   const resolvedExtensions = ExtensionManager.resolve(extensions)

package/src/helpers/getSchemaByResolvedExtensions.ts

@@ -1,13 +1,14 @@
-import { NodeSpec, MarkSpec, Schema } from 'prosemirror-model'
+import { MarkSpec, NodeSpec, Schema } from 'prosemirror-model'
+
+import { MarkConfig, NodeConfig } from '..'
 import { AnyConfig, Extensions } from '../types'
-import { NodeConfig, MarkConfig } from '..'
-import { splitExtensions } from './splitExtensions'
+import { callOrReturn } from '../utilities/callOrReturn'
+import { isEmptyObject } from '../utilities/isEmptyObject'
 import { getAttributesFromExtensions } from './getAttributesFromExtensions'
+import { getExtensionField } from './getExtensionField'
 import { getRenderedAttributes } from './getRenderedAttributes'
-import { isEmptyObject } from '../utilities/isEmptyObject'
 import { injectExtensionAttributesToParseRule } from './injectExtensionAttributesToParseRule'
-import { callOrReturn } from '../utilities/callOrReturn'
-import { getExtensionField } from './getExtensionField'
+import { splitExtensions } from './splitExtensions'
 
 function cleanUpSchemaItem<T>(data: T) {
   return Object.fromEntries(Object.entries(data).filter(([key, value]) => {

package/src/helpers/getText.ts

@@ -1,5 +1,6 @@
-import { TextSerializer } from '../types'
 import { Node as ProseMirrorNode } from 'prosemirror-model'
+
+import { TextSerializer } from '../types'
 import { getTextBetween } from './getTextBetween'
 
 export function getText(

package/src/helpers/getTextBetween.ts

@@ -1,6 +1,7 @@
-import { Range, TextSerializer } from '../types'
 import { Node as ProseMirrorNode } from 'prosemirror-model'
 
+import { Range, TextSerializer } from '../types'
+
 export function getTextBetween(
   startNode: ProseMirrorNode,
   range: Range,
@@ -31,9 +32,10 @@ export function getTextBetween(
         pos,
         parent,
         index,
+        range,
       })
     } else if (node.isText) {
-      text += node?.text?.slice(Math.max(from, pos) - pos, to - pos)
+      text += node?.text?.slice(Math.max(from, pos) - pos, to - pos) // eslint-disable-line
       separated = false
     } else if (node.isBlock && !separated) {
       text += blockSeparator

package/src/helpers/getTextContentFromNodes.ts

@@ -0,0 +1,17 @@
+import { ResolvedPos } from 'prosemirror-model'
+
+export const getTextContentFromNodes = ($from: ResolvedPos<any>, maxMatch = 500) => {
+  let textBefore = ''
+
+  $from.parent.nodesBetween(
+    Math.max(0, $from.parentOffset - maxMatch),
+    $from.parentOffset,
+    (node, pos, parent, index) => {
+      textBefore += node.type.spec.toText?.({
+        node, pos, parent, index,
+      }) || node.textContent || '%leaf%'
+    },
+  )
+
+  return textBefore
+}

package/src/helpers/{getTextSeralizersFromSchema.ts → getTextSerializersFromSchema.ts}

@@ -1,7 +1,8 @@
 import { Schema } from 'prosemirror-model'
+
 import { TextSerializer } from '../types'
 
-export function getTextSeralizersFromSchema(schema: Schema): Record<string, TextSerializer> {
+export function getTextSerializersFromSchema(schema: Schema): Record<string, TextSerializer> {
   return Object.fromEntries(Object
     .entries(schema.nodes)
     .filter(([, node]) => node.spec.toText)

package/src/helpers/index.ts

@@ -0,0 +1,33 @@
+export * from './combineTransactionSteps'
+export * from './defaultBlockAt'
+export * from './findChildren'
+export * from './findChildrenInRange'
+export * from './findParentNode'
+export * from './findParentNodeClosestToPos'
+export * from './generateHTML'
+export * from './generateJSON'
+export * from './generateText'
+export * from './getAttributes'
+export * from './getChangedRanges'
+export * from './getDebugJSON'
+export * from './getExtensionField'
+export * from './getHTMLFromFragment'
+export * from './getMarkAttributes'
+export * from './getMarkRange'
+export * from './getMarksBetween'
+export * from './getMarkType'
+export * from './getNodeAttributes'
+export * from './getNodeType'
+export * from './getSchema'
+export * from './getText'
+export * from './getTextBetween'
+export * from './getTextContentFromNodes'
+export * from './getTextSerializersFromSchema'
+export * from './isActive'
+export * from './isList'
+export * from './isMarkActive'
+export * from './isNodeActive'
+export * from './isNodeEmpty'
+export * from './isNodeSelection'
+export * from './isTextSelection'
+export * from './posToDOMRect'

package/src/helpers/injectExtensionAttributesToParseRule.ts

@@ -1,4 +1,5 @@
 import { ParseRule } from 'prosemirror-model'
+
 import { ExtensionAttribute } from '../types'
 import { fromString } from '../utilities/fromString'
 

package/src/helpers/isActive.ts

@@ -1,7 +1,8 @@
 import { EditorState } from 'prosemirror-state'
-import { isNodeActive } from './isNodeActive'
-import { isMarkActive } from './isMarkActive'
+
 import { getSchemaTypeNameByName } from './getSchemaTypeNameByName'
+import { isMarkActive } from './isMarkActive'
+import { isNodeActive } from './isNodeActive'
 
 export function isActive(state: EditorState, name: string | null, attributes: Record<string, any> = {}): boolean {
   if (!name) {

package/src/helpers/isList.ts

@@ -1,8 +1,8 @@
-import { Extensions } from '../types'
 import { NodeConfig } from '..'
-import { splitExtensions } from './splitExtensions'
-import { callOrReturn } from '../utilities/callOrReturn'
 import { getExtensionField } from '../helpers/getExtensionField'
+import { Extensions } from '../types'
+import { callOrReturn } from '../utilities/callOrReturn'
+import { splitExtensions } from './splitExtensions'
 
 export function isList(name: string, extensions: Extensions): boolean {
   const { nodeExtensions } = splitExtensions(extensions)

package/src/helpers/isMarkActive.ts

@@ -1,8 +1,9 @@
-import { EditorState } from 'prosemirror-state'
 import { MarkType } from 'prosemirror-model'
+import { EditorState } from 'prosemirror-state'
+
+import { MarkRange } from '../types'
 import { objectIncludes } from '../utilities/objectIncludes'
 import { getMarkType } from './getMarkType'
-import { MarkRange } from '../types'
 
 export function isMarkActive(
   state: EditorState,

package/src/helpers/isNodeActive.ts

@@ -1,8 +1,9 @@
-import { EditorState } from 'prosemirror-state'
 import { NodeType } from 'prosemirror-model'
+import { EditorState } from 'prosemirror-state'
+
+import { NodeRange } from '../types'
 import { objectIncludes } from '../utilities/objectIncludes'
 import { getNodeType } from './getNodeType'
-import { NodeRange } from '../types'
 
 export function isNodeActive(
   state: EditorState,

package/src/helpers/isNodeSelection.ts

@@ -1,4 +1,5 @@
 import { NodeSelection } from 'prosemirror-state'
+
 import { isObject } from '../utilities/isObject'
 
 export function isNodeSelection(value: unknown): value is NodeSelection {

package/src/helpers/isTextSelection.ts

@@ -1,4 +1,5 @@
 import { TextSelection } from 'prosemirror-state'
+
 import { isObject } from '../utilities/isObject'
 
 export function isTextSelection(value: unknown): value is TextSelection {

package/src/helpers/posToDOMRect.ts

@@ -1,4 +1,5 @@
 import { EditorView } from 'prosemirror-view'
+
 import { minMax } from '../utilities/minMax'
 
 export function posToDOMRect(view: EditorView, from: number, to: number): DOMRect {

package/src/helpers/resolveFocusPosition.ts

@@ -1,5 +1,6 @@
 import { Node as ProseMirrorNode } from 'prosemirror-model'
 import { Selection, TextSelection } from 'prosemirror-state'
+
 import { FocusPosition } from '../types'
 import { minMax } from '../utilities/minMax'
 

package/src/helpers/selectionToInsertionEnd.ts

@@ -1,5 +1,5 @@
 import { Selection, Transaction } from 'prosemirror-state'
-import { ReplaceStep, ReplaceAroundStep } from 'prosemirror-transform'
+import { ReplaceAroundStep, ReplaceStep } from 'prosemirror-transform'
 
 // source: https://github.com/ProseMirror/prosemirror-state/blob/master/src/selection.js#L466
 export function selectionToInsertionEnd(tr: Transaction, startLen: number, bias: number) {

package/src/helpers/splitExtensions.ts

@@ -1,7 +1,7 @@
-import { Extensions } from '../types'
 import { Extension } from '../Extension'
-import { Node } from '../Node'
 import { Mark } from '../Mark'
+import { Node } from '../Node'
+import { Extensions } from '../types'
 
 export function splitExtensions(extensions: Extensions) {
   const baseExtensions = extensions.filter(extension => extension.type === 'extension') as Extension[]

package/src/index.ts

@@ -1,60 +1,18 @@
-import * as extensions from './extensions'
-
-export { extensions }
+export * from './CommandManager'
 export * from './Editor'
 export * from './Extension'
-export * from './Node'
+export * as extensions from './extensions'
+export * from './helpers'
+export * from './InputRule'
+export * from './inputRules'
 export * from './Mark'
+export * from './Node'
 export * from './NodeView'
-export * from './Tracker'
-export * from './InputRule'
 export * from './PasteRule'
-export * from './CommandManager'
+export * from './pasteRules'
+export * from './Tracker'
 export * from './types'
-
-export * from './inputRules/nodeInputRule'
-export * from './inputRules/markInputRule'
-export * from './inputRules/textblockTypeInputRule'
-export * from './inputRules/textInputRule'
-export * from './inputRules/wrappingInputRule'
-export * from './pasteRules/markPasteRule'
-export * from './pasteRules/textPasteRule'
-
-export * from './utilities/callOrReturn'
-export * from './utilities/escapeForRegEx'
-export * from './utilities/mergeAttributes'
-
-export * from './helpers/combineTransactionSteps'
-export * from './helpers/defaultBlockAt'
-export * from './helpers/getExtensionField'
-export * from './helpers/findChildren'
-export * from './helpers/findChildrenInRange'
-export * from './helpers/findParentNode'
-export * from './helpers/findParentNodeClosestToPos'
-export * from './helpers/generateHTML'
-export * from './helpers/generateJSON'
-export * from './helpers/generateText'
-export * from './helpers/getChangedRanges'
-export * from './helpers/getSchema'
-export * from './helpers/getHTMLFromFragment'
-export * from './helpers/getDebugJSON'
-export * from './helpers/getAttributes'
-export * from './helpers/getMarkAttributes'
-export * from './helpers/getMarkRange'
-export * from './helpers/getMarkType'
-export * from './helpers/getMarksBetween'
-export * from './helpers/getNodeAttributes'
-export * from './helpers/getNodeType'
-export * from './helpers/getText'
-export * from './helpers/getTextBetween'
-export * from './helpers/isActive'
-export * from './helpers/isList'
-export * from './helpers/isMarkActive'
-export * from './helpers/isNodeActive'
-export * from './helpers/isNodeEmpty'
-export * from './helpers/isNodeSelection'
-export * from './helpers/isTextSelection'
-export * from './helpers/posToDOMRect'
+export * from './utilities'
 
 // eslint-disable-next-line
 export interface Commands<ReturnType = any> {}

package/src/inputRules/index.ts

@@ -0,0 +1,5 @@
+export * from './markInputRule'
+export * from './nodeInputRule'
+export * from './textblockTypeInputRule'
+export * from './textInputRule'
+export * from './wrappingInputRule'

package/src/inputRules/markInputRule.ts

@@ -1,8 +1,9 @@
-import { InputRule, InputRuleFinder } from '../InputRule'
 import { MarkType } from 'prosemirror-model'
+
 import { getMarksBetween } from '../helpers/getMarksBetween'
-import { callOrReturn } from '../utilities/callOrReturn'
+import { InputRule, InputRuleFinder } from '../InputRule'
 import { ExtendedRegExpMatchArray } from '../types'
+import { callOrReturn } from '../utilities/callOrReturn'
 
 /**
  * Build an input rule that adds a mark when the

package/src/inputRules/nodeInputRule.ts

@@ -1,4 +1,5 @@
 import { NodeType } from 'prosemirror-model'
+
 import { InputRule, InputRuleFinder } from '../InputRule'
 import { ExtendedRegExpMatchArray } from '../types'
 import { callOrReturn } from '../utilities/callOrReturn'

package/src/inputRules/textblockTypeInputRule.ts

@@ -1,5 +1,6 @@
-import { InputRule, InputRuleFinder } from '../InputRule'
 import { NodeType } from 'prosemirror-model'
+
+import { InputRule, InputRuleFinder } from '../InputRule'
 import { ExtendedRegExpMatchArray } from '../types'
 import { callOrReturn } from '../utilities/callOrReturn'
 

package/src/inputRules/wrappingInputRule.ts

@@ -1,6 +1,7 @@
+import { Node as ProseMirrorNode, NodeType } from 'prosemirror-model'
+import { canJoin, findWrapping } from 'prosemirror-transform'
+
 import { InputRule, InputRuleFinder } from '../InputRule'
-import { NodeType, Node as ProseMirrorNode } from 'prosemirror-model'
-import { findWrapping, canJoin } from 'prosemirror-transform'
 import { ExtendedRegExpMatchArray } from '../types'
 import { callOrReturn } from '../utilities/callOrReturn'
 

package/src/pasteRules/index.ts

@@ -0,0 +1,2 @@
+export * from './markPasteRule'
+export * from './textPasteRule'

package/src/pasteRules/markPasteRule.ts

@@ -1,8 +1,9 @@
-import { PasteRule, PasteRuleFinder } from '../PasteRule'
 import { MarkType } from 'prosemirror-model'
+
 import { getMarksBetween } from '../helpers/getMarksBetween'
-import { callOrReturn } from '../utilities/callOrReturn'
+import { PasteRule, PasteRuleFinder } from '../PasteRule'
 import { ExtendedRegExpMatchArray } from '../types'
+import { callOrReturn } from '../utilities/callOrReturn'
 
 /**
  * Build an paste rule that adds a mark when the

package/src/types.ts

@@ -1,25 +1,26 @@
 import {
-  Node as ProseMirrorNode,
   Mark as ProseMirrorMark,
+  Node as ProseMirrorNode,
   ParseOptions,
 } from 'prosemirror-model'
+import { EditorState, Transaction } from 'prosemirror-state'
 import {
-  EditorView,
   Decoration,
-  NodeView,
   EditorProps,
+  EditorView,
+  NodeView,
 } from 'prosemirror-view'
-import { EditorState, Transaction } from 'prosemirror-state'
-import { Extension } from './Extension'
-import { Node } from './Node'
-import { Mark } from './Mark'
-import { Editor } from './Editor'
+
 import {
   Commands,
   ExtensionConfig,
-  NodeConfig,
   MarkConfig,
+  NodeConfig,
 } from '.'
+import { Editor } from './Editor'
+import { Extension } from './Extension'
+import { Mark } from './Mark'
+import { Node } from './Node'
 
 export type AnyConfig = ExtensionConfig | NodeConfig | MarkConfig
 export type AnyExtension = Extension | Node | Mark
@@ -70,6 +71,7 @@ export interface EditorOptions {
   content: Content,
   extensions: Extensions,
   injectCSS: boolean,
+  injectNonce: string | undefined,
   autofocus: FocusPosition,
   editable: boolean,
   editorProps: EditorProps,
@@ -127,6 +129,7 @@ export type Attribute = {
   renderHTML?: ((attributes: Record<string, any>) => Record<string, any> | null) | null,
   parseHTML?: ((element: HTMLElement) => any | null) | null,
   keepOnSplit: boolean,
+  isRequired?: boolean,
 }
 
 export type Attributes = {
@@ -243,6 +246,7 @@ export type TextSerializer = (props: {
   pos: number,
   parent: ProseMirrorNode,
   index: number,
+  range: Range,
 }) => string
 
 export type ExtendedRegExpMatchArray = RegExpMatchArray & {

package/src/utilities/createStyleTag.ts

@@ -1,4 +1,4 @@
-export function createStyleTag(style: string): HTMLStyleElement {
+export function createStyleTag(style: string, nonce?: string): HTMLStyleElement {
   const tipTapStyleTag = (<HTMLStyleElement>document.querySelector('style[data-tiptap-style]'))
 
   if (tipTapStyleTag !== null) {
@@ -7,6 +7,10 @@ export function createStyleTag(style: string): HTMLStyleElement {
 
   const styleNode = document.createElement('style')
 
+  if (nonce) {
+    styleNode.setAttribute('nonce', nonce)
+  }
+
   styleNode.setAttribute('data-tiptap-style', '')
   styleNode.innerHTML = style
   document.getElementsByTagName('head')[0].appendChild(styleNode)

package/src/utilities/index.ts

@@ -0,0 +1,3 @@
+export * from './callOrReturn'
+export * from './escapeForRegEx'
+export * from './mergeAttributes'

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

@@ -1,3 +0,0 @@
-import { Schema } from 'prosemirror-model';
-import { TextSerializer } from '../types';
-export declare function getTextSeralizersFromSchema(schema: Schema): Record<string, TextSerializer>;