diff --git a/docs/src/pages/components/autocomplete/CustomizedHook.js b/docs/src/pages/components/autocomplete/CustomizedHook.js index a6ac3952884a1f..6002fb563321b9 100644 --- a/docs/src/pages/components/autocomplete/CustomizedHook.js +++ b/docs/src/pages/components/autocomplete/CustomizedHook.js @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ import * as React from 'react'; import PropTypes from 'prop-types'; -import useAutocomplete from '@material-ui/core/useAutocomplete'; +import { useAutocomplete } from '@material-ui/unstyled/AutocompleteUnstyled'; import CheckIcon from '@material-ui/icons/Check'; import CloseIcon from '@material-ui/icons/Close'; import { styled } from '@material-ui/core/styles'; diff --git a/docs/src/pages/components/autocomplete/CustomizedHook.tsx b/docs/src/pages/components/autocomplete/CustomizedHook.tsx index 2f68a4c6be94e8..cf3abe6d57fe6a 100644 --- a/docs/src/pages/components/autocomplete/CustomizedHook.tsx +++ b/docs/src/pages/components/autocomplete/CustomizedHook.tsx @@ -1,8 +1,9 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ import * as React from 'react'; -import useAutocomplete, { +import { + useAutocomplete, AutocompleteGetTagProps, -} from '@material-ui/core/useAutocomplete'; +} from '@material-ui/unstyled/AutocompleteUnstyled'; import CheckIcon from '@material-ui/icons/Check'; import CloseIcon from '@material-ui/icons/Close'; import { styled } from '@material-ui/core/styles'; diff --git a/docs/src/pages/components/autocomplete/UseAutocomplete.js b/docs/src/pages/components/autocomplete/UseAutocomplete.js index e699ec6e4d4ab5..c3079677be17ba 100644 --- a/docs/src/pages/components/autocomplete/UseAutocomplete.js +++ b/docs/src/pages/components/autocomplete/UseAutocomplete.js @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ import * as React from 'react'; -import useAutocomplete from '@material-ui/core/useAutocomplete'; +import { useAutocomplete } from '@material-ui/unstyled/AutocompleteUnstyled'; import { styled } from '@material-ui/core/styles'; const Label = styled('label')({ diff --git a/docs/src/pages/components/autocomplete/UseAutocomplete.tsx b/docs/src/pages/components/autocomplete/UseAutocomplete.tsx index a467414e4624ce..51732a04322565 100644 --- a/docs/src/pages/components/autocomplete/UseAutocomplete.tsx +++ b/docs/src/pages/components/autocomplete/UseAutocomplete.tsx @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ import * as React from 'react'; -import useAutocomplete from '@material-ui/core/useAutocomplete'; +import { useAutocomplete } from '@material-ui/unstyled/AutocompleteUnstyled'; import { styled } from '@material-ui/core/styles'; const Label = styled('label')({ diff --git a/packages/material-ui-lab/src/useAutocomplete/index.d.ts b/packages/material-ui-lab/src/useAutocomplete/index.d.ts index 2b97f6ae10f252..b86e1da42b1811 100644 --- a/packages/material-ui-lab/src/useAutocomplete/index.d.ts +++ b/packages/material-ui-lab/src/useAutocomplete/index.d.ts @@ -1 +1 @@ -export { default } from '@material-ui/core/useAutocomplete'; +export { useAutocomplete as default } from '@material-ui/unstyled'; diff --git a/packages/material-ui-lab/src/useAutocomplete/index.js b/packages/material-ui-lab/src/useAutocomplete/index.js index a0f3c16b272b9f..23d0b284855caf 100644 --- a/packages/material-ui-lab/src/useAutocomplete/index.js +++ b/packages/material-ui-lab/src/useAutocomplete/index.js @@ -1 +1 @@ -export { default, createFilterOptions } from '@material-ui/core/useAutocomplete'; +export { useAutocomplete as default, createFilterOptions } from '@material-ui/unstyled'; diff --git a/packages/material-ui-unstyled/src/AutocompleteUnstyled/index.d.ts b/packages/material-ui-unstyled/src/AutocompleteUnstyled/index.d.ts new file mode 100644 index 00000000000000..1814592b27b49d --- /dev/null +++ b/packages/material-ui-unstyled/src/AutocompleteUnstyled/index.d.ts @@ -0,0 +1,2 @@ +export { default as useAutocomplete } from './useAutocomplete'; +export * from './useAutocomplete'; diff --git a/packages/material-ui-unstyled/src/AutocompleteUnstyled/index.js b/packages/material-ui-unstyled/src/AutocompleteUnstyled/index.js new file mode 100644 index 00000000000000..16fbc428d75a3d --- /dev/null +++ b/packages/material-ui-unstyled/src/AutocompleteUnstyled/index.js @@ -0,0 +1 @@ +export { default as useAutocomplete, createFilterOptions } from './useAutocomplete'; diff --git a/packages/material-ui/src/useAutocomplete/useAutocomplete.d.ts b/packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.d.ts similarity index 100% rename from packages/material-ui/src/useAutocomplete/useAutocomplete.d.ts rename to packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.d.ts diff --git a/packages/material-ui/src/useAutocomplete/useAutocomplete.js b/packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.js similarity index 99% rename from packages/material-ui/src/useAutocomplete/useAutocomplete.js rename to packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.js index e007568ff8fc81..62bc7df557b79c 100644 --- a/packages/material-ui/src/useAutocomplete/useAutocomplete.js +++ b/packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.js @@ -1,6 +1,11 @@ /* eslint-disable no-constant-condition */ import * as React from 'react'; -import { setRef, useEventCallback, useControlled, unstable_useId as useId } from '../utils'; +import { + unstable_setRef as setRef, + unstable_useEventCallback as useEventCallback, + unstable_useControlled as useControlled, + unstable_useId as useId, +} from '@material-ui/utils'; // https://stackoverflow.com/questions/990904/remove-accents-diacritics-in-a-string-in-javascript // Give up on IE11 support for this feature diff --git a/packages/material-ui/src/useAutocomplete/useAutocomplete.spec.ts b/packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.spec.ts similarity index 97% rename from packages/material-ui/src/useAutocomplete/useAutocomplete.spec.ts rename to packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.spec.ts index f31398b6a6fa87..28e7ce57e533e1 100644 --- a/packages/material-ui/src/useAutocomplete/useAutocomplete.spec.ts +++ b/packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.spec.ts @@ -1,4 +1,4 @@ -import useAutocomplete, { FilterOptionsState } from '@material-ui/core/useAutocomplete'; +import { useAutocomplete, FilterOptionsState } from '@material-ui/unstyled/AutocompleteUnstyled'; import { expectType } from '@material-ui/types'; interface Person { diff --git a/packages/material-ui/src/useAutocomplete/useAutocomplete.test.js b/packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.test.js similarity index 98% rename from packages/material-ui/src/useAutocomplete/useAutocomplete.test.js rename to packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.test.js index 63453cbced05d3..fdde55847ecf50 100644 --- a/packages/material-ui/src/useAutocomplete/useAutocomplete.test.js +++ b/packages/material-ui-unstyled/src/AutocompleteUnstyled/useAutocomplete.test.js @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { createClientRender, screen, ErrorBoundary } from 'test/utils'; -import useAutocomplete, { createFilterOptions } from '@material-ui/core/useAutocomplete'; +import { useAutocomplete, createFilterOptions } from '@material-ui/unstyled/AutocompleteUnstyled'; describe('useAutocomplete', () => { const render = createClientRender(); diff --git a/packages/material-ui-unstyled/src/index.d.ts b/packages/material-ui-unstyled/src/index.d.ts index ab4cb25c2173b8..15eff93b9f8696 100644 --- a/packages/material-ui-unstyled/src/index.d.ts +++ b/packages/material-ui-unstyled/src/index.d.ts @@ -1,3 +1,5 @@ +export * from './AutocompleteUnstyled'; + export { default as BackdropUnstyled } from './BackdropUnstyled'; export * from './BackdropUnstyled'; diff --git a/packages/material-ui-unstyled/src/index.js b/packages/material-ui-unstyled/src/index.js index 290c1e94355a9d..ca4ee9cab48874 100644 --- a/packages/material-ui-unstyled/src/index.js +++ b/packages/material-ui-unstyled/src/index.js @@ -1,3 +1,5 @@ +export * from './AutocompleteUnstyled'; + export { default as BackdropUnstyled } from './BackdropUnstyled'; export * from './BackdropUnstyled'; diff --git a/packages/material-ui/src/Autocomplete/Autocomplete.d.ts b/packages/material-ui/src/Autocomplete/Autocomplete.d.ts index eeb70d8878006f..20eb2770416812 100644 --- a/packages/material-ui/src/Autocomplete/Autocomplete.d.ts +++ b/packages/material-ui/src/Autocomplete/Autocomplete.d.ts @@ -4,15 +4,16 @@ import { ChipProps, ChipTypeMap } from '@material-ui/core/Chip'; import { PopperProps } from '@material-ui/core/Popper'; import { SxProps } from '@material-ui/system'; import { OverridableStringUnion } from '@material-ui/types'; -import { AutocompleteClasses } from './autocompleteClasses'; -import useAutocomplete, { +import { + useAutocomplete, AutocompleteChangeDetails, AutocompleteChangeReason, AutocompleteCloseReason, AutocompleteInputChangeReason, createFilterOptions, UseAutocompleteProps, -} from '../useAutocomplete'; +} from '@material-ui/unstyled'; +import { AutocompleteClasses } from './autocompleteClasses'; export { AutocompleteChangeDetails, diff --git a/packages/material-ui/src/Autocomplete/Autocomplete.js b/packages/material-ui/src/Autocomplete/Autocomplete.js index 2dbb26825d0af6..a26be0d3922a37 100644 --- a/packages/material-ui/src/Autocomplete/Autocomplete.js +++ b/packages/material-ui/src/Autocomplete/Autocomplete.js @@ -2,7 +2,11 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { chainPropTypes, integerPropType } from '@material-ui/utils'; -import { unstable_composeClasses as composeClasses } from '@material-ui/unstyled'; +import { + unstable_composeClasses as composeClasses, + useAutocomplete, + createFilterOptions, +} from '@material-ui/unstyled'; import { alpha } from '@material-ui/system'; import Popper from '../Popper'; import ListSubheader from '../ListSubheader'; @@ -11,7 +15,6 @@ import IconButton from '../IconButton'; import Chip from '../Chip'; import ClearIcon from '../internal/svg-icons/Close'; import ArrowDropDownIcon from '../internal/svg-icons/ArrowDropDown'; -import useAutocomplete, { createFilterOptions } from '../useAutocomplete'; import useThemeProps from '../styles/useThemeProps'; import styled from '../styles/styled'; import autocompleteClasses, { getAutocompleteUtilityClass } from './autocompleteClasses'; diff --git a/packages/material-ui/src/index.d.ts b/packages/material-ui/src/index.d.ts index ed08cc1d465ff4..f53f36ec64100d 100644 --- a/packages/material-ui/src/index.d.ts +++ b/packages/material-ui/src/index.d.ts @@ -98,7 +98,6 @@ export * from './AppBar'; export { default as Autocomplete } from './Autocomplete'; export * from './Autocomplete'; - export { default as Avatar } from './Avatar'; export * from './Avatar'; @@ -462,9 +461,6 @@ export * from './useScrollTrigger'; export { default as Zoom } from './Zoom'; export * from './Zoom'; -export { default as useAutocomplete } from './useAutocomplete'; -export * from './useAutocomplete'; - export { default as GlobalStyles } from './GlobalStyles'; export * from './GlobalStyles'; diff --git a/packages/material-ui/src/index.js b/packages/material-ui/src/index.js index 6783fbbb0161f6..ac05e801b1aaf3 100644 --- a/packages/material-ui/src/index.js +++ b/packages/material-ui/src/index.js @@ -398,9 +398,6 @@ export * from './useScrollTrigger'; export { default as Zoom } from './Zoom'; export * from './Zoom'; -// createFilterOptions is exported from Autocomplete -export { default as useAutocomplete } from './useAutocomplete'; - export { default as GlobalStyles } from './GlobalStyles'; export * from './GlobalStyles'; diff --git a/packages/material-ui/src/useAutocomplete/index.d.ts b/packages/material-ui/src/useAutocomplete/index.d.ts deleted file mode 100644 index 6f01318688c9f2..00000000000000 --- a/packages/material-ui/src/useAutocomplete/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default } from './useAutocomplete'; -export * from './useAutocomplete'; diff --git a/packages/material-ui/src/useAutocomplete/index.js b/packages/material-ui/src/useAutocomplete/index.js deleted file mode 100644 index a6c05b480618e9..00000000000000 --- a/packages/material-ui/src/useAutocomplete/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default, createFilterOptions } from './useAutocomplete'; diff --git a/test/bundling/scripts/fixtureTemplateValues.js b/test/bundling/scripts/fixtureTemplateValues.js index 90bb4b8f3ad00a..e673df40c6b589 100644 --- a/test/bundling/scripts/fixtureTemplateValues.js +++ b/test/bundling/scripts/fixtureTemplateValues.js @@ -249,8 +249,8 @@ import { Typography as Typography_core } from '@material-ui/core'; import Typography_core__pathImport from '@material-ui/core/Typography'; import { Unstable_TrapFocus as Unstable_TrapFocus_core } from '@material-ui/core'; import Unstable_TrapFocus_core__pathImport from '@material-ui/core/Unstable_TrapFocus'; -import { useAutocomplete as useAutocomplete_core } from '@material-ui/core'; -import useAutocomplete_core__pathImport from '@material-ui/core/useAutocomplete'; +import { useAutocomplete as useAutocomplete_core } from '@material-ui/unstyled'; +import useAutocomplete_core__pathImport from '@material-ui/unstyled/AutocompleteUnstyled'; import { useMediaQuery as useMediaQuery_core } from '@material-ui/core'; import useMediaQuery_core__pathImport from '@material-ui/core/useMediaQuery'; import { usePagination as usePagination_core } from '@material-ui/core';