@rjsf/core 5.0.0-beta.6 → 5.0.0-beta.8

package/dist/core.cjs.development.js

@@ -784,7 +784,7 @@ class ArrayField extends React.Component {
     } = this.props;
     const {
       fields: {
-        SchemaField
+        ArraySchemaField
       }
     } = registry;
     const {
@@ -799,7 +799,7 @@ class ArrayField extends React.Component {
     };
     has.toolbar = Object.keys(has).some(key => has[key]);
     return {
-      children: /*#__PURE__*/React__default["default"].createElement(SchemaField, {
+      children: /*#__PURE__*/React__default["default"].createElement(ArraySchemaField, {
         name: name,
         index: index,
         schema: itemSchema,
@@ -1595,58 +1595,6 @@ function getFieldComponent(schema, uiOptions, idSchema, registry) {
     });
   };
 }
-/** The `Help` component renders any help desired for a field
- *
- * @param props - The id and help information to be rendered
- */
-
-
-function Help(props) {
-  const {
-    id,
-    help
-  } = props;
-
-  if (!help) {
-    return null;
-  }
-
-  if (typeof help === "string") {
-    return /*#__PURE__*/React__default["default"].createElement("p", {
-      id: id,
-      className: "help-block"
-    }, help);
-  }
-
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    id: id,
-    className: "help-block"
-  }, help);
-}
-/** The `ErrorList` component renders the errors local to the particular field
- *
- * @param props - The list of errors to show
- */
-
-
-function ErrorList$1(props) {
-  const {
-    errors = []
-  } = props;
-
-  if (errors.length === 0) {
-    return null;
-  }
-
-  return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("ul", {
-    className: "error-detail bs-callout bs-callout-info"
-  }, errors.filter(elem => !!elem).map((error, index) => {
-    return /*#__PURE__*/React__default["default"].createElement("li", {
-      className: "text-danger",
-      key: index
-    }, error);
-  })));
-}
 /** The `SchemaFieldRender` component is the work-horse of react-jsonschema-form, determining what kind of real field to
  * render based on the `schema`, `uiSchema` and all the other props. It also deals with rendering the `anyOf` and
  * `oneOf` fields.
@@ -1679,6 +1627,8 @@ function SchemaFieldRender(props) {
   const uiOptions = utils.getUiOptions(uiSchema);
   const FieldTemplate = utils.getTemplate("FieldTemplate", registry, uiOptions);
   const DescriptionFieldTemplate = utils.getTemplate("DescriptionFieldTemplate", registry, uiOptions);
+  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 FieldComponent = getFieldComponent(schema, uiOptions, idSchema, registry);
@@ -1724,16 +1674,15 @@ function SchemaFieldRender(props) {
   if (wasPropertyKeyModified) {
     label = name;
   } else {
-    label = uiOptions.title || props.schema.title || schema.title || name;
+    label = utils.ADDITIONAL_PROPERTY_FLAG in schema ? name : uiOptions.title || props.schema.title || schema.title || name;
   }
 
   const description = uiOptions.description || props.schema.description || schema.description || "";
-  const errors = __errors;
   const help = uiOptions.help;
   const hidden = uiOptions.widget === "hidden";
   const classNames = ["form-group", "field", "field-" + schema.type];
 
-  if (!hideError && errors && errors.length > 0) {
+  if (!hideError && __errors && __errors.length > 0) {
     classNames.push("field-error has-error has-danger");
   }
 
@@ -1749,6 +1698,22 @@ function SchemaFieldRender(props) {
     classNames.push(uiOptions.classNames);
   }
 
+  const helpComponent = /*#__PURE__*/React__default["default"].createElement(FieldHelpTemplate, {
+    help: help,
+    idSchema: idSchema,
+    schema: schema,
+    uiSchema: uiSchema,
+    hasErrors: !hideError && __errors && __errors.length > 0,
+    registry: registry
+  });
+  const errorsComponent = hideError ? undefined : /*#__PURE__*/React__default["default"].createElement(FieldErrorTemplate, {
+    errors: __errors,
+    errorSchema: errorSchema,
+    idSchema: idSchema,
+    schema: schema,
+    uiSchema: uiSchema,
+    registry: registry
+  });
   const fieldProps = {
     description: /*#__PURE__*/React__default["default"].createElement(DescriptionFieldTemplate, {
       id: id + "__description",
@@ -1756,15 +1721,10 @@ function SchemaFieldRender(props) {
       registry: registry
     }),
     rawDescription: description,
-    help: /*#__PURE__*/React__default["default"].createElement(Help, {
-      id: id + "__help",
-      help: help
-    }),
+    help: helpComponent,
     rawHelp: typeof help === "string" ? help : undefined,
-    errors: hideError ? undefined : /*#__PURE__*/React__default["default"].createElement(ErrorList$1, {
-      errors: errors
-    }),
-    rawErrors: hideError ? undefined : errors,
+    errors: errorsComponent,
+    rawErrors: hideError ? undefined : __errors,
     id,
     label,
     hidden,
@@ -1932,6 +1892,7 @@ function NullField(props) {
 const fields = {
   AnyOfField: AnyOfField,
   ArrayField,
+  ArraySchemaField: SchemaField,
   BooleanField,
   NumberField,
   ObjectField,
@@ -2485,6 +2446,63 @@ function FieldTemplate(props) {
   }), displayLabel && description ? description : null, children, errors, help);
 }
 
+/** The `FieldErrorTemplate` component renders the errors local to the particular field
+ *
+ * @param props - The `FieldErrorProps` for the errors being rendered
+ */
+
+function FieldErrorTemplate(props) {
+  const {
+    errors = [],
+    idSchema
+  } = props;
+
+  if (errors.length === 0) {
+    return null;
+  }
+
+  const id = idSchema.$id + "__error";
+  return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("ul", {
+    id: id,
+    className: "error-detail bs-callout bs-callout-info"
+  }, errors.filter(elem => !!elem).map((error, index) => {
+    return /*#__PURE__*/React__default["default"].createElement("li", {
+      className: "text-danger",
+      key: index
+    }, error);
+  })));
+}
+
+/** The `FieldHelpTemplate` component renders any help desired for a field
+ *
+ * @param props - The `FieldHelpProps` to be rendered
+ */
+
+function FieldHelpTemplate(props) {
+  const {
+    idSchema,
+    help
+  } = props;
+
+  if (!help) {
+    return null;
+  }
+
+  const id = idSchema.$id + "__help";
+
+  if (typeof help === "string") {
+    return /*#__PURE__*/React__default["default"].createElement("p", {
+      id: id,
+      className: "help-block"
+    }, help);
+  }
+
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    id: id,
+    className: "help-block"
+  }, help);
+}
+
 /** The `ObjectFieldTemplate` is the template to use to render all the inner properties of an object along with the
  * title and description if available. If the object is expandable, then an `AddButton` is also rendered after all
  * the properties.
@@ -2581,6 +2599,8 @@ const templates = {
   DescriptionFieldTemplate: DescriptionField,
   ErrorListTemplate: ErrorList,
   FieldTemplate,
+  FieldErrorTemplate,
+  FieldHelpTemplate,
   ObjectFieldTemplate,
   TitleFieldTemplate: TitleField,
   UnsupportedFieldTemplate: UnsupportedField