@limetech/lime-elements 39.45.2 → 39.45.3

package/dist/cjs/limel-form.cjs.entry.js

@@ -29155,8 +29155,15 @@ function NullField(props) {
     return null;
 }
 
-// Static matchers for standard '.' separator used during normalization inside handleChange
+// Matches a string that ends in a . character, optionally followed by a sequence of
+// digits followed by any number of 0 characters up until the end of the line.
+// Ensuring that there is at least one prefixed character is important so that
+// you don't incorrectly match against "0".
 const trailingCharMatcherWithPrefix = /\.([0-9]*0)*$/;
+// This is used for trimming the trailing 0 and . characters without affecting
+// the rest of the string. Its possible to use one RegEx with groups for this
+// functionality, but it is fairly complex compared to simply defining two
+// different matchers.
 const trailingCharMatcher = /[0.]0*$/;
 /**
  * The NumberField class has some special handling for dealing with trailing
@@ -29179,8 +29186,6 @@ function NumberField(props) {
     const { registry, onChange, formData, value: initialValue } = props;
     const [lastValue, setLastValue] = reactExports.useState(initialValue);
     const { StringField } = registry.fields;
-    const separator = getDecimalSeparator();
-    const escapedSeparator = separator === '.' ? '\\.' : separator;
     let value = formData;
     /** Handle the change from the `StringField` to properly convert to a number
      *
@@ -29189,11 +29194,9 @@ function NumberField(props) {
     const handleChange = reactExports.useCallback((newValue, path, errorSchema, id) => {
         // Cache the original value in component state
         setLastValue(newValue);
-        // Convert locale separator to standard '.' first
-        const standardValue = typeof newValue === 'string' ? newValue.replace(separator, '.') : newValue;
         // Normalize decimals that don't start with a zero character in advance so
         // that the rest of the normalization logic is simpler
-        const normalizedValue = `${standardValue}`.startsWith('.') ? `0${standardValue}` : standardValue;
+        const normalizedValue = `${newValue}`.startsWith('.') ? `0${newValue}` : newValue;
         // Check that the value is a string (this can happen if the widget used is a
         // <select>, due to an enum declaration etc) then, if the value ends in a
         // trailing decimal point or multiple zeroes, strip the trailing values
@@ -29201,33 +29204,19 @@ function NumberField(props) {
             ? asNumber(normalizedValue.replace(trailingCharMatcher, ''))
             : asNumber(normalizedValue);
         onChange(processed, path, errorSchema, id);
-    }, [onChange, separator]);
+    }, [onChange]);
     if (typeof lastValue === 'string' && typeof value === 'number') {
         // Construct a regular expression that checks for a string that consists
-        // of the formData value suffixed with zero or one locale separator characters and zero
+        // of the formData value suffixed with zero or one '.' characters and zero
         // or more '0' characters
-        const re = new RegExp(`^(${String(value).replace('.', escapedSeparator)})?${escapedSeparator}?0*$`);
+        const re = new RegExp(`^(${String(value).replace('.', '\\.')})?\\.?0*$`);
         // If the cached "lastValue" is a match, use that instead of the formData
         // value to prevent the input value from changing in the UI
         if (lastValue.match(re)) {
             value = lastValue;
         }
     }
-    // Format value to use the locale separator for rendering if it is a number
-    let displayValue = value;
-    if (typeof value === 'number' && separator !== '.') {
-        const { schema, uiSchema } = props;
-        const { schemaUtils } = registry;
-        const enumOptions = schemaUtils.isSelect(schema) ? optionsList(schema, uiSchema) : undefined;
-        const defaultWidget = enumOptions ? 'select' : 'text';
-        const { widget = defaultWidget } = getUiOptions(uiSchema);
-        // Do not convert the value to a locale-specific string for radio, select,
-        // or hidden widgets because option matching relies on the original numeric value.
-        if (widget !== 'radio' && widget !== 'select' && widget !== 'hidden') {
-            displayValue = String(value).replace('.', separator);
-        }
-    }
-    return jsxRuntimeExports.jsx(StringField, { ...props, formData: displayValue, onChange: handleChange });
+    return jsxRuntimeExports.jsx(StringField, { ...props, formData: value, onChange: handleChange });
 }
 
 var q={af:"\u2061",applyfunction:"\u2061",ic:"\u2063",invisiblecomma:"\u2063",invisibletimes:"\u2062",it:"\u2062",lrm:"\u200E",negativemediumspace:"\u200B",negativethickspace:"\u200B",negativethinspace:"\u200B",negativeverythinspace:"\u200B",nobreak:"\u2060",rlm:"\u200F",shy:"\xAD",zerowidthspace:"\u200B",zwj:"\u200D",zwnj:"\u200C",downbreve:"\u0311",tdot:"\u20DB",tripledot:"\u20DB",dotdot:"\u20DC",tab:"	",newline:`
@@ -29320,12 +29309,6 @@ function getDefaultValue(translateString, type) {
             return translateString(TranslatableString.NewStringDefault);
     }
 }
-function isAdditionalPropertySchema(schema) {
-    return Boolean(schema?.[ADDITIONAL_PROPERTY_FLAG]);
-}
-function getAdditionalPropertyOrder(schemaProperties) {
-    return Object.keys(schemaProperties).filter((property) => isAdditionalPropertySchema(schemaProperties[property]));
-}
 /** The `ObjectFieldProperty` component is used to render the `SchemaField` for a child property of an object
  */
 function ObjectFieldPropertyFn(props) {
@@ -29390,15 +29373,10 @@ function ObjectField$1(props) {
     formDataRef.current = formData;
     const schema = reactExports.useMemo(() => schemaUtils.retrieveSchema(rawSchema, formData, true), [schemaUtils, rawSchema, formData]);
     const uiOptions = reactExports.useMemo(() => getUiOptions(uiSchema, globalUiOptions), [uiSchema, globalUiOptions]);
-    const schemaProperties = reactExports.useMemo(() => schema.properties ?? {}, [schema.properties]);
+    const { properties: schemaProperties = {} } = schema;
     // All the children will use childFieldPathId if present in the props, falling back to the fieldPathId
     const childFieldPathId = props.childFieldPathId ?? fieldPathId;
     const lastRenamedProperty = reactExports.useRef({ previousKey: '', currentKey: undefined });
-    const [additionalPropertyOrder, setAdditionalPropertyOrder] = reactExports.useState(() => getAdditionalPropertyOrder(schemaProperties));
-    const definedPropertyOrder = reactExports.useMemo(() => {
-        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 = shouldRenderOptionalField(registry, schema, required, uiSchema);
@@ -29461,7 +29439,6 @@ function ObjectField$1(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]);
     /** Returns a callback function that deals with the rename of a key for an additional property for a schema. That
@@ -29490,7 +29467,6 @@ function ObjectField$1(props) {
                 lastRenamedProperty.current.previousKey = oldKey;
             }
             lastRenamedProperty.current.currentKey = actualNewKey;
-            setAdditionalPropertyOrder((order) => order.map((property) => (property === oldKey ? actualNewKey : property)));
             onChange(renamedObj, childFieldPathId.path);
         }
     }, [onChange, childFieldPathId, getAvailableKey]);
@@ -29498,7 +29474,6 @@ function ObjectField$1(props) {
      * value for the path plus the key to be removed
      */
     const handleRemoveProperty = reactExports.useCallback((key) => {
-        setAdditionalPropertyOrder((order) => order.filter((property) => property !== key));
         onChange(ADDITIONAL_PROPERTY_KEY_REMOVE, [...childFieldPathId.path, key]);
     }, [onChange, childFieldPathId]);
     /** Returns the stable React key for a property. For the most recently renamed
@@ -29514,9 +29489,8 @@ function ObjectField$1(props) {
     }, []);
     if (!renderOptionalField || hasFormData) {
         try {
-            const definedPropertySet = new Set(definedPropertyOrder);
-            const currentAdditionalProperties = additionalPropertyOrder.filter((property) => Object.hasOwn(schemaProperties, property) && !definedPropertySet.has(property));
-            orderedProperties = orderProperties([...definedPropertyOrder, ...currentAdditionalProperties], uiOptions.order);
+            const properties = Object.keys(schemaProperties);
+            orderedProperties = orderProperties(properties, uiOptions.order);
         }
         catch (err) {
             return (jsxRuntimeExports.jsxs("div", { children: [jsxRuntimeExports.jsx("p", { className: 'rjsf-config-error', style: { color: 'red' }, children: jsxRuntimeExports.jsx(AZ, { options: { disableParsingRawHTML: true }, children: translateString(TranslatableString.InvalidObjectField, [name || 'root', err.message]) }) }), jsxRuntimeExports.jsx("pre", { children: JSON.stringify(schema) })] }));
@@ -29529,7 +29503,7 @@ function ObjectField$1(props) {
         title: uiOptions.label === false ? '' : templateTitle,
         description: uiOptions.label === false ? undefined : description,
         properties: orderedProperties.map((propertyName) => {
-            const addedByAdditionalProperties = isAdditionalPropertySchema(schema.properties?.[propertyName]);
+            const addedByAdditionalProperties = Boolean(schema.properties?.[propertyName]?.[ADDITIONAL_PROPERTY_FLAG]);
             const fieldUiSchema = addedByAdditionalProperties ? uiSchema.additionalProperties : uiSchema[propertyName];
             const hidden = getUiOptions(fieldUiSchema).widget === 'hidden';
             const content = (jsxRuntimeExports.jsx(ObjectFieldProperty, { propertyName: propertyName, required: isRequired(schema, propertyName), schema: _baseIteratee.get(schema, [PROPERTIES_KEY, propertyName], {}), uiSchema: fieldUiSchema, errorSchema: _baseIteratee.get(errorSchema, [propertyName]), fieldPathId: childFieldPathId, formData: _baseIteratee.get(formData, [propertyName]), handleKeyRename: handleKeyRename, handleRemoveProperty: handleRemoveProperty, addedByAdditionalProperties: addedByAdditionalProperties, onChange: onChange, onBlur: onBlur, onFocus: onFocus, registry: registry, disabled: disabled, readonly: readonly, hideError: hideError }, getStableKey(propertyName)));