Update imports

Author: DiegoAndai

packages/mui-material-next/src/Select/Select.d.ts

@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { SxProps } from '@mui/system';
-import { InternalStandardProps as StandardProps, Theme } from '..';
-import { InputProps } from '../Input';
-import { MenuProps } from '../Menu';
+// TODO v6: replace @mui/material with @mui/material-next when components are available
+import { InternalStandardProps as StandardProps, Theme } from '@mui/material';
+import { InputProps } from '@mui/material/Input';
+import { MenuProps } from '@mui/material/Menu';
+import { OutlinedInputProps } from '@mui/material/OutlinedInput';
 import { SelectChangeEvent, SelectInputProps } from './SelectInput';
 import { SelectClasses } from './selectClasses';
-import { OutlinedInputProps } from '../OutlinedInput';
 
 export { SelectChangeEvent };
 

packages/mui-material-next/src/Select/Select.js

@@ -2,17 +2,17 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
-import { deepmerge } from '@mui/utils';
+import { deepmerge, unstable_useForkRef as useForkRef } from '@mui/utils';
+// TODO v6: replace @mui/material with @mui/material-next when components are available
+import Input from '@mui/material/Input';
+import NativeSelectInput from '@mui/material/NativeSelect/NativeSelectInput';
+import FilledInput from '@mui/material/FilledInput';
+import OutlinedInput from '@mui/material/OutlinedInput';
 import SelectInput from './SelectInput';
 import formControlState from '../FormControl/formControlState';
 import useFormControl from '../FormControl/useFormControl';
 import ArrowDropDownIcon from '../internal/svg-icons/ArrowDropDown';
-import Input from '../Input';
-import NativeSelectInput from '../NativeSelect/NativeSelectInput';
-import FilledInput from '../FilledInput';
-import OutlinedInput from '../OutlinedInput';
 import useThemeProps from '../styles/useThemeProps';
-import useForkRef from '../utils/useForkRef';
 import styled, { rootShouldForwardProp } from '../styles/styled';
 
 const useUtilityClasses = (ownerState) => {

packages/mui-material-next/src/Select/Select.spec.tsx

@@ -1,7 +1,9 @@
 import * as React from 'react';
-import Select, { SelectChangeEvent } from '@mui/material/Select';
+// TODO v6: replace @mui/material with @mui/material-next when Menu component is available
 import MenuItem from '@mui/material/MenuItem';
+// TODO v6: replace createTheme with material-next's extendTheme when implementing Material You design
 import { createTheme } from '@mui/material/styles';
+import Select, { SelectChangeEvent } from '@mui/material-next/Select';
 
 function genericValueTest() {
   function handleChangeWithSameTypeAsSelect(event: SelectChangeEvent<number>) {}

packages/mui-material-next/src/Select/Select.test.js

@@ -11,14 +11,14 @@ import {
 } from '@mui-internal/test-utils';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import MenuItem, { menuItemClasses } from '@mui/material/MenuItem';
+// TODO v6: replace @mui/material with @mui/material-next when components are available
 import ListSubheader from '@mui/material/ListSubheader';
-import InputBase from '@mui/material/InputBase';
 import OutlinedInput from '@mui/material/OutlinedInput';
 import InputLabel from '@mui/material/InputLabel';
-import Select from '@mui/material/Select';
+import { nativeSelectClasses } from '@mui/material/NativeSelect';
 import Divider from '@mui/material/Divider';
+import Select from '@mui/material-next/Select';
 import classes from './selectClasses';
-import { nativeSelectClasses } from '../NativeSelect';
 
 describe('<Select />', () => {
   const { clock, render } = createRenderer({ clock: 'fake' });
@@ -1685,7 +1685,7 @@ describe('<Select />', () => {
       const { getByTestId } = render(
         <Select
           className="foo"
-          input={<InputBase data-testid="root" className="bar" />}
+          input={<OutlinedInput data-testid="root" className="bar" />}
           value=""
         />,
       );

packages/mui-material-next/src/Select/SelectInput.d.ts

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { SxProps } from '@mui/system';
+// TODO v6: replace @mui/material with @mui/material-next when Menu component is available
+import { MenuProps } from '@mui/material/Menu';
 import { Theme } from '..';
-import { MenuProps } from '../Menu';
 
 /**
  * The change can be caused by different kind of events.

packages/mui-material-next/src/Select/SelectInput.js

@@ -5,18 +5,23 @@ import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import MuiError from '@mui/utils/macros/MuiError.macro';
 import { unstable_composeClasses as composeClasses } from '@mui/base/composeClasses';
-import { refType, unstable_useId as useId } from '@mui/utils';
-import ownerDocument from '../utils/ownerDocument';
-import capitalize from '../utils/capitalize';
-import Menu from '../Menu/Menu';
+import {
+  refType,
+  unstable_useId as useId,
+  unstable_capitalize as capitalize,
+  unstable_ownerDocument as ownerDocument,
+  unstable_useForkRef as useForkRef,
+  unstable_useControlled as useControlled,
+} from '@mui/utils';
+import { shouldForwardProp } from '@mui/system';
+// TODO v6: replace @mui/material with @mui/material-next when components are available
+import Menu from '@mui/material/Menu/Menu';
 import {
   nativeSelectSelectStyles,
   nativeSelectIconStyles,
-} from '../NativeSelect/NativeSelectInput';
+} from '@mui/material/NativeSelect/NativeSelectInput';
 import { isFilled } from '../InputBase/utils';
-import styled, { slotShouldForwardProp } from '../styles/styled';
-import useForkRef from '../utils/useForkRef';
-import useControlled from '../utils/useControlled';
+import styled from '../styles/styled';
 import selectClasses, { getSelectUtilityClasses } from './selectClasses';
 
 const SelectSelect = styled('div', {
@@ -57,7 +62,7 @@ const SelectIcon = styled('svg', {
 })(nativeSelectIconStyles);
 
 const SelectNativeInput = styled('input', {
-  shouldForwardProp: (prop) => slotShouldForwardProp(prop) && prop !== 'classes',
+  shouldForwardProp: (prop) => shouldForwardProp(prop) && prop !== 'classes',
   name: 'MuiSelect',
   slot: 'NativeInput',
   overridesResolver: (props, styles) => styles.nativeInput,

packages/mui-material-next/src/Select/selectClasses.ts

@@ -1,5 +1,7 @@
-import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils';
-import generateUtilityClass from '../generateUtilityClass';
+import {
+  unstable_generateUtilityClasses as generateUtilityClasses,
+  unstable_generateUtilityClass as generateUtilityClass,
+} from '@mui/utils';
 
 export interface SelectClasses {
   /** Styles applied to the root element. */

packages/mui-material-next/src/index.ts

@@ -20,6 +20,9 @@ export * from './InputBase';
 
 export { default as Input } from './Input';
 
+export { default as Select } from './Select';
+export * from './Select';
+
 export { default as Slider } from './Slider';
 export * from './Slider';
 

packages/mui-material-next/src/internal/svg-icons/ArrowDropDown.tsx

@@ -0,0 +1,8 @@
+'use client';
+import * as React from 'react';
+import createSvgIcon from '../../utils/createSvgIcon';
+
+/**
+ * @ignore - internal component.
+ */
+export default createSvgIcon(<path d="M7 10l5 5 5-5z" />, 'ArrowDropDown');