@heartlandone/vega 2.75.0 → 2.75.1

package/dist/collection/components/vega-rich-text-editor/test/dto/blocks/html-block.test.js

@@ -39,6 +39,45 @@ describe('HTMLBlock', () => {
         ],
       }, { autoMatchFormat: false }).toHtml()).toMatchSnapshot();
     });
+    it('toHtml should handle self-closing hr tag correctly', () => {
+      const hrBlock = RTEHtmlBlock.from({
+        id: 'hr-1',
+        type: 'html-block',
+        htmlTag: 'hr',
+        children: [],
+      }, { autoMatchFormat: false });
+      expect(hrBlock.toHtml()).toBe('<hr>');
+    });
+    it('toHtml should handle self-closing hr tag with attributes correctly', () => {
+      const hrBlock = RTEHtmlBlock.from({
+        id: 'hr-1',
+        type: 'html-block',
+        htmlTag: 'hr',
+        annotations: { customClass: ['divider'] },
+        children: [],
+      }, { autoMatchFormat: false });
+      expect(hrBlock.toHtml()).toBe('<hr class="divider">');
+    });
+    it('toHtml should handle self-closing input tag correctly', () => {
+      const inputBlock = RTEHtmlBlock.from({
+        id: 'input-1',
+        type: 'html-block',
+        htmlTag: 'input',
+        annotations: { customAttribute: { type: 'text', placeholder: 'Enter text' } },
+        children: [],
+      }, { autoMatchFormat: false });
+      expect(inputBlock.toHtml()).toBe('<input type="text" placeholder="Enter text">');
+    });
+    it('toHtml should handle self-closing col tag correctly', () => {
+      const colBlock = RTEHtmlBlock.from({
+        id: 'col-1',
+        type: 'html-block',
+        htmlTag: 'col',
+        annotations: { customAttribute: { span: '2' } },
+        children: [],
+      }, { autoMatchFormat: false });
+      expect(colBlock.toHtml()).toBe('<col span="2">');
+    });
   });
   describe('public methods', () => {
     let htmlBlock;

package/dist/collection/components/vega-rich-text-editor/test/dto/content-state.test.js

@@ -1,4 +1,5 @@
 import { VegaRTEContent } from '../../dto/content-state';
+import { HTMLContentCleaner } from '../../slimmers/controllers/html-cleaner';
 import { RTETextBlock } from '../../dto/blocks/text-block';
 import { RTEImageBlock } from '../../dto/blocks/image-block';
 import { RTEListBlock } from '../../dto/blocks/list-block';
@@ -2613,7 +2614,7 @@ describe('content state', () => {
       </footer>
     </article>
     <address>ADDRESS: 123 Main St, City, Country</address>
-    <blockquote cite="https://example.com">BLOCKQUOTE: “This is a quoted text.”ote>
+    <blockquote cite="https://example.com">BLOCKQUOTE: “This is a quoted text.”</blockquote>
     <details>
       <summary>DETAILS / SUMMARY Example</summary>
       <p>Extra information shown when expanded.</p>
@@ -2955,4 +2956,168 @@ Line 1
       });
     });
   });
