@rjsf/core 5.0.0-beta.10 → 5.0.0-beta.11

package/dist/core.cjs.development.js

@@ -229,7 +229,7 @@ class ArrayField extends React.Component {
     };
 
     this.onChangeForIndex = index => {
-      return (value, newErrorSchema) => {
+      return (value, newErrorSchema, id) => {
         const {
           formData,
           onChange,
@@ -244,15 +244,16 @@ class ArrayField extends React.Component {
         });
         onChange(newFormData, errorSchema && errorSchema && { ...errorSchema,
           [index]: newErrorSchema
-        });
+        }, id);
       };
     };
 
     this.onSelectChange = value => {
       const {
-        onChange
+        onChange,
+        idSchema
       } = this.props;
-      onChange(value);
+      onChange(value, undefined, idSchema && idSchema.$id);
     };
 
     const {
@@ -897,19 +898,19 @@ function BooleanField(props) {
 
     // We deprecated enumNames in v5. It's intentionally omitted from RSJFSchema type, so we need to cast here.
     const schemaWithEnumNames = schema;
-    schema.enum = (_schema$enum = schema.enum) != null ? _schema$enum : [true, false];
+    const enums = (_schema$enum = schema.enum) != null ? _schema$enum : [true, false];
 
-    if (!schemaWithEnumNames.enumNames && schema.enum && schema.enum.length === 2 && schema.enum.every(v => typeof v === "boolean")) {
+    if (!schemaWithEnumNames.enumNames && enums.length === 2 && enums.every(v => typeof v === "boolean")) {
       enumOptions = [{
-        value: schema.enum[0],
-        label: schema.enum[0] ? "Yes" : "No"
+        value: enums[0],
+        label: enums[0] ? "Yes" : "No"
       }, {
-        value: schema.enum[1],
-        label: schema.enum[1] ? "Yes" : "No"
+        value: enums[1],
+        label: enums[1] ? "Yes" : "No"
       }];
     } else {
       enumOptions = utils.optionsList({
-        enum: schema.enum,
+        enum: enums,
         // NOTE: enumNames is deprecated, but still supported for now.
         enumNames: schemaWithEnumNames.enumNames
       });
@@ -985,7 +986,7 @@ class AnyOfField extends React.Component {
       } // Call getDefaultFormState to make sure defaults are populated on change.
 
 
-      onChange(schemaUtils.getDefaultFormState(options[selectedOption], newFormData));
+      onChange(schemaUtils.getDefaultFormState(options[selectedOption], newFormData), undefined, this.getFieldId());
       this.setState({
         selectedOption: parseInt(option, 10)
       });
@@ -1059,8 +1060,17 @@ class AnyOfField extends React.Component {
    */
 
 
+  getFieldId() {
+    const {
+      idSchema,
+      schema
+    } = this.props;
+    return "" + idSchema.$id + (schema.oneOf ? "__oneof_select" : "__anyof_select");
+  }
   /** Renders the `AnyOfField` selector along with a `SchemaField` for the value of the `formData`
    */
+
+
   render() {
     const {
       name,
@@ -1079,8 +1089,7 @@ class AnyOfField extends React.Component {
       onFocus,
       options,
       registry,
-      uiSchema,
-      schema
+      uiSchema
     } = this.props;
     const {
       widgets,
@@ -1119,7 +1128,7 @@ class AnyOfField extends React.Component {
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "form-group"
     }, /*#__PURE__*/React__default["default"].createElement(Widget, {
-      id: "" + idSchema.$id + (schema.oneOf ? "__oneof_select" : "__anyof_select"),
+      id: this.getFieldId(),
       schema: {
         type: "number",
         default: 0
@@ -1258,7 +1267,7 @@ class ObjectField extends React.Component {
         addedByAdditionalProperties = false;
       }
 
-      return (value, newErrorSchema) => {
+      return (value, newErrorSchema, id) => {
         const {
           formData,
           onChange,
@@ -1281,7 +1290,7 @@ class ObjectField extends React.Component {
         };
         onChange(newFormData, errorSchema && errorSchema && { ...errorSchema,
           [name]: newErrorSchema
-        });
+        }, id);
       };
     };
 
@@ -1350,7 +1359,7 @@ class ObjectField extends React.Component {
     };
 
     this.handleAddClick = schema => () => {
-      if (!isObject__default["default"](schema.additionalProperties)) {
+      if (!schema.additionalProperties) {
         return;
       }
 
@@ -1359,18 +1368,22 @@ class ObjectField extends React.Component {
         onChange,
         registry
       } = this.props;
-      let type = schema.additionalProperties.type;
       const newFormData = { ...formData
       };
-
-      if (utils.REF_KEY in schema.additionalProperties) {
-        const {
-          schemaUtils
-        } = registry;
-        const refSchema = schemaUtils.retrieveSchema({
-          $ref: schema.additionalProperties[utils.REF_KEY]
-        }, formData);
-        type = refSchema.type;
+      let type = undefined;
+
+      if (isObject__default["default"](schema.additionalProperties)) {
+        type = schema.additionalProperties.type;
+
+        if (utils.REF_KEY in schema.additionalProperties) {
+          const {
+            schemaUtils
+          } = registry;
+          const refSchema = schemaUtils.retrieveSchema({
+            $ref: schema.additionalProperties[utils.REF_KEY]
+          }, formData);
+          type = refSchema.type;
+        }
       }
 
       const newKey = this.getAvailableKey("newKey", newFormData); // Cast this to make the `set` work properly
@@ -1633,7 +1646,16 @@ function SchemaFieldRender(props) {
   const FieldHelpTemplate = utils.getTemplate("FieldHelpTemplate", registry, uiOptions);
   const FieldErrorTemplate = utils.getTemplate("FieldErrorTemplate", registry, uiOptions);
   const schema = schemaUtils.retrieveSchema(_schema, formData);
-  const idSchema = utils.mergeObjects(schemaUtils.toIdSchema(schema, _idSchema.$id, formData, idPrefix, idSeparator), _idSchema);
+  const fieldId = _idSchema[utils.ID_KEY];
+  const idSchema = utils.mergeObjects(schemaUtils.toIdSchema(schema, fieldId, formData, idPrefix, idSeparator), _idSchema);
+  /** Intermediary `onChange` handler for field components that will inject the `id` of the current field into the
+   * `onChange` chain if it is not already being provided from a deeper level in the hierarchy
+   */
+
+  const handleFieldComponentChange = React__default["default"].useCallback((formData, newErrorSchema, id) => {
+    const theId = id || fieldId;
+    return onChange(formData, newErrorSchema, theId);
+  }, [fieldId, onChange]);
   const FieldComponent = getFieldComponent(schema, uiOptions, idSchema, registry);
   const disabled = Boolean(props.disabled || uiOptions.disabled);
   const readonly = Boolean(props.readonly || uiOptions.readonly || props.schema.readOnly || schema.readOnly);
@@ -1659,6 +1681,7 @@ function SchemaFieldRender(props) {
   }
 
   const field = /*#__PURE__*/React__default["default"].createElement(FieldComponent, { ...props,
+    onChange: handleFieldComponentChange,
     idSchema: idSchema,
     schema: schema,
     uiSchema: fieldUiSchema,
@@ -1721,6 +1744,8 @@ function SchemaFieldRender(props) {
     description: /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
       id: id + "__description",
       description: description,
+      schema: schema,
+      uiSchema: uiSchema,
       registry: registry
     }),
     rawDescription: description,
@@ -1916,19 +1941,25 @@ function ArrayFieldDescriptionTemplate(props) {
     idSchema,
     description,
     registry,
+    schema,
     uiSchema
   } = props;
+  const options = utils.getUiOptions(uiSchema);
+  const {
+    label: displayLabel = true
+  } = options;
 
-  if (!description) {
+  if (!description || !displayLabel) {
     return null;
   }
 
-  const options = utils.getUiOptions(uiSchema);
   const DescriptionFieldTemplate = utils.getTemplate("DescriptionFieldTemplate", registry, options);
   const id = idSchema.$id + "__description";
   return /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
     id: id,
     description: description,
+    schema: schema,
+    uiSchema: uiSchema,
     registry: registry
   });
 }
@@ -2032,11 +2063,13 @@ function ArrayFieldTemplate(props) {
     idSchema: idSchema,
     title: uiOptions.title || title,
     required: required,
+    schema: schema,
     uiSchema: uiSchema,
     registry: registry
-  }), (uiOptions.description || schema.description) && /*#__PURE__*/React__default["default"].createElement(ArrayFieldDescriptionTemplate, {
+  }), /*#__PURE__*/React__default["default"].createElement(ArrayFieldDescriptionTemplate, {
     idSchema: idSchema,
     description: uiOptions.description || schema.description,
+    schema: schema,
     uiSchema: uiSchema,
     registry: registry
   }), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -2068,22 +2101,27 @@ function ArrayFieldTitleTemplate(props) {
   const {
     idSchema,
     title,
+    schema,
     uiSchema,
     required,
     registry
   } = props;
+  const options = utils.getUiOptions(uiSchema);
+  const {
+    label: displayLabel = true
+  } = options;
 
-  if (!title) {
+  if (!title || !displayLabel) {
     return null;
   }
 
-  const options = utils.getUiOptions(uiSchema);
   const TitleFieldTemplate = utils.getTemplate("TitleFieldTemplate", registry, options);
   const id = idSchema.$id + "__title";
   return /*#__PURE__*/React__default["default"].createElement(TitleFieldTemplate, {
     id: id,
     title: title,
     required: required,
+    schema: schema,
     uiSchema: uiSchema,
     registry: registry
   });
@@ -2488,11 +2526,14 @@ function ObjectFieldTemplate(props) {
     id: idSchema.$id + "__title",
     title: options.title || title,
     required: required,
+    schema: schema,
     uiSchema: uiSchema,
     registry: registry
   }), (options.description || description) && /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
     id: idSchema.$id + "__description",
     description: options.description || description,
+    schema: schema,
+    uiSchema: uiSchema,
     registry: registry
   }), properties.map(prop => prop.content), utils.canExpand(schema, uiSchema, formData) && /*#__PURE__*/React__default["default"].createElement(AddButton, {
     className: "object-property-expand",
@@ -2840,6 +2881,7 @@ function AltDateTimeWidget(_ref) {
 function CheckboxWidget(_ref) {
   let {
     schema,
+    uiSchema,
     options,
     id,
     value,
@@ -2865,6 +2907,8 @@ function CheckboxWidget(_ref) {
   }, schema.description && /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
     id: id + "__description",
     description: schema.description,
+    schema: schema,
+    uiSchema: uiSchema,
     registry: registry
   }), /*#__PURE__*/React__default["default"].createElement("label", null, /*#__PURE__*/React__default["default"].createElement("input", {
     type: "checkbox",
@@ -3587,7 +3631,7 @@ class Form extends React.Component {
       return getAllPaths(pathSchema);
     };
 
-    this.onChange = (formData, newErrorSchema) => {
+    this.onChange = (formData, newErrorSchema, id) => {
       const {
         extraErrors,
         omitExtraData,
@@ -3654,7 +3698,7 @@ class Form extends React.Component {
 
       this.setState(state, () => onChange && onChange({ ...this.state,
         ...state
-      }));
+      }, id));
     };
 
     this.onBlur = (id, data) => {