@marvalt/wparser 0.1.38 → 0.1.40

package/dist/index.esm.js

@@ -2275,57 +2275,14 @@ const Paragraph = ({ block, context }) => {
     const spacing = getSpacing(context.spacingConfig || context.registry.spacingConfig, 'paragraph', 'my-6');
     // Check if innerHTML contains HTML elements (like links, strong, em, etc.)
     const hasHTML = block.innerHTML && /<[a-z][\s\S]*>/i.test(block.innerHTML);
-    // If innerHTML contains HTML elements, render it directly (preserves links, formatting, etc.)
-    if (hasHTML && block.innerHTML) {
-        const htmlContent = block.innerHTML;
-        // Check if HTML contains shortcodes
-        const hasShortcodes = /\[(\w+)/.test(htmlContent);
-        if (hasShortcodes && context.registry.shortcodes) {
-            // For HTML with shortcodes, we need to process shortcodes first
-            // Extract text content to process shortcodes, then reconstruct
-            const textContent = getBlockTextContent(block);
-            const parts = renderTextWithShortcodes(textContent, context.registry);
-            // Check if any part is a block-level element (section, div, etc.)
-            const isBlockLevelElement = (element) => {
-                if (!React.isValidElement(element)) {
-                    return false;
-                }
-                const type = element.type;
-                // Check for block-level HTML elements
-                if (typeof type === 'string' && ['section', 'div', 'article', 'header', 'footer', 'aside', 'nav'].includes(type)) {
-                    return true;
-                }
-                // Check if it's React.Fragment - recursively check its children
-                if (type === React.Fragment) {
-                    const fragmentProps = element.props;
-                    const children = React.Children.toArray(fragmentProps.children);
-                    return children.some((child) => isBlockLevelElement(child));
-                }
-                // Check if it's a React component (likely block-level)
-                if (typeof type === 'function' || (typeof type === 'object' && type !== null && type !== React.Fragment)) {
-                    return true;
-                }
-                return false;
-            };
-            const hasBlockLevelContent = React.Children.toArray(parts).some((part) => isBlockLevelElement(part));
-            if (hasBlockLevelContent) {
-                // Render block-level content without <p> wrapper, but add spacing wrapper
-                return jsxRuntimeExports.jsx("div", { className: spacing, children: parts });
-            }
-            // For mixed HTML and shortcodes, render shortcode parts but this is complex
-            // For now, fall back to rendering HTML with shortcodes processed in text
-            // This is a limitation - shortcodes in HTML paragraphs with links won't work perfectly
-            // But links will be preserved
-            return jsxRuntimeExports.jsx("p", { className: buildClassName(spacing, textAlign), dangerouslySetInnerHTML: { __html: htmlContent } });
-        }
-        // No shortcodes, just render HTML directly (preserves links, formatting, etc.)
-        return jsxRuntimeExports.jsx("p", { className: buildClassName(spacing, textAlign), dangerouslySetInnerHTML: { __html: htmlContent } });
-    }
-    // No HTML, use text content (existing logic for shortcodes)
-    const content = getBlockTextContent(block);
-    const hasShortcodes = /\[(\w+)/.test(content);
+    // 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.)
         const isBlockLevelElement = (element) => {
             if (!React.isValidElement(element)) {
@@ -2353,11 +2310,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 || {};