+  describe('cleanHtmlWhitespace', () => {
+    const cleaner = new HTMLContentCleaner();
+    const cleanHtmlWhitespace = (html) => {
+      return cleaner.clean(html);
+    };
+    it('should inline a table by removing all whitespace between tags', () => {
+      const input = `<table style="width: 400px; border-collapse: collapse;">   <thead>     <tr>       ` +
+        `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 1</th>       ` +
+        `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 2</th>       ` +
+        `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 3</th>     ` +
+        `</tr>   </thead>   <tbody>     <tr>       <td style="padding: 12px;">Cell 1-1</td>       ` +
+        `<td style="padding: 12px;">Cell 1-2</td>       <td style="padding: 12px;">Cell 1-3</td>     ` +
+        `</tr>     <tr>       <td style="padding: 12px;">Cell 2-1</td>       <td style="padding: 12px;">Cell 2-2</td>       ` +
+        `<td style="padding: 12px;">Cell 2-3</td>     </tr>     <tr>       <td style="padding: 12px;">Cell 3-1</td>       ` +
+        `<td style="padding: 12px;">Cell 3-2</td>       <td style="padding: 12px;">Cell 3-3</td>     ` +
+        `</tr>   </tbody> </table>`;
+      const expected = `<table style="width: 400px; border-collapse: collapse;"><thead><tr>` +
+        `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 1</th>` +
+        `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 2</th>` +
+        `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 3</th>` +
+        `</tr></thead><tbody><tr>` +
+        `<td style="padding: 12px;">Cell 1-1</td>` +
+        `<td style="padding: 12px;">Cell 1-2</td>` +
+        `<td style="padding: 12px;">Cell 1-3</td>` +
+        `</tr><tr>` +
+        `<td style="padding: 12px;">Cell 2-1</td>` +
+        `<td style="padding: 12px;">Cell 2-2</td>` +
+        `<td style="padding: 12px;">Cell 2-3</td>` +
+        `</tr><tr>` +
+        `<td style="padding: 12px;">Cell 3-1</td>` +
+        `<td style="padding: 12px;">Cell 3-2</td>` +
+        `<td style="padding: 12px;">Cell 3-3</td>` +
+        `</tr></tbody></table>`;
+      expect(cleanHtmlWhitespace(input)).toBe(expected);
+    });
+    it('should remove \\n\\t after opening tag and before closing tag', () => {
+      const input = '<p>\n\t <span>test</span>\n\t </p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p><span>test</span></p>');
+    });
+    it('should remove all \\n and \\t characters', () => {
+      const input = '<p>\n\ttest\n</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>test</p>');
+    });
+    it('should preserve space between matching tags', () => {
+      const input = '<span> </span>';
+      expect(cleanHtmlWhitespace(input)).toBe('<span> </span>');
+    });
+    it('should preserve space with text between matching tags', () => {
+      const input = '<span> test </span>';
+      expect(cleanHtmlWhitespace(input)).toBe('<span> test </span>');
+    });
+    it('should preserve multiple spaces between matching tags', () => {
+      const input = '<span>  </span>';
+      expect(cleanHtmlWhitespace(input)).toBe('<span>  </span>');
+    });
+    it('should remove whitespace between opening tags', () => {
+      const input = '<div>\n\t<p></p></div>';
+      expect(cleanHtmlWhitespace(input)).toBe('<div><p></p></div>');
+    });
+    it('should remove \\n\\t after opening tag but preserve regular spaces', () => {
+      const input = '<p>\n\t  Hello</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>  Hello</p>');
+    });
+    it('should remove whitespace between multiple closing tags', () => {
+      const input = '<table><tbody><tr></tr> </tbody> </table>';
+      expect(cleanHtmlWhitespace(input)).toBe('<table><tbody><tr></tr></tbody></table>');
+    });
+    it('should remove whitespace between multiple opening tags', () => {
+      const input = '<div> <span></span></div>';
+      expect(cleanHtmlWhitespace(input)).toBe('<div><span></span></div>');
+    });
+    it('should handle complex nested structure', () => {
+      const input = '<div>\n\t<p>\n\t\t<span>Hello</span>\n\t</p>\n</div>';
+      expect(cleanHtmlWhitespace(input)).toBe('<div><p><span>Hello</span></p></div>');
+    });
+    it('should preserve regular spaces within text content', () => {
+      const input = '<p>Hello World</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello World</p>');
+    });
+    it('should preserve multiple spaces in text content', () => {
+      const input = '<p>Hello  World</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello  World</p>');
+    });
+    it('should not remove \\n between words in text content', () => {
+      const input = '<p>Hello\nWorld</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello\nWorld</p>');
+    });
+    it('should not remove \\n between words with space in text content', () => {
+      const input = '<p>Hello\n World</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello\n World</p>');
+    });
+    it('should remove newline after img tag', () => {
+      const input = '<div><img id="image-id" class="img-class" style="vertical-align: bottom; width: 25%; padding: 20px" alt="test alt" src="data:image/svg+xml;base64,xxx=" data-size="sm">\n</div>';
+      const expected = '<div><img id="image-id" class="img-class" style="vertical-align: bottom; width: 25%; padding: 20px" alt="test alt" src="data:image/svg+xml;base64,xxx=" data-size="sm"></div>';
+      expect(cleanHtmlWhitespace(input)).toBe(expected);
+    });
+    it('should handle 4-level deep nesting', () => {
+      const input = '<div>\n\t<section>\n\t\t<article>\n\t\t\t<p>Text</p>\n\t\t</article>\n\t</section>\n</div>';
+      expect(cleanHtmlWhitespace(input)).toBe('<div><section><article><p>Text</p></article></section></div>');
+    });
+    it('should handle 5-level deep nesting', () => {
+      const input = '<div>\n\t<section>\n\t\t<article>\n\t\t\t<main>\n\t\t\t\t<p>Text</p>\n\t\t\t</main>\n\t\t</article>\n\t</section>\n</div>';
+      expect(cleanHtmlWhitespace(input)).toBe('<div><section><article><main><p>Text</p></main></article></section></div>');
+    });
+    it('should handle 6-level deep nesting', () => {
+      const input = '<div>\n\t<section>\n\t\t<article>\n\t\t\t<main>\n\t\t\t\t<aside>\n\t\t\t\t\t<p>Text</p>\n\t\t\t\t</aside>\n\t\t\t</main>\n\t\t</article>\n\t</section>\n</div>';
+      expect(cleanHtmlWhitespace(input)).toBe('<div><section><article><main><aside><p>Text</p></aside></main></article></section></div>');
+    });
+    it('should remove whitespace after br and hr tags', () => {
+      const input1 = '<div><br>\n</div>';
+      expect(cleanHtmlWhitespace(input1)).toBe('<div><br></div>');
+      const input2 = '<div><hr>\n\t</div>';
+      expect(cleanHtmlWhitespace(input2)).toBe('<div><hr></div>');
+      const input3 = '<div><input type="text">\n</div>';
+      expect(cleanHtmlWhitespace(input3)).toBe('<div><input type="text"></div>');
+    });
+    it('should remove multiple consecutive \\n characters', () => {
+      const input = '<p>\n\n\n\nHello</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello</p>');
+    });
+    it('should remove multiple consecutive \\t characters', () => {
+      const input = '<p>\t\t\tHello</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello</p>');
+    });
+    it('should preserve empty matching tags', () => {
+      const input = '<span></span>';
+      expect(cleanHtmlWhitespace(input)).toBe('<span></span>');
+    });
+    it('should handle mixed spaces, tabs, and newlines', () => {
+      const input = '<div> \n\t <p>Text</p> \n\t </div>';
+      expect(cleanHtmlWhitespace(input)).toBe('<div><p>Text</p></div>');
+    });
+    it('should preserve spaces in attribute values', () => {
+      const input = '<p class="my custom class">Text</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p class="my custom class">Text</p>');
+    });
+    it('should remove newlines after br tags', () => {
+      const input = '<p>Line 1<br>\nLine 2</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Line 1<br>Line 2</p>');
+    });
+    it('should preserve spaces in code blocks between matching tags', () => {
+      const input = '<code>  const x = 1;  </code>';
+      expect(cleanHtmlWhitespace(input)).toBe('<code>  const x = 1;  </code>');
+    });
+    it('should handle empty string', () => {
+      expect(cleanHtmlWhitespace('')).toBe('');
+    });
+    it('should preserve plain text without tags', () => {
+      const input = 'Hello World';
+      expect(cleanHtmlWhitespace(input)).toBe('Hello World');
+    });
+    it('should remove whitespace between different inline elements', () => {
+      const input = '<span>text</span>\n\t<strong>bold</strong>';
+      expect(cleanHtmlWhitespace(input)).toBe('<span>text</span><strong>bold</strong>');
+    });
+    it('should remove \\t\\n combination', () => {
+      const input = '<p>\t\nHello</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello</p>');
+    });
+    it('should remove complex \\n\\t\\n patterns', () => {
+      const input = '<p>\n\t\n\t\nHello</p>';
+      expect(cleanHtmlWhitespace(input)).toBe('<p>Hello</p>');
+    });
+  });
 });

