@wavemaker/app-ng-runtime 11.15.4-rc.250 → 11.15.5-rc.253

package/core/fesm2022/index.mjs

@@ -1485,7 +1485,9 @@ 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')) {
+    // Detect Angular's initial form state where the field has 'ng-invalid', 'ng-pristine', and 'ng-untouched' before user interaction.
+    const isInitialInvalidState = toAdd.includes('ng-untouched') && toAdd.includes('ng-pristine') && toAdd.includes('ng-invalid');
+    if ((isNgUntouchedValid && toAdd.includes('ng-untouched') && toAdd.includes('ng-invalid')) || isInitialInvalidState) {
         toAdd = toAdd.replace('ng-invalid', '');
     }
     removeClass(node, toRemove, sync);
@@ -3848,10 +3850,14 @@ const triggerItemAction = (scope, item) => {
 const getDatasourceFromExpr = (expr, scope) => {
     const isBoundToVariable = startsWith(expr, 'Variables.');
     const isBoundToWidget = startsWith(expr, 'Widgets.');
+    const isBoundToActivePageVar = startsWith(expr, 'App.activePage.Variables.');
     const parts = expr.split('.');
     if (isBoundToVariable) {
         return get(scope.viewParent.Variables, parts[1]);
     }
+    if (isBoundToActivePageVar) {
+        return get(scope.viewParent?.App?.activePage?.Variables, parts[3]);
+    }
     if (isBoundToWidget) {
         const widgetScope = get(scope.viewParent.Widgets, parts[1]);
         const widgetDatasetBoundExpr = widgetScope.$attrs.get('datasetboundexpr');