@wavemaker/app-ng-runtime 11.5.0-next.24744 → 11.5.0-next.24745

app-ng-runtime/components/data/list/list-item.directive.d.ts

@@ -6,7 +6,6 @@ import * as i0 from "@angular/core";
 export declare class ListItemDirective implements OnInit, AfterViewInit {
     private inj;
     private app;
-    _viewParent: ListComponent;
     item: any;
     context: any;
     destroy: Subject<any>;
@@ -26,13 +25,13 @@ export declare class ListItemDirective implements OnInit, AfterViewInit {
     get $last(): any;
     get currentItemWidgets(): {};
     set wmListItem(val: any);
-    constructor(inj: Injector, elRef: ElementRef, app: App, _viewParent: ListComponent);
+    constructor(inj: Injector, elRef: ElementRef, app: App);
     private registerWatch;
     private itemClassWatcher;
     private disableItemWatcher;
     private setUpCUDHandlers;
     ngOnInit(): void;
     ngAfterViewInit(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<ListItemDirective, [null, null, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ListItemDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<ListItemDirective, "[wmListItem]", ["listItemRef"], { "wmListItem": "wmListItem"; }, {}, never, never, false, never>;
 }

app-ng-runtime/core/bundles/index.umd.js

@@ -3787,30 +3787,58 @@
        }
    };
    const findParent = (lView, viewParentApp) => {
-       let parent = findViewParent(lView);
-       return parent ? parent : viewParentApp;
+       // console.log("---*************--lView--*************---", lView);
+       // console.log("---*************--viewParentApp--*************---", viewParentApp);
+       let parentObj = findViewParent(lView, { 'parent': {}, 'root': {} });
+       // console.log("---*************--parentObj--*************---", parentObj);
+       let finalParent = {};
+       if (parentObj['parent'] === null || parentObj['root'] === null) {
+           parentObj['root'] = viewParentApp;
+           parentObj['parent'] = {};
+       }
+       let mergFunc = function (objValue, srcValue, key) {
+           const protectedKeys = ['viewParent'];
+           if (protectedKeys.includes(key)) {
+               return objValue;
+           }
+           return srcValue;
+       };
+       if (_.isEmpty(parentObj['parent'])) {
+           finalParent = _.mergeWith(parentObj.root, parentObj.parent, mergFunc);
+       }
+       else {
+           finalParent = _.mergeWith(parentObj.parent, parentObj.root, mergFunc);
+       }
+       // console.log("---*************--finalParent--*************---", finalParent);
+       return finalParent;
    };
-   const findViewParent = (lView) => {
+   const findViewParent = (lView, parentObj) => {
        if (lView[3] === null) {
-           return lView[8];
+           parentObj['root'] = lView[8];
+           return parentObj;
        }
        let parentlView = lView[3];
-       if (typeof lView[1] === "boolean") {
-           return findViewParent(parentlView);
+       if (typeof lView[1] === "boolean") { // this is lContainer, not lView if this is boolean
+           return findViewParent(parentlView, parentObj);
        }
        let componentType = lView[1]["type"];
        if (componentType === 0 || componentType === 1) {
            let p = lView[8];
            // ts-ignore
-           if (p.hasOwnProperty("isDialogComponent")) {
-               return findViewParent(parentlView);
+           if (p.hasOwnProperty("isDynamicComponent") || p.hasOwnProperty("isPageComponent")) {
+               parentObj['root'] = p;
+               return parentObj;
            }
            else {
-               return p;
+               if (_.isEmpty(parentObj['parent'])) {
+                   parentObj['parent'] = p;
+                   // console.log(".......parentObj........", parentObj)
+               }
+               return findViewParent(parentlView, parentObj);
            }
        }
-       else {
-           return findViewParent(parentlView);
+       else { // when componentType == 2, then fetch parent again
+           return findViewParent(parentlView, parentObj);
        }
    };