@capillarytech/creatives-library 8.0.263 → 8.0.265

package/v2Components/HtmlEditor/components/PreviewPane/index.js

@@ -15,13 +15,13 @@
  * - Filters dangerous protocols (javascript:, data:, vbscript:)
  * - Variant-aware sanitization (EMAIL vs INAPP with different security levels)
  * - Iframe sandbox uses "allow-scripts" only (no allow-same-origin for security)
- * - Content delivered via srcdoc attribute for CSP compliance (replaces blob URLs)
+ * - Content delivered via blob URLs to isolate iframe from parent origin
  *
  * Previous Security Issues (FIXED):
  * - Removed insecure manual sanitizeJavaScript function that only escaped </script> tags
  * - Replaced with robust DOMPurify-based sanitization for full XSS protection
  * - Removed "allow-same-origin" from iframe sandbox to prevent same-origin access
- * - Replaced blob URLs with srcdoc to comply with CSP frame-src directives
+ * - Implemented blob URL delivery to maintain isolation while allowing script execution
  */
 
 import React, { useMemo, useEffect, useRef } from 'react';
@@ -55,7 +55,7 @@ const PreviewPane = ({
   className = '',
   isFullscreenMode = false,
   isModalContext = false,
-  layoutType = LAYOUT_TYPES.MODAL,
+  layoutType = LAYOUT_TYPES.MODAL
 }) => {
   const { content, layout, variant } = useEditorContext();
 
@@ -103,25 +103,36 @@ const PreviewPane = ({
     return sanitizationResult.sanitized;
   }, [contentValue, variant]);
 
-  // Use srcdoc instead of blob URLs for CSP compliance
-  // srcdoc allows embedding HTML directly in iframe without violating frame-src CSP directives
-  // This is more secure and CSP-compliant than blob URLs
-  const iframeContent = useMemo(() => {
-    if (!combinedContent) {
-      return null;
+  // Create blob URL for secure iframe content delivery
+  // This isolates the iframe content from the parent origin while allowing script execution
+  const blobUrlRef = useRef(null);
+  const blobUrl = useMemo(() => {
+    // Clean up previous blob URL to prevent memory leaks
+    if (blobUrlRef.current) {
+      URL.revokeObjectURL(blobUrlRef.current);
+      blobUrlRef.current = null;
     }
 
-    // srcdoc has a size limit (~2MB in some browsers), but for HTML preview content this should be sufficient
-    // If content is too large, we'll fall back to about:blank and log a warning
-    const MAX_SRCDOC_SIZE = 2000000; // 2MB limit
-    if (combinedContent.length > MAX_SRCDOC_SIZE) {
-      console.warn('PreviewPane: Content too large for srcdoc, using about:blank');
-      return null;
+    // Create new blob URL if we have content
+    if (combinedContent) {
+      const blob = new Blob([combinedContent], { type: 'text/html' });
+      blobUrlRef.current = URL.createObjectURL(blob);
+      return blobUrlRef.current;
     }
 
-    return combinedContent;
+    return null;
   }, [combinedContent]);
 
+  // Cleanup blob URL on unmount
+  useEffect(() => {
+    return () => {
+      if (blobUrlRef.current) {
+        URL.revokeObjectURL(blobUrlRef.current);
+        blobUrlRef.current = null;
+      }
+    };
+  }, []);
+
   // Generate CSS classes based on view mode
   const getIframeClasses = () => {
     const baseClass = 'preview-pane__iframe';
@@ -143,15 +154,15 @@ const PreviewPane = ({
       // Use layout.mobileWidth or fallback to 375px
       const width = mobileWidth || 375;
       baseStyles.width = `${width}px`;
+      baseStyles.height = '100%'; // Fill container height
     }
-    baseStyles.height = '100%'; // Fill container height
+
     return baseStyles;
   };
 
   const renderDeviceFrame = () => (
     <iframe
-      src={iframeContent ? undefined : 'about:blank'}
-      srcDoc={iframeContent || undefined}
+      src={blobUrl || 'about:blank'}
       title={intl.formatMessage(messages.htmlPreview)}
       className={getIframeClasses()}
       style={getPreviewStyles()}
@@ -162,7 +173,17 @@ const PreviewPane = ({
   const renderEmptyState = () => (
     <div className="preview-empty">
       <div className="empty-content">
-        <p className="preview-mode-info"></p>
+        <div className="empty-icon">📝</div>
+        <p>{intl.formatMessage(messages.startTypingHtml)}</p>
+        <p className="preview-mode-info">
+          {intl.formatMessage(messages.previewMode)}: {
+            viewMode === PREVIEW_MODES.DESKTOP
+              ? intl.formatMessage(messages.desktop)
+              : viewMode === PREVIEW_MODES.MOBILE
+                ? intl.formatMessage(messages.mobile)
+                : intl.formatMessage(messages.mobileDevice)
+          }
+        </p>
       </div>
     </div>
   );
@@ -191,7 +212,7 @@ const PreviewPane = ({
       </CapRow>
 
       <CapRow className="preview-pane__content">
-        {iframeContent ? renderDeviceFrame() : renderEmptyState()}
+        {blobUrl ? renderDeviceFrame() : renderEmptyState()}
       </CapRow>
     </div>
   );
@@ -202,7 +223,7 @@ PreviewPane.propTypes = {
   className: PropTypes.string,
   isFullscreenMode: PropTypes.bool,
   isModalContext: PropTypes.bool,
-  layoutType: PropTypes.oneOf(Object.values(LAYOUT_TYPES)),
+  layoutType: PropTypes.oneOf(Object.values(LAYOUT_TYPES))
 };
 
 export default injectIntl(PreviewPane);

package/v2Components/HtmlEditor/components/SplitContainer/_splitContainer.scss

@@ -161,7 +161,7 @@
 
   // Dragging state styling
   &--dragging &__splitter {
-    background-color: map-get($CAP_SECONDARY, base);
+    background-color: map-get($CAP_PRIMARY, base);
   }
 
   &--dragging &__splitter-line {

package/v2Components/HtmlEditor/components/ValidationErrorDisplay/__tests__/index.test.js

@@ -0,0 +1,152 @@
+/**
+ * ValidationErrorDisplay Component Tests
+ *
+ * Tests for the ValidationErrorDisplay component that integrates with ErrorInfoNote.
+ */
+
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import ValidationErrorDisplay from '../index';
+
+// Mock ErrorInfoNote component
+jest.mock('../../../../ErrorInfoNote', () => {
+  return function MockErrorInfoNote({ errorMessages }) {
+    const liquidErrors = errorMessages?.LIQUID_ERROR_MSG || [];
+    const standardErrors = errorMessages?.STANDARD_ERROR_MSG || [];
+    const hasErrors = liquidErrors.length > 0 || standardErrors.length > 0;
+
+    if (!hasErrors) return null;
+
+    return (
+      <div data-testid="error-info-note">
+        {liquidErrors.map((msg, index) => (
+          <div key={`liquid-${index}`} data-testid="error-message">
+            {msg}
+          </div>
+        ))}
+        {standardErrors.map((msg, index) => (
+          <div key={`standard-${index}`} data-testid="error-message">
+            {msg}
+          </div>
+        ))}
+      </div>
+    );
+  };
+});
+
+describe('ValidationErrorDisplay', () => {
+  it('renders standard errors when validation has issues', () => {
+    const mockValidation = {
+      getAllIssues: () => [
+        { message: 'Missing closing tag', severity: 'error', line: 5, column: 10 },
+        { message: 'Invalid attribute', severity: 'error', line: 7 }
+      ],
+      isClean: () => false,
+      isValidating: false
+    };
+
+    render(<ValidationErrorDisplay validation={mockValidation} />);
+
+    expect(screen.getByTestId('error-info-note')).toBeInTheDocument();
+    const errorMessages = screen.getAllByTestId('error-message');
+    expect(errorMessages).toHaveLength(2);
+    expect(errorMessages[0]).toHaveTextContent('Missing closing tag Line 5, Char 10.');
+    expect(errorMessages[1]).toHaveTextContent('Invalid attribute Line 7.');
+  });
+
+  it('renders liquid errors separately', () => {
+    const mockValidation = {
+      getAllIssues: () => [
+        { message: 'Invalid liquid syntax', severity: 'error', source: 'liquid-validator', line: 3 },
+        { message: 'HTML error', severity: 'error', source: 'htmlhint', line: 10 }
+      ],
+      isClean: () => false,
+      isValidating: false
+    };
+
+    render(<ValidationErrorDisplay validation={mockValidation} />);
+
+    expect(screen.getByTestId('error-info-note')).toBeInTheDocument();
+    const errorMessages = screen.getAllByTestId('error-message');
+    expect(errorMessages).toHaveLength(2);
+    // First should be liquid error, second should be standard error
+    expect(errorMessages[0]).toHaveTextContent('Invalid liquid syntax Line 3.');
+    expect(errorMessages[1]).toHaveTextContent('HTML error Line 10.');
+  });
+
+  it('does not render when validation has no errors', () => {
+    const mockValidation = {
+      getAllIssues: () => [],
+      isClean: () => true,
+      isValidating: false
+    };
+
+    const { container } = render(<ValidationErrorDisplay validation={mockValidation} />);
+
+    expect(screen.queryByTestId('error-info-note')).not.toBeInTheDocument();
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('does not render when validation is null', () => {
+    const { container } = render(<ValidationErrorDisplay validation={null} />);
+
+    expect(screen.queryByTestId('error-info-note')).not.toBeInTheDocument();
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('does not render when validation is in progress', () => {
+    const mockValidation = {
+      getAllIssues: () => [],
+      isClean: () => false,
+      isValidating: true
+    };
+
+    const { container } = render(<ValidationErrorDisplay validation={mockValidation} />);
+
+    expect(screen.queryByTestId('error-info-note')).not.toBeInTheDocument();
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('applies custom className', () => {
+    const mockValidation = {
+      getAllIssues: () => [{ message: 'Error', severity: 'error' }],
+      isClean: () => false,
+      isValidating: false
+    };
+
+    const { container } = render(
+      <ValidationErrorDisplay validation={mockValidation} className="custom-class" />
+    );
+
+    const wrapper = container.querySelector('.validation-error-display');
+    expect(wrapper).toHaveClass('custom-class');
+  });
+
+  it('handles inapp variant correctly', () => {
+    const mockValidation = {
+      getAllIssues: () => [{ message: 'Mobile error', severity: 'error' }],
+      isClean: () => false,
+      isValidating: false
+    };
+
+    render(<ValidationErrorDisplay validation={mockValidation} variant="inapp" />);
+
+    expect(screen.getByTestId('error-info-note')).toBeInTheDocument();
+    expect(screen.getByTestId('error-message')).toHaveTextContent('Mobile error');
+  });
+
+  it('includes rule information in error messages when available', () => {
+    const mockValidation = {
+      getAllIssues: () => [
+        { message: 'Alt attribute required', severity: 'error', rule: 'alt-require', line: 5 }
+      ],
+      isClean: () => false,
+      isValidating: false
+    };
+
+    render(<ValidationErrorDisplay validation={mockValidation} />);
+
+    expect(screen.getByTestId('error-message')).toHaveTextContent('Alt attribute required Line 5. • alt-require');
+  });
+});

package/v2Components/HtmlEditor/components/ValidationErrorDisplay/_validationErrorDisplay.scss

@@ -1,7 +1,5 @@
 /**
  * ValidationErrorDisplay Styles
- *
- * When collapsed, panel sticks to footer (header bar only visible).
  */
 
 @import '~@capillarytech/cap-ui-library/styles/_variables.scss';
@@ -11,18 +9,10 @@
   flex-direction: column;
   width: 100%;
   margin-bottom: 1rem;
-  flex-shrink: 0;
 
   // Ensure proper spacing when used in different contexts
   &:last-child {
     margin-bottom: 0;
-    padding-bottom: 0.25rem;
-  }
-
-  // Collapsed: panel stays in footer as a slim bar (tabs + expand arrow only)
-  &--collapsed {
-    margin-bottom: 0;
-    padding-bottom: 0.25rem;
   }
 
   // Integration with ErrorInfoNote component
@@ -33,17 +23,9 @@
   // Responsive adjustments
   @media (max-width: 768px) {
     margin-bottom: 0.75rem;
-
-    &.validation-error-display--collapsed {
-      margin-bottom: 0;
-    }
   }
 
   @media (max-width: 576px) {
     margin-bottom: 0.5rem;
-
-    &.validation-error-display--collapsed {
-      margin-bottom: 0;
-    }
   }
 }

package/v2Components/HtmlEditor/components/ValidationErrorDisplay/index.js

@@ -1,15 +1,18 @@
 /**
- * ValidationErrorDisplay - HTML Editor validation display
+ * ValidationErrorDisplay - HTML Editor validation using ErrorInfoNote
  *
- * Displays validation errors and warnings in two tabs (Errors, Warnings).
- * Panel can be collapsed to a sticky footer bar; it does not disappear.
+ * This component integrates the existing ErrorInfoNote component with the HTML Editor's
+ * validation system, providing a consistent error display that matches the Figma design.
  */
 
-import React, { useState } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 
-import { hasValidationErrors } from '../../utils/validationAdapter';
-import ValidationTabs from '../ValidationTabs';
+import CapRow from '@capillarytech/cap-ui-library/CapRow';
+import ErrorInfoNote from '../../../ErrorInfoNote';
+
+import { transformValidationToErrorInfo, hasValidationErrors } from '../../utils/validationAdapter';
+import { HTML_EDITOR_VARIANTS } from '../../constants';
 
 // Styles
 import './_validationErrorDisplay.scss';
@@ -17,59 +20,51 @@ import './_validationErrorDisplay.scss';
 /**
  * ValidationErrorDisplay Component
  *
- * Displays validation issues in Errors and Warnings tabs; collapse toggles visibility but panel stays in footer.
+ * Displays validation errors using the existing ErrorInfoNote component
  */
 const ValidationErrorDisplay = ({
   validation,
+  variant = HTML_EDITOR_VARIANTS.EMAIL,
   onErrorClick,
-  className = '',
+  className = ''
 }) => {
-  const [isCollapsed, setIsCollapsed] = useState(false);
-
-  const handleToggleCollapse = () => {
-    setIsCollapsed((prev) => !prev);
-  };
-
-  // Expand panel when user clicks redirection (so panel does not stay stuck to footer)
-  const handleExpand = () => {
-    setIsCollapsed(false);
-  };
-
+  // Don't render if no validation or no errors
   if (!hasValidationErrors(validation)) {
     return null;
   }
 
+  // Transform validation data to ErrorInfoNote format
+  const errorData = transformValidationToErrorInfo(validation, variant);
+  const { errorMessages } = errorData || {};
+
+  // Handle error click if provided
+  const handleErrorClick = (error) => {
+    onErrorClick?.(error);
+  };
+
   return (
-    <div
-      className={`validation-error-display ${isCollapsed ? 'validation-error-display--collapsed' : ''} ${className}`}
+    <CapRow
+      className={`validation-error-display ${className}`}
       role="alert"
       aria-live="polite"
       aria-label="Validation errors"
     >
-      <ValidationTabs
-        validation={validation}
-        onErrorClick={onErrorClick}
-        isCollapsed={isCollapsed}
-        onToggleCollapse={handleToggleCollapse}
-        onExpand={handleExpand}
+      <ErrorInfoNote
+        errorMessages={errorMessages}
+        onErrorClick={handleErrorClick}
       />
-    </div>
+    </CapRow>
   );
 };
 
 ValidationErrorDisplay.propTypes = {
   validation: PropTypes.shape({
     isValidating: PropTypes.bool,
-    getAllIssues: PropTypes.func,
+    getAllIssues: PropTypes.func
   }),
+  variant: PropTypes.oneOf(Object.values(HTML_EDITOR_VARIANTS)),
   onErrorClick: PropTypes.func,
-  className: PropTypes.string,
-};
-
-ValidationErrorDisplay.defaultProps = {
-  validation: null,
-  onErrorClick: null,
-  className: '',
+  className: PropTypes.string
 };
 
 export default ValidationErrorDisplay;

package/v2Components/HtmlEditor/components/ValidationPanel/_validationPanel.scss

@@ -5,17 +5,17 @@
 @import '~@capillarytech/cap-ui-library/styles/_variables.scss';
 
 .validation-panel {
-  border: 1px solid $CAP_COLOR_16;
-  border-radius: $CAP_SPACE_06;
-  background: $CAP_WHITE;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  background: #fff;
 
   &--loading {
-    padding: $CAP_SPACE_16;
+    padding: 16px;
     text-align: center;
   }
 
   &--clean {
-    padding: $CAP_SPACE_16;
+    padding: 16px;
     text-align: center;
     background: #f6ffed;
     border-color: #b7eb8f;
@@ -25,7 +25,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    gap: $CAP_SPACE_08;
+    gap: 8px;
     color: #666;
     font-size: 14px;
   }
@@ -34,36 +34,36 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    gap: $CAP_SPACE_08;
+    gap: 8px;
     color: #52c41a;
     font-size: 14px;
-    font-weight: $FONT_WEIGHT_MEDIUM;
+    font-weight: 500;
   }
 
   &__summary {
     display: flex;
-    gap: $CAP_SPACE_16;
-    padding: $CAP_SPACE_12 $CAP_SPACE_16;
-    background: $CAP_G21;
-    border-bottom: 1px solid $CAP_COLOR_16;
-    border-radius: $CAP_SPACE_06 $CAP_SPACE_06 0 0;
+    gap: 16px;
+    padding: 12px 16px;
+    background: #fafafa;
+    border-bottom: 1px solid #d9d9d9;
+    border-radius: 6px 6px 0 0;
   }
 
   &__summary-item {
     display: flex;
     align-items: center;
-    gap: $CAP_SPACE_04;
-    font-size: $CAP_SPACE_12;
+    gap: 4px;
+    font-size: 12px;
     color: #666;
 
     &--security {
       color: #ff4d4f;
-      font-weight: $FONT_WEIGHT_MEDIUM;
+      font-weight: 500;
     }
 
     span:first-of-type {
       font-weight: 600;
-      margin-left: $CAP_SPACE_02;
+      margin-left: 2px;
     }
   }
 
@@ -72,7 +72,7 @@
       border: none;
 
       &:last-child {
-        border-radius: 0 0 $CAP_SPACE_06 $CAP_SPACE_06;
+        border-radius: 0 0 6px 6px;
       }
     }
 
@@ -123,8 +123,8 @@
   &__title {
     display: flex;
     align-items: center;
-    gap: $CAP_SPACE_08;
-    font-weight: $FONT_WEIGHT_MEDIUM;
+    gap: 8px;
+    font-weight: 500;
   }
 
   &__issues {
@@ -133,41 +133,41 @@
   }
 
   &__sanitization {
-    border-top: 1px solid $CAP_COLOR_16;
+    border-top: 1px solid #d9d9d9;
     background: #f9f9f9;
   }
 
   &__sanitization-header {
     display: flex;
     align-items: center;
-    gap: $CAP_SPACE_08;
-    padding: $CAP_SPACE_12 $CAP_SPACE_16;
-    font-weight: $FONT_WEIGHT_MEDIUM;
+    gap: 8px;
+    padding: 12px 16px;
+    font-weight: 500;
     color: #666;
     font-size: 13px;
   }
 
   &__sanitization-list {
-    padding: 0 $CAP_SPACE_16 $CAP_SPACE_12;
+    padding: 0 16px 12px;
   }
 
   &__sanitization-item {
-    padding: $CAP_SPACE_04 0;
-    font-size: $CAP_SPACE_12;
+    padding: 4px 0;
+    font-size: 12px;
     color: #8c8c8c;
   }
 }
 
 .validation-issue {
   display: flex;
-  gap: $CAP_SPACE_12;
-  padding: $CAP_SPACE_12 $CAP_SPACE_16;
+  gap: 12px;
+  padding: 12px 16px;
   border-bottom: 1px solid #f0f0f0;
   cursor: pointer;
   transition: background-color 0.2s;
 
   &:hover {
-    background: $CAP_G21;
+    background: #fafafa;
   }
 
   &:last-child {
@@ -189,18 +189,6 @@
   &__icon {
     flex-shrink: 0;
     margin-top: 2px;
-
-    &--error {
-      color: #ff4d4f;
-    }
-
-    &--info {
-      color: #1890ff;
-    }
-
-    &--security {
-      color: #ff4d4f;
-    }
   }
 
   &__content {
@@ -212,14 +200,14 @@
     font-size: 13px;
     line-height: 1.4;
     color: #262626;
-    margin-bottom: $CAP_SPACE_04;
+    margin-bottom: 4px;
     word-break: break-word;
   }
 
   &__meta {
     display: flex;
     flex-wrap: wrap;
-    gap: $CAP_SPACE_08;
+    gap: 8px;
     font-size: 11px;
     color: #8c8c8c;
   }
@@ -242,9 +230,9 @@
   &__source {
     display: flex;
     align-items: center;
-    gap: $CAP_SPACE_04;
+    gap: 4px;
     background: #f0f0f0;
-    padding: $CAP_SPACE_02 $CAP_SPACE_06;
+    padding: 2px 6px;
     border-radius: 3px;
   }
 }