@evoke-platform/ui-components 1.5.1-testing.1 → 1.6.0-dev.10

package/dist/published/components/core/SwipeableDrawer/SwipeableDrawer.d.ts

@@ -0,0 +1,4 @@
+import { SwipeableDrawerProps } from '@mui/material';
+import * as React from 'react';
+declare const SwipeableDrawer: (props: SwipeableDrawerProps) => React.JSX.Element;
+export default SwipeableDrawer;

package/dist/published/components/core/SwipeableDrawer/SwipeableDrawer.js

@@ -0,0 +1,8 @@
+import { SwipeableDrawer as MuiSwipeableDrawer } from '@mui/material';
+import * as React from 'react';
+import UIThemeProvider from '../../../theme';
+const SwipeableDrawer = (props) => {
+    return (React.createElement(UIThemeProvider, null,
+        React.createElement(MuiSwipeableDrawer, { ...props })));
+};
+export default SwipeableDrawer;

package/dist/published/components/core/SwipeableDrawer/index.d.ts

@@ -0,0 +1,3 @@
+import SwipeableDrawer from './SwipeableDrawer';
+export default SwipeableDrawer;
+export { SwipeableDrawer };

package/dist/published/components/core/SwipeableDrawer/index.js

@@ -0,0 +1,3 @@
+import SwipeableDrawer from './SwipeableDrawer';
+export default SwipeableDrawer;
+export { SwipeableDrawer };

package/dist/published/components/core/index.d.ts

@@ -37,6 +37,7 @@ export { Skeleton } from './Skeleton';
 export { Snackbar } from './Snackbar';
 export * from './StaticDatePicker';
 export { Step, StepButton, StepConnector, StepContent, StepIcon, StepLabel, Stepper } from './Stepper';
+export { SwipeableDrawer } from './SwipeableDrawer';
 export { Switch } from './Switch';
 export { Table } from './Table';
 export { Tab, Tabs } from './Tabs';
@@ -47,7 +48,7 @@ export { Tooltip } from './Tooltip';
 export { Typography } from './Typography';
 export { TabContext, TabList, TabPanel, TreeItem, TreeView } from '@mui/lab';
 export { CardActionArea, CardActions, CardContent, CardHeader, CardMedia, Input, InputAdornment, InputLabel, ListItemButton, ListItemText, MenuList, SvgIcon, TableBody, TableCell, TableContainer, TableHead, TablePagination, TableRow, TableSortLabel, } from '@mui/material';
-export { useGridApiRef } from '@mui/x-data-grid';
+export { GridToolbarContainer, GridToolbarQuickFilter, useGridApiRef } from '@mui/x-data-grid';
 export { TreeItem as RichTreeItem, RichTreeView, TreeItem2Content, TreeItem2DragAndDropOverlay, TreeItem2GroupTransition, TreeItem2Icon, TreeItem2IconContainer, TreeItem2Label, TreeItem2Provider, TreeItem2Root, useTreeItem2, } from '@mui/x-tree-view';
 export type { GridSize } from '@mui/material';
 export type { GridCellParams, GridColDef, GridEventListener, GridFilterModel, GridInitialState, GridRowParams, GridSortModel, GridValueFormatterParams, GridValueGetterParams, } from '@mui/x-data-grid';

package/dist/published/components/core/index.js

@@ -37,6 +37,7 @@ export { Skeleton } from './Skeleton';
 export { Snackbar } from './Snackbar';
 export * from './StaticDatePicker';
 export { Step, StepButton, StepConnector, StepContent, StepIcon, StepLabel, Stepper } from './Stepper';
+export { SwipeableDrawer } from './SwipeableDrawer';
 export { Switch } from './Switch';
 export { Table } from './Table';
 export { Tab, Tabs } from './Tabs';
@@ -48,5 +49,5 @@ export { Typography } from './Typography';
 //TODO: Review following components. They also need theme control:
 export { TabContext, TabList, TabPanel, TreeItem, TreeView } from '@mui/lab';
 export { CardActionArea, CardActions, CardContent, CardHeader, CardMedia, Input, InputAdornment, InputLabel, ListItemButton, ListItemText, MenuList, SvgIcon, TableBody, TableCell, TableContainer, TableHead, TablePagination, TableRow, TableSortLabel, } from '@mui/material';
