@marvalt/wparser 0.1.35 → 0.1.39

package/dist/index.cjs

@@ -1758,7 +1758,17 @@ function extractImageUrl(block) {
  * Extract image attributes (url, alt, width, height)
  */
 function extractImageAttributes(block) {
-    return getImageAttributes(block);
+    const attrs = getImageAttributes(block);
+    // Convert width to number if it's a string
+    const width = typeof attrs.width === 'string'
+        ? (parseInt(attrs.width, 10) || undefined)
+        : attrs.width;
+    return {
+        url: attrs.url,
+        alt: attrs.alt,
+        width,
+        height: attrs.height,
+    };
 }
 /**
  * Extract title/heading text from a block
@@ -2262,16 +2272,20 @@ function getHeadingSpacing(spacingConfig, level) {
     return headingConfig?.h3 || 'mt-6 mb-4';
 }
 const Paragraph = ({ block, context }) => {
-    const content = getBlockTextContent(block);
     const attrs = block.attributes || {};
     const textAlign = getTextAlignClasses(attrs['align']);
     const spacing = getSpacing(context.spacingConfig || context.registry.spacingConfig, 'paragraph', 'my-6');
-    // Check if content contains shortcodes
-    const hasShortcodes = /\[(\w+)/.test(content);
+    // Check if innerHTML contains HTML elements (like links, strong, em, etc.)
+    const hasHTML = block.innerHTML && /<[a-z][\s\S]*>/i.test(block.innerHTML);
+    // Check if content contains shortcodes (check both HTML and text content)
+    const htmlContent = block.innerHTML || '';
+    const textContent = getBlockTextContent(block);
+    const hasShortcodes = /\[(\w+)/.test(htmlContent) || /\[(\w+)/.test(textContent);
+    // If shortcodes are present, always process them (even if HTML is also present)
     if (hasShortcodes && context.registry.shortcodes) {
-        const parts = renderTextWithShortcodes(content, context.registry);
+        // Process shortcodes from text content
+        const parts = renderTextWithShortcodes(textContent, context.registry);
         // Check if any part is a block-level element (section, div, etc.)
-        // If so, render without wrapping in <p> to avoid DOM nesting violations
         const isBlockLevelElement = (element) => {
             if (!React.isValidElement(element)) {
                 return false;
@@ -2288,7 +2302,6 @@ const Paragraph = ({ block, context }) => {
                 return children.some((child) => isBlockLevelElement(child));
             }
             // Check if it's a React component (likely block-level)
-            // Most custom components render block-level content
             if (typeof type === 'function' || (typeof type === 'object' && type !== null && type !== React.Fragment)) {
                 return true;
             }
@@ -2299,11 +2312,15 @@ const Paragraph = ({ block, context }) => {
             // Render block-level content without <p> wrapper, but add spacing wrapper
             return jsxRuntimeExports.jsx("div", { className: spacing, children: parts });
         }
-        // Don't hardcode text color - let it inherit from parent (e.g., column with background color)
+        // Render shortcode parts inside paragraph (shortcodes are processed as React components)
         return jsxRuntimeExports.jsx("p", { className: buildClassName(spacing, textAlign), children: parts });
     }
-    // Don't hardcode text color - let it inherit from parent (e.g., column with background color)
-    return jsxRuntimeExports.jsx("p", { className: buildClassName(spacing, textAlign), children: content });
+    // If innerHTML contains HTML elements but no shortcodes, render it directly (preserves links, formatting, etc.)
+    if (hasHTML && block.innerHTML) {
+        return jsxRuntimeExports.jsx("p", { className: buildClassName(spacing, textAlign), dangerouslySetInnerHTML: { __html: htmlContent } });
+    }
+    // No HTML and no shortcodes, just render plain text content
+    return jsxRuntimeExports.jsx("p", { className: buildClassName(spacing, textAlign), children: textContent });
 };
 const Heading = ({ block, children, context }) => {
     const attrs = block.attributes || {};