package/dist/collection/components/vega-rich-text-editor/test/html-cleaner/html-content-cleaner.test.js

@@ -0,0 +1,186 @@
+import { HTMLContentCleaner } from '../../slimmers/controllers/html-cleaner';
+describe('HTMLContentCleaner', () => {
+  let cleaner;
+  beforeEach(() => {
+    cleaner = new HTMLContentCleaner();
+  });
+  it('should handle empty string', () => {
+    expect(cleaner.clean('')).toBe('');
+  });
+  it('should handle whitespace-only string', () => {
+    expect(cleaner.clean('   ')).toBe('   ');
+  });
+  it('should remove \\n\\t after opening tag and before closing tag', () => {
+    const input = '<div><p>\n\t <span>test</span>\n\t </p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p><span>test</span></p></div>');
+  });
+  it('should remove all \\n and \\t characters between tags', () => {
+    const input = '<div><p>\n\ttest\n</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>test</p></div>');
+  });
+  it('should preserve space between matching tags', () => {
+    const input = '<div><span> </span></div>';
+    expect(cleaner.clean(input)).toBe('<div><span> </span></div>');
+  });
+  it('should preserve space with text between matching tags', () => {
+    const input = '<div><span> test </span></div>';
+    expect(cleaner.clean(input)).toBe('<div><span> test </span></div>');
+  });
+  it('should preserve multiple spaces between matching tags', () => {
+    const input = '<div><span>  </span></div>';
+    expect(cleaner.clean(input)).toBe('<div><span>  </span></div>');
+  });
+  it('should remove whitespace between opening tags', () => {
+    const input = '<div>\n\t<p></p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p></p></div>');
+  });
+  it('should remove \\n\\t after opening tag but preserve regular spaces', () => {
+    const input = '<p>\n\t  Hello</p>';
+    expect(cleaner.clean(input)).toBe('<p>  Hello</p>');
+  });
+  it('should remove whitespace between multiple closing tags', () => {
+    const input = '<table><tbody><tr></tr> </tbody> </table>';
+    expect(cleaner.clean(input)).toBe('<table><tbody><tr></tr></tbody></table>');
+  });
+  it('should remove whitespace between multiple opening tags', () => {
+    const input = '<div> <span></span></div>';
+    expect(cleaner.clean(input)).toBe('<div><span></span></div>');
+  });
+  it('should handle complex nested structure', () => {
+    const input = '<div>\n\t<p>\n\t\t<span>Hello</span>\n\t</p>\n</div>';
+    expect(cleaner.clean(input)).toBe('<div><p><span>Hello</span></p></div>');
+  });
+  it('should preserve regular spaces within text content', () => {
+    const input = '<div><p>Hello World</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello World</p></div>');
+  });
+  it('should preserve multiple spaces in text content', () => {
+    const input = '<div><p>Hello  World</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello  World</p></div>');
+  });
+  it('should not remove \\n between words in text content', () => {
+    const input = '<div><p>Hello\nWorld</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello\nWorld</p></div>');
+  });
+  it('should not remove \\n between words with space in text content', () => {
+    const input = '<div><p>Hello\n World</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello\n World</p></div>');
+  });
+  it('should remove multiple consecutive \\n characters', () => {
+    const input = '<div><p>\n\n\n\nHello</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello</p></div>');
+  });
+  it('should remove multiple consecutive \\t characters', () => {
+    const input = '<div><p>\t\t\tHello</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello</p></div>');
+  });
+  it('should preserve empty matching tags', () => {
+    const input = '<div><span></span></div>';
+    expect(cleaner.clean(input)).toBe('<div><span></span></div>');
+  });
+  it('should handle mixed spaces, tabs, and newlines', () => {
+    const input = '<div> \n\t <p>Text</p> \n\t </div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Text</p></div>');
+  });
+  it('should remove \\t\\n combination', () => {
+    const input = '<div><p>\t\nHello</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello</p></div>');
+  });
+  it('should remove complex \\n\\t\\n patterns', () => {
+    const input = '<div><p>\n\t\n\t\nHello</p></div>';
+    expect(cleaner.clean(input)).toBe('<div><p>Hello</p></div>');
+  });
+  it('should handle 4-level deep nesting', () => {
+    const input = '<div>\n\t<section>\n\t\t<article>\n\t\t\t<p>Text</p>\n\t\t</article>\n\t</section>\n</div>';
+    expect(cleaner.clean(input)).toBe('<div><section><article><p>Text</p></article></section></div>');
+  });
+  it('should handle 5-level deep nesting', () => {
+    const input = '<div>\n\t<section>\n\t\t<article>\n\t\t\t<main>\n\t\t\t\t<p>Text</p>\n\t\t\t</main>\n\t\t</article>\n\t</section>\n</div>';
+    expect(cleaner.clean(input)).toBe('<div><section><article><main><p>Text</p></main></article></section></div>');
+  });
+  it('should handle 6-level deep nesting', () => {
+    const input = '<div>\n\t<section>\n\t\t<article>\n\t\t\t<main>\n\t\t\t\t<aside>\n\t\t\t\t\t<p>Text</p>\n\t\t\t\t</aside>\n\t\t\t</main>\n\t\t</article>\n\t</section>\n</div>';
+    expect(cleaner.clean(input)).toBe('<div><section><article><main><aside><p>Text</p></aside></main></article></section></div>');
+  });
+  it('should remove whitespace after br and hr tags', () => {
+    const input1 = '<div><br>\n</div>';
+    expect(cleaner.clean(input1)).toBe('<div><br></div>');
+    const input2 = '<div><hr>\n\t</div>';
+    expect(cleaner.clean(input2)).toBe('<div><hr></div>');
+    const input3 = '<div><input type="text">\n</div>';
+    expect(cleaner.clean(input3)).toBe('<div><input type="text"></div>');
+  });
+  it('should remove newlines after br tags', () => {
+    const input = '<p>Line 1<br>\nLine 2</p>';
+    expect(cleaner.clean(input)).toBe('<p>Line 1<br>Line 2</p>');
+  });
+  it('should preserve spaces in code blocks between matching tags', () => {
+    const input = '<code>  const x = 1;  </code>';
+    expect(cleaner.clean(input)).toBe('<code>  const x = 1;  </code>');
+  });
+  it('should preserve plain text without tags', () => {
+    const input = 'Hello World';
+    expect(cleaner.clean(input)).toBe('Hello World');
+  });
+  it('should remove whitespace between different inline elements', () => {
+    const input = '<span>text</span>\n\t<strong>bold</strong>';
+    expect(cleaner.clean(input)).toBe('<span>text</span><strong>bold</strong>');
+  });
+  it('should inline a table by removing all whitespace between tags', () => {
+    const input = `<table style="width: 400px; border-collapse: collapse;">   <thead>     <tr>       ` +
+      `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 1</th>       ` +
+      `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 2</th>       ` +
+      `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 3</th>     ` +
+      `</tr>   </thead>   <tbody>     <tr>       <td style="padding: 12px;">Cell 1-1</td>       ` +
+      `<td style="padding: 12px;">Cell 1-2</td>       <td style="padding: 12px;">Cell 1-3</td>     ` +
+      `</tr>     <tr>       <td style="padding: 12px;">Cell 2-1</td>       <td style="padding: 12px;">Cell 2-2</td>       ` +
+      `<td style="padding: 12px;">Cell 2-3</td>     </tr>     <tr>       <td style="padding: 12px;">Cell 3-1</td>       ` +
+      `<td style="padding: 12px;">Cell 3-2</td>       <td style="padding: 12px;">Cell 3-3</td>     ` +
+      `</tr>   </tbody> </table>`;
+    const expected = `<table style="width: 400px; border-collapse: collapse;"><thead><tr>` +
+      `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 1</th>` +
+      `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 2</th>` +
+      `<th style="padding: 12px; text-align: left; font-weight: bold;">Header 3</th>` +
+      `</tr></thead><tbody><tr>` +
+      `<td style="padding: 12px;">Cell 1-1</td>` +
+      `<td style="padding: 12px;">Cell 1-2</td>` +
+      `<td style="padding: 12px;">Cell 1-3</td>` +
+      `</tr><tr>` +
+      `<td style="padding: 12px;">Cell 2-1</td>` +
+      `<td style="padding: 12px;">Cell 2-2</td>` +
+      `<td style="padding: 12px;">Cell 2-3</td>` +
+      `</tr><tr>` +
+      `<td style="padding: 12px;">Cell 3-1</td>` +
+      `<td style="padding: 12px;">Cell 3-2</td>` +
+      `<td style="padding: 12px;">Cell 3-3</td>` +
+      `</tr></tbody></table>`;
+    expect(cleaner.clean(input)).toBe(expected);
+  });
+  it('should remove newline after img tag', () => {
+    const input = '<div><img id="image-id" class="img-class" style="vertical-align: bottom; width: 25%; padding: 20px" alt="test alt" src="data:image/svg+xml;base64,xxx=" data-size="sm">\n</div>';
+    const expected = '<div><img id="image-id" class="img-class" style="vertical-align: bottom; width: 25%; padding: 20px" alt="test alt" src="data:image/svg+xml;base64,xxx=" data-size="sm"></div>';
+    expect(cleaner.clean(input)).toBe(expected);
+  });
+  it('should preserve spaces in attribute values', () => {
+    const input = '<p class="my custom class">Text</p>';
+    expect(cleaner.clean(input)).toBe('<p class="my custom class">Text</p>');
+  });
+  describe('Edge cases', () => {
+    it('should handle self-closing tags', () => {
+      expect(cleaner.clean('<br/>\n<hr/>')).toBe('<br/><hr/>');
+      expect(cleaner.clean('<img src="test.jpg"/>\n<input/>')).toBe('<img src="test.jpg"/><input/>');
+    });
+    it('should handle nested matching tags', () => {
+      expect(cleaner.clean('<div> <div> </div> </div>')).toBe('<div><div> </div></div>');
+    });
+    it('should handle tags with special characters in attributes', () => {
+      expect(cleaner.clean('<a href="http://example.com?a=1&b=2">\nLink</a>')).toBe('<a href="http://example.com?a=1&b=2">Link</a>');
+    });
+    it('should handle HTML entities', () => {
+      expect(cleaner.clean('<div><p>\n&nbsp;&lt;&gt;</p></div>')).toBe('<div><p>&nbsp;&lt;&gt;</p></div>');
+    });
+    it('should handle comments', () => {
+      expect(cleaner.clean('<div>\n<!-- comment -->\n<p>Text</p></div>')).toBe('<div><!-- comment --><p>Text</p></div>');
+    });
+  });
+});

