@wavemaker/app-ng-runtime 11.5.0-next.141086 → 11.5.0-next.141088

app-ng-runtime/core/fesm2020/index.mjs

@@ -1,4 +1,4 @@
-import { Attribute, ImplicitReceiver, LiteralPrimitive, LiteralArray, LiteralMap, PropertyRead, PropertyWrite, KeyedRead, PrefixNot, Binary, Conditional, Call, Chain, BindingPipe, Parser, Lexer } from '@angular/compiler';
+import { Attribute, ImplicitReceiver, PropertyRead, LiteralPrimitive, LiteralArray, LiteralMap, PropertyWrite, KeyedRead, PrefixNot, Binary, Conditional, Call, Chain, BindingPipe, Parser, Lexer } from '@angular/compiler';
 import { Subject } from 'rxjs';
 import * as i0 from '@angular/core';
 import { Injectable, NgModule } from '@angular/core';
@@ -1443,6 +1443,11 @@ const addClass = (node, nv, sync) => {
     });
 };
 const switchClass = (node, toAdd = '', toRemove = '', sync) => {
+    // After NG15 upgrade ng-invalid class is added even the field is valid, so we are removing the ng-invalid manually
+    const isNgUntouchedValid = node.classList.contains('ng-untouched') && node.classList.contains('ng-valid');
+    if (isNgUntouchedValid && toAdd.includes('ng-untouched') && toAdd.includes('ng-invalid')) {
+        toAdd = toAdd.replace('ng-invalid', '');
+    }
     removeClass(node, toRemove, sync);
     addClass(node, toAdd, sync);
 };
@@ -1756,8 +1761,7 @@ class ASTCompiler {
         }
         const fn = this.build(ast.receiver, stmts);
         const v = this.createVar();
-        const isImplicitReceiver = ast.receiver instanceof ImplicitReceiver;
-        const exp = stmts[stmts.length - 1];
+        const isImplicitReceiver = ast.receiver instanceof ImplicitReceiver || (ast.receiver instanceof PropertyRead && ast.receiver?.receiver instanceof ImplicitReceiver);
         const context = stmts[stmts.length - 1].split('&&')[0].split('=')[1];
         stmts.push(`${v}= ${fn}&&${fn}${isImplicitReceiver ? '.bind(_ctx)' : `.bind(${context})`}(${_args.join(',')})`);
         return v;