@rjsf/utils 5.24.7 → 5.24.9
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 +4 -4
- package/dist/index.js.map +2 -2
- package/dist/utils.esm.js +4 -4
- package/dist/utils.esm.js.map +2 -2
- package/dist/utils.umd.js +4 -4
- package/lib/schema/getDefaultFormState.js +8 -4
- package/lib/schema/getDefaultFormState.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/schema/getDefaultFormState.ts +8 -4
package/dist/index.js
CHANGED
|
@@ -1325,7 +1325,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1325
1325
|
defaults = schema[CONST_KEY];
|
|
1326
1326
|
} else if (isObject(defaults) && isObject(schema.default)) {
|
|
1327
1327
|
defaults = mergeObjects(defaults, schema.default);
|
|
1328
|
-
} else if (DEFAULT_KEY in schema) {
|
|
1328
|
+
} else if (DEFAULT_KEY in schema && !schema[ANY_OF_KEY] && !schema[ONE_OF_KEY]) {
|
|
1329
1329
|
defaults = schema.default;
|
|
1330
1330
|
} else if (REF_KEY in schema) {
|
|
1331
1331
|
const refName = schema[REF_KEY];
|
|
@@ -1378,7 +1378,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1378
1378
|
schemaToCompute = oneOf[getClosestMatchingOption(
|
|
1379
1379
|
validator,
|
|
1380
1380
|
rootSchema,
|
|
1381
|
-
rawFormData,
|
|
1381
|
+
rawFormData ?? schema.default,
|
|
1382
1382
|
oneOf,
|
|
1383
1383
|
0,
|
|
1384
1384
|
discriminator,
|
|
@@ -1394,7 +1394,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1394
1394
|
schemaToCompute = anyOf[getClosestMatchingOption(
|
|
1395
1395
|
validator,
|
|
1396
1396
|
rootSchema,
|
|
1397
|
-
rawFormData,
|
|
1397
|
+
rawFormData ?? schema.default,
|
|
1398
1398
|
anyOf,
|
|
1399
1399
|
0,
|
|
1400
1400
|
discriminator,
|
|
@@ -1431,7 +1431,7 @@ function computeDefaults(validator, rawSchema, computeDefaultsProps = {}) {
|
|
|
1431
1431
|
experimental_defaultFormStateBehavior,
|
|
1432
1432
|
experimental_customMergeAllOf
|
|
1433
1433
|
);
|
|
1434
|
-
if (!isObject(rawFormData)) {
|
|
1434
|
+
if (!isObject(rawFormData) || ALL_OF_KEY in schema) {
|
|
1435
1435
|
defaultsWithFormData = mergeDefaultsWithFormData(
|
|
1436
1436
|
defaultsWithFormData,
|
|
1437
1437
|
matchingFormData,
|