@rjsf/utils 5.24.9 → 5.24.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +8 -2
- package/dist/index.js.map +2 -2
- package/dist/utils.esm.js +8 -2
- package/dist/utils.esm.js.map +2 -2
- package/dist/utils.umd.js +8 -2
- package/lib/schema/getDefaultFormState.js +13 -2
- package/lib/schema/getDefaultFormState.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -29
- package/src/schema/getDefaultFormState.ts +15 -3
package/dist/utils.esm.js
CHANGED
|
@@ -1177,13 +1177,13 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1177
1177
|
required,
|
|
1178
1178
|
shouldMergeDefaultsIntoFormData = false
|
|
1179
1179
|
} = computeDefaultsProps;
|
|
1180
|
-
|
|
1180
|
+
let formData = isObject(rawFormData) ? rawFormData : {};
|
|
1181
1181
|
const schema = isObject(rawSchema) ? rawSchema : {};
|
|
1182
1182
|
let defaults = parentDefaults;
|
|
1183
1183
|
let schemaToCompute = null;
|
|
1184
1184
|
let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
|
|
1185
1185
|
let updatedRecurseList = _recurseList;
|
|
1186
|
-
if (schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
|
|
1186
|
+
if (schema[CONST_KEY] !== void 0 && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
|
|
1187
1187
|
defaults = schema[CONST_KEY];
|
|
1188
1188
|
} else if (isObject(defaults) && isObject(schema.default)) {
|
|
1189
1189
|
defaults = mergeObjects(defaults, schema.default);
|
|
@@ -1195,6 +1195,12 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1195
1195
|
updatedRecurseList = _recurseList.concat(refName);
|
|
1196
1196
|
schemaToCompute = findSchemaDefinition(refName, rootSchema);
|
|
1197
1197
|
}
|
|
1198
|
+
if (schemaToCompute && !defaults) {
|
|
1199
|
+
defaults = schema.default;
|
|
1200
|
+
}
|
|
1201
|
+
if (shouldMergeDefaultsIntoFormData && schemaToCompute && !isObject(rawFormData)) {
|
|
1202
|
+
formData = rawFormData;
|
|
1203
|
+
}
|
|
1198
1204
|
} else if (DEPENDENCIES_KEY in schema) {
|
|
1199
1205
|
const defaultFormData = {
|
|
1200
1206
|
...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults),
|