package/dist/collection/components/vega-rich-text-editor/test/html-cleaner/remove-whitespace-after-opening-tag-processor.test.js

@@ -0,0 +1,22 @@
+import { RemoveWhitespaceAfterOpeningTagProcessor } from '../../slimmers/controllers/html-cleaner';
+describe('RemoveWhitespaceAfterOpeningTagProcessor', () => {
+  let processor;
+  beforeEach(() => {
+    processor = new RemoveWhitespaceAfterOpeningTagProcessor();
+  });
+  it('should remove \\n and \\t after opening tag', () => {
+    expect(processor.process('<div><p>\n\tHello</p></div>')).toBe('<div><p>Hello</p></div>');
+    expect(processor.process('<div><div>\n\n\tWorld</div></div>')).toBe('<div><div>World</div></div>');
+    expect(processor.process('<div><span>\tTest</span></div>')).toBe('<div><span>Test</span></div>');
+  });
+  it('should preserve regular spaces', () => {
+    expect(processor.process('<div><p>  Hello</p></div>')).toBe('<div><p>  Hello</p></div>');
+    expect(processor.process('<div><p> World</p></div>')).toBe('<div><p> World</p></div>');
+  });
+  it('should not affect text without opening tags', () => {
+    expect(processor.process('<div>Hello World</div>')).toBe('<div>Hello World</div>');
+  });
+  it('should handle multiple occurrences', () => {
+    expect(processor.process('<div><p>\nHello</p><div>\tWorld</div></div>')).toBe('<div><p>Hello</p><div>World</div></div>');
+  });
+});