-export { useGridApiRef } from '@mui/x-data-grid';
+export { GridToolbarContainer, GridToolbarQuickFilter, useGridApiRef } from '@mui/x-data-grid';
 export { TreeItem as RichTreeItem, RichTreeView, TreeItem2Content, TreeItem2DragAndDropOverlay, TreeItem2GroupTransition, TreeItem2Icon, TreeItem2IconContainer, TreeItem2Label, TreeItem2Provider, TreeItem2Root, useTreeItem2, } from '@mui/x-tree-view';

package/dist/published/components/custom/BuilderGrid/BuilderGrid.js

@@ -17,7 +17,32 @@ const BuilderGrid = (props) => {
             borderBottom: 'none',
             boxShadow: 'rgba(145, 158, 171, 0.2) 0px 8px 16px',
         } },
-        React.createElement(MuiDataGrid, { autoPageSize: !disablePagination, hideFooterPagination: disablePagination, hideFooter: disablePagination, onMenuOpen: (env) => setAnchorEl(env.target), loading: loading, rows: rows, ...rest, sx: {
+        React.createElement(MuiDataGrid, { autoPageSize: !disablePagination, hideFooterPagination: disablePagination, hideFooter: disablePagination, onMenuOpen: (env) => setAnchorEl(env.target), loading: loading, rows: rows, getRowId: (row) => row.id, disableColumnMenu: true, initialState: {
+                sorting: {
+                    sortModel: initialSort ? [initialSort] : [],
+                },
+            }, componentsProps: {
+                panel: {
+                    anchorEl: anchorEl,
+                    placement: 'bottom-end',
+                    sx: {
+                        '& .MuiPaper-root': {
+                            borderRadius: '6px',
+                            boxShadow: '0px 24px 48px rgba(145, 158, 171, 0.4)',
+                            padding: '8px',
+                            stop: -120,
+                        },
+                    },
+                },
+            }, slots: {
+                toolbar: hideToolbar ? null : toolbar,
+                noResultsOverlay: () => {
+                    return React.createElement(Box, null);
+                },
+                noRowsOverlay: () => {
+                    return noRowsOverlay ? noRowsOverlay : null;
+                },
+            }, rowHeight: 60, columnHeaderHeight: 62, ...rest, sx: {
                 border: 'none',
                 '& .MuiDataGrid-toolbarContainer': {
                     padding: '0',
@@ -64,32 +89,7 @@ const BuilderGrid = (props) => {
                 },
                 height: disablePagination && !loading ? 'auto' : 'calc(100vh - 240px)',
                 ...rest.sx,
-            }, getRowId: (row) => row.id, disableColumnMenu: true, initialState: {
-                sorting: {
-                    sortModel: initialSort ? [initialSort] : [],
-                },
-            }, componentsProps: {
-                panel: {
-                    anchorEl: anchorEl,
-                    placement: 'bottom-end',
-                    sx: {
-                        '& .MuiPaper-root': {
-                            borderRadius: '6px',
-                            boxShadow: '0px 24px 48px rgba(145, 158, 171, 0.4)',
-                            padding: '8px',
-                            stop: -120,
-                        },
-                    },
-                },
-            }, slots: {
-                toolbar: hideToolbar ? null : toolbar,
-                noResultsOverlay: () => {
-                    return React.createElement(Box, null);
-                },
-                noRowsOverlay: () => {
-                    return noRowsOverlay ? noRowsOverlay : null;
-                },
-            }, rowHeight: 60, columnHeaderHeight: 62 }))) : (React.createElement(React.Fragment, null, error ? (React.createElement(Box, { sx: {
+            } }))) : (React.createElement(React.Fragment, null, error ? (React.createElement(Box, { sx: {
             backgroundColor: '#fff',
             borderRadius: '6px',
             display: 'flex',

package/dist/published/components/custom/Form/Common/FormComponentWrapper.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { ErrorRounded, Help, HighlightOffOutlined } from '../../../../icons';
+import { ErrorRounded, Help } from '../../../../icons';
 import { IconButton, Tooltip, Typography } from '../../../core';
 import { Box } from '../../../layout';
 const underFieldStyles = {
@@ -13,11 +13,6 @@ const descriptionStyles = {
     whiteSpace: 'normal',
     paddingBottom: '4px',
 };
-const clearBtnStyles = {
-    color: '#637381',
-    fontSize: '1.2rem',
-    marginBottom: '2px',
-};
 const PrefixSuffix = (props) => {
     const { prefix, suffix, height } = props;
     const text = prefix || suffix;
@@ -51,7 +46,7 @@ const PrefixSuffix = (props) => {
  * description, tooltip, prefix, suffix and word/char counts
  */
 export const FormComponentWrapper = (props) => {
-    const { inputId, label, description, tooltip, prefix, suffix, value, validate, errorMessage, showCharCount, type, viewOnly, children, displayOption, onChange, property, readOnly, } = props;
+    const { inputId, label, description, tooltip, prefix, suffix, value, validate, errorMessage, showCharCount, type, viewOnly, children, displayOption, property, } = props;
     const [fieldHeight, setFieldHeight] = useState(40);
     const { maxLength } = validate;
     const fieldRef = useRef(null);
@@ -76,12 +71,6 @@ export const FormComponentWrapper = (props) => {
                     tooltip && (React.createElement(Tooltip, { placement: "right", title: tooltip },
                         React.createElement(IconButton, null,
                             React.createElement(Help, { sx: { fontSize: '14px' } }))))),
-                displayOption === 'radioButton' && onChange && !viewOnly && !readOnly && value && (React.createElement(Tooltip, { title: `Clear` },
-                    React.createElement("span", null,
-                        React.createElement(IconButton, { "aria-label": `Clear`, sx: { padding: '0px' }, onClick: () => {
-                                property && onChange(property.id, '');
-                            } },
-                            React.createElement(HighlightOffOutlined, { sx: clearBtnStyles }))))),
                 React.createElement(Box, { sx: { ...(displayOption === 'radioButton' && { display: 'flex' }) } },
                     React.createElement(Typography, { variant: "caption", sx: descriptionStyles }, description)))),
             React.createElement(Box, { sx: { display: 'flex', flexDirection: 'row' } },

package/dist/published/components/custom/Form/FormComponents/FormFieldComponent.d.ts

@@ -12,6 +12,7 @@ type FormFieldComponentProps = Omit<BaseFormComponentProps, 'property'> & {
     initialValue?: string;
     displayOption?: 'radioButton' | 'dropdown';
     strictlyTrue?: boolean;
+    nonStrictEnum?: boolean;
 };
 export declare class FormFieldComponent extends ReactComponent {
     [x: string]: any;

package/dist/published/components/custom/Form/FormComponents/FormFieldComponent.js

@@ -485,6 +485,6 @@ export class FormFieldComponent extends ReactComponent {
                             falsePositiveMaskError &&
                             isEmpty(this.errorDetails) &&
                             this.emit('changed-' + this.component.key, e.target.value);
-                    }, ...this.component, id: inputId, defaultValue: this.dataValue, mask: this.component.inputMask, error: this.hasErrors(), size: this.component.fieldHeight ?? 'medium', required: this.component.property.type === 'boolean' ? this.component.strictlyTrue : undefined }))), root);
+                    }, ...this.component, id: inputId, defaultValue: this.dataValue, mask: this.component.inputMask, error: this.hasErrors(), size: this.component.fieldHeight ?? 'medium', required: this.component.property.type === 'boolean' ? this.component.strictlyTrue : undefined, isCombobox: this.component.nonStrictEnum }))), root);
     }
 }

