croco-html 4.3.2 → 4.3.4

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);
@@ -1018,15 +1018,16 @@ class BodyTagsExtensions {
         }
         return options.definedCustomTags[tagName];
     }
-    static convertToHtmlString(bodyTag) {
-        const tagName = bodyTag.tagDescription.tag;
-        if (this.tagServices.hasOwnProperty(tagName)) {
-            return this.tagServices[tagName].bodyTagToHtmlStringConverter(bodyTag);
+    static convertToHtmlString(bodyTag, options) {
+        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) {
-        let htmls = bodyTags.map(bodyTag => (BodyTagsExtensions.convertToHtmlString(bodyTag)));
+    static bodyTagsToHtml(bodyTags, options) {
+        let htmls = bodyTags.map(bodyTag => (BodyTagsExtensions.convertToHtmlString(bodyTag, options)));
         let result = "";
         for (let index = 0; index < htmls.length; index++) {
             const element = htmls[index];
@@ -2281,7 +2282,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;
         }
@@ -2460,7 +2461,7 @@ class VisualEditorComponent {
         this.recalculateHtml();
     }
     recalculateHtml() {
-        let result = BodyTagsExtensions.bodyTagsToHtml(this.bodyTags);
+        let result = BodyTagsExtensions.bodyTagsToHtml(this.bodyTags, this._options);
         this.html = XmlExtensions.formatXml("<body>" + result + "</body>");
         this.onHtmlChanged.emit(this.html);
     }