croco-html 4.3.3 → 4.3.5

package/fesm2022/croco-html.mjs

@@ -269,9 +269,9 @@ class FileImageTagService {
             fileIdAttr = `${FileImageTagDataConsts.FileIdAttrName}="${bodyTag.attributes[FileImageTagDataConsts.FileIdAttrName]}"`;
         }
         if (bodyTag.attributes.hasOwnProperty(FileImageTagDataConsts.ScreenMediaRequest) && bodyTag.attributes[FileImageTagDataConsts.ScreenMediaRequest]) {
-            screenMediaRequestAttr = `${FileImageTagDataConsts.ScreenMediaRequest}="${bodyTag.attributes[FileImageTagDataConsts.ScreenMediaRequest]}"`;
+            screenMediaRequestAttr = ` ${FileImageTagDataConsts.ScreenMediaRequest}="${bodyTag.attributes[FileImageTagDataConsts.ScreenMediaRequest]}"`;
         }
-        return `<${FileImageTagDataConsts.TagName} ${fileIdAttr} ${screenMediaRequestAttr}></${FileImageTagDataConsts.TagName}>`;
+        return `<${FileImageTagDataConsts.TagName} ${fileIdAttr}${screenMediaRequestAttr}></${FileImageTagDataConsts.TagName}>`;
     }
     extractBlockFromHtmlElement(elem, options) {
         let fileId = elem.getAttribute(FileImageTagDataConsts.FileIdAttrName);
@@ -988,7 +988,7 @@ class TableTagService {
 }
 
 class BodyTagsExtensions {
-    static { this.tagServices = {
+    static { this._tagServices = {
         [TextTags.text]: new TextTagHtmlMarkupTagService("text", "T"),
         [TextTags.h1]: new TextTagHtmlMarkupTagService("h1", "H1"),
         [TextTags.h2]: new TextTagHtmlMarkupTagService("h2", "H2"),
@@ -1004,7 +1004,7 @@ class BodyTagsExtensions {
         [TableTypes.Table]: new TableTagService()
     }; }
     static hasTagService(tagName, options) {
-        if (this.tagServices.hasOwnProperty(tagName)) {
+        if (this._tagServices.hasOwnProperty(tagName)) {
             return true;
         }
         if (options.definedCustomTags.hasOwnProperty(tagName)) {
@@ -1013,17 +1013,18 @@ class BodyTagsExtensions {
         return false;
     }
     static getTagService(tagName, options) {
-        if (this.tagServices.hasOwnProperty(tagName)) {
-            return this.tagServices[tagName];
+        if (this._tagServices.hasOwnProperty(tagName)) {
+            return this._tagServices[tagName];
         }
         return options.definedCustomTags[tagName];
     }
     static convertToHtmlString(bodyTag, options) {
-        const tagName = bodyTag.tagDescription.tag;
+        const tagName = bodyTag.tagDescription.tag.toLowerCase();
         if (this.hasTagService(tagName, options)) {
             return this.getTagService(tagName, options).bodyTagToHtmlStringConverter(bodyTag);
         }
-        return `<mapper-not-found>"${bodyTag.tagDescription.tag}" тег не найден.</mapper-not-found>`;
+        console.log("convertToHtmlString", bodyTag, options);
+        return `<mapper-not-found>"${tagName}" тег не найден.</mapper-not-found>`;
     }
     static bodyTagsToHtml(bodyTags, options) {
         let htmls = bodyTags.map(bodyTag => (BodyTagsExtensions.convertToHtmlString(bodyTag, options)));
@@ -1036,14 +1037,15 @@ class BodyTagsExtensions {
     }
     static getBodyTags(html, options) {
         let result = HtmlExtractionMethods.transformHtmlStringToBlocks(html, options);
-        return result.map(x => BodyTagsExtensions.toBodyTag(x));
+        return result.map(x => BodyTagsExtensions.toBodyTag(x, options));
     }
     static sanitizeInnerHtml(html) {
         return html.trim().replace('\n\t', '');
     }
-    static toBodyTag(data) {
-        if (this.tagServices.hasOwnProperty(data.tagName)) {
-            return this.tagServices[data.tagName].toBodyTag(data);
+    static toBodyTag(data, options) {
+        const tagName = data.tagName;
+        if (this.hasTagService(tagName, options)) {
+            return this.getTagService(tagName, options).toBodyTag(data);
         }
         return {
             presentOrEdit: true,
@@ -2281,7 +2283,7 @@ class MainEditorBlockComponent {
         this.onTagSaved.emit(this.tag);
     }
     isDefinedCustomTag() {
-        console.log("isDefinedCustomTag()", this._options);
+        console.log("isDefinedCustomTag()", this.tag, this._options);
         if (this._options.definedCustomTags.hasOwnProperty(this.tag.tagDescription.tag)) {
             return true;
         }