package/dist/published/components/custom/Form/FormComponents/RepeatableFieldComponent/RepeatableField.js

@@ -7,6 +7,7 @@ import sift from 'sift';
 import { Edit, TrashCan } from '../../../../../icons';
 import { Button, IconButton, Skeleton, Snackbar, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Tooltip, Typography, } from '../../../../core';
 import { Box } from '../../../../layout';
+import { getReadableQuery } from '../../../CriteriaBuilder';
 import { getPrefixedUrl, normalizeDateTime, retrieveCustomErrorMessage } from '../../utils';
 import { ActionDialog } from './ActionDialog';
 import { DocumentViewerCell } from './DocumentViewerCell';
@@ -37,6 +38,7 @@ const RepeatableField = (props) => {
     const [relatedObject, setRelatedObject] = useState();
     const [hasCreateAction, setHasCreateAction] = useState(false);
     const [users, setUsers] = useState();
+    const [criteriaObjects, setCriteriaObjects] = useState([]);
     const [openDialog, setOpenDialog] = useState(false);
     const [dialogType, setDialogType] = useState();
     const [selectedRow, setSelectedRow] = useState();
@@ -50,9 +52,7 @@ const RepeatableField = (props) => {
     const [error, setError] = useState(false);
     const DEFAULT_CREATE_ACTION = '_create';
     const { instanceChanges } = useNotification();
-    const fetchRelatedInstances = useCallback(async () => {
-        if (openDialog)
-            return;
+    const fetchRelatedObject = useCallback(async () => {
         let relatedObject;
         if (property.objectId) {
             try {
@@ -80,31 +80,86 @@ const RepeatableField = (props) => {
             catch (err) {
                 console.error(error);
             }
-            if (property.relatedPropertyId && instance?.id) {
-                const filterProperty = `${property.relatedPropertyId}.id`;
-                const filter = { where: { [filterProperty]: instance?.id }, limit: 100 };
-                const objectId = property.objectId;
-                try {
-                    const timeout = setTimeout(() => {
-                        setLoading(false);
-                    }, 300);
-                    setLoading(true);
-                    const instances = await apiServices.get(getPrefixedUrl(`/objects/${objectId}/instances`), {
-                        params: { filter: JSON.stringify(filter) },
-                    });
-                    clearTimeout(timeout);
+        }
+        relatedObject && checkCreateAccess(relatedObject);
+    }, [apiServices, property]);
+    const fetchRelatedInstances = useCallback(async () => {
+        if (openDialog)
+            return;
+        if (property.objectId && property.relatedPropertyId && instance?.id) {
+            const filterProperty = `${property.relatedPropertyId}.id`;
+            const filter = { where: { [filterProperty]: instance?.id }, limit: 100 };
+            const objectId = property.objectId;
+            try {
+                const timeout = setTimeout(() => {
                     setLoading(false);
-                    if (instances) {
-                        setRelatedInstances(instances);
-                    }
-                }
-                catch (error) {
-                    setError(true);
+                }, 300);
+                setLoading(true);
+                const instances = await apiServices.get(getPrefixedUrl(`/objects/${objectId}/instances`), {
+                    params: { filter: JSON.stringify(filter) },
+                });
+                clearTimeout(timeout);
+                setLoading(false);
+                if (instances) {
+                    setRelatedInstances(instances);
                 }
             }
+            catch (error) {
+                setError(true);
+            }
         }
-        relatedObject && checkCreateAccess(relatedObject);
-    }, [apiServices, property, viewLayout]);
+    }, [apiServices, property]);
+    const fetchCriteriaObjects = useCallback(async () => {
+        let objectIds = [];
+        const criteriaProperties = relatedObject?.properties?.filter((property) => property.type === 'criteria' && property.objectId) ?? [];
+        if (tableViewLayout) {
+            objectIds = criteriaProperties
+                .filter((p) => tableViewLayout.properties.some((column) => column.id === p.id))
+                .map((property) => property.objectId);
+        }
+        else {
+            objectIds = criteriaProperties.map((p) => p.objectId);
+        }
+        const objects = [];
+        for (const objectId of new Set(objectIds)) {
+            try {
+                const criteriaObject = await apiServices.get(getPrefixedUrl(`/objects/${objectId}/effective`), {
+                    params: { fields: ['id', 'name', 'properties'] },
+                });
+                objects.push(criteriaObject);
+            }
+            catch (error) {
+                console.error(`Error fetching criteria object with ID ${objectId}:`, error);
+            }
+        }
+        setCriteriaObjects(objects);
+    }, [apiServices, relatedObject, tableViewLayout]);
+    useEffect(() => {
+        (async () => {
+            try {
+                const users = await apiServices.get(getPrefixedUrl(`/users`));
+                setUsers(users);
+            }
+            catch (error) {
+                console.error(error);
+            }
+        })();
+    }, [apiServices]);
+    useEffect(() => {
+        fetchRelatedObject();
+        fetchRelatedInstances();
+    }, [fetchRelatedInstances, fetchRelatedObject, reloadOnErrorTrigger, instance]);
+    useEffect(() => {
+        if (relatedObject)
+            fetchCriteriaObjects();
+    }, [fetchCriteriaObjects, relatedObject]);
+    useEffect(() => {
+        if (relatedObject?.rootObjectId) {
+            const callback = () => fetchRelatedInstances();
+            instanceChanges?.subscribe(relatedObject?.rootObjectId, callback);
+            return () => instanceChanges?.unsubscribe(relatedObject?.rootObjectId, callback);
+        }
+    }, [instanceChanges, relatedObject]);
     const retrieveCriteria = (relatedObjProperty, action, object) => {
         let property;
         if (action.parameters) {
@@ -171,27 +226,6 @@ const RepeatableField = (props) => {
             });
         }
     };
-    useEffect(() => {
-        (async () => {
-            try {
-                const users = await apiServices.get(getPrefixedUrl(`/users`));
-                setUsers(users);
-            }
-            catch (error) {
-                console.error(error);
-            }
-        })();
-    }, [apiServices]);
-    useEffect(() => {
-        fetchRelatedInstances();
-    }, [fetchRelatedInstances, reloadOnErrorTrigger, instance]);
-    useEffect(() => {
-        if (relatedObject?.rootObjectId) {
-            const callback = () => fetchRelatedInstances();
-            instanceChanges?.subscribe(relatedObject?.rootObjectId, callback);
-            return () => instanceChanges?.unsubscribe(relatedObject?.rootObjectId, callback);
-        }
-    }, [instanceChanges, relatedObject]);
     const deleteRow = (id) => {
         setDialogType('delete');
         setSelectedRow(id);
@@ -334,28 +368,24 @@ const RepeatableField = (props) => {
     };
     const getValue = (relatedInstance, propertyId, propertyType) => {
         const value = get(relatedInstance, propertyId);
-        // If the property is not date-like then just return the
-        // value found at the given path.
-        if (!['date', 'date-time', 'time'].includes(propertyType)) {
-            return value;
-        }
         // If the date-like value is empty then there is no need to format.
         if (!value) {
             return value;
         }
-        // At this point it has been asserted that there is a value
-        // and since the property is date-like the value must be
-        // a string.
-        const stringValue = value;
         if (propertyType === 'date') {
-            return DateTime.fromISO(stringValue).toLocaleString(DateTime.DATE_SHORT);
+            return DateTime.fromISO(value).toLocaleString(DateTime.DATE_SHORT);
         }
         if (propertyType === 'date-time') {
-            return DateTime.fromISO(stringValue).toLocaleString(DateTime.DATETIME_SHORT);
+            return DateTime.fromISO(value).toLocaleString(DateTime.DATETIME_SHORT);
         }
         if (propertyType === 'time') {
-            return DateTime.fromISO(stringValue).toLocaleString(DateTime.TIME_SIMPLE);
+            return DateTime.fromISO(value).toLocaleString(DateTime.TIME_SIMPLE);
+        }
+        if (propertyType === 'criteria' && typeof value === 'object') {
+            const property = relatedObject?.properties?.find((p) => p.id === propertyId);
+            return getReadableQuery(value, criteriaObjects.find((o) => o.id === property?.objectId)?.properties ?? []);
         }
+        return value;
     };
     const columns = retrieveViewLayout();
     return loading ? (React.createElement(React.Fragment, null,

package/dist/published/components/custom/Form/tests/Form.test.js

@@ -6,7 +6,7 @@ import { isEqual } from 'lodash';
 import { http, HttpResponse } from 'msw';
 import { setupServer } from 'msw/node';
 import React from 'react';
-import { it } from 'vitest';
+import { expect, it } from 'vitest';
 import Form from '../Common/Form';
 import { licenseObject, npLicense, npSpecialtyType1, npSpecialtyType2, rnLicense, rnSpecialtyType1, rnSpecialtyType2, specialtyObject, specialtyTypeObject, } from './test-data';
 const removePoppers = () => {

package/dist/published/components/custom/Form/utils.js

@@ -165,6 +165,7 @@ export function convertFormToComponents(entries, parameters, object) {
                 data: {
                     values: entry.type === 'input' ? entry.enumWithLabels : undefined,
                 },
+                nonStrictEnum: parameter.nonStrictEnum,
                 property: property,
                 defaultToCurrentTime: displayOptions?.defaultValue === 'currentTime' && parameter.type === 'time' ? true : false,
                 defaultToCurrentDate: displayOptions?.defaultValue === 'currentDate' && parameter.type === 'date' ? true : false,

package/dist/published/components/custom/FormField/AddressFieldComponent/addressFieldComponent.js

@@ -45,7 +45,7 @@ const AddressFieldComponent = (props) => {
         setAnchorEl(null);
     };
     return (React.createElement(Box, null,
-        !mask ? (React.createElement(TextField, { id: id, inputRef: textFieldRef, onChange: !readOnly ? handleChange : undefined, error: error, errorMessage: errorMessage, value: value, fullWidth: true, onBlur: onBlur, size: size ?? 'medium', placeholder: placeholder, InputProps: {
+        !mask ? (React.createElement(TextField, { id: id, inputRef: textFieldRef, onChange: !readOnly ? handleChange : undefined, error: error, errorMessage: errorMessage, value: value, fullWidth: true, onBlur: onBlur, size: size ?? 'medium', placeholder: readOnly ? undefined : placeholder, InputProps: {
                 type: 'search',
                 autoComplete: 'off',
             }, required: required, readOnly: readOnly, multiline: property.type === 'string' && !readOnly && isMultiLineText, rows: isMultiLineText ? (rows ? rows : 3) : undefined, ...(additionalProps ?? {}) })) : (React.createElement(InputMask, { mask: mask, maskChar: inputMaskPlaceholderChar ?? '_', value: value, onChange: !readOnly ? handleChange : undefined, onBlur: onBlur, alwaysShowMask: true }, (() => (React.createElement(TextField, { id: id, inputRef: textFieldRef, sx: readOnly

package/dist/published/components/custom/FormField/BooleanSelect/BooleanSelect.js

@@ -56,12 +56,12 @@ const BooleanSelect = (props) => {
         return readOnlyComponent();
     }
     return displayOption === 'dropdown' ? (React.createElement(Autocomplete, { renderInput: (params) => (React.createElement(TextField, { ...params, error: error, errorMessage: errorMessage, onBlur: onBlur, fullWidth: true, sx: { background: 'white' }, placeholder: placeholder, size: size ?? 'medium' })), value: booleanOptions.find((opt) => opt.value === value) ?? '', onChange: (e, selectedValue) => handleChange(selectedValue.value), isOptionEqualToValue: (option, val) => option?.value === val?.value, options: booleanOptions, disableClearable: true, sx: { background: 'white', borderRadius: '8px' }, ...(additionalProps ?? {}), sortBy: "NONE", required: strictlyTrue })) : (React.createElement(FormControl, { required: strictlyTrue, error: error, fullWidth: true },
-        React.createElement(FormControlLabel, { labelPlacement: "end", label: labelComponent(), control: displayOption === 'switch' ? (React.createElement(Switch, { id: id, "aria-required": strictlyTrue, "aria-invalid": error, size: size ?? 'medium', name: property.id, checked: value, onChange: (e) => handleChange(e.target.checked), sx: {
+        React.createElement(FormControlLabel, { labelPlacement: "end", label: labelComponent(), sx: { marginLeft: '-8px' }, control: displayOption === 'switch' ? (React.createElement(Switch, { id: id, "aria-required": strictlyTrue, "aria-invalid": error, size: size ?? 'medium', name: property.id, checked: value, onChange: (e) => handleChange(e.target.checked), sx: {
                     alignSelf: 'start',
-                } })) : (React.createElement(Checkbox, { id: id, "aria-required": strictlyTrue, "aria-invalid": error, size: size ?? 'medium', checked: value, name: property.id, onChange: (e) => handleChange(e.target.checked), sx: {
+                }, ...(additionalProps ?? {}) })) : (React.createElement(Checkbox, { id: id, "aria-required": strictlyTrue, "aria-invalid": error, size: size ?? 'medium', checked: value, name: property.id, onChange: (e) => handleChange(e.target.checked), sx: {
                     alignSelf: 'start',
                     padding: '4px 9px 9px 9px',
-                } })) }),
+                }, ...(additionalProps ?? {}) })) }),
         error && errorMessage?.length && React.createElement(FormHelperText, { sx: { marginX: 0 } }, errorMessage),
         descriptionComponent()));
 };

package/dist/published/components/custom/FormField/DatePickerSelect/DatePickerSelect.js

@@ -1,4 +1,5 @@
 import { DateTimeFormatter } from '@js-joda/core';
+import { omit } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { InvalidDate, LocalDate, nativeJs } from '../../../../util';
 import { DatePicker, LocalizationProvider, TextField } from '../../../core';
@@ -36,6 +37,11 @@ const DatePickerSelect = (props) => {
         onChange && onChange(property.id, date, property);
     };
     return readOnly ? (React.createElement(InputFieldComponent, { ...{ ...props, defaultValue: asMonthDayYearFormat(value) } })) : (React.createElement(LocalizationProvider, null,
-        React.createElement(DatePicker, { value: value, onChange: handleChange, inputFormat: "MM/dd/yyyy", renderInput: (params) => (React.createElement(TextField, { ...params, id: id, error: error, errorMessage: errorMessage, onBlur: onBlur, fullWidth: true, required: required, sx: { background: 'white', borderRadius: '8px' }, size: size ?? 'medium', ...(additionalProps ?? {}) })) })));
+        React.createElement(DatePicker, { value: value, onChange: handleChange, inputFormat: "MM/dd/yyyy", renderInput: (params) => (React.createElement(TextField, { ...params, id: id, error: error, errorMessage: errorMessage, onBlur: onBlur, fullWidth: true, required: required, sx: { background: 'white', borderRadius: '8px' }, size: size ?? 'medium', 
+                // merges MUI inputProps with additionalProps.inputProps in a way that still shows the value
+                inputProps: {
+                    ...params.inputProps,
+                    ...(additionalProps?.inputProps ?? {}),
+                }, ...omit(additionalProps, ['inputProps']) })) })));
 };
 export default DatePickerSelect;

package/dist/published/components/custom/FormField/DateTimePickerSelect/DateTimePickerSelect.js

@@ -1,4 +1,5 @@
 import { LocalDate, LocalDateTime, LocalTime, nativeJs } from '@js-joda/core';
+import { omit } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { InvalidDate } from '../../../../util';
 import { DateTimePicker, LocalizationProvider, TextField } from '../../../core';
@@ -43,6 +44,11 @@ const DateTimePickerSelect = (props) => {
         props.onChange && props.onChange(property.id, date, property);
     };
     return readOnly ? (React.createElement(InputFieldComponent, { ...{ ...props, defaultValue: formatDateTime(value) } })) : (React.createElement(LocalizationProvider, null,
-        React.createElement(DateTimePicker, { value: value, onChange: handleChange, renderInput: (params) => (React.createElement(TextField, { ...params, id: id, error: error, errorMessage: errorMessage, onBlur: onBlur, fullWidth: true, required: required, sx: { background: 'white', borderRadius: '8px' }, size: size ?? 'medium', ...(additionalProps ?? {}) })) })));
+        React.createElement(DateTimePicker, { value: value, onChange: handleChange, renderInput: (params) => (React.createElement(TextField, { ...params, id: id, error: error, errorMessage: errorMessage, onBlur: onBlur, fullWidth: true, required: required, sx: { background: 'white', borderRadius: '8px' }, size: size ?? 'medium', 
+                // merges MUI inputProps with additionalProps.inputProps in a way that still shows the value
+                inputProps: {
+                    ...params.inputProps,
+                    ...(additionalProps?.inputProps ?? {}),
+                }, ...omit(additionalProps, ['inputProps']) })) })));
 };
 export default DateTimePickerSelect;

package/dist/published/components/custom/FormField/FormField.d.ts

@@ -35,6 +35,7 @@ export type FormFieldProps = {
     label?: string;
     description?: string;
     tooltip?: string;
+    isCombobox?: boolean;
 };
 declare const FormField: (props: FormFieldProps) => React.JSX.Element;
 export default FormField;

package/dist/published/components/custom/FormField/FormField.js

@@ -8,7 +8,7 @@ import InputFieldComponent from './InputFieldComponent/InputFieldComponent';
 import Select from './Select/Select';
 import TimePickerSelect from './TimePickerSelect/TimePickerSelect';
 const FormField = (props) => {
-    const { id, defaultValue, error, onChange, property, readOnly, selectOptions, required, strictlyTrue, size, placeholder, errorMessage, onBlur, mask, max, min, isMultiLineText, rows, inputMaskPlaceholderChar, queryAddresses, isOptionEqualToValue, renderOption, disableCloseOnSelect, getOptionLabel, additionalProps, displayOption, sortBy, label, description, tooltip, } = props;
+    const { id, defaultValue, error, onChange, property, readOnly, selectOptions, required, strictlyTrue, size, placeholder, errorMessage, onBlur, mask, max, min, isMultiLineText, rows, inputMaskPlaceholderChar, queryAddresses, isOptionEqualToValue, renderOption, disableCloseOnSelect, getOptionLabel, additionalProps, displayOption, sortBy, label, description, tooltip, isCombobox, } = props;
     let control;
     const commonProps = {
         id: id ?? property.id,
@@ -36,6 +36,7 @@ const FormField = (props) => {
         label,
         description,
         tooltip,
+        isCombobox,
     };
     if (queryAddresses) {
         control = (React.createElement(AddressFieldComponent, { ...commonProps, mask: mask, inputMaskPlaceholderChar: inputMaskPlaceholderChar, isMultiLineText: isMultiLineText, rows: rows, queryAddresses: queryAddresses }));

package/dist/published/components/custom/FormField/InputFieldComponent/InputFieldComponent.js

@@ -36,9 +36,12 @@ const InputFieldComponent = (props) => {
         setInputValue(selectValue);
     };
     const InputProps = property.type === 'number'
-        ? { inputComponent: NumericFormat, inputProps: { min, max, readOnly } }
+        ? {
+            inputComponent: NumericFormat,
+            inputProps: { min, max, readOnly, ...(additionalProps?.inputProps ?? {}) },
+        }
         : property.type === 'integer'
-            ? { inputProps: { min, max } }
+            ? { inputProps: { min, max, ...(additionalProps?.inputProps ?? {}) } }
             : null;
     return property.enum && !readOnly ? (React.createElement(Autocomplete, { id: id, 
         // note: this is different between widgets and builder
@@ -62,7 +65,7 @@ const InputFieldComponent = (props) => {
                     backgroundColor: '#f4f6f8',
                 },
             }),
-        }, error: error, errorMessage: errorMessage, value: value, onChange: !readOnly ? handleChange : undefined, InputProps: { ...InputProps, readOnly: readOnly }, required: required, fullWidth: true, onBlur: onBlur, placeholder: placeholder, size: size ?? 'medium', type: property.type === 'integer' ? 'number' : 'text', multiline: property.type === 'string' && !readOnly && isMultiLineText, rows: isMultiLineText ? (rows ? rows : 3) : undefined, ...(additionalProps ?? {}) })) : (React.createElement(InputMask, { mask: mask, maskChar: inputMaskPlaceholderChar ?? '_', value: value, onChange: !readOnly ? handleChange : undefined, onBlur: onBlur, alwaysShowMask: true }, (() => (React.createElement(TextField, { id: id, sx: readOnly
+        }, error: error, errorMessage: errorMessage, value: value, onChange: !readOnly ? handleChange : undefined, InputProps: { ...InputProps, readOnly: readOnly }, required: required, fullWidth: true, onBlur: onBlur, placeholder: readOnly ? undefined : placeholder, size: size ?? 'medium', type: property.type === 'integer' ? 'number' : 'text', multiline: property.type === 'string' && !readOnly && isMultiLineText, rows: isMultiLineText ? (rows ? rows : 3) : undefined, ...(additionalProps ?? {}) })) : (React.createElement(InputMask, { mask: mask, maskChar: inputMaskPlaceholderChar ?? '_', value: value, onChange: !readOnly ? handleChange : undefined, onBlur: onBlur, alwaysShowMask: true }, (() => (React.createElement(TextField, { id: id, sx: readOnly
             ? {
                 '& .MuiOutlinedInput-notchedOutline': {
                     border: 'none',