@vertigis/react-ui 19.0.1 → 19.0.2

package/FormLabelTextField/FormLabelTextField.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef } from "react";
+import { forwardRef, useMemo } from "react";
 import FormControl from "../FormControl/index.js";
 import FormHelperText from "../FormHelperText/index.js";
 import FormLabel from "../FormLabel/index.js";
@@ -11,17 +11,45 @@ import { useId } from "../utils/react.js";
  * for inline help.
  */
 const FormLabelTextField = forwardRef((props, ref) => {
-    const { autoComplete, autoFocus = false, children, defaultValue, FormHelperTextProps, fullWidth = false, helperText, id: idProp, InputLabelProps, inputProps, InputProps, inputRef, label, maxRows, minRows, multiline = false, name, nativeSelect = false, onBlur, onChange, onFocus, placeholder, rows, select = false, SelectProps, type, value, ...other } = props;
+    const { autoComplete, autoFocus = false, children, defaultValue, FormHelperTextProps, fullWidth = false, helperText, id: idProp, InputLabelProps, inputProps, InputProps, inputRef, label, maxRows, minRows, multiline = false, name, nativeSelect = false, onBlur, onChange, onFocus, placeholder, rows, select = false, SelectProps, slotProps, type, value, ...other } = props;
     const id = useId(idProp);
     const helperTextId = helperText && id ? `${id}-helper-text` : undefined;
     const inputLabelId = label && id ? `${id}-label` : undefined;
-    const inputMoreProps = {};
+    const { formHelperTextProps, inputLabelProps, htmlInputProps, propsForInput, selectProps } = useMemo(() => {
+        const formHelperTextProps = (slotProps?.formHelperText ??
+            FormHelperTextProps ??
+            {});
+        const htmlInputProps = slotProps?.htmlInput ?? inputProps;
+        const inputLabelProps = (slotProps?.inputLabel ??
+            InputLabelProps ??
+            {});
+        const propsForInput = (slotProps?.input ??
+            InputProps ??
+            {});
+        const selectProps = (slotProps?.select ??
+            SelectProps ??
+            {});
+        return {
+            formHelperTextProps,
+            htmlInputProps,
+            inputLabelProps,
+            propsForInput,
+            selectProps,
+        };
+    }, [
+        FormHelperTextProps,
+        InputLabelProps,
+        inputProps,
+        InputProps,
+        SelectProps,
+        slotProps,
+    ]);
     if (select || nativeSelect) {
         // Unset defaults from textbox inputs.
-        if (!SelectProps || (!SelectProps.native && !nativeSelect)) {
-            inputMoreProps.id = undefined;
+        if (!selectProps || (!selectProps.native && !nativeSelect)) {
+            propsForInput.id = undefined;
         }
-        inputMoreProps["aria-describedby"] = undefined;
+        propsForInput["aria-describedby"] = undefined;
     }
     const InputElement = (_jsx(Input
     // All of the properties fron here down to `InputProps` can be overridden by it.
@@ -34,7 +62,7 @@ const FormLabelTextField = forwardRef((props, ref) => {
         // if it exists rather than set it.
         //
         // eslint-disable-next-line jsx-a11y/no-autofocus
-        autoFocus: autoFocus, defaultValue: defaultValue, fullWidth: fullWidth, inputProps: inputProps, inputRef: inputRef, maxRows: maxRows, minRows: minRows, multiline: multiline, name: name, onBlur: onBlur, onChange: onChange, onFocus: onFocus, placeholder: placeholder, rows: rows, type: type, value: value, ...inputMoreProps, ...InputProps, "aria-describedby": helperTextId, id: id }));
-    return (_jsxs(FormControl, { fullWidth: fullWidth, ref: ref, ...other, children: [label && (_jsx(FormLabel, { htmlFor: id, id: inputLabelId, children: label })), helperText && (_jsx(FormHelperText, { ...FormHelperTextProps, id: helperTextId, children: helperText })), select || nativeSelect ? (_jsx(Select, { "aria-describedby": helperTextId, id: id, labelId: inputLabelId, value: value, input: InputElement, ...SelectProps, ...(nativeSelect && { native: true }), children: children })) : (InputElement)] }));
+        autoFocus: autoFocus, defaultValue: defaultValue, fullWidth: fullWidth, inputProps: htmlInputProps, inputRef: inputRef, maxRows: maxRows, minRows: minRows, multiline: multiline, name: name, onBlur: onBlur, onChange: onChange, onFocus: onFocus, placeholder: placeholder, rows: rows, type: type, value: value, ...propsForInput, "aria-describedby": helperTextId, id: id }));
+    return (_jsxs(FormControl, { fullWidth: fullWidth, ref: ref, ...other, children: [label && (_jsx(FormLabel, { ...inputLabelProps, htmlFor: id, id: inputLabelId, children: label })), helperText && (_jsx(FormHelperText, { ...formHelperTextProps, id: helperTextId, children: helperText })), select || nativeSelect ? (_jsx(Select, { "aria-describedby": helperTextId, id: id, labelId: inputLabelId, value: value, input: InputElement, ...selectProps, ...(nativeSelect && { native: true }), children: children })) : (InputElement)] }));
 });
 export default FormLabelTextField;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertigis/react-ui",
-  "version": "19.0.1",
+  "version": "19.0.2",
   "description": "Utilities and React components used in VertiGIS applications.",
   "keywords": [
     "vertigis",