@node-projects/web-component-designer 0.0.77 → 0.0.81

package/.github/FUNDING.yml

@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
 github: jogibear9988
+patreon: jogibear9988

package/dist/elements/documentContainer.js

@@ -146,7 +146,7 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
             else if (this._tabControl.selectedIndex === 2) {
             }
             else if (this._tabControl.selectedIndex === 3)
-                this.demoView.display(this._serviceContainer, this.designerView.instanceServiceContainer, this._content);
+                this.demoView.display(this._serviceContainer, this.designerView.instanceServiceContainer, this._content, this.additionalStyleString);
         }
     }
     get content() {
@@ -191,7 +191,7 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
                 this._splitDiv.appendChild(this.codeView);
             }
             if (i.newIndex === 3) {
-                this.demoView.display(this._serviceContainer, this.designerView.instanceServiceContainer, this._content);
+                this.demoView.display(this._serviceContainer, this.designerView.instanceServiceContainer, this._content, this.additionalStyleString);
             }
         });
         if (this._content)

package/dist/elements/helper/ElementHelper.d.ts

@@ -1,3 +1,9 @@
 export declare function newElementFromString(text: any): Element;
+export declare enum ElementDisplayType {
+    none = 0,
+    inline = 1,
+    block = 2
+}
 export declare function isInline(element: HTMLElement): boolean;
+export declare function getElementDisplaytype(element: HTMLElement): ElementDisplayType;
 export declare function isEmptyTextNode(node: Node): boolean;

package/dist/elements/helper/ElementHelper.js

@@ -4,9 +4,19 @@ export function newElementFromString(text) {
     const fragment = range.createContextualFragment(text);
     return fragment.firstChild;
 }
+export var ElementDisplayType;
+(function (ElementDisplayType) {
+    ElementDisplayType[ElementDisplayType["none"] = 0] = "none";
+    ElementDisplayType[ElementDisplayType["inline"] = 1] = "inline";
+    ElementDisplayType[ElementDisplayType["block"] = 2] = "block";
+})(ElementDisplayType || (ElementDisplayType = {}));
 export function isInline(element) {
     return element != null && window.getComputedStyle(element).display.startsWith('inline');
 }
+export function getElementDisplaytype(element) {
+    const display = window.getComputedStyle(element).display;
+    return display == 'none' ? ElementDisplayType.none : display.startsWith('inline') ? ElementDisplayType.inline : ElementDisplayType.block;
+}
 export function isEmptyTextNode(node) {
     return node.textContent.trim() == '' && node.textContent.indexOf('\xa0' /* &nbsp; */) < 0;
 }

package/dist/elements/helper/PathDataPolyfill.d.ts

@@ -1,42 +1,42 @@
 import { IPoint } from "../../interfaces/IPoint.js";
 export {};
