@rjsf/utils 6.0.1 → 6.1.0

package/dist/utils.esm.js

@@ -1464,12 +1464,12 @@ function computeDefaultBasedOnSchemaTypeAndDefaults(schema, computedDefault) {
   const shouldReturnNullAsDefault = Array.isArray(type) && type.includes("null") && isEmpty4(computedDefault) && schemaDefault === null;
   return shouldReturnNullAsDefault ? null : computedDefault;
 }
-function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false) {
+function maybeAddDefaultToObject(obj, key, computedDefault, includeUndefinedValues, isParentRequired, requiredFields = [], experimental_defaultFormStateBehavior = {}, isConst = false, isNullType = false) {
   const { emptyObjectFields = "populateAllDefaults" } = experimental_defaultFormStateBehavior;
   if (includeUndefinedValues === true || isConst) {
     obj[key] = computedDefault;
   } else if (includeUndefinedValues === "excludeObjectChildren") {
-    if (!isObject(computedDefault) || !isEmpty4(computedDefault)) {
+    if (isNullType && computedDefault !== void 0 || !isObject(computedDefault) || !isEmpty4(computedDefault)) {
       obj[key] = computedDefault;
     }
   } else if (emptyObjectFields !== "skipDefaults") {
@@ -1695,7 +1695,8 @@ function getObjectDefaults(validator, rawSchema, {
           required,
           retrievedSchema.required,
           experimental_defaultFormStateBehavior,
-          hasConst
+          hasConst,
+          propertySchema?.type === "null"
         );
         return acc;
       },
@@ -1877,6 +1878,9 @@ function getDefaultFormState(validator, theSchema, formData, rootSchema, include
   return defaults;
 }
 
+// src/schema/getDisplayLabel.ts
+import get13 from "lodash/get";
+
 // src/isCustomWidget.ts
 function isCustomWidget(uiSchema = {}) {
   return (
@@ -1908,25 +1912,28 @@ function isFilesArray(validator, schema, uiSchema = {}, rootSchema, experimental
 function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOptions, experimental_customMergeAllOf) {
   const uiOptions = getUiOptions(uiSchema, globalOptions);
   const { label = true } = uiOptions;
-  let displayLabel = !!label;
-  const schemaType = getSchemaType(schema);
-  if (schemaType === "array") {
-    displayLabel = isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || isFilesArray(validator, schema, uiSchema, rootSchema, experimental_customMergeAllOf) || isCustomWidget(uiSchema);
-  }
-  if (schemaType === "object") {
-    displayLabel = false;
-  }
-  if (schemaType === "boolean" && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
-    displayLabel = false;
-  }
-  if (uiSchema && uiSchema[UI_FIELD_KEY]) {
-    displayLabel = false;
+  let displayLabel = Boolean(label);
+  if (displayLabel) {
+    const schemaType = getSchemaType(schema);
+    const addedByAdditionalProperty = get13(schema, ADDITIONAL_PROPERTY_FLAG, false);
+    if (schemaType === "array") {
+      displayLabel = addedByAdditionalProperty || isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) || isFilesArray(validator, schema, uiSchema, rootSchema, experimental_customMergeAllOf) || isCustomWidget(uiSchema);
+    }
+    if (schemaType === "object") {
+      displayLabel = addedByAdditionalProperty;
+    }
+    if (schemaType === "boolean" && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
+      displayLabel = false;
+    }
+    if (uiSchema && uiSchema[UI_FIELD_KEY]) {
+      displayLabel = false;
+    }
   }
   return displayLabel;
 }
 
 // src/schema/sanitizeDataForNewSchema.ts
-import get13 from "lodash/get";
+import get14 from "lodash/get";
 import has5 from "lodash/has";
 var NO_VALUE = Symbol("no Value");
 function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}, experimental_customMergeAllOf) {
@@ -1934,19 +1941,19 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
   if (has5(newSchema, PROPERTIES_KEY)) {
     const removeOldSchemaData = {};
     if (has5(oldSchema, PROPERTIES_KEY)) {
-      const properties = get13(oldSchema, PROPERTIES_KEY, {});
+      const properties = get14(oldSchema, PROPERTIES_KEY, {});
       Object.keys(properties).forEach((key) => {
         if (has5(data, key)) {
           removeOldSchemaData[key] = void 0;
         }
       });
     }
-    const keys2 = Object.keys(get13(newSchema, PROPERTIES_KEY, {}));
+    const keys2 = Object.keys(get14(newSchema, PROPERTIES_KEY, {}));
     const nestedData = {};
     keys2.forEach((key) => {
-      const formValue = get13(data, key);
-      let oldKeyedSchema = get13(oldSchema, [PROPERTIES_KEY, key], {});
-      let newKeyedSchema = get13(newSchema, [PROPERTIES_KEY, key], {});
+      const formValue = get14(data, key);
+      let oldKeyedSchema = get14(oldSchema, [PROPERTIES_KEY, key], {});
+      let newKeyedSchema = get14(newSchema, [PROPERTIES_KEY, key], {});
       if (has5(oldKeyedSchema, REF_KEY)) {
         oldKeyedSchema = retrieveSchema(
           validator,
@@ -1965,8 +1972,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaTypeForKey = get13(oldKeyedSchema, "type");
-      const newSchemaTypeForKey = get13(newKeyedSchema, "type");
+      const oldSchemaTypeForKey = get14(oldKeyedSchema, "type");
+      const newSchemaTypeForKey = get14(newKeyedSchema, "type");
       if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
         if (has5(removeOldSchemaData, key)) {
           delete removeOldSchemaData[key];
@@ -1984,17 +1991,17 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
             nestedData[key] = itemData;
           }
         } else {
-          const newOptionDefault = get13(newKeyedSchema, "default", NO_VALUE);
-          const oldOptionDefault = get13(oldKeyedSchema, "default", NO_VALUE);
+          const newOptionDefault = get14(newKeyedSchema, "default", NO_VALUE);
+          const oldOptionDefault = get14(oldKeyedSchema, "default", NO_VALUE);
           if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
             if (oldOptionDefault === formValue) {
               removeOldSchemaData[key] = newOptionDefault;
-            } else if (get13(newKeyedSchema, "readOnly") === true) {
+            } else if (get14(newKeyedSchema, "readOnly") === true) {
               removeOldSchemaData[key] = void 0;
             }
           }
-          const newOptionConst = get13(newKeyedSchema, "const", NO_VALUE);
-          const oldOptionConst = get13(oldKeyedSchema, "const", NO_VALUE);
+          const newOptionConst = get14(newKeyedSchema, "const", NO_VALUE);
+          const oldOptionConst = get14(oldKeyedSchema, "const", NO_VALUE);
           if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
             removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
           }
@@ -2006,9 +2013,9 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
       ...removeOldSchemaData,
       ...nestedData
     };
-  } else if (get13(oldSchema, "type") === "array" && get13(newSchema, "type") === "array" && Array.isArray(data)) {
-    let oldSchemaItems = get13(oldSchema, "items");
-    let newSchemaItems = get13(newSchema, "items");
+  } else if (get14(oldSchema, "type") === "array" && get14(newSchema, "type") === "array" && Array.isArray(data)) {
+    let oldSchemaItems = get14(oldSchema, "items");
+    let newSchemaItems = get14(newSchema, "items");
     if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
       if (has5(oldSchemaItems, REF_KEY)) {
         oldSchemaItems = retrieveSchema(
@@ -2028,10 +2035,10 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaType = get13(oldSchemaItems, "type");
-      const newSchemaType = get13(newSchemaItems, "type");
+      const oldSchemaType = get14(oldSchemaItems, "type");
+      const newSchemaType = get14(newSchemaItems, "type");
       if (!oldSchemaType || oldSchemaType === newSchemaType) {
-        const maxItems = get13(newSchema, "maxItems", -1);
+        const maxItems = get14(newSchema, "maxItems", -1);
         if (newSchemaType === "object") {
           newFormData = data.reduce((newValue, aValue) => {
             const itemValue = sanitizeDataForNewSchema(
@@ -2059,7 +2066,7 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
 }
 
 // src/schema/toPathSchema.ts
-import get14 from "lodash/get";
+import get15 from "lodash/get";
 import set2 from "lodash/set";
 function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
@@ -2152,7 +2159,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = get14(schema, [PROPERTIES_KEY, property], {});
+      const field = get15(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2160,7 +2167,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
         rootSchema,
         // It's possible that formData is not an object -- this can happen if an
         // array item has just been added, but not populated with data yet
-        get14(formData, [property]),
+        get15(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2173,7 +2180,7 @@ function toPathSchema(validator, schema, name = "", rootSchema, formData, experi
 }
 
 // src/createSchemaUtils.ts
-import get15 from "lodash/get";
+import get16 from "lodash/get";
 var SchemaUtils = class {
   /** Constructs the `SchemaUtils` instance with the given `validator` and `rootSchema` stored as instance variables
    *
@@ -2184,7 +2191,7 @@ var SchemaUtils = class {
    */
   constructor(validator, rootSchema, experimental_defaultFormStateBehavior, experimental_customMergeAllOf) {
     if (rootSchema && rootSchema[SCHEMA_KEY] === JSON_SCHEMA_DRAFT_2020_12) {
-      this.rootSchema = makeAllReferencesAbsolute(rootSchema, get15(rootSchema, ID_KEY, "#"));
+      this.rootSchema = makeAllReferencesAbsolute(rootSchema, get16(rootSchema, ID_KEY, "#"));
     } else {
       this.rootSchema = rootSchema;
     }
@@ -2598,7 +2605,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 import cloneDeep from "lodash/cloneDeep";
-import get16 from "lodash/get";
+import get17 from "lodash/get";
 import set3 from "lodash/set";
 import setWith from "lodash/setWith";
 var ErrorSchemaBuilder = class {
@@ -2627,7 +2634,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? get16(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? get17(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       setWith(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2653,7 +2660,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = get16(errorBlock, ERRORS_KEY);
+    let errorsList = get17(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -2697,7 +2704,7 @@ var ErrorSchemaBuilder = class {
 import keys from "lodash/keys";
 import pickBy from "lodash/pickBy";
 import isPlainObject2 from "lodash/isPlainObject";
-import get17 from "lodash/get";
+import get18 from "lodash/get";
 import difference from "lodash/difference";
 function getChangedFields(a, b) {
   const aIsPlainObject = isPlainObject2(a);
@@ -2710,7 +2717,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return keys(b);
   } else {
-    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get17(b, key))));
+    const unequalFields = keys(pickBy(a, (value, key) => !deepEquals(value, get18(b, key))));
     const diffFields = difference(keys(b), keys(a));
     return [...unequalFields, ...diffFields];
   }
@@ -2824,10 +2831,10 @@ function getTemplate(name, registry, uiOptions = {}) {
 }
 
 // src/getTestIds.ts
-import get18 from "lodash/get";
+import get19 from "lodash/get";
 import uniqueId from "lodash/uniqueId";
 function getTestIds() {
-  if (typeof process === "undefined" || get18(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || get19(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -2847,7 +2854,7 @@ function getTestIds() {
 // src/getWidget.tsx
 import { createElement } from "react";
 import ReactIs from "react-is";
-import get19 from "lodash/get";
+import get20 from "lodash/get";
 import set4 from "lodash/set";
 import { jsx } from "react/jsx-runtime";
 var widgetMap = {
@@ -2903,7 +2910,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = get19(AWidget, "MergedWidget");
+  let MergedWidget = get20(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -3041,14 +3048,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-import get20 from "lodash/get";
+import get21 from "lodash/get";
 import has6 from "lodash/has";
 function lookupFromFormContext(regOrFc, toLookup, fallback) {
   const lookupPath = [LOOKUP_MAP_NAME];
   if (has6(regOrFc, FORM_CONTEXT_NAME)) {
     lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return get20(regOrFc, [...lookupPath, toLookup], fallback);
+  return get21(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3585,7 +3592,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 import forEach from "lodash/forEach";
 
 // src/parser/ParserValidator.ts
-import get21 from "lodash/get";
+import get22 from "lodash/get";
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3611,7 +3618,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = get21(schema, ID_KEY, hash);
+    const key = get22(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {