@rjsf/utils 6.0.1 → 6.1.0

package/dist/index.cjs

@@ -1629,12 +1629,12 @@ function computeDefaultBasedOnSchemaTypeAndDefaults(schema, computedDefault) {
   const shouldReturnNullAsDefault = Array.isArray(type) && type.includes("null") && (0, import_isEmpty4.default)(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) || !(0, import_isEmpty4.default)(computedDefault)) {
+    if (isNullType && computedDefault !== void 0 || !isObject(computedDefault) || !(0, import_isEmpty4.default)(computedDefault)) {
       obj[key] = computedDefault;
     }
   } else if (emptyObjectFields !== "skipDefaults") {
@@ -1860,7 +1860,8 @@ function getObjectDefaults(validator, rawSchema, {
           required,
           retrievedSchema.required,
           experimental_defaultFormStateBehavior,
-          hasConst
+          hasConst,
+          propertySchema?.type === "null"
         );
         return acc;
       },
@@ -2042,6 +2043,9 @@ function getDefaultFormState(validator, theSchema, formData, rootSchema, include
   return defaults;
 }
 
+// src/schema/getDisplayLabel.ts
+var import_get13 = __toESM(require("lodash/get"), 1);
+
 // src/isCustomWidget.ts
 function isCustomWidget(uiSchema = {}) {
   return (
@@ -2073,25 +2077,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 = (0, import_get13.default)(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
-var import_get13 = __toESM(require("lodash/get"), 1);
+var import_get14 = __toESM(require("lodash/get"), 1);
 var import_has5 = __toESM(require("lodash/has"), 1);
 var NO_VALUE = Symbol("no Value");
 function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, data = {}, experimental_customMergeAllOf) {
@@ -2099,19 +2106,19 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
   if ((0, import_has5.default)(newSchema, PROPERTIES_KEY)) {
     const removeOldSchemaData = {};
     if ((0, import_has5.default)(oldSchema, PROPERTIES_KEY)) {
-      const properties = (0, import_get13.default)(oldSchema, PROPERTIES_KEY, {});
+      const properties = (0, import_get14.default)(oldSchema, PROPERTIES_KEY, {});
       Object.keys(properties).forEach((key) => {
         if ((0, import_has5.default)(data, key)) {
           removeOldSchemaData[key] = void 0;
         }
       });
     }
-    const keys2 = Object.keys((0, import_get13.default)(newSchema, PROPERTIES_KEY, {}));
+    const keys2 = Object.keys((0, import_get14.default)(newSchema, PROPERTIES_KEY, {}));
     const nestedData = {};
     keys2.forEach((key) => {
-      const formValue = (0, import_get13.default)(data, key);
-      let oldKeyedSchema = (0, import_get13.default)(oldSchema, [PROPERTIES_KEY, key], {});
-      let newKeyedSchema = (0, import_get13.default)(newSchema, [PROPERTIES_KEY, key], {});
+      const formValue = (0, import_get14.default)(data, key);
+      let oldKeyedSchema = (0, import_get14.default)(oldSchema, [PROPERTIES_KEY, key], {});
+      let newKeyedSchema = (0, import_get14.default)(newSchema, [PROPERTIES_KEY, key], {});
       if ((0, import_has5.default)(oldKeyedSchema, REF_KEY)) {
         oldKeyedSchema = retrieveSchema(
           validator,
@@ -2130,8 +2137,8 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaTypeForKey = (0, import_get13.default)(oldKeyedSchema, "type");
-      const newSchemaTypeForKey = (0, import_get13.default)(newKeyedSchema, "type");
+      const oldSchemaTypeForKey = (0, import_get14.default)(oldKeyedSchema, "type");
+      const newSchemaTypeForKey = (0, import_get14.default)(newKeyedSchema, "type");
       if (!oldSchemaTypeForKey || oldSchemaTypeForKey === newSchemaTypeForKey) {
         if ((0, import_has5.default)(removeOldSchemaData, key)) {
           delete removeOldSchemaData[key];
@@ -2149,17 +2156,17 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
             nestedData[key] = itemData;
           }
         } else {
-          const newOptionDefault = (0, import_get13.default)(newKeyedSchema, "default", NO_VALUE);
-          const oldOptionDefault = (0, import_get13.default)(oldKeyedSchema, "default", NO_VALUE);
+          const newOptionDefault = (0, import_get14.default)(newKeyedSchema, "default", NO_VALUE);
+          const oldOptionDefault = (0, import_get14.default)(oldKeyedSchema, "default", NO_VALUE);
           if (newOptionDefault !== NO_VALUE && newOptionDefault !== formValue) {
             if (oldOptionDefault === formValue) {
               removeOldSchemaData[key] = newOptionDefault;
-            } else if ((0, import_get13.default)(newKeyedSchema, "readOnly") === true) {
+            } else if ((0, import_get14.default)(newKeyedSchema, "readOnly") === true) {
               removeOldSchemaData[key] = void 0;
             }
           }
-          const newOptionConst = (0, import_get13.default)(newKeyedSchema, "const", NO_VALUE);
-          const oldOptionConst = (0, import_get13.default)(oldKeyedSchema, "const", NO_VALUE);
+          const newOptionConst = (0, import_get14.default)(newKeyedSchema, "const", NO_VALUE);
+          const oldOptionConst = (0, import_get14.default)(oldKeyedSchema, "const", NO_VALUE);
           if (newOptionConst !== NO_VALUE && newOptionConst !== formValue) {
             removeOldSchemaData[key] = oldOptionConst === formValue ? newOptionConst : void 0;
           }
@@ -2171,9 +2178,9 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
       ...removeOldSchemaData,
       ...nestedData
     };
-  } else if ((0, import_get13.default)(oldSchema, "type") === "array" && (0, import_get13.default)(newSchema, "type") === "array" && Array.isArray(data)) {
-    let oldSchemaItems = (0, import_get13.default)(oldSchema, "items");
-    let newSchemaItems = (0, import_get13.default)(newSchema, "items");
+  } else if ((0, import_get14.default)(oldSchema, "type") === "array" && (0, import_get14.default)(newSchema, "type") === "array" && Array.isArray(data)) {
+    let oldSchemaItems = (0, import_get14.default)(oldSchema, "items");
+    let newSchemaItems = (0, import_get14.default)(newSchema, "items");
     if (typeof oldSchemaItems === "object" && typeof newSchemaItems === "object" && !Array.isArray(oldSchemaItems) && !Array.isArray(newSchemaItems)) {
       if ((0, import_has5.default)(oldSchemaItems, REF_KEY)) {
         oldSchemaItems = retrieveSchema(
@@ -2193,10 +2200,10 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
           experimental_customMergeAllOf
         );
       }
-      const oldSchemaType = (0, import_get13.default)(oldSchemaItems, "type");
-      const newSchemaType = (0, import_get13.default)(newSchemaItems, "type");
+      const oldSchemaType = (0, import_get14.default)(oldSchemaItems, "type");
+      const newSchemaType = (0, import_get14.default)(newSchemaItems, "type");
       if (!oldSchemaType || oldSchemaType === newSchemaType) {
-        const maxItems = (0, import_get13.default)(newSchema, "maxItems", -1);
+        const maxItems = (0, import_get14.default)(newSchema, "maxItems", -1);
         if (newSchemaType === "object") {
           newFormData = data.reduce((newValue, aValue) => {
             const itemValue = sanitizeDataForNewSchema(
@@ -2224,7 +2231,7 @@ function sanitizeDataForNewSchema(validator, rootSchema, newSchema, oldSchema, d
 }
 
 // src/schema/toPathSchema.ts
-var import_get14 = __toESM(require("lodash/get"), 1);
+var import_get15 = __toESM(require("lodash/get"), 1);
 var import_set2 = __toESM(require("lodash/set"), 1);
 function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _recurseList = [], experimental_customMergeAllOf) {
   if (REF_KEY in schema || DEPENDENCIES_KEY in schema || ALL_OF_KEY in schema) {
@@ -2317,7 +2324,7 @@ function toPathSchemaInternal(validator, schema, name, rootSchema, formData, _re
     }
   } else if (PROPERTIES_KEY in schema) {
     for (const property in schema.properties) {
-      const field = (0, import_get14.default)(schema, [PROPERTIES_KEY, property], {});
+      const field = (0, import_get15.default)(schema, [PROPERTIES_KEY, property], {});
       pathSchema[property] = toPathSchemaInternal(
         validator,
         field,
@@ -2325,7 +2332,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
-        (0, import_get14.default)(formData, [property]),
+        (0, import_get15.default)(formData, [property]),
         _recurseList,
         experimental_customMergeAllOf
       );
@@ -2338,7 +2345,7 @@ function toPathSchema(validator, schema, name = "", rootSchema, formData, experi
 }
 
 // src/createSchemaUtils.ts
-var import_get15 = __toESM(require("lodash/get"), 1);
+var import_get16 = __toESM(require("lodash/get"), 1);
 var SchemaUtils = class {
   /** Constructs the `SchemaUtils` instance with the given `validator` and `rootSchema` stored as instance variables
    *
@@ -2349,7 +2356,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, (0, import_get15.default)(rootSchema, ID_KEY, "#"));
+      this.rootSchema = makeAllReferencesAbsolute(rootSchema, (0, import_get16.default)(rootSchema, ID_KEY, "#"));
     } else {
       this.rootSchema = rootSchema;
     }
@@ -2763,7 +2770,7 @@ function enumOptionsSelectValue(valueIndex, selected, allEnumOptions = []) {
 
 // src/ErrorSchemaBuilder.ts
 var import_cloneDeep = __toESM(require("lodash/cloneDeep"), 1);
-var import_get16 = __toESM(require("lodash/get"), 1);
+var import_get17 = __toESM(require("lodash/get"), 1);
 var import_set3 = __toESM(require("lodash/set"), 1);
 var import_setWith = __toESM(require("lodash/setWith"), 1);
 var ErrorSchemaBuilder = class {
@@ -2792,7 +2799,7 @@ var ErrorSchemaBuilder = class {
    */
   getOrCreateErrorBlock(pathOfError) {
     const hasPath = Array.isArray(pathOfError) && pathOfError.length > 0 || typeof pathOfError === "string";
-    let errorBlock = hasPath ? (0, import_get16.default)(this.errorSchema, pathOfError) : this.errorSchema;
+    let errorBlock = hasPath ? (0, import_get17.default)(this.errorSchema, pathOfError) : this.errorSchema;
     if (!errorBlock && pathOfError) {
       errorBlock = {};
       (0, import_setWith.default)(this.errorSchema, pathOfError, errorBlock, Object);
@@ -2818,7 +2825,7 @@ var ErrorSchemaBuilder = class {
    */
   addErrors(errorOrList, pathOfError) {
     const errorBlock = this.getOrCreateErrorBlock(pathOfError);
-    let errorsList = (0, import_get16.default)(errorBlock, ERRORS_KEY);
+    let errorsList = (0, import_get17.default)(errorBlock, ERRORS_KEY);
     if (!Array.isArray(errorsList)) {
       errorsList = [];
       errorBlock[ERRORS_KEY] = errorsList;
@@ -2862,7 +2869,7 @@ var ErrorSchemaBuilder = class {
 var import_keys = __toESM(require("lodash/keys"), 1);
 var import_pickBy = __toESM(require("lodash/pickBy"), 1);
 var import_isPlainObject2 = __toESM(require("lodash/isPlainObject"), 1);
-var import_get17 = __toESM(require("lodash/get"), 1);
+var import_get18 = __toESM(require("lodash/get"), 1);
 var import_difference = __toESM(require("lodash/difference"), 1);
 function getChangedFields(a, b) {
   const aIsPlainObject = (0, import_isPlainObject2.default)(a);
@@ -2875,7 +2882,7 @@ function getChangedFields(a, b) {
   } else if (!aIsPlainObject && bIsPlainObject) {
     return (0, import_keys.default)(b);
   } else {
-    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get17.default)(b, key))));
+    const unequalFields = (0, import_keys.default)((0, import_pickBy.default)(a, (value, key) => !deepEquals(value, (0, import_get18.default)(b, key))));
     const diffFields = (0, import_difference.default)((0, import_keys.default)(b), (0, import_keys.default)(a));
     return [...unequalFields, ...diffFields];
   }
@@ -2989,10 +2996,10 @@ function getTemplate(name, registry, uiOptions = {}) {
 }
 
 // src/getTestIds.ts
-var import_get18 = __toESM(require("lodash/get"), 1);
+var import_get19 = __toESM(require("lodash/get"), 1);
 var import_uniqueId = __toESM(require("lodash/uniqueId"), 1);
 function getTestIds() {
-  if (typeof process === "undefined" || (0, import_get18.default)(process, "env.NODE_ENV") !== "test") {
+  if (typeof process === "undefined" || (0, import_get19.default)(process, "env.NODE_ENV") !== "test") {
     return {};
   }
   const ids = /* @__PURE__ */ new Map();
@@ -3012,7 +3019,7 @@ function getTestIds() {
 // src/getWidget.tsx
 var import_react = require("react");
 var import_react_is = __toESM(require("react-is"), 1);
-var import_get19 = __toESM(require("lodash/get"), 1);
+var import_get20 = __toESM(require("lodash/get"), 1);
 var import_set4 = __toESM(require("lodash/set"), 1);
 var import_jsx_runtime = require("react/jsx-runtime");
 var widgetMap = {
@@ -3068,7 +3075,7 @@ var widgetMap = {
   }
 };
 function mergeWidgetOptions(AWidget) {
-  let MergedWidget = (0, import_get19.default)(AWidget, "MergedWidget");
+  let MergedWidget = (0, import_get20.default)(AWidget, "MergedWidget");
   if (!MergedWidget) {
     const defaultOptions = AWidget.defaultProps && AWidget.defaultProps.options || {};
     MergedWidget = ({ options, ...props }) => {
@@ -3206,14 +3213,14 @@ function localToUTC(dateString) {
 }
 
 // src/lookupFromFormContext.ts
-var import_get20 = __toESM(require("lodash/get"), 1);
+var import_get21 = __toESM(require("lodash/get"), 1);
 var import_has6 = __toESM(require("lodash/has"), 1);
 function lookupFromFormContext(regOrFc, toLookup, fallback) {
   const lookupPath = [LOOKUP_MAP_NAME];
   if ((0, import_has6.default)(regOrFc, FORM_CONTEXT_NAME)) {
     lookupPath.unshift(FORM_CONTEXT_NAME);
   }
-  return (0, import_get20.default)(regOrFc, [...lookupPath, toLookup], fallback);
+  return (0, import_get21.default)(regOrFc, [...lookupPath, toLookup], fallback);
 }
 
 // src/orderProperties.ts
@@ -3750,7 +3757,7 @@ var TranslatableString = /* @__PURE__ */ ((TranslatableString2) => {
 var import_forEach = __toESM(require("lodash/forEach"), 1);
 
 // src/parser/ParserValidator.ts
-var import_get21 = __toESM(require("lodash/get"), 1);
+var import_get22 = __toESM(require("lodash/get"), 1);
 var ParserValidator = class {
   /** Construct the ParserValidator for the given `rootSchema`. This `rootSchema` will be stashed in the `schemaMap`
    * first.
@@ -3776,7 +3783,7 @@ var ParserValidator = class {
    * @param hash - The hash value at which to map the schema
    */
   addSchema(schema, hash) {
-    const key = (0, import_get21.default)(schema, ID_KEY, hash);
+    const key = (0, import_get22.default)(schema, ID_KEY, hash);
     const identifiedSchema = { ...schema, [ID_KEY]: key };
     const existing = this.schemaMap[key];
     if (!existing) {