-declare type PathDataM = {
+export declare type PathDataM = {
     type: 'M' | 'm';
     values: [x: number, y: number];
 };
-declare type PathDataL = {
+export declare type PathDataL = {
     type: 'L' | 'l';
     values: [x: number, y: number];
 };
-declare type PathDataT = {
+export declare type PathDataT = {
     type: 'T' | 't';
     values: [x: number, y: number];
 };
-declare type PathDataH = {
+export declare type PathDataH = {
     type: 'H' | 'h';
     values: [x: number];
 };
-declare type PathDataV = {
+export declare type PathDataV = {
     type: 'V' | 'v';
     values: [y: number];
 };
-declare type PathDataZ = {
+export declare type PathDataZ = {
     type: 'Z' | 'z';
     values?: [];
 };
-declare type PathDataC = {
+export declare type PathDataC = {
     type: 'C' | 'c';
     values: [x1: number, y1: number, x2: number, y2: number, x: number, y: number];
 };
-declare type PathDataS = {
+export declare type PathDataS = {
     type: 'S' | 's';
     values: [x2: number, y2: number, x: number, y: number];
 };
-declare type PathDataQ = {
+export declare type PathDataQ = {
     type: 'Q' | 'q';
     values: [x1: number, y1: number, x: number, y: number];
 };
-declare type PathDataA = {
+export declare type PathDataA = {
     type: 'A' | 'a';
     values: [rx: number, ry: number, ang: number, flag1: 0 | 1, flag2: 0 | 1, x: number, y: number];
 };
@@ -47,6 +47,7 @@ export declare function straightenLine(p1: IPoint, p2: IPoint): IPoint;
 export declare function calculateNormLegth(p1: IPoint, p2: IPoint): number;
 export declare function calculateAlpha(p1: IPoint, p2: IPoint): number;
 export declare function moveSVGPath(path: SVGPathElement, xFactor: number, yFactor: number): string;
+export declare function createPathD(path: PathData[]): string;
 declare global {
     interface SVGGraphicsElement {
         getPathData(options?: {

package/dist/elements/helper/PathDataPolyfill.js

@@ -857,7 +857,7 @@ if (!SVGPathElement.prototype.getPathData || !SVGPathElement.prototype.setPathDa
     })();
 }
 export function straightenLine(p1, p2) {
-    let newP = p2;
+    let newP;
     let alpha = calculateAlpha(p1, p2);
     let normLength;
     if ((alpha >= 337.5 && alpha < 360 || alpha >= 0 && alpha < 22.5)) { // 0
@@ -941,3 +941,38 @@ export function moveSVGPath(path, xFactor, yFactor) {
     }
     return newPathData;
 }
+export function createPathD(path) {
+    let pathD = "";
+    for (let p of path) {
+        switch (p.type) {
+            case 'M':
+                pathD += p.type + p.values[0] + " " + p.values[1];
+                break;
+            case 'L':
+                pathD += p.type + p.values[0] + " " + p.values[1];
+                break;
+            case 'H':
+                break;
+            case 'V':
+                break;
+            case 'Z':
+                pathD += p.type;
+                break;
+            case 'C':
+            case 'c':
+                pathD += p.type + p.values[0] + " " + p.values[1] + " " + p.values[2] + " " + p.values[3] + " " + p.values[4] + " " + p.values[5];
+                break;
+            case 'S':
+                break;
+            case 'Q':
+            case 'q':
+                pathD += p.type + p.values[0] + " " + p.values[1] + " " + p.values[2] + " " + p.values[3];
+                break;
+            case 'T':
+                break;
+            case 'A':
+                break;
+        }
+    }
+    return pathD;
+}

package/dist/elements/services/DefaultServiceBootstrap.js

@@ -4,7 +4,6 @@ import { LitElementPropertiesService } from './propertiesService/services/LitEle
 import { NativeElementsPropertiesService } from './propertiesService/services/NativeElementsPropertiesService.js';
 import { DefaultInstanceService } from './instanceService/DefaultInstanceService.js';
 import { DefaultEditorTypesService } from './propertiesService/DefaultEditorTypesService.js';
-import { HtmlWriterService } from './htmlWriterService/HtmlWriterService.js';
 import { BaseCustomWebComponentPropertiesService } from './propertiesService/services/BaseCustomWebComponentPropertiesService.js';
 import { DefaultPlacementService } from './placementService/DefaultPlacementService.js';
 import { DefaultHtmlParserService } from './htmlParserService/DefaultHtmlParserService.js';
@@ -52,6 +51,9 @@ import { DemoProviderService } from './demoProviderService/DemoProviderService';
 import { DrawRectTool } from '../widgets/designerView/tools/DrawRectTool.js';
 import { DrawEllipsisTool } from '../widgets/designerView/tools/DrawEllipsisTool.js';
 import { DrawLineTool } from '../widgets/designerView/tools/DrawLineTool.js';
+import { HtmlWriterService } from './htmlWriterService/HtmlWriterService.js';
+import { RectContextMenu } from '../widgets/designerView/extensions/contextMenu/RectContextMenu.js';
+import { PathContextMenu } from '../widgets/designerView/extensions/contextMenu/PathContextMenu.js';
 export function createDefaultServiceContainer() {
     let serviceContainer = new ServiceContainer();
     serviceContainer.register("propertyService", new PolymerPropertiesService());
@@ -125,7 +127,9 @@ export function createDefaultServiceContainer() {
         new CopyPasteContextMenu(),
         new ZMoveContextMenu(),
         new MultipleItemsSelectedContextMenu(),
-        new ItemsBelowContextMenu()
+        new PathContextMenu(),
+        new RectContextMenu(),
+        new ItemsBelowContextMenu(),
     ];
     return serviceContainer;
 }

package/dist/elements/services/ServiceContainer.d.ts

@@ -67,7 +67,7 @@ export declare class ServiceContainer extends BaseServiceContainer<ServiceNameMa
     get elementsServices(): IElementsService[];
     get instanceServices(): IInstanceService[];
     get editorTypesServices(): IEditorTypesService[];
-    get htmlWriterServices(): IHtmlWriterService[];
+    get htmlWriterService(): IHtmlWriterService;
     get htmlParserService(): IHtmlParserService;
     get intializationService(): IIntializationService;
     get elementAtPointService(): IElementAtPointService;

package/dist/elements/services/ServiceContainer.js

@@ -40,8 +40,8 @@ export class ServiceContainer extends BaseServiceContainer {
     get editorTypesServices() {
         return this.getServices('editorTypesService');
     }
-    get htmlWriterServices() {
-        return this.getServices('htmlWriterService');
+    get htmlWriterService() {
+        return this.getLastService('htmlWriterService');
     }
     get htmlParserService() {
         return this.getLastService('htmlParserService');

package/dist/elements/services/demoProviderService/DemoProviderService.d.ts

@@ -2,5 +2,5 @@ import { InstanceServiceContainer } from "../InstanceServiceContainer.js";
 import { ServiceContainer } from "../ServiceContainer.js";
 import { IDemoProviderService } from "./IDemoProviderService.js";
 export declare class DemoProviderService implements IDemoProviderService {
-    provideDemo(container: HTMLElement, serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string): Promise<void>;
+    provideDemo(container: HTMLElement, serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string, style: string): Promise<void>;
 }

package/dist/elements/services/demoProviderService/DemoProviderService.js

@@ -1,6 +1,6 @@
 import { DomHelper } from '@node-projects/base-custom-webcomponent/dist/DomHelper';
 export class DemoProviderService {
-    provideDemo(container, serviceContainer, instanceServiceContainer, code) {
+    provideDemo(container, serviceContainer, instanceServiceContainer, code, style) {
         return new Promise(resolve => {
             const iframe = document.createElement('iframe');
             iframe.style.width = '100%';
@@ -21,6 +21,7 @@ export class DemoProviderService {
             }
             doc.write("document.body.style.display='';");
             doc.write('</script>');
+            doc.write('<style>' + (style ?? '') + '</style>');
             doc.write('<body style="display:none; width: 100%; height: 100%; margin: 0; padding: 0; position: absolute;">' + code + '</body>');
             doc.close();
         });

package/dist/elements/services/demoProviderService/IDemoProviderService.d.ts

@@ -1,5 +1,5 @@
 import { InstanceServiceContainer } from "../InstanceServiceContainer.js";
 import { ServiceContainer } from "../ServiceContainer.js";
 export interface IDemoProviderService {
-    provideDemo(container: HTMLElement, serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string): any;
+    provideDemo(container: HTMLElement, serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string, style: string): any;
 }

package/dist/elements/services/htmlWriterService/AbstractHtmlWriterService.d.ts

@@ -0,0 +1,10 @@
+import { IDesignItem } from '../../item/IDesignItem.js';
+import { IHtmlWriterService } from './IHtmlWriterService.js';
+import { IHtmlWriterOptions } from './IHtmlWriterOptions.js';
+import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
+import { IStringPosition } from './IStringPosition.js';
+export declare abstract class AbstractHtmlWriterService implements IHtmlWriterService {
+    abstract write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): any;
+    writeAttributes(indentedTextWriter: IndentedTextWriter, designItem: IDesignItem, options: IHtmlWriterOptions): void;
+    writeStyles(indentedTextWriter: IndentedTextWriter, designItem: IDesignItem, options: IHtmlWriterOptions): void;
+}

package/dist/elements/services/htmlWriterService/AbstractHtmlWriterService.js

@@ -0,0 +1,62 @@
+import { DomConverter } from '../../widgets/designerView/DomConverter.js';
+import { CssCombiner } from '../../helper/CssCombiner.js';
+import { PropertiesHelper } from '../propertiesService/services/PropertiesHelper.js';
+export class AbstractHtmlWriterService {
+    writeAttributes(indentedTextWriter, designItem, options) {
+        if (designItem.hasAttributes) {
+            for (const a of designItem.attributes) {
+                indentedTextWriter.write(' ');
+                if (typeof a[1] === 'string') {
+                    if (a[1] === "")
+                        indentedTextWriter.write(a[0]);
+                    else {
+                        if (options.parseJsonInAttributes &&
+                            ((a[1].startsWith('{') && !a[1].startsWith('{{') && a[1].endsWith('}')) ||
+                                (a[1].startsWith('[') && !a[1].startsWith('[[') && a[1].endsWith(']')))) {
+                            try {
+                                let j = JSON.parse(a[1]);
+                                let txt;
+                                if (options.jsonWriteMode == 'beauty')
+                                    txt = JSON.stringify(j, null, 2);
+                                else
+                                    txt = JSON.stringify(j);
+                                indentedTextWriter.write(a[0] + '=\'' + DomConverter.normalizeAttributeValue(txt, true) + '\'');
+                                continue;
+                            }
+                            catch { }
+                        }
+                        const content = DomConverter.normalizeAttributeValue(a[1]);
+                        if (content.indexOf('"')) {
+                            const contentSingle = DomConverter.normalizeAttributeValue(a[1], true);
+                            if (contentSingle.length < content.length)
+                                indentedTextWriter.write(a[0] + '=\'' + contentSingle + '\'');
+                            else
+                                indentedTextWriter.write(a[0] + '="' + content + '"');
+                        }
+                        else
+                            indentedTextWriter.write(a[0] + '="' + content + '"');
+                    }
+                }
+                else if (!a[1])
+                    indentedTextWriter.write(a[0]);
+                else {
+                    //TODO: writing of bindings, really ???
+                }
+            }
+        }
+    }
+    writeStyles(indentedTextWriter, designItem, options) {
+        if (designItem.hasStyles) {
+            indentedTextWriter.write(' style="');
+            let styles = designItem.styles;
+            if (options.compressCssToShorthandProperties)
+                styles = CssCombiner.combine(styles);
+            for (const s of styles) {
+                if (s[0]) {
+                    indentedTextWriter.write(PropertiesHelper.camelToDashCase(s[0]) + ':' + DomConverter.normalizeAttributeValue(s[1]) + ';');
+                }
+            }
+            indentedTextWriter.write('"');
+        }
+    }
+}

package/dist/elements/services/htmlWriterService/FormatingHtmlWriterService.d.ts

@@ -0,0 +1,22 @@
+import { IDesignItem } from '../../item/IDesignItem.js';
+import { IHtmlWriterService } from './IHtmlWriterService.js';
+import { IHtmlWriterOptions } from './IHtmlWriterOptions.js';
+import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
+import { IStringPosition } from './IStringPosition.js';
+declare enum ElementContainerType {
+    block = 0,
+    complex = 1
+}
+export declare class FormatingHtmlWriterService implements IHtmlWriterService {
+    private writeAttributes;
+    private writeStyles;
+    private _writeTextNode;
+    private _writeCommentNode;
+    private _writeElementNode;
+    private _writeDesignItemList;
+    private _writeNewlineAndIntend;
+    private _writeInternal;
+    getContainerType(element: HTMLElement): ElementContainerType;
+    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+}
+export {};

package/dist/elements/services/htmlWriterService/FormatingHtmlWriterService.js

@@ -0,0 +1,133 @@
+import { DomConverter } from '../../widgets/designerView/DomConverter.js';
+import { CssCombiner } from '../../helper/CssCombiner.js';
+import { NodeType } from '../../item/NodeType.js';
+import { PropertiesHelper } from '../propertiesService/services/PropertiesHelper.js';
+import { ElementDisplayType, getElementDisplaytype } from '../../helper/ElementHelper.js';
+var ElementContainerType;
+(function (ElementContainerType) {
+    ElementContainerType[ElementContainerType["block"] = 0] = "block";
+    ElementContainerType[ElementContainerType["complex"] = 1] = "complex";
+})(ElementContainerType || (ElementContainerType = {}));
+// const defaultDisplayNoneContainerDisplayType: ElementContainerType = ElementContainerType.complex;
+export class FormatingHtmlWriterService {
+    writeAttributes(writeContext, designItem) {
+        if (designItem.hasAttributes) {
+            for (const a of designItem.attributes) {
+                writeContext.indentedTextWriter.write(' ');
+                if (typeof a[1] === 'string') {
+                    if (a[1] === "")
+                        writeContext.indentedTextWriter.write(a[0]);
+                    else
+                        writeContext.indentedTextWriter.write(a[0] + '="' + DomConverter.normalizeAttributeValue(a[1]) + '"');
+                }
+                else if (!a[1])
+                    writeContext.indentedTextWriter.write(a[0]);
+                else {
+                }
+            }
+        }
+    }
+    writeStyles(writeContext, designItem) {
+        if (designItem.hasStyles) {
+            writeContext.indentedTextWriter.write(' style="');
+            let styles = designItem.styles;
+            if (writeContext.options.compressCssToShorthandProperties)
+                styles = CssCombiner.combine(styles);
+            for (const s of styles) {
+                if (s[0]) {
+                    writeContext.indentedTextWriter.write(PropertiesHelper.camelToDashCase(s[0]) + ':' + DomConverter.normalizeAttributeValue(s[1]) + ';');
+                }
+            }
+            writeContext.indentedTextWriter.write('"');
+        }
+    }
+    _writeTextNode(writeContext, designItem) {
+        writeContext.lastElementDisplayType = ElementDisplayType.inline;
+        let content = DomConverter.normalizeContentValue(designItem.content).trim();
+        if (content) {
+            writeContext.indentedTextWriter.write(content);
+        }
+    }
+    _writeCommentNode(writeContext, designItem) {
+        writeContext.indentedTextWriter.write('<!--' + designItem.content + '-->');
+    }
+    _writeElementNode(writeContext, designItem) {
+        //    const cs = getComputedStyle(designItem.element);
+        //cs.whiteSpace === 'pre'
+        //isInPre
+        //is in inline?
+        const currentElementDisplayType = getElementDisplaytype(designItem.element);
+        writeContext.lastElementDisplayType = currentElementDisplayType;
+        writeContext.indentedTextWriter.write('<' + designItem.name);
+        this.writeAttributes(writeContext, designItem);
+        this.writeStyles(writeContext, designItem);
+        writeContext.indentedTextWriter.write('>');
+        let contentSingleTextNode = false;
+        if (designItem.hasChildren) {
+            const children = designItem.children();
+            contentSingleTextNode = designItem.childCount === 1 && designItem.firstChild.nodeType === NodeType.TextNode;
+            if (contentSingleTextNode) {
+                this._writeInternal(writeContext, designItem.firstChild);
+            }
+            else {
+                let previousContainerDisplayType = writeContext.containerDisplayType;
+                writeContext.containerDisplayType = this.getContainerType(designItem.element);
+                writeContext.indentedTextWriter.levelRaise();
+                this._writeDesignItemList(currentElementDisplayType, writeContext, children);
+                writeContext.indentedTextWriter.levelShrink();
+                writeContext.containerDisplayType = previousContainerDisplayType;
+            }
+        }
+        else if (designItem.hasContent) {
+            writeContext.indentedTextWriter.write(DomConverter.normalizeContentValue(designItem.content));
+        }
+        if (!DomConverter.IsSelfClosingElement(designItem.name)) {
+            if (currentElementDisplayType === ElementDisplayType.block && designItem.hasChildren && !contentSingleTextNode) {
+                this._writeNewlineAndIntend(writeContext);
+            }
+            //write newline & intend ???
+            writeContext.indentedTextWriter.write('</' + designItem.name + '>');
+            if (currentElementDisplayType !== ElementDisplayType.none) {
+                writeContext.lastElementDisplayType = currentElementDisplayType;
+            }
+        }
+    }
+    _writeDesignItemList(currentElementDisplayType, writeContext, children) {
+        for (const c of children) {
+            if (writeContext.lastElementDisplayType == null) {
+                //first entry, do nothing
+            }
+            else if (writeContext.containerDisplayType === ElementContainerType.complex)
+                this._writeNewlineAndIntend(writeContext);
+            else if (writeContext.lastElementDisplayType !== ElementDisplayType.inline /*|| currentElementDisplayType !== ElementDisplayType.inline*/)
+                this._writeNewlineAndIntend(writeContext);
+            this._writeInternal(writeContext, c);
+        }
+    }
+    _writeNewlineAndIntend(writeContext) {
+        writeContext.indentedTextWriter.writeNewline();
+        writeContext.indentedTextWriter.writeIndent();
+    }
+    _writeInternal(writeContext, designItem) {
+        const start = writeContext.indentedTextWriter.position;
+        if (designItem.nodeType === NodeType.TextNode)
+            this._writeTextNode(writeContext, designItem);
+        else if (designItem.nodeType === NodeType.Comment)
+            this._writeCommentNode(writeContext, designItem);
+        else if (designItem.nodeType === NodeType.Element)
+            this._writeElementNode(writeContext, designItem);
+        if (writeContext.designItemsAssignmentList) {
+            writeContext.designItemsAssignmentList.set(designItem, { start: start, length: writeContext.indentedTextWriter.position - start - 1 });
+        }
+    }
+    getContainerType(element) {
+        const display = window.getComputedStyle(element).display;
+        if (display === 'block' || display === "inline-block" || display == '')
+            return ElementContainerType.block;
+        return ElementContainerType.complex;
+    }
+    write(indentedTextWriter, designItems, rootContainerKeepInline, options, designItemsAssignmentList) {
+        const context = { indentedTextWriter, options, lastElementDisplayType: null, containerDisplayType: ElementContainerType.block, designItemsAssignmentList };
+        this._writeDesignItemList(ElementDisplayType.inline, context, designItems);
+    }
+}

package/dist/elements/services/htmlWriterService/HtmlWriterService copy.d.ts

@@ -4,9 +4,9 @@ import { IHtmlWriterOptions } from './IHtmlWriterOptions';
 import { IndentedTextWriter } from '../../helper/IndentedTextWriter';
 import { IStringPosition } from './IStringPosition';
 export declare class HtmlWriterService implements IHtmlWriterService {
-    canWrite(designItem: IDesignItem): boolean;
     private _conditionalyWriteIndent;
     private _conditionalyWriteNewline;
-    write(indentedTextWriter: IndentedTextWriter, designItem: IDesignItem, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+    private internalWrite;
     private writeTextNode;
 }

package/dist/elements/services/htmlWriterService/HtmlWriterService copy.js

@@ -2,14 +2,12 @@ import { DomConverter } from '../../widgets/designerView/DomConverter';
 import { CssCombiner } from '../../helper/CssCombiner';
 import { NodeType } from '../../item/NodeType';
 import { PropertiesHelper } from '../propertiesService/services/PropertiesHelper';
-import { isInline } from '../../helper/ElementHelper.js';
+import { isEmptyTextNode, isInline } from '../../helper/ElementHelper.js';
 export class HtmlWriterService {
-    canWrite(designItem) {
-        return true;
-    }
     _conditionalyWriteIndent(indentedTextWriter, designItem) {
         if ((designItem.element instanceof HTMLElement && !isInline(designItem.element)) ||
-            (designItem.element.previousElementSibling instanceof HTMLElement && !isInline(designItem.element.previousElementSibling)))
+            (designItem.element.previousElementSibling instanceof HTMLElement && !isInline(designItem.element.previousElementSibling)) ||
+            (designItem.element.previousElementSibling == null && !isInline(designItem.element.parentElement) && (designItem.element.previousSibling == null || isEmptyTextNode(designItem.element.previousSibling))))
             indentedTextWriter.writeIndent();
     }
     _conditionalyWriteNewline(indentedTextWriter, designItem) {
@@ -17,10 +15,20 @@ export class HtmlWriterService {
             (designItem.element.nextElementSibling instanceof HTMLElement && !isInline(designItem.element.nextElementSibling)))
             indentedTextWriter.writeNewline();
     }
-    write(indentedTextWriter, designItem, options, designItemsAssignmentList) {
+    write(indentedTextWriter, designItems, rootContainerKeepInline, options, designItemsAssignmentList) {
+        for (const d of designItems) {
+            this.internalWrite(indentedTextWriter, d, options, designItemsAssignmentList);
+        }
+    }
+    internalWrite(indentedTextWriter, designItem, options, designItemsAssignmentList) {
         let start = indentedTextWriter.position;
         if (designItem.nodeType == NodeType.TextNode) {
-            this.writeTextNode(indentedTextWriter, designItem, true);
+            if (isEmptyTextNode(designItem.element) &&
+                ((designItem.element.previousSibling instanceof HTMLElement && !isInline(designItem.element.previousSibling)) ||
+                    (designItem.element.nextSibling instanceof HTMLElement && !isInline(designItem.element.nextSibling)))) {
+            }
+            else
+                this.writeTextNode(indentedTextWriter, designItem, true);
         }
         else if (designItem.nodeType == NodeType.Comment) {
             this._conditionalyWriteIndent(indentedTextWriter, designItem);
@@ -59,24 +67,30 @@ export class HtmlWriterService {
                 indentedTextWriter.write('"');
             }
             indentedTextWriter.write('>');
+            let contentSingleTextNode = false;
             if (designItem.hasChildren) {
                 const children = designItem.children();
-                const singleTextNode = designItem.childCount === 1 && designItem.firstChild.nodeType === NodeType.TextNode;
-                if (singleTextNode) {
+                contentSingleTextNode = designItem.childCount === 1 && designItem.firstChild.nodeType === NodeType.TextNode;
+                if (contentSingleTextNode) {
                     this.writeTextNode(indentedTextWriter, designItem, false);
                 }
                 else {
-                    indentedTextWriter.writeNewline();
-                    indentedTextWriter.levelRaise();
+                    if (designItem.element instanceof HTMLElement && !isInline(designItem.element)) {
+                        indentedTextWriter.writeNewline();
+                        indentedTextWriter.levelRaise();
+                    }
                     for (const c of children) {
-                        c.serviceContainer.forSomeServicesTillResult('htmlWriterService', (s) => {
-                            if (s.canWrite(c)) {
-                                s.write(indentedTextWriter, c, options, designItemsAssignmentList);
-                            }
-                        });
+                        this.internalWrite(indentedTextWriter, c, options, designItemsAssignmentList);
+                        let childSingleTextNode = c.childCount === 1 && c.firstChild.nodeType === NodeType.TextNode;
+                        if (childSingleTextNode)
+                            indentedTextWriter.writeNewline();
+                    }
+                    if (designItem.element instanceof HTMLElement && !isInline(designItem.element)) {
+                        indentedTextWriter.levelShrink();
+                        if (!indentedTextWriter.isLastCharNewline())
+                            indentedTextWriter.writeNewline();
+                        indentedTextWriter.writeIndent();
                     }
-                    indentedTextWriter.levelShrink();
-                    indentedTextWriter.writeIndent();
                 }
             }
             else if (designItem.hasContent) {
@@ -84,7 +98,8 @@ export class HtmlWriterService {
             }
             if (!DomConverter.IsSelfClosingElement(designItem.name))
                 indentedTextWriter.write('</' + designItem.name + '>');
-            this._conditionalyWriteNewline(indentedTextWriter, designItem);
+            if (!contentSingleTextNode)
+                this._conditionalyWriteNewline(indentedTextWriter, designItem);
         }
         if (designItemsAssignmentList) {
             designItemsAssignmentList.set(designItem, { start: start, length: indentedTextWriter.position - start - 1 });

package/dist/elements/services/htmlWriterService/HtmlWriterService.d.ts

@@ -1,12 +1,12 @@
-import { IDesignItem } from '../../item/IDesignItem';
-import { IHtmlWriterService } from './IHtmlWriterService';
-import { IHtmlWriterOptions } from './IHtmlWriterOptions';
-import { IndentedTextWriter } from '../../helper/IndentedTextWriter';
-import { IStringPosition } from './IStringPosition';
-export declare class HtmlWriterService implements IHtmlWriterService {
-    canWrite(designItem: IDesignItem): boolean;
+import { IDesignItem } from '../../item/IDesignItem.js';
+import { IHtmlWriterOptions } from './IHtmlWriterOptions.js';
+import { IndentedTextWriter } from '../../helper/IndentedTextWriter.js';
+import { IStringPosition } from './IStringPosition.js';
+import { AbstractHtmlWriterService } from './AbstractHtmlWriterService.js';
+export declare class HtmlWriterService extends AbstractHtmlWriterService {
     private _conditionalyWriteIndent;
     private _conditionalyWriteNewline;
-    write(indentedTextWriter: IndentedTextWriter, designItem: IDesignItem, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+    write(indentedTextWriter: IndentedTextWriter, designItems: IDesignItem[], rootContainerKeepInline: boolean, options: IHtmlWriterOptions, designItemsAssignmentList?: Map<IDesignItem, IStringPosition>): void;
+    private internalWrite;
     private writeTextNode;
 }