@tiptap/core 3.20.0 → 3.20.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "3.20.0",
+  "version": "3.20.1",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -52,10 +52,10 @@
     "jsx-dev-runtime"
   ],
   "devDependencies": {
-    "@tiptap/pm": "^3.20.0"
+    "@tiptap/pm": "^3.20.1"
   },
   "peerDependencies": {
-    "@tiptap/pm": "^3.20.0"
+    "@tiptap/pm": "^3.20.1"
   },
   "repository": {
     "type": "git",

package/src/utilities/mergeAttributes.ts

@@ -1,3 +1,76 @@
+/** Splits a CSS style string into declarations, ignoring semicolons inside quotes/parentheses. */
+function splitStyleDeclarations(styles: string): string[] {
+  const result: string[] = []
+
+  let current = ''
+  let inSingleQuote = false
+  let inDoubleQuote = false
+  let parenDepth = 0
+
+  const length = styles.length
+  for (let i = 0; i < length; i += 1) {
+    const char = styles[i]
+    if (char === "'" && !inDoubleQuote) {
+      inSingleQuote = !inSingleQuote
+      current += char
+      continue
+    }
+    if (char === '"' && !inSingleQuote) {
+      inDoubleQuote = !inDoubleQuote
+      current += char
+      continue
+    }
+    if (!inSingleQuote && !inDoubleQuote) {
+      if (char === '(') {
+        parenDepth += 1
+        current += char
+        continue
+      }
+      if (char === ')' && parenDepth > 0) {
+        parenDepth -= 1
+        current += char
+        continue
+      }
+      if (char === ';' && parenDepth === 0) {
+        result.push(current)
+        current = ''
+        continue
+      }
+    }
+    current += char
+  }
+  if (current) {
+    result.push(current)
+  }
+
+  return result
+}
+
+/** Yields property/value pairs from a style string. */
+function parseStyleEntries(styles: string | undefined): [property: string, value: string][] {
+  const pairs: [string, string][] = []
+
+  const declarations = splitStyleDeclarations(styles || '')
+  const numDeclarations = declarations.length
+
+  for (let i = 0; i < numDeclarations; i += 1) {
+    const declaration = declarations[i]
+
+    const firstColonIndex = declaration.indexOf(':')
+    if (firstColonIndex === -1) {
+      continue
+    }
+
+    const property = declaration.slice(0, firstColonIndex).trim()
+    const value = declaration.slice(firstColonIndex + 1).trim()
+    if (property && value) {
+      pairs.push([property, value])
+    }
+  }
+
+  return pairs
+}
+
 export function mergeAttributes(...objects: Record<string, any>[]): Record<string, any> {
   return objects
     .filter(item => !!item)
@@ -21,32 +94,7 @@ export function mergeAttributes(...objects: Record<string, any>[]): Record<strin
 
           mergedAttributes[key] = [...existingClasses, ...insertClasses].join(' ')
         } else if (key === 'style') {
-          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)
-          })
+          const styleMap = new Map([...parseStyleEntries(mergedAttributes[key]), ...parseStyleEntries(value)])
 
           mergedAttributes[key] = Array.from(styleMap.entries())
             .map(([property, val]) => `${property}: ${val}`)