@rjsf/core 5.18.3 → 5.18.5

package/dist/core.umd.js

@@ -1063,7 +1063,7 @@
       [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;
       }
@@ -1180,20 +1180,23 @@
         const { formData, onChange, registry } = this.props;
         const newFormData = { ...formData };
         let type = void 0;
+        let defaultValue = void 0;
         if (isObject(schema.additionalProperties)) {
           type = schema.additionalProperties.type;
+          defaultValue = schema.additionalProperties.default;
           let apSchema = schema.additionalProperties;
           if (utils.REF_KEY in apSchema) {
             const { schemaUtils } = registry;
             apSchema = schemaUtils.retrieveSchema({ $ref: apSchema[utils.REF_KEY] }, formData);
             type = apSchema.type;
+            defaultValue = apSchema.default;
           }
           if (!type && (utils.ANY_OF_KEY in apSchema || utils.ONE_OF_KEY in apSchema)) {
             type = "object";
           }
         }
         const newKey = this.getAvailableKey("newKey", newFormData);
-        set(newFormData, newKey, this.getDefaultValue(type));
+        set(newFormData, newKey, defaultValue ?? this.getDefaultValue(type));
         onChange(newFormData);
       };
     }
@@ -1241,8 +1244,8 @@
         idSchema,
         name,
         required = false,
-        disabled = false,
-        readonly = false,
+        disabled,
+        readonly,
         hideError,
         idPrefix,
         idSeparator,
@@ -1413,11 +1416,11 @@
       [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;
     }
@@ -1915,9 +1918,12 @@
       ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
       [onChange, options]
     );
-    const _onBlur = react.useCallback(({ target: { value: value2 } }) => onBlur(id, value2), [onBlur, id]);
+    const _onBlur = react.useCallback(
+      ({ target }) => onBlur(id, target && target.value),
+      [onBlur, id]
+    );
     const _onFocus = react.useCallback(
-      ({ target: { value: value2 } }) => onFocus(id, value2),
+      ({ target }) => onFocus(id, target && target.value),
       [onFocus, id]
     );
     return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
@@ -2241,7 +2247,7 @@
             className: "form-control",
             type: "text",
             id: `${id}-key`,
-            onBlur: (event) => onKeyChange(event.target.value),
+            onBlur: ({ target }) => onKeyChange(target && target.value),
             defaultValue: label
           }
         )
@@ -2497,11 +2503,11 @@
   }) {
     const checkboxesValues = Array.isArray(value) ? value : [value];
     const handleBlur = react.useCallback(
-      ({ target: { value: value2 } }) => onBlur(id, utils.enumOptionsValueForIndex(value2, enumOptions, emptyValue)),
+      ({ target }) => onBlur(id, utils.enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
       [onBlur, id]
     );
     const handleFocus = react.useCallback(
-      ({ target: { value: value2 } }) => onFocus(id, utils.enumOptionsValueForIndex(value2, enumOptions, emptyValue)),
+      ({ target }) => onFocus(id, utils.enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
       [onFocus, id]
     );
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "checkboxes", id, children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
@@ -2744,11 +2750,11 @@
   }) {
     const { enumOptions, enumDisabled, inline, emptyValue } = options;
     const handleBlur = react.useCallback(
-      ({ target: { value: value2 } }) => onBlur(id, utils.enumOptionsValueForIndex(value2, enumOptions, emptyValue)),
+      ({ target }) => onBlur(id, utils.enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
       [onBlur, id]
     );
     const handleFocus = react.useCallback(
-      ({ target: { value: value2 } }) => onFocus(id, utils.enumOptionsValueForIndex(value2, enumOptions, emptyValue)),
+      ({ target }) => onFocus(id, utils.enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
       [onFocus, id]
     );
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "field-radio-group", id, children: Array.isArray(enumOptions) && enumOptions.map((option, i) => {
@@ -2881,11 +2887,11 @@
       [onChange, options.emptyValue]
     );
     const handleBlur = react.useCallback(
-      ({ target: { value: value2 } }) => onBlur(id, value2),
+      ({ target }) => onBlur(id, target && target.value),
       [onBlur, id]
     );
     const handleFocus = react.useCallback(
-      ({ target: { value: value2 } }) => onFocus(id, value2),
+      ({ target }) => onFocus(id, target && target.value),
       [id, onFocus]
     );
     return /* @__PURE__ */ jsxRuntime.jsx(
@@ -3006,7 +3012,7 @@
           Object.keys(_obj).forEach((key) => {
             if (typeof _obj[key] === "object") {
               const newPaths = paths.map((path) => [...path, key]);
-              if (_obj[key][utils.RJSF_ADDITONAL_PROPERTIES_FLAG] && _obj[key][utils.NAME_KEY] !== "") {
+              if (_obj[key][utils.RJSF_ADDITIONAL_PROPERTIES_FLAG] && _obj[key][utils.NAME_KEY] !== "") {
                 acc.push(_obj[key][utils.NAME_KEY]);
               } else {
                 getAllPaths(_obj[key], acc, newPaths);
@@ -3495,9 +3501,10 @@
         autoComplete,
         enctype,
         acceptcharset,
+        acceptCharset,
         noHtml5Validate = false,
-        disabled = false,
-        readonly = false,
+        disabled,
+        readonly,
         formContext,
         showErrorList = "top",
         _internalFormWrapper
@@ -3524,7 +3531,7 @@
           action,
           autoComplete,
           encType: enctype,
-          acceptCharset: acceptcharset,
+          acceptCharset: acceptCharset || acceptcharset,
           noValidate: noHtml5Validate,
           onSubmit: this.onSubmit,
           as,

package/dist/index.esm.js

@@ -8,7 +8,7 @@ import {
   isObject as isObject5,
   mergeObjects as mergeObjects2,
   NAME_KEY,
-  RJSF_ADDITONAL_PROPERTIES_FLAG,
+  RJSF_ADDITIONAL_PROPERTIES_FLAG,
   shouldRender,
   SUBMIT_BTN_OPTIONS_KEY,
   toErrorList,
@@ -1134,7 +1134,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;
     }
@@ -1272,20 +1272,23 @@ var ObjectField = class extends Component3 {
       const { formData, onChange, registry } = this.props;
       const newFormData = { ...formData };
       let type = void 0;
+      let defaultValue = void 0;
       if (isObject3(schema.additionalProperties)) {
         type = schema.additionalProperties.type;
+        defaultValue = schema.additionalProperties.default;
         let apSchema = schema.additionalProperties;
         if (REF_KEY in apSchema) {
           const { schemaUtils } = registry;
           apSchema = schemaUtils.retrieveSchema({ $ref: apSchema[REF_KEY] }, formData);
           type = apSchema.type;
+          defaultValue = apSchema.default;
         }
         if (!type && (ANY_OF_KEY2 in apSchema || ONE_OF_KEY2 in apSchema)) {
           type = "object";
         }
       }
       const newKey = this.getAvailableKey("newKey", newFormData);
-      set2(newFormData, newKey, this.getDefaultValue(type));
+      set2(newFormData, newKey, defaultValue ?? this.getDefaultValue(type));
       onChange(newFormData);
     };
   }
@@ -1333,8 +1336,8 @@ var ObjectField = class extends Component3 {
       idSchema,
       name,
       required = false,
-      disabled = false,
-      readonly = false,
+      disabled,
+      readonly,
       hideError,
       idPrefix,
       idSeparator,
@@ -1524,11 +1527,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;
   }
@@ -2073,9 +2076,12 @@ function BaseInputTemplate(props) {
     ({ target: { value: value2 } }) => onChange(value2 === "" ? options.emptyValue : value2),
     [onChange, options]
   );
-  const _onBlur = useCallback3(({ target: { value: value2 } }) => onBlur(id, value2), [onBlur, id]);
+  const _onBlur = useCallback3(
+    ({ target }) => onBlur(id, target && target.value),
+    [onBlur, id]
+  );
   const _onFocus = useCallback3(
-    ({ target: { value: value2 } }) => onFocus(id, value2),
+    ({ target }) => onFocus(id, target && target.value),
     [onFocus, id]
   );
   return /* @__PURE__ */ jsxs6(Fragment2, { children: [
@@ -2467,7 +2473,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
         }
       )
@@ -2761,11 +2767,11 @@ function CheckboxesWidget({
 }) {
   const checkboxesValues = Array.isArray(value) ? value : [value];
   const handleBlur = useCallback6(
-    ({ target: { value: value2 } }) => onBlur(id, enumOptionsValueForIndex(value2, enumOptions, emptyValue)),
+    ({ target }) => onBlur(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
     [onBlur, id]
   );
   const handleFocus = useCallback6(
-    ({ target: { value: value2 } }) => onFocus(id, enumOptionsValueForIndex(value2, enumOptions, emptyValue)),
+    ({ target }) => onFocus(id, enumOptionsValueForIndex(target && target.value, enumOptions, emptyValue)),
     [onFocus, id]
   );
   return /* @__PURE__ */ jsx29("div", { className: "checkboxes", id, children: Array.isArray(enumOptions) && enumOptions.map((option, index) => {
@@ -3056,11 +3062,11 @@ function RadioWidget({
 }) {
   const { enumOptions, enumDisabled, inline, emptyValue } = options;
   const handleBlur = useCallback9(
-    ({ target: { value: value2 } }) => onBlur(id, enumOptionsValueForIndex2(value2, enumOptions, emptyValue)),
+    ({ target }) => onBlur(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue)),
     [onBlur, id]
   );
   const handleFocus = useCallback9(
-    ({ target: { value: value2 } }) => onFocus(id, enumOptionsValueForIndex2(value2, enumOptions, emptyValue)),
+    ({ target }) => onFocus(id, enumOptionsValueForIndex2(target && target.value, enumOptions, emptyValue)),
     [onFocus, id]
   );
   return /* @__PURE__ */ jsx37("div", { className: "field-radio-group", id, children: Array.isArray(enumOptions) && enumOptions.map((option, i) => {
@@ -3210,11 +3216,11 @@ function TextareaWidget({
     [onChange, options.emptyValue]
   );
   const handleBlur = useCallback11(
-    ({ target: { value: value2 } }) => onBlur(id, value2),
+    ({ target }) => onBlur(id, target && target.value),
     [onBlur, id]
   );
   const handleFocus = useCallback11(
-    ({ target: { value: value2 } }) => onFocus(id, value2),
+    ({ target }) => onFocus(id, target && target.value),
     [id, onFocus]
   );
   return /* @__PURE__ */ jsx40(
@@ -3355,7 +3361,7 @@ var Form = class extends Component5 {
         Object.keys(_obj).forEach((key) => {
           if (typeof _obj[key] === "object") {
             const newPaths = paths.map((path) => [...path, key]);
-            if (_obj[key][RJSF_ADDITONAL_PROPERTIES_FLAG] && _obj[key][NAME_KEY] !== "") {
+            if (_obj[key][RJSF_ADDITIONAL_PROPERTIES_FLAG] && _obj[key][NAME_KEY] !== "") {
               acc.push(_obj[key][NAME_KEY]);
             } else {
               getAllPaths(_obj[key], acc, newPaths);
@@ -3844,9 +3850,10 @@ var Form = class extends Component5 {
       autoComplete,
       enctype,
       acceptcharset,
+      acceptCharset,
       noHtml5Validate = false,
-      disabled = false,
-      readonly = false,
+      disabled,
+      readonly,
       formContext,
       showErrorList = "top",
       _internalFormWrapper
@@ -3873,7 +3880,7 @@ var Form = class extends Component5 {
         action,
         autoComplete,
         encType: enctype,
-        acceptCharset: acceptcharset,
+        acceptCharset: acceptCharset || acceptcharset,
         noValidate: noHtml5Validate,
         onSubmit: this.onSubmit,
         as,