package/dist/collection/components/vega-rich-text-editor/test/html-cleaner/remove-whitespace-before-closing-tag-processor.test.js

@@ -0,0 +1,22 @@
+import { RemoveWhitespaceBeforeClosingTagProcessor } from '../../slimmers/controllers/html-cleaner';
+describe('RemoveWhitespaceBeforeClosingTagProcessor', () => {
+  let processor;
+  beforeEach(() => {
+    processor = new RemoveWhitespaceBeforeClosingTagProcessor();
+  });
+  it('should remove \\n and \\t before closing tag', () => {
+    expect(processor.process('<div><p>World\n\t</p></div>')).toBe('<div><p>World</p></div>');
+    expect(processor.process('<div><div>Hello\n</div></div>')).toBe('<div><div>Hello</div></div>');
+    expect(processor.process('<div><span>Test\t</span></div>')).toBe('<div><span>Test</span></div>');
+  });
+  it('should preserve regular spaces', () => {
+    expect(processor.process('<div><p>Hello  </p></div>')).toBe('<div><p>Hello  </p></div>');
+    expect(processor.process('<div><p>World </p></div>')).toBe('<div><p>World </p></div>');
+  });
+  it('should not affect text without closing tags', () => {
+    expect(processor.process('<div>Hello World</div>')).toBe('<div>Hello World</div>');
+  });
+  it('should handle multiple occurrences', () => {
+    expect(processor.process('<div><p>Hello\n</p><div>World\t</div></div>')).toBe('<div><p>Hello</p><div>World</div></div>');
+  });
+});

