@rjsf/core 5.12.0 → 5.12.1
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/core.umd.js +1 -1
- package/dist/index.esm.js +1 -1
- package/dist/index.esm.js.map +2 -2
- package/dist/index.js +1 -1
- package/dist/index.js.map +2 -2
- package/lib/components/fields/MultiSchemaField.js +2 -1
- package/lib/components/fields/MultiSchemaField.js.map +1 -1
- package/package.json +5 -5
- package/src/components/fields/MultiSchemaField.tsx +2 -1
|
@@ -109,7 +109,8 @@ class AnyOfField extends Component {
|
|
|
109
109
|
const option = selectedOption >= 0 ? retrievedOptions[selectedOption] || null : null;
|
|
110
110
|
let optionSchema;
|
|
111
111
|
if (option) {
|
|
112
|
-
|
|
112
|
+
// merge all top level fields except properties
|
|
113
|
+
const { oneOf, anyOf, properties } = schema, remaining = __rest(schema, ["oneOf", "anyOf", "properties"]);
|
|
113
114
|
// Merge in all the non-oneOf/anyOf properties and also skip the special ADDITIONAL_PROPERTY_FLAG property
|
|
114
115
|
unset(remaining, ADDITIONAL_PROPERTY_FLAG);
|
|
115
116
|
optionSchema = !isEmpty(remaining) ? mergeSchemas(remaining, option) : option;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiSchemaField.js","sourceRoot":"","sources":["../../../src/components/fields/MultiSchemaField.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,EACL,wBAAwB,EACxB,UAAU,EACV,UAAU,EAGV,+BAA+B,EAC/B,YAAY,EACZ,SAAS,EACT,YAAY,EAGZ,kBAAkB,GACnB,MAAM,aAAa,CAAC;AAUrB;;;;GAIG;AACH,MAAM,UAA8F,SAAQ,SAG3G;IACC;;;OAGG;IACH,YAAY,KAA0B;QACpC,KAAK,CAAC,KAAK,CAAC,CAAC;QAgEf;;;;;WAKG;QACH,mBAAc,GAAG,CAAC,MAAe,EAAE,EAAE;YACnC,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACxD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACpD,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;YACjC,MAAM,SAAS,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnE,IAAI,SAAS,KAAK,cAAc,EAAE;gBAChC,OAAO;aACR;YACD,MAAM,SAAS,GAAG,SAAS,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3E,MAAM,SAAS,GAAG,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAErF,IAAI,WAAW,GAAG,WAAW,CAAC,wBAAwB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YACvF,IAAI,WAAW,IAAI,SAAS,EAAE;gBAC5B,uGAAuG;gBACvG,oGAAoG;gBACpG,WAAW,GAAG,WAAW,CAAC,mBAAmB,CAAC,SAAS,EAAE,WAAW,EAAE,uBAAuB,CAAM,CAAC;aACrG;YACD,QAAQ,CAAC,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;YAEpD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;QAC/C,CAAC,CAAC;QAxFA,MAAM,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,EAAE,EAAE,WAAW,EAAE,GAC1B,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,sFAAsF;QACtF,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAM,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE5F,IAAI,CAAC,KAAK,GAAG;YACX,gBAAgB;YAChB,cAAc,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,CAAC;SACtE,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,kBAAkB,CAAC,SAAwC,EAAE,SAAoC;QAC/F,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACnD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;YAC3C,MAAM,EACJ,QAAQ,EAAE,EAAE,WAAW,EAAE,GAC1B,GAAG,IAAI,CAAC,KAAK,CAAC;YACf,yFAAyF;YACzF,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAM,EAAE,EAAE,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC5F,QAAQ,GAAG,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC;SACjD;QACD,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE;YACxF,MAAM,EAAE,gBAAgB,EAAE,GAAG,QAAQ,CAAC;YACtC,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;YAE1F,IAAI,SAAS,IAAI,cAAc,KAAK,cAAc,EAAE;gBAClD,QAAQ,GAAG,EAAE,cAAc,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC;aACjE;SACF;QACD,IAAI,QAAQ,KAAK,IAAI,CAAC,KAAK,EAAE;YAC3B,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACzB;IACH,CAAC;IAED;;;;;OAKG;IACH,iBAAiB,CAAC,cAAsB,EAAE,QAAuB,EAAE,OAAY;QAC7E,MAAM,EACJ,MAAM,EACN,QAAQ,EAAE,EAAE,WAAW,EAAE,GAC1B,GAAG,IAAI,CAAC,KAAK,CAAC;QAEf,MAAM,aAAa,GAAG,+BAA+B,CAAI,MAAM,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,WAAW,CAAC,wBAAwB,CAAC,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;QACtG,OAAO,MAAM,CAAC;IAChB,CAAC;IA8BD,UAAU;QACR,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACxC,OAAO,GAAG,QAAQ,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChF,CAAC;IAED;OACG;IACH,MAAM;QACJ,MAAM,EACJ,IAAI,EACJ,QAAQ,GAAG,KAAK,EAChB,WAAW,GAAG,EAAE,EAChB,WAAW,EACX,MAAM,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,QAAQ,GACT,GAAG,IAAI,CAAC,KAAK,CAAC;QAEf,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QACpF,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QAC7C,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACxD,MAAM,KAOF,YAAY,CAAU,QAAQ,EAAE,eAAe,CAAC,EAP9C,EACJ,MAAM,GAAG,QAAQ,EACjB,WAAW,EACX,SAAS,EACT,YAAY,EACZ,KAAK,GAAG,MAAM,CAAC,KAAK,OAE8B,EAD/C,SAAS,cANR,+DAOL,CAAmD,CAAC;QACrD,MAAM,MAAM,GAAG,SAAS,CAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,WAAW,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QAEpF,MAAM,MAAM,GAAG,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACrF,IAAI,YAAe,CAAC;QAEpB,IAAI,MAAM,EAAE;YACV,MAAM,EAAE,KAAK,EAAE,KAAK,KAAmB,MAAM,EAApB,SAAS,UAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"MultiSchemaField.js","sourceRoot":"","sources":["../../../src/components/fields/MultiSchemaField.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rjsf/core",
|
|
3
|
-
"version": "5.12.
|
|
3
|
+
"version": "5.12.1",
|
|
4
4
|
"description": "A simple React component capable of building HTML forms out of a JSON schema.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build:ts": "rimraf lib && tsc",
|
|
@@ -55,9 +55,9 @@
|
|
|
55
55
|
"@babel/preset-env": "^7.22.9",
|
|
56
56
|
"@babel/preset-react": "^7.22.5",
|
|
57
57
|
"@babel/preset-typescript": "^7.22.5",
|
|
58
|
-
"@rjsf/utils": "^5.12.
|
|
59
|
-
"@rjsf/validator-ajv6": "^5.12.
|
|
60
|
-
"@rjsf/validator-ajv8": "^5.12.
|
|
58
|
+
"@rjsf/utils": "^5.12.1",
|
|
59
|
+
"@rjsf/validator-ajv6": "^5.12.1",
|
|
60
|
+
"@rjsf/validator-ajv8": "^5.12.1",
|
|
61
61
|
"@types/lodash": "^4.14.196",
|
|
62
62
|
"@types/react": "^17.0.62",
|
|
63
63
|
"@types/react-dom": "^17.0.20",
|
|
@@ -103,5 +103,5 @@
|
|
|
103
103
|
"publishConfig": {
|
|
104
104
|
"access": "public"
|
|
105
105
|
},
|
|
106
|
-
"gitHead": "
|
|
106
|
+
"gitHead": "de6477730fd16a07def501c2cb761af9c3f4c247"
|
|
107
107
|
}
|
|
@@ -172,7 +172,8 @@ class AnyOfField<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends For
|
|
|
172
172
|
let optionSchema: S;
|
|
173
173
|
|
|
174
174
|
if (option) {
|
|
175
|
-
|
|
175
|
+
// merge all top level fields except properties
|
|
176
|
+
const { oneOf, anyOf, properties, ...remaining } = schema;
|
|
176
177
|
// Merge in all the non-oneOf/anyOf properties and also skip the special ADDITIONAL_PROPERTY_FLAG property
|
|
177
178
|
unset(remaining, ADDITIONAL_PROPERTY_FLAG);
|
|
178
179
|
optionSchema = !isEmpty(remaining) ? (mergeSchemas(remaining, option) as S) : option;
|