npm - @tiptap/core - Versions diffs - 3.0.0 → 3.0.2 - Mend

@@ -0,0 +1,30 @@
+import type { NodeType } from '@tiptap/pm/model'
+import { type EditorState, NodeSelection } from '@tiptap/pm/state'
+export function canInsertNode(state: EditorState, nodeType: NodeType): boolean {
+  const { selection } = state
+  const { $from } = selection
+  // Special handling for NodeSelection
+  if (selection instanceof NodeSelection) {
+    const index = $from.index()
+    const parent = $from.parent
+    // Can we replace the selected node with the horizontal rule?
+    return parent.canReplaceWith(index, index + 1, nodeType)
+  }
+  // Default: check if we can insert at the current position
+  let depth = $from.depth
+  while (depth >= 0) {
+    const index = $from.index(depth)
+    const parent = $from.node(depth)
+    const match = parent.contentMatchAt(index)
+    if (match.matchType(nodeType)) {
+      return true
+    }
+    depth -= 1
+  }
+  return false
+}

@@ -1,5 +1,7 @@
 export function createStyleTag(style: string, nonce?: string, suffix?: string): HTMLStyleElement {
-  const tiptapStyleTag = (<HTMLStyleElement>document.querySelector(`style[data-tiptap-style${suffix ? `-${suffix}` : ''}]`))
+  const tiptapStyleTag = <HTMLStyleElement>(
+    document.querySelector(`style[data-tiptap-style${suffix ? `-${suffix}` : ''}]`)
+  )
   if (tiptapStyleTag !== null) {
     return tiptapStyleTag

@@ -4,17 +4,13 @@
  * @param key Key to remove
  */
 export function deleteProps(obj: Record<string, any>, propOrProps: string | string[]): Record<string, any> {
-  const props = typeof propOrProps === 'string'
-    ? [propOrProps]
-    : propOrProps
+  const props = typeof propOrProps === 'string' ? [propOrProps] : propOrProps
-  return Object
-    .keys(obj)
-    .reduce((newObj: Record<string, any>, prop) => {
-      if (!props.includes(prop)) {
-        newObj[prop] = obj[prop]
-      }
+  return Object.keys(obj).reduce((newObj: Record<string, any>, prop) => {
+    if (!props.includes(prop)) {
+      newObj[prop] = obj[prop]
+    }
-      return newObj
-    }, {})
+    return newObj
+  }, {})
 }

@@ -15,6 +15,9 @@ const removeWhitespaces = (node: HTMLElement) => {
 }
 export function elementFromString(value: string): HTMLElement {
+  if (typeof window === 'undefined') {
+    throw new Error('[tiptap error]: there is no window object available, so this function cannot be used')
+  }
   // add a wrapper to preserve leading and trailing whitespace
   const wrappedValue = `<body>${value}</body>`

@@ -1,5 +1,8 @@
-export function findDuplicates(items: any[]): any[] {
+/**
+ * Find duplicates in an array.
+ */
+export function findDuplicates<T>(items: T[]): T[] {
   const filtered = items.filter((el, index) => items.indexOf(el) !== index)
-  return [...new Set(filtered)]
+  return Array.from(new Set(filtered))
 }

@@ -1,10 +1,12 @@
 export * from './callOrReturn.js'
+export * from './canInsertNode.js'
 export * from './createStyleTag.js'
 export * from './deleteProps.js'
 export * from './elementFromString.js'
 export * from './escapeForRegEx.js'
 export * from './findDuplicates.js'
 export * from './fromString.js'
+export * from './isAndroid.js'
 export * from './isEmptyObject.js'
 export * from './isFunction.js'
 export * from './isiOS.js'

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 export function isFunction(value: any): value is Function {
   return typeof value === 'function'
 }

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

@@ -1,12 +1,7 @@
 export function isiOS(): boolean {
-  return [
-    'iPad Simulator',
-    'iPhone Simulator',
-    'iPod Simulator',
-    'iPad',
-    'iPhone',
-    'iPod',
-  ].includes(navigator.platform)
-  // iPad on iOS 13 detection
-  || (navigator.userAgent.includes('Mac') && 'ontouchend' in document)
+  return (
+    ['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'].includes(navigator.platform) ||
+    // iPad on iOS 13 detection
+    (navigator.userAgent.includes('Mac') && 'ontouchend' in document)
+  )
 }

@@ -14,16 +14,43 @@ export function mergeAttributes(...objects: Record<string, any>[]): Record<strin
         }
         if (key === 'class') {
-          const valueClasses: string[] = value ? value.split(' ') : []
+          const valueClasses: string[] = value ? String(value).split(' ') : []
           const existingClasses: string[] = mergedAttributes[key] ? mergedAttributes[key].split(' ') : []
-          const insertClasses = valueClasses.filter(
-            valueClass => !existingClasses.includes(valueClass),
-          )
+          const insertClasses = valueClasses.filter(valueClass => !existingClasses.includes(valueClass))
           mergedAttributes[key] = [...existingClasses, ...insertClasses].join(' ')
         } else if (key === 'style') {
-          mergedAttributes[key] = [mergedAttributes[key], value].join('; ')
+          const newStyles: string[] = value
+            ? value
+                .split(';')
+                .map((style: string) => style.trim())
+                .filter(Boolean)
+            : []
+          const existingStyles: string[] = mergedAttributes[key]
+            ? mergedAttributes[key]
+                .split(';')
+                .map((style: string) => style.trim())
+                .filter(Boolean)
+            : []
+          const styleMap = new Map<string, string>()
+          existingStyles.forEach(style => {
+            const [property, val] = style.split(':').map(part => part.trim())
+            styleMap.set(property, val)
+          })
+          newStyles.forEach(style => {
+            const [property, val] = style.split(':').map(part => part.trim())
+            styleMap.set(property, val)
+          })
+          mergedAttributes[key] = Array.from(styleMap.entries())
+            .map(([property, val]) => `${property}: ${val}`)
+            .join('; ')
         } else {
           mergedAttributes[key] = value
         }

@@ -8,8 +8,6 @@ export function removeDuplicates<T>(array: T[], by = JSON.stringify): T[] {
   return array.filter(item => {
     const key = by(item)
-    return Object.prototype.hasOwnProperty.call(seen, key)
-      ? false
-      : (seen[key] = true)
+    return Object.prototype.hasOwnProperty.call(seen, key) ? false : (seen[key] = true)
   })
 }

@tiptap/core 3.0.0 → 3.0.2