@rjsf/core 5.18.4 → 5.18.6

package/dist/index.js

@@ -1132,7 +1132,7 @@ function NumberField(props) {
     [onChange]
   );
   if (typeof lastValue === "string" && typeof value === "number") {
-    const re = new RegExp(`${value}`.replace(".", "\\.") + "\\.?0*$");
+    const re = new RegExp(`^(${String(value).replace(".", "\\.")})?\\.?0*$`);
     if (lastValue.match(re)) {
       value = lastValue;
     }
@@ -1260,20 +1260,23 @@ var ObjectField = class extends import_react4.Component {
       const { formData, onChange, registry } = this.props;
       const newFormData = { ...formData };
       let type = void 0;
+      let defaultValue = void 0;
       if ((0, import_isObject3.default)(schema.additionalProperties)) {
         type = schema.additionalProperties.type;
+        defaultValue = schema.additionalProperties.default;
         let apSchema = schema.additionalProperties;
         if (import_utils5.REF_KEY in apSchema) {
           const { schemaUtils } = registry;
           apSchema = schemaUtils.retrieveSchema({ $ref: apSchema[import_utils5.REF_KEY] }, formData);
           type = apSchema.type;
+          defaultValue = apSchema.default;
         }
         if (!type && (import_utils5.ANY_OF_KEY in apSchema || import_utils5.ONE_OF_KEY in apSchema)) {
           type = "object";
         }
       }
       const newKey = this.getAvailableKey("newKey", newFormData);
-      (0, import_set2.default)(newFormData, newKey, this.getDefaultValue(type));
+      (0, import_set2.default)(newFormData, newKey, defaultValue ?? this.getDefaultValue(type));
       onChange(newFormData);
     };
   }
