@rjsf/utils 5.0.0-beta.12 → 5.0.0-beta.14

package/dist/utils.umd.development.js

@@ -405,7 +405,9 @@
    *
    * @param obj1 - The first object to merge
    * @param obj2 - The second object to merge
-   * @param [concatArrays=false] - Optional flag that, when true, will cause arrays to be concatenated
+   * @param [concatArrays=false] - Optional flag that, when true, will cause arrays to be concatenated. Use
+   *          "preventDuplicates" to merge arrays in a manner that prevents any duplicate entries from being merged.
+   *          NOTE: Uses shallow comparison for the duplicate checking.
    * @returns - A new object that is the merge of the two given objects
    */
   function mergeObjects(obj1, obj2, concatArrays) {
@@ -418,7 +420,16 @@
       if (obj1 && key in obj1 && isObject(right)) {
         acc[key] = mergeObjects(left, right, concatArrays);
       } else if (concatArrays && Array.isArray(left) && Array.isArray(right)) {
-        acc[key] = left.concat(right);
+        let toMerge = right;
+        if (concatArrays === "preventDuplicates") {
+          toMerge = right.reduce((result, value) => {
+            if (!left.includes(value)) {
+              result.push(value);
+            }
+            return result;
+          }, []);
+        }
+        acc[key] = left.concat(toMerge);
       } else {
         acc[key] = right;
       }
@@ -878,7 +889,9 @@
    * @param [parentDefaults] - Any defaults provided by the parent field in the schema
    * @param [rootSchema] - The options root schema, used to primarily to look up `$ref`s
    * @param [rawFormData] - The current formData, if any, onto which to provide any missing defaults
-   * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults
+   * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults.
+   *          If "excludeObjectChildren", pass `includeUndefinedValues` as false when computing defaults for any nested
+   *          object properties.
    * @returns - The resulting `formData` with all the defaults provided
    */
   function computeDefaults(validator, schema, parentDefaults, rootSchema, rawFormData, includeUndefinedValues) {
@@ -921,8 +934,16 @@
         return Object.keys(schema.properties || {}).reduce((acc, key) => {
           // Compute the defaults for this node, with the parent defaults we might
           // have from a previous run: defaults[key].
-          const computedDefault = computeDefaults(validator, get__default["default"](schema, [PROPERTIES_KEY, key]), get__default["default"](defaults, [key]), rootSchema, get__default["default"](formData, [key]), includeUndefinedValues);
-          if (includeUndefinedValues || computedDefault !== undefined) {
+          const computedDefault = computeDefaults(validator, get__default["default"](schema, [PROPERTIES_KEY, key]), get__default["default"](defaults, [key]), rootSchema, get__default["default"](formData, [key]), includeUndefinedValues === "excludeObjectChildren" ? false : includeUndefinedValues);
+          if (includeUndefinedValues) {
+            acc[key] = computedDefault;
+          } else if (isObject(computedDefault)) {
+            // Store computedDefault if it's a non-empty object (e.g. not {})
+            if (!isEmpty__default["default"](computedDefault)) {
+              acc[key] = computedDefault;
+            }
+          } else if (computedDefault !== undefined) {
+            // Store computedDefault if it's a defined primitive (e.g. true)
             acc[key] = computedDefault;
           }
           return acc;
@@ -967,7 +988,9 @@
    * @param theSchema - The schema for which the default state is desired
    * @param [formData] - The current formData, if any, onto which to provide any missing defaults
    * @param [rootSchema] - The root schema, used to primarily to look up `$ref`s
-   * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults
+   * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults.
+   *          If "excludeObjectChildren", pass `includeUndefinedValues` as false when computing defaults for any nested
+   *          object properties.
    * @returns - The resulting `formData` with all the defaults provided
    */
   function getDefaultFormState(validator, theSchema, formData, rootSchema, includeUndefinedValues) {
@@ -1218,7 +1241,9 @@
      *
      * @param schema - The schema for which the default state is desired
      * @param [formData] - The current formData, if any, onto which to provide any missing defaults
-     * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults
+     * @param [includeUndefinedValues=false] - Optional flag, if true, cause undefined values to be added as defaults.
+     *          If "excludeObjectChildren", pass `includeUndefinedValues` as false when computing defaults for any nested
+     *          object properties.
      * @returns - The resulting `formData` with all the defaults provided
      */
     getDefaultFormState(schema, formData, includeUndefinedValues) {