@wavemaker/app-ng-runtime 11.5.0-next.141087 → 11.5.0-next.141089

app-ng-runtime/components/base/fesm2020/index.mjs

@@ -950,6 +950,37 @@ class BaseComponent {
         this.__cloneable__ = false;
         this.$attrs = new Map();
         this.isMuted = false;
+        this.findParentlView = (lView) => {
+            //console.log("---*************--widgetType--*************---", this.widgetType);
+            let parentlView = lView[3];
+            if (typeof lView[1] === "boolean") { // this is lContainer, not lView if this is boolean
+                return this.findParentlView(parentlView);
+            }
+            let componentType = lView[1]["type"];
+            if (this.widgetType === "wm-button") {
+                if (componentType === 0 || componentType === 1) {
+                    let p = lView[8];
+                    // ts-ignore
+                    if (p.constructor.name === 'DialogComponent') {
+                        return this.findParentlView(parentlView);
+                    }
+                    else {
+                        return p;
+                    }
+                }
+                else { // when componentType == 2, then fetch parent again
+                    return this.findParentlView(parentlView);
+                }
+            }
+            else {
+                if (componentType === 0 || componentType === 1) {
+                    return lView[8];
+                }
+                else { // when componentType == 2, then fetch parent again
+                    return this.findParentlView(parentlView);
+                }
+            }
+        };
         const elementRef = inj.get(ElementRef);
         this.nativeElement = elementRef.nativeElement;
         //making the code compatible in both the JIT and AOT modes
@@ -962,21 +993,7 @@ class BaseComponent {
         // this.viewParent = _viewParent || (this.viewContainerRef as any).parentInjector._lView[8];
         // https://github.com/angular/angular/blob/main/packages/core/src/render3/interfaces/view.ts
         let lView = this.inj._lView;
-        const getParentlView = (lView) => {
-            //console.log("---*************--widgetType--*************---", this.widgetType);
-            let parentlView = lView[3];
-            if (typeof lView[1] === "boolean") { // this is lContainer, not lView if this is boolean
-                return getParentlView(parentlView);
-            }
-            let componentType = lView[1]["type"];
-            if (componentType === 0 || componentType === 1) {
-                return lView[8];
-            }
-            else { // when componentType == 2, then fetch parent again
-                return getParentlView(parentlView);
-            }
-        };
-        this.viewParent = getParentlView(lView) || this.viewParentApp;
+        this.viewParent = lView[8] === null ? this.viewParentApp : this.findParentlView(lView);
         //console.log("---*************--context--*************---", lView[8]);
         this.context = this.inj._lView[8];
         this.displayType = config.displayType || DISPLAY_TYPE.BLOCK;
@@ -1306,6 +1323,7 @@ class BaseComponent {
      * If the attribute is a bound expression, register a watch on the expression
      */
     processAttr(attrName, attrValue) {
+        // console.log("====attrName=====", attrName, "=====typeof attrname=====", typeof attrName, "-----attrValue----", attrValue);
         const { 0: propName, 1: type, 2: meta, length } = attrName.split('.');
         if (type === 'bind') {
             // if the show property is bound, set the initial value to false
@@ -1979,8 +1997,9 @@ class PartialContainerDirective {
         const componentFactory = await this.partialRefProvider.getComponentFactoryRef(nv, ComponentType.PARTIAL, { prefab: prefabName });
         if (componentFactory) {
             const instanceRef = this.vcRef.createComponent(componentFactory, 0, this.inj);
-            if (instanceRef && instanceRef['_component'] && prefabName) {
-                instanceRef['_component'].prefabName = prefabName;
+            if (instanceRef && instanceRef['instance'] && prefabName) {
+                // @ts-ignore
+                instanceRef['instance'].prefabName = prefabName;
             }
             if (!this.$target) {
                 this.$target = this.elRef.nativeElement.querySelector('[partial-container-target]') || this.elRef.nativeElement;