ExportFromMarkup: fix serialization for self closing tags (T1297767) (#30299)

Author: anna-shakhova

packages/devextreme/js/core/utils/svg.js

@@ -6,13 +6,14 @@ import { isRenderer, isString } from './type';
 const window = getWindow();
 
 function getMarkup(element, backgroundColor) {
-    const temp = domAdapter.createElement('div');
     const clone = element.cloneNode(true);
+    const serializer = new window.XMLSerializer();
+
     if(backgroundColor) {
         $(clone).css('backgroundColor', backgroundColor);
     }
-    temp.appendChild(clone);
-    return temp.innerHTML;
+
+    return serializer.serializeToString(clone);
 }
 
 function fixNamespaces(markup) {
@@ -33,7 +34,9 @@ function decodeHtmlEntities(markup) {
         .replace(/</gi, '<')
         .replace(/>/gi, '>')
         .replace(/ /gi, ' ')
-        .replace(/­/gi, '­');
+        .replace(/\u00A0/g, ' ')
+        .replace(/­/gi, '­')
+        .replace(/\u00AD/g, '­');
 }
 
 export const HIDDEN_FOR_EXPORT = 'hidden-for-export';

packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js

@@ -591,6 +591,32 @@ function checkDashStyle(assert, elem, result, style, value) {
         assert.notStrictEqual(markupString.indexOf('1 2 3'), -1);
     });
 
+    QUnit.test('Keep self closing xhtml tags (T1297767)', function(assert) {
+        const parent = { element: document.createElement('div') };
+        const svg = (new rendererModule.SvgElement({}, 'svg')).append(parent);
+        $('#qunit-fixture').append(parent);
+
+        svg.attr({
+            xmlns: 'http://www.w3.org/2000/svg',
+            'xmlns:xlink': 'http://www.w3.org/1999/xlink',
+            version: '1.1'
+        });
+
+        const foreignObject = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
+        const div = document.createElement('div');
+        const br = document.createElement('br');
+
+        div.appendChild(br);
+        foreignObject.appendChild(div);
+
+        svg.element.appendChild(foreignObject);
+
+        const markupString = svg.markup();
+        const expectedMarkup = '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"><foreignObject><div xmlns="http://www.w3.org/1999/xhtml"><br /></div></foreignObject></svg>';
+
+        assert.deepEqual(mapFromStr(markupString), mapFromStr(expectedMarkup));
+    });
+
     QUnit.module('SvgElement jQuery API', {
         beforeEach: function() {
             const renderer = rendererModule;