package/dist/collection/components/vega-rich-text-editor/test/html-cleaner/remove-whitespace-between-tags-processor.test.js

@@ -0,0 +1,26 @@
+import { RemoveWhitespaceBetweenTagsProcessor } from '../../slimmers/controllers/html-cleaner';
+describe('RemoveWhitespaceBetweenTagsProcessor', () => {
+  let processor;
+  beforeEach(() => {
+    processor = new RemoveWhitespaceBetweenTagsProcessor();
+  });
+  it('should remove whitespace between different tags', () => {
+    expect(processor.process('<div><p></p>\n\t<div></div></div>')).toBe('<div><p></p><div></div></div>');
+    expect(processor.process('<div><div>\n\t<span></span></div></div>')).toBe('<div><div><span></span></div></div>');
+    expect(processor.process('<div><div></div> <p></p></div>')).toBe('<div><div></div><p></p></div>');
+  });
+  it('should preserve whitespace between matching tags', () => {
+    expect(processor.process('<div><span> </span></div>')).toBe('<div><span> </span></div>');
+    expect(processor.process('<div><span>  </span></div>')).toBe('<div><span>  </span></div>');
+    expect(processor.process('<div><span>\n\t</span></div>')).toBe('<div><span>\n\t</span></div>');
+    expect(processor.process('<div><code> </code></div>')).toBe('<div><code> </code></div>');
+  });
+  it('should handle custom elements with hyphens', () => {
+    expect(processor.process('<div><my-component> </my-component></div>')).toBe('<div><my-component> </my-component></div>');
+    expect(processor.process('<div><my-component></my-component>\n<other-component></other-component></div>')).toBe('<div><my-component></my-component><other-component></other-component></div>');
+  });
+  it('should handle tags with attributes', () => {
+    expect(processor.process('<div><div class="test">\n<span></span></div></div>')).toBe('<div><div class="test"><span></span></div></div>');
+    expect(processor.process('<div><span id="test"> </span></div>')).toBe('<div><span id="test"> </span></div>');
+  });
+});

