@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/index.js
CHANGED
|
@@ -1315,13 +1315,13 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1315
1315
|
required,
|
|
1316
1316
|
shouldMergeDefaultsIntoFormData = false
|
|
1317
1317
|
} = computeDefaultsProps;
|
|
1318
|
-
|
|
1318
|
+
let formData = isObject(rawFormData) ? rawFormData : {};
|
|
1319
1319
|
const schema = isObject(rawSchema) ? rawSchema : {};
|
|
1320
1320
|
let defaults = parentDefaults;
|
|
1321
1321
|
let schemaToCompute = null;
|
|
1322
1322
|
let experimental_dfsb_to_compute = experimental_defaultFormStateBehavior;
|
|
1323
1323
|
let updatedRecurseList = _recurseList;
|
|
1324
|
-
if (schema[CONST_KEY] && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
|
|
1324
|
+
if (schema[CONST_KEY] !== void 0 && experimental_defaultFormStateBehavior?.constAsDefaults !== "never" && !constIsAjvDataReference(schema)) {
|
|
1325
1325
|
defaults = schema[CONST_KEY];
|
|
1326
1326
|
} else if (isObject(defaults) && isObject(schema.default)) {
|
|
1327
1327
|
defaults = mergeObjects(defaults, schema.default);
|
|
@@ -1333,6 +1333,12 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1333
1333
|
updatedRecurseList = _recurseList.concat(refName);
|
|
1334
1334
|
schemaToCompute = findSchemaDefinition(refName, rootSchema);
|
|
1335
1335
|
}
|
|
1336
|
+
if (schemaToCompute && !defaults) {
|
|
1337
|
+
defaults = schema.default;
|
|
1338
|
+
}
|
|
1339
|
+
if (shouldMergeDefaultsIntoFormData && schemaToCompute && !isObject(rawFormData)) {
|
|
1340
|
+
formData = rawFormData;
|
|
1341
|
+
}
|
|
1336
1342
|
} else if (DEPENDENCIES_KEY in schema) {
|
|
1337
1343
|
const defaultFormData = {
|
|
1338
1344
|
...getDefaultBasedOnSchemaType(validator, schema, computeDefaultsProps, defaults),
|