fix(core/forms): add null check before reset value

gnucoop · Feb 13, 2023 · 7b64348 · 7b64348
1 parent 13ac67e
commit 7b64348
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/projects/core/forms/src/form-renderer.ts b/projects/core/forms/src/form-renderer.ts
@@ -1477,7 +1477,9 @@ const updateVisibilityMapEntry = (
         if (s && !s.closed) {
           s.unsubscribe();
         }
-        fg.controls[completeName].setValue(null);
+        if (fg.controls != null && fg.controls[completeName] != null) {
+          fg.controls[completeName].setValue(null);
+        }
       });
     }
     if (isField) {
@@ -1486,7 +1488,7 @@ const updateVisibilityMapEntry = (
   } else if (visibilityChanged && nodeInstance.visible && isField) {
     const fg = formGroup.getValue();
     const res = updateFormula(nodeInstance, newFormValue);
-    if (fg != null && res.changed) {
+    if (fg != null && res.changed && fg.controls != null && fg.controls[completeName] != null) {
       fg.controls[completeName].setValue(res.value);
     }
   }