package/dist/collection/helpers/code-format/code-formatter.js

@@ -5,6 +5,7 @@ class CodeFormatter {
   constructor() {
     /**
      * Formats a given HTML source string by applying indentation and cleaning up styles.
+     * Content inside preserve tags (pre) is preserved as-is without formatting.
      *
      * @param {string} source - The HTML source string to format.
      * @param {CodeFormatOptions} options - Formatting options.
@@ -19,9 +20,25 @@ class CodeFormatter {
       const tokens = source.split(tagRegex).filter((t) => t.length > 0);
       let indentLevel = 0;
       let output = '';
+      let preserveDepth = 0;
       for (let i = 0; i < tokens.length; i++) {
         let token = tokens[i];
-        // Decrease indentation for closing tags
+        const tagName = CodeFormatter.getTagName(token);
+        // Track if we're entering or exiting preserve tags
+        if (CodeFormatter.PRESERVE_CONTENT_TAGS.has(tagName)) {
+          if (token.startsWith('</')) {
+            preserveDepth = Math.max(0, preserveDepth - 1);
+          }
+          else if (token.startsWith('<')) {
+            preserveDepth++;
+          }
+        }
+        // If inside preserve tag, output as-is without formatting
+        if (preserveDepth > 0) {
+          output += token;
+          continue;
+        }
+        // Decrease indentation for closing tags (after exiting preserve tags)
         if (token.startsWith('</')) {
           indentLevel = Math.max(0, indentLevel - 1);
         }
@@ -31,15 +48,20 @@ class CodeFormatter {
           token = token.replace(/style\s*=\s*"([^"]*)"/g, (_, styleContent) => {
             return `style="${this.formatStyle(styleContent)}"`;
           });
-          const tagName = CodeFormatter.getTagName(token);
           const isInline = CodeFormatter.INLINE_TAGS.has(tagName);
-          // Inline tag grouping: e.g., <strong>Text</strong> stays on one line
-          if (isInline && i + 2 < tokens.length && tokens[i + 2] === `</${tagName}>`) {
-            // Group consecutive inline tags
+          // Inline tag grouping: e.g., <strong>Text</strong> or <span></span> stays on one line
+          // Check for empty tags: <tag></tag> (closing tag immediately follows opening tag)
+          if (isInline && i + 1 < tokens.length && tokens[i + 1] === `</${tagName}>`) {
+            // Empty inline tag: <span></span>
+            output += `${indent}${token}${tokens[i + 1]}\n`;
+            i += 1;
+          }
+          else if (isInline && i + 2 < tokens.length && tokens[i + 2] === `</${tagName}>`) {
+            // Group consecutive inline tags with content
             let inlineGroup = `${token}${tokens[i + 1]}${tokens[i + 2]}`;
             i += 2;
             // Keep merging consecutive inline tag pairs
-            while (i + 2 < tokens.length &&
+            while (i + 3 < tokens.length &&
               tokens[i + 1].startsWith('<') &&
               CodeFormatter.INLINE_TAGS.has(CodeFormatter.getTagName(tokens[i + 1])) &&
               tokens[i + 3] === `</${CodeFormatter.getTagName(tokens[i + 1])}>`) {
@@ -53,7 +75,7 @@ class CodeFormatter {
             // Increase indentation for non-void opening tags
             if (!token.startsWith('</') &&
               !token.endsWith('/>') &&
-              !/^<br|^<img|^<meta|^<input|^<hr/i.test(token)) {
+              !CodeFormatter.VOID_TAGS.has(tagName)) {
               indentLevel++;
             }
           }
@@ -94,6 +116,10 @@ class CodeFormatter {
       .join('; ');
   }
 }
+/**
+ * Inline/phrasing elements that should be kept on a single line with their content.
+ * These tags are formatted as: <tag>content</tag> on one line.
+ */
 CodeFormatter.INLINE_TAGS = new Set([
   'span',
   'strong',
@@ -113,4 +139,28 @@ CodeFormatter.INLINE_TAGS = new Set([
   'del',
   'ins',
 ]);
+/**
+ * Void/self-closing elements that don't have closing tags.
+ * Used to avoid increasing indentation for these elements.
+ */
+CodeFormatter.VOID_TAGS = new Set([
+  'area',
+  'base',
+  'br',
+  'col',
+  'embed',
+  'hr',
+  'img',
+  'input',
+  'link',
+  'meta',
+  'param',
+  'source',
+  'track',
+  'wbr',
+]);
+/**
+ * Tags whose content should be preserved as-is without formatting.
+ */
+CodeFormatter.PRESERVE_CONTENT_TAGS = new Set(['pre']);
 export default new CodeFormatter();