@progress/kendo-editor-common 1.12.0-develop.1 → 1.12.1-develop.1

package/dist/es2015/flatten-spans.js

@@ -52,8 +52,7 @@ const getInnerSpan = (dom) => {
     return dom.querySelector('span span');
 };
 const isEmptySpan = (fragment) => {
-    var _a;
-    return fragment.childNodes.length === 1 && ((_a = fragment.firstChild) === null || _a === void 0 ? void 0 : _a.nodeName) === 'SPAN' && fragment.firstChild.childNodes.length === 0;
+    return fragment.childNodes.length === 1 && fragment.firstChild.nodeName === 'SPAN' && fragment.firstChild.childNodes.length === 0;
 };
 /**
  * Flattens nested <span> elements in the given HTML string while preserving
@@ -63,7 +62,6 @@ const isEmptySpan = (fragment) => {
  * @returns The normalized HTML content with flattened <span> elements.
  */
 const flattenNestedSpans = (content) => {
-    var _a, _b, _c;
     const dom = htmlToFragment(content);
     let innerSpan = getInnerSpan(dom);
     while (innerSpan) {
@@ -73,7 +71,8 @@ const flattenNestedSpans = (content) => {
             const right = extractor.extractAfter(innerSpan);
             const left = extractor.extractBefore(innerSpan);
             for (let i = 0; i < innerSpan.style.length; i++) {
-                parentSpan.style[innerSpan.style.item(i)] = innerSpan.style[innerSpan.style.item(i)];
+                const prop = innerSpan.style.item(i);
+                parentSpan.style[prop] = innerSpan.style.getPropertyValue(prop);
             }
             innerSpan.removeAttribute('style');
             if (innerSpan.classList.length) {
@@ -93,12 +92,16 @@ const flattenNestedSpans = (content) => {
             while (innerSpan.firstChild && innerSpan.parentNode) {
                 innerSpan.parentNode.insertBefore(innerSpan.firstChild, innerSpan);
             }
-            (_a = innerSpan.parentNode) === null || _a === void 0 ? void 0 : _a.removeChild(innerSpan);
-            if (!isEmptySpan(left)) {
-                (_b = parentSpan.parentNode) === null || _b === void 0 ? void 0 : _b.insertBefore(left, parentSpan);
+            if (innerSpan.parentNode) {
+                innerSpan.parentNode.removeChild(innerSpan);
             }
-            if (!isEmptySpan(right)) {
-                (_c = parentSpan.parentNode) === null || _c === void 0 ? void 0 : _c.insertBefore(right, parentSpan.nextSibling);
+            if (parentSpan.parentNode) {
+                if (!isEmptySpan(left)) {
+                    parentSpan.parentNode.insertBefore(left, parentSpan);
+                }
+                if (!isEmptySpan(right)) {
+                    parentSpan.parentNode.insertBefore(right, parentSpan.nextSibling);
+                }
             }
         }
         innerSpan = getInnerSpan(dom);

package/dist/es2015/listConvert.js

@@ -11,10 +11,7 @@ const isPartOfListItem = (element) => {
     return /^MsoListParagraph/.test(element.className);
 };
 const innerText = (node) => {
-    let text = node.innerHTML;
-    text = text.replace(/<!--(.|\s)*?-->/gi, '');
-    text = text.replace(/<\/?[^>]+?\/?>/gm, '');
-    return text;
+    return node.textContent;
 };
 const createList = (type, styleType) => {
     const list = document.createElement(type);
@@ -68,11 +65,10 @@ const mapListsCandidates = (nodes, groups) => {
     });
 };
 const listTypes = (p) => {
-    let html = p.innerHTML;
+    const html = p.textContent;
     const trimStartText = (t) => {
         return t.replace(/^(?:&nbsp;|[\u00a0\n\r\s])+/, '');
     };
-    html = html.replace(/<\/?\w+[^>]*>/g, '').replace(/&nbsp;/g, '\u00a0');
     if ((/^[\u2022\u00b7\u00a7\u00d8oØüvn][\u00a0 ]+/.test(html))) {
         return {
             tag: 'ul',

package/dist/es2015/main.js

@@ -1,4 +1,4 @@
-export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, setHtml, trimWhitespace } from './source.js';
+export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, removeComments, setHtml, trimWhitespace } from './source.js';
 export { flattenNestedSpans } from './flatten-spans.js';
 export { applyInlineStyle, getInlineStyles, toggleInlineFormat } from './inline-style.js';
 export { applyLink, removeLink } from './link.js';
@@ -17,7 +17,7 @@ export { indentRules, outdentRules } from './config/indent-rules.js';
 export { marks, nodes } from './config/schema.js';
 export { buildKeymap, buildListKeymap } from './config/keymap.js';
 export { bold, italic, link, strikethrough, subscript, superscript, underline } from './config/commands.js';
-export { pasteCleanup, removeAttribute, removeComments, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr } from './paste.js';
+export { pasteCleanup, removeAttribute, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr } from './paste.js';
 export { convertMsLists } from './listConvert.js';
 export { find, findAll, findAt, replace, replaceAll } from './find-replace.js';
 export { placeholder } from './plugins/placeholder.js';

package/dist/es2015/paste.js

@@ -10,7 +10,11 @@ const sanitize = (html) => {
     html = html.replace(/<\/?[ovw]:[^>]*?>/gi, ''); // MS elements, e.g. <o:p>, <w:sdtPr>, <v:
     html = html.replace(/<\\?\??xml[^>]*>/gi, ''); // XML namespaces
     html = html.replace(/<(?:link|meta) [^>]+?>/ig, '');
-    html = html.replace(/<style[^>]*?>\s*<\/style>/ig, '');
+    let previousHtml;
+    do {
+        previousHtml = html;
+        html = html.replace(/<style[^>]*?>\s*<\/style>/ig, '');
+    } while (html !== previousHtml);
     html = html.replace(/<\/?st1:.*?>/gi, '');
     html = html.replace(/<a name="[a-zA-Z0-9_]+">/gmi, '');
     html = html.replace(/v:shapes?="[^"]+"/ig, '');
@@ -18,12 +22,6 @@ const sanitize = (html) => {
     html = html.replace(/<!\[endif\]>/ig, '');
     return html;
 };
-/**
- * Removes comments in HTML.
- */
-const removeComments = (html) => {
-    return html.replace(/<!--[\s\S]+?-->/g, '');
-};
 /**
  * Removes the specified tag(s).
  */
@@ -161,4 +159,4 @@ const replaceImageSourcesFromRtf = (html, clipboardData) => {
     });
 };
 
-export { pasteCleanup, removeAttribute, removeComments, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr };
+export { pasteCleanup, removeAttribute, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr };

package/dist/es2015/source.js

@@ -157,7 +157,7 @@ const htmlToFragment = (html) => {
     const template = document.createElement('template');
     template.innerHTML = replaceStyleAttr(html);
     restoreStyleAttr(template.content);
-    return template.content;
+    return template.content.cloneNode(true);
 };
 /**
  * @hidden
@@ -230,5 +230,22 @@ const hasSameMarkup = (dom1, dom2, schema, parseOptions) => {
     const fragment2 = Fragment.from(parseContent(dom2, schema, parseOptions));
     return fragment1.eq(fragment2);
 };
+/**
+ * Removes comments in HTML.
+ */
+const removeComments = (html) => {
+    const fragment = htmlToFragment(html);
+    removeCommentsFromDom(fragment);
+    return fragmentToHtml(fragment);
+};
+const removeCommentsFromDom = (dom) => {
+    var _a;
+    const iterator = dom.ownerDocument.createNodeIterator(dom, NodeFilter.SHOW_COMMENT);
+    let commentNode = iterator.nextNode();
+    while (commentNode) {
+        (_a = commentNode.parentNode) === null || _a === void 0 ? void 0 : _a.removeChild(commentNode);
+        commentNode = iterator.nextNode();
+    }
+};
 
-export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, setHtml, trimWhitespace };
+export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, removeComments, setHtml, trimWhitespace };

package/dist/es2015/utils.js

@@ -265,7 +265,7 @@ const applyStyle = (styleText, styleType, styleValue) => {
 const setStyleAttr = (element, styleString) => {
     const styles = parseStyle(styleString);
     for (const style in styles) {
-        if (style && typeof element.style[style] !== 'undefined') {
+        if (style && element.style[style] !== undefined) {
             element.style[style] = styles[style];
         }
     }

package/dist/npm/flatten-spans.js

@@ -54,8 +54,7 @@ const getInnerSpan = (dom) => {
     return dom.querySelector('span span');
 };
 const isEmptySpan = (fragment) => {
-    var _a;
-    return fragment.childNodes.length === 1 && ((_a = fragment.firstChild) === null || _a === void 0 ? void 0 : _a.nodeName) === 'SPAN' && fragment.firstChild.childNodes.length === 0;
+    return fragment.childNodes.length === 1 && fragment.firstChild.nodeName === 'SPAN' && fragment.firstChild.childNodes.length === 0;
 };
 /**
  * Flattens nested <span> elements in the given HTML string while preserving
@@ -65,7 +64,6 @@ const isEmptySpan = (fragment) => {
  * @returns The normalized HTML content with flattened <span> elements.
  */
 const flattenNestedSpans = (content) => {
-    var _a, _b, _c;
     const dom = source.htmlToFragment(content);
     let innerSpan = getInnerSpan(dom);
     while (innerSpan) {
@@ -75,7 +73,8 @@ const flattenNestedSpans = (content) => {
             const right = extractor.extractAfter(innerSpan);
             const left = extractor.extractBefore(innerSpan);
             for (let i = 0; i < innerSpan.style.length; i++) {
-                parentSpan.style[innerSpan.style.item(i)] = innerSpan.style[innerSpan.style.item(i)];
+                const prop = innerSpan.style.item(i);
+                parentSpan.style[prop] = innerSpan.style.getPropertyValue(prop);
             }
             innerSpan.removeAttribute('style');
             if (innerSpan.classList.length) {
@@ -95,12 +94,16 @@ const flattenNestedSpans = (content) => {
             while (innerSpan.firstChild && innerSpan.parentNode) {
                 innerSpan.parentNode.insertBefore(innerSpan.firstChild, innerSpan);
             }
-            (_a = innerSpan.parentNode) === null || _a === void 0 ? void 0 : _a.removeChild(innerSpan);
-            if (!isEmptySpan(left)) {
-                (_b = parentSpan.parentNode) === null || _b === void 0 ? void 0 : _b.insertBefore(left, parentSpan);
+            if (innerSpan.parentNode) {
+                innerSpan.parentNode.removeChild(innerSpan);
             }
-            if (!isEmptySpan(right)) {
-                (_c = parentSpan.parentNode) === null || _c === void 0 ? void 0 : _c.insertBefore(right, parentSpan.nextSibling);
+            if (parentSpan.parentNode) {
+                if (!isEmptySpan(left)) {
+                    parentSpan.parentNode.insertBefore(left, parentSpan);
+                }
+                if (!isEmptySpan(right)) {
+                    parentSpan.parentNode.insertBefore(right, parentSpan.nextSibling);
+                }
             }
         }
         innerSpan = getInnerSpan(dom);

package/dist/npm/listConvert.js

@@ -13,10 +13,7 @@ const isPartOfListItem = (element) => {
     return /^MsoListParagraph/.test(element.className);
 };
 const innerText = (node) => {
-    let text = node.innerHTML;
-    text = text.replace(/<!--(.|\s)*?-->/gi, '');
-    text = text.replace(/<\/?[^>]+?\/?>/gm, '');
-    return text;
+    return node.textContent;
 };
 const createList = (type, styleType) => {
     const list = document.createElement(type);
@@ -70,11 +67,10 @@ const mapListsCandidates = (nodes, groups) => {
     });
 };
 const listTypes = (p) => {
-    let html = p.innerHTML;
+    const html = p.textContent;
     const trimStartText = (t) => {
         return t.replace(/^(?:&nbsp;|[\u00a0\n\r\s])+/, '');
     };
-    html = html.replace(/<\/?\w+[^>]*>/g, '').replace(/&nbsp;/g, '\u00a0');
     if ((/^[\u2022\u00b7\u00a7\u00d8oØüvn][\u00a0 ]+/.test(html))) {
         return {
             tag: 'ul',

package/dist/npm/main.d.ts

@@ -1,4 +1,4 @@
-export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, setHtml, trimWhitespace } from './source.js';
+export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, removeComments, setHtml, trimWhitespace } from './source.js';
 export { flattenNestedSpans } from './flatten-spans.js';
 export { applyInlineStyle, getInlineStyles, toggleInlineFormat } from './inline-style.js';
 export { applyLink, removeLink } from './link.js';
@@ -19,7 +19,7 @@ export { PasteCleanupSettings } from './types/paste-cleanup-settings.js';
 export { marks, nodes } from './config/schema.js';
 export { buildKeymap, buildListKeymap } from './config/keymap.js';
 export { InlineFormatOptions, bold, italic, link, strikethrough, subscript, superscript, underline } from './config/commands.js';
-export { pasteCleanup, removeAttribute, removeComments, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr } from './paste.js';
+export { pasteCleanup, removeAttribute, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr } from './paste.js';
 export { convertMsLists } from './listConvert.js';
 export { SearchOptions, find, findAll, findAt, replace, replaceAll } from './find-replace.js';
 export { placeholder } from './plugins/placeholder.js';

package/dist/npm/main.js

@@ -54,6 +54,7 @@ exports.hasSameMarkup = source.hasSameMarkup;
 exports.htmlToFragment = source.htmlToFragment;
 exports.parseContent = source.parseContent;
 exports.pmDocToFragment = source.pmDocToFragment;
+exports.removeComments = source.removeComments;
 exports.setHtml = source.setHtml;
 exports.trimWhitespace = source.trimWhitespace;
 exports.flattenNestedSpans = flattenSpans.flattenNestedSpans;
@@ -123,7 +124,6 @@ exports.superscript = commands.superscript;
 exports.underline = commands.underline;
 exports.pasteCleanup = paste.pasteCleanup;
 exports.removeAttribute = paste.removeAttribute;
-exports.removeComments = paste.removeComments;
 exports.removeTag = paste.removeTag;
 exports.replaceImageSourcesFromRtf = paste.replaceImageSourcesFromRtf;
 exports.sanitize = paste.sanitize;

package/dist/npm/paste.d.ts

@@ -4,10 +4,6 @@ import { PasteCleanupSettings } from './types/paste-cleanup-settings.js';
  * Removes the invalid HTML. Use it as a first step for cleaning the HTML.
  */
 declare const sanitize: (html: string) => string;
-/**
- * Removes comments in HTML.
- */
-declare const removeComments: (html: string) => string;
 /**
  * Removes the specified tag(s).
  */
@@ -39,4 +35,4 @@ declare const pasteCleanup: (html: string, settings: PasteCleanupSettings) => st
  */
 declare const replaceImageSourcesFromRtf: (html: string, clipboardData: DataTransfer) => string;
 
-export { pasteCleanup, removeAttribute, removeComments, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr };
+export { pasteCleanup, removeAttribute, removeTag, replaceImageSourcesFromRtf, sanitize, sanitizeClassAttr, sanitizeStyleAttr };

package/dist/npm/paste.js

@@ -12,7 +12,11 @@ const sanitize = (html) => {
     html = html.replace(/<\/?[ovw]:[^>]*?>/gi, ''); // MS elements, e.g. <o:p>, <w:sdtPr>, <v:
     html = html.replace(/<\\?\??xml[^>]*>/gi, ''); // XML namespaces
     html = html.replace(/<(?:link|meta) [^>]+?>/ig, '');
-    html = html.replace(/<style[^>]*?>\s*<\/style>/ig, '');
+    let previousHtml;
+    do {
+        previousHtml = html;
+        html = html.replace(/<style[^>]*?>\s*<\/style>/ig, '');
+    } while (html !== previousHtml);
     html = html.replace(/<\/?st1:.*?>/gi, '');
     html = html.replace(/<a name="[a-zA-Z0-9_]+">/gmi, '');
     html = html.replace(/v:shapes?="[^"]+"/ig, '');
@@ -20,12 +24,6 @@ const sanitize = (html) => {
     html = html.replace(/<!\[endif\]>/ig, '');
     return html;
 };
-/**
- * Removes comments in HTML.
- */
-const removeComments = (html) => {
-    return html.replace(/<!--[\s\S]+?-->/g, '');
-};
 /**
  * Removes the specified tag(s).
  */
@@ -165,7 +163,6 @@ const replaceImageSourcesFromRtf = (html, clipboardData) => {
 
 exports.pasteCleanup = pasteCleanup;
 exports.removeAttribute = removeAttribute;
-exports.removeComments = removeComments;
 exports.removeTag = removeTag;
 exports.replaceImageSourcesFromRtf = replaceImageSourcesFromRtf;
 exports.sanitize = sanitize;

package/dist/npm/source.d.ts

@@ -73,5 +73,9 @@ declare const setHtml: (content: string, command?: string, parseOptions?: ParseO
  * @hidden
  */
 declare const hasSameMarkup: (dom1: string, dom2: string, schema: Schema, parseOptions?: ParseOptions) => boolean;
+/**
+ * Removes comments in HTML.
+ */
+declare const removeComments: (html: string) => string;
 
-export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, setHtml, trimWhitespace };
+export { domToPmDoc, fragmentToHtml, getHtml, hasSameMarkup, htmlToFragment, parseContent, pmDocToFragment, removeComments, setHtml, trimWhitespace };

package/dist/npm/source.js

@@ -159,7 +159,7 @@ const htmlToFragment = (html) => {
     const template = document.createElement('template');
     template.innerHTML = replaceStyleAttr(html);
     restoreStyleAttr(template.content);
-    return template.content;
+    return template.content.cloneNode(true);
 };
 /**
  * @hidden
@@ -232,6 +232,23 @@ const hasSameMarkup = (dom1, dom2, schema, parseOptions) => {
     const fragment2 = prosemirrorModel.Fragment.from(parseContent(dom2, schema, parseOptions));
     return fragment1.eq(fragment2);
 };
+/**
+ * Removes comments in HTML.
+ */
+const removeComments = (html) => {
+    const fragment = htmlToFragment(html);
+    removeCommentsFromDom(fragment);
+    return fragmentToHtml(fragment);
+};
+const removeCommentsFromDom = (dom) => {
+    var _a;
+    const iterator = dom.ownerDocument.createNodeIterator(dom, NodeFilter.SHOW_COMMENT);
+    let commentNode = iterator.nextNode();
+    while (commentNode) {
+        (_a = commentNode.parentNode) === null || _a === void 0 ? void 0 : _a.removeChild(commentNode);
+        commentNode = iterator.nextNode();
+    }
+};
 
 exports.domToPmDoc = domToPmDoc;
 exports.fragmentToHtml = fragmentToHtml;
@@ -240,5 +257,6 @@ exports.hasSameMarkup = hasSameMarkup;
 exports.htmlToFragment = htmlToFragment;
 exports.parseContent = parseContent;
 exports.pmDocToFragment = pmDocToFragment;
+exports.removeComments = removeComments;
 exports.setHtml = setHtml;
 exports.trimWhitespace = trimWhitespace;

package/dist/npm/utils.js

@@ -267,7 +267,7 @@ const applyStyle = (styleText, styleType, styleValue) => {
 const setStyleAttr = (element, styleString) => {
     const styles = parseStyle(styleString);
     for (const style in styles) {
-        if (style && typeof element.style[style] !== 'undefined') {
+        if (style && element.style[style] !== undefined) {
             element.style[style] = styles[style];
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-editor-common",
   "description": "Kendo UI TypeScript package exporting functions for Editor component",
-  "version": "1.12.0-develop.1",
+  "version": "1.12.1-develop.1",
   "keywords": [
     "Kendo UI"
   ],