diff --git a/packages/mui-material/src/Accordion/Accordion.js b/packages/mui-material/src/Accordion/Accordion.js index 5483c88ad1f670..3adf939dcd5cdd 100644 --- a/packages/mui-material/src/Accordion/Accordion.js +++ b/packages/mui-material/src/Accordion/Accordion.js @@ -3,8 +3,8 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Collapse from '../Collapse'; diff --git a/packages/mui-material/src/AccordionActions/AccordionActions.js b/packages/mui-material/src/AccordionActions/AccordionActions.js index 912b6f265049c8..c6bc67b81056e9 100644 --- a/packages/mui-material/src/AccordionActions/AccordionActions.js +++ b/packages/mui-material/src/AccordionActions/AccordionActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getAccordionActionsUtilityClass } from './accordionActionsClasses'; diff --git a/packages/mui-material/src/AccordionDetails/AccordionDetails.js b/packages/mui-material/src/AccordionDetails/AccordionDetails.js index b9c7eefc67e1ef..d39ee3bd0b5f72 100644 --- a/packages/mui-material/src/AccordionDetails/AccordionDetails.js +++ b/packages/mui-material/src/AccordionDetails/AccordionDetails.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getAccordionDetailsUtilityClass } from './accordionDetailsClasses'; diff --git a/packages/mui-material/src/AccordionSummary/AccordionSummary.js b/packages/mui-material/src/AccordionSummary/AccordionSummary.js index b40956653b9d0d..922f9615d5d6e4 100644 --- a/packages/mui-material/src/AccordionSummary/AccordionSummary.js +++ b/packages/mui-material/src/AccordionSummary/AccordionSummary.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Alert/Alert.js b/packages/mui-material/src/Alert/Alert.js index b063487a913c3b..db4a52e3fc21b6 100644 --- a/packages/mui-material/src/Alert/Alert.js +++ b/packages/mui-material/src/Alert/Alert.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { darken, lighten } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { darken, lighten } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/AlertTitle/AlertTitle.js b/packages/mui-material/src/AlertTitle/AlertTitle.js index ab003a117e4f48..8889812510d73f 100644 --- a/packages/mui-material/src/AlertTitle/AlertTitle.js +++ b/packages/mui-material/src/AlertTitle/AlertTitle.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/AppBar/AppBar.js b/packages/mui-material/src/AppBar/AppBar.js index 2f36324bf04e35..fec36c2e635a3d 100644 --- a/packages/mui-material/src/AppBar/AppBar.js +++ b/packages/mui-material/src/AppBar/AppBar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Autocomplete/Autocomplete.js b/packages/mui-material/src/Autocomplete/Autocomplete.js index 0e970b2b30305e..18e0e9d58180c1 100644 --- a/packages/mui-material/src/Autocomplete/Autocomplete.js +++ b/packages/mui-material/src/Autocomplete/Autocomplete.js @@ -2,13 +2,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, integerPropType } from '@mui/utils'; -import { - unstable_composeClasses as composeClasses, - useAutocomplete, - createFilterOptions, -} from '@mui/base'; -import { alpha } from '@mui/system'; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import { useAutocomplete, createFilterOptions } from '@mui/base'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import Popper from '../Popper'; import ListSubheader from '../ListSubheader'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/Avatar/Avatar.js b/packages/mui-material/src/Avatar/Avatar.js index e1994e72475b00..60002012382a53 100644 --- a/packages/mui-material/src/Avatar/Avatar.js +++ b/packages/mui-material/src/Avatar/Avatar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Person from '../internal/svg-icons/Person'; diff --git a/packages/mui-material/src/AvatarGroup/AvatarGroup.js b/packages/mui-material/src/AvatarGroup/AvatarGroup.js index a1fdfb09dc466e..84babf704c59e8 100644 --- a/packages/mui-material/src/AvatarGroup/AvatarGroup.js +++ b/packages/mui-material/src/AvatarGroup/AvatarGroup.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { isFragment } from 'react-is'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Avatar, { avatarClasses } from '../Avatar'; diff --git a/packages/mui-material/src/Backdrop/Backdrop.js b/packages/mui-material/src/Backdrop/Backdrop.js index 8a8f4331409da8..1221de8bc3db64 100644 --- a/packages/mui-material/src/Backdrop/Backdrop.js +++ b/packages/mui-material/src/Backdrop/Backdrop.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Fade from '../Fade'; diff --git a/packages/mui-material/src/Badge/Badge.js b/packages/mui-material/src/Badge/Badge.js index 0acd4237363ddf..f38326e038e5a9 100644 --- a/packages/mui-material/src/Badge/Badge.js +++ b/packages/mui-material/src/Badge/Badge.js @@ -2,10 +2,10 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { usePreviousProps } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import usePreviousProps from '@mui/utils/usePreviousProps'; +import composeClasses from '@mui/utils/composeClasses'; import { useBadge } from '@mui/base/useBadge'; -import { useSlotProps } from '@mui/base'; +import { useSlotProps } from '@mui/base/utils'; import { styled, createUseThemeProps } from '../zero-styled'; import capitalize from '../utils/capitalize'; import badgeClasses, { getBadgeUtilityClass } from './badgeClasses'; diff --git a/packages/mui-material/src/BottomNavigation/BottomNavigation.js b/packages/mui-material/src/BottomNavigation/BottomNavigation.js index e62764d9f91099..86eb69a517aec6 100755 --- a/packages/mui-material/src/BottomNavigation/BottomNavigation.js +++ b/packages/mui-material/src/BottomNavigation/BottomNavigation.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getBottomNavigationUtilityClass } from './bottomNavigationClasses'; diff --git a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js index 0274540aeaeefa..caedc7018e73b3 100644 --- a/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js +++ b/packages/mui-material/src/BottomNavigationAction/BottomNavigationAction.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js index 7ae564eca375dc..2b208d529df3a1 100644 --- a/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js +++ b/packages/mui-material/src/Breadcrumbs/BreadcrumbCollapsed.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { emphasize } from '@mui/system'; +import { emphasize } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import MoreHorizIcon from '../internal/svg-icons/MoreHoriz'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js index cde6e6dbba8256..6d9ffc22b684d4 100644 --- a/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js +++ b/packages/mui-material/src/Breadcrumbs/Breadcrumbs.js @@ -3,8 +3,9 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import integerPropType from '@mui/utils/integerPropType'; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/Button/Button.js b/packages/mui-material/src/Button/Button.js index d924ad68d38966..014448bf49e051 100644 --- a/packages/mui-material/src/Button/Button.js +++ b/packages/mui-material/src/Button/Button.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { internal_resolveProps as resolveProps } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import resolveProps from '@mui/utils/resolveProps'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.js b/packages/mui-material/src/ButtonBase/ButtonBase.js index 05f3e5963e7052..bad1a0f69f2891 100644 --- a/packages/mui-material/src/ButtonBase/ButtonBase.js +++ b/packages/mui-material/src/ButtonBase/ButtonBase.js @@ -2,8 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { elementTypeAcceptingRef, refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from '@mui/utils/refType'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/ButtonBase/TouchRipple.js b/packages/mui-material/src/ButtonBase/TouchRipple.js index 4c0bc8ad469305..584d3982405702 100644 --- a/packages/mui-material/src/ButtonBase/TouchRipple.js +++ b/packages/mui-material/src/ButtonBase/TouchRipple.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { TransitionGroup } from 'react-transition-group'; import clsx from 'clsx'; import { keyframes } from '@mui/system'; -import { unstable_useTimeout as useTimeout } from '@mui/utils'; +import useTimeout from '@mui/utils/useTimeout'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Ripple from './Ripple'; diff --git a/packages/mui-material/src/ButtonGroup/ButtonGroup.js b/packages/mui-material/src/ButtonGroup/ButtonGroup.js index e9eb02dddf72a2..8dc5c7aa6e1855 100644 --- a/packages/mui-material/src/ButtonGroup/ButtonGroup.js +++ b/packages/mui-material/src/ButtonGroup/ButtonGroup.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; -import { getValidReactChildren } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; +import getValidReactChildren from '@mui/utils/getValidReactChildren'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Card/Card.js b/packages/mui-material/src/Card/Card.js index 26526533e02e24..76fec05f8f4399 100644 --- a/packages/mui-material/src/Card/Card.js +++ b/packages/mui-material/src/Card/Card.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/CardActionArea/CardActionArea.js b/packages/mui-material/src/CardActionArea/CardActionArea.js index b666d03ed7f4a8..55cf85f103b9f0 100644 --- a/packages/mui-material/src/CardActionArea/CardActionArea.js +++ b/packages/mui-material/src/CardActionArea/CardActionArea.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import cardActionAreaClasses, { getCardActionAreaUtilityClass } from './cardActionAreaClasses'; diff --git a/packages/mui-material/src/CardActions/CardActions.js b/packages/mui-material/src/CardActions/CardActions.js index 958111cafd32d5..c20972400583d5 100644 --- a/packages/mui-material/src/CardActions/CardActions.js +++ b/packages/mui-material/src/CardActions/CardActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getCardActionsUtilityClass } from './cardActionsClasses'; diff --git a/packages/mui-material/src/CardContent/CardContent.js b/packages/mui-material/src/CardContent/CardContent.js index db30e846cca8e4..2021d480c12177 100644 --- a/packages/mui-material/src/CardContent/CardContent.js +++ b/packages/mui-material/src/CardContent/CardContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getCardContentUtilityClass } from './cardContentClasses'; diff --git a/packages/mui-material/src/CardHeader/CardHeader.js b/packages/mui-material/src/CardHeader/CardHeader.js index db9d6e6fbbe679..1ac7c5e80ad7fa 100644 --- a/packages/mui-material/src/CardHeader/CardHeader.js +++ b/packages/mui-material/src/CardHeader/CardHeader.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import Typography from '../Typography'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/CardMedia/CardMedia.js b/packages/mui-material/src/CardMedia/CardMedia.js index 16932d30316359..6cf26c3cba1f38 100644 --- a/packages/mui-material/src/CardMedia/CardMedia.js +++ b/packages/mui-material/src/CardMedia/CardMedia.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getCardMediaUtilityClass } from './cardMediaClasses'; diff --git a/packages/mui-material/src/Checkbox/Checkbox.js b/packages/mui-material/src/Checkbox/Checkbox.js index 8b9577ec2c6177..2a320260668f68 100644 --- a/packages/mui-material/src/Checkbox/Checkbox.js +++ b/packages/mui-material/src/Checkbox/Checkbox.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import SwitchBase from '../internal/SwitchBase'; import CheckBoxOutlineBlankIcon from '../internal/svg-icons/CheckBoxOutlineBlank'; import CheckBoxIcon from '../internal/svg-icons/CheckBox'; diff --git a/packages/mui-material/src/Chip/Chip.js b/packages/mui-material/src/Chip/Chip.js index 39210a127f5893..a8ffaf70cf30d8 100644 --- a/packages/mui-material/src/Chip/Chip.js +++ b/packages/mui-material/src/Chip/Chip.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import CancelIcon from '../internal/svg-icons/Cancel'; import useForkRef from '../utils/useForkRef'; import unsupportedProp from '../utils/unsupportedProp'; diff --git a/packages/mui-material/src/CircularProgress/CircularProgress.js b/packages/mui-material/src/CircularProgress/CircularProgress.js index ab5b6861c18903..e50517d07ec2d8 100644 --- a/packages/mui-material/src/CircularProgress/CircularProgress.js +++ b/packages/mui-material/src/CircularProgress/CircularProgress.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import { keyframes, css } from '@mui/system'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Collapse/Collapse.js b/packages/mui-material/src/Collapse/Collapse.js index b7294131917fd4..42e206e96137b8 100644 --- a/packages/mui-material/src/Collapse/Collapse.js +++ b/packages/mui-material/src/Collapse/Collapse.js @@ -3,8 +3,9 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementTypeAcceptingRef, unstable_useTimeout as useTimeout } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import useTimeout from '@mui/utils/useTimeout'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { duration } from '../styles/createTransitions'; diff --git a/packages/mui-material/src/Dialog/Dialog.js b/packages/mui-material/src/Dialog/Dialog.js index a2472f8b58e36d..420076e0bf8092 100644 --- a/packages/mui-material/src/Dialog/Dialog.js +++ b/packages/mui-material/src/Dialog/Dialog.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { unstable_useId as useId } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import useId from '@mui/utils/useId'; import capitalize from '../utils/capitalize'; import Modal from '../Modal'; import Fade from '../Fade'; diff --git a/packages/mui-material/src/DialogActions/DialogActions.js b/packages/mui-material/src/DialogActions/DialogActions.js index b54ca2f6da7dbd..a66fb25bf2008b 100644 --- a/packages/mui-material/src/DialogActions/DialogActions.js +++ b/packages/mui-material/src/DialogActions/DialogActions.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDialogActionsUtilityClass } from './dialogActionsClasses'; diff --git a/packages/mui-material/src/DialogContent/DialogContent.js b/packages/mui-material/src/DialogContent/DialogContent.js index 9606dd07ad071f..ec0367c918df4c 100644 --- a/packages/mui-material/src/DialogContent/DialogContent.js +++ b/packages/mui-material/src/DialogContent/DialogContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDialogContentUtilityClass } from './dialogContentClasses'; diff --git a/packages/mui-material/src/DialogContentText/DialogContentText.js b/packages/mui-material/src/DialogContentText/DialogContentText.js index 980b0de7d13604..c6c8cabc6056ed 100644 --- a/packages/mui-material/src/DialogContentText/DialogContentText.js +++ b/packages/mui-material/src/DialogContentText/DialogContentText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/DialogTitle/DialogTitle.js b/packages/mui-material/src/DialogTitle/DialogTitle.js index a22ecde134baa8..aa160274950623 100644 --- a/packages/mui-material/src/DialogTitle/DialogTitle.js +++ b/packages/mui-material/src/DialogTitle/DialogTitle.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import Typography from '../Typography'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Divider/Divider.js b/packages/mui-material/src/Divider/Divider.js index a986b921347550..80aefb09bbe3c6 100644 --- a/packages/mui-material/src/Divider/Divider.js +++ b/packages/mui-material/src/Divider/Divider.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getDividerUtilityClass } from './dividerClasses'; diff --git a/packages/mui-material/src/Drawer/Drawer.js b/packages/mui-material/src/Drawer/Drawer.js index 520c77e7286220..eef70ec528fcd4 100644 --- a/packages/mui-material/src/Drawer/Drawer.js +++ b/packages/mui-material/src/Drawer/Drawer.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import Modal from '../Modal'; import Slide from '../Slide'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/Fab/Fab.js b/packages/mui-material/src/Fab/Fab.js index 579bc36656102b..10f3ab80910ed0 100644 --- a/packages/mui-material/src/Fab/Fab.js +++ b/packages/mui-material/src/Fab/Fab.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Fade/Fade.js b/packages/mui-material/src/Fade/Fade.js index b659c8e77d9f9d..0258a3adae8723 100644 --- a/packages/mui-material/src/Fade/Fade.js +++ b/packages/mui-material/src/Fade/Fade.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementAcceptingRef } from '@mui/utils'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import useTheme from '../styles/useTheme'; import { reflow, getTransitionProps } from '../transitions/utils'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/FilledInput/FilledInput.js b/packages/mui-material/src/FilledInput/FilledInput.js index 1440d645b11df4..9e2de297107310 100644 --- a/packages/mui-material/src/FilledInput/FilledInput.js +++ b/packages/mui-material/src/FilledInput/FilledInput.js @@ -1,8 +1,9 @@ 'use client'; import * as React from 'react'; -import { refType, deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; +import refType from '@mui/utils/refType'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import InputBase from '../InputBase'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/FormControl/FormControl.js b/packages/mui-material/src/FormControl/FormControl.js index 1385536d3b53e0..ce8353db232aa5 100644 --- a/packages/mui-material/src/FormControl/FormControl.js +++ b/packages/mui-material/src/FormControl/FormControl.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { isFilled, isAdornedStart } from '../InputBase/utils'; diff --git a/packages/mui-material/src/FormControlLabel/FormControlLabel.js b/packages/mui-material/src/FormControlLabel/FormControlLabel.js index cff14bda1a9924..d6d215eb661ca8 100644 --- a/packages/mui-material/src/FormControlLabel/FormControlLabel.js +++ b/packages/mui-material/src/FormControlLabel/FormControlLabel.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import { useFormControl } from '../FormControl'; import Stack from '../Stack'; import Typography from '../Typography'; diff --git a/packages/mui-material/src/FormGroup/FormGroup.js b/packages/mui-material/src/FormGroup/FormGroup.js index d8e42477b93eb2..7a908ea680476c 100644 --- a/packages/mui-material/src/FormGroup/FormGroup.js +++ b/packages/mui-material/src/FormGroup/FormGroup.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getFormGroupUtilityClass } from './formGroupClasses'; diff --git a/packages/mui-material/src/FormHelperText/FormHelperText.js b/packages/mui-material/src/FormHelperText/FormHelperText.js index 6c5c74afa4d19e..f8acae4f37d515 100644 --- a/packages/mui-material/src/FormHelperText/FormHelperText.js +++ b/packages/mui-material/src/FormHelperText/FormHelperText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/FormLabel/FormLabel.js b/packages/mui-material/src/FormLabel/FormLabel.js index fb02e3b9af9eb6..ba9826f0d7f52a 100644 --- a/packages/mui-material/src/FormLabel/FormLabel.js +++ b/packages/mui-material/src/FormLabel/FormLabel.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Grid/Grid.js b/packages/mui-material/src/Grid/Grid.js index 4672813ffc6175..62900dc203ac44 100644 --- a/packages/mui-material/src/Grid/Grid.js +++ b/packages/mui-material/src/Grid/Grid.js @@ -13,11 +13,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { - unstable_extendSxProp as extendSxProp, handleBreakpoints, unstable_resolveBreakpointValues as resolveBreakpointValues, } from '@mui/system'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import { extendSxProp } from '@mui/system/styleFunctionSx'; +import composeClasses from '@mui/utils/composeClasses'; import requirePropFactory from '../utils/requirePropFactory'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Grow/Grow.js b/packages/mui-material/src/Grow/Grow.js index 99d37827cd132d..77866f1f107765 100644 --- a/packages/mui-material/src/Grow/Grow.js +++ b/packages/mui-material/src/Grow/Grow.js @@ -1,7 +1,8 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { elementAcceptingRef, unstable_useTimeout as useTimeout } from '@mui/utils'; +import useTimeout from '@mui/utils/useTimeout'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import { Transition } from 'react-transition-group'; import useTheme from '../styles/useTheme'; import { getTransitionProps, reflow } from '../transitions/utils'; diff --git a/packages/mui-material/src/Hidden/HiddenCss.js b/packages/mui-material/src/Hidden/HiddenCss.js index e27c28524cf8e6..c88531677ce928 100644 --- a/packages/mui-material/src/Hidden/HiddenCss.js +++ b/packages/mui-material/src/Hidden/HiddenCss.js @@ -2,7 +2,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Hidden/HiddenJs.js b/packages/mui-material/src/Hidden/HiddenJs.js index 5b718c09c008e8..b591452cef6299 100644 --- a/packages/mui-material/src/Hidden/HiddenJs.js +++ b/packages/mui-material/src/Hidden/HiddenJs.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { exactProp } from '@mui/utils'; +import exactProp from '@mui/utils/exactProp'; import withWidth, { isWidthDown, isWidthUp } from './withWidth'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Hidden/withWidth.js b/packages/mui-material/src/Hidden/withWidth.js index 276ba00f470684..986fa0a8fd8e30 100644 --- a/packages/mui-material/src/Hidden/withWidth.js +++ b/packages/mui-material/src/Hidden/withWidth.js @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import { getDisplayName } from '@mui/utils'; -import { getThemeProps } from '@mui/system'; +import getDisplayName from '@mui/utils/getDisplayName'; +import { getThemeProps } from '@mui/system/useThemeProps'; import useTheme from '../styles/useTheme'; import useEnhancedEffect from '../utils/useEnhancedEffect'; import useMediaQuery from '../useMediaQuery'; diff --git a/packages/mui-material/src/Icon/Icon.js b/packages/mui-material/src/Icon/Icon.js index b21d0d573c5fac..c98665f504ca04 100644 --- a/packages/mui-material/src/Icon/Icon.js +++ b/packages/mui-material/src/Icon/Icon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/IconButton/IconButton.js b/packages/mui-material/src/IconButton/IconButton.js index abd4ebf72427e2..0c6a5351555cc2 100644 --- a/packages/mui-material/src/IconButton/IconButton.js +++ b/packages/mui-material/src/IconButton/IconButton.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/IconButton/IconButton.test.js b/packages/mui-material/src/IconButton/IconButton.test.js index 7c744f92a59c47..f282aed1da1b08 100644 --- a/packages/mui-material/src/IconButton/IconButton.test.js +++ b/packages/mui-material/src/IconButton/IconButton.test.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import PropTypes from 'prop-types'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from '@mui/utils/capitalize'; import { ThemeProvider, createTheme } from '@mui/material/styles'; import IconButton, { iconButtonClasses as classes } from '@mui/material/IconButton'; import Icon from '@mui/material/Icon'; diff --git a/packages/mui-material/src/ImageList/ImageList.js b/packages/mui-material/src/ImageList/ImageList.js index 70da0435e7a0fb..5a521234e12ef5 100644 --- a/packages/mui-material/src/ImageList/ImageList.js +++ b/packages/mui-material/src/ImageList/ImageList.js @@ -1,6 +1,6 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { integerPropType } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/ImageListItem/ImageListItem.js b/packages/mui-material/src/ImageListItem/ImageListItem.js index f105b3e6ea1abd..4efc8004bd0537 100644 --- a/packages/mui-material/src/ImageListItem/ImageListItem.js +++ b/packages/mui-material/src/ImageListItem/ImageListItem.js @@ -1,6 +1,6 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { integerPropType } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js index 53bdcce44953e3..beb348657dbc6b 100644 --- a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js +++ b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js @@ -1,5 +1,5 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/Input/Input.js b/packages/mui-material/src/Input/Input.js index 51982e9d261346..23f0d477ed74f3 100644 --- a/packages/mui-material/src/Input/Input.js +++ b/packages/mui-material/src/Input/Input.js @@ -1,8 +1,9 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { refType, deepmerge } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import deepmerge from '@mui/utils/deepmerge'; +import refType from '@mui/utils/refType'; import InputBase from '../InputBase'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/InputAdornment/InputAdornment.js b/packages/mui-material/src/InputAdornment/InputAdornment.js index 7f80baf3a880d0..286d7f3463c249 100644 --- a/packages/mui-material/src/InputAdornment/InputAdornment.js +++ b/packages/mui-material/src/InputAdornment/InputAdornment.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import Typography from '../Typography'; import FormControlContext from '../FormControl/FormControlContext'; diff --git a/packages/mui-material/src/InputBase/InputBase.js b/packages/mui-material/src/InputBase/InputBase.js index a7b4186b88d0a9..cbb51b1ed0f844 100644 --- a/packages/mui-material/src/InputBase/InputBase.js +++ b/packages/mui-material/src/InputBase/InputBase.js @@ -2,13 +2,12 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType, elementTypeAcceptingRef } from '@mui/utils'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import refType from '@mui/utils/refType'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { - unstable_composeClasses as composeClasses, - isHostComponent, - TextareaAutosize, -} from '@mui/base'; +import { TextareaAutosize } from '@mui/base'; +import { isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import formControlState from '../FormControl/formControlState'; import FormControlContext from '../FormControl/FormControlContext'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/InputLabel/InputLabel.js b/packages/mui-material/src/InputLabel/InputLabel.js index 8007698a5e0ea8..dd8003ee8ebb7c 100644 --- a/packages/mui-material/src/InputLabel/InputLabel.js +++ b/packages/mui-material/src/InputLabel/InputLabel.js @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import clsx from 'clsx'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/LinearProgress/LinearProgress.js b/packages/mui-material/src/LinearProgress/LinearProgress.js index 5a298f109c2f06..4ca989cf10592e 100644 --- a/packages/mui-material/src/LinearProgress/LinearProgress.js +++ b/packages/mui-material/src/LinearProgress/LinearProgress.js @@ -2,8 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { keyframes, css, darken, lighten } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { keyframes, css } from '@mui/system'; +import { darken, lighten } from '@mui/system/colorManipulator'; import capitalize from '../utils/capitalize'; import useTheme from '../styles/useTheme'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/Link/Link.js b/packages/mui-material/src/Link/Link.js index e23708341b4ec4..f5e72605b7312d 100644 --- a/packages/mui-material/src/Link/Link.js +++ b/packages/mui-material/src/Link/Link.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { elementTypeAcceptingRef } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Link/getTextDecoration.ts b/packages/mui-material/src/Link/getTextDecoration.ts index cd574b1d0c3321..7cdb42cd9d501f 100644 --- a/packages/mui-material/src/Link/getTextDecoration.ts +++ b/packages/mui-material/src/Link/getTextDecoration.ts @@ -1,4 +1,5 @@ -import { alpha, getPath } from '@mui/system'; +import { getPath } from '@mui/system'; +import { alpha } from '@mui/system/colorManipulator'; import type { Theme } from '../styles'; export const colorTransformations = { diff --git a/packages/mui-material/src/List/List.js b/packages/mui-material/src/List/List.js index a8c6037163f5db..aecb83a331e8ae 100644 --- a/packages/mui-material/src/List/List.js +++ b/packages/mui-material/src/List/List.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from './ListContext'; diff --git a/packages/mui-material/src/ListItem/ListItem.js b/packages/mui-material/src/ListItem/ListItem.js index 9b31b6651b0352..d60ee0e4892a8c 100644 --- a/packages/mui-material/src/ListItem/ListItem.js +++ b/packages/mui-material/src/ListItem/ListItem.js @@ -2,9 +2,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses, isHostComponent } from '@mui/base'; -import { chainPropTypes, elementTypeAcceptingRef } from '@mui/utils'; -import { alpha } from '@mui/system'; +import { isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js index 6bb8339ba8eec7..fa580dbcb2509f 100644 --- a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js +++ b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import ListContext from '../List/ListContext'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/ListItemButton/ListItemButton.js b/packages/mui-material/src/ListItemButton/ListItemButton.js index 2870684be5a99b..58d025dba07928 100644 --- a/packages/mui-material/src/ListItemButton/ListItemButton.js +++ b/packages/mui-material/src/ListItemButton/ListItemButton.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/ListItemIcon/ListItemIcon.js b/packages/mui-material/src/ListItemIcon/ListItemIcon.js index 1b0ff52ff8ed5a..7a143e3d89d8c0 100644 --- a/packages/mui-material/src/ListItemIcon/ListItemIcon.js +++ b/packages/mui-material/src/ListItemIcon/ListItemIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import { getListItemIconUtilityClass } from './listItemIconClasses'; diff --git a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js index cf9d7acfceefb0..3b101be0640fe4 100644 --- a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js +++ b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from '../List/ListContext'; diff --git a/packages/mui-material/src/ListItemText/ListItemText.js b/packages/mui-material/src/ListItemText/ListItemText.js index 6729dfb7bfc254..b5460439d37b9a 100644 --- a/packages/mui-material/src/ListItemText/ListItemText.js +++ b/packages/mui-material/src/ListItemText/ListItemText.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import Typography from '../Typography'; import ListContext from '../List/ListContext'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/ListSubheader/ListSubheader.js b/packages/mui-material/src/ListSubheader/ListSubheader.js index 48c01aa2fbdc5d..668b3e9dd32dcf 100644 --- a/packages/mui-material/src/ListSubheader/ListSubheader.js +++ b/packages/mui-material/src/ListSubheader/ListSubheader.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Menu/Menu.js b/packages/mui-material/src/Menu/Menu.js index 1e3af0d0b445e4..adced73ab01bb1 100644 --- a/packages/mui-material/src/Menu/Menu.js +++ b/packages/mui-material/src/Menu/Menu.js @@ -3,9 +3,9 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import { useSlotProps } from '@mui/base/utils'; -import { HTMLElementType } from '@mui/utils'; +import HTMLElementType from '@mui/utils/HTMLElementType'; import MenuList from '../MenuList'; import Popover, { PopoverPaper } from '../Popover'; import styled, { rootShouldForwardProp } from '../styles/styled'; diff --git a/packages/mui-material/src/MenuItem/MenuItem.js b/packages/mui-material/src/MenuItem/MenuItem.js index 64b5a079e820cf..fde0d2867c1e1f 100644 --- a/packages/mui-material/src/MenuItem/MenuItem.js +++ b/packages/mui-material/src/MenuItem/MenuItem.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ListContext from '../List/ListContext'; diff --git a/packages/mui-material/src/MobileStepper/MobileStepper.js b/packages/mui-material/src/MobileStepper/MobileStepper.js index 4a9511714bc087..fbf543479f5e3f 100644 --- a/packages/mui-material/src/MobileStepper/MobileStepper.js +++ b/packages/mui-material/src/MobileStepper/MobileStepper.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import Paper from '../Paper'; import capitalize from '../utils/capitalize'; import LinearProgress from '../LinearProgress'; diff --git a/packages/mui-material/src/Modal/Modal.js b/packages/mui-material/src/Modal/Modal.js index 691edcc89b97cd..69b85c5bf6d7b4 100644 --- a/packages/mui-material/src/Modal/Modal.js +++ b/packages/mui-material/src/Modal/Modal.js @@ -2,10 +2,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { elementAcceptingRef, HTMLElementType } from '@mui/utils'; -import { useSlotProps } from '@mui/base'; +import HTMLElementType from '@mui/utils/HTMLElementType'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; +import { useSlotProps } from '@mui/base/utils'; import { unstable_useModal as useModal } from '@mui/base/unstable_useModal'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import FocusTrap from '../Unstable_TrapFocus'; import Portal from '../Portal'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/NativeSelect/NativeSelect.js b/packages/mui-material/src/NativeSelect/NativeSelect.js index 674f0e6797b75c..ebfa1ea9ca753d 100644 --- a/packages/mui-material/src/NativeSelect/NativeSelect.js +++ b/packages/mui-material/src/NativeSelect/NativeSelect.js @@ -2,7 +2,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import NativeSelectInput from './NativeSelectInput'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/NativeSelect/NativeSelectInput.js b/packages/mui-material/src/NativeSelect/NativeSelectInput.js index d0c88089f1ff3e..c912d69ddc9a7c 100644 --- a/packages/mui-material/src/NativeSelect/NativeSelectInput.js +++ b/packages/mui-material/src/NativeSelect/NativeSelectInput.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import nativeSelectClasses, { getNativeSelectUtilityClasses } from './nativeSelectClasses'; import styled, { rootShouldForwardProp } from '../styles/styled'; diff --git a/packages/mui-material/src/OutlinedInput/OutlinedInput.js b/packages/mui-material/src/OutlinedInput/OutlinedInput.js index 2a9b87952f9d7a..6d75411fa65732 100644 --- a/packages/mui-material/src/OutlinedInput/OutlinedInput.js +++ b/packages/mui-material/src/OutlinedInput/OutlinedInput.js @@ -1,8 +1,8 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import NotchedOutline from './NotchedOutline'; import useFormControl from '../FormControl/useFormControl'; import formControlState from '../FormControl/formControlState'; diff --git a/packages/mui-material/src/Pagination/Pagination.js b/packages/mui-material/src/Pagination/Pagination.js index f96d8720d6609f..659f4588fd1989 100644 --- a/packages/mui-material/src/Pagination/Pagination.js +++ b/packages/mui-material/src/Pagination/Pagination.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { integerPropType } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; import useThemeProps from '../styles/useThemeProps'; import { getPaginationUtilityClass } from './paginationClasses'; import usePagination from '../usePagination'; diff --git a/packages/mui-material/src/PaginationItem/PaginationItem.js b/packages/mui-material/src/PaginationItem/PaginationItem.js index 9be03580d12ca3..715286a41a4458 100644 --- a/packages/mui-material/src/PaginationItem/PaginationItem.js +++ b/packages/mui-material/src/PaginationItem/PaginationItem.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import useThemeProps from '../styles/useThemeProps'; import paginationItemClasses, { getPaginationItemUtilityClass } from './paginationItemClasses'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Paper/Paper.js b/packages/mui-material/src/Paper/Paper.js index e4f6d6da4bca88..7f0d449c86c278 100644 --- a/packages/mui-material/src/Paper/Paper.js +++ b/packages/mui-material/src/Paper/Paper.js @@ -2,9 +2,10 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import getOverlayAlpha from '../styles/getOverlayAlpha'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Popover/Popover.js b/packages/mui-material/src/Popover/Popover.js index ff8e582fae651c..8df1fbc6b7cd6d 100644 --- a/packages/mui-material/src/Popover/Popover.js +++ b/packages/mui-material/src/Popover/Popover.js @@ -2,18 +2,13 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { - unstable_composeClasses as composeClasses, - useSlotProps, - isHostComponent, -} from '@mui/base'; -import { - chainPropTypes, - integerPropType, - elementTypeAcceptingRef, - refType, - HTMLElementType, -} from '@mui/utils'; +import { useSlotProps, isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import HTMLElementType from '@mui/utils/HTMLElementType'; +import refType from '@mui/utils/refType'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import debounce from '../utils/debounce'; diff --git a/packages/mui-material/src/Popper/Popper.test.js b/packages/mui-material/src/Popper/Popper.test.js index 74162a2c04da51..b8418f6859e8f2 100644 --- a/packages/mui-material/src/Popper/Popper.test.js +++ b/packages/mui-material/src/Popper/Popper.test.js @@ -7,7 +7,8 @@ import { fireEvent, screen, } from '@mui-internal/test-utils'; -import { ThemeProvider, createTheme } from '@mui/system'; +import { ThemeProvider } from '@mui/system'; +import createTheme from '@mui/system/createTheme'; import Grow from '@mui/material/Grow'; import Popper from '@mui/material/Popper'; diff --git a/packages/mui-material/src/Popper/Popper.tsx b/packages/mui-material/src/Popper/Popper.tsx index ab8059ff1ed1dd..6609e81a78b2a1 100644 --- a/packages/mui-material/src/Popper/Popper.tsx +++ b/packages/mui-material/src/Popper/Popper.tsx @@ -1,7 +1,9 @@ 'use client'; import { Popper as BasePopper, PopperProps as BasePopperProps } from '@mui/base/Popper'; -import { Direction, SxProps, useThemeWithoutDefault as useTheme } from '@mui/system'; -import { HTMLElementType, refType } from '@mui/utils'; +import { Direction, SxProps } from '@mui/system'; +import useTheme from '@mui/system/useThemeWithoutDefault'; +import refType from '@mui/utils/refType'; +import HTMLElementType from '@mui/utils/HTMLElementType'; import PropTypes from 'prop-types'; import * as React from 'react'; import { styled, Theme, useThemeProps } from '../styles'; diff --git a/packages/mui-material/src/Radio/Radio.js b/packages/mui-material/src/Radio/Radio.js index c84584cb866338..71025ca11975d4 100644 --- a/packages/mui-material/src/Radio/Radio.js +++ b/packages/mui-material/src/Radio/Radio.js @@ -2,9 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import SwitchBase from '../internal/SwitchBase'; import useThemeProps from '../styles/useThemeProps'; import RadioButtonIcon from './RadioButtonIcon'; diff --git a/packages/mui-material/src/Rating/Rating.js b/packages/mui-material/src/Rating/Rating.js index 77fdd726b9ccae..dcf47bd122362d 100644 --- a/packages/mui-material/src/Rating/Rating.js +++ b/packages/mui-material/src/Rating/Rating.js @@ -2,8 +2,10 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, visuallyHidden, clamp } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import clamp from '@mui/utils/clamp'; +import visuallyHidden from '@mui/utils/visuallyHidden'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import composeClasses from '@mui/utils/composeClasses'; import useTheme from '../styles/useTheme'; import { capitalize, diff --git a/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js b/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js index b4d1c1dde4505a..e061f697005ec3 100644 --- a/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js +++ b/packages/mui-material/src/ScopedCssBaseline/ScopedCssBaseline.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { html, body } from '../CssBaseline/CssBaseline'; diff --git a/packages/mui-material/src/Select/Select.js b/packages/mui-material/src/Select/Select.js index 1902ac88385fab..69bc3ea931cddb 100644 --- a/packages/mui-material/src/Select/Select.js +++ b/packages/mui-material/src/Select/Select.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; import SelectInput from './SelectInput'; import formControlState from '../FormControl/formControlState'; import useFormControl from '../FormControl/useFormControl'; diff --git a/packages/mui-material/src/Select/SelectInput.js b/packages/mui-material/src/Select/SelectInput.js index 6a361ae35e5a1a..159346bf0bc050 100644 --- a/packages/mui-material/src/Select/SelectInput.js +++ b/packages/mui-material/src/Select/SelectInput.js @@ -4,8 +4,9 @@ import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { refType, unstable_useId as useId } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import useId from '@mui/utils/useId'; +import refType from '@mui/utils/refType'; import ownerDocument from '../utils/ownerDocument'; import capitalize from '../utils/capitalize'; import Menu from '../Menu/Menu'; diff --git a/packages/mui-material/src/Skeleton/Skeleton.js b/packages/mui-material/src/Skeleton/Skeleton.js index 00bf3a357e82c2..94d72f36b8da95 100644 --- a/packages/mui-material/src/Skeleton/Skeleton.js +++ b/packages/mui-material/src/Skeleton/Skeleton.js @@ -3,7 +3,7 @@ import * as React from 'react'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import { keyframes, css } from '@mui/system'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import { alpha, unstable_getUnit as getUnit, unstable_toUnitless as toUnitless } from '../styles'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Slide/Slide.js b/packages/mui-material/src/Slide/Slide.js index ee52963c949829..f2d30a7a97d588 100644 --- a/packages/mui-material/src/Slide/Slide.js +++ b/packages/mui-material/src/Slide/Slide.js @@ -2,7 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementAcceptingRef, HTMLElementType, chainPropTypes } from '@mui/utils'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import HTMLElementType from '@mui/utils/HTMLElementType'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import debounce from '../utils/debounce'; import useForkRef from '../utils/useForkRef'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Slider/Slider.js b/packages/mui-material/src/Slider/Slider.js index ac67ca95010292..5b4e386af1f6d8 100644 --- a/packages/mui-material/src/Slider/Slider.js +++ b/packages/mui-material/src/Slider/Slider.js @@ -2,14 +2,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { - isHostComponent, - useSlotProps, - unstable_composeClasses as composeClasses, -} from '@mui/base'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import { isHostComponent, useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import { useSlider, valueToPercent } from '@mui/base/useSlider'; -import { alpha, lighten, darken } from '@mui/system'; +import { alpha, lighten, darken } from '@mui/system/colorManipulator'; import useThemeProps from '../styles/useThemeProps'; import styled, { slotShouldForwardProp } from '../styles/styled'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/Snackbar/Snackbar.js b/packages/mui-material/src/Snackbar/Snackbar.js index 87371a15ab6e5e..36f68c826193f2 100644 --- a/packages/mui-material/src/Snackbar/Snackbar.js +++ b/packages/mui-material/src/Snackbar/Snackbar.js @@ -1,7 +1,8 @@ 'use client'; import * as React from 'react'; import PropTypes from 'prop-types'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import { ClickAwayListener } from '@mui/base/ClickAwayListener'; import { useSnackbar } from '@mui/base/useSnackbar'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/SnackbarContent/SnackbarContent.js b/packages/mui-material/src/SnackbarContent/SnackbarContent.js index 33aaaf9b66771b..cdee122e3185c0 100644 --- a/packages/mui-material/src/SnackbarContent/SnackbarContent.js +++ b/packages/mui-material/src/SnackbarContent/SnackbarContent.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { emphasize } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { emphasize } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Paper from '../Paper'; diff --git a/packages/mui-material/src/SpeedDial/SpeedDial.js b/packages/mui-material/src/SpeedDial/SpeedDial.js index 880c13d01bc98b..ed88ceaf072c9b 100644 --- a/packages/mui-material/src/SpeedDial/SpeedDial.js +++ b/packages/mui-material/src/SpeedDial/SpeedDial.js @@ -3,8 +3,9 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { clamp, unstable_useTimeout as useTimeout } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import useTimeout from '@mui/utils/useTimeout'; +import clamp from '@mui/utils/clamp'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js index c922fff9dc98f6..b1a44948531dc8 100644 --- a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js +++ b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { emphasize } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { emphasize } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Fab from '../Fab'; diff --git a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js index 5e538681be3ee5..5286882d359bcd 100644 --- a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js +++ b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import AddIcon from '../internal/svg-icons/Add'; diff --git a/packages/mui-material/src/Step/Step.js b/packages/mui-material/src/Step/Step.js index 331a4d4f80cfd8..40010102fb5d05 100644 --- a/packages/mui-material/src/Step/Step.js +++ b/packages/mui-material/src/Step/Step.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import StepperContext from '../Stepper/StepperContext'; import StepContext from './StepContext'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/StepButton/StepButton.js b/packages/mui-material/src/StepButton/StepButton.js index 0f566ab05ef21c..068741b194eddc 100644 --- a/packages/mui-material/src/StepButton/StepButton.js +++ b/packages/mui-material/src/StepButton/StepButton.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/StepConnector/StepConnector.js b/packages/mui-material/src/StepConnector/StepConnector.js index 98cb45deddb2b4..30d416e5d9baae 100644 --- a/packages/mui-material/src/StepConnector/StepConnector.js +++ b/packages/mui-material/src/StepConnector/StepConnector.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/StepContent/StepContent.js b/packages/mui-material/src/StepContent/StepContent.js index c51158f86f9dea..3be729ca1ea5a5 100644 --- a/packages/mui-material/src/StepContent/StepContent.js +++ b/packages/mui-material/src/StepContent/StepContent.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Collapse from '../Collapse'; diff --git a/packages/mui-material/src/StepIcon/StepIcon.js b/packages/mui-material/src/StepIcon/StepIcon.js index a1805e99b41d1e..f40a13455e9fc5 100644 --- a/packages/mui-material/src/StepIcon/StepIcon.js +++ b/packages/mui-material/src/StepIcon/StepIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import CheckCircle from '../internal/svg-icons/CheckCircle'; diff --git a/packages/mui-material/src/StepLabel/StepLabel.js b/packages/mui-material/src/StepLabel/StepLabel.js index d2ab98fdabb29a..80c3f7e5e36a93 100644 --- a/packages/mui-material/src/StepLabel/StepLabel.js +++ b/packages/mui-material/src/StepLabel/StepLabel.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import StepIcon from '../StepIcon'; diff --git a/packages/mui-material/src/Stepper/Stepper.js b/packages/mui-material/src/Stepper/Stepper.js index 8d33b470a4ac85..0edd4ab6516329 100644 --- a/packages/mui-material/src/Stepper/Stepper.js +++ b/packages/mui-material/src/Stepper/Stepper.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import integerPropType from '@mui/utils/integerPropType'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getStepperUtilityClass } from './stepperClasses'; diff --git a/packages/mui-material/src/SvgIcon/SvgIcon.js b/packages/mui-material/src/SvgIcon/SvgIcon.js index d944ee248bdc28..3548612a6b256d 100644 --- a/packages/mui-material/src/SvgIcon/SvgIcon.js +++ b/packages/mui-material/src/SvgIcon/SvgIcon.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js index fe08513c28dc18..71e6f51c2932ae 100644 --- a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js +++ b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js @@ -2,8 +2,8 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; -import { elementTypeAcceptingRef } from '@mui/utils'; -import { useThemeProps } from '@mui/system'; +import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef'; +import useThemeProps from '@mui/system/useThemeProps'; import { NoSsr } from '@mui/base'; import Drawer, { getAnchor, isHorizontal } from '../Drawer/Drawer'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/Switch/Switch.js b/packages/mui-material/src/Switch/Switch.js index 61b4fc95e69277..9506a24aa7eb0b 100644 --- a/packages/mui-material/src/Switch/Switch.js +++ b/packages/mui-material/src/Switch/Switch.js @@ -3,9 +3,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha, darken, lighten } from '@mui/system'; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha, darken, lighten } from '@mui/system/colorManipulator'; import capitalize from '../utils/capitalize'; import SwitchBase from '../internal/SwitchBase'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Tab/Tab.js b/packages/mui-material/src/Tab/Tab.js index 92ccbeb63f665b..43d53422a76454 100644 --- a/packages/mui-material/src/Tab/Tab.js +++ b/packages/mui-material/src/Tab/Tab.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/TabScrollButton/TabScrollButton.js b/packages/mui-material/src/TabScrollButton/TabScrollButton.js index 5b6e75322044a1..c2fdad8acb5f9e 100644 --- a/packages/mui-material/src/TabScrollButton/TabScrollButton.js +++ b/packages/mui-material/src/TabScrollButton/TabScrollButton.js @@ -3,7 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import KeyboardArrowLeft from '../internal/svg-icons/KeyboardArrowLeft'; import KeyboardArrowRight from '../internal/svg-icons/KeyboardArrowRight'; import ButtonBase from '../ButtonBase'; diff --git a/packages/mui-material/src/Table/Table.js b/packages/mui-material/src/Table/Table.js index 167176dab2cb01..33201ca6ae94ab 100644 --- a/packages/mui-material/src/Table/Table.js +++ b/packages/mui-material/src/Table/Table.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import TableContext from './TableContext'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableBody/TableBody.js b/packages/mui-material/src/TableBody/TableBody.js index 406165a74f11ff..0fc5115e327055 100644 --- a/packages/mui-material/src/TableBody/TableBody.js +++ b/packages/mui-material/src/TableBody/TableBody.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableCell/TableCell.js b/packages/mui-material/src/TableCell/TableCell.js index 2b07787e17b9ec..1b790f9e04c4e1 100644 --- a/packages/mui-material/src/TableCell/TableCell.js +++ b/packages/mui-material/src/TableCell/TableCell.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { darken, alpha, lighten } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { darken, alpha, lighten } from '@mui/system/colorManipulator'; import capitalize from '../utils/capitalize'; import TableContext from '../Table/TableContext'; import Tablelvl2Context from '../Table/Tablelvl2Context'; diff --git a/packages/mui-material/src/TableContainer/TableContainer.js b/packages/mui-material/src/TableContainer/TableContainer.js index 4aa1ad7037a580..206d3b4295b7af 100644 --- a/packages/mui-material/src/TableContainer/TableContainer.js +++ b/packages/mui-material/src/TableContainer/TableContainer.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getTableContainerUtilityClass } from './tableContainerClasses'; diff --git a/packages/mui-material/src/TableFooter/TableFooter.js b/packages/mui-material/src/TableFooter/TableFooter.js index 9bfe4bbbeb681f..ca142c563b62d6 100644 --- a/packages/mui-material/src/TableFooter/TableFooter.js +++ b/packages/mui-material/src/TableFooter/TableFooter.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableHead/TableHead.js b/packages/mui-material/src/TableHead/TableHead.js index 4e2b9ea456c63d..3a58974aa5ab09 100644 --- a/packages/mui-material/src/TableHead/TableHead.js +++ b/packages/mui-material/src/TableHead/TableHead.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TablePagination/TablePagination.js b/packages/mui-material/src/TablePagination/TablePagination.js index a8101f155f49fc..88dbd75c142c07 100644 --- a/packages/mui-material/src/TablePagination/TablePagination.js +++ b/packages/mui-material/src/TablePagination/TablePagination.js @@ -2,8 +2,10 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes, integerPropType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses, isHostComponent } from '@mui/base'; +import integerPropType from '@mui/utils/integerPropType'; +import chainPropTypes from '@mui/utils/chainPropTypes'; +import { isHostComponent } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import InputBase from '../InputBase'; diff --git a/packages/mui-material/src/TableRow/TableRow.js b/packages/mui-material/src/TableRow/TableRow.js index 23f2582388da13..40612a6e0a9209 100644 --- a/packages/mui-material/src/TableRow/TableRow.js +++ b/packages/mui-material/src/TableRow/TableRow.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { alpha } from '@mui/system'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import Tablelvl2Context from '../Table/Tablelvl2Context'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; diff --git a/packages/mui-material/src/TableSortLabel/TableSortLabel.js b/packages/mui-material/src/TableSortLabel/TableSortLabel.js index 65586b8443726c..7031a61adebc1d 100644 --- a/packages/mui-material/src/TableSortLabel/TableSortLabel.js +++ b/packages/mui-material/src/TableSortLabel/TableSortLabel.js @@ -1,5 +1,5 @@ 'use client'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import clsx from 'clsx'; import PropTypes from 'prop-types'; import * as React from 'react'; diff --git a/packages/mui-material/src/Tabs/Tabs.js b/packages/mui-material/src/Tabs/Tabs.js index 1971e21c7188f9..31a26e7f16b83a 100644 --- a/packages/mui-material/src/Tabs/Tabs.js +++ b/packages/mui-material/src/Tabs/Tabs.js @@ -3,8 +3,9 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses, useSlotProps } from '@mui/base'; +import refType from '@mui/utils/refType'; +import { useSlotProps } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import useTheme from '../styles/useTheme'; diff --git a/packages/mui-material/src/TextField/TextField.js b/packages/mui-material/src/TextField/TextField.js index 3a97d7c0a7d353..6e3372513b7aac 100644 --- a/packages/mui-material/src/TextField/TextField.js +++ b/packages/mui-material/src/TextField/TextField.js @@ -2,8 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { refType, unstable_useId as useId } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import useId from '@mui/utils/useId'; +import refType from '@mui/utils/refType'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import Input from '../Input'; diff --git a/packages/mui-material/src/ToggleButton/ToggleButton.js b/packages/mui-material/src/ToggleButton/ToggleButton.js index eb7c65a40aa97f..bfa15b63247e6a 100644 --- a/packages/mui-material/src/ToggleButton/ToggleButton.js +++ b/packages/mui-material/src/ToggleButton/ToggleButton.js @@ -3,8 +3,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { internal_resolveProps as resolveProps } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import resolveProps from '@mui/utils/resolveProps'; +import composeClasses from '@mui/utils/composeClasses'; import { alpha } from '../styles'; import ButtonBase from '../ButtonBase'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js index d6be6dcd4bd2d8..799cf46053b912 100644 --- a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js +++ b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js @@ -3,8 +3,8 @@ import * as React from 'react'; import { isFragment } from 'react-is'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; -import { getValidReactChildren } from '@mui/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import getValidReactChildren from '@mui/utils/getValidReactChildren'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Toolbar/Toolbar.js b/packages/mui-material/src/Toolbar/Toolbar.js index 7861b9beb207ba..070e1a54739974 100644 --- a/packages/mui-material/src/Toolbar/Toolbar.js +++ b/packages/mui-material/src/Toolbar/Toolbar.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import composeClasses from '@mui/utils/composeClasses'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import { getToolbarUtilityClass } from './toolbarClasses'; diff --git a/packages/mui-material/src/Tooltip/Tooltip.js b/packages/mui-material/src/Tooltip/Tooltip.js index 71f532f6834e4f..4ac297822d06a3 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.js +++ b/packages/mui-material/src/Tooltip/Tooltip.js @@ -2,13 +2,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { - elementAcceptingRef, - unstable_useTimeout as useTimeout, - unstable_Timeout as Timeout, -} from '@mui/utils'; -import { unstable_composeClasses as composeClasses, appendOwnerState } from '@mui/base'; -import { alpha } from '@mui/system'; +import useTimeout, { Timeout } from '@mui/utils/useTimeout'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; +import { appendOwnerState } from '@mui/base/utils'; +import composeClasses from '@mui/utils/composeClasses'; +import { alpha } from '@mui/system/colorManipulator'; import styled from '../styles/styled'; import useTheme from '../styles/useTheme'; import useThemeProps from '../styles/useThemeProps'; diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js index d385bbb1b73c17..0f917f9d9a0318 100644 --- a/packages/mui-material/src/Typography/Typography.js +++ b/packages/mui-material/src/Typography/Typography.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { unstable_extendSxProp as extendSxProp } from '@mui/system'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import { extendSxProp } from '@mui/system/styleFunctionSx'; +import composeClasses from '@mui/utils/composeClasses'; import styled from '../styles/styled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; diff --git a/packages/mui-material/src/Zoom/Zoom.js b/packages/mui-material/src/Zoom/Zoom.js index 0724707ab6251a..5f0ebfd5d9f781 100644 --- a/packages/mui-material/src/Zoom/Zoom.js +++ b/packages/mui-material/src/Zoom/Zoom.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { Transition } from 'react-transition-group'; -import { elementAcceptingRef } from '@mui/utils'; +import elementAcceptingRef from '@mui/utils/elementAcceptingRef'; import useTheme from '../styles/useTheme'; import { reflow, getTransitionProps } from '../transitions/utils'; import useForkRef from '../utils/useForkRef'; diff --git a/packages/mui-material/src/internal/SwitchBase.js b/packages/mui-material/src/internal/SwitchBase.js index ecc2d7735edb23..35d8b4b1f749ff 100644 --- a/packages/mui-material/src/internal/SwitchBase.js +++ b/packages/mui-material/src/internal/SwitchBase.js @@ -2,8 +2,8 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { refType } from '@mui/utils'; -import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses'; +import refType from '@mui/utils/refType'; +import composeClasses from '@mui/utils/composeClasses'; import capitalize from '../utils/capitalize'; import styled, { rootShouldForwardProp } from '../styles/styled'; import useControlled from '../utils/useControlled'; diff --git a/packages/mui-material/src/styles/CssVarsProvider.tsx b/packages/mui-material/src/styles/CssVarsProvider.tsx index 68cd94172e4579..90cd0733dd72a7 100644 --- a/packages/mui-material/src/styles/CssVarsProvider.tsx +++ b/packages/mui-material/src/styles/CssVarsProvider.tsx @@ -3,11 +3,8 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ // @ts-ignore import * as React from 'react'; -import { - unstable_createCssVarsProvider as createCssVarsProvider, - SxProps, - unstable_styleFunctionSx as styleFunctionSx, -} from '@mui/system'; +import { unstable_createCssVarsProvider as createCssVarsProvider, SxProps } from '@mui/system'; +import styleFunctionSx from '@mui/system/styleFunctionSx'; import experimental_extendTheme, { SupportedColorScheme, CssVarsTheme, diff --git a/packages/mui-material/src/styles/createMuiStrictModeTheme.js b/packages/mui-material/src/styles/createMuiStrictModeTheme.js index 73a29c693390ab..6974e0013b72f9 100644 --- a/packages/mui-material/src/styles/createMuiStrictModeTheme.js +++ b/packages/mui-material/src/styles/createMuiStrictModeTheme.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; import createTheme from './createTheme'; export default function createMuiStrictModeTheme(options, ...args) { diff --git a/packages/mui-material/src/styles/createPalette.js b/packages/mui-material/src/styles/createPalette.js index cd984c8e30f39e..4d6bf554415986 100644 --- a/packages/mui-material/src/styles/createPalette.js +++ b/packages/mui-material/src/styles/createPalette.js @@ -1,6 +1,6 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { darken, getContrastRatio, lighten } from '@mui/system'; +import { darken, getContrastRatio, lighten } from '@mui/system/colorManipulator'; import common from '../colors/common'; import grey from '../colors/grey'; import purple from '../colors/purple'; diff --git a/packages/mui-material/src/styles/createPalette.test.js b/packages/mui-material/src/styles/createPalette.test.js index d992456ec26131..16c7cfaa4c0de8 100644 --- a/packages/mui-material/src/styles/createPalette.test.js +++ b/packages/mui-material/src/styles/createPalette.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { darken, lighten } from '@mui/system'; +import { darken, lighten } from '@mui/system/colorManipulator'; import { deepOrange, blue, purple, indigo } from '../colors'; import createPalette, { dark, light } from './createPalette'; diff --git a/packages/mui-material/src/styles/createTheme.js b/packages/mui-material/src/styles/createTheme.js index 39cba1f2731a1f..da3850cf994703 100644 --- a/packages/mui-material/src/styles/createTheme.js +++ b/packages/mui-material/src/styles/createTheme.js @@ -1,9 +1,8 @@ -import { deepmerge } from '@mui/utils'; -import { - createTheme as systemCreateTheme, +import deepmerge from '@mui/utils/deepmerge'; +import styleFunctionSx, { unstable_defaultSxConfig as defaultSxConfig, - unstable_styleFunctionSx as styleFunctionSx, -} from '@mui/system'; +} from '@mui/system/styleFunctionSx'; +import systemCreateTheme from '@mui/system/createTheme'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; import generateUtilityClass from '@mui/utils/generateUtilityClass'; import createMixins from './createMixins'; diff --git a/packages/mui-material/src/styles/createTypography.js b/packages/mui-material/src/styles/createTypography.js index 8d2c6ed73e8c46..277808d2a7ec0c 100644 --- a/packages/mui-material/src/styles/createTypography.js +++ b/packages/mui-material/src/styles/createTypography.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; function round(value) { return Math.round(value * 1e5) / 1e5; diff --git a/packages/mui-material/src/styles/experimental_extendTheme.js b/packages/mui-material/src/styles/experimental_extendTheme.js index 6d4c61b5a45b9c..3d8c2a31f3f357 100644 --- a/packages/mui-material/src/styles/experimental_extendTheme.js +++ b/packages/mui-material/src/styles/experimental_extendTheme.js @@ -1,16 +1,21 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; +import { + unstable_createGetCssVar as systemCreateGetCssVar, + unstable_prepareCssVars as prepareCssVars, +} from '@mui/system'; +import styleFunctionSx, { + unstable_defaultSxConfig as defaultSxConfig, +} from '@mui/system/styleFunctionSx'; + import { private_safeColorChannel as safeColorChannel, private_safeAlpha as safeAlpha, private_safeDarken as safeDarken, private_safeLighten as safeLighten, private_safeEmphasize as safeEmphasize, - unstable_createGetCssVar as systemCreateGetCssVar, - unstable_defaultSxConfig as defaultSxConfig, - unstable_styleFunctionSx as styleFunctionSx, - unstable_prepareCssVars as prepareCssVars, hslToRgb, -} from '@mui/system'; +} from '@mui/system/colorManipulator'; + import defaultShouldSkipGeneratingVar from './shouldSkipGeneratingVar'; import createThemeWithoutVars from './createTheme'; import getOverlayAlpha from './getOverlayAlpha'; diff --git a/packages/mui-material/src/styles/styled.js b/packages/mui-material/src/styles/styled.js index 83798adbda1e78..4e68a6ab48eaef 100644 --- a/packages/mui-material/src/styles/styled.js +++ b/packages/mui-material/src/styles/styled.js @@ -1,5 +1,5 @@ 'use client'; -import { createStyled, shouldForwardProp } from '@mui/system'; +import createStyled, { shouldForwardProp } from '@mui/system/createStyled'; import defaultTheme from './defaultTheme'; import THEME_ID from './identifier'; diff --git a/packages/mui-material/src/styles/useThemeProps.js b/packages/mui-material/src/styles/useThemeProps.js index 77e14c7646ed24..60b85ce8fd8894 100644 --- a/packages/mui-material/src/styles/useThemeProps.js +++ b/packages/mui-material/src/styles/useThemeProps.js @@ -1,5 +1,5 @@ 'use client'; -import { useThemeProps as systemUseThemeProps } from '@mui/system'; +import systemUseThemeProps from '@mui/system/useThemeProps'; import defaultTheme from './defaultTheme'; import THEME_ID from './identifier'; diff --git a/packages/mui-material/src/useMediaQuery/useMediaQuery.ts b/packages/mui-material/src/useMediaQuery/useMediaQuery.ts index afdda55456e356..33d8650b83395c 100644 --- a/packages/mui-material/src/useMediaQuery/useMediaQuery.ts +++ b/packages/mui-material/src/useMediaQuery/useMediaQuery.ts @@ -1,6 +1,7 @@ 'use client'; import * as React from 'react'; -import { getThemeProps, useThemeWithoutDefault as useTheme } from '@mui/system'; +import { getThemeProps } from '@mui/system/useThemeProps'; +import useTheme from '@mui/system/useThemeWithoutDefault'; import useEnhancedEffect from '../utils/useEnhancedEffect'; /** diff --git a/packages/mui-material/src/usePagination/usePagination.js b/packages/mui-material/src/usePagination/usePagination.js index 46aaeb777ffaed..c77a737e0ebbe3 100644 --- a/packages/mui-material/src/usePagination/usePagination.js +++ b/packages/mui-material/src/usePagination/usePagination.js @@ -1,5 +1,5 @@ 'use client'; -import { unstable_useControlled as useControlled } from '@mui/utils'; +import useControlled from '@mui/utils/useControlled'; export default function usePagination(props = {}) { // keep default values in sync with @default tags in Pagination.propTypes diff --git a/packages/mui-material/src/utils/capitalize.d.ts b/packages/mui-material/src/utils/capitalize.d.ts index 4f0850098ea2dc..01718f07f09ff2 100644 --- a/packages/mui-material/src/utils/capitalize.d.ts +++ b/packages/mui-material/src/utils/capitalize.d.ts @@ -1,3 +1,3 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from '@mui/utils/capitalize'; export default capitalize; diff --git a/packages/mui-material/src/utils/capitalize.js b/packages/mui-material/src/utils/capitalize.js index 4f0850098ea2dc..01718f07f09ff2 100644 --- a/packages/mui-material/src/utils/capitalize.js +++ b/packages/mui-material/src/utils/capitalize.js @@ -1,3 +1,3 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from '@mui/utils/capitalize'; export default capitalize; diff --git a/packages/mui-material/src/utils/createChainedFunction.d.ts b/packages/mui-material/src/utils/createChainedFunction.d.ts index a84cf559319c84..59818e8c187bc1 100644 --- a/packages/mui-material/src/utils/createChainedFunction.d.ts +++ b/packages/mui-material/src/utils/createChainedFunction.d.ts @@ -1,3 +1,3 @@ -import { unstable_createChainedFunction as createChainedFunction } from '@mui/utils'; +import createChainedFunction from '@mui/utils/createChainedFunction'; export default createChainedFunction; diff --git a/packages/mui-material/src/utils/createChainedFunction.js b/packages/mui-material/src/utils/createChainedFunction.js index a84cf559319c84..59818e8c187bc1 100644 --- a/packages/mui-material/src/utils/createChainedFunction.js +++ b/packages/mui-material/src/utils/createChainedFunction.js @@ -1,3 +1,3 @@ -import { unstable_createChainedFunction as createChainedFunction } from '@mui/utils'; +import createChainedFunction from '@mui/utils/createChainedFunction'; export default createChainedFunction; diff --git a/packages/mui-material/src/utils/debounce.d.ts b/packages/mui-material/src/utils/debounce.d.ts index fe7cea1db2834a..5d8a1c9fdc408b 100644 --- a/packages/mui-material/src/utils/debounce.d.ts +++ b/packages/mui-material/src/utils/debounce.d.ts @@ -1,3 +1,3 @@ -import { unstable_debounce as debounce } from '@mui/utils'; +import debounce from '@mui/utils/debounce'; export default debounce; diff --git a/packages/mui-material/src/utils/debounce.js b/packages/mui-material/src/utils/debounce.js index fe7cea1db2834a..5d8a1c9fdc408b 100644 --- a/packages/mui-material/src/utils/debounce.js +++ b/packages/mui-material/src/utils/debounce.js @@ -1,3 +1,3 @@ -import { unstable_debounce as debounce } from '@mui/utils'; +import debounce from '@mui/utils/debounce'; export default debounce; diff --git a/packages/mui-material/src/utils/deprecatedPropType.d.ts b/packages/mui-material/src/utils/deprecatedPropType.d.ts index fbb605c0bbac97..67e8da82050a76 100644 --- a/packages/mui-material/src/utils/deprecatedPropType.d.ts +++ b/packages/mui-material/src/utils/deprecatedPropType.d.ts @@ -1,3 +1,3 @@ -import { unstable_deprecatedPropType as deprecatedPropType } from '@mui/utils'; +import deprecatedPropType from '@mui/utils/deprecatedPropType'; export default deprecatedPropType; diff --git a/packages/mui-material/src/utils/deprecatedPropType.js b/packages/mui-material/src/utils/deprecatedPropType.js index fbb605c0bbac97..67e8da82050a76 100644 --- a/packages/mui-material/src/utils/deprecatedPropType.js +++ b/packages/mui-material/src/utils/deprecatedPropType.js @@ -1,3 +1,3 @@ -import { unstable_deprecatedPropType as deprecatedPropType } from '@mui/utils'; +import deprecatedPropType from '@mui/utils/deprecatedPropType'; export default deprecatedPropType; diff --git a/packages/mui-material/src/utils/getScrollbarSize.ts b/packages/mui-material/src/utils/getScrollbarSize.ts index e3dcf3ea57a1e0..62dd95cc8f1e33 100644 --- a/packages/mui-material/src/utils/getScrollbarSize.ts +++ b/packages/mui-material/src/utils/getScrollbarSize.ts @@ -1,3 +1,3 @@ -import { unstable_getScrollbarSize as getScrollbarSize } from '@mui/utils'; +import getScrollbarSize from '@mui/utils/getScrollbarSize'; export default getScrollbarSize; diff --git a/packages/mui-material/src/utils/isMuiElement.d.ts b/packages/mui-material/src/utils/isMuiElement.d.ts index c3784104b24753..f886833aff8c85 100644 --- a/packages/mui-material/src/utils/isMuiElement.d.ts +++ b/packages/mui-material/src/utils/isMuiElement.d.ts @@ -1,3 +1,3 @@ -import { unstable_isMuiElement as isMuiElement } from '@mui/utils'; +import isMuiElement from '@mui/utils/isMuiElement'; export default isMuiElement; diff --git a/packages/mui-material/src/utils/isMuiElement.js b/packages/mui-material/src/utils/isMuiElement.js index c3784104b24753..f886833aff8c85 100644 --- a/packages/mui-material/src/utils/isMuiElement.js +++ b/packages/mui-material/src/utils/isMuiElement.js @@ -1,3 +1,3 @@ -import { unstable_isMuiElement as isMuiElement } from '@mui/utils'; +import isMuiElement from '@mui/utils/isMuiElement'; export default isMuiElement; diff --git a/packages/mui-material/src/utils/ownerDocument.ts b/packages/mui-material/src/utils/ownerDocument.ts index fd042ac6edcd51..155fa3528eda81 100644 --- a/packages/mui-material/src/utils/ownerDocument.ts +++ b/packages/mui-material/src/utils/ownerDocument.ts @@ -1,3 +1,3 @@ -import { unstable_ownerDocument as ownerDocument } from '@mui/utils'; +import ownerDocument from '@mui/utils/ownerDocument'; export default ownerDocument; diff --git a/packages/mui-material/src/utils/ownerWindow.ts b/packages/mui-material/src/utils/ownerWindow.ts index 47a847d5feba9a..9af3de65cb6989 100644 --- a/packages/mui-material/src/utils/ownerWindow.ts +++ b/packages/mui-material/src/utils/ownerWindow.ts @@ -1,3 +1,3 @@ -import { unstable_ownerWindow as ownerWindow } from '@mui/utils'; +import ownerWindow from '@mui/utils/ownerWindow'; export default ownerWindow; diff --git a/packages/mui-material/src/utils/requirePropFactory.d.ts b/packages/mui-material/src/utils/requirePropFactory.d.ts index eb2c8e65787d91..1074ad5c85a976 100644 --- a/packages/mui-material/src/utils/requirePropFactory.d.ts +++ b/packages/mui-material/src/utils/requirePropFactory.d.ts @@ -1,3 +1,3 @@ -import { unstable_requirePropFactory as requirePropFactory } from '@mui/utils'; +import requirePropFactory from '@mui/utils/requirePropFactory'; export default requirePropFactory; diff --git a/packages/mui-material/src/utils/requirePropFactory.js b/packages/mui-material/src/utils/requirePropFactory.js index eb2c8e65787d91..1074ad5c85a976 100644 --- a/packages/mui-material/src/utils/requirePropFactory.js +++ b/packages/mui-material/src/utils/requirePropFactory.js @@ -1,3 +1,3 @@ -import { unstable_requirePropFactory as requirePropFactory } from '@mui/utils'; +import requirePropFactory from '@mui/utils/requirePropFactory'; export default requirePropFactory; diff --git a/packages/mui-material/src/utils/setRef.ts b/packages/mui-material/src/utils/setRef.ts index c1d1eddf231690..6cee7e00bffe43 100644 --- a/packages/mui-material/src/utils/setRef.ts +++ b/packages/mui-material/src/utils/setRef.ts @@ -1,3 +1,3 @@ -import { unstable_setRef as setRef } from '@mui/utils'; +import setRef from '@mui/utils/setRef'; export default setRef; diff --git a/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js b/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js index 751ce4ee7aef79..eb22bb12531ae4 100644 --- a/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js +++ b/packages/mui-material/src/utils/shouldSpreadAdditionalProps.js @@ -1,4 +1,4 @@ -import { isHostComponent } from '@mui/base'; +import { isHostComponent } from '@mui/base/utils'; const shouldSpreadAdditionalProps = (Slot) => { return !Slot || !isHostComponent(Slot); diff --git a/packages/mui-material/src/utils/unsupportedProp.d.ts b/packages/mui-material/src/utils/unsupportedProp.d.ts index a7ac2dbd955df4..80104143560b59 100644 --- a/packages/mui-material/src/utils/unsupportedProp.d.ts +++ b/packages/mui-material/src/utils/unsupportedProp.d.ts @@ -1,3 +1,3 @@ -import { unstable_unsupportedProp as unsupportedProp } from '@mui/utils'; +import unsupportedProp from '@mui/utils/unsupportedProp'; export default unsupportedProp; diff --git a/packages/mui-material/src/utils/unsupportedProp.js b/packages/mui-material/src/utils/unsupportedProp.js index a7ac2dbd955df4..80104143560b59 100644 --- a/packages/mui-material/src/utils/unsupportedProp.js +++ b/packages/mui-material/src/utils/unsupportedProp.js @@ -1,3 +1,3 @@ -import { unstable_unsupportedProp as unsupportedProp } from '@mui/utils'; +import unsupportedProp from '@mui/utils/unsupportedProp'; export default unsupportedProp; diff --git a/packages/mui-material/src/utils/useControlled.d.ts b/packages/mui-material/src/utils/useControlled.d.ts index 1e05d42f2be58f..ae268b214180de 100644 --- a/packages/mui-material/src/utils/useControlled.d.ts +++ b/packages/mui-material/src/utils/useControlled.d.ts @@ -1,3 +1,3 @@ -import { unstable_useControlled as useControlled } from '@mui/utils'; +import useControlled from '@mui/utils/useControlled'; export default useControlled; diff --git a/packages/mui-material/src/utils/useControlled.js b/packages/mui-material/src/utils/useControlled.js index 098ebf75c4e83d..33aefe699f5974 100644 --- a/packages/mui-material/src/utils/useControlled.js +++ b/packages/mui-material/src/utils/useControlled.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useControlled as useControlled } from '@mui/utils'; +import useControlled from '@mui/utils/useControlled'; export default useControlled; diff --git a/packages/mui-material/src/utils/useEnhancedEffect.d.ts b/packages/mui-material/src/utils/useEnhancedEffect.d.ts index 2ec3b89a86d8ba..52622565d8fa3e 100644 --- a/packages/mui-material/src/utils/useEnhancedEffect.d.ts +++ b/packages/mui-material/src/utils/useEnhancedEffect.d.ts @@ -1,3 +1,3 @@ -import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils'; +import useEnhancedEffect from '@mui/utils/useEnhancedEffect'; export default useEnhancedEffect; diff --git a/packages/mui-material/src/utils/useEnhancedEffect.js b/packages/mui-material/src/utils/useEnhancedEffect.js index 2695c89b614494..d4e273740fb956 100644 --- a/packages/mui-material/src/utils/useEnhancedEffect.js +++ b/packages/mui-material/src/utils/useEnhancedEffect.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils'; +import useEnhancedEffect from '@mui/utils/useEnhancedEffect'; export default useEnhancedEffect; diff --git a/packages/mui-material/src/utils/useEventCallback.d.ts b/packages/mui-material/src/utils/useEventCallback.d.ts index ff3ee70183388b..69ed51700c8348 100644 --- a/packages/mui-material/src/utils/useEventCallback.d.ts +++ b/packages/mui-material/src/utils/useEventCallback.d.ts @@ -1,3 +1,3 @@ -import { unstable_useEventCallback as useEventCallback } from '@mui/utils'; +import useEventCallback from '@mui/utils/useEventCallback'; export default useEventCallback; diff --git a/packages/mui-material/src/utils/useEventCallback.js b/packages/mui-material/src/utils/useEventCallback.js index 03b624ad3749d2..4ebbd890c36689 100644 --- a/packages/mui-material/src/utils/useEventCallback.js +++ b/packages/mui-material/src/utils/useEventCallback.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useEventCallback as useEventCallback } from '@mui/utils'; +import useEventCallback from '@mui/utils/useEventCallback'; export default useEventCallback; diff --git a/packages/mui-material/src/utils/useForkRef.d.ts b/packages/mui-material/src/utils/useForkRef.d.ts index b80dfcccfaacfb..5c0ce6f3608d8a 100644 --- a/packages/mui-material/src/utils/useForkRef.d.ts +++ b/packages/mui-material/src/utils/useForkRef.d.ts @@ -1,3 +1,3 @@ -import { unstable_useForkRef as useForkRef } from '@mui/utils'; +import useForkRef from '@mui/utils/useForkRef'; export default useForkRef; diff --git a/packages/mui-material/src/utils/useForkRef.js b/packages/mui-material/src/utils/useForkRef.js index 38b967df8e7a75..bdcb95552910c4 100644 --- a/packages/mui-material/src/utils/useForkRef.js +++ b/packages/mui-material/src/utils/useForkRef.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useForkRef as useForkRef } from '@mui/utils'; +import useForkRef from '@mui/utils/useForkRef'; export default useForkRef; diff --git a/packages/mui-material/src/utils/useId.d.ts b/packages/mui-material/src/utils/useId.d.ts index 51a0cf8c6d03f9..8f3624cea3c0c7 100644 --- a/packages/mui-material/src/utils/useId.d.ts +++ b/packages/mui-material/src/utils/useId.d.ts @@ -1,3 +1,3 @@ -import { unstable_useId as useId } from '@mui/utils'; +import useId from '@mui/utils/useId'; export default useId; diff --git a/packages/mui-material/src/utils/useId.js b/packages/mui-material/src/utils/useId.js index fbd108d5635dad..d99075f6377825 100644 --- a/packages/mui-material/src/utils/useId.js +++ b/packages/mui-material/src/utils/useId.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useId as useId } from '@mui/utils'; +import useId from '@mui/utils/useId'; export default useId; diff --git a/packages/mui-material/src/utils/useIsFocusVisible.d.ts b/packages/mui-material/src/utils/useIsFocusVisible.d.ts index e640db0f81d031..b1d9d514e158b6 100644 --- a/packages/mui-material/src/utils/useIsFocusVisible.d.ts +++ b/packages/mui-material/src/utils/useIsFocusVisible.d.ts @@ -1,3 +1,3 @@ -import { unstable_useIsFocusVisible as useIsFocusVisible } from '@mui/utils'; +import useIsFocusVisible from '@mui/utils/useIsFocusVisible'; export default useIsFocusVisible; diff --git a/packages/mui-material/src/utils/useIsFocusVisible.js b/packages/mui-material/src/utils/useIsFocusVisible.js index 14e2ca9248573d..9cfe9a7a1cb64c 100644 --- a/packages/mui-material/src/utils/useIsFocusVisible.js +++ b/packages/mui-material/src/utils/useIsFocusVisible.js @@ -1,4 +1,4 @@ 'use client'; -import { unstable_useIsFocusVisible as useIsFocusVisible } from '@mui/utils'; +import useIsFocusVisible from '@mui/utils/useIsFocusVisible'; export default useIsFocusVisible; diff --git a/packages/mui-material/src/utils/useSlot.ts b/packages/mui-material/src/utils/useSlot.ts index 8709c030e95eab..53731186cd595d 100644 --- a/packages/mui-material/src/utils/useSlot.ts +++ b/packages/mui-material/src/utils/useSlot.ts @@ -1,7 +1,7 @@ 'use client'; import * as React from 'react'; import { ClassValue } from 'clsx'; -import { unstable_useForkRef as useForkRef } from '@mui/utils'; +import useForkRef from '@mui/utils/useForkRef'; import { appendOwnerState, resolveComponentProps, mergeSlotProps } from '@mui/base/utils'; export type WithCommonProps = T & { diff --git a/packages/mui-system/src/Box/Box.js b/packages/mui-system/src/Box/Box.js index 5a153663dc56b6..2d00707a13f3c7 100644 --- a/packages/mui-system/src/Box/Box.js +++ b/packages/mui-system/src/Box/Box.js @@ -1,6 +1,6 @@ 'use client'; import PropTypes from 'prop-types'; -import { unstable_ClassNameGenerator as ClassNameGenerator } from '@mui/utils'; +import ClassNameGenerator from '@mui/utils/ClassNameGenerator'; import createBox from '../createBox'; import boxClasses from './boxClasses'; diff --git a/packages/mui-system/src/Box/Box.test.js b/packages/mui-system/src/Box/Box.test.js index 0a908fb2403bf2..6e03f46a484c97 100644 --- a/packages/mui-system/src/Box/Box.test.js +++ b/packages/mui-system/src/Box/Box.test.js @@ -2,7 +2,9 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; -import { Box, createTheme, ThemeProvider, boxClasses as classes } from '@mui/system'; +import { Box, ThemeProvider, boxClasses as classes } from '@mui/system'; + +import createTheme from '@mui/system/createTheme'; describe('', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/Box/boxClasses.ts b/packages/mui-system/src/Box/boxClasses.ts index 65757282f0af88..c3d38ea7d59ae3 100644 --- a/packages/mui-system/src/Box/boxClasses.ts +++ b/packages/mui-system/src/Box/boxClasses.ts @@ -1,4 +1,4 @@ -import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; export interface BoxClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/Container/containerClasses.ts b/packages/mui-system/src/Container/containerClasses.ts index fc68f10115c6ad..f7794eeb2cfc17 100644 --- a/packages/mui-system/src/Container/containerClasses.ts +++ b/packages/mui-system/src/Container/containerClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; export interface ContainerClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/Container/createContainer.tsx b/packages/mui-system/src/Container/createContainer.tsx index e412907809fe38..a5ec4fc96e0f9a 100644 --- a/packages/mui-system/src/Container/createContainer.tsx +++ b/packages/mui-system/src/Container/createContainer.tsx @@ -3,11 +3,9 @@ import PropTypes from 'prop-types'; import clsx from 'clsx'; import { Interpolation, MUIStyledComponent as StyledComponent } from '@mui/styled-engine'; import { OverridableComponent } from '@mui/types'; -import { - unstable_capitalize as capitalize, - unstable_composeClasses as composeClasses, - unstable_generateUtilityClass as generateUtilityClass, -} from '@mui/utils'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; +import composeClasses from '@mui/utils/composeClasses'; +import capitalize from '@mui/utils/capitalize'; import { ContainerProps, ContainerTypeMap } from './ContainerProps'; import useThemePropsSystem from '../useThemeProps'; import systemStyled from '../styled'; diff --git a/packages/mui-system/src/Stack/Stack.test.js b/packages/mui-system/src/Stack/Stack.test.js index 7e190c6d1703f2..6da5266b210e2b 100644 --- a/packages/mui-system/src/Stack/Stack.test.js +++ b/packages/mui-system/src/Stack/Stack.test.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, describeConformance } from '@mui-internal/test-utils'; import Stack from '@mui/system/Stack'; -import { createTheme } from '@mui/system'; +import createTheme from '@mui/system/createTheme'; import { style } from './createStack'; describe('', () => { diff --git a/packages/mui-system/src/Stack/createStack.tsx b/packages/mui-system/src/Stack/createStack.tsx index 9cbae5fe1fc9ec..840163c4e20799 100644 --- a/packages/mui-system/src/Stack/createStack.tsx +++ b/packages/mui-system/src/Stack/createStack.tsx @@ -2,11 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { OverridableComponent } from '@mui/types'; -import { - deepmerge, - unstable_composeClasses as composeClasses, - unstable_generateUtilityClass as generateUtilityClass, -} from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; +import composeClasses from '@mui/utils/composeClasses'; import systemStyled from '../styled'; import useThemePropsSystem from '../useThemeProps'; import { extendSxProp } from '../styleFunctionSx'; diff --git a/packages/mui-system/src/Stack/stackClasses.ts b/packages/mui-system/src/Stack/stackClasses.ts index 3c3aea3ec5e8b4..b1ed723fc77998 100644 --- a/packages/mui-system/src/Stack/stackClasses.ts +++ b/packages/mui-system/src/Stack/stackClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; export interface StackClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/ThemeProvider/ThemeProvider.js b/packages/mui-system/src/ThemeProvider/ThemeProvider.js index 65c9649eb89bf4..48d4e8a3d97dda 100644 --- a/packages/mui-system/src/ThemeProvider/ThemeProvider.js +++ b/packages/mui-system/src/ThemeProvider/ThemeProvider.js @@ -5,7 +5,7 @@ import { ThemeProvider as MuiThemeProvider, useTheme as usePrivateTheme, } from '@mui/private-theming'; -import { exactProp } from '@mui/utils'; +import exactProp from '@mui/utils/exactProp'; import { ThemeContext as StyledEngineThemeContext } from '@mui/styled-engine'; import useThemeWithoutDefault from '../useThemeWithoutDefault'; diff --git a/packages/mui-system/src/Unstable_Grid/Grid.test.js b/packages/mui-system/src/Unstable_Grid/Grid.test.js index 6e6d9094a9cd97..83308842e38ccd 100644 --- a/packages/mui-system/src/Unstable_Grid/Grid.test.js +++ b/packages/mui-system/src/Unstable_Grid/Grid.test.js @@ -1,7 +1,8 @@ import * as React from 'react'; import { expect } from 'chai'; import { describeConformance, createRenderer, screen } from '@mui-internal/test-utils'; -import { ThemeProvider, createTheme } from '@mui/system'; +import { ThemeProvider } from '@mui/system'; +import createTheme from '@mui/system/createTheme'; import Grid, { gridClasses as classes } from '@mui/system/Unstable_Grid'; describe('System ', () => { diff --git a/packages/mui-system/src/Unstable_Grid/createGrid.tsx b/packages/mui-system/src/Unstable_Grid/createGrid.tsx index 37465f1953ef5b..38b361a9a2a44b 100644 --- a/packages/mui-system/src/Unstable_Grid/createGrid.tsx +++ b/packages/mui-system/src/Unstable_Grid/createGrid.tsx @@ -2,11 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { OverridableComponent } from '@mui/types'; -import { - unstable_composeClasses as composeClasses, - unstable_generateUtilityClass as generateUtilityClass, - unstable_isMuiElement as isMuiElement, -} from '@mui/utils'; +import isMuiElement from '@mui/utils/isMuiElement'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; +import composeClasses from '@mui/utils/composeClasses'; import systemStyled from '../styled'; import useThemePropsSystem from '../useThemeProps'; import useTheme from '../useTheme'; diff --git a/packages/mui-system/src/Unstable_Grid/gridClasses.ts b/packages/mui-system/src/Unstable_Grid/gridClasses.ts index 65909e9e05fb96..93b59de11cb538 100644 --- a/packages/mui-system/src/Unstable_Grid/gridClasses.ts +++ b/packages/mui-system/src/Unstable_Grid/gridClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClasses from '@mui/utils/generateUtilityClasses'; +import generateUtilityClass from '@mui/utils/generateUtilityClass'; export interface GridClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-system/src/breakpoints.js b/packages/mui-system/src/breakpoints.js index 44b48db750aa10..b1d017b24777ed 100644 --- a/packages/mui-system/src/breakpoints.js +++ b/packages/mui-system/src/breakpoints.js @@ -1,5 +1,5 @@ import PropTypes from 'prop-types'; -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; import merge from './merge'; // The breakpoint **start** at this value. diff --git a/packages/mui-system/src/colorManipulator.js b/packages/mui-system/src/colorManipulator.js index dc8960c9027847..cec3860d6bd6c3 100644 --- a/packages/mui-system/src/colorManipulator.js +++ b/packages/mui-system/src/colorManipulator.js @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { clamp } from '@mui/utils'; +import clamp from '@mui/utils/clamp'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; /** diff --git a/packages/mui-system/src/colorManipulator.spec.ts b/packages/mui-system/src/colorManipulator.spec.ts index feca52b4430345..37e37f0f0292e0 100644 --- a/packages/mui-system/src/colorManipulator.spec.ts +++ b/packages/mui-system/src/colorManipulator.spec.ts @@ -1,4 +1,6 @@ import { expectType } from '@mui/types'; +import { ColorFormat, ColorObject } from '@mui/system'; + import { hexToRgb, rgbToHex, @@ -12,9 +14,7 @@ import { alpha, lighten, darken, - ColorFormat, - ColorObject, -} from '@mui/system'; +} from '@mui/system/colorManipulator'; expectType<(color: string) => string, typeof hexToRgb>(hexToRgb); diff --git a/packages/mui-system/src/colorManipulator.test.js b/packages/mui-system/src/colorManipulator.test.js index 99ba4aaacf8aea..98406f195d0b83 100644 --- a/packages/mui-system/src/colorManipulator.test.js +++ b/packages/mui-system/src/colorManipulator.test.js @@ -1,4 +1,6 @@ import { expect } from 'chai'; +import { blend } from '@mui/system'; + import { recomposeColor, hexToRgb, @@ -12,8 +14,7 @@ import { getLuminance, lighten, colorChannel, - blend, -} from '@mui/system'; +} from '@mui/system/colorManipulator'; describe('utils/colorManipulator', () => { describe('recomposeColor', () => { diff --git a/packages/mui-system/src/createStyled.js b/packages/mui-system/src/createStyled.js index ee118347505d86..da61ca564547da 100644 --- a/packages/mui-system/src/createStyled.js +++ b/packages/mui-system/src/createStyled.js @@ -1,6 +1,8 @@ /* eslint-disable no-underscore-dangle */ import styledEngineStyled, { internal_processStyles as processStyles } from '@mui/styled-engine'; -import { getDisplayName, unstable_capitalize as capitalize, isPlainObject } from '@mui/utils'; +import { isPlainObject } from '@mui/utils/deepmerge'; +import capitalize from '@mui/utils/capitalize'; +import getDisplayName from '@mui/utils/getDisplayName'; import createTheme from './createTheme'; import styleFunctionSx from './styleFunctionSx'; diff --git a/packages/mui-system/src/createTheme/createTheme.js b/packages/mui-system/src/createTheme/createTheme.js index a0727253b00bcf..24c1c4d29971cc 100644 --- a/packages/mui-system/src/createTheme/createTheme.js +++ b/packages/mui-system/src/createTheme/createTheme.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; import createBreakpoints from './createBreakpoints'; import shape from './shape'; import createSpacing from './createSpacing'; diff --git a/packages/mui-system/src/createTheme/createTheme.test.js b/packages/mui-system/src/createTheme/createTheme.test.js index 3698f1e0c0e9d0..934e3ee1f87eb9 100644 --- a/packages/mui-system/src/createTheme/createTheme.test.js +++ b/packages/mui-system/src/createTheme/createTheme.test.js @@ -1,7 +1,9 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer } from '@mui-internal/test-utils'; -import { createTheme, styled, ThemeProvider } from '@mui/system'; +import { styled, ThemeProvider } from '@mui/system'; + +import createTheme from '@mui/system/createTheme'; describe('createTheme', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.js b/packages/mui-system/src/cssVars/createCssVarsProvider.js index 429f1f634ed390..b6c1877bbaea65 100644 --- a/packages/mui-system/src/cssVars/createCssVarsProvider.js +++ b/packages/mui-system/src/cssVars/createCssVarsProvider.js @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import MuiError from '@mui-internal/babel-macros/MuiError.macro'; -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; import { GlobalStyles } from '@mui/styled-engine'; import { useTheme as muiUseTheme } from '@mui/private-theming'; import ThemeProvider from '../ThemeProvider'; diff --git a/packages/mui-system/src/cssVars/prepareCssVars.ts b/packages/mui-system/src/cssVars/prepareCssVars.ts index 1723fc9cd7679d..a9d5e456406ec1 100644 --- a/packages/mui-system/src/cssVars/prepareCssVars.ts +++ b/packages/mui-system/src/cssVars/prepareCssVars.ts @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; import cssVarsParser from './cssVarsParser'; export interface DefaultCssVarsTheme { diff --git a/packages/mui-system/src/index.spec.tsx b/packages/mui-system/src/index.spec.tsx index 8411979d97df94..8605558b50ccfa 100644 --- a/packages/mui-system/src/index.spec.tsx +++ b/packages/mui-system/src/index.spec.tsx @@ -1,14 +1,8 @@ import * as React from 'react'; import styled from 'styled-components'; -import { - breakpoints, - display, - compose, - createTheme, - spacing, - style, - styled as muiStyled, -} from '@mui/system'; +import { breakpoints, display, compose, spacing, style, styled as muiStyled } from '@mui/system'; + +import createTheme from '@mui/system/createTheme'; function composeTest() { function first(props: { color: string }) { diff --git a/packages/mui-system/src/merge.js b/packages/mui-system/src/merge.js index 83c30c82e7ba45..8fdd03b1d17c18 100644 --- a/packages/mui-system/src/merge.js +++ b/packages/mui-system/src/merge.js @@ -1,4 +1,4 @@ -import { deepmerge } from '@mui/utils'; +import deepmerge from '@mui/utils/deepmerge'; function merge(acc, item) { if (!item) { diff --git a/packages/mui-system/src/propsToClassKey.js b/packages/mui-system/src/propsToClassKey.js index 631ea38b7310b4..9596e920aa19e3 100644 --- a/packages/mui-system/src/propsToClassKey.js +++ b/packages/mui-system/src/propsToClassKey.js @@ -1,4 +1,4 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from '@mui/utils/capitalize'; function isEmpty(string) { return string.length === 0; diff --git a/packages/mui-system/src/sizing.test.js b/packages/mui-system/src/sizing.test.js index fbab61d41fde36..dafd725654be8b 100644 --- a/packages/mui-system/src/sizing.test.js +++ b/packages/mui-system/src/sizing.test.js @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { createTheme } from '@mui/system'; +import createTheme from '@mui/system/createTheme'; import sizing from './sizing'; describe('sizing', () => { diff --git a/packages/mui-system/src/style.js b/packages/mui-system/src/style.js index 2767e7e306623a..46e4044e34cbe8 100644 --- a/packages/mui-system/src/style.js +++ b/packages/mui-system/src/style.js @@ -1,4 +1,4 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from '@mui/utils/capitalize'; import responsivePropType from './responsivePropType'; import { handleBreakpoints } from './breakpoints'; diff --git a/packages/mui-system/src/styleFunctionSx/extendSxProp.js b/packages/mui-system/src/styleFunctionSx/extendSxProp.js index 773172783f79c2..7fe50d39fa7e2d 100644 --- a/packages/mui-system/src/styleFunctionSx/extendSxProp.js +++ b/packages/mui-system/src/styleFunctionSx/extendSxProp.js @@ -1,4 +1,4 @@ -import { isPlainObject } from '@mui/utils'; +import { isPlainObject } from '@mui/utils/deepmerge'; import defaultSxConfig from './defaultSxConfig'; const splitProps = (props) => { diff --git a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js index 4f391e563b674a..151f117c416477 100644 --- a/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js +++ b/packages/mui-system/src/styleFunctionSx/styleFunctionSx.js @@ -1,4 +1,4 @@ -import { unstable_capitalize as capitalize } from '@mui/utils'; +import capitalize from '@mui/utils/capitalize'; import merge from '../merge'; import { getPath, getStyleValue as getValue } from '../style'; import { diff --git a/packages/mui-system/src/styled.test.js b/packages/mui-system/src/styled.test.js index a8551cc90bb52c..31a8b178dfc52f 100644 --- a/packages/mui-system/src/styled.test.js +++ b/packages/mui-system/src/styled.test.js @@ -1,7 +1,9 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, screen } from '@mui-internal/test-utils'; -import { styled, createTheme, ThemeProvider } from '@mui/system'; +import { styled, ThemeProvider } from '@mui/system'; + +import createTheme from '@mui/system/createTheme'; describe('styled', () => { const { render } = createRenderer(); diff --git a/packages/mui-system/src/useThemeProps/getThemeProps.js b/packages/mui-system/src/useThemeProps/getThemeProps.js index aa3a17f87941c9..0d3042c2eec2f1 100644 --- a/packages/mui-system/src/useThemeProps/getThemeProps.js +++ b/packages/mui-system/src/useThemeProps/getThemeProps.js @@ -1,4 +1,4 @@ -import { internal_resolveProps as resolveProps } from '@mui/utils'; +import resolveProps from '@mui/utils/resolveProps'; export default function getThemeProps(params) { const { theme, name, props } = params; diff --git a/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts b/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts index a313ca87b5e00f..d940e5c33ff7f5 100644 --- a/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts +++ b/packages/mui-system/src/useThemeProps/useThemeProps.spec.ts @@ -1,5 +1,5 @@ import { expectType } from '@mui/types'; -import { useThemeProps } from '@mui/system'; +import useThemeProps from '@mui/system/useThemeProps'; interface SliderProps { track?: boolean;