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

package/dist/core.cjs.development.js

@@ -784,9 +784,11 @@ class ArrayField extends React.Component {
     } = this.props;
     const {
       fields: {
-        ArraySchemaField
+        ArraySchemaField,
+        SchemaField
       }
     } = registry;
+    const ItemSchemaField = ArraySchemaField || SchemaField;
     const {
       orderable = true,
       removable = true
@@ -799,7 +801,7 @@ class ArrayField extends React.Component {
     };
     has.toolbar = Object.keys(has).some(key => has[key]);
     return {
-      children: /*#__PURE__*/React__default["default"].createElement(ArraySchemaField, {
+      children: /*#__PURE__*/React__default["default"].createElement(ItemSchemaField, {
         name: name,
         index: index,
         schema: itemSchema,
@@ -833,7 +835,8 @@ class ArrayField extends React.Component {
       onDropIndexClick: this.onDropIndexClick,
       onReorderClick: this.onReorderClick,
       readonly,
-      registry
+      registry,
+      uiSchema: itemUiSchema
     };
   }
 
@@ -1892,7 +1895,7 @@ function NullField(props) {
 const fields = {
   AnyOfField: AnyOfField,
   ArrayField,
-  ArraySchemaField: SchemaField,
+  // ArrayField falls back to SchemaField if ArraySchemaField is not defined, which it isn't by default
   BooleanField,
   NumberField,
   ObjectField,
@@ -1948,7 +1951,8 @@ function ArrayFieldItemTemplate(props) {
     onDropIndexClick,
     onReorderClick,
     readonly,
-    registry
+    registry,
+    uiSchema
   } = props;
   const {
     MoveDownButton,
@@ -1976,15 +1980,18 @@ function ArrayFieldItemTemplate(props) {
   }, (hasMoveUp || hasMoveDown) && /*#__PURE__*/React__default["default"].createElement(MoveUpButton, {
     style: btnStyle,
     disabled: disabled || readonly || !hasMoveUp,
-    onClick: onReorderClick(index, index - 1)
+    onClick: onReorderClick(index, index - 1),
+    uiSchema: uiSchema
   }), (hasMoveUp || hasMoveDown) && /*#__PURE__*/React__default["default"].createElement(MoveDownButton, {
     style: btnStyle,
     disabled: disabled || readonly || !hasMoveDown,
-    onClick: onReorderClick(index, index + 1)
+    onClick: onReorderClick(index, index + 1),
+    uiSchema: uiSchema
   }), hasRemove && /*#__PURE__*/React__default["default"].createElement(RemoveButton, {
     style: btnStyle,
     disabled: disabled || readonly,
-    onClick: onDropIndexClick(index)
+    onClick: onDropIndexClick(index),
+    uiSchema: uiSchema
   }))));
 }
 
@@ -2046,7 +2053,8 @@ function ArrayFieldTemplate(props) {
   })), canAdd && /*#__PURE__*/React__default["default"].createElement(AddButton, {
     className: "array-item-add",
     onClick: onAddClick,
-    disabled: disabled || readonly
+    disabled: disabled || readonly,
+    uiSchema: uiSchema
   }));
 }
 
@@ -2203,6 +2211,7 @@ function IconButton(props) {
     iconType = "default",
     icon,
     className,
+    uiSchema,
     ...otherProps
   } = props;
   return /*#__PURE__*/React__default["default"].createElement("button", {
@@ -2366,6 +2375,7 @@ function WrapIfAdditional(props) {
     required,
     schema,
     children,
+    uiSchema,
     registry
   } = props;
   const {
@@ -2409,7 +2419,8 @@ function WrapIfAdditional(props) {
       border: "0"
     },
     disabled: disabled || readonly,
-    onClick: onDropPropertyClick(label)
+    onClick: onDropPropertyClick(label),
+    uiSchema: uiSchema
   }))));
 }
 
@@ -2549,7 +2560,8 @@ function ObjectFieldTemplate(props) {
   }), properties.map(prop => prop.content), utils.canExpand(schema, uiSchema, formData) && /*#__PURE__*/React__default["default"].createElement(AddButton, {
     className: "object-property-expand",
     onClick: onAddClick(schema),
-    disabled: disabled || readonly
+    disabled: disabled || readonly,
+    uiSchema: uiSchema
   }));
 }
 
@@ -3665,8 +3677,7 @@ class Form extends React.Component {
         omitExtraData,
         extraErrors,
         noValidate,
-        onSubmit,
-        onError
+        onSubmit
       } = this.props;
       let {
         formData: newFormData
@@ -3683,54 +3694,26 @@ class Form extends React.Component {
         newFormData = this.getUsedFormData(newFormData, fieldNames);
       }
 
-      if (!noValidate) {
-        const schemaValidation = this.validate(schemaUtils, newFormData);
-        let errors = schemaValidation.errors;
-        let errorSchema = schemaValidation.errorSchema;
-        const schemaValidationErrors = errors;
-        const schemaValidationErrorSchema = errorSchema;
-
-        if (errors.length > 0) {
-          if (extraErrors) {
-            const merged = schemaUtils.mergeValidationData(schemaValidation, extraErrors);
-            errorSchema = merged.errorSchema;
-            errors = merged.errors;
+      if (noValidate || this.validateForm()) {
+        // There are no errors generated through schema validation.
+        // Check for user provided errors and update state accordingly.
+        const errorSchema = extraErrors || {};
+        const errors = extraErrors ? schemaUtils.getValidator().toErrorList(extraErrors) : [];
+        this.setState({
+          formData: newFormData,
+          errors,
+          errorSchema,
+          schemaValidationErrors: [],
+          schemaValidationErrorSchema: {}
+        }, () => {
+          if (onSubmit) {
+            onSubmit({ ...this.state,
+              formData: newFormData,
+              status: "submitted"
+            }, event);
           }
-
-          this.setState({
-            errors,
-            errorSchema,
-            schemaValidationErrors,
-            schemaValidationErrorSchema
-          }, () => {
-            if (onError) {
-              onError(errors);
-            } else {
-              console.error("Form validation failed", errors);
-            }
-          });
-          return;
-        }
-      } // There are no errors generated through schema validation.
-      // Check for user provided errors and update state accordingly.
-
-
-      const errorSchema = extraErrors || {};
-      const errors = extraErrors ? schemaUtils.getValidator().toErrorList(extraErrors) : [];
-      this.setState({
-        formData: newFormData,
-        errors,
-        errorSchema,
-        schemaValidationErrors: [],
-        schemaValidationErrorSchema: {}
-      }, () => {
-        if (onSubmit) {
-          onSubmit({ ...this.state,
-            formData: newFormData,
-            status: "submitted"
-          }, event);
-        }
-      });
+        });
+      }
     };
 
     if (!props.validator) {
@@ -3958,6 +3941,54 @@ class Form extends React.Component {
       this.formElement.current.requestSubmit();
     }
   }
+  /** Programmatically validate the form. If `onError` is provided, then it will be called with the list of errors the
+   * same way as would happen on form submission.
+   *
+   * @returns - True if the form is valid, false otherwise.
+   */
+
+
+  validateForm() {
+    const {
+      extraErrors,
+      onError
+    } = this.props;
+    const {
+      formData
+    } = this.state;
+    const {
+      schemaUtils
+    } = this.state;
+    const schemaValidation = this.validate(schemaUtils, formData);
+    let errors = schemaValidation.errors;
+    let errorSchema = schemaValidation.errorSchema;
+    const schemaValidationErrors = errors;
+    const schemaValidationErrorSchema = errorSchema;
+
+    if (errors.length > 0) {
+      if (extraErrors) {
+        const merged = schemaUtils.mergeValidationData(schemaValidation, extraErrors);
+        errorSchema = merged.errorSchema;
+        errors = merged.errors;
+      }
+
+      this.setState({
+        errors,
+        errorSchema,
+        schemaValidationErrors,
+        schemaValidationErrorSchema
+      }, () => {
+        if (onError) {
+          onError(errors);
+        } else {
+          console.error("Form validation failed", errors);
+        }
+      });
+      return false;
+    }
+
+    return true;
+  }
   /** Renders the `Form` fields inside the <form> | `tagName` or `_internalFormWrapper`, rendering any errors if
    * needed along with the submit button or any children of the form.
    */