@wavemaker-ai/app-ng-runtime 1.0.0-rc.317 → 1.0.0-rc.319

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

@@ -2035,8 +2035,8 @@
         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 createElement$1 = name => {
+        return new compiler.Element(name, [], [], [], false, noSpan$1, noSpan$1, noSpan$1, false);
     };
     const getElementNode = (name, node) => {
         let elementNode;
@@ -2056,7 +2056,7 @@
         });
         return elementNode;
     };
-    const noSpan = {};
+    const noSpan$1 = {};
     const idGen$9 = new core.IDGenerator('wm_page');
     transpiler.register('wm-page', () => {
         return {
@@ -2066,7 +2066,7 @@
                     pageContentNode = getElementNode('wm-page-content', getElementNode('wm-content', node));
                 }
                 if (pageContentNode) {
-                    const conditionalNode = createElement('ng-container');
+                    const conditionalNode = createElement$1('ng-container');
                     const ifOpenText = new compiler.Text('@if (compilePageContent) {', null, undefined, undefined);
                     conditionalNode.children.push(ifOpenText);
                     conditionalNode.children = conditionalNode.children.concat(pageContentNode.children);
@@ -2237,14 +2237,23 @@
     });
 
     const tagName$h = 'div';
+    const createElement = name => {
+        return new compiler.Element(name, [], [], [], false, noSpan, noSpan, noSpan, false);
+    };
+    const noSpan = {};
     transpiler.register('wm-page-content', () => {
         return {
             template: (node) => {
-                // For SPA pages, just append onPageContentReady() without conditional wrapping
                 for (let attr of node.attrs) {
                     if (attr.name === 'spa' && attr.value === 'true') {
-                        // No conditional wrapping needed - content should render immediately
-                        node.children.push(new compiler.Text('{{onPageContentReady()}}', 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(node.children);
+                        conditionalNode.children.push(new compiler.Text('{{onPageContentReady()}}', null, undefined, undefined));
+                        const ifCloseText = new compiler.Text('}', null, undefined, undefined);
+                        conditionalNode.children.push(ifCloseText);
+                        node.children = [conditionalNode];
                         break;
                     }
                 }

package/build-task/fesm2022/index.mjs

@@ -2036,8 +2036,8 @@ 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 createElement$1 = name => {
+    return new Element(name, [], [], [], false, noSpan$1, noSpan$1, noSpan$1, false);
 };
 const getElementNode = (name, node) => {
     let elementNode;
@@ -2057,7 +2057,7 @@ const getElementNode = (name, node) => {
     });
     return elementNode;
 };
-const noSpan = {};
+const noSpan$1 = {};
 const idGen$9 = new IDGenerator('wm_page');
 register('wm-page', () => {
     return {
@@ -2067,7 +2067,7 @@ register('wm-page', () => {
                 pageContentNode = getElementNode('wm-page-content', getElementNode('wm-content', node));
             }
             if (pageContentNode) {
-                const conditionalNode = createElement('ng-container');
+                const conditionalNode = createElement$1('ng-container');
                 const ifOpenText = new Text('@if (compilePageContent) {', null, undefined, undefined);
                 conditionalNode.children.push(ifOpenText);
                 conditionalNode.children = conditionalNode.children.concat(pageContentNode.children);
@@ -2238,14 +2238,23 @@ var rightPanel_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$h = 'div';
+const createElement = name => {
+    return new Element(name, [], [], [], false, noSpan, noSpan, noSpan, false);
+};
+const noSpan = {};
 register('wm-page-content', () => {
     return {
         template: (node) => {
-            // For SPA pages, just append onPageContentReady() without conditional wrapping
             for (let attr of node.attrs) {
                 if (attr.name === 'spa' && attr.value === 'true') {
-                    // No conditional wrapping needed - content should render immediately
-                    node.children.push(new Text('{{onPageContentReady()}}', 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(node.children);
+                    conditionalNode.children.push(new Text('{{onPageContentReady()}}', null, undefined, undefined));
+                    const ifCloseText = new Text('}', null, undefined, undefined);
+                    conditionalNode.children.push(ifCloseText);
+                    node.children = [conditionalNode];
                     break;
                 }
             }