@wavemaker/app-ng-runtime 11.5.2-rc.5436 → 11.5.3-next.141099

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

@@ -3,7 +3,7 @@ import { InjectionToken, forwardRef, ElementRef, inject, ViewContainerRef, Injec
 import * as i1$1 from '@angular/common';
 import { Location, CommonModule } from '@angular/common';
 import * as i1 from '@wm/core';
-import { FormWidgetType, checkIsCustomPipeExpression, $parseExpr, isValidWebURL, encodeUrl, stringStartsWith, prettifyLabel, deHyphenate, initCaps, getClonedObject, setCSS, isDefined, IDGenerator, toBoolean, isChangeFromWatch, $unwatch, resetChangeFromWatch, isObject, toDimension, $appDigest, removeClass, addClass, setCSSFromObj, App, findParent, setAttr, isMobileApp, switchClass, removeAttr, $parseEvent, $invokeWatchers, $watch, transformFileURI, ComponentType, noop as noop$1, isLargeTabletLandscape, isLargeTabletPortrait, isKitkatDevice, debounce, hasOffsetStr, AbstractI18nService, CURRENCY_INFO, isMobile, AbstractDialogService, DataSource, processFilterExpBindNode, MatchMode, isEqualWithFields, getFormattedDate, isAndroid, isNumberType, DataType, findValueOf, validateAccessRoles, VALIDATOR, isIos } from '@wm/core';
+import { FormWidgetType, checkIsCustomPipeExpression, $parseExpr, isValidWebURL, encodeUrl, stringStartsWith, prettifyLabel, deHyphenate, initCaps, getClonedObject, setCSS, isDefined, IDGenerator, toBoolean, isChangeFromWatch, $unwatch, resetChangeFromWatch, isObject, toDimension, $appDigest, removeClass, addClass, setCSSFromObj, App, setAttr, isMobileApp, switchClass, removeAttr, $parseEvent, $invokeWatchers, $watch, transformFileURI, ComponentType, noop as noop$1, isLargeTabletLandscape, isLargeTabletPortrait, isKitkatDevice, debounce, hasOffsetStr, AbstractI18nService, CURRENCY_INFO, isMobile, AbstractDialogService, DataSource, processFilterExpBindNode, MatchMode, isEqualWithFields, getFormattedDate, isAndroid, isNumberType, DataType, findValueOf, validateAccessRoles, VALIDATOR, isIos } from '@wm/core';
 import { SecurityModule, SecurityService } from '@wm/security';
 import { createFocusTrap } from '@wavemaker/focus-trap/dist/focus-trap';
 import * as i1$2 from '@angular/platform-browser';
@@ -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,7 +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;
-        this.viewParent = findParent(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;
@@ -1328,7 +1359,7 @@ class BaseComponent {
     getAttributes() {
         let _tNodeAttrs = this.inj._tNode.attrs, actualAttrs = Array.from(this.nativeElement.attributes).map(attr => attr.name);
         if (_tNodeAttrs === null) {
-            return actualAttrs.sort();
+            return actualAttrs;
         }
         _.forEach(_tNodeAttrs, (attr, i) => {
             if (typeof attr === 'number') {
@@ -1342,20 +1373,15 @@ class BaseComponent {
                 }
             }
         });
-        /*
-        Sorting attributes as properties like placeholder is not working when it is bound.
-        placeholder and placeholder.bind two properties are coming in Array.
-        When array is not sorted, initially placeholder.bind value is set then placeholder default value is updated.
-        If array is sorted, placeholder.bind value will be set finally.
-        This is caused because of the way we are storing attribute names in watcher registry map
-         */
-        return actualAttrs.sort();
+        return actualAttrs;
     }
     /**
      * Process the attributes
      */
     processAttrs() {
-        _.map(this.getAttributes(), (attrName) => {
+        const attrs = this.getAttributes();
+        let i = 0;
+        _.map(attrs, (attrName) => {
             let attrValue = this.nativeElement.attributes[attrName].value;
             this.$attrs.set(attrName, attrValue);
             this.processAttr(attrName, attrValue);
@@ -1698,7 +1724,20 @@ class LazyLoadDirective {
         this.viewContainer = viewContainer;
         let viewParentApp = inj ? inj.get(App) : inject(App);
         let lView = inj._lView;
-        this.viewParent = findParent(lView, viewParentApp);
+        const getParentlView = (lView) => {
+            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) || viewParentApp;
         //this.context = (inj as any).view.context;
         this.context = inj._lView[8];
     }
@@ -4550,9 +4589,9 @@ class BaseFieldValidations {
         if (this.widgetContext.ngform) {
             this.widgetControl.setValidators(this.instance._validators);
             const opt = {};
-            // updating the value only when prevData is not equal to current value. and also initially when  instance.value is empty or null for some widgets like date, checkboxset
+            // updating the value only when prevData is not equal to current value.
             // emitEvent flag will prevent from emitting the valueChanges when value is equal to the prevDatavalue.
-            if (this.formwidget && (this.instance.value === this.formwidget.prevDatavalue || this.isNullOrEmptyOrFalsy(this.instance.value))) {
+            if (this.formwidget && this.instance.value === this.formwidget.prevDatavalue) {
                 opt['emitEvent'] = false;
             }
             this.widgetControl.updateValueAndValidity(opt);
@@ -4609,9 +4648,9 @@ class BaseFieldValidations {
         this.widgetControl.setAsyncValidators([this._asyncValidatorFn()]);
         if (this.widgetContext.ngform.touched) {
             const opt = {};
-            // updating the value only when prevData is not equal to current value. and also initially when  instance.value is empty or null for some widgets like date, checkboxset
+            // updating the value only when prevData is not equal to current value.
             // emitEvent flag will prevent from emitting the valueChanges when value is equal to the prevDatavalue.
-            if (this.formwidget && (this.instance.value === this.formwidget.prevDatavalue || this.isNullOrEmptyOrFalsy(this.instance.value))) {
+            if (this.formwidget && this.instance.value === this.formwidget.prevDatavalue) {
                 opt['emitEvent'] = false;
             }
             this.widgetControl.updateValueAndValidity(opt);
@@ -4678,9 +4717,9 @@ class BaseFieldValidations {
         this.applyDefaultValidators();
         if (this._asyncValidatorFn) {
             const opt = {};
-            // updating the value only when prevData is not equal to current value. and also initially when  instance.value is empty or null for some widgets like date, checkboxset
+            // updating the value only when prevData is not equal to current value.
             // emitEvent flag will prevent from emitting the valueChanges when value is equal to the prevDatavalue.
-            if (this.formwidget && (this.instance.value === this.formwidget.prevDatavalue || this.isNullOrEmptyOrFalsy(this.instance.value))) {
+            if (this.formwidget && this.instance.value === this.formwidget.prevDatavalue) {
                 opt['emitEvent'] = false;
             }
             this.widgetControl.setAsyncValidators([this._asyncValidatorFn()]);
@@ -4701,16 +4740,13 @@ class BaseFieldValidations {
             this.applyDefaultValidators();
         }, watchName));
     }
-    isNullOrEmptyOrFalsy(value) {
-        return _.isEmpty(value);
-    }
     // invokes both custom sync validations and default validations.
     applyDefaultValidators() {
         const validators = this.getDefaultValidators();
         const opt = {};
-        // updating the value only when prevData is not equal to current value. and also initially when  instance.value is empty or null for some widgets like date, checkboxset
+        // updating the value only when prevData is not equal to current value.
         // emitEvent flag will prevent from emitting the valueChanges when value is equal to the prevDatavalue.
-        if (this.formwidget && (this.instance.value === this.formwidget.prevDatavalue || this.isNullOrEmptyOrFalsy(this.instance.value))) {
+        if (this.formwidget && this.instance.value === this.formwidget.prevDatavalue) {
             opt['emitEvent'] = false;
         }
         this.widgetControl.setValidators(_.concat(this._syncValidators || [], validators));