@@ -1321,8 +1324,8 @@ var ObjectField = class extends import_react4.Component {
       idSchema,
       name,
       required = false,
-      disabled = false,
-      readonly = false,
+      disabled,
+      readonly,
       hideError,
       idPrefix,
       idSeparator,
@@ -1501,11 +1504,11 @@ function SchemaFieldRender(props) {
     [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);
+  const disabled = Boolean(uiOptions.disabled ?? props.disabled);
+  const readonly = Boolean(uiOptions.readonly ?? props.readonly ?? props.schema.readOnly ?? schema.readOnly);
   const uiSchemaHideError = uiOptions.hideError;
   const hideError = uiSchemaHideError === void 0 ? props.hideError : Boolean(uiSchemaHideError);
-  const autofocus = Boolean(props.autofocus || uiOptions.autofocus);
+  const autofocus = Boolean(uiOptions.autofocus ?? props.autofocus);
   if (Object.keys(schema).length === 0) {
     return null;
   }
@@ -2030,9 +2033,12 @@ function BaseInputTemplate(props) {
     ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
     [onChange, options]
   );
-  const _onBlur = (0, import_react7.useCallback)(({ target: { value: value2 } }) => onBlur(id, value2), [onBlur, id]);
+  const _onBlur = (0, import_react7.useCallback)(
+    ({ target }) => onBlur(id, target && target.value),
+    [onBlur, id]
+  );
   const _onFocus = (0, import_react7.useCallback)(
-    ({ target: { value: value2 } }) => onFocus(id, value2),
+    ({ target }) => onFocus(id, target && target.value),
     [onFocus, id]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(import_jsx_runtime12.Fragment, { children: [
@@ -2410,7 +2416,7 @@ function WrapIfAdditionalTemplate(props) {
           className: "form-control",
           type: "text",
           id: `${id}-key`,
-          onBlur: (event) => onKeyChange(event.target.value),
+          onBlur: ({ target }) => onKeyChange(target && target.value),
           defaultValue: label
         }
       )
@@ -2684,11 +2690,11 @@ function CheckboxesWidget({
 }) {
   const checkboxesValues = Array.isArray(value) ? value : [value];
   const handleBlur = (0, import_react10.useCallback)(
-    ({ target: { value: value2 } }) => onBlur(id, (0, import_utils24.enumOptionsValueForIndex)(value2, enumOptions, emptyValue)),
+    ({ target }) => onBlur(id, (0, import_utils24.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue)),
     [onBlur, id]
   );
   const handleFocus = (0, import_react10.useCallback)(
-    ({ target: { value: value2 } }) => onFocus(id, (0, import_utils24.enumOptionsValueForIndex)(value2, enumOptions, emptyValue)),
+    ({ target }) => onFocus(id, (0, import_utils24.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue)),
     [onFocus, id]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)("div", { className: "checkboxes", id, children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
@@ -2966,11 +2972,11 @@ function RadioWidget({
 }) {
   const { enumOptions, enumDisabled, inline, emptyValue } = options;
   const handleBlur = (0, import_react13.useCallback)(
-    ({ target: { value: value2 } }) => onBlur(id, (0, import_utils31.enumOptionsValueForIndex)(value2, enumOptions, emptyValue)),
+    ({ target }) => onBlur(id, (0, import_utils31.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue)),
     [onBlur, id]
   );
   const handleFocus = (0, import_react13.useCallback)(
-    ({ target: { value: value2 } }) => onFocus(id, (0, import_utils31.enumOptionsValueForIndex)(value2, enumOptions, emptyValue)),
+    ({ target }) => onFocus(id, (0, import_utils31.enumOptionsValueForIndex)(target && target.value, enumOptions, emptyValue)),
     [onFocus, id]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)("div", { className: "field-radio-group", id, children: Array.isArray(enumOptions) && enumOptions.map((option, i) => {
@@ -3116,11 +3122,11 @@ function TextareaWidget({
     [onChange, options.emptyValue]
   );
   const handleBlur = (0, import_react15.useCallback)(
-    ({ target: { value: value2 } }) => onBlur(id, value2),
+    ({ target }) => onBlur(id, target && target.value),
     [onBlur, id]
   );
   const handleFocus = (0, import_react15.useCallback)(
-    ({ target: { value: value2 } }) => onFocus(id, value2),
+    ({ target }) => onFocus(id, target && target.value),
     [id, onFocus]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
@@ -3279,9 +3285,22 @@ var Form = class extends import_react17.Component {
       };
       return getAllPaths(pathSchema);
     };
+    /** Returns the `formData` after filtering to remove any extra data not in a form field
+     *
+     * @param formData - The data for the `Form`
+     * @returns The `formData` after omitting extra data
+     */
+    this.omitExtraData = (formData) => {
+      const { schema, schemaUtils } = this.state;
+      const retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
+      const pathSchema = schemaUtils.toPathSchema(retrievedSchema, "", formData);
+      const fieldNames = this.getFieldNames(pathSchema, formData);
+      const newFormData = this.getUsedFormData(formData, fieldNames);
+      return newFormData;
+    };
     /** Function to handle changes made to a field in the `Form`. This handler receives an entirely new copy of the
      * `formData` along with a new `ErrorSchema`. It will first update the `formData` with any missing default fields and
-     * then, if `omitExtraData` and `liveOmit` are turned on, the `formData` will be filterer to remove any extra data not
+     * then, if `omitExtraData` and `liveOmit` are turned on, the `formData` will be filtered to remove any extra data not
      * in a form field. Then, the resulting formData will be validated if required. The state will be updated with the new
      * updated (potentially filtered) `formData`, any errors that resulted from validation. Finally the `onChange`
      * callback will be called if specified with the updated state.
@@ -3302,10 +3321,7 @@ var Form = class extends import_react17.Component {
       let newFormData = formData;
       let _retrievedSchema;
       if (omitExtraData === true && liveOmit === true) {
-        _retrievedSchema = schemaUtils.retrieveSchema(schema, formData);
-        const pathSchema = schemaUtils.toPathSchema(_retrievedSchema, "", formData);
-        const fieldNames = this.getFieldNames(pathSchema, formData);
-        newFormData = this.getUsedFormData(formData, fieldNames);
+        newFormData = this.omitExtraData(formData);
         state = {
           formData: newFormData
         };
@@ -3400,14 +3416,10 @@ var Form = class extends import_react17.Component {
       event.persist();
       const { omitExtraData, extraErrors, noValidate, onSubmit } = this.props;
       let { formData: newFormData } = this.state;
-      const { schema, schemaUtils } = this.state;
       if (omitExtraData === true) {
-        const retrievedSchema = schemaUtils.retrieveSchema(schema, newFormData);
-        const pathSchema = schemaUtils.toPathSchema(retrievedSchema, "", newFormData);
-        const fieldNames = this.getFieldNames(pathSchema, newFormData);
-        newFormData = this.getUsedFormData(newFormData, fieldNames);
+        newFormData = this.omitExtraData(newFormData);
       }
-      if (noValidate || this.validateForm()) {
+      if (noValidate || this.validateFormWithFormData(newFormData)) {
         const errorSchema = extraErrors || {};
         const errors = extraErrors ? (0, import_utils39.toErrorList)(extraErrors) : [];
         this.setState(
@@ -3437,6 +3449,59 @@ var Form = class extends import_react17.Component {
         this.formElement.current.requestSubmit();
       }
     };
+    /** Validates the form using the given `formData`. For use on form submission or on programmatic validation.
+     * If `onError` is provided, then it will be called with the list of errors.
+     *
+     * @param formData - The form data to validate
+     * @returns - True if the form is valid, false otherwise.
+     */
+    this.validateFormWithFormData = (formData) => {
+      const { extraErrors, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
+      const { errors: prevErrors } = this.state;
+      const schemaValidation = this.validate(formData);
+      let errors = schemaValidation.errors;
+      let errorSchema = schemaValidation.errorSchema;
+      const schemaValidationErrors = errors;
+      const schemaValidationErrorSchema = errorSchema;
+      const hasError = errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
+      if (hasError) {
+        if (extraErrors) {
+          const merged = (0, import_utils39.validationDataMerge)(schemaValidation, extraErrors);
+          errorSchema = merged.errorSchema;
+          errors = merged.errors;
+        }
+        if (focusOnFirstError) {
+          if (typeof focusOnFirstError === "function") {
+            focusOnFirstError(errors[0]);
+          } else {
+            this.focusOnError(errors[0]);
+          }
+        }
+        this.setState(
+          {
+            errors,
+            errorSchema,
+            schemaValidationErrors,
+            schemaValidationErrorSchema
+          },
+          () => {
+            if (onError) {
+              onError(errors);
+            } else {
+              console.error("Form validation failed", errors);
+            }
+          }
+        );
+      } else if (prevErrors.length > 0) {
+        this.setState({
+          errors: [],
+          errorSchema: {},
+          schemaValidationErrors: [],
+          schemaValidationErrorSchema: {}
+        });
+      }
+      return !hasError;
+    };
     if (!props.validator) {
       throw new Error("A validator is required for Form functionality to work");
     }
@@ -3680,57 +3745,19 @@ var Form = class extends import_react17.Component {
       field.focus();
     }
   }
-  /** Programmatically validate the form. If `onError` is provided, then it will be called with the list of errors the
+  /** Programmatically validate the form.  If `omitExtraData` is true, the `formData` will first be filtered to remove
+   * any extra data not in a form field. 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, extraErrorsBlockSubmit, focusOnFirstError, onError } = this.props;
-    const { formData, errors: prevErrors } = this.state;
-    const schemaValidation = this.validate(formData);
-    let errors = schemaValidation.errors;
-    let errorSchema = schemaValidation.errorSchema;
-    const schemaValidationErrors = errors;
-    const schemaValidationErrorSchema = errorSchema;
-    const hasError = errors.length > 0 || extraErrors && extraErrorsBlockSubmit;
-    if (hasError) {
-      if (extraErrors) {
-        const merged = (0, import_utils39.validationDataMerge)(schemaValidation, extraErrors);
-        errorSchema = merged.errorSchema;
-        errors = merged.errors;
-      }
-      if (focusOnFirstError) {
-        if (typeof focusOnFirstError === "function") {
-          focusOnFirstError(errors[0]);
-        } else {
-          this.focusOnError(errors[0]);
-        }
-      }
-      this.setState(
-        {
-          errors,
-          errorSchema,
-          schemaValidationErrors,
-          schemaValidationErrorSchema
-        },
-        () => {
-          if (onError) {
-            onError(errors);
-          } else {
-            console.error("Form validation failed", errors);
-          }
-        }
-      );
-    } else if (prevErrors.length > 0) {
-      this.setState({
-        errors: [],
-        errorSchema: {},
-        schemaValidationErrors: [],
-        schemaValidationErrorSchema: {}
-      });
+    const { omitExtraData } = this.props;
+    let { formData: newFormData } = this.state;
+    if (omitExtraData === true) {
+      newFormData = this.omitExtraData(newFormData);
     }
-    return !hasError;
+    return this.validateFormWithFormData(newFormData);
   }
   /** 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.
@@ -3752,8 +3779,8 @@ var Form = class extends import_react17.Component {
       acceptcharset,
       acceptCharset,
       noHtml5Validate = false,
-      disabled = false,
-      readonly = false,
+      disabled,
+      readonly,
       formContext,
       showErrorList = "top",
       _internalFormWrapper