@redsift/table 11.10.0-muiv6 → 11.11.0-muiv5

package/_internal/StatefulDataGrid2.js

@@ -1,1791 +1,15 @@
-import { _ as _objectSpread2, a as _objectWithoutProperties, b as _extends$1 } from './_rollupPluginBabelHelpers.js';
-import * as React from 'react';
+import { _ as _objectSpread2, b as _objectWithoutProperties, a as _extends } from './_rollupPluginBabelHelpers.js';
 import React__default, { useCallback, useEffect, useMemo, forwardRef, useRef, useState } from 'react';
 import classNames from 'classnames';
-import { Icon, useTheme as useTheme$1, ThemeProvider, RedsiftColorBlueN, RedsiftColorNeutralXDarkGrey, RedsiftColorNeutralWhite } from '@redsift/design-system';
-import { getGridNumericOperators as getGridNumericOperators$1, GridFilterInputValue, GridFilterInputSingleSelect, GridFilterInputMultipleValue, GridFilterInputMultipleSingleSelect, getGridStringOperators as getGridStringOperators$1, getGridBooleanOperators, getGridDateOperators, getGridSingleSelectOperators, GridLogicOperator, useGridApiRef, DataGridPro, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector } from '@mui/x-data-grid-pro';
-import { L as LicenseInfo, u as useControlledDatagridState, T as ThemeProvider$1, S as StyledDataGrid } from './useControlledDatagridState.js';
-import { mdiSync } from '@redsift/icons';
-import { _ as _objectWithoutPropertiesLoose, a as _extends, d as defaultSxConfig, i as isPlainObject, s as styled, b as styleFunctionSx, u as useTheme, c as clsx, e as createTheme, T as THEME_ID, C as ClassNameGenerator, P as PropTypes, g as generateUtilityClasses, f as generateUtilityClass, h as styled$1, j as useThemeProps, k as capitalize, l as composeClasses, r as rootShouldForwardProp, m as refType } from './Portal.js';
-import { j as jsxRuntimeExports } from './jsx-runtime.js';
-import { u as useFormControl, f as formControlState, i as isAdornedStart, a as isFilled, F as FormControlContext, b as useId, c as Select, I as Input, d as FilledInput, O as OutlinedInput, o as onServerSideSelectionStatusChange, S as ServerSideControlledPagination, C as ControlledPagination } from './ControlledPagination.js';
+import { useTheme, ThemeProvider, RedsiftColorBlueN, RedsiftColorNeutralXDarkGrey, RedsiftColorNeutralWhite } from '@redsift/design-system';
+import { GridLinkOperator, useGridApiRef, DataGridPro, gridPaginatedVisibleSortedGridRowEntriesSelector, gridPaginatedVisibleSortedGridRowIdsSelector, gridFilteredSortedRowEntriesSelector, gridFilteredSortedRowIdsSelector } from '@mui/x-data-grid-pro';
+import { o as operatorList, M as LicenseInfo, N as useControlledDatagridState, T as ThemeProvider$1, O as StyledDataGrid, f as customColumnTypes } from './useControlledDatagridState.js';
+import { g as createTheme } from './Portal.js';
 import { T as Toolbar } from './Toolbar2.js';
+import { o as onServerSideSelectionStatusChange, S as ServerSideControlledPagination, C as ControlledPagination } from './ControlledPagination.js';
 import { B as BaseButton, a as BaseCheckbox, c as BasePopper, b as BaseIcon } from './BasePopper.js';
 import { T as ToolbarWrapper } from './ToolbarWrapper2.js';
 
-function isMuiElement(element, muiNames) {
-  return /*#__PURE__*/React.isValidElement(element) && muiNames.indexOf(element.type.muiName) !== -1;
-}
-
-const _excluded$7 = ["sx"];
-const splitProps = props => {
-  var _props$theme$unstable, _props$theme;
-  const result = {
-    systemProps: {},
-    otherProps: {}
-  };
-  const config = (_props$theme$unstable = props == null ? void 0 : (_props$theme = props.theme) == null ? void 0 : _props$theme.unstable_sxConfig) != null ? _props$theme$unstable : defaultSxConfig;
-  Object.keys(props).forEach(prop => {
-    if (config[prop]) {
-      result.systemProps[prop] = props[prop];
-    } else {
-      result.otherProps[prop] = props[prop];
-    }
-  });
-  return result;
-};
-function extendSxProp(props) {
-  const {
-      sx: inSx
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded$7);
-  const {
-    systemProps,
-    otherProps
-  } = splitProps(other);
-  let finalSx;
-  if (Array.isArray(inSx)) {
-    finalSx = [systemProps, ...inSx];
-  } else if (typeof inSx === 'function') {
-    finalSx = (...args) => {
-      const result = inSx(...args);
-      if (!isPlainObject(result)) {
-        return systemProps;
-      }
-      return _extends({}, systemProps, result);
-    };
-  } else {
-    finalSx = _extends({}, systemProps, inSx);
-  }
-  return _extends({}, otherProps, {
-    sx: finalSx
-  });
-}
-
-const _excluded$6 = ["className", "component"];
-function createBox(options = {}) {
-  const {
-    themeId,
-    defaultTheme,
-    defaultClassName = 'MuiBox-root',
-    generateClassName
-  } = options;
-  const BoxRoot = styled('div', {
-    shouldForwardProp: prop => prop !== 'theme' && prop !== 'sx' && prop !== 'as'
-  })(styleFunctionSx);
-  const Box = /*#__PURE__*/React.forwardRef(function Box(inProps, ref) {
-    const theme = useTheme(defaultTheme);
-    const _extendSxProp = extendSxProp(inProps),
-      {
-        className,
-        component = 'div'
-      } = _extendSxProp,
-      other = _objectWithoutPropertiesLoose(_extendSxProp, _excluded$6);
-    return /*#__PURE__*/jsxRuntimeExports.jsx(BoxRoot, _extends({
-      as: component,
-      ref: ref,
-      className: clsx(className, generateClassName ? generateClassName(defaultClassName) : defaultClassName),
-      theme: themeId ? theme[themeId] || theme : theme
-    }, other));
-  });
-  return Box;
-}
-
-const defaultTheme = createTheme();
-const Box = createBox({
-  themeId: THEME_ID,
-  defaultTheme,
-  defaultClassName: 'MuiBox-root',
-  generateClassName: ClassNameGenerator.generate
-});
-process.env.NODE_ENV !== "production" ? Box.propTypes /* remove-proptypes */ = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // |     To update them edit the d.ts file and run "yarn proptypes"     |
-  // ----------------------------------------------------------------------
-  /**
-   * @ignore
-   */
-  children: PropTypes.node,
-  /**
-   * The component used for the root node.
-   * Either a string to use a HTML element or a component.
-   */
-  component: PropTypes.elementType,
-  /**
-   * The system prop that allows defining system overrides as well as additional CSS styles.
-   */
-  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
-} : void 0;
-var Box$1 = Box;
-
-function getFormLabelUtilityClasses(slot) {
-  return generateUtilityClass('MuiFormLabel', slot);
-}
-const formLabelClasses = generateUtilityClasses('MuiFormLabel', ['root', 'colorSecondary', 'focused', 'disabled', 'error', 'filled', 'required', 'asterisk']);
-var formLabelClasses$1 = formLabelClasses;
-
-const _excluded$5 = ["children", "className", "color", "component", "disabled", "error", "filled", "focused", "required"];
-const useUtilityClasses$4 = ownerState => {
-  const {
-    classes,
-    color,
-    focused,
-    disabled,
-    error,
-    filled,
-    required
-  } = ownerState;
-  const slots = {
-    root: ['root', `color${capitalize(color)}`, disabled && 'disabled', error && 'error', filled && 'filled', focused && 'focused', required && 'required'],
-    asterisk: ['asterisk', error && 'error']
-  };
-  return composeClasses(slots, getFormLabelUtilityClasses, classes);
-};
-const FormLabelRoot = styled$1('label', {
-  name: 'MuiFormLabel',
-  slot: 'Root',
-  overridesResolver: ({
-    ownerState
-  }, styles) => {
-    return _extends({}, styles.root, ownerState.color === 'secondary' && styles.colorSecondary, ownerState.filled && styles.filled);
-  }
-})(({
-  theme,
-  ownerState
-}) => _extends({
-  color: (theme.vars || theme).palette.text.secondary
-}, theme.typography.body1, {
-  lineHeight: '1.4375em',
-  padding: 0,
-  position: 'relative',
-  [`&.${formLabelClasses$1.focused}`]: {
-    color: (theme.vars || theme).palette[ownerState.color].main
-  },
-  [`&.${formLabelClasses$1.disabled}`]: {
-    color: (theme.vars || theme).palette.text.disabled
-  },
-  [`&.${formLabelClasses$1.error}`]: {
-    color: (theme.vars || theme).palette.error.main
-  }
-}));
-const AsteriskComponent = styled$1('span', {
-  name: 'MuiFormLabel',
-  slot: 'Asterisk',
-  overridesResolver: (props, styles) => styles.asterisk
-})(({
-  theme
-}) => ({
-  [`&.${formLabelClasses$1.error}`]: {
-    color: (theme.vars || theme).palette.error.main
-  }
-}));
-const FormLabel = /*#__PURE__*/React.forwardRef(function FormLabel(inProps, ref) {
-  const props = useThemeProps({
-    props: inProps,
-    name: 'MuiFormLabel'
-  });
-  const {
-      children,
-      className,
-      component = 'label'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded$5);
-  const muiFormControl = useFormControl();
-  const fcs = formControlState({
-    props,
-    muiFormControl,
-    states: ['color', 'required', 'focused', 'disabled', 'error', 'filled']
-  });
-  const ownerState = _extends({}, props, {
-    color: fcs.color || 'primary',
-    component,
-    disabled: fcs.disabled,
-    error: fcs.error,
-    filled: fcs.filled,
-    focused: fcs.focused,
-    required: fcs.required
-  });
-  const classes = useUtilityClasses$4(ownerState);
-  return /*#__PURE__*/jsxRuntimeExports.jsxs(FormLabelRoot, _extends({
-    as: component,
-    ownerState: ownerState,
-    className: clsx(classes.root, className),
-    ref: ref
-  }, other, {
-    children: [children, fcs.required && /*#__PURE__*/jsxRuntimeExports.jsxs(AsteriskComponent, {
-      ownerState: ownerState,
-      "aria-hidden": true,
-      className: classes.asterisk,
-      children: ["\u2009", '*']
-    })]
-  }));
-});
-process.env.NODE_ENV !== "production" ? FormLabel.propTypes /* remove-proptypes */ = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // |     To update them edit the d.ts file and run "yarn proptypes"     |
-  // ----------------------------------------------------------------------
-  /**
-   * The content of the component.
-   */
-  children: PropTypes.node,
-  /**
-   * Override or extend the styles applied to the component.
-   */
-  classes: PropTypes.object,
-  /**
-   * @ignore
-   */
-  className: PropTypes.string,
-  /**
-   * The color of the component.
-   * It supports both default and custom theme colors, which can be added as shown in the
-   * [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
-   */
-  color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']), PropTypes.string]),
-  /**
-   * The component used for the root node.
-   * Either a string to use a HTML element or a component.
-   */
-  component: PropTypes.elementType,
-  /**
-   * If `true`, the label should be displayed in a disabled state.
-   */
-  disabled: PropTypes.bool,
-  /**
-   * If `true`, the label is displayed in an error state.
-   */
-  error: PropTypes.bool,
-  /**
-   * If `true`, the label should use filled classes key.
-   */
-  filled: PropTypes.bool,
-  /**
-   * If `true`, the input of this label is focused (used by `FormGroup` components).
-   */
-  focused: PropTypes.bool,
-  /**
-   * If `true`, the label will indicate that the `input` is required.
-   */
-  required: PropTypes.bool,
-  /**
-   * The system prop that allows defining system overrides as well as additional CSS styles.
-   */
-  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
-} : void 0;
-var FormLabel$1 = FormLabel;
-
-function getInputLabelUtilityClasses(slot) {
-  return generateUtilityClass('MuiInputLabel', slot);
-}
-generateUtilityClasses('MuiInputLabel', ['root', 'focused', 'disabled', 'error', 'required', 'asterisk', 'formControl', 'sizeSmall', 'shrink', 'animated', 'standard', 'filled', 'outlined']);
-
-const _excluded$4 = ["disableAnimation", "margin", "shrink", "variant", "className"];
-const useUtilityClasses$3 = ownerState => {
-  const {
-    classes,
-    formControl,
-    size,
-    shrink,
-    disableAnimation,
-    variant,
-    required
-  } = ownerState;
-  const slots = {
-    root: ['root', formControl && 'formControl', !disableAnimation && 'animated', shrink && 'shrink', size === 'small' && 'sizeSmall', variant],
-    asterisk: [required && 'asterisk']
-  };
-  const composedClasses = composeClasses(slots, getInputLabelUtilityClasses, classes);
-  return _extends({}, classes, composedClasses);
-};
-const InputLabelRoot = styled$1(FormLabel$1, {
-  shouldForwardProp: prop => rootShouldForwardProp(prop) || prop === 'classes',
-  name: 'MuiInputLabel',
-  slot: 'Root',
-  overridesResolver: (props, styles) => {
-    const {
-      ownerState
-    } = props;
-    return [{
-      [`& .${formLabelClasses$1.asterisk}`]: styles.asterisk
-    }, styles.root, ownerState.formControl && styles.formControl, ownerState.size === 'small' && styles.sizeSmall, ownerState.shrink && styles.shrink, !ownerState.disableAnimation && styles.animated, styles[ownerState.variant]];
-  }
-})(({
-  theme,
-  ownerState
-}) => _extends({
-  display: 'block',
-  transformOrigin: 'top left',
-  whiteSpace: 'nowrap',
-  overflow: 'hidden',
-  textOverflow: 'ellipsis',
-  maxWidth: '100%'
-}, ownerState.formControl && {
-  position: 'absolute',
-  left: 0,
-  top: 0,
-  // slight alteration to spec spacing to match visual spec result
-  transform: 'translate(0, 20px) scale(1)'
-}, ownerState.size === 'small' && {
-  // Compensation for the `Input.inputSizeSmall` style.
-  transform: 'translate(0, 17px) scale(1)'
-}, ownerState.shrink && {
-  transform: 'translate(0, -1.5px) scale(0.75)',
-  transformOrigin: 'top left',
-  maxWidth: '133%'
-}, !ownerState.disableAnimation && {
-  transition: theme.transitions.create(['color', 'transform', 'max-width'], {
-    duration: theme.transitions.duration.shorter,
-    easing: theme.transitions.easing.easeOut
-  })
-}, ownerState.variant === 'filled' && _extends({
-  // Chrome's autofill feature gives the input field a yellow background.
-  // Since the input field is behind the label in the HTML tree,
-  // the input field is drawn last and hides the label with an opaque background color.
-  // zIndex: 1 will raise the label above opaque background-colors of input.
-  zIndex: 1,
-  pointerEvents: 'none',
-  transform: 'translate(12px, 16px) scale(1)',
-  maxWidth: 'calc(100% - 24px)'
-}, ownerState.size === 'small' && {
-  transform: 'translate(12px, 13px) scale(1)'
-}, ownerState.shrink && _extends({
-  userSelect: 'none',
-  pointerEvents: 'auto',
-  transform: 'translate(12px, 7px) scale(0.75)',
-  maxWidth: 'calc(133% - 24px)'
-}, ownerState.size === 'small' && {
-  transform: 'translate(12px, 4px) scale(0.75)'
-})), ownerState.variant === 'outlined' && _extends({
-  // see comment above on filled.zIndex
-  zIndex: 1,
-  pointerEvents: 'none',
-  transform: 'translate(14px, 16px) scale(1)',
-  maxWidth: 'calc(100% - 24px)'
-}, ownerState.size === 'small' && {
-  transform: 'translate(14px, 9px) scale(1)'
-}, ownerState.shrink && {
-  userSelect: 'none',
-  pointerEvents: 'auto',
-  // Theoretically, we should have (8+5)*2/0.75 = 34px
-  // but it feels a better when it bleeds a bit on the left, so 32px.
-  maxWidth: 'calc(133% - 32px)',
-  transform: 'translate(14px, -9px) scale(0.75)'
-})));
-const InputLabel = /*#__PURE__*/React.forwardRef(function InputLabel(inProps, ref) {
-  const props = useThemeProps({
-    name: 'MuiInputLabel',
-    props: inProps
-  });
-  const {
-      disableAnimation = false,
-      shrink: shrinkProp,
-      className
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded$4);
-  const muiFormControl = useFormControl();
-  let shrink = shrinkProp;
-  if (typeof shrink === 'undefined' && muiFormControl) {
-    shrink = muiFormControl.filled || muiFormControl.focused || muiFormControl.adornedStart;
-  }
-  const fcs = formControlState({
-    props,
-    muiFormControl,
-    states: ['size', 'variant', 'required']
-  });
-  const ownerState = _extends({}, props, {
-    disableAnimation,
-    formControl: muiFormControl,
-    shrink,
-    size: fcs.size,
-    variant: fcs.variant,
-    required: fcs.required
-  });
-  const classes = useUtilityClasses$3(ownerState);
-  return /*#__PURE__*/jsxRuntimeExports.jsx(InputLabelRoot, _extends({
-    "data-shrink": shrink,
-    ownerState: ownerState,
-    ref: ref,
-    className: clsx(classes.root, className)
-  }, other, {
-    classes: classes
-  }));
-});
-process.env.NODE_ENV !== "production" ? InputLabel.propTypes /* remove-proptypes */ = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // |     To update them edit the d.ts file and run "yarn proptypes"     |
-  // ----------------------------------------------------------------------
-  /**
-   * The content of the component.
-   */
-  children: PropTypes.node,
-  /**
-   * Override or extend the styles applied to the component.
-   */
-  classes: PropTypes.object,
-  /**
-   * @ignore
-   */
-  className: PropTypes.string,
-  /**
-   * The color of the component.
-   * It supports both default and custom theme colors, which can be added as shown in the
-   * [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
-   */
-  color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['error', 'info', 'primary', 'secondary', 'success', 'warning']), PropTypes.string]),
-  /**
-   * If `true`, the transition animation is disabled.
-   * @default false
-   */
-  disableAnimation: PropTypes.bool,
-  /**
-   * If `true`, the component is disabled.
-   */
-  disabled: PropTypes.bool,
-  /**
-   * If `true`, the label is displayed in an error state.
-   */
-  error: PropTypes.bool,
-  /**
-   * If `true`, the `input` of this label is focused.
-   */
-  focused: PropTypes.bool,
-  /**
-   * If `dense`, will adjust vertical spacing. This is normally obtained via context from
-   * FormControl.
-   */
-  margin: PropTypes.oneOf(['dense']),
-  /**
-   * if `true`, the label will indicate that the `input` is required.
-   */
-  required: PropTypes.bool,
-  /**
-   * If `true`, the label is shrunk.
-   */
-  shrink: PropTypes.bool,
-  /**
-   * The size of the component.
-   * @default 'normal'
-   */
-  size: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['normal', 'small']), PropTypes.string]),
-  /**
-   * The system prop that allows defining system overrides as well as additional CSS styles.
-   */
-  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-  /**
-   * The variant to use.
-   */
-  variant: PropTypes.oneOf(['filled', 'outlined', 'standard'])
-} : void 0;
-var InputLabel$1 = InputLabel;
-
-function getFormControlUtilityClasses(slot) {
-  return generateUtilityClass('MuiFormControl', slot);
-}
-generateUtilityClasses('MuiFormControl', ['root', 'marginNone', 'marginNormal', 'marginDense', 'fullWidth', 'disabled']);
-
-const _excluded$3 = ["children", "className", "color", "component", "disabled", "error", "focused", "fullWidth", "hiddenLabel", "margin", "required", "size", "variant"];
-const useUtilityClasses$2 = ownerState => {
-  const {
-    classes,
-    margin,
-    fullWidth
-  } = ownerState;
-  const slots = {
-    root: ['root', margin !== 'none' && `margin${capitalize(margin)}`, fullWidth && 'fullWidth']
-  };
-  return composeClasses(slots, getFormControlUtilityClasses, classes);
-};
-const FormControlRoot = styled$1('div', {
-  name: 'MuiFormControl',
-  slot: 'Root',
-  overridesResolver: ({
-    ownerState
-  }, styles) => {
-    return _extends({}, styles.root, styles[`margin${capitalize(ownerState.margin)}`], ownerState.fullWidth && styles.fullWidth);
-  }
-})(({
-  ownerState
-}) => _extends({
-  display: 'inline-flex',
-  flexDirection: 'column',
-  position: 'relative',
-  // Reset fieldset default style.
-  minWidth: 0,
-  padding: 0,
-  margin: 0,
-  border: 0,
-  verticalAlign: 'top'
-}, ownerState.margin === 'normal' && {
-  marginTop: 16,
-  marginBottom: 8
-}, ownerState.margin === 'dense' && {
-  marginTop: 8,
-  marginBottom: 4
-}, ownerState.fullWidth && {
-  width: '100%'
-}));
-
-/**
- * Provides context such as filled/focused/error/required for form inputs.
- * Relying on the context provides high flexibility and ensures that the state always stays
- * consistent across the children of the `FormControl`.
- * This context is used by the following components:
- *
- *  - FormLabel
- *  - FormHelperText
- *  - Input
- *  - InputLabel
- *
- * You can find one composition example below and more going to [the demos](/material-ui/react-text-field/#components).
- *
- * ```jsx
- * <FormControl>
- *   <InputLabel htmlFor="my-input">Email address</InputLabel>
- *   <Input id="my-input" aria-describedby="my-helper-text" />
- *   <FormHelperText id="my-helper-text">We'll never share your email.</FormHelperText>
- * </FormControl>
- * ```
- *
- * ⚠️ Only one `InputBase` can be used within a FormControl because it creates visual inconsistencies.
- * For instance, only one input can be focused at the same time, the state shouldn't be shared.
- */
-const FormControl = /*#__PURE__*/React.forwardRef(function FormControl(inProps, ref) {
-  const props = useThemeProps({
-    props: inProps,
-    name: 'MuiFormControl'
-  });
-  const {
-      children,
-      className,
-      color = 'primary',
-      component = 'div',
-      disabled = false,
-      error = false,
-      focused: visuallyFocused,
-      fullWidth = false,
-      hiddenLabel = false,
-      margin = 'none',
-      required = false,
-      size = 'medium',
-      variant = 'outlined'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded$3);
-  const ownerState = _extends({}, props, {
-    color,
-    component,
-    disabled,
-    error,
-    fullWidth,
-    hiddenLabel,
-    margin,
-    required,
-    size,
-    variant
-  });
-  const classes = useUtilityClasses$2(ownerState);
-  const [adornedStart, setAdornedStart] = React.useState(() => {
-    // We need to iterate through the children and find the Input in order
-    // to fully support server-side rendering.
-    let initialAdornedStart = false;
-    if (children) {
-      React.Children.forEach(children, child => {
-        if (!isMuiElement(child, ['Input', 'Select'])) {
-          return;
-        }
-        const input = isMuiElement(child, ['Select']) ? child.props.input : child;
-        if (input && isAdornedStart(input.props)) {
-          initialAdornedStart = true;
-        }
-      });
-    }
-    return initialAdornedStart;
-  });
-  const [filled, setFilled] = React.useState(() => {
-    // We need to iterate through the children and find the Input in order
-    // to fully support server-side rendering.
-    let initialFilled = false;
-    if (children) {
-      React.Children.forEach(children, child => {
-        if (!isMuiElement(child, ['Input', 'Select'])) {
-          return;
-        }
-        if (isFilled(child.props, true) || isFilled(child.props.inputProps, true)) {
-          initialFilled = true;
-        }
-      });
-    }
-    return initialFilled;
-  });
-  const [focusedState, setFocused] = React.useState(false);
-  if (disabled && focusedState) {
-    setFocused(false);
-  }
-  const focused = visuallyFocused !== undefined && !disabled ? visuallyFocused : focusedState;
-  let registerEffect;
-  if (process.env.NODE_ENV !== 'production') {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    const registeredInput = React.useRef(false);
-    registerEffect = () => {
-      if (registeredInput.current) {
-        console.error(['MUI: There are multiple `InputBase` components inside a FormControl.', 'This creates visual inconsistencies, only use one `InputBase`.'].join('\n'));
-      }
-      registeredInput.current = true;
-      return () => {
-        registeredInput.current = false;
-      };
-    };
-  }
-  const childContext = React.useMemo(() => {
-    return {
-      adornedStart,
-      setAdornedStart,
-      color,
-      disabled,
-      error,
-      filled,
-      focused,
-      fullWidth,
-      hiddenLabel,
-      size,
-      onBlur: () => {
-        setFocused(false);
-      },
-      onEmpty: () => {
-        setFilled(false);
-      },
-      onFilled: () => {
-        setFilled(true);
-      },
-      onFocus: () => {
-        setFocused(true);
-      },
-      registerEffect,
-      required,
-      variant
-    };
-  }, [adornedStart, color, disabled, error, filled, focused, fullWidth, hiddenLabel, registerEffect, required, size, variant]);
-  return /*#__PURE__*/jsxRuntimeExports.jsx(FormControlContext.Provider, {
-    value: childContext,
-    children: /*#__PURE__*/jsxRuntimeExports.jsx(FormControlRoot, _extends({
-      as: component,
-      ownerState: ownerState,
-      className: clsx(classes.root, className),
-      ref: ref
-    }, other, {
-      children: children
-    }))
-  });
-});
-process.env.NODE_ENV !== "production" ? FormControl.propTypes /* remove-proptypes */ = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // |     To update them edit the d.ts file and run "yarn proptypes"     |
-  // ----------------------------------------------------------------------
-  /**
-   * The content of the component.
-   */
-  children: PropTypes.node,
-  /**
-   * Override or extend the styles applied to the component.
-   */
-  classes: PropTypes.object,
-  /**
-   * @ignore
-   */
-  className: PropTypes.string,
-  /**
-   * The color of the component.
-   * It supports both default and custom theme colors, which can be added as shown in the
-   * [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
-   * @default 'primary'
-   */
-  color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['primary', 'secondary', 'error', 'info', 'success', 'warning']), PropTypes.string]),
-  /**
-   * The component used for the root node.
-   * Either a string to use a HTML element or a component.
-   */
-  component: PropTypes.elementType,
-  /**
-   * If `true`, the label, input and helper text should be displayed in a disabled state.
-   * @default false
-   */
-  disabled: PropTypes.bool,
-  /**
-   * If `true`, the label is displayed in an error state.
-   * @default false
-   */
-  error: PropTypes.bool,
-  /**
-   * If `true`, the component is displayed in focused state.
-   */
-  focused: PropTypes.bool,
-  /**
-   * If `true`, the component will take up the full width of its container.
-   * @default false
-   */
-  fullWidth: PropTypes.bool,
-  /**
-   * If `true`, the label is hidden.
-   * This is used to increase density for a `FilledInput`.
-   * Be sure to add `aria-label` to the `input` element.
-   * @default false
-   */
-  hiddenLabel: PropTypes.bool,
-  /**
-   * If `dense` or `normal`, will adjust vertical spacing of this and contained components.
-   * @default 'none'
-   */
-  margin: PropTypes.oneOf(['dense', 'none', 'normal']),
-  /**
-   * If `true`, the label will indicate that the `input` is required.
-   * @default false
-   */
-  required: PropTypes.bool,
-  /**
-   * The size of the component.
-   * @default 'medium'
-   */
-  size: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['medium', 'small']), PropTypes.string]),
-  /**
-   * The system prop that allows defining system overrides as well as additional CSS styles.
-   */
-  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-  /**
-   * The variant to use.
-   * @default 'outlined'
-   */
-  variant: PropTypes.oneOf(['filled', 'outlined', 'standard'])
-} : void 0;
-var FormControl$1 = FormControl;
-
-function getFormHelperTextUtilityClasses(slot) {
-  return generateUtilityClass('MuiFormHelperText', slot);
-}
-const formHelperTextClasses = generateUtilityClasses('MuiFormHelperText', ['root', 'error', 'disabled', 'sizeSmall', 'sizeMedium', 'contained', 'focused', 'filled', 'required']);
-var formHelperTextClasses$1 = formHelperTextClasses;
-
-var _span;
-const _excluded$2 = ["children", "className", "component", "disabled", "error", "filled", "focused", "margin", "required", "variant"];
-const useUtilityClasses$1 = ownerState => {
-  const {
-    classes,
-    contained,
-    size,
-    disabled,
-    error,
-    filled,
-    focused,
-    required
-  } = ownerState;
-  const slots = {
-    root: ['root', disabled && 'disabled', error && 'error', size && `size${capitalize(size)}`, contained && 'contained', focused && 'focused', filled && 'filled', required && 'required']
-  };
-  return composeClasses(slots, getFormHelperTextUtilityClasses, classes);
-};
-const FormHelperTextRoot = styled$1('p', {
-  name: 'MuiFormHelperText',
-  slot: 'Root',
-  overridesResolver: (props, styles) => {
-    const {
-      ownerState
-    } = props;
-    return [styles.root, ownerState.size && styles[`size${capitalize(ownerState.size)}`], ownerState.contained && styles.contained, ownerState.filled && styles.filled];
-  }
-})(({
-  theme,
-  ownerState
-}) => _extends({
-  color: (theme.vars || theme).palette.text.secondary
-}, theme.typography.caption, {
-  textAlign: 'left',
-  marginTop: 3,
-  marginRight: 0,
-  marginBottom: 0,
-  marginLeft: 0,
-  [`&.${formHelperTextClasses$1.disabled}`]: {
-    color: (theme.vars || theme).palette.text.disabled
-  },
-  [`&.${formHelperTextClasses$1.error}`]: {
-    color: (theme.vars || theme).palette.error.main
-  }
-}, ownerState.size === 'small' && {
-  marginTop: 4
-}, ownerState.contained && {
-  marginLeft: 14,
-  marginRight: 14
-}));
-const FormHelperText = /*#__PURE__*/React.forwardRef(function FormHelperText(inProps, ref) {
-  const props = useThemeProps({
-    props: inProps,
-    name: 'MuiFormHelperText'
-  });
-  const {
-      children,
-      className,
-      component = 'p'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded$2);
-  const muiFormControl = useFormControl();
-  const fcs = formControlState({
-    props,
-    muiFormControl,
-    states: ['variant', 'size', 'disabled', 'error', 'filled', 'focused', 'required']
-  });
-  const ownerState = _extends({}, props, {
-    component,
-    contained: fcs.variant === 'filled' || fcs.variant === 'outlined',
-    variant: fcs.variant,
-    size: fcs.size,
-    disabled: fcs.disabled,
-    error: fcs.error,
-    filled: fcs.filled,
-    focused: fcs.focused,
-    required: fcs.required
-  });
-  const classes = useUtilityClasses$1(ownerState);
-  return /*#__PURE__*/jsxRuntimeExports.jsx(FormHelperTextRoot, _extends({
-    as: component,
-    ownerState: ownerState,
-    className: clsx(classes.root, className),
-    ref: ref
-  }, other, {
-    children: children === ' ' ? // notranslate needed while Google Translate will not fix zero-width space issue
-    _span || (_span = /*#__PURE__*/jsxRuntimeExports.jsx("span", {
-      className: "notranslate",
-      children: "\u200B"
-    })) : children
-  }));
-});
-process.env.NODE_ENV !== "production" ? FormHelperText.propTypes /* remove-proptypes */ = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // |     To update them edit the d.ts file and run "yarn proptypes"     |
-  // ----------------------------------------------------------------------
-  /**
-   * The content of the component.
-   *
-   * If `' '` is provided, the component reserves one line height for displaying a future message.
-   */
-  children: PropTypes.node,
-  /**
-   * Override or extend the styles applied to the component.
-   */
-  classes: PropTypes.object,
-  /**
-   * @ignore
-   */
-  className: PropTypes.string,
-  /**
-   * The component used for the root node.
-   * Either a string to use a HTML element or a component.
-   */
-  component: PropTypes.elementType,
-  /**
-   * If `true`, the helper text should be displayed in a disabled state.
-   */
-  disabled: PropTypes.bool,
-  /**
-   * If `true`, helper text should be displayed in an error state.
-   */
-  error: PropTypes.bool,
-  /**
-   * If `true`, the helper text should use filled classes key.
-   */
-  filled: PropTypes.bool,
-  /**
-   * If `true`, the helper text should use focused classes key.
-   */
-  focused: PropTypes.bool,
-  /**
-   * If `dense`, will adjust vertical spacing. This is normally obtained via context from
-   * FormControl.
-   */
-  margin: PropTypes.oneOf(['dense']),
-  /**
-   * If `true`, the helper text should use required classes key.
-   */
-  required: PropTypes.bool,
-  /**
-   * The system prop that allows defining system overrides as well as additional CSS styles.
-   */
-  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-  /**
-   * The variant to use.
-   */
-  variant: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['filled', 'outlined', 'standard']), PropTypes.string])
-} : void 0;
-var FormHelperText$1 = FormHelperText;
-
-function getTextFieldUtilityClass(slot) {
-  return generateUtilityClass('MuiTextField', slot);
-}
-generateUtilityClasses('MuiTextField', ['root']);
-
-const _excluded$1 = ["autoComplete", "autoFocus", "children", "className", "color", "defaultValue", "disabled", "error", "FormHelperTextProps", "fullWidth", "helperText", "id", "InputLabelProps", "inputProps", "InputProps", "inputRef", "label", "maxRows", "minRows", "multiline", "name", "onBlur", "onChange", "onClick", "onFocus", "placeholder", "required", "rows", "select", "SelectProps", "type", "value", "variant"];
-const variantComponent = {
-  standard: Input,
-  filled: FilledInput,
-  outlined: OutlinedInput
-};
-const useUtilityClasses = ownerState => {
-  const {
-    classes
-  } = ownerState;
-  const slots = {
-    root: ['root']
-  };
-  return composeClasses(slots, getTextFieldUtilityClass, classes);
-};
-const TextFieldRoot = styled$1(FormControl$1, {
-  name: 'MuiTextField',
-  slot: 'Root',
-  overridesResolver: (props, styles) => styles.root
-})({});
-
-/**
- * The `TextField` is a convenience wrapper for the most common cases (80%).
- * It cannot be all things to all people, otherwise the API would grow out of control.
- *
- * ## Advanced Configuration
- *
- * It's important to understand that the text field is a simple abstraction
- * on top of the following components:
- *
- * - [FormControl](/material-ui/api/form-control/)
- * - [InputLabel](/material-ui/api/input-label/)
- * - [FilledInput](/material-ui/api/filled-input/)
- * - [OutlinedInput](/material-ui/api/outlined-input/)
- * - [Input](/material-ui/api/input/)
- * - [FormHelperText](/material-ui/api/form-helper-text/)
- *
- * If you wish to alter the props applied to the `input` element, you can do so as follows:
- *
- * ```jsx
- * const inputProps = {
- *   step: 300,
- * };
- *
- * return <TextField id="time" type="time" inputProps={inputProps} />;
- * ```
- *
- * For advanced cases, please look at the source of TextField by clicking on the
- * "Edit this page" button above. Consider either:
- *
- * - using the upper case props for passing values directly to the components
- * - using the underlying components directly as shown in the demos
- */
-const TextField = /*#__PURE__*/React.forwardRef(function TextField(inProps, ref) {
-  const props = useThemeProps({
-    props: inProps,
-    name: 'MuiTextField'
-  });
-  const {
-      autoComplete,
-      autoFocus = false,
-      children,
-      className,
-      color = 'primary',
-      defaultValue,
-      disabled = false,
-      error = false,
-      FormHelperTextProps,
-      fullWidth = false,
-      helperText,
-      id: idOverride,
-      InputLabelProps,
-      inputProps,
-      InputProps,
-      inputRef,
-      label,
-      maxRows,
-      minRows,
-      multiline = false,
-      name,
-      onBlur,
-      onChange,
-      onClick,
-      onFocus,
-      placeholder,
-      required = false,
-      rows,
-      select = false,
-      SelectProps,
-      type,
-      value,
-      variant = 'outlined'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded$1);
-  const ownerState = _extends({}, props, {
-    autoFocus,
-    color,
-    disabled,
-    error,
-    fullWidth,
-    multiline,
-    required,
-    select,
-    variant
-  });
-  const classes = useUtilityClasses(ownerState);
-  if (process.env.NODE_ENV !== 'production') {
-    if (select && !children) {
-      console.error('MUI: `children` must be passed when using the `TextField` component with `select`.');
-    }
-  }
-  const InputMore = {};
-  if (variant === 'outlined') {
-    if (InputLabelProps && typeof InputLabelProps.shrink !== 'undefined') {
-      InputMore.notched = InputLabelProps.shrink;
-    }
-    InputMore.label = label;
-  }
-  if (select) {
-    // unset defaults from textbox inputs
-    if (!SelectProps || !SelectProps.native) {
-      InputMore.id = undefined;
-    }
-    InputMore['aria-describedby'] = undefined;
-  }
-  const id = useId(idOverride);
-  const helperTextId = helperText && id ? `${id}-helper-text` : undefined;
-  const inputLabelId = label && id ? `${id}-label` : undefined;
-  const InputComponent = variantComponent[variant];
-  const InputElement = /*#__PURE__*/jsxRuntimeExports.jsx(InputComponent, _extends({
-    "aria-describedby": helperTextId,
-    autoComplete: autoComplete,
-    autoFocus: autoFocus,
-    defaultValue: defaultValue,
-    fullWidth: fullWidth,
-    multiline: multiline,
-    name: name,
-    rows: rows,
-    maxRows: maxRows,
-    minRows: minRows,
-    type: type,
-    value: value,
-    id: id,
-    inputRef: inputRef,
-    onBlur: onBlur,
-    onChange: onChange,
-    onFocus: onFocus,
-    onClick: onClick,
-    placeholder: placeholder,
-    inputProps: inputProps
-  }, InputMore, InputProps));
-  return /*#__PURE__*/jsxRuntimeExports.jsxs(TextFieldRoot, _extends({
-    className: clsx(classes.root, className),
-    disabled: disabled,
-    error: error,
-    fullWidth: fullWidth,
-    ref: ref,
-    required: required,
-    color: color,
-    variant: variant,
-    ownerState: ownerState
-  }, other, {
-    children: [label != null && label !== '' && /*#__PURE__*/jsxRuntimeExports.jsx(InputLabel$1, _extends({
-      htmlFor: id,
-      id: inputLabelId
-    }, InputLabelProps, {
-      children: label
-    })), select ? /*#__PURE__*/jsxRuntimeExports.jsx(Select, _extends({
-      "aria-describedby": helperTextId,
-      id: id,
-      labelId: inputLabelId,
-      value: value,
-      input: InputElement
-    }, SelectProps, {
-      children: children
-    })) : InputElement, helperText && /*#__PURE__*/jsxRuntimeExports.jsx(FormHelperText$1, _extends({
-      id: helperTextId
-    }, FormHelperTextProps, {
-      children: helperText
-    }))]
-  }));
-});
-process.env.NODE_ENV !== "production" ? TextField.propTypes /* remove-proptypes */ = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // |     To update them edit the d.ts file and run "yarn proptypes"     |
-  // ----------------------------------------------------------------------
-  /**
-   * This prop helps users to fill forms faster, especially on mobile devices.
-   * The name can be confusing, as it's more like an autofill.
-   * You can learn more about it [following the specification](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#autofill).
-   */
-  autoComplete: PropTypes.string,
-  /**
-   * If `true`, the `input` element is focused during the first mount.
-   * @default false
-   */
-  autoFocus: PropTypes.bool,
-  /**
-   * @ignore
-   */
-  children: PropTypes.node,
-  /**
-   * Override or extend the styles applied to the component.
-   */
-  classes: PropTypes.object,
-  /**
-   * @ignore
-   */
-  className: PropTypes.string,
-  /**
-   * The color of the component.
-   * It supports both default and custom theme colors, which can be added as shown in the
-   * [palette customization guide](https://mui.com/material-ui/customization/palette/#adding-new-colors).
-   * @default 'primary'
-   */
-  color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['primary', 'secondary', 'error', 'info', 'success', 'warning']), PropTypes.string]),
-  /**
-   * The default value. Use when the component is not controlled.
-   */
-  defaultValue: PropTypes.any,
-  /**
-   * If `true`, the component is disabled.
-   * @default false
-   */
-  disabled: PropTypes.bool,
-  /**
-   * If `true`, the label is displayed in an error state.
-   * @default false
-   */
-  error: PropTypes.bool,
-  /**
-   * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element.
-   */
-  FormHelperTextProps: PropTypes.object,
-  /**
-   * If `true`, the input will take up the full width of its container.
-   * @default false
-   */
-  fullWidth: PropTypes.bool,
-  /**
-   * The helper text content.
-   */
-  helperText: PropTypes.node,
-  /**
-   * The id of the `input` element.
-   * Use this prop to make `label` and `helperText` accessible for screen readers.
-   */
-  id: PropTypes.string,
-  /**
-   * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element.
-   * Pointer events like `onClick` are enabled if and only if `shrink` is `true`.
-   */
-  InputLabelProps: PropTypes.object,
-  /**
-   * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element.
-   */
-  inputProps: PropTypes.object,
-  /**
-   * Props applied to the Input element.
-   * It will be a [`FilledInput`](/material-ui/api/filled-input/),
-   * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/)
-   * component depending on the `variant` prop value.
-   */
-  InputProps: PropTypes.object,
-  /**
-   * Pass a ref to the `input` element.
-   */
-  inputRef: refType,
-  /**
-   * The label content.
-   */
-  label: PropTypes.node,
-  /**
-   * If `dense` or `normal`, will adjust vertical spacing of this and contained components.
-   * @default 'none'
-   */
-  margin: PropTypes.oneOf(['dense', 'none', 'normal']),
-  /**
-   * Maximum number of rows to display when multiline option is set to true.
-   */
-  maxRows: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  /**
-   * Minimum number of rows to display when multiline option is set to true.
-   */
-  minRows: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  /**
-   * If `true`, a `textarea` element is rendered instead of an input.
-   * @default false
-   */
-  multiline: PropTypes.bool,
-  /**
-   * Name attribute of the `input` element.
-   */
-  name: PropTypes.string,
-  /**
-   * @ignore
-   */
-  onBlur: PropTypes.func,
-  /**
-   * Callback fired when the value is changed.
-   *
-   * @param {object} event The event source of the callback.
-   * You can pull out the new value by accessing `event.target.value` (string).
-   */
-  onChange: PropTypes.func,
-  /**
-   * @ignore
-   */
-  onClick: PropTypes.func,
-  /**
-   * @ignore
-   */
-  onFocus: PropTypes.func,
-  /**
-   * The short hint displayed in the `input` before the user enters a value.
-   */
-  placeholder: PropTypes.string,
-  /**
-   * If `true`, the label is displayed as required and the `input` element is required.
-   * @default false
-   */
-  required: PropTypes.bool,
-  /**
-   * Number of rows to display when multiline option is set to true.
-   */
-  rows: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  /**
-   * Render a [`Select`](/material-ui/api/select/) element while passing the Input element to `Select` as `input` parameter.
-   * If this option is set you must pass the options of the select as children.
-   * @default false
-   */
-  select: PropTypes.bool,
-  /**
-   * Props applied to the [`Select`](/material-ui/api/select/) element.
-   */
-  SelectProps: PropTypes.object,
-  /**
-   * The size of the component.
-   */
-  size: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['medium', 'small']), PropTypes.string]),
-  /**
-   * The system prop that allows defining system overrides as well as additional CSS styles.
-   */
-  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-  /**
-   * Type of the `input` element. It should be [a valid HTML5 input type](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Form_%3Cinput%3E_types).
-   */
-  type: PropTypes /* @typescript-to-proptypes-ignore */.string,
-  /**
-   * The value of the `input` element, required for a controlled component.
-   */
-  value: PropTypes.any,
-  /**
-   * The variant to use.
-   * @default 'outlined'
-   */
-  variant: PropTypes.oneOf(['filled', 'outlined', 'standard'])
-} : void 0;
-var TextField$1 = TextField;
-
-const SUBMIT_FILTER_STROKE_TIME = 500;
-const InputNumberInterval = props => {
-  var _item$value;
-  const {
-    item,
-    applyValue,
-    focusElementRef = null
-  } = props;
-  const filterTimeout = React.useRef();
-  const [filterValueState, setFilterValueState] = React.useState((_item$value = item.value) !== null && _item$value !== void 0 ? _item$value : '');
-  const [applying, setIsApplying] = React.useState(false);
-  React.useEffect(() => {
-    return () => {
-      clearTimeout(filterTimeout.current);
-    };
-  }, []);
-  React.useEffect(() => {
-    var _item$value2;
-    const itemValue = (_item$value2 = item.value) !== null && _item$value2 !== void 0 ? _item$value2 : [undefined, undefined];
-    setFilterValueState(itemValue);
-  }, [item.value]);
-  const updateFilterValue = (lowerBound, upperBound) => {
-    clearTimeout(filterTimeout.current);
-    setFilterValueState([lowerBound, upperBound]);
-    setIsApplying(true);
-    filterTimeout.current = setTimeout(() => {
-      setIsApplying(false);
-      applyValue(_objectSpread2(_objectSpread2({}, item), {}, {
-        value: [lowerBound, upperBound]
-      }));
-    }, SUBMIT_FILTER_STROKE_TIME);
-  };
-  const handleUpperFilterChange = event => {
-    const newUpperBound = event.target.value;
-    updateFilterValue(filterValueState[0], newUpperBound);
-  };
-  const handleLowerFilterChange = event => {
-    const newLowerBound = event.target.value;
-    updateFilterValue(newLowerBound, filterValueState[1]);
-  };
-  return /*#__PURE__*/React.createElement(Box$1, {
-    sx: {
-      display: 'inline-flex',
-      flexDirection: 'row',
-      alignItems: 'end',
-      height: 48,
-      pl: '20px'
-    }
-  }, /*#__PURE__*/React.createElement(TextField$1, {
-    name: "lower-bound-input",
-    placeholder: "From",
-    label: "From",
-    variant: "standard",
-    value: Number(filterValueState[0]),
-    onChange: handleLowerFilterChange,
-    type: "number",
-    inputRef: focusElementRef,
-    sx: {
-      mr: 2
-    }
-  }), /*#__PURE__*/React.createElement(TextField$1, {
-    name: "upper-bound-input",
-    placeholder: "To",
-    label: "To",
-    variant: "standard",
-    value: Number(filterValueState[1]),
-    onChange: handleUpperFilterChange,
-    type: "number",
-    InputProps: applying ? {
-      endAdornment: /*#__PURE__*/React.createElement(Icon, {
-        icon: mdiSync
-      })
-    } : {}
-  }));
-};
-
-const isBetweenOperator = {
-  label: 'is between',
-  value: 'isBetween',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    if (!Array.isArray(filterItem.value) || filterItem.value.length !== 2) {
-      return null;
-    }
-    if (filterItem.value[0] == null || filterItem.value[1] == null) {
-      return null;
-    }
-    if (typeof filterItem.value[0] !== 'number' || typeof filterItem.value[1] !== 'number') {
-      return null;
-    }
-    return params => {
-      return params.value !== null && params.value !== undefined && filterItem.value[0] <= params.value && params.value <= filterItem.value[1];
-    };
-  },
-  InputComponent: InputNumberInterval
-};
-const IS_BETWEEN = isBetweenOperator;
-
-const getGridNumericOperators = () => [...getGridNumericOperators$1(), IS_BETWEEN];
-
-const doesNotContain = {
-  label: 'does not contain',
-  value: 'doesNotContain',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      if (String(params.value).indexOf(filterItem.value) !== -1) {
-        return false;
-      }
-      return true;
-    };
-  },
-  InputComponent: GridFilterInputValue
-};
-const DOES_NOT_CONTAIN = doesNotContain;
-
-const doesNotEqual = {
-  label: 'does not equal',
-  value: 'doesNotEqual',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.value) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      if (String(params.value) === filterItem.value) {
-        return false;
-      }
-      return true;
-    };
-  },
-  InputComponent: GridFilterInputValue
-};
-const DOES_NOT_EQUAL = doesNotEqual;
-
-const doesNotHaveOperator = {
-  label: "doesn't have",
-  value: 'doesNotHave',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      const cellValues = Array.isArray(params.value) ? params.value : [params.value];
-      return !cellValues.map(value => String(value)).includes(filterItem.value);
-    };
-  },
-  InputComponent: GridFilterInputValue
-};
-const DOES_NOT_HAVE = doesNotHaveOperator;
-const DOES_NOT_HAVE_WITH_SELECT = _objectSpread2(_objectSpread2({}, DOES_NOT_HAVE), {}, {
-  InputComponent: GridFilterInputSingleSelect
-});
-
-const hasOperator = {
-  label: 'has',
-  value: 'has',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      const cellValues = Array.isArray(params.value) ? params.value : [params.value];
-      return cellValues.map(value => String(value)).includes(filterItem.value);
-    };
-  },
-  InputComponent: GridFilterInputValue
-};
-const HAS = hasOperator;
-const HAS_WITH_SELECT = _objectSpread2(_objectSpread2({}, HAS), {}, {
-  InputComponent: GridFilterInputSingleSelect
-});
-
-const hasOnlyOperator = {
-  label: 'has only',
-  value: 'hasOnly',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      const cellValues = Array.isArray(params.value) ? params.value : [params.value];
-      return cellValues.length === 1 && String(cellValues[0]) === filterItem.value;
-    };
-  },
-  InputComponent: GridFilterInputValue
-};
-const HAS_ONLY = hasOnlyOperator;
-const HAS_ONLY_WITH_SELECT = _objectSpread2(_objectSpread2({}, HAS_ONLY), {}, {
-  InputComponent: GridFilterInputSingleSelect
-});
-
-const isOperator = {
-  label: 'is',
-  value: 'is',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (Array.isArray(params.value)) {
-        return false;
-      }
-      return String(params.value) === filterItem.value;
-    };
-  },
-  InputComponent: GridFilterInputValue
-};
-const IS = isOperator;
-const IS_WITH_SELECT = _objectSpread2(_objectSpread2({}, IS), {}, {
-  InputComponent: GridFilterInputSingleSelect
-});
-
-const isNotOperator = {
-  label: 'is not',
-  value: 'isNot',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (Array.isArray(params.value)) {
-        return true;
-      }
-      return String(params.value) !== filterItem.value;
-    };
-  },
-  InputComponent: GridFilterInputValue
-};
-const IS_NOT = isNotOperator;
-const IS_NOT_WITH_SELECT = _objectSpread2(_objectSpread2({}, IS_NOT), {}, {
-  InputComponent: GridFilterInputSingleSelect
-});
-
-const containsAnyOfOperator = {
-  label: 'contains any of',
-  value: 'containsAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const paramValues = Array.isArray(params.value) ? params.value : [params.value];
-      let match = false;
-      filterItem.value.forEach(filteredValue => {
-        paramValues.forEach(paramValue => {
-          if (String(paramValue).indexOf(filteredValue) !== -1) {
-            match = true;
-          }
-        });
-      });
-      return match;
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const containsAnyOfCIOperator = {
-  label: 'contains any of (case insensitive)',
-  value: 'containsAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const paramValues = Array.isArray(params.value) ? params.value : [params.value];
-      const paramValuesLower = paramValues.map(item => String(item).toLowerCase());
-      let match = false;
-      filterItem.value.forEach(filteredValue => {
-        if (paramValuesLower.indexOf(filteredValue.toLowerCase()) !== -1) {
-          match = true;
-        }
-      });
-      return match;
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const CONTAINS_ANY_OF = containsAnyOfOperator;
-const CONTAINS_ANY_OF_I = containsAnyOfCIOperator;
-
-const doesNotHaveAnyOf = {
-  label: "doesn't have any of",
-  value: 'doesNotHaveAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !Array.isArray(filterItem.value) || filterItem.value.length === 0) {
-      return null;
-    }
-    return params => {
-      const cellValues = Array.isArray(params.value) ? params.value : [params.value];
-
-      // Return true only if none of the filter values are in the cell values
-      return filterItem.value.every(filterVal => !cellValues.map(value => String(value)).includes(filterVal));
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const DOES_NOT_HAVE_ANY_OF = doesNotHaveAnyOf;
-const DOES_NOT_HAVE_ANY_OF_WITH_SELECT = _objectSpread2(_objectSpread2({}, DOES_NOT_HAVE_ANY_OF), {}, {
-  InputComponent: GridFilterInputMultipleSingleSelect
-});
-
-const endsWithAnyOfOperator = {
-  label: 'ends with any of',
-  value: 'endsWithAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const paramValues = Array.isArray(params.value) ? params.value : [params.value];
-      let match = false;
-      filterItem.value.forEach(filteredValue => {
-        paramValues.forEach(paramValue => {
-          if (String(paramValue).endsWith(filteredValue)) {
-            match = true;
-          }
-        });
-      });
-      return match;
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const ENDS_WITH_ANY_OF = endsWithAnyOfOperator;
-
-const isAnyOfOperator = {
-  label: 'is any of',
-  value: 'isAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const paramValues = Array.isArray(params.value) ? params.value : [params.value];
-      for (const paramValue of paramValues) {
-        if (filterItem.value.includes(String(paramValue))) {
-          return true;
-        }
-      }
-      return false;
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const IS_ANY_OF = isAnyOfOperator;
-const IS_ANY_OF_WITH_SELECT = _objectSpread2(_objectSpread2({}, IS_ANY_OF), {}, {
-  InputComponent: GridFilterInputMultipleSingleSelect
-});
-
-const isAnyOfIOperator = {
-  label: 'is any of (case-insensitive)',
-  value: 'isAnyOfI',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    const lowerCaseFilterValues = filterItem.value.map(v => String(v).toLowerCase());
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const paramValues = Array.isArray(params.value) ? params.value : [params.value];
-      for (const paramValue of paramValues) {
-        if (lowerCaseFilterValues.includes(String(paramValue).toLowerCase())) {
-          return true;
-        }
-      }
-      return false;
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const IS_ANY_OF_I = isAnyOfIOperator;
-const IS_ANY_OF_I_WITH_SELECT = _objectSpread2(_objectSpread2({}, IS_ANY_OF_I), {}, {
-  InputComponent: GridFilterInputMultipleSingleSelect
-});
-
-const hasAnyOfOperator = {
-  label: 'has any of',
-  value: 'hasAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const cellValues = Array.isArray(params.value) ? params.value : [params.value];
-      const filterItemValues = Array.isArray(filterItem.value) ? filterItem.value : [filterItem.value];
-      return filterItemValues.some(v => cellValues.map(value => String(value)).includes(v));
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const HAS_ANY_OF = hasAnyOfOperator;
-const HAS_ANY_OF_WITH_SELECT = _objectSpread2(_objectSpread2({}, HAS_ANY_OF), {}, {
-  InputComponent: GridFilterInputMultipleSingleSelect
-});
-
-const isNotAnyOfOperator = {
-  label: 'is not any of',
-  value: 'isNotAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const paramValues = Array.isArray(params.value) ? params.value : [params.value];
-      for (const paramValue of paramValues) {
-        if (filterItem.value.includes(String(paramValue))) {
-          return false;
-        }
-      }
-      return true;
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const IS_NOT_ANY_OF = isNotAnyOfOperator;
-const IS_NOT_ANY_OF_WITH_SELECT = _objectSpread2(_objectSpread2({}, IS_NOT_ANY_OF), {}, {
-  InputComponent: GridFilterInputMultipleSingleSelect
-});
-
-const startsWithAnyOfOperator = {
-  label: 'starts with any of',
-  value: 'startsWithAnyOf',
-  getApplyFilterFn: filterItem => {
-    if (!filterItem.field || !filterItem.value || !filterItem.operator) {
-      return null;
-    }
-    return params => {
-      if (filterItem.value.length === 0) {
-        return true;
-      }
-      const paramValues = Array.isArray(params.value) ? params.value : [params.value];
-      let match = false;
-      filterItem.value.forEach(filteredValue => {
-        paramValues.forEach(paramValue => {
-          if (String(paramValue).startsWith(filteredValue)) {
-            match = true;
-          }
-        });
-      });
-      return match;
-    };
-  },
-  InputComponent: GridFilterInputMultipleValue
-};
-const STARTS_WITH_ANY_OF = startsWithAnyOfOperator;
-
-const getGridStringArrayOperators = () => [CONTAINS_ANY_OF, ENDS_WITH_ANY_OF, IS_ANY_OF, IS_ANY_OF_I, IS_NOT_ANY_OF, STARTS_WITH_ANY_OF];
-const getGridStringArrayOperatorsWithSelect = () => [CONTAINS_ANY_OF, ENDS_WITH_ANY_OF, IS_ANY_OF_WITH_SELECT, IS_ANY_OF_I_WITH_SELECT, IS_NOT_WITH_SELECT, IS_WITH_SELECT, STARTS_WITH_ANY_OF];
-const getGridStringArrayOperatorsWithSelectOnStringArrayColumns = () => [HAS_WITH_SELECT, HAS_ANY_OF_WITH_SELECT, HAS_ONLY_WITH_SELECT, DOES_NOT_HAVE_WITH_SELECT, DOES_NOT_HAVE_ANY_OF_WITH_SELECT];
-
-const getGridStringOperators = () => [...getGridStringOperators$1().filter(operator => !['isAnyOf'].includes(operator.value)), DOES_NOT_CONTAIN, DOES_NOT_EQUAL, ...getGridStringArrayOperators()];
-
-// istanbul ignore file
-const operatorList = {
-  // Default types
-  string: getGridStringOperators$1(),
-  number: getGridNumericOperators$1(),
-  boolean: getGridBooleanOperators(),
-  date: getGridDateOperators(),
-  dateTime: getGridDateOperators(true),
-  singleSelect: getGridSingleSelectOperators(),
-  // Extended types
-  rsString: getGridStringOperators(),
-  rsNumber: getGridNumericOperators(),
-  rsSingleSelect: [CONTAINS_ANY_OF, ENDS_WITH_ANY_OF, IS_ANY_OF_WITH_SELECT, IS_NOT_WITH_SELECT, IS_WITH_SELECT, STARTS_WITH_ANY_OF],
-  rsSingleSelectWithShortOperatorList: [IS_WITH_SELECT, IS_NOT_WITH_SELECT, IS_ANY_OF_WITH_SELECT],
-  rsMultipleSelect: [HAS_WITH_SELECT, HAS_ANY_OF_WITH_SELECT, HAS_ONLY_WITH_SELECT, DOES_NOT_HAVE_WITH_SELECT, DOES_NOT_HAVE_ANY_OF_WITH_SELECT],
-  rsMultipleSelectWithShortOperatorList: [HAS_WITH_SELECT, DOES_NOT_HAVE_WITH_SELECT, HAS_ANY_OF_WITH_SELECT],
-  // Custom types
-  rsStringArray: getGridStringArrayOperators()
-};
-
 const PAGINATION_MODEL_KEY = 'paginationModel';
 const FILTER_MODEL_KEY = 'filterModel';
 const SORT_MODEL_KEY = 'sortModel';
@@ -1843,63 +67,347 @@ const clearPreviousVersionStorage = (id, previousLocalStorageVersions) => {
   }
 };
 
-// reference value: https://www.w3schools.com/tags/ref_urlencode.ASP
-const DECODER = {
-  '%20': ' ',
-  '%26': '&',
-  '%3D': '=',
-  '%3F': '?',
-  '%5B': '[',
-  '%5D': ']',
-  '%2C': ',',
-  '%3C': '<',
-  '%3E': '>',
-  '%21': '!',
-  '%22': '"'
-};
-const ENCODER = {
-  ' ': '%20',
-  '&': '%26',
-  '=': '%3D',
-  '?': '%3F',
+// Characters that need URL encoding in display format values
+// These characters could cause CloudFront issues or parsing ambiguity
+const CHARS_TO_ENCODE_IN_VALUES = {
+  ':': '%3A',
+  // Colon - reserved
+  ',': '%2C',
+  // Comma - used as list separator (only in list values)
+  '~': '%7E',
+  // Tilde - reserved
+  ';': '%3B',
+  // Semicolon - reserved
   '[': '%5B',
+  // Square bracket - used in internal format
   ']': '%5D',
-  ',': '%2C',
-  '<': '%3C',
-  '>': '%3E',
-  '!': '%21',
-  '"': '%22'
+  // Square bracket - used in internal format
+  '(': '%28',
+  // Parenthesis - reserved
+  ')': '%29' // Parenthesis - reserved
+};
+
+/**
+ * Encodes special characters in a value for display format URLs.
+ * This ensures values containing colons, commas, etc. don't break parsing.
+ */
+const encodeDisplayValue = value => {
+  let encoded = value;
+  for (const [char, replacement] of Object.entries(CHARS_TO_ENCODE_IN_VALUES)) {
+    encoded = encoded.split(char).join(replacement);
+  }
+  return encoded;
+};
+
+/**
+ * Decodes URL-encoded characters in display format values back to their original form.
+ * Uses decodeURIComponent to handle all standard URL encoding.
+ */
+const decodeDisplayValue = value => {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    // If decoding fails, return the original value
+    return value;
+  }
+};
+
+/**
+ * Encodes array values for display format URLs.
+ * Each value is URL-encoded and joined with commas.
+ */
+const encodeDisplayArrayValue = values => {
+  return values.map(v => encodeDisplayValue(v)).join(',');
+};
+
+/**
+ * Decodes comma-separated display format array values.
+ * Handles URL-encoded commas within individual values.
+ */
+const decodeDisplayArrayValue = value => {
+  if (value === '') {
+    return [];
+  }
+  // Split by unencoded commas only (not %2C)
+  // First, temporarily replace encoded commas, then split, then restore
+  const TEMP_COMMA_PLACEHOLDER = '\x00COMMA\x00';
+  const withPlaceholder = value.split('%2C').join(TEMP_COMMA_PLACEHOLDER);
+  const parts = withPlaceholder.split(',');
+  return parts.map(part => {
+    const withCommasRestored = part.split(TEMP_COMMA_PLACEHOLDER).join('%2C');
+    return decodeDisplayValue(withCommasRestored);
+  });
+};
+
+/**
+ * Converts internal bracket notation to display-friendly dot notation.
+ *
+ * Display format (CloudFront-safe, no brackets):
+ * - `field[operator]=value` → `field.operator=value` (value URL-encoded if needed)
+ * - `field[isAnyOf]=list[a,b,c]` → `field.isAnyOf=a,b,c` (comma-separated, values URL-encoded)
+ * - `_sortColumn=[field,desc]` → `_sortColumn=field.desc`
+ * - `_pagination=[0,25,next]` → `_pagination=0.25.next`
+ * - `_pinnedColumnsLeft=[a,b,c]` → `_pinnedColumnsLeft=a,b,c` (comma-separated)
+ * - `_columnVisibility=[a,b,c]` → `_columnVisibility=a,b,c` (comma-separated)
+ */
+const convertToDisplayFormat = search => {
+  if (!search) return search;
+  const cleanSearch = search.startsWith('?') ? search.slice(1) : search;
+  const params = cleanSearch.split('&');
+  const converted = params.map(param => {
+    // Handle _sortColumn=[field,direction]
+    if (param.startsWith('_sortColumn=')) {
+      const value = param.slice('_sortColumn='.length);
+      if (value.startsWith('[') && value.endsWith(']')) {
+        const inner = value.slice(1, -1);
+        if (inner === '') {
+          return '_sortColumn=';
+        }
+        const [field, direction] = inner.split(',');
+        return `_sortColumn=${field}.${direction}`;
+      }
+      return param;
+    }
+
+    // Handle _pagination=[page,pageSize,direction]
+    if (param.startsWith('_pagination=')) {
+      const value = param.slice('_pagination='.length);
+      if (value.startsWith('[') && value.endsWith(']')) {
+        const inner = value.slice(1, -1);
+        if (inner === '') {
+          return '_pagination=';
+        }
+        const [page, pageSize, direction] = inner.split(',');
+        return `_pagination=${page}.${pageSize}.${direction}`;
+      }
+      return param;
+    }
+
+    // Handle _pinnedColumnsLeft=[a,b,c] and _pinnedColumnsRight=[a,b,c]
+    if (param.startsWith('_pinnedColumnsLeft=') || param.startsWith('_pinnedColumnsRight=')) {
+      const eqIndex = param.indexOf('=');
+      const key = param.slice(0, eqIndex);
+      const value = param.slice(eqIndex + 1);
+      if (value.startsWith('[') && value.endsWith(']')) {
+        const inner = value.slice(1, -1);
+        return `${key}=${inner}`;
+      }
+      return param;
+    }
+
+    // Handle _columnVisibility=[a,b,c]
+    if (param.startsWith('_columnVisibility=')) {
+      const value = param.slice('_columnVisibility='.length);
+      if (value.startsWith('[') && value.endsWith(']')) {
+        const inner = value.slice(1, -1);
+        return `_columnVisibility=${inner}`;
+      }
+      return param;
+    }
+
+    // Handle _field[operator,type]=value or _field[operator,type]=list[a,b,c]
+    const bracketMatch = param.match(/^_([^[]+)\[([^\]]+)\]=(.*)$/);
+    if (bracketMatch) {
+      const [, field, operatorAndType, value] = bracketMatch;
+      const [operator] = operatorAndType.split(',');
+
+      // Convert list[a,b,c] to comma-separated with URL-encoded values
+      if (value.startsWith('list[') && value.endsWith(']')) {
+        const listContent = value.slice(5, -1);
+        if (listContent === '') {
+          return `${field}.${operator}=`;
+        }
+        const items = listContent.split(',');
+        return `${field}.${operator}=${encodeDisplayArrayValue(items)}`;
+      }
+      // URL-encode special characters in the value
+      return `${field}.${operator}=${encodeDisplayValue(value)}`;
+    }
+    return param;
+  });
+  return converted.join('&');
+};
+
+/**
+ * Converts display-friendly dot notation back to internal bracket notation.
+ *
+ * Internal format (server-side compatible):
+ * - `field.operator=value` → `_field[operator,type]=value`
+ * - `field.isAnyOf=a,b,c` → `_field[isAnyOf,type]=list[a,b,c]`
+ * - `_sortColumn=field.desc` → `_sortColumn=[field,desc]`
+ * - `_pagination=0.25.next` → `_pagination=[0,25,next]`
+ * - `_pinnedColumnsLeft=a,b,c` → `_pinnedColumnsLeft=[a,b,c]`
+ * - `_columnVisibility=a,b,c` → `_columnVisibility=[a,b,c]`
+ */
+const convertFromDisplayFormat = (search, columns) => {
+  if (!search) return search;
+  const cleanSearch = search.startsWith('?') ? search.slice(1) : search;
+  const params = cleanSearch.split('&');
+  const converted = params.map(param => {
+    // Handle _sortColumn=field.direction or _sortColumn=
+    if (param.startsWith('_sortColumn=')) {
+      const value = param.slice('_sortColumn='.length);
+      if (value === '') {
+        return '_sortColumn=[]';
+      }
+      // If it already has brackets, leave it alone
+      if (value.startsWith('[')) {
+        return param;
+      }
+      const dotIndex = value.indexOf('.');
+      if (dotIndex !== -1) {
+        const field = value.slice(0, dotIndex);
+        const direction = value.slice(dotIndex + 1);
+        return `_sortColumn=[${field},${direction}]`;
+      }
+      return param;
+    }
+
+    // Handle _pagination=page.pageSize.direction or _pagination=
+    if (param.startsWith('_pagination=')) {
+      const value = param.slice('_pagination='.length);
+      if (value === '') {
+        return '_pagination=[]';
+      }
+      // If it already has brackets, leave it alone
+      if (value.startsWith('[')) {
+        return param;
+      }
+      const parts = value.split('.');
+      if (parts.length === 3) {
+        return `_pagination=[${parts.join(',')}]`;
+      }
+      return param;
+    }
+
+    // Handle _pinnedColumnsLeft=a,b,c and _pinnedColumnsRight=a,b,c
+    if (param.startsWith('_pinnedColumnsLeft=') || param.startsWith('_pinnedColumnsRight=')) {
+      const eqIndex = param.indexOf('=');
+      const key = param.slice(0, eqIndex);
+      const value = param.slice(eqIndex + 1);
+      // If it already has brackets, leave it alone
+      if (value.startsWith('[')) {
+        return param;
+      }
+      return `${key}=[${value}]`;
+    }
+
+    // Handle _columnVisibility=a,b,c
+    if (param.startsWith('_columnVisibility=')) {
+      const value = param.slice('_columnVisibility='.length);
+      // If it already has brackets, leave it alone
+      if (value.startsWith('[')) {
+        return param;
+      }
+      return `_columnVisibility=[${value}]`;
+    }
+
+    // Handle field.operator=value (dot notation for filters)
+    const dotMatch = param.match(/^([^.]+)\.([a-zA-Z_]+)=(.*)$/);
+    if (dotMatch) {
+      const [, field, operator, rawValue] = dotMatch;
+
+      // Get column type for this field
+      const column = columns.find(c => c.field === field);
+      const columnType = (column === null || column === void 0 ? void 0 : column.type) || 'string';
+
+      // Check if this is a list operator
+      const listOps = ['containsAnyOf', 'doesNotContainAnyOf', 'endsWithAnyOf', 'doesNotEndWithAnyOf', 'hasAnyOf', 'doesNotHaveAnyOf', 'isAnyOf', 'isNotAnyOf', 'startsWithAnyOf', 'doesNotStartWithAnyOf'];
+      if (listOps.includes(operator)) {
+        const items = decodeDisplayArrayValue(rawValue);
+        return `_${field}[${operator},${columnType}]=list[${items.join(',')}]`;
+      }
+      // Decode URL-encoded special characters in the value
+      const decodedValue = decodeDisplayValue(rawValue);
+      return `_${field}[${operator},${columnType}]=${decodedValue}`;
+    }
+    return param;
+  });
+  return converted.join('&');
+};
+
+/**
+ * Detects if search string is in display format and converts it to internal format.
+ */
+const getDecodedSearchFromUrl = (search, columns) => {
+  const searchWithoutLeadingQuestion = search.startsWith('?') ? search.slice(1) : search;
+
+  // Check if it's using display format:
+  // 1. Contains dot notation for filters like 'field.operator='
+  // 2. Has empty _sortColumn= (display format) instead of _sortColumn=[] (internal format)
+  // 3. Has _pinnedColumnsLeft=a,b without brackets
+  // 4. Has _sortColumn=field.desc format
+  // 5. Has _pagination=0.25.next format
+  const hasDotNotationFilter = /[a-zA-Z_]+\.[a-zA-Z_]+=/.test(searchWithoutLeadingQuestion);
+  const hasEmptySortColumn = /(_sortColumn)=(&|$)/.test(searchWithoutLeadingQuestion);
+  const hasSortDotNotation = /_sortColumn=[^&[]+\.[^&]+/.test(searchWithoutLeadingQuestion);
+  const hasPaginationDotNotation = /_pagination=[^&[]+\.[^&]+/.test(searchWithoutLeadingQuestion);
+  const hasPinnedWithoutBrackets = /(_pinnedColumnsLeft|_pinnedColumnsRight)=[^&[]*(&|$)/.test(searchWithoutLeadingQuestion);
+  const hasVisibilityWithoutBrackets = /_columnVisibility=[^&[]*(&|$)/.test(searchWithoutLeadingQuestion);
+  const hasBracketNotation = /\[.*\]=/.test(searchWithoutLeadingQuestion);
+  const isDisplayFormat = (hasDotNotationFilter || hasEmptySortColumn || hasSortDotNotation || hasPaginationDotNotation || hasPinnedWithoutBrackets || hasVisibilityWithoutBrackets) && !hasBracketNotation;
+  if (isDisplayFormat) {
+    return '?' + convertFromDisplayFormat(searchWithoutLeadingQuestion, columns);
+  }
+
+  // Already in internal bracket format or empty
+  return search;
+};
+
+/**
+ * Builds a display-format query string from internal format.
+ */
+const buildQueryParamsString = search => {
+  const displaySearch = convertToDisplayFormat(search);
+  return displaySearch.startsWith('?') ? displaySearch : `?${displaySearch}`;
+};
+
+/**
+ * Compares two search strings for equality, ignoring parameter order.
+ * This prevents infinite update loops when the same parameters appear in different order.
+ */
+const areSearchStringsEqual = (search1, search2) => {
+  const strippedSearch1 = search1.startsWith('?') ? search1.slice(1) : search1;
+  const strippedSearch2 = search2.startsWith('?') ? search2.slice(1) : search2;
+
+  // Quick check: if strings are identical, no need to parse
+  if (strippedSearch1 === strippedSearch2) {
+    return true;
+  }
+
+  // Parse and sort parameters for order-independent comparison
+  const params1 = strippedSearch1.split('&').filter(Boolean).sort();
+  const params2 = strippedSearch2.split('&').filter(Boolean).sort();
+  if (params1.length !== params2.length) {
+    return false;
+  }
+  return params1.every((param, index) => param === params2[index]);
 };
 const decodeValue = value => {
   if (value === '') {
-    return '';
+    return undefined;
   }
-  const re = new RegExp(Object.keys(DECODER).reduce((acc, curr) => `${acc},${curr}`), 'g');
-  // decodeValue for lists:
+
+  // Handle array values encoded as list[item1,item2,...]
   if (value.startsWith('list[')) {
-    const arrayValues = value.split('[')[1].split(']')[0];
-    const arrayList = arrayValues.split(',').map(v => v.replace(re, encoded => DECODER[encoded])).filter(item => item);
-    return arrayList.length > 0 ? arrayList : [];
+    const arrayContent = value.slice(5, -1); // Remove 'list[' and ']'
+    if (arrayContent === '') {
+      return [];
+    }
+    return arrayContent.split(',').filter(item => item);
   }
-  return value.replace(re, encoded => DECODER[encoded]);
+  return value;
 };
 const encodeValue = value => {
-  if (!value) {
+  if (value === undefined || value === null) {
     return '';
   }
 
-  // Array encoding for value:
-  // we are representing it as list[encoded], where encoded is the list comma separated
+  // Handle array values - encode as list[item1,item2,...]
   if (Array.isArray(value)) {
-    const encodedArray = value.map(entry => {
-      return String(entry).replace(/\s|&|=|\?|\[|\]/g, encoded => ENCODER[encoded]);
-    }).join(',');
-    return `list[${encodedArray}]`;
+    return `list[${value.map(String).join(',')}]`;
   }
-
-  // we might also pass integers
-  const castedValue = String(value);
-  return castedValue.replace(/\s|&|=|\?|\[|\]/g, encoded => ENCODER[encoded]);
+  return String(value);
 };
 const urlSearchParamsToString = searchParams => {
   let searchString = '';
@@ -1924,39 +432,42 @@ const numberOperatorDecoder = {
   lt: '<',
   lte: '<='
 };
-const isOperatorValueValid = (field, operator, columns) => {
-  const column = columns.find(column => column.field === field);
+const isOperatorValueValid = (columnField, operatorValue, columns) => {
+  const column = columns.find(column => column.field === columnField);
   if (!column) {
     return false;
   }
   const columnType = (column === null || column === void 0 ? void 0 : column.type) || 'string';
-  const operators = column.filterOperators || operatorList[columnType];
+  const operators = operatorList[columnType];
   if (!operators) {
     return false;
   }
-  return !!operators.find(op => columnType === 'number' && Object.keys(numberOperatorEncoder).includes(op.value) ? numberOperatorEncoder[op.value] === operator : op.value === operator);
+  if ('filterOperators' in operators) {
+    return !!operators.filterOperators.find(op => columnType === 'number' && Object.keys(numberOperatorEncoder).includes(op.value) ? numberOperatorEncoder[op.value] === operatorValue : op['value'] === operatorValue);
+  }
+  return !!operators.find(op => ['number', 'rsNumber'].includes(columnType) && Object.keys(numberOperatorEncoder).includes(op.value) ? numberOperatorEncoder[op.value] === operatorValue : op['value'] === operatorValue);
 };
 const listOperators = ['containsAnyOf', 'doesNotContainAnyOf', 'endsWithAnyOf', 'doesNotEndWithAnyOf', 'hasAnyOf', 'doesNotHaveAnyOf', 'isAnyOf', 'isNotAnyOf', 'startsWithAnyOf', 'doesNotStartWithAnyOf'];
 
 // Check if the value doesn't break
-const isValueValid = (value, field, columns, operator) => {
+const isValueValid = (value, columnField, columns, operatorValue) => {
   var _column$type;
   // every field accepts undefined as value for default
   if (value === undefined || value === '') {
     return true;
   }
 
-  // xxxAnyOf accepts as value only lists, and we are declaring them in the
+  // xxxAnyOf accepts as value only lists, and we are declearing them in the
   // URL as `list=[...]`
-  if (listOperators.includes(operator)) {
+  if (listOperators.includes(operatorValue)) {
     return Array.isArray(value) || value === '';
   }
 
   // We are accepting arrays only if they are of the 'xxxAnyOf' type
-  if (Array.isArray(value) && !listOperators.includes(operator)) {
+  if (Array.isArray(value) && !listOperators.includes(operatorValue)) {
     return false;
   }
-  const column = columns.find(column => column.field === field);
+  const column = columns.find(column => column.field === columnField);
   if (!column) {
     return false;
   }
@@ -1994,7 +505,7 @@ const getFilterModelFromString = (searchString, columns) => {
   if (!searchString) {
     return 'invalid';
   }
-  let logicOperator = GridLogicOperator.And;
+  let linkOperator = GridLinkOperator.And;
   let quickFilterValues = [];
   const searchParams = new URLSearchParams();
   for (const [key, value] of new URLSearchParams(searchString)) {
@@ -2002,7 +513,7 @@ const getFilterModelFromString = (searchString, columns) => {
       searchParams.set(key, value);
     }
     if (key === '_logicOperator') {
-      logicOperator = value === GridLogicOperator.And || value === GridLogicOperator.Or ? value : GridLogicOperator.And;
+      linkOperator = value;
     }
     if (key === '_quickFilterValues') {
       try {
@@ -2021,7 +532,7 @@ const getFilterModelFromString = (searchString, columns) => {
     if (isInvalid) {
       return;
     }
-    const field = key.split('[')[0].slice(1);
+    const field = key.split('[')[0].slice(1); // Slice to remove the _ at the beginning
     if (!fields.includes(field)) {
       return;
     }
@@ -2038,6 +549,7 @@ const getFilterModelFromString = (searchString, columns) => {
       return;
     }
     const operator = splitRight[0];
+    // if the operator is not part of the valid operators invalidate the URL
     if (!isOperatorValueValid(field, operator, columns) || Array.isArray(operator)) {
       isInvalid = true;
       return;
@@ -2049,37 +561,41 @@ const getFilterModelFromString = (searchString, columns) => {
       return;
     }
     items.push({
-      field,
-      operator: columnType === 'number' && Object.keys(numberOperatorDecoder).includes(operator) ? numberOperatorDecoder[operator] : operator,
+      columnField: field,
+      operatorValue: ['number', 'rsNumber'].includes(columnType) && Object.keys(numberOperatorDecoder).includes(operator) ? numberOperatorDecoder[operator] : operator,
       id,
       value: listOperators.includes(operator) && decodedValue === '' ? [] : decodedValue,
       type
     });
   });
+
+  // If we found some condition that results in an invalid URL,
+  // return the empty filterModel (this will trigger the localStorage)
+  // and will pick up the last valid search
   if (isInvalid) {
     return 'invalid';
   }
   return {
     items,
-    logicOperator,
+    linkOperator,
     quickFilterValues
   };
 };
 const getSearchParamsFromFilterModel = filterModel => {
   var _filterModel$quickFil;
   const searchParams = new URLSearchParams();
-  searchParams.set('_logicOperator', filterModel['logicOperator'] || '');
+  searchParams.set('_logicOperator', filterModel['linkOperator'] || '');
   filterModel['items'].forEach(item => {
     const {
-      field,
-      operator,
+      columnField,
+      operatorValue,
       value,
       type
     } = item;
-    if (Object.keys(numberOperatorEncoder).includes(operator)) {
-      searchParams.set(`_${field}[${numberOperatorEncoder[operator]},${encodeValue(type)}]`, encodeValue(value));
+    if (Object.keys(numberOperatorEncoder).includes(operatorValue)) {
+      searchParams.set(`_${columnField}[${numberOperatorEncoder[operatorValue]},${encodeValue(type)}]`, encodeValue(value));
     } else {
-      searchParams.set(`_${field}[${encodeValue(operator)},${encodeValue(type)}]`, encodeValue(value));
+      searchParams.set(`_${columnField}[${encodeValue(operatorValue)},${encodeValue(type)}]`, encodeValue(value));
     }
   });
   if ((_filterModel$quickFil = filterModel.quickFilterValues) !== null && _filterModel$quickFil !== void 0 && _filterModel$quickFil.length) {
@@ -2095,7 +611,7 @@ const getSearchParamsFromFilterModel = filterModel => {
 const getFilterModel = (search, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion) => {
   const defaultValue = initialState && initialState.filter && initialState.filter.filterModel ? initialState.filter.filterModel : {
     items: [],
-    logicOperator: GridLogicOperator.And
+    linkOperator: GridLinkOperator.And
   };
   if (isNewVersion) {
     return defaultValue;
@@ -2234,38 +750,13 @@ const getPaginationModel = (search, localStoragePagination, setLocalStoragePagin
 
 /** COLUMN VISIBILITY */
 
-const getColumnVisibilityFromString = (searchString, columns) => {
-  if (!searchString) {
-    return 'invalid';
-  }
-  const searchParams = new URLSearchParams(searchString);
-  const value = searchParams.get('_columnVisibility');
-  if (value === '' || value === null || value === '[]') {
-    return 'invalid';
-  }
-  const parsedFields = value.slice(1, value.length - 1).split(',');
-  const fields = columns.map(column => column.field);
-  const visibility = {};
-  for (const field of fields) {
-    visibility[field] = false;
-  }
-  for (const parsedField of parsedFields) {
-    if (fields.includes(parsedField)) {
-      visibility[parsedField] = true;
-    }
-  }
-  if (Object.values(visibility).filter(v => v === true).length === 0) {
-    return 'invalid';
-  }
-  return visibility;
-};
 const getSearchParamsFromColumnVisibility = (columnVisibility, columns) => {
   const searchParams = new URLSearchParams();
-  const fields = columns.map(column => column.field);
+  const columnFields = columns.map(column => column.field);
 
   // if column visibility model is empty, show all columns
   if (Object.keys(columnVisibility).length == 0) {
-    searchParams.set('_columnVisibility', `[${fields.join(',')}]`);
+    searchParams.set('_columnVisibility', `[${columnFields.join(',')}]`);
     return searchParams;
   }
   const finalColumnVisibility = columns.filter(c => {
@@ -2276,10 +767,63 @@ const getSearchParamsFromColumnVisibility = (columnVisibility, columns) => {
       [colName]: true
     });
   }, columnVisibility);
-  const visibleColumns = fields.filter(column => finalColumnVisibility[column] !== false);
+  const visibleColumns = Object.entries(finalColumnVisibility)
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  .filter(_ref => {
+    let [_, visible] = _ref;
+    return visible;
+  })
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  .map(_ref2 => {
+    let [column, _] = _ref2;
+    return encodeValue(column);
+  });
   searchParams.set('_columnVisibility', `[${visibleColumns.join(',')}]`);
   return searchParams;
 };
+const getColumnVisibilityFromString = (notParsed, tableColumns) => {
+  if (!notParsed || notParsed.length === 1 && notParsed[0] === '?') {
+    return 'invalid';
+  }
+  // remove the initial ? if present
+  const parsed = notParsed[0] === '?' ? notParsed.slice(1) : notParsed;
+  const visibility = {};
+  let exist = false;
+  let visibleColumnsCount = 0;
+  for (const item of parsed.split('&')) {
+    // if it's not column visibility field, skip
+    const fieldURL = item.split('=')[0];
+    if (fieldURL !== '_columnVisibility') {
+      continue;
+    }
+    // e.g. item = _columnVisibility[abc,def]
+    const left = item.split(']')[0];
+    if (left.split('[').length < 2) {
+      continue;
+    }
+    const encodedValues = item.split('[')[1].split(']')[0];
+    if (typeof encodedValues !== 'string') {
+      continue;
+    }
+    exist = true;
+    const columnFields = tableColumns.map(column => column.field);
+    // TODO: Add validation that , is present
+    const columns = encodedValues.split(',').map(value => decodeValue(value));
+
+    // for each column, check if it's visible and add it to visibility model
+    for (const column of columnFields) {
+      const isColumnVisible = columns.includes(column);
+      visibility[column] = isColumnVisible;
+      if (isColumnVisible) {
+        visibleColumnsCount += 1;
+      }
+    }
+  }
+  if (visibleColumnsCount === 0 && !exist) {
+    return 'invalid';
+  }
+  return visibility;
+};
 
 // Rules:
 // - if we have something in the URL, use that info
@@ -2340,8 +884,8 @@ const getPinnedColumnsFromString = (notParsed, tableColumns) => {
     if (typeof encodedValues !== 'string') {
       continue;
     }
-    const fields = [...tableColumns.map(column => column.field), '__check__'];
-    const columns = encodedValues.split(',').map(value => decodeValue(value)).filter(val => typeof val === 'string' && fields.includes(val));
+    const columnFields = [...tableColumns.map(column => column.field), '__check__'];
+    const columns = encodedValues.split(',').map(value => decodeValue(value)).filter(val => typeof val === 'string' && columnFields.includes(val));
     if (fieldURL === '_pinnedColumnsLeft') {
       pinnedColumns['left'] = columns;
     }
@@ -2349,9 +893,9 @@ const getPinnedColumnsFromString = (notParsed, tableColumns) => {
       pinnedColumns['right'] = columns;
     }
   }
-  return pinnedColumns.left && pinnedColumns.left.length > 0 || pinnedColumns.right && pinnedColumns.right.length > 0 ? {
-    left: pinnedColumns.left || [],
-    right: pinnedColumns.right || []
+  return pinnedColumns['left'] || pinnedColumns['right'] ? {
+    left: pinnedColumns['left'] || [],
+    right: pinnedColumns['right'] || []
   } : 'invalid';
 };
 const getSearchParamsFromPinnedColumns = pinnedColumns => {
@@ -2401,7 +945,7 @@ const getSearchParamsFromTab = search => {
   }
   return searchParams;
 };
-const getFinalSearch = _ref => {
+const getFinalSearch = _ref3 => {
   let {
     search,
     localStorageVersion,
@@ -2411,7 +955,7 @@ const getFinalSearch = _ref => {
     columnsVisibilityModel,
     pinnedColumnsModel,
     columns
-  } = _ref;
+  } = _ref3;
   const filterModelSearch = getSearchParamsFromFilterModel(filterModel);
   const sortModelSearch = getSearchParamsFromSorting(sortModel);
   const paginationModelSearch = getSearchParamsFromPagination(paginationModel);
@@ -2435,7 +979,9 @@ const getFinalSearch = _ref => {
 };
 /** Return the state of the table given the URL and the local storage state */
 const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, columns, historyReplace, initialState, localStorage) => {
-  const currentVersion = new URLSearchParams(search).get('v');
+  // Convert from display format (dot notation) to internal format (bracket notation) if needed
+  const decodedSearch = getDecodedSearchFromUrl(search, columns);
+  const currentVersion = new URLSearchParams(decodedSearch).get('v');
   const isNewVersion = !currentVersion || Number(currentVersion) !== localStorageVersion;
   const {
     localStorageFilters,
@@ -2449,14 +995,14 @@ const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, column
     localStoragePinnedColumns,
     setLocalStoragePinnedColumns
   } = localStorage;
-  const filterModel = getFilterModel(search, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion);
-  const sortModel = getSortModel(search, columns, localStorageSorting, setLocalStorageSorting, initialState, isNewVersion);
-  const paginationModel = getPaginationModel(search, localStoragePagination, setLocalStoragePagination, initialState, isNewVersion);
-  const columnVisibilityModel = getColumnsVisibility(search, columns, localStorageColumnsVisibility, setLocalStorageColumnsVisibility, initialState, isNewVersion);
-  const pinnedColumnsModel = getPinnedColumns(search, columns, localStoragePinnedColumns, setLocalStoragePinnedColumns, initialState, isNewVersion);
+  const filterModel = getFilterModel(decodedSearch, columns, localStorageFilters, setLocalStorageFilters, initialState, isNewVersion);
+  const sortModel = getSortModel(decodedSearch, columns, localStorageSorting, setLocalStorageSorting, initialState, isNewVersion);
+  const paginationModel = getPaginationModel(decodedSearch, localStoragePagination, setLocalStoragePagination, initialState, isNewVersion);
+  const columnVisibilityModel = getColumnsVisibility(decodedSearch, columns, localStorageColumnsVisibility, setLocalStorageColumnsVisibility, initialState, isNewVersion);
+  const pinnedColumnsModel = getPinnedColumns(decodedSearch, columns, localStoragePinnedColumns, setLocalStoragePinnedColumns, initialState, isNewVersion);
   const finalSearch = getFinalSearch({
     localStorageVersion,
-    search,
+    search: decodedSearch,
     filterModel,
     sortModel,
     paginationModel,
@@ -2464,9 +1010,15 @@ const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, column
     pinnedColumnsModel,
     columns
   });
-  const searchString = urlSearchParamsToString(finalSearch);
-  if (searchString !== search) {
-    historyReplace(searchString);
+  const internalSearchString = urlSearchParamsToString(finalSearch);
+  // Convert to display format for the URL
+  const displaySearchString = buildQueryParamsString(internalSearchString);
+  const displaySearchWithoutQuestion = displaySearchString.startsWith('?') ? displaySearchString.slice(1) : displaySearchString;
+
+  // Compare with original search (without leading ?)
+  const originalSearchWithoutQuestion = search.startsWith('?') ? search.slice(1) : search;
+  if (!areSearchStringsEqual(displaySearchWithoutQuestion, originalSearchWithoutQuestion)) {
+    historyReplace(displaySearchWithoutQuestion);
   }
   return {
     filterModel,
@@ -2476,16 +1028,18 @@ const getModelsParsedOrUpdateLocalStorage = (search, localStorageVersion, column
     pinnedColumnsModel
   };
 };
-const updateUrl = (_ref2, search, localStorageVersion, historyReplace, columns) => {
+const updateUrl = (_ref4, search, localStorageVersion, historyReplace, columns) => {
   let {
     filterModel,
     sortModel,
     paginationModel,
     columnsModel: columnsVisibilityModel,
     pinnedColumnsModel
-  } = _ref2;
+  } = _ref4;
+  // Convert from display format to internal format if needed
+  const decodedSearch = getDecodedSearchFromUrl(search, columns);
   const newSearch = getFinalSearch({
-    search,
+    search: decodedSearch,
     localStorageVersion,
     filterModel,
     sortModel,
@@ -2494,9 +1048,15 @@ const updateUrl = (_ref2, search, localStorageVersion, historyReplace, columns)
     pinnedColumnsModel,
     columns
   });
-  const searchString = urlSearchParamsToString(newSearch);
-  if (searchString !== search) {
-    historyReplace(searchString);
+  const internalSearchString = urlSearchParamsToString(newSearch);
+  // Convert to display format for the URL
+  const displaySearchString = buildQueryParamsString(internalSearchString);
+  const displaySearchWithoutQuestion = displaySearchString.startsWith('?') ? displaySearchString.slice(1) : displaySearchString;
+
+  // Compare with original search (without leading ?)
+  const originalSearchWithoutQuestion = search.startsWith('?') ? search.slice(1) : search;
+  if (!areSearchStringsEqual(displaySearchWithoutQuestion, originalSearchWithoutQuestion)) {
+    historyReplace(displaySearchWithoutQuestion);
   }
 };
 
@@ -2504,17 +1064,17 @@ const updateUrl = (_ref2, search, localStorageVersion, historyReplace, columns)
 // do not use it for equivalence (e.g. with value `3` and undefined we
 // will get 0).
 const compareFilters = (firstFilter, secondFilter) => {
-  if (firstFilter.field < secondFilter.field) {
+  if (firstFilter.columnField < secondFilter.columnField) {
     return -1;
-  } else if (firstFilter.field > secondFilter.field) {
+  } else if (firstFilter.columnField > secondFilter.columnField) {
     return 1;
   }
-  if (firstFilter.operator === undefined || secondFilter.operator === undefined) {
+  if (firstFilter.operatorValue === undefined || secondFilter.operatorValue === undefined) {
     return 0;
   }
-  if (firstFilter.operator < secondFilter.operator) {
+  if (firstFilter.operatorValue < secondFilter.operatorValue) {
     return -1;
-  } else if (firstFilter.operator > secondFilter.operator) {
+  } else if (firstFilter.operatorValue > secondFilter.operatorValue) {
     return 1;
   }
   if (firstFilter.value < secondFilter.value) {
@@ -2525,18 +1085,18 @@ const compareFilters = (firstFilter, secondFilter) => {
   return 0;
 };
 const areFiltersEquivalent = (firstFilter, secondFilter) => {
-  return firstFilter.field === secondFilter.field && firstFilter.operator === secondFilter.operator && firstFilter.value === secondFilter.value;
+  return firstFilter.columnField === secondFilter.columnField && firstFilter.operatorValue === secondFilter.operatorValue && firstFilter.value === secondFilter.value;
 };
 const areFilterModelsEquivalent = (filterModel, filterModelToMatch) => {
   const {
     items,
-    logicOperator
+    linkOperator
   } = filterModel;
   const {
     items: itemsToMatch,
-    logicOperator: logicOperatorToMatch
+    linkOperator: linkOperatorToMatch
   } = filterModelToMatch;
-  if (logicOperator !== logicOperatorToMatch) {
+  if (linkOperator !== linkOperatorToMatch) {
     return false;
   }
   if (items.length !== itemsToMatch.length) {
@@ -2549,7 +1109,7 @@ const areFilterModelsEquivalent = (filterModel, filterModelToMatch) => {
     const filterToCompare = itemsToMatch[i];
 
     // compareFilters return 0 if and only if the filters have the same
-    // field, operator, and value
+    // columnField, operatorValue, and value
     if (!areFiltersEquivalent(filter, filterToCompare)) {
       return false;
     }
@@ -2558,6 +1118,8 @@ const areFilterModelsEquivalent = (filterModel, filterModelToMatch) => {
 };
 
 // Get and Set data from LocalStorage WITHOUT useState
+
+// triggering a state update and consecutive re-render
 const useFetchState = (defaultValue, key) => {
   let stickyValue = null;
   try {
@@ -2565,7 +1127,16 @@ const useFetchState = (defaultValue, key) => {
   } catch (e) {
     console.error('StatefulDataGrid: error getting item from local storage: ', e);
   }
-  const parsedValue = stickyValue !== null && stickyValue !== undefined && stickyValue !== 'undefined' ? JSON.parse(stickyValue) : defaultValue;
+  let parsedValue = stickyValue !== null && stickyValue !== undefined && stickyValue !== 'undefined' ? JSON.parse(stickyValue) : defaultValue;
+
+  // TODO: temporary workaround to avoid clashes when someone had sorting on the now-removed screenshot field (renamed to num_annotations)
+  // Consider upgrading the Datagrid component library as the exception handling was added in this PR: https://github.com/mui-org/material-ui-x/pull/3224
+  if (parsedValue instanceof Array) {
+    const fields = (parsedValue || []).map(item => item.field);
+    if (fields.includes('screenshot') || fields.includes('diffs')) {
+      parsedValue = defaultValue;
+    }
+  }
   const updateValue = useCallback(value => {
     try {
       window.localStorage.setItem(key, JSON.stringify(value));
@@ -2576,8 +1147,6 @@ const useFetchState = (defaultValue, key) => {
   return [parsedValue, updateValue];
 };
 
-// import useLocalStorage from './useLocalStorage';
-
 const useTableStates = (id, version) => {
   const [paginationModel, setPaginationModel] = useFetchState('', buildStorageKey({
     id,
@@ -2634,7 +1203,8 @@ const useStatefulTable = props => {
     onColumnVisibilityModelChange: propsOnColumnVisibilityModelChange,
     onColumnWidthChange: propsOnColumnWidthChange,
     onFilterModelChange: propsOnFilterModelChange,
-    onPaginationModelChange: propsOnPaginationModelChange,
+    onPageChange: propsOnPageChange,
+    onPageSizeChange: propsOnPageSizeChange,
     onPinnedColumnsChange: propsOnPinnedColumnsChange,
     onSortModelChange: propsOnSortModelChange,
     useRouter,
@@ -2664,7 +1234,7 @@ const useStatefulTable = props => {
     setDimensionModel
   } = useTableStates(id, localStorageVersion);
 
-  // clearing up old version keys, triggering only on first render
+  // clearing up old version keys
   useEffect(() => clearPreviousVersionStorage(id, previousLocalStorageVersions), [id, previousLocalStorageVersions]);
   const onColumnDimensionChange = useCallback(_ref => {
     let {
@@ -2709,7 +1279,7 @@ const useStatefulTable = props => {
     onFilterModelChange: (model, details) => {
       const filterModel = _objectSpread2(_objectSpread2({}, model), {}, {
         items: model.items.map(item => {
-          const column = apiRef.current.getColumn(item.field);
+          const column = apiRef.current.getColumn(item.columnField);
           item.type = column.type || 'string';
           return item;
         }),
@@ -2747,16 +1317,34 @@ const useStatefulTable = props => {
       }, search, localStorageVersion, historyReplace, columns);
     },
     pinnedColumns: pinnedColumnsModel,
-    paginationModel: paginationModelParsed,
-    onPaginationModelChange: (model, details) => {
-      const paginationModel = _objectSpread2(_objectSpread2({}, model), {}, {
-        direction: paginationModelParsed.page < model.page ? 'next' : 'back'
-      });
-      propsOnPaginationModelChange === null || propsOnPaginationModelChange === void 0 ? void 0 : propsOnPaginationModelChange(paginationModel, details);
+    page: paginationModelParsed.page,
+    pageSize: paginationModelParsed.pageSize,
+    onPageChange: (page, details) => {
+      console.log('page change', page);
+      const direction = paginationModelParsed.page < page ? 'next' : 'back';
+      propsOnPageChange === null || propsOnPageChange === void 0 ? void 0 : propsOnPageChange(page, details);
+      updateUrl({
+        filterModel: filterParsed,
+        sortModel: sortModelParsed,
+        paginationModel: {
+          page,
+          pageSize: paginationModelParsed.pageSize,
+          direction
+        },
+        columnsModel: apiRef.current.state.columns.columnVisibilityModel,
+        pinnedColumnsModel: pinnedColumnsModel
+      }, search, localStorageVersion, historyReplace, columns);
+    },
+    onPageSizeChange: (pageSize, details) => {
+      propsOnPageSizeChange === null || propsOnPageSizeChange === void 0 ? void 0 : propsOnPageSizeChange(pageSize, details);
       updateUrl({
         filterModel: filterParsed,
         sortModel: sortModelParsed,
-        paginationModel: paginationModel,
+        paginationModel: {
+          page: paginationModelParsed.page,
+          pageSize,
+          direction: paginationModelParsed.direction
+        },
         columnsModel: apiRef.current.state.columns.columnVisibilityModel,
         pinnedColumnsModel: pinnedColumnsModel
       }, search, localStorageVersion, historyReplace, columns);
@@ -2782,7 +1370,7 @@ const useStatefulTable = props => {
   };
 };
 
-const _excluded = ["apiRef", "autoHeight", "className", "columns", "slots", "slotProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "paginationModel", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "localStorageVersion", "previousLocalStorageVersions", "onFilterModelChange", "rowSelectionModel", "onColumnWidthChange", "onPaginationModelChange", "onRowSelectionModelChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "pagination", "paginationPlacement", "paginationProps", "rows", "pageSizeOptions", "sx", "theme", "useRouter", "paginationMode", "rowCount"];
+const _excluded = ["apiRef", "autoHeight", "className", "columns", "columnTypes", "components", "componentsProps", "filterModel", "columnVisibilityModel", "pinnedColumns", "sortModel", "page", "pageSize", "height", "hideToolbar", "initialState", "isRowSelectable", "license", "localStorageVersion", "previousLocalStorageVersions", "onFilterModelChange", "selectionModel", "onColumnWidthChange", "onPageChange", "onPageSizeChange", "onSelectionModelChange", "onColumnVisibilityModelChange", "onPinnedColumnsChange", "onSortModelChange", "pagination", "paginationPlacement", "paginationProps", "rows", "rowsPerPageOptions", "sx", "theme", "useRouter", "paginationMode", "rowCount"];
 const COMPONENT_NAME = 'DataGrid';
 const CLASSNAME = 'redsift-datagrid';
 const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
@@ -2792,13 +1380,15 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       autoHeight,
       className,
       columns,
-      slots,
-      slotProps,
+      columnTypes: propsColumnTypes,
+      components,
+      componentsProps,
       filterModel: propsFilterModel,
       columnVisibilityModel: propsColumnVisibilityModel,
       pinnedColumns: propsPinnedColumns,
       sortModel: propsSortModel,
-      paginationModel: propsPaginationModel,
+      page: propsPage,
+      pageSize: propsPageSize,
       height: propsHeight,
       hideToolbar,
       initialState,
@@ -2807,10 +1397,11 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       localStorageVersion,
       previousLocalStorageVersions,
       onFilterModelChange: propsOnFilterModelChange,
-      rowSelectionModel: propsRowSelectionModel,
+      selectionModel: propsSelectionModel,
       onColumnWidthChange: propsOnColumnWidthChange,
-      onPaginationModelChange: propsOnPaginationModelChange,
-      onRowSelectionModelChange: propsOnRowSelectionModelChange,
+      onPageChange: propsOnPageChange,
+      onPageSizeChange: propsOnPageSizeChange,
+      onSelectionModelChange: propsOnSelectionModelChange,
       onColumnVisibilityModelChange: propsOnColumnVisibilityModelChange,
       onPinnedColumnsChange: propsOnPinnedColumnsChange,
       onSortModelChange: propsOnSortModelChange,
@@ -2818,7 +1409,7 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       paginationPlacement = 'both',
       paginationProps,
       rows,
-      pageSizeOptions,
+      rowsPerPageOptions,
       sx,
       theme: propsTheme,
       useRouter,
@@ -2826,41 +1417,46 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
       rowCount
     } = props,
     forwardedProps = _objectWithoutProperties(props, _excluded);
-  const theme = useTheme$1(propsTheme);
+  const theme = useTheme(propsTheme);
   const _apiRef = useGridApiRef();
   const apiRef = propsApiRef !== null && propsApiRef !== void 0 ? propsApiRef : _apiRef;
-  const RenderedToolbar = slots !== null && slots !== void 0 && slots.toolbar ? slots.toolbar : Toolbar;
+  const RenderedToolbar = components !== null && components !== void 0 && components.Toolbar ? components.Toolbar : Toolbar;
   LicenseInfo.setLicenseKey(license);
   const height = propsHeight !== null && propsHeight !== void 0 ? propsHeight : autoHeight ? undefined : '500px';
   const {
     onColumnVisibilityModelChange: controlledOnColumnVisibilityModelChange,
     onFilterModelChange: controlledOnFilterModelChange,
-    onPaginationModelChange: controlledOnPaginationModelChange,
+    onPageChange: controlledOnPageChange,
+    onPageSizeChange: controlledOnPageSizeChange,
     onPinnedColumnsChange: controlledOnPinnedColumnsChange,
     onSortModelChange: controlledOnSortModelChange
   } = useControlledDatagridState({
     initialState,
-    pageSizeOptions,
+    rowsPerPageOptions,
     propsColumnVisibilityModel,
     propsFilterModel,
     propsOnColumnVisibilityModelChange,
     propsOnFilterModelChange,
     propsOnPinnedColumnsChange,
     propsOnSortModelChange,
-    propsPaginationModel,
+    propsPage,
+    propsPageSize,
     propsPinnedColumns,
     propsSortModel,
-    propsOnPaginationModelChange
+    propsOnPageChange,
+    propsOnPageSizeChange
   });
   const {
     columnVisibilityModel,
     filterModel,
     onColumnVisibilityModelChange,
     onFilterModelChange,
-    onPaginationModelChange,
+    onPageChange,
+    onPageSizeChange,
     onPinnedColumnsChange,
     onSortModelChange,
-    paginationModel,
+    page,
+    pageSize,
     pinnedColumns,
     sortModel,
     onColumnWidthChange
@@ -2871,43 +1467,40 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     onColumnVisibilityModelChange: controlledOnColumnVisibilityModelChange,
     onColumnWidthChange: propsOnColumnWidthChange,
     onFilterModelChange: controlledOnFilterModelChange,
-    onPaginationModelChange: controlledOnPaginationModelChange,
+    onPageChange: controlledOnPageChange,
+    onPageSizeChange: controlledOnPageSizeChange,
     onPinnedColumnsChange: controlledOnPinnedColumnsChange,
     onSortModelChange: controlledOnSortModelChange,
     useRouter: useRouter,
     localStorageVersion,
     previousLocalStorageVersions
   });
-  const [rowSelectionModel, setRowSelectionModel] = useState(propsRowSelectionModel !== null && propsRowSelectionModel !== void 0 ? propsRowSelectionModel : []);
+  const [selectionModel, setSelectionModel] = useState(propsSelectionModel !== null && propsSelectionModel !== void 0 ? propsSelectionModel : []);
   useEffect(() => {
-    setRowSelectionModel(propsRowSelectionModel !== null && propsRowSelectionModel !== void 0 ? propsRowSelectionModel : []);
-  }, [propsRowSelectionModel]);
-  const onRowSelectionModelChange = (selectionModel, details) => {
-    if (propsOnRowSelectionModelChange) {
-      propsOnRowSelectionModelChange(selectionModel, details);
+    setSelectionModel(propsSelectionModel !== null && propsSelectionModel !== void 0 ? propsSelectionModel : []);
+  }, [propsSelectionModel]);
+  const onSelectionModelChange = (selectionModel, details) => {
+    if (propsOnSelectionModelChange) {
+      propsOnSelectionModelChange(selectionModel, details);
     } else {
-      setRowSelectionModel(selectionModel);
+      setSelectionModel(selectionModel);
     }
   };
   const selectionStatus = useRef({
     type: 'none',
     numberOfSelectedRows: 0,
     numberOfSelectedRowsInPage: 0,
-    page: paginationModel.page,
-    pageSize: paginationModel.pageSize
+    page,
+    pageSize: pageSize
   });
 
-  // The checkboxSelectionVisibleOnly should only be applied to client-side pagination,
-  // for server-side pagination it produces inconsistent behavior when selecting all rows in pages 2 and beyond
-  const checkboxSelectionVisibleOnly = Boolean(pagination) && Boolean(paginationMode != 'server');
-
   // in server-side pagination we want to update the selection status
   // every time we navigate between pages, resize our page or select something
   useEffect(() => {
     if (paginationMode == 'server') {
-      onServerSideSelectionStatusChange(Array.isArray(rowSelectionModel) ? rowSelectionModel : [rowSelectionModel], apiRef, selectionStatus, isRowSelectable, paginationModel.page, paginationModel.pageSize);
+      onServerSideSelectionStatusChange(Array.isArray(selectionModel) ? selectionModel : [selectionModel], apiRef, selectionStatus, isRowSelectable, page, pageSize);
     }
-  }, [rowSelectionModel, paginationModel.page, paginationModel.pageSize]);
+  }, [selectionModel, page, pageSize]);
   if (!Array.isArray(rows)) {
     return null;
   }
@@ -2933,20 +1526,22 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     ref: datagridRef,
     className: classNames(StatefulDataGrid.className, className),
     $height: height
-  }, /*#__PURE__*/React__default.createElement(DataGridPro, _extends$1({}, forwardedProps, {
+  }, /*#__PURE__*/React__default.createElement(DataGridPro, _extends({}, forwardedProps, {
     apiRef: apiRef,
     columns: columns,
     columnVisibilityModel: columnVisibilityModel,
     filterModel: filterModel,
     onColumnVisibilityModelChange: onColumnVisibilityModelChange,
     onFilterModelChange: onFilterModelChange,
-    onPaginationModelChange: onPaginationModelChange,
+    onPageChange: onPageChange,
+    onPageSizeChange: onPageSizeChange,
     onPinnedColumnsChange: onPinnedColumnsChange,
     onSortModelChange: onSortModelChange,
-    paginationModel: paginationModel,
+    page: page,
+    pageSize: pageSize,
     pinnedColumns: pinnedColumns,
     sortModel: sortModel,
-    pageSizeOptions: pageSizeOptions,
+    rowsPerPageOptions: rowsPerPageOptions,
     onColumnWidthChange: onColumnWidthChange,
     initialState: initialState,
     isRowSelectable: isRowSelectable,
@@ -2956,75 +1551,80 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
     rows: rows,
     rowCount: rowCount,
     autoHeight: autoHeight,
-    checkboxSelectionVisibleOnly: checkboxSelectionVisibleOnly,
-    slots: _objectSpread2(_objectSpread2({
-      baseButton: BaseButton,
-      baseCheckbox: BaseCheckbox,
-      // baseTextField,
-      basePopper: BasePopper,
-      columnFilteredIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+    checkboxSelectionVisibleOnly: Boolean(pagination),
+    columnTypes: _objectSpread2(_objectSpread2({}, customColumnTypes), propsColumnTypes),
+    components: _objectSpread2(_objectSpread2({
+      BaseButton,
+      BaseCheckbox,
+      // BaseTextField,
+      BasePopper,
+      ColumnFilteredIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "ColumnFilteredIcon"
       })),
-      columnSelectorIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSelectorIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "ColumnSelectorIcon"
       })),
-      columnSortedAscendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSortedAscendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "ColumnSortedAscendingIcon"
       })),
-      columnSortedDescendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ColumnSortedDescendingIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "ColumnSortedDescendingIcon"
       })),
-      densityCompactIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityCompactIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "DensityCompactIcon"
       })),
-      densityStandardIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityStandardIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "DensityStandardIcon"
       })),
-      densityComfortableIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DensityComfortableIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "DensityComfortableIcon"
       })),
-      detailPanelCollapseIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DetailPanelCollapseIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "DetailPanelCollapseIcon"
       })),
-      detailPanelExpandIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      DetailPanelExpandIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "DetailPanelExpandIcon"
       })),
-      exportIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({}, props, {
+      ExportIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({}, props, {
         displayName: "ExportIcon"
       })),
-      openFilterButtonIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends$1({
+      OpenFilterButtonIcon: props => /*#__PURE__*/React__default.createElement(BaseIcon, _extends({
         displayName: "OpenFilterButtonIcon"
       }, props))
-    }, slots), {}, {
-      toolbar: ToolbarWrapper,
-      pagination: props => {
-        return pagination ? paginationMode == 'server' ? /*#__PURE__*/React__default.createElement(ServerSideControlledPagination, _extends$1({}, props, {
+    }, components), {}, {
+      Toolbar: ToolbarWrapper,
+      Pagination: props => {
+        return pagination ? paginationMode == 'server' ? /*#__PURE__*/React__default.createElement(ServerSideControlledPagination, _extends({}, props, {
           displaySelection: false,
           displayRowsPerPage: ['bottom', 'both'].includes(paginationPlacement),
           displayPagination: ['bottom', 'both'].includes(paginationPlacement),
           selectionStatus: selectionStatus.current,
-          paginationModel: paginationModel,
-          onPaginationModelChange: onPaginationModelChange,
-          pageSizeOptions: pageSizeOptions,
+          page: page,
+          pageSize: pageSize,
+          onPageChange: onPageChange,
+          onPageSizeChange: onPageSizeChange,
+          rowsPerPageOptions: rowsPerPageOptions,
           paginationProps: paginationProps,
           paginationMode: paginationMode,
           rowCount: rowCount
-        })) : /*#__PURE__*/React__default.createElement(ControlledPagination, _extends$1({}, props, {
+        })) : /*#__PURE__*/React__default.createElement(ControlledPagination, _extends({}, props, {
           displaySelection: false,
           displayRowsPerPage: ['bottom', 'both'].includes(paginationPlacement),
           displayPagination: ['bottom', 'both'].includes(paginationPlacement),
           selectionStatus: selectionStatus.current,
           apiRef: apiRef,
           isRowSelectable: isRowSelectable,
-          paginationModel: paginationModel,
-          onPaginationModelChange: onPaginationModelChange,
-          pageSizeOptions: pageSizeOptions,
+          page: page,
+          pageSize: pageSize,
+          onPageChange: onPageChange,
+          onPageSizeChange: onPageSizeChange,
+          rowsPerPageOptions: rowsPerPageOptions,
           paginationProps: paginationProps,
           paginationMode: paginationMode
         })) : null;
       }
     }),
-    slotProps: _objectSpread2(_objectSpread2({}, slotProps), {}, {
+    componentsProps: _objectSpread2(_objectSpread2({}, componentsProps), {}, {
       toolbar: _objectSpread2({
         hideToolbar,
         RenderedToolbar,
@@ -3035,16 +1635,18 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
         selectionStatus,
         apiRef,
         isRowSelectable,
-        paginationModel,
-        onPaginationModelChange,
-        pageSizeOptions,
+        page,
+        pageSize,
+        onPageChange,
+        onPageSizeChange,
+        rowsPerPageOptions,
         paginationProps,
         paginationMode,
         rowCount
-      }, slotProps === null || slotProps === void 0 ? void 0 : slotProps.toolbar)
+      }, componentsProps === null || componentsProps === void 0 ? void 0 : componentsProps.toolbar)
     }),
-    rowSelectionModel: rowSelectionModel,
-    onRowSelectionModelChange: (newSelectionModel, details) => {
+    selectionModel: selectionModel,
+    onSelectionModelChange: (newSelectionModel, details) => {
       if (pagination && paginationMode != 'server') {
         const selectableRowsInPage = isRowSelectable ? gridPaginatedVisibleSortedGridRowEntriesSelector(apiRef).filter(_ref => {
           let {
@@ -3102,7 +1704,7 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
           };
         }
       }
-      onRowSelectionModelChange === null || onRowSelectionModelChange === void 0 ? void 0 : onRowSelectionModelChange(newSelectionModel, details);
+      onSelectionModelChange === null || onSelectionModelChange === void 0 ? void 0 : onSelectionModelChange(newSelectionModel, details);
     },
     sx: _objectSpread2(_objectSpread2({}, sx), {}, {
       '.MuiDataGrid-columnHeaders': {
@@ -3118,5 +1720,5 @@ const StatefulDataGrid = /*#__PURE__*/forwardRef((props, ref) => {
 StatefulDataGrid.className = CLASSNAME;
 StatefulDataGrid.displayName = COMPONENT_NAME;
 
-export { getSearchParamsFromSorting as $, getGridStringArrayOperatorsWithSelectOnStringArrayColumns as A, SORT_MODEL_KEY as B, CONTAINS_ANY_OF as C, DOES_NOT_CONTAIN as D, ENDS_WITH_ANY_OF as E, FILTER_MODEL_KEY as F, PINNED_COLUMNS as G, HAS as H, IS_BETWEEN as I, DIMENSION_MODEL_KEY as J, FILTER_SEARCH_KEY as K, CATEGORIES as L, buildStorageKey as M, clearPreviousVersionStorage as N, decodeValue as O, PAGINATION_MODEL_KEY as P, encodeValue as Q, urlSearchParamsToString as R, STARTS_WITH_ANY_OF as S, numberOperatorEncoder as T, numberOperatorDecoder as U, VISIBILITY_MODEL_KEY as V, isOperatorValueValid as W, isValueValid as X, getFilterModelFromString as Y, getSearchParamsFromFilterModel as Z, getSortingFromString as _, DOES_NOT_EQUAL as a, getPaginationFromString as a0, getSearchParamsFromPagination as a1, getColumnVisibilityFromString as a2, getSearchParamsFromColumnVisibility as a3, getPinnedColumnsFromString as a4, getSearchParamsFromPinnedColumns as a5, getSearchParamsFromTab as a6, getFinalSearch as a7, getModelsParsedOrUpdateLocalStorage as a8, updateUrl as a9, areFilterModelsEquivalent as aa, StatefulDataGrid as ab, DOES_NOT_HAVE as b, DOES_NOT_HAVE_WITH_SELECT as c, HAS_WITH_SELECT as d, HAS_ONLY as e, HAS_ONLY_WITH_SELECT as f, getGridNumericOperators as g, IS as h, IS_WITH_SELECT as i, IS_NOT as j, IS_NOT_WITH_SELECT as k, getGridStringOperators as l, CONTAINS_ANY_OF_I as m, DOES_NOT_HAVE_ANY_OF as n, operatorList as o, DOES_NOT_HAVE_ANY_OF_WITH_SELECT as p, IS_ANY_OF as q, IS_ANY_OF_WITH_SELECT as r, IS_ANY_OF_I as s, IS_ANY_OF_I_WITH_SELECT as t, HAS_ANY_OF as u, HAS_ANY_OF_WITH_SELECT as v, IS_NOT_ANY_OF as w, IS_NOT_ANY_OF_WITH_SELECT as x, getGridStringArrayOperators as y, getGridStringArrayOperatorsWithSelect as z };
+export { getModelsParsedOrUpdateLocalStorage as A, updateUrl as B, CATEGORIES as C, DIMENSION_MODEL_KEY as D, areFilterModelsEquivalent as E, FILTER_MODEL_KEY as F, StatefulDataGrid as G, PAGINATION_MODEL_KEY as P, SORT_MODEL_KEY as S, VISIBILITY_MODEL_KEY as V, PINNED_COLUMNS as a, FILTER_SEARCH_KEY as b, buildStorageKey as c, clearPreviousVersionStorage as d, convertToDisplayFormat as e, convertFromDisplayFormat as f, getDecodedSearchFromUrl as g, buildQueryParamsString as h, areSearchStringsEqual as i, decodeValue as j, encodeValue as k, numberOperatorDecoder as l, getFilterModelFromString as m, numberOperatorEncoder as n, getSearchParamsFromFilterModel as o, getSortingFromString as p, getSearchParamsFromSorting as q, getPaginationFromString as r, getSearchParamsFromPagination as s, getSearchParamsFromColumnVisibility as t, urlSearchParamsToString as u, getColumnVisibilityFromString as v, getPinnedColumnsFromString as w, getSearchParamsFromPinnedColumns as x, getSearchParamsFromTab as y, getFinalSearch as z };
 //# sourceMappingURL=StatefulDataGrid2.js.map