@wavemaker/app-ng-runtime 11.5.0-next.24737 → 11.5.0-next.24739

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

@@ -952,34 +952,27 @@ class BaseComponent {
         this.isMuted = false;
         this.findParentlView = (lView) => {
             //console.log("---*************--widgetType--*************---", this.widgetType);
+            if (lView[3] === null) {
+                return lView[8] ? lView[8] : this.viewParentApp;
+            }
             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
+            if (componentType === 0 || componentType === 1) {
+                let p = lView[8];
+                // ts-ignore
+                if (p.constructor.name === 'DialogComponent') {
                     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);
+                else {
+                    return p;
                 }
             }
+            else { // when componentType == 2, then fetch parent again
+                return this.findParentlView(parentlView);
+            }
         };
         const elementRef = inj.get(ElementRef);
         this.nativeElement = elementRef.nativeElement;
@@ -1920,10 +1913,14 @@ class PartialParamHandlerDirective {
     }
     registerParams(name, value, bindExpr, type) {
         this.widgetRef.partialParams[name] = value;
+        let viewParent = this.widgetRef.getViewParent();
+        if (this.widgetRef.inj._tNode.parent === null) {
+            viewParent = this.getViewParent(viewParent);
+        }
         if (!value && bindExpr) {
             this.widgetRef.registerDestroyListener(
             //[Todo-CSP]: expr fn should be generated be default
-            $watch(bindExpr, this.widgetRef.getViewParent(), _.get(this.widgetRef, 'context'), nv => {
+            $watch(bindExpr, viewParent, _.get(this.widgetRef, 'context'), nv => {
                 this.widgetRef.partialParams[name] = nv;
                 // notify the partial container of the param changes
                 this.widgetRef.params$.next();
@@ -1933,6 +1930,13 @@ class PartialParamHandlerDirective {
             this.widgetRef.params$.next();
         }
     }
+    getViewParent(viewParent) {
+        let parent = viewParent.viewParent;
+        if (parent.constructor.name === "DynamicComponent") {
+            return parent;
+        }
+        return this.getViewParent(parent);
+    }
 }
 PartialParamHandlerDirective.ɵfac = function PartialParamHandlerDirective_Factory(t) { return new (t || PartialParamHandlerDirective)(i0.ɵɵdirectiveInject(WidgetRef, 2)); };
 PartialParamHandlerDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: PartialParamHandlerDirective, selectors: [["", "partialContainer", ""]] });