@rjsf/core 6.7.0 → 6.7.1

package/dist/index.esm.js

@@ -6,7 +6,7 @@ import {
   ErrorSchemaBuilder,
   getChangedFields,
   getTemplate as getTemplate29,
-  getUiOptions as getUiOptions22,
+  getUiOptions as getUiOptions23,
   hashObject as hashObject6,
   isObject as isObject6,
   mergeObjects,
@@ -1909,7 +1909,7 @@ var NullField_default = NullField;
 
 // src/components/fields/NumberField.tsx
 import { useState as useState6, useCallback as useCallback4 } from "react";
-import { asNumber } from "@rjsf/utils";
+import { asNumber, getDecimalSeparator, getUiOptions as getUiOptions9, optionsList as optionsList4 } from "@rjsf/utils";
 import { jsx as jsx9 } from "react/jsx-runtime";
 var trailingCharMatcherWithPrefix = /\.([0-9]*0)*$/;
 var trailingCharMatcher = /[0.]0*$/;
@@ -1917,23 +1917,37 @@ function NumberField(props) {
   const { registry, onChange, formData, value: initialValue } = props;
   const [lastValue, setLastValue] = useState6(initialValue);
   const { StringField: StringField2 } = registry.fields;
+  const separator = getDecimalSeparator();
+  const escapedSeparator = separator === "." ? "\\." : separator;
   let value = formData;
   const handleChange = useCallback4(
     (newValue, path, errorSchema, id) => {
       setLastValue(newValue);
-      const normalizedValue = `${newValue}`.startsWith(".") ? `0${newValue}` : newValue;
+      const standardValue = typeof newValue === "string" ? newValue.replace(separator, ".") : newValue;
+      const normalizedValue = `${standardValue}`.startsWith(".") ? `0${standardValue}` : standardValue;
       const processed = typeof normalizedValue === "string" && trailingCharMatcherWithPrefix.exec(normalizedValue) ? asNumber(normalizedValue.replace(trailingCharMatcher, "")) : asNumber(normalizedValue);
       onChange(processed, path, errorSchema, id);
     },
-    [onChange]
+    [onChange, separator]
   );
   if (typeof lastValue === "string" && typeof value === "number") {
-    const re = new RegExp(`^(${String(value).replace(".", "\\.")})?\\.?0*$`);
+    const re = new RegExp(`^(${String(value).replace(".", escapedSeparator)})?${escapedSeparator}?0*$`);
     if (lastValue.match(re)) {
       value = lastValue;
     }
   }
-  return /* @__PURE__ */ jsx9(StringField2, { ...props, formData: value, onChange: handleChange });
+  let displayValue = value;
+  if (typeof value === "number" && separator !== ".") {
+    const { schema, uiSchema } = props;
+    const { schemaUtils } = registry;
+    const enumOptions = schemaUtils.isSelect(schema) ? optionsList4(schema, uiSchema) : void 0;
+    const defaultWidget = enumOptions ? "select" : "text";
+    const { widget = defaultWidget } = getUiOptions9(uiSchema);
+    if (widget !== "radio" && widget !== "select" && widget !== "hidden") {
+      displayValue = String(value).replace(".", separator);
+    }
+  }
+  return /* @__PURE__ */ jsx9(StringField2, { ...props, formData: displayValue, onChange: handleChange });
 }
 var NumberField_default = NumberField;
 
@@ -1943,7 +1957,7 @@ import {
   ADDITIONAL_PROPERTY_FLAG,
   ANY_OF_KEY as ANY_OF_KEY4,
   getTemplate as getTemplate8,
-  getUiOptions as getUiOptions9,
+  getUiOptions as getUiOptions10,
   isFormDataAvailable as isFormDataAvailable3,
   orderProperties,
   shouldRenderOptionalField as shouldRenderOptionalField3,
@@ -1986,6 +2000,12 @@ function getDefaultValue(translateString, type) {
       return translateString(TranslatableString5.NewStringDefault);
   }
 }
+function isAdditionalPropertySchema(schema) {
+  return Boolean(schema?.[ADDITIONAL_PROPERTY_FLAG]);
+}
+function getAdditionalPropertyOrder(schemaProperties) {
+  return Object.keys(schemaProperties).filter((property) => isAdditionalPropertySchema(schemaProperties[property]));
+}
 function ObjectFieldPropertyFn(props) {
   const {
     fieldPathId,
@@ -2094,10 +2114,17 @@ function ObjectField(props) {
     () => schemaUtils.retrieveSchema(rawSchema, formData, true),
     [schemaUtils, rawSchema, formData]
   );
-  const uiOptions = useMemo4(() => getUiOptions9(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
-  const { properties: schemaProperties = {} } = schema;
+  const uiOptions = useMemo4(() => getUiOptions10(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
+  const schemaProperties = useMemo4(() => schema.properties ?? {}, [schema.properties]);
   const childFieldPathId = props.childFieldPathId ?? fieldPathId;
   const lastRenamedProperty = useRef3({ previousKey: "", currentKey: void 0 });
+  const [additionalPropertyOrder, setAdditionalPropertyOrder] = useState7(
+    () => getAdditionalPropertyOrder(schemaProperties)
+  );
+  const definedPropertyOrder = useMemo4(() => {
+    const additionalPropertySet = new Set(getAdditionalPropertyOrder(schemaProperties));
+    return Object.keys(schemaProperties).filter((property) => !additionalPropertySet.has(property));
+  }, [schemaProperties]);
   const templateTitle = uiOptions.title ?? schema.title ?? title ?? name;
   const description = uiOptions.description ?? schema.description;
   const renderOptionalField = shouldRenderOptionalField3(registry, schema, required, uiSchema);
@@ -2105,7 +2132,7 @@ function ObjectField(props) {
   let orderedProperties = [];
   const getAvailableKey = useCallback5(
     (preferredKey, existingFormData) => {
-      const { duplicateKeySuffixSeparator = "-" } = getUiOptions9(uiSchema, globalUiOptions);
+      const { duplicateKeySuffixSeparator = "-" } = getUiOptions10(uiSchema, globalUiOptions);
       let index = 0;
       let newKey = preferredKey;
       while (has3(existingFormData, newKey)) {
@@ -2150,6 +2177,7 @@ function ObjectField(props) {
       lastRenamedProperty.current.currentKey = newKey;
       lastRenamedProperty.current.previousKey = getAvailableKey(newKey, newFormData);
     }
+    setAdditionalPropertyOrder((order) => [...order, newKey]);
     onChange(newFormData, childFieldPathId.path);
   }, [formData, onChange, translateString, schemaUtils, childFieldPathId, getAvailableKey, schema]);
   const handleKeyRename = useCallback5(
@@ -2171,6 +2199,7 @@ function ObjectField(props) {
           lastRenamedProperty.current.previousKey = oldKey;
         }
         lastRenamedProperty.current.currentKey = actualNewKey;
+        setAdditionalPropertyOrder((order) => order.map((property) => property === oldKey ? actualNewKey : property));
         onChange(renamedObj, childFieldPathId.path);
       }
     },
@@ -2178,6 +2207,7 @@ function ObjectField(props) {
   );
   const handleRemoveProperty = useCallback5(
     (key) => {
+      setAdditionalPropertyOrder((order) => order.filter((property) => property !== key));
       onChange(ADDITIONAL_PROPERTY_KEY_REMOVE, [...childFieldPathId.path, key]);
     },
     [onChange, childFieldPathId]
@@ -2190,8 +2220,11 @@ function ObjectField(props) {
   }, []);
   if (!renderOptionalField || hasFormData) {
     try {
-      const properties = Object.keys(schemaProperties);
-      orderedProperties = orderProperties(properties, uiOptions.order);
+      const definedPropertySet = new Set(definedPropertyOrder);
+      const currentAdditionalProperties = additionalPropertyOrder.filter(
+        (property) => Object.hasOwn(schemaProperties, property) && !definedPropertySet.has(property)
+      );
+      orderedProperties = orderProperties([...definedPropertyOrder, ...currentAdditionalProperties], uiOptions.order);
     } catch (err) {
       return /* @__PURE__ */ jsxs("div", { children: [
         /* @__PURE__ */ jsx10("p", { className: "rjsf-config-error", style: { color: "red" }, children: /* @__PURE__ */ jsx10(Markdown, { options: { disableParsingRawHTML: true }, children: translateString(TranslatableString5.InvalidObjectField, [name || "root", err.message]) }) }),
@@ -2206,11 +2239,9 @@ function ObjectField(props) {
     title: uiOptions.label === false ? "" : templateTitle,
     description: uiOptions.label === false ? void 0 : description,
     properties: orderedProperties.map((propertyName) => {
-      const addedByAdditionalProperties = Boolean(
-        schema.properties?.[propertyName]?.[ADDITIONAL_PROPERTY_FLAG]
-      );
+      const addedByAdditionalProperties = isAdditionalPropertySchema(schema.properties?.[propertyName]);
       const fieldUiSchema = addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[propertyName];
-      const hidden = getUiOptions9(fieldUiSchema).widget === "hidden";
+      const hidden = getUiOptions10(fieldUiSchema).widget === "hidden";
       const content = /* @__PURE__ */ jsx10(
         ObjectFieldProperty,
         {
@@ -2262,7 +2293,7 @@ function ObjectField(props) {
 import {
   getSchemaType,
   getTemplate as getTemplate9,
-  getUiOptions as getUiOptions10,
+  getUiOptions as getUiOptions11,
   isFormDataAvailable as isFormDataAvailable4,
   optionalControlsId,
   TranslatableString as TranslatableString6
@@ -2281,7 +2312,7 @@ function OptionalDataControlsField(props) {
     registry
   } = props;
   const { globalUiOptions = {}, schemaUtils, translateString } = registry;
-  const uiOptions = getUiOptions10(uiSchema, globalUiOptions);
+  const uiOptions = getUiOptions11(uiSchema, globalUiOptions);
   const OptionalDataControlsTemplate2 = getTemplate9(
     "OptionalDataControlsTemplate",
     registry,
@@ -2335,7 +2366,7 @@ import {
   descriptionId,
   getSchemaType as getSchemaType2,
   getTemplate as getTemplate10,
-  getUiOptions as getUiOptions11,
+  getUiOptions as getUiOptions12,
   ID_KEY as ID_KEY4,
   isFormDataAvailable as isFormDataAvailable5,
   ONE_OF_KEY as ONE_OF_KEY5,
@@ -2410,7 +2441,7 @@ function SchemaFieldRender(props) {
     return /* @__PURE__ */ jsx12(CyclicSchemaField2, { ...props });
   }
   const uiSchema = resolveUiSchema(_schema, _uiSchema, registry);
-  const uiOptions = getUiOptions11(uiSchema, globalUiOptions);
+  const uiOptions = getUiOptions12(uiSchema, globalUiOptions);
   const FieldTemplate2 = getTemplate10("FieldTemplate", registry, uiOptions);
   const DescriptionFieldTemplate = getTemplate10(
     "DescriptionFieldTemplate",
@@ -2595,7 +2626,7 @@ var SchemaField_default = SchemaField;
 
 // src/components/fields/StringField.tsx
 import { useCallback as useCallback7 } from "react";
-import { getWidget as getWidget5, getUiOptions as getUiOptions12, optionsList as optionsList4, hasWidget } from "@rjsf/utils";
+import { getWidget as getWidget5, getUiOptions as getUiOptions13, optionsList as optionsList5, hasWidget } from "@rjsf/utils";
 import { jsx as jsx13 } from "react/jsx-runtime";
 function StringField(props) {
   const {
@@ -2618,12 +2649,12 @@ function StringField(props) {
   } = props;
   const { title: schemaTitle, format } = schema;
   const { widgets: widgets2, schemaUtils, globalUiOptions } = registry;
-  const enumOptions = schemaUtils.isSelect(schema) ? optionsList4(schema, uiSchema) : void 0;
+  const enumOptions = schemaUtils.isSelect(schema) ? optionsList5(schema, uiSchema) : void 0;
   let defaultWidget = enumOptions ? "select" : "text";
   if (format && hasWidget(schema, format, widgets2)) {
     defaultWidget = format;
   }
-  const { widget = defaultWidget, placeholder = "", title: uiTitle, ...options } = getUiOptions12(uiSchema);
+  const { widget = defaultWidget, placeholder = "", title: uiTitle, ...options } = getUiOptions13(uiSchema);
   const displayLabel = schemaUtils.getDisplayLabel(schema, uiSchema, globalUiOptions);
   const label = uiTitle ?? title ?? schemaTitle ?? name;
   const Widget = getWidget5(schema, widget, widgets2);
@@ -2683,11 +2714,11 @@ function fields() {
 var fields_default = fields;
 
 // src/components/templates/ArrayFieldDescriptionTemplate.tsx
-import { descriptionId as descriptionId2, getTemplate as getTemplate11, getUiOptions as getUiOptions13 } from "@rjsf/utils";
+import { descriptionId as descriptionId2, getTemplate as getTemplate11, getUiOptions as getUiOptions14 } from "@rjsf/utils";
 import { jsx as jsx14 } from "react/jsx-runtime";
 function ArrayFieldDescriptionTemplate(props) {
   const { fieldPathId, description, registry, schema, uiSchema } = props;
-  const options = getUiOptions13(uiSchema, registry.globalUiOptions);
+  const options = getUiOptions14(uiSchema, registry.globalUiOptions);
   const { label: displayLabel = true } = options;
   if (!description || !displayLabel) {
     return null;
@@ -2778,11 +2809,11 @@ function ArrayFieldItemButtonsTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldItemTemplate.tsx
-import { getTemplate as getTemplate12, getUiOptions as getUiOptions14 } from "@rjsf/utils";
+import { getTemplate as getTemplate12, getUiOptions as getUiOptions15 } from "@rjsf/utils";
 import { jsx as jsx16, jsxs as jsxs4 } from "react/jsx-runtime";
 function ArrayFieldItemTemplate(props) {
   const { children, className, buttonsProps, displayLabel, hasDescription, hasToolbar, registry, uiSchema } = props;
-  const uiOptions = getUiOptions14(uiSchema);
+  const uiOptions = getUiOptions15(uiSchema);
   const ArrayFieldItemButtonsTemplate2 = getTemplate12(
     "ArrayFieldItemButtonsTemplate",
     registry,
@@ -2804,7 +2835,7 @@ function ArrayFieldItemTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldTemplate.tsx
-import { getTemplate as getTemplate13, getUiOptions as getUiOptions15, buttonId as buttonId2 } from "@rjsf/utils";
+import { getTemplate as getTemplate13, getUiOptions as getUiOptions16, buttonId as buttonId2 } from "@rjsf/utils";
 import { jsx as jsx17, jsxs as jsxs5 } from "react/jsx-runtime";
 function ArrayFieldTemplate(props) {
   const {
@@ -2822,7 +2853,7 @@ function ArrayFieldTemplate(props) {
     schema,
     title
   } = props;
-  const uiOptions = getUiOptions15(uiSchema);
+  const uiOptions = getUiOptions16(uiSchema);
   const ArrayFieldDescriptionTemplate2 = getTemplate13(
     "ArrayFieldDescriptionTemplate",
     registry,
@@ -2877,11 +2908,11 @@ function ArrayFieldTemplate(props) {
 }
 
 // src/components/templates/ArrayFieldTitleTemplate.tsx
-import { getTemplate as getTemplate14, getUiOptions as getUiOptions16, titleId as titleId2 } from "@rjsf/utils";
+import { getTemplate as getTemplate14, getUiOptions as getUiOptions17, titleId as titleId2 } from "@rjsf/utils";
 import { jsx as jsx18 } from "react/jsx-runtime";
 function ArrayFieldTitleTemplate(props) {
   const { fieldPathId, title, schema, uiSchema, required, registry, optionalDataControl } = props;
-  const options = getUiOptions16(uiSchema, registry.globalUiOptions);
+  const options = getUiOptions17(uiSchema, registry.globalUiOptions);
   const { label: displayLabel = true } = options;
   if (!title || !displayLabel) {
     return null;
@@ -3159,13 +3190,13 @@ function CyclicSchemaExpandTemplate(props) {
 }
 
 // src/components/RichDescription.tsx
-import { getTestIds as getTestIds2, getUiOptions as getUiOptions17 } from "@rjsf/utils";
+import { getTestIds as getTestIds2, getUiOptions as getUiOptions18 } from "@rjsf/utils";
 import { Markdown as Markdown2 } from "markdown-to-jsx/react";
 import { jsx as jsx25 } from "react/jsx-runtime";
 var TEST_IDS = getTestIds2();
 function RichDescription({ description, registry, uiSchema = {} }) {
   const { globalUiOptions } = registry;
-  const uiOptions = getUiOptions17(uiSchema, globalUiOptions);
+  const uiOptions = getUiOptions18(uiSchema, globalUiOptions);
   if (uiOptions.enableMarkdownInDescription && typeof description === "string") {
     return /* @__PURE__ */ jsx25(Markdown2, { options: { disableParsingRawHTML: true }, "data-testid": TEST_IDS.markdown, children: description });
   }
@@ -3239,7 +3270,7 @@ function FieldErrorTemplate(props) {
 import { helpId } from "@rjsf/utils";
 
 // src/components/RichHelp.tsx
-import { getTestIds as getTestIds3, getUiOptions as getUiOptions18 } from "@rjsf/utils";
+import { getTestIds as getTestIds3, getUiOptions as getUiOptions19 } from "@rjsf/utils";
 import { Markdown as Markdown3 } from "markdown-to-jsx/react";
 import { jsx as jsx30 } from "react/jsx-runtime";
 var TEST_IDS2 = getTestIds3();
@@ -3249,7 +3280,7 @@ function RichHelp({
   uiSchema = {}
 }) {
   const { globalUiOptions } = registry;
-  const uiOptions = getUiOptions18(uiSchema, globalUiOptions);
+  const uiOptions = getUiOptions19(uiSchema, globalUiOptions);
   if (uiOptions.enableMarkdownInHelp && typeof help === "string") {
     return /* @__PURE__ */ jsx30(Markdown3, { options: { disableParsingRawHTML: true }, "data-testid": TEST_IDS2.markdown, children: help });
   }
@@ -3268,7 +3299,7 @@ function FieldHelpTemplate(props) {
 }
 
 // src/components/templates/FieldTemplate/FieldTemplate.tsx
-import { getTemplate as getTemplate16, getUiOptions as getUiOptions19 } from "@rjsf/utils";
+import { getTemplate as getTemplate16, getUiOptions as getUiOptions20 } from "@rjsf/utils";
 
 // src/components/templates/FieldTemplate/Label.tsx
 import { jsx as jsx32, jsxs as jsxs9 } from "react/jsx-runtime";
@@ -3288,7 +3319,7 @@ function Label(props) {
 import { jsx as jsx33, jsxs as jsxs10 } from "react/jsx-runtime";
 function FieldTemplate(props) {
   const { id, label, children, errors, help, description, hidden, required, displayLabel, registry, uiSchema } = props;
-  const uiOptions = getUiOptions19(uiSchema);
+  const uiOptions = getUiOptions20(uiSchema);
   const WrapIfAdditionalTemplate2 = getTemplate16(
     "WrapIfAdditionalTemplate",
     registry,
@@ -3328,7 +3359,7 @@ function MultiSchemaFieldTemplate(props) {
 }
 
 // src/components/templates/ObjectFieldTemplate.tsx
-import { canExpand, descriptionId as descriptionId3, getTemplate as getTemplate17, getUiOptions as getUiOptions20, titleId as titleId3, buttonId as buttonId3 } from "@rjsf/utils";
+import { canExpand, descriptionId as descriptionId3, getTemplate as getTemplate17, getUiOptions as getUiOptions21, titleId as titleId3, buttonId as buttonId3 } from "@rjsf/utils";
 import { jsx as jsx36, jsxs as jsxs12 } from "react/jsx-runtime";
 function ObjectFieldTemplate(props) {
   const {
@@ -3347,7 +3378,7 @@ function ObjectFieldTemplate(props) {
     title,
     uiSchema
   } = props;
-  const options = getUiOptions20(uiSchema);
+  const options = getUiOptions21(uiSchema);
   const TitleFieldTemplate = getTemplate17("TitleFieldTemplate", registry, options);
   const DescriptionFieldTemplate = getTemplate17(
     "DescriptionFieldTemplate",
@@ -3689,7 +3720,7 @@ import {
   getTemplate as getTemplate18,
   labelValue,
   schemaRequiresTrueValue,
-  getUiOptions as getUiOptions21
+  getUiOptions as getUiOptions22
 } from "@rjsf/utils";
 import { jsx as jsx44, jsxs as jsxs18 } from "react/jsx-runtime";
 function CheckboxWidget({
@@ -3727,7 +3758,7 @@ function CheckboxWidget({
     (event) => onFocus(id, event.target.checked),
     [onFocus, id]
   );
-  const uiOptions = getUiOptions21(uiSchema);
+  const uiOptions = getUiOptions22(uiSchema);
   const isCheckboxWidget = uiOptions.widget === "checkbox";
   const description = isCheckboxWidget ? void 0 : options.description ?? schema.description;
   return /* @__PURE__ */ jsxs18("div", { className: `checkbox ${disabled || readonly ? "disabled" : ""}`, children: [
@@ -4663,7 +4694,7 @@ var Form = class _Form extends Component {
   /** Renders any errors contained in the `state` in using the `ErrorList`, if not disabled by `showErrorList`. */
   renderErrors(registry) {
     const { errors, errorSchema, schema, uiSchema } = this.state;
-    const options = getUiOptions22(uiSchema);
+    const options = getUiOptions23(uiSchema);
     const ErrorListTemplate = getTemplate29("ErrorListTemplate", registry, options);
     if (errors?.length) {
       return /* @__PURE__ */ jsx61(
@@ -5227,7 +5258,7 @@ var Form = class _Form extends Component {
     const { SubmitButton: SubmitButton2 } = registry.templates.ButtonTemplates;
     const as = _internalFormWrapper ? tagName : void 0;
     const FormTag = _internalFormWrapper || tagName || "form";
-    let { [SUBMIT_BTN_OPTIONS_KEY]: submitOptions = {} } = getUiOptions22(uiSchema);
+    let { [SUBMIT_BTN_OPTIONS_KEY]: submitOptions = {} } = getUiOptions23(uiSchema);
     if (disabled) {
       submitOptions = { ...submitOptions, props: { ...submitOptions.props, disabled: true } };
     }