Preserve fieldset nested fields visibility

Author: danielcardoso5

src/helpers.js

@@ -213,6 +213,46 @@ export function getPrefillValues(fields, initialValues = {}) {
   return initialValues;
 }
 
+/**
+ * Preserves the visibility of nested fields in a fieldset
+ * @param {Object} field - field object
+ * @param {String} parentPath - path to the parent field
+ * @returns {Object} - object with a map of the visibility of the nested fields, e.g. { 'parent.child': true }
+ */
+function preserveNestedFieldsVisibility(field, parentPath = '') {
+  return field.fields?.reduce?.((acc, f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    if (!isNil(f.isVisible)) {
+      acc[path] = f.isVisible;
+    }
+
+    if (f.fields) {
+      Object.assign(acc, preserveNestedFieldsVisibility(f, path));
+    }
+    return acc;
+  }, {});
+}
+
+/**
+ * Restores the visibility of nested fields in a fieldset
+ * @param {Object} field - field object
+ * @param {Object} nestedFieldsVisibility - object with a map of the visibility of the nested fields, e.g. { 'parent.child': true }
+ * @param {String} parentPath - path to the parent field
+ */
+function restoreNestedFieldsVisibility(field, nestedFieldsVisibility, parentPath = '') {
+  field.fields.forEach((f) => {
+    const path = parentPath ? `${parentPath}.${f.name}` : f.name;
+    const visibility = get(nestedFieldsVisibility, path);
+    if (!isNil(visibility)) {
+      f.isVisible = visibility;
+    }
+
+    if (f.fields) {
+      restoreNestedFieldsVisibility(f, nestedFieldsVisibility, path);
+    }
+  });
+}
+
 /**
  * Updates field properties based on the current JSON-schema node and the required fields
  *
@@ -243,10 +283,22 @@ function updateField(field, requiredFields, node, formValues, logic, config) {
     field.isVisible = true;
   }
 
+  // Store current visibility of fields within a fieldset before updating its attributes
+  const nestedFieldsVisibility = preserveNestedFieldsVisibility(field);
+
   const updateAttributes = (fieldAttrs) => {
     Object.entries(fieldAttrs).forEach(([key, value]) => {
       field[key] = value;
 
+      // If the field is a fieldset, restore the visibility of the fields within it.
+      // If this is not in place, calling updateField for multiple conditionals touching
+      // the same fieldset will unset previously calculated visibility for the nested fields.
+      // This is because rebuildFieldset is called via a calculateConditionalProperties closure
+      // created at the time of building the fields, and it returns a new fieldset.fields array
+      if (key === 'fields' && !isNil(nestedFieldsVisibility)) {
+        restoreNestedFieldsVisibility(field, nestedFieldsVisibility);
+      }
+
       if (key === 'schema' && typeof value === 'function') {
         // key "schema" refers to YupSchema that needs to be processed for validations.
         field[key] = value();