@wavemaker-ai/app-ng-runtime 1.0.0-rc.309 → 1.0.0-rc.314

package/build-task/bundles/index.umd.js

@@ -2035,6 +2035,9 @@
         const child = node && node.children.find(e => (e instanceof compiler.Element && e.name === childName));
         return child;
     };
+    const createElement = name => {
+        return new compiler.Element(name, [], [], [], false, noSpan, noSpan, noSpan, false);
+    };
     const getElementNode = (name, node) => {
         let elementNode;
         if (!node) {
@@ -2053,6 +2056,7 @@
         });
         return elementNode;
     };
+    const noSpan = {};
     const idGen$9 = new core.IDGenerator('wm_page');
     transpiler.register('wm-page', () => {
         return {
@@ -2062,9 +2066,14 @@
                     pageContentNode = getElementNode('wm-page-content', getElementNode('wm-content', node));
                 }
                 if (pageContentNode) {
-                    // Wrap content in @if block with proper newlines to avoid template syntax errors
-                    pageContentNode.children.unshift(new compiler.Text('@if (compilePageContent) {\n', null, undefined, undefined));
-                    pageContentNode.children.push(new compiler.Text('\n{{onPageContentReady()}}\n}', null, undefined, undefined));
+                    const conditionalNode = createElement('ng-container');
+                    const ifOpenText = new compiler.Text('@if (compilePageContent) {', null, undefined, undefined);
+                    conditionalNode.children.push(ifOpenText);
+                    conditionalNode.children = conditionalNode.children.concat(pageContentNode.children);
+                    conditionalNode.children.push(new compiler.Text('{{onPageContentReady()}}', null, undefined, undefined));
+                    const ifCloseText = new compiler.Text('}', null, undefined, undefined);
+                    conditionalNode.children.push(ifCloseText);
+                    pageContentNode.children = [conditionalNode];
                 }
             },
             pre: (attrs) => {

package/build-task/fesm2022/index.mjs

@@ -2036,6 +2036,9 @@ const findChild = (node, childName) => {
     const child = node && node.children.find(e => (e instanceof Element && e.name === childName));
     return child;
 };
+const createElement = name => {
+    return new Element(name, [], [], [], false, noSpan, noSpan, noSpan, false);
+};
 const getElementNode = (name, node) => {
     let elementNode;
     if (!node) {
@@ -2064,9 +2067,14 @@ register('wm-page', () => {
                 pageContentNode = getElementNode('wm-page-content', getElementNode('wm-content', node));
             }
             if (pageContentNode) {
-                // Wrap content in @if block with proper newlines to avoid template syntax errors
-                pageContentNode.children.unshift(new Text('@if (compilePageContent) {\n', null, undefined, undefined));
-                pageContentNode.children.push(new Text('\n{{onPageContentReady()}}\n}', null, undefined, undefined));
+                const conditionalNode = createElement('ng-container');
+                const ifOpenText = new Text('@if (compilePageContent) {', null, undefined, undefined);
+                conditionalNode.children.push(ifOpenText);
+                conditionalNode.children = conditionalNode.children.concat(pageContentNode.children);
+                conditionalNode.children.push(new Text('{{onPageContentReady()}}', null, undefined, undefined));
+                const ifCloseText = new Text('}', null, undefined, undefined);
+                conditionalNode.children.push(ifCloseText);
+                pageContentNode.children = [conditionalNode];
             }
         },
         pre: (attrs) => {