From 9ed86205bb3d2db812d8e036f551dba62a04e4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Wed, 6 Jul 2022 12:37:16 +0200 Subject: [PATCH 01/14] [base] Make CSS class prefixes consistent --- .../src/ButtonUnstyled/buttonUnstyledClasses.ts | 4 ++-- .../src/InputUnstyled/inputUnstyledClasses.ts | 6 +++--- .../src/MenuItemUnstyled/menuItemUnstyledClasses.ts | 11 ++++++----- .../mui-base/src/MenuUnstyled/menuUnstyledClasses.ts | 4 ++-- .../src/ModalUnstyled/modalUnstyledClasses.ts | 1 + .../OptionGroupUnstyled/optionGroupUnstyledClasses.ts | 4 ++-- .../src/OptionUnstyled/optionUnstyledClasses.tsx | 4 ++-- .../src/SelectUnstyled/selectUnstyledClasses.ts | 4 ++-- .../src/SliderUnstyled/sliderUnstyledClasses.ts | 1 + .../src/SwitchUnstyled/switchUnstyledClasses.ts | 4 ++-- .../src/TabPanelUnstyled/tabPanelUnstyledClasses.ts | 10 +++++----- .../mui-base/src/TabUnstyled/tabUnstyledClasses.ts | 4 ++-- .../tablePaginationUnstyledClasses.ts | 8 ++++---- .../src/TabsListUnstyled/tabsListUnstyledClasses.ts | 11 ++++++----- .../mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts | 4 ++-- 15 files changed, 42 insertions(+), 38 deletions(-) diff --git a/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts b/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts index bc4ca040ecbde0..7937db6f648564 100644 --- a/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts +++ b/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts @@ -11,10 +11,10 @@ export interface ButtonUnstyledClasses { export type ButtonUnstyledClassKey = keyof ButtonUnstyledClasses; export function getButtonUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('ButtonUnstyled', slot); + return generateUtilityClass('BaseButton', slot); } -const buttonUnstyledClasses: ButtonUnstyledClasses = generateUtilityClasses('ButtonUnstyled', [ +const buttonUnstyledClasses: ButtonUnstyledClasses = generateUtilityClasses('BaseButton', [ 'root', 'active', 'disabled', diff --git a/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts b/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts index abab7b8c61494c..efd351e806c297 100644 --- a/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts +++ b/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts @@ -29,10 +29,10 @@ export interface InputUnstyledClasses { export type InputUnstyledClassKey = keyof InputUnstyledClasses; export function getInputUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiInput', slot); + return generateUtilityClass('BaseInput', slot); } -const inputBaseClasses: InputUnstyledClasses = generateUtilityClasses('MuiInput', [ +const inputUnstyledClasses: InputUnstyledClasses = generateUtilityClasses('BaseInput', [ 'root', 'formControl', 'focused', @@ -46,4 +46,4 @@ const inputBaseClasses: InputUnstyledClasses = generateUtilityClasses('MuiInput' 'adornedEnd', ]); -export default inputBaseClasses; +export default inputUnstyledClasses; diff --git a/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts b/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts index 647e10ff9e9dfc..f1dc02fbcca705 100644 --- a/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts +++ b/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts @@ -10,12 +10,13 @@ export interface MenuItemUnstyledClasses { export type MenuItemUnstyledClassKey = keyof MenuItemUnstyledClasses; export function getMenuItemUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiMenuItemUnstyled', slot); + return generateUtilityClass('BaseMenuItem', slot); } -const menuItemUnstyledClasses: MenuItemUnstyledClasses = generateUtilityClasses( - 'MuiMenuItemUnstyled', - ['root', 'disabled', 'focusVisible'], -); +const menuItemUnstyledClasses: MenuItemUnstyledClasses = generateUtilityClasses('BaseMenuItem', [ + 'root', + 'disabled', + 'focusVisible', +]); export default menuItemUnstyledClasses; diff --git a/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts b/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts index cfe6be9faa8205..7f9cd9f32f8154 100644 --- a/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts +++ b/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface MenuUnstyledClasses { export type MenuUnstyledClassKey = keyof MenuUnstyledClasses; export function getMenuUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiMenuUnstyled', slot); + return generateUtilityClass('BaseMenu', slot); } -const menuUnstyledClasses: MenuUnstyledClasses = generateUtilityClasses('MuiMenuUnstyled', [ +const menuUnstyledClasses: MenuUnstyledClasses = generateUtilityClasses('BaseMenu', [ 'root', 'listbox', 'expanded', diff --git a/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts b/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts index 58807bfc9bfda2..29dc5c63050368 100644 --- a/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts +++ b/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts @@ -10,6 +10,7 @@ export interface ModalUnstyledClasses { export type ModalUnstyledClassKey = keyof ModalUnstyledClasses; +// TODO: change `MuiModal` to 'BaseModal` after it's possible to customize the prefix from Material UI components. export function getModalUtilityClass(slot: string): string { return generateUtilityClass('MuiModal', slot); } diff --git a/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts b/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts index 3758d1d0e9f978..01958b1e1aee20 100644 --- a/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts +++ b/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts @@ -10,11 +10,11 @@ export interface OptionGroupUnstyledClasses { export type OptionGroupUnstyledClassKey = keyof OptionGroupUnstyledClasses; export function getOptionGroupUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiOptionGroupUnstyled', slot); + return generateUtilityClass('BaseOptionGroup', slot); } const optionGroupUnstyledClasses: OptionGroupUnstyledClasses = generateUtilityClasses( - 'MuiOptionGroupUnstyled', + 'BaseOptionGroup', ['root', 'label', 'list'], ); diff --git a/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx b/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx index 20d6a48b64e720..364a403291ec87 100644 --- a/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx +++ b/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx @@ -11,10 +11,10 @@ export interface OptionUnstyledClasses { export type OptionUnstyledClassKey = keyof OptionUnstyledClasses; export function getOptionUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiOptionUnstyled', slot); + return generateUtilityClass('BaseOption', slot); } -const optionUnstyledClasses: OptionUnstyledClasses = generateUtilityClasses('MuiOptionUnstyled', [ +const optionUnstyledClasses: OptionUnstyledClasses = generateUtilityClasses('BaseOption', [ 'root', 'disabled', 'selected', diff --git a/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts b/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts index 341becc73f57e7..703a53bfad4474 100644 --- a/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts +++ b/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts @@ -15,10 +15,10 @@ export interface SelectUnstyledClasses { export type SelectUnstyledClassKey = keyof SelectUnstyledClasses; export function getSelectUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiSelectUnstyled', slot); + return generateUtilityClass('BaseSelect', slot); } -const selectUnstyledClasses: SelectUnstyledClasses = generateUtilityClasses('MuiSelectUnstyled', [ +const selectUnstyledClasses: SelectUnstyledClasses = generateUtilityClasses('BaseSelect', [ 'root', 'button', 'listbox', diff --git a/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts b/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts index 46a9423b74d5be..f6db2f723c3ab0 100644 --- a/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts +++ b/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts @@ -46,6 +46,7 @@ export interface SliderUnstyledClasses { export type SliderUnstyledClassKey = keyof SliderUnstyledClasses; +// TODO: change `MuiSlider` to 'BaseSlider` after it's possible to customize the prefix from Material UI components. export function getSliderUtilityClass(slot: string): string { return generateUtilityClass('MuiSlider', slot); } diff --git a/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts b/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts index 2135a58dc8f632..fc062a56ffe806 100644 --- a/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts +++ b/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts @@ -23,10 +23,10 @@ export interface SwitchUnstyledClasses { export type SwitchUnstyledClassKey = keyof SwitchUnstyledClasses; export function getSwitchUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiSwitch', slot); + return generateUtilityClass('BaseSwitch', slot); } -const switchUnstyledClasses: SwitchUnstyledClasses = generateUtilityClasses('MuiSwitch', [ +const switchUnstyledClasses: SwitchUnstyledClasses = generateUtilityClasses('BaseSwitch', [ 'root', 'input', 'track', diff --git a/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts b/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts index 3d6a6cf1c7283b..cb93af3ce2c3e6 100644 --- a/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts +++ b/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts @@ -9,12 +9,12 @@ export interface TabPanelUnstyledClasses { export type TabPanelUnstyledClassKey = keyof TabPanelUnstyledClasses; export function getTabPanelUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('TabPanelUnstyled', slot); + return generateUtilityClass('BaseTabPanel', slot); } -const tabPanelUnstyledClasses: TabPanelUnstyledClasses = generateUtilityClasses( - 'TabPanelUnstyled', - ['root', 'hidden'], -); +const tabPanelUnstyledClasses: TabPanelUnstyledClasses = generateUtilityClasses('BaseTabPanel', [ + 'root', + 'hidden', +]); export default tabPanelUnstyledClasses; diff --git a/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts b/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts index 3ef53bdf09a9ce..533cb15b4ca7b2 100644 --- a/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts +++ b/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface TabUnstyledClasses { export type TabUnstyledClassKey = keyof TabUnstyledClasses; export function getTabUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('TabUnstyled', slot); + return generateUtilityClass('BaseTab', slot); } -const tabUnstyledClasses: TabUnstyledClasses = generateUtilityClasses('TabUnstyled', [ +const tabUnstyledClasses: TabUnstyledClasses = generateUtilityClasses('BaseTab', [ 'root', 'selected', 'disabled', diff --git a/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts b/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts index 37928098679fe8..91f037e7c5ba4e 100644 --- a/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts +++ b/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts @@ -29,11 +29,11 @@ export interface TablePaginationUnstyledClasses { export type TablePaginationUnstyledClassKey = keyof TablePaginationUnstyledClasses; export function getTablePaginationUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('MuiTablePaginationUnstyled', slot); + return generateUtilityClass('BaseTablePagination', slot); } -const tablePaginationClasses: TablePaginationUnstyledClasses = generateUtilityClasses( - 'MuiTablePaginationUnstyled', +const tablePaginationUnstyledClasses: TablePaginationUnstyledClasses = generateUtilityClasses( + 'BaseTablePagination', [ 'root', 'toolbar', @@ -49,4 +49,4 @@ const tablePaginationClasses: TablePaginationUnstyledClasses = generateUtilityCl ], ); -export default tablePaginationClasses; +export default tablePaginationUnstyledClasses; diff --git a/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts b/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts index 871dd8ab61b3f7..b31f35bee0c209 100644 --- a/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts +++ b/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts @@ -10,12 +10,13 @@ export interface TabsListUnstyledClasses { export type TabsListUnstyledClassKey = keyof TabsListUnstyledClasses; export function getTabsListUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('TabsListUnstyled', slot); + return generateUtilityClass('BaseTabsList', slot); } -const tabsListUnstyledClasses: TabsListUnstyledClasses = generateUtilityClasses( - 'TabsListUnstyled', - ['root', 'horizontal', 'vertical'], -); +const tabsListUnstyledClasses: TabsListUnstyledClasses = generateUtilityClasses('BaseTabsList', [ + 'root', + 'horizontal', + 'vertical', +]); export default tabsListUnstyledClasses; diff --git a/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts b/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts index e2eb3f9c566683..c4afe672516885 100644 --- a/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts +++ b/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface TabsUnstyledClasses { export type TabsUnstyledClassKey = keyof TabsUnstyledClasses; export function getTabsUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('TabsUnstyled', slot); + return generateUtilityClass('BaseTabs', slot); } -const tabsUnstyledClasses: TabsUnstyledClasses = generateUtilityClasses('TabsUnstyled', [ +const tabsUnstyledClasses: TabsUnstyledClasses = generateUtilityClasses('BaseTabs', [ 'root', 'horizontal', 'vertical', From 06f6b498b82a19106bf4334c05135a0aaecfa3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Wed, 6 Jul 2022 14:09:23 +0200 Subject: [PATCH 02/14] Fix unit tests --- .../SelectUnstyled/SelectUnstyled.test.tsx | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx b/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx index 3c7e6d1158b3b9..a4068568c22d7c 100644 --- a/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx +++ b/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx @@ -144,11 +144,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'd' }); - expect(getByText('Dragon Fruit')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'r' }); - expect(getByText('Dragon Fruit')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'z' }); - expect(getByText('Dragon Fruit')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class('BaseOption-highlighted'); }); it('navigate to next element with same starting character on repeated keys', () => { @@ -171,11 +171,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Calamondin')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Calamondin')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); }); it('navigate using the label prop', () => { @@ -210,11 +210,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'd' }); - expect(getByTestId('5')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByTestId('5')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'r' }); - expect(getByTestId('5')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByTestId('5')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'z' }); - expect(getByTestId('5')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByTestId('5')).to.have.class('BaseOption-highlighted'); }); it('skips the non-stringifiable options', () => { @@ -240,11 +240,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Calamondin')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Calamondin')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); }); it('navigate to options with diacritic characters', () => { @@ -266,12 +266,12 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'b' }); - expect(getByText('Ba')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Ba')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('Bą')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('Bą')).to.have.class('BaseOption-highlighted'); }); it('navigate to next options with beginning diacritic characters', () => { @@ -294,17 +294,17 @@ describe('SelectUnstyled', () => { userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąa')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('ąa')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąb')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('ąb')).to.have.class('BaseOption-highlighted'); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'AltGraph' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąc')).to.have.class('MuiOptionUnstyled-highlighted'); + expect(getByText('ąc')).to.have.class('BaseOption-highlighted'); }); }); From 4d63740bacba8dc9e7502e60a6b37e9a6b9dd8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 11:58:28 +0200 Subject: [PATCH 03/14] Rename all Base- classes to Mui- and add Mui-Base product class --- .../src/BadgeUnstyled/badgeUnstyledClasses.ts | 4 +-- .../ButtonUnstyled/buttonUnstyledClasses.ts | 4 +-- .../formControlUnstyledClasses.ts | 4 +-- .../src/InputUnstyled/inputUnstyledClasses.ts | 4 +-- .../menuItemUnstyledClasses.ts | 4 +-- .../src/MenuUnstyled/menuUnstyledClasses.ts | 4 +-- .../src/ModalUnstyled/modalUnstyledClasses.ts | 1 - .../optionGroupUnstyledClasses.ts | 4 +-- .../OptionUnstyled/optionUnstyledClasses.tsx | 4 +-- .../SelectUnstyled/SelectUnstyled.test.tsx | 34 +++++++++---------- .../SelectUnstyled/selectUnstyledClasses.ts | 4 +-- .../SliderUnstyled/sliderUnstyledClasses.ts | 1 - .../SwitchUnstyled/switchUnstyledClasses.ts | 4 +-- .../tabPanelUnstyledClasses.ts | 4 +-- .../src/TabUnstyled/tabUnstyledClasses.ts | 4 +-- .../tablePaginationUnstyledClasses.ts | 4 +-- .../tabsListUnstyledClasses.ts | 4 +-- .../src/TabsUnstyled/tabsUnstyledClasses.ts | 4 +-- .../src/generateUtilityClass/index.ts | 17 +++++++++- 19 files changed, 63 insertions(+), 50 deletions(-) diff --git a/packages/mui-base/src/BadgeUnstyled/badgeUnstyledClasses.ts b/packages/mui-base/src/BadgeUnstyled/badgeUnstyledClasses.ts index b90cba8ccc58ea..a965c61864f08a 100644 --- a/packages/mui-base/src/BadgeUnstyled/badgeUnstyledClasses.ts +++ b/packages/mui-base/src/BadgeUnstyled/badgeUnstyledClasses.ts @@ -13,10 +13,10 @@ export interface BadgeUnstyledClasses { export type BadgeUnstyledClassKey = keyof BadgeUnstyledClasses; export function getBadgeUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseBadge', slot); + return generateUtilityClass('MuiBadge', slot); } -const badgeUnstyledClasses: BadgeUnstyledClasses = generateUtilityClasses('BaseBadge', [ +const badgeUnstyledClasses: BadgeUnstyledClasses = generateUtilityClasses('MuiBadge', [ 'root', 'badge', 'invisible', diff --git a/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts b/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts index 7937db6f648564..03bb3e5fb0cb7e 100644 --- a/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts +++ b/packages/mui-base/src/ButtonUnstyled/buttonUnstyledClasses.ts @@ -11,10 +11,10 @@ export interface ButtonUnstyledClasses { export type ButtonUnstyledClassKey = keyof ButtonUnstyledClasses; export function getButtonUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseButton', slot); + return generateUtilityClass('MuiButton', slot); } -const buttonUnstyledClasses: ButtonUnstyledClasses = generateUtilityClasses('BaseButton', [ +const buttonUnstyledClasses: ButtonUnstyledClasses = generateUtilityClasses('MuiButton', [ 'root', 'active', 'disabled', diff --git a/packages/mui-base/src/FormControlUnstyled/formControlUnstyledClasses.ts b/packages/mui-base/src/FormControlUnstyled/formControlUnstyledClasses.ts index 74353b4655e1a1..c110eda512ece4 100644 --- a/packages/mui-base/src/FormControlUnstyled/formControlUnstyledClasses.ts +++ b/packages/mui-base/src/FormControlUnstyled/formControlUnstyledClasses.ts @@ -19,11 +19,11 @@ export interface FormControlUnstyledClasses { export type FormControlUnstyledClassKey = keyof FormControlUnstyledClasses; export function getFormControlUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseFormControl', slot); + return generateUtilityClass('MuiFormControl', slot); } const formControlUnstyledClasses: FormControlUnstyledClasses = generateUtilityClasses( - 'BaseFormControl', + 'MuiFormControl', ['root', 'disabled', 'error', 'filled', 'focused', 'required'], ); diff --git a/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts b/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts index efd351e806c297..8bd59806857552 100644 --- a/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts +++ b/packages/mui-base/src/InputUnstyled/inputUnstyledClasses.ts @@ -29,10 +29,10 @@ export interface InputUnstyledClasses { export type InputUnstyledClassKey = keyof InputUnstyledClasses; export function getInputUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseInput', slot); + return generateUtilityClass('MuiInput', slot); } -const inputUnstyledClasses: InputUnstyledClasses = generateUtilityClasses('BaseInput', [ +const inputUnstyledClasses: InputUnstyledClasses = generateUtilityClasses('MuiInput', [ 'root', 'formControl', 'focused', diff --git a/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts b/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts index f1dc02fbcca705..e56d041ded6d4b 100644 --- a/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts +++ b/packages/mui-base/src/MenuItemUnstyled/menuItemUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface MenuItemUnstyledClasses { export type MenuItemUnstyledClassKey = keyof MenuItemUnstyledClasses; export function getMenuItemUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseMenuItem', slot); + return generateUtilityClass('MuiMenuItem', slot); } -const menuItemUnstyledClasses: MenuItemUnstyledClasses = generateUtilityClasses('BaseMenuItem', [ +const menuItemUnstyledClasses: MenuItemUnstyledClasses = generateUtilityClasses('MuiMenuItem', [ 'root', 'disabled', 'focusVisible', diff --git a/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts b/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts index 7f9cd9f32f8154..6e83b87c8f966e 100644 --- a/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts +++ b/packages/mui-base/src/MenuUnstyled/menuUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface MenuUnstyledClasses { export type MenuUnstyledClassKey = keyof MenuUnstyledClasses; export function getMenuUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseMenu', slot); + return generateUtilityClass('MuiMenu', slot); } -const menuUnstyledClasses: MenuUnstyledClasses = generateUtilityClasses('BaseMenu', [ +const menuUnstyledClasses: MenuUnstyledClasses = generateUtilityClasses('MuiMenu', [ 'root', 'listbox', 'expanded', diff --git a/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts b/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts index 29dc5c63050368..58807bfc9bfda2 100644 --- a/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts +++ b/packages/mui-base/src/ModalUnstyled/modalUnstyledClasses.ts @@ -10,7 +10,6 @@ export interface ModalUnstyledClasses { export type ModalUnstyledClassKey = keyof ModalUnstyledClasses; -// TODO: change `MuiModal` to 'BaseModal` after it's possible to customize the prefix from Material UI components. export function getModalUtilityClass(slot: string): string { return generateUtilityClass('MuiModal', slot); } diff --git a/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts b/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts index 01958b1e1aee20..1916532fa3163c 100644 --- a/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts +++ b/packages/mui-base/src/OptionGroupUnstyled/optionGroupUnstyledClasses.ts @@ -10,11 +10,11 @@ export interface OptionGroupUnstyledClasses { export type OptionGroupUnstyledClassKey = keyof OptionGroupUnstyledClasses; export function getOptionGroupUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseOptionGroup', slot); + return generateUtilityClass('MuiOptionGroup', slot); } const optionGroupUnstyledClasses: OptionGroupUnstyledClasses = generateUtilityClasses( - 'BaseOptionGroup', + 'MuiOptionGroup', ['root', 'label', 'list'], ); diff --git a/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx b/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx index 364a403291ec87..7df906dcf79b48 100644 --- a/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx +++ b/packages/mui-base/src/OptionUnstyled/optionUnstyledClasses.tsx @@ -11,10 +11,10 @@ export interface OptionUnstyledClasses { export type OptionUnstyledClassKey = keyof OptionUnstyledClasses; export function getOptionUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseOption', slot); + return generateUtilityClass('MuiOption', slot); } -const optionUnstyledClasses: OptionUnstyledClasses = generateUtilityClasses('BaseOption', [ +const optionUnstyledClasses: OptionUnstyledClasses = generateUtilityClasses('MuiOption', [ 'root', 'disabled', 'selected', diff --git a/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx b/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx index ca23c74fe87854..0888eaefe68b27 100644 --- a/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx +++ b/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx @@ -144,11 +144,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'd' }); - expect(getByText('Dragon Fruit')).to.have.class('BaseOption-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'r' }); - expect(getByText('Dragon Fruit')).to.have.class('BaseOption-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'z' }); - expect(getByText('Dragon Fruit')).to.have.class('BaseOption-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class('MuiOption-highlighted'); }); it('navigate to next element with same starting character on repeated keys', () => { @@ -171,11 +171,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); + expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Calamondin')).to.have.class('BaseOption-highlighted'); + expect(getByText('Calamondin')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); + expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); }); it('navigate using the label prop', () => { @@ -210,11 +210,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'd' }); - expect(getByTestId('5')).to.have.class('BaseOption-highlighted'); + expect(getByTestId('5')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'r' }); - expect(getByTestId('5')).to.have.class('BaseOption-highlighted'); + expect(getByTestId('5')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'z' }); - expect(getByTestId('5')).to.have.class('BaseOption-highlighted'); + expect(getByTestId('5')).to.have.class('MuiOption-highlighted'); }); it('skips the non-stringifiable options', () => { @@ -240,11 +240,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); + expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Calamondin')).to.have.class('BaseOption-highlighted'); + expect(getByText('Calamondin')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('BaseOption-highlighted'); + expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); }); it('navigate to options with diacritic characters', () => { @@ -266,12 +266,12 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'b' }); - expect(getByText('Ba')).to.have.class('BaseOption-highlighted'); + expect(getByText('Ba')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('Bą')).to.have.class('BaseOption-highlighted'); + expect(getByText('Bą')).to.have.class('MuiOption-highlighted'); }); it('navigate to next options with beginning diacritic characters', () => { @@ -294,17 +294,17 @@ describe('SelectUnstyled', () => { userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąa')).to.have.class('BaseOption-highlighted'); + expect(getByText('ąa')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąb')).to.have.class('BaseOption-highlighted'); + expect(getByText('ąb')).to.have.class('MuiOption-highlighted'); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'AltGraph' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąc')).to.have.class('BaseOption-highlighted'); + expect(getByText('ąc')).to.have.class('MuiOption-highlighted'); }); }); diff --git a/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts b/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts index 703a53bfad4474..71cd8393066103 100644 --- a/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts +++ b/packages/mui-base/src/SelectUnstyled/selectUnstyledClasses.ts @@ -15,10 +15,10 @@ export interface SelectUnstyledClasses { export type SelectUnstyledClassKey = keyof SelectUnstyledClasses; export function getSelectUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseSelect', slot); + return generateUtilityClass('MuiSelect', slot); } -const selectUnstyledClasses: SelectUnstyledClasses = generateUtilityClasses('BaseSelect', [ +const selectUnstyledClasses: SelectUnstyledClasses = generateUtilityClasses('MuiSelect', [ 'root', 'button', 'listbox', diff --git a/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts b/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts index f6db2f723c3ab0..46a9423b74d5be 100644 --- a/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts +++ b/packages/mui-base/src/SliderUnstyled/sliderUnstyledClasses.ts @@ -46,7 +46,6 @@ export interface SliderUnstyledClasses { export type SliderUnstyledClassKey = keyof SliderUnstyledClasses; -// TODO: change `MuiSlider` to 'BaseSlider` after it's possible to customize the prefix from Material UI components. export function getSliderUtilityClass(slot: string): string { return generateUtilityClass('MuiSlider', slot); } diff --git a/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts b/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts index fc062a56ffe806..2135a58dc8f632 100644 --- a/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts +++ b/packages/mui-base/src/SwitchUnstyled/switchUnstyledClasses.ts @@ -23,10 +23,10 @@ export interface SwitchUnstyledClasses { export type SwitchUnstyledClassKey = keyof SwitchUnstyledClasses; export function getSwitchUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseSwitch', slot); + return generateUtilityClass('MuiSwitch', slot); } -const switchUnstyledClasses: SwitchUnstyledClasses = generateUtilityClasses('BaseSwitch', [ +const switchUnstyledClasses: SwitchUnstyledClasses = generateUtilityClasses('MuiSwitch', [ 'root', 'input', 'track', diff --git a/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts b/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts index cb93af3ce2c3e6..d5824fa9aa70b4 100644 --- a/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts +++ b/packages/mui-base/src/TabPanelUnstyled/tabPanelUnstyledClasses.ts @@ -9,10 +9,10 @@ export interface TabPanelUnstyledClasses { export type TabPanelUnstyledClassKey = keyof TabPanelUnstyledClasses; export function getTabPanelUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseTabPanel', slot); + return generateUtilityClass('MuiTabPanel', slot); } -const tabPanelUnstyledClasses: TabPanelUnstyledClasses = generateUtilityClasses('BaseTabPanel', [ +const tabPanelUnstyledClasses: TabPanelUnstyledClasses = generateUtilityClasses('MuiTabPanel', [ 'root', 'hidden', ]); diff --git a/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts b/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts index 533cb15b4ca7b2..f390da7a3936da 100644 --- a/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts +++ b/packages/mui-base/src/TabUnstyled/tabUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface TabUnstyledClasses { export type TabUnstyledClassKey = keyof TabUnstyledClasses; export function getTabUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseTab', slot); + return generateUtilityClass('MuiTab', slot); } -const tabUnstyledClasses: TabUnstyledClasses = generateUtilityClasses('BaseTab', [ +const tabUnstyledClasses: TabUnstyledClasses = generateUtilityClasses('MuiTab', [ 'root', 'selected', 'disabled', diff --git a/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts b/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts index 91f037e7c5ba4e..bf2d1d7b5e74de 100644 --- a/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts +++ b/packages/mui-base/src/TablePaginationUnstyled/tablePaginationUnstyledClasses.ts @@ -29,11 +29,11 @@ export interface TablePaginationUnstyledClasses { export type TablePaginationUnstyledClassKey = keyof TablePaginationUnstyledClasses; export function getTablePaginationUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseTablePagination', slot); + return generateUtilityClass('MuiTablePagination', slot); } const tablePaginationUnstyledClasses: TablePaginationUnstyledClasses = generateUtilityClasses( - 'BaseTablePagination', + 'MuiTablePagination', [ 'root', 'toolbar', diff --git a/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts b/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts index b31f35bee0c209..e68a6b42963db4 100644 --- a/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts +++ b/packages/mui-base/src/TabsListUnstyled/tabsListUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface TabsListUnstyledClasses { export type TabsListUnstyledClassKey = keyof TabsListUnstyledClasses; export function getTabsListUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseTabsList', slot); + return generateUtilityClass('MuiTabsList', slot); } -const tabsListUnstyledClasses: TabsListUnstyledClasses = generateUtilityClasses('BaseTabsList', [ +const tabsListUnstyledClasses: TabsListUnstyledClasses = generateUtilityClasses('MuiTabsList', [ 'root', 'horizontal', 'vertical', diff --git a/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts b/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts index c4afe672516885..374ed2208aa01d 100644 --- a/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts +++ b/packages/mui-base/src/TabsUnstyled/tabsUnstyledClasses.ts @@ -10,10 +10,10 @@ export interface TabsUnstyledClasses { export type TabsUnstyledClassKey = keyof TabsUnstyledClasses; export function getTabsUnstyledUtilityClass(slot: string): string { - return generateUtilityClass('BaseTabs', slot); + return generateUtilityClass('MuiTabs', slot); } -const tabsUnstyledClasses: TabsUnstyledClasses = generateUtilityClasses('BaseTabs', [ +const tabsUnstyledClasses: TabsUnstyledClasses = generateUtilityClasses('MuiTabs', [ 'root', 'horizontal', 'vertical', diff --git a/packages/mui-base/src/generateUtilityClass/index.ts b/packages/mui-base/src/generateUtilityClass/index.ts index 19bb1127412e87..c22d1d1053576d 100644 --- a/packages/mui-base/src/generateUtilityClass/index.ts +++ b/packages/mui-base/src/generateUtilityClass/index.ts @@ -1,2 +1,17 @@ -export { unstable_generateUtilityClass as default } from '@mui/utils'; +import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; + export type { GlobalStateSlot } from '@mui/utils'; +export const ProductClass = 'Mui-Base'; + +export default function generateBaseUtilityClass( + componentName: string, + slot: string, + globalStatePrefix = 'Mui', +) { + const slotClass = generateUtilityClass(componentName, slot, globalStatePrefix); + if (slot === 'root') { + return `${ProductClass} ${slotClass}`; + } + + return slotClass; +} From e3c533965e4a212c8e357948944abd2881a8c4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 12:22:59 +0200 Subject: [PATCH 04/14] Add product class to Material UI components --- .../src/Accordion/accordionClasses.ts | 3 ++- .../AccordionActions/accordionActionsClasses.ts | 3 ++- .../AccordionDetails/accordionDetailsClasses.ts | 3 ++- .../AccordionSummary/accordionSummaryClasses.ts | 3 ++- packages/mui-material/src/Alert/alertClasses.ts | 3 ++- .../src/AlertTitle/alertTitleClasses.ts | 3 ++- .../mui-material/src/AppBar/appBarClasses.ts | 3 ++- .../src/Autocomplete/autocompleteClasses.ts | 3 ++- .../mui-material/src/Avatar/avatarClasses.ts | 3 ++- .../src/AvatarGroup/avatarGroupClasses.ts | 3 ++- .../src/Backdrop/backdropClasses.ts | 3 ++- .../BottomNavigation/bottomNavigationClasses.ts | 3 ++- .../bottomNavigationActionClasses.ts | 3 ++- .../src/Breadcrumbs/breadcrumbsClasses.ts | 3 ++- .../mui-material/src/Button/buttonClasses.ts | 3 ++- .../src/ButtonBase/buttonBaseClasses.ts | 3 ++- .../src/ButtonBase/touchRippleClasses.ts | 3 ++- .../src/ButtonGroup/buttonGroupClasses.ts | 3 ++- packages/mui-material/src/Card/cardClasses.ts | 3 ++- .../src/CardActionArea/cardActionAreaClasses.ts | 3 ++- .../src/CardActions/cardActionsClasses.ts | 3 ++- .../src/CardContent/cardContentClasses.ts | 3 ++- .../src/CardHeader/cardHeaderClasses.ts | 3 ++- .../src/CardMedia/cardMediaClasses.ts | 3 ++- .../src/Checkbox/checkboxClasses.ts | 3 ++- packages/mui-material/src/Chip/chipClasses.ts | 3 ++- .../CircularProgress/circularProgressClasses.ts | 3 ++- .../src/Collapse/collapseClasses.ts | 3 ++- .../src/Container/containerClasses.ts | 3 ++- .../mui-material/src/Dialog/dialogClasses.ts | 3 ++- .../src/DialogActions/dialogActionsClasses.ts | 3 ++- .../src/DialogContent/dialogContentClasses.ts | 3 ++- .../dialogContentTextClasses.ts | 3 ++- .../src/DialogTitle/dialogTitleClasses.ts | 3 ++- .../mui-material/src/Divider/dividerClasses.ts | 3 ++- .../mui-material/src/Drawer/drawerClasses.ts | 3 ++- packages/mui-material/src/Fab/fabClasses.ts | 3 ++- .../src/FormGroup/formGroupClasses.ts | 3 ++- .../src/FormHelperText/formHelperTextClasses.ts | 3 ++- .../src/FormLabel/formLabelClasses.ts | 3 ++- packages/mui-material/src/Grid/gridClasses.ts | 3 ++- .../mui-material/src/Hidden/hiddenCssClasses.js | 3 ++- packages/mui-material/src/Icon/iconClasses.ts | 3 ++- .../src/IconButton/iconButtonClasses.ts | 3 ++- .../src/ImageList/imageListClasses.ts | 3 ++- .../src/ImageListItem/imageListItemClasses.ts | 3 ++- .../ImageListItemBar/imageListItemBarClasses.ts | 3 ++- .../src/InputAdornment/inputAdornmentClasses.ts | 3 ++- .../src/InputBase/inputBaseClasses.ts | 3 ++- .../src/InputLabel/inputLabelClasses.ts | 3 ++- .../src/LinearProgress/linearProgressClasses.ts | 3 ++- packages/mui-material/src/Link/linkClasses.ts | 3 ++- packages/mui-material/src/List/listClasses.ts | 3 ++- .../src/ListItem/listItemClasses.ts | 3 ++- .../src/ListItemAvatar/listItemAvatarClasses.ts | 3 ++- .../src/ListItemButton/listItemButtonClasses.ts | 3 ++- .../src/ListItemIcon/listItemIconClasses.ts | 3 ++- .../listItemSecondaryActionClasses.ts | 3 ++- .../src/ListItemText/listItemTextClasses.ts | 3 ++- .../src/ListSubheader/listSubheaderClasses.ts | 3 ++- packages/mui-material/src/Menu/menuClasses.ts | 3 ++- .../src/MenuItem/menuItemClasses.ts | 3 ++- .../src/MobileStepper/mobileStepperClasses.ts | 3 ++- .../src/NativeSelect/nativeSelectClasses.ts | 3 ++- .../src/Pagination/paginationClasses.ts | 3 ++- .../src/PaginationItem/paginationItemClasses.ts | 3 ++- packages/mui-material/src/Paper/paperClasses.ts | 3 ++- .../mui-material/src/Popover/popoverClasses.ts | 3 ++- packages/mui-material/src/Radio/radioClasses.ts | 3 ++- .../mui-material/src/Rating/ratingClasses.ts | 3 ++- .../scopedCssBaselineClasses.ts | 3 ++- .../mui-material/src/Select/selectClasses.ts | 3 ++- .../src/Skeleton/skeletonClasses.ts | 3 ++- .../src/Snackbar/snackbarClasses.ts | 3 ++- .../SnackbarContent/snackbarContentClasses.ts | 3 ++- .../src/SpeedDial/speedDialClasses.ts | 3 ++- .../SpeedDialAction/speedDialActionClasses.ts | 3 ++- .../src/SpeedDialIcon/speedDialIconClasses.ts | 3 ++- packages/mui-material/src/Step/stepClasses.ts | 3 ++- .../src/StepButton/stepButtonClasses.ts | 3 ++- .../src/StepConnector/stepConnectorClasses.ts | 3 ++- .../src/StepContent/stepContentClasses.ts | 3 ++- .../src/StepIcon/stepIconClasses.ts | 3 ++- .../src/StepLabel/stepLabelClasses.ts | 3 ++- .../mui-material/src/Stepper/stepperClasses.ts | 3 ++- .../mui-material/src/SvgIcon/svgIconClasses.ts | 3 ++- .../mui-material/src/Switch/switchClasses.ts | 3 ++- packages/mui-material/src/Tab/tabClasses.ts | 3 ++- .../TabScrollButton/tabScrollButtonClasses.ts | 3 ++- packages/mui-material/src/Table/tableClasses.ts | 3 ++- .../src/TableBody/tableBodyClasses.ts | 3 ++- .../src/TableCell/tableCellClasses.ts | 3 ++- .../src/TableContainer/tableContainerClasses.ts | 3 ++- .../src/TableFooter/tableFooterClasses.ts | 3 ++- .../src/TableHead/tableHeadClasses.ts | 3 ++- .../TablePagination/tablePaginationClasses.ts | 3 ++- .../src/TableRow/tableRowClasses.ts | 3 ++- .../src/TableSortLabel/tableSortLabelClasses.ts | 3 ++- packages/mui-material/src/Tabs/tabsClasses.ts | 3 ++- .../src/TextField/textFieldClasses.ts | 3 ++- .../src/ToggleButton/toggleButtonClasses.ts | 3 ++- .../toggleButtonGroupClasses.ts | 3 ++- .../mui-material/src/Toolbar/toolbarClasses.ts | 3 ++- .../mui-material/src/Tooltip/tooltipClasses.ts | 3 ++- .../src/Typography/typographyClasses.ts | 3 ++- .../src/Unstable_Grid2/grid2Classes.ts | 3 ++- .../src/generateUtilityClass/index.ts | 17 +++++++++++++++++ .../src/internal/switchBaseClasses.ts | 3 ++- 108 files changed, 231 insertions(+), 107 deletions(-) create mode 100644 packages/mui-material/src/generateUtilityClass/index.ts diff --git a/packages/mui-material/src/Accordion/accordionClasses.ts b/packages/mui-material/src/Accordion/accordionClasses.ts index 76bf3ca08e6199..c5a4c44bc5e6e3 100644 --- a/packages/mui-material/src/Accordion/accordionClasses.ts +++ b/packages/mui-material/src/Accordion/accordionClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AccordionClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts b/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts index a463ca01a323e9..824a20fcc3da04 100644 --- a/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts +++ b/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AccordionActionsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts b/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts index 532076f2fa6d9c..9fe5f2dff7d745 100644 --- a/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts +++ b/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AccordionDetailsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts b/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts index 377873cd9a2391..6e016084218edb 100644 --- a/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts +++ b/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AccordionSummaryClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Alert/alertClasses.ts b/packages/mui-material/src/Alert/alertClasses.ts index b29e15d5cd3f4b..2734982843dd25 100644 --- a/packages/mui-material/src/Alert/alertClasses.ts +++ b/packages/mui-material/src/Alert/alertClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AlertClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/AlertTitle/alertTitleClasses.ts b/packages/mui-material/src/AlertTitle/alertTitleClasses.ts index 74a927c9c1f789..91e548a375f0ca 100644 --- a/packages/mui-material/src/AlertTitle/alertTitleClasses.ts +++ b/packages/mui-material/src/AlertTitle/alertTitleClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AlertTitleClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/AppBar/appBarClasses.ts b/packages/mui-material/src/AppBar/appBarClasses.ts index f75c8e492ac016..a6d0e1d168aacd 100644 --- a/packages/mui-material/src/AppBar/appBarClasses.ts +++ b/packages/mui-material/src/AppBar/appBarClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AppBarClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Autocomplete/autocompleteClasses.ts b/packages/mui-material/src/Autocomplete/autocompleteClasses.ts index f50cac4f2e748b..531523ccae029c 100644 --- a/packages/mui-material/src/Autocomplete/autocompleteClasses.ts +++ b/packages/mui-material/src/Autocomplete/autocompleteClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AutocompleteClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Avatar/avatarClasses.ts b/packages/mui-material/src/Avatar/avatarClasses.ts index 4afabe8bb9e781..7c6dbc7c69011b 100644 --- a/packages/mui-material/src/Avatar/avatarClasses.ts +++ b/packages/mui-material/src/Avatar/avatarClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AvatarClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts b/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts index 0c5b10ac6c9a60..e7b5cf5417d7c2 100644 --- a/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts +++ b/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface AvatarGroupClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Backdrop/backdropClasses.ts b/packages/mui-material/src/Backdrop/backdropClasses.ts index 1d085617cf67b6..2bcecfff38781b 100644 --- a/packages/mui-material/src/Backdrop/backdropClasses.ts +++ b/packages/mui-material/src/Backdrop/backdropClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface BackdropClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts b/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts index 74f6889b4e0523..666f76e553c69d 100644 --- a/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts +++ b/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface BottomNavigationClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts b/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts index 5a020e74500a19..a6ea3a63e63cd2 100644 --- a/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts +++ b/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface BottomNavigationActionClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts b/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts index c18edd5f3023b2..371f42099ebf8b 100644 --- a/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts +++ b/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface BreadcrumbsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Button/buttonClasses.ts b/packages/mui-material/src/Button/buttonClasses.ts index eaf30b095e8665..7a675ea05a30e5 100644 --- a/packages/mui-material/src/Button/buttonClasses.ts +++ b/packages/mui-material/src/Button/buttonClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts b/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts index 51fa3299d60bca..8f9c1411ab6b78 100644 --- a/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts +++ b/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ButtonBaseClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ButtonBase/touchRippleClasses.ts b/packages/mui-material/src/ButtonBase/touchRippleClasses.ts index f6e6e03bea80cc..f7548df245f9b1 100644 --- a/packages/mui-material/src/ButtonBase/touchRippleClasses.ts +++ b/packages/mui-material/src/ButtonBase/touchRippleClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TouchRippleClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts b/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts index 7a7cf6bf96fdea..8e47091c7aa144 100644 --- a/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts +++ b/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ButtonGroupClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Card/cardClasses.ts b/packages/mui-material/src/Card/cardClasses.ts index 787a9ae3aad10c..a3b078185bfd9b 100644 --- a/packages/mui-material/src/Card/cardClasses.ts +++ b/packages/mui-material/src/Card/cardClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CardClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts b/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts index dc61cdd7040d6f..d69150bf54a9fb 100644 --- a/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts +++ b/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CardActionAreaClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/CardActions/cardActionsClasses.ts b/packages/mui-material/src/CardActions/cardActionsClasses.ts index e46daac6464bf4..5de770180b8c4b 100644 --- a/packages/mui-material/src/CardActions/cardActionsClasses.ts +++ b/packages/mui-material/src/CardActions/cardActionsClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CardActionsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/CardContent/cardContentClasses.ts b/packages/mui-material/src/CardContent/cardContentClasses.ts index 4af4acb7c8d716..b0d0a22f9a66e3 100644 --- a/packages/mui-material/src/CardContent/cardContentClasses.ts +++ b/packages/mui-material/src/CardContent/cardContentClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CardContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/CardHeader/cardHeaderClasses.ts b/packages/mui-material/src/CardHeader/cardHeaderClasses.ts index 50b58c4079de43..d5b6194eebf68f 100644 --- a/packages/mui-material/src/CardHeader/cardHeaderClasses.ts +++ b/packages/mui-material/src/CardHeader/cardHeaderClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CardHeaderClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/CardMedia/cardMediaClasses.ts b/packages/mui-material/src/CardMedia/cardMediaClasses.ts index e137b891dc4278..23cd4b2dd04c90 100644 --- a/packages/mui-material/src/CardMedia/cardMediaClasses.ts +++ b/packages/mui-material/src/CardMedia/cardMediaClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CardMediaClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Checkbox/checkboxClasses.ts b/packages/mui-material/src/Checkbox/checkboxClasses.ts index 4b5213e9265bf4..a5df51ab1db2fb 100644 --- a/packages/mui-material/src/Checkbox/checkboxClasses.ts +++ b/packages/mui-material/src/Checkbox/checkboxClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CheckboxClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Chip/chipClasses.ts b/packages/mui-material/src/Chip/chipClasses.ts index 6363e5d1eb2e40..6c27efe0b13ac5 100644 --- a/packages/mui-material/src/Chip/chipClasses.ts +++ b/packages/mui-material/src/Chip/chipClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ChipClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/CircularProgress/circularProgressClasses.ts b/packages/mui-material/src/CircularProgress/circularProgressClasses.ts index fc80a46ba20aae..67aaaad9e3c073 100644 --- a/packages/mui-material/src/CircularProgress/circularProgressClasses.ts +++ b/packages/mui-material/src/CircularProgress/circularProgressClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CircularProgressClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Collapse/collapseClasses.ts b/packages/mui-material/src/Collapse/collapseClasses.ts index a38c556cc4e3ee..36f684a2c637df 100644 --- a/packages/mui-material/src/Collapse/collapseClasses.ts +++ b/packages/mui-material/src/Collapse/collapseClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface CollapseClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Container/containerClasses.ts b/packages/mui-material/src/Container/containerClasses.ts index dc8c11d99cb839..9495334ac58240 100644 --- a/packages/mui-material/src/Container/containerClasses.ts +++ b/packages/mui-material/src/Container/containerClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; import { ContainerClasses } from '@mui/system'; export type { ContainerClassKey } from '@mui/system'; diff --git a/packages/mui-material/src/Dialog/dialogClasses.ts b/packages/mui-material/src/Dialog/dialogClasses.ts index 997e3507355cae..f59baf0d08da0e 100644 --- a/packages/mui-material/src/Dialog/dialogClasses.ts +++ b/packages/mui-material/src/Dialog/dialogClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface DialogClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/DialogActions/dialogActionsClasses.ts b/packages/mui-material/src/DialogActions/dialogActionsClasses.ts index 52c80d583aa568..7e827e1507a300 100644 --- a/packages/mui-material/src/DialogActions/dialogActionsClasses.ts +++ b/packages/mui-material/src/DialogActions/dialogActionsClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface DialogActionsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/DialogContent/dialogContentClasses.ts b/packages/mui-material/src/DialogContent/dialogContentClasses.ts index 88587b8f35b1cd..d377b9cde33635 100644 --- a/packages/mui-material/src/DialogContent/dialogContentClasses.ts +++ b/packages/mui-material/src/DialogContent/dialogContentClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface DialogContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts b/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts index 64f72d154ebab8..30764ca5e33818 100644 --- a/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts +++ b/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface DialogContentTextClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts b/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts index 79e101090a3902..4bc0d06f3ebfab 100644 --- a/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts +++ b/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface DialogTitleClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Divider/dividerClasses.ts b/packages/mui-material/src/Divider/dividerClasses.ts index 23dde619babf74..3752a21aa8accb 100644 --- a/packages/mui-material/src/Divider/dividerClasses.ts +++ b/packages/mui-material/src/Divider/dividerClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface DividerClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Drawer/drawerClasses.ts b/packages/mui-material/src/Drawer/drawerClasses.ts index 72048c19872c17..7eabeba1221c1a 100644 --- a/packages/mui-material/src/Drawer/drawerClasses.ts +++ b/packages/mui-material/src/Drawer/drawerClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface DrawerClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Fab/fabClasses.ts b/packages/mui-material/src/Fab/fabClasses.ts index fa3beaad5f58fb..ed539ebedf235e 100644 --- a/packages/mui-material/src/Fab/fabClasses.ts +++ b/packages/mui-material/src/Fab/fabClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface FabClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/FormGroup/formGroupClasses.ts b/packages/mui-material/src/FormGroup/formGroupClasses.ts index 3ad1d332676586..f40a0d8069978e 100644 --- a/packages/mui-material/src/FormGroup/formGroupClasses.ts +++ b/packages/mui-material/src/FormGroup/formGroupClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface FormGroupClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts b/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts index 8868f5a0312586..82f0bd1da2c0ab 100644 --- a/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts +++ b/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface FormHelperTextClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/FormLabel/formLabelClasses.ts b/packages/mui-material/src/FormLabel/formLabelClasses.ts index b43c6fddf5f35b..4755a4e0dab98e 100644 --- a/packages/mui-material/src/FormLabel/formLabelClasses.ts +++ b/packages/mui-material/src/FormLabel/formLabelClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface FormLabelClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Grid/gridClasses.ts b/packages/mui-material/src/Grid/gridClasses.ts index c7284fe493ea30..62cb63c92dc334 100644 --- a/packages/mui-material/src/Grid/gridClasses.ts +++ b/packages/mui-material/src/Grid/gridClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface GridClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Hidden/hiddenCssClasses.js b/packages/mui-material/src/Hidden/hiddenCssClasses.js index 99f798a2d12831..14815809ae9628 100644 --- a/packages/mui-material/src/Hidden/hiddenCssClasses.js +++ b/packages/mui-material/src/Hidden/hiddenCssClasses.js @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export function getHiddenCssUtilityClass(slot) { return generateUtilityClass('PrivateHiddenCss', slot); diff --git a/packages/mui-material/src/Icon/iconClasses.ts b/packages/mui-material/src/Icon/iconClasses.ts index 9241f1c13d50d4..3b048c3529d1cd 100644 --- a/packages/mui-material/src/Icon/iconClasses.ts +++ b/packages/mui-material/src/Icon/iconClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface IconClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/IconButton/iconButtonClasses.ts b/packages/mui-material/src/IconButton/iconButtonClasses.ts index f0d14524966c7a..67513295ea410a 100644 --- a/packages/mui-material/src/IconButton/iconButtonClasses.ts +++ b/packages/mui-material/src/IconButton/iconButtonClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface IconButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ImageList/imageListClasses.ts b/packages/mui-material/src/ImageList/imageListClasses.ts index 4e6dd293896b21..49a5bb2c8c10e6 100644 --- a/packages/mui-material/src/ImageList/imageListClasses.ts +++ b/packages/mui-material/src/ImageList/imageListClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ImageListClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ImageListItem/imageListItemClasses.ts b/packages/mui-material/src/ImageListItem/imageListItemClasses.ts index a1852bfb8a719c..d7150d3a30e763 100644 --- a/packages/mui-material/src/ImageListItem/imageListItemClasses.ts +++ b/packages/mui-material/src/ImageListItem/imageListItemClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ImageListItemClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts b/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts index 629a8c03867600..2d877ecc7984eb 100644 --- a/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts +++ b/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ImageListItemBarClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts b/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts index 6a336e351ba33e..4266e809f72114 100644 --- a/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts +++ b/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface InputAdornmentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/InputBase/inputBaseClasses.ts b/packages/mui-material/src/InputBase/inputBaseClasses.ts index cc0def36827622..9723b5a560e251 100644 --- a/packages/mui-material/src/InputBase/inputBaseClasses.ts +++ b/packages/mui-material/src/InputBase/inputBaseClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface InputBaseClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/InputLabel/inputLabelClasses.ts b/packages/mui-material/src/InputLabel/inputLabelClasses.ts index def827601ec0aa..e55a3ef68d8a83 100644 --- a/packages/mui-material/src/InputLabel/inputLabelClasses.ts +++ b/packages/mui-material/src/InputLabel/inputLabelClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface InputLabelClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/LinearProgress/linearProgressClasses.ts b/packages/mui-material/src/LinearProgress/linearProgressClasses.ts index 2f2fc5ba8885bc..04c1178466b500 100644 --- a/packages/mui-material/src/LinearProgress/linearProgressClasses.ts +++ b/packages/mui-material/src/LinearProgress/linearProgressClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface LinearProgressClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Link/linkClasses.ts b/packages/mui-material/src/Link/linkClasses.ts index 1823e8e48bf5d4..1b76325587f697 100644 --- a/packages/mui-material/src/Link/linkClasses.ts +++ b/packages/mui-material/src/Link/linkClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface LinkClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/List/listClasses.ts b/packages/mui-material/src/List/listClasses.ts index 615daa63fb4d91..7569c0533bc28d 100644 --- a/packages/mui-material/src/List/listClasses.ts +++ b/packages/mui-material/src/List/listClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ListItem/listItemClasses.ts b/packages/mui-material/src/ListItem/listItemClasses.ts index 97ea244e265c2b..f4acf89c38763f 100644 --- a/packages/mui-material/src/ListItem/listItemClasses.ts +++ b/packages/mui-material/src/ListItem/listItemClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListItemClasses { /** Styles applied to the (normally root) `component` element. May be wrapped by a `container`. */ diff --git a/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts b/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts index 3e0168855941d1..914155fd523ddc 100644 --- a/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts +++ b/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListItemAvatarClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts b/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts index 1d34bf50bc11bd..4f2d827d4288d1 100644 --- a/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts +++ b/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListItemButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts b/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts index 5e65b9b0404fb2..aa6fdceae1ec8d 100644 --- a/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts +++ b/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListItemIconClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts b/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts index db4bfde196d0ff..6dd809cedd643a 100644 --- a/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts +++ b/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListItemSecondaryActionClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ListItemText/listItemTextClasses.ts b/packages/mui-material/src/ListItemText/listItemTextClasses.ts index 42862fb91bddca..2b11c5a6aa3b64 100644 --- a/packages/mui-material/src/ListItemText/listItemTextClasses.ts +++ b/packages/mui-material/src/ListItemText/listItemTextClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListItemTextClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts b/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts index 2b988e3fbe2794..ef9cb08b13b7cf 100644 --- a/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts +++ b/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ListSubheaderClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Menu/menuClasses.ts b/packages/mui-material/src/Menu/menuClasses.ts index 859cdcd28d88d0..700be2a997b7ce 100644 --- a/packages/mui-material/src/Menu/menuClasses.ts +++ b/packages/mui-material/src/Menu/menuClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface MenuClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/MenuItem/menuItemClasses.ts b/packages/mui-material/src/MenuItem/menuItemClasses.ts index 545c6150931003..d8184348b76495 100644 --- a/packages/mui-material/src/MenuItem/menuItemClasses.ts +++ b/packages/mui-material/src/MenuItem/menuItemClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface MenuItemClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts b/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts index cd6ed477d8513c..1e660b3ff65086 100644 --- a/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts +++ b/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface MobileStepperClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts b/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts index 0ee0652113ee33..ab4999d59fd0f6 100644 --- a/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts +++ b/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface NativeSelectClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Pagination/paginationClasses.ts b/packages/mui-material/src/Pagination/paginationClasses.ts index 0036650e231d71..06a01a0920204d 100644 --- a/packages/mui-material/src/Pagination/paginationClasses.ts +++ b/packages/mui-material/src/Pagination/paginationClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface PaginationClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/PaginationItem/paginationItemClasses.ts b/packages/mui-material/src/PaginationItem/paginationItemClasses.ts index d98e1a45c36df2..996b1dec881c97 100644 --- a/packages/mui-material/src/PaginationItem/paginationItemClasses.ts +++ b/packages/mui-material/src/PaginationItem/paginationItemClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface PaginationItemClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Paper/paperClasses.ts b/packages/mui-material/src/Paper/paperClasses.ts index 93240bd68025e4..83f069abc704f2 100644 --- a/packages/mui-material/src/Paper/paperClasses.ts +++ b/packages/mui-material/src/Paper/paperClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface PaperClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Popover/popoverClasses.ts b/packages/mui-material/src/Popover/popoverClasses.ts index db921fd94e5d0b..85c826316ac88c 100644 --- a/packages/mui-material/src/Popover/popoverClasses.ts +++ b/packages/mui-material/src/Popover/popoverClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface PopoverClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Radio/radioClasses.ts b/packages/mui-material/src/Radio/radioClasses.ts index c244f4267f97be..06accc2d393da2 100644 --- a/packages/mui-material/src/Radio/radioClasses.ts +++ b/packages/mui-material/src/Radio/radioClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface RadioClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Rating/ratingClasses.ts b/packages/mui-material/src/Rating/ratingClasses.ts index 1b20168be8795c..4d88214095155d 100644 --- a/packages/mui-material/src/Rating/ratingClasses.ts +++ b/packages/mui-material/src/Rating/ratingClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface RatingClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts b/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts index 09ef6b698d9676..98c3de561d3d41 100644 --- a/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts +++ b/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ScopedCssBaselineClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Select/selectClasses.ts b/packages/mui-material/src/Select/selectClasses.ts index a12038afe7310a..d935bcc55b75f6 100644 --- a/packages/mui-material/src/Select/selectClasses.ts +++ b/packages/mui-material/src/Select/selectClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SelectClasses { /** Styles applied to the select component `select` class. */ diff --git a/packages/mui-material/src/Skeleton/skeletonClasses.ts b/packages/mui-material/src/Skeleton/skeletonClasses.ts index 88447bcc1f810c..72981cb41aa760 100644 --- a/packages/mui-material/src/Skeleton/skeletonClasses.ts +++ b/packages/mui-material/src/Skeleton/skeletonClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SkeletonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Snackbar/snackbarClasses.ts b/packages/mui-material/src/Snackbar/snackbarClasses.ts index 1723ed8edb2ce7..fa06da4b260a18 100644 --- a/packages/mui-material/src/Snackbar/snackbarClasses.ts +++ b/packages/mui-material/src/Snackbar/snackbarClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SnackbarClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts b/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts index 0ee139f7ec400c..dfbcc4ff3c019f 100644 --- a/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts +++ b/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SnackbarContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/SpeedDial/speedDialClasses.ts b/packages/mui-material/src/SpeedDial/speedDialClasses.ts index 57ca9f76492fdb..b16dd1bf6af53f 100644 --- a/packages/mui-material/src/SpeedDial/speedDialClasses.ts +++ b/packages/mui-material/src/SpeedDial/speedDialClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SpeedDialClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts b/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts index c50f8e97d58ec0..6d0af7ab5ab830 100644 --- a/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts +++ b/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SpeedDialActionClasses { /** Styles applied to the Fab component. */ diff --git a/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts b/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts index 40bcfb4f55e206..6030071f1d46ee 100644 --- a/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts +++ b/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SpeedDialIconClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Step/stepClasses.ts b/packages/mui-material/src/Step/stepClasses.ts index 96c96078d5c6ea..1b3bd866072e66 100644 --- a/packages/mui-material/src/Step/stepClasses.ts +++ b/packages/mui-material/src/Step/stepClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface StepClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/StepButton/stepButtonClasses.ts b/packages/mui-material/src/StepButton/stepButtonClasses.ts index cb3f575d8d9a88..c4e1bb5dea1e36 100644 --- a/packages/mui-material/src/StepButton/stepButtonClasses.ts +++ b/packages/mui-material/src/StepButton/stepButtonClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface StepButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/StepConnector/stepConnectorClasses.ts b/packages/mui-material/src/StepConnector/stepConnectorClasses.ts index e500d2288f437b..b6d76e89791477 100644 --- a/packages/mui-material/src/StepConnector/stepConnectorClasses.ts +++ b/packages/mui-material/src/StepConnector/stepConnectorClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface StepConnectorClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/StepContent/stepContentClasses.ts b/packages/mui-material/src/StepContent/stepContentClasses.ts index 9d0915001cdaf7..fbc4cc974b91e0 100644 --- a/packages/mui-material/src/StepContent/stepContentClasses.ts +++ b/packages/mui-material/src/StepContent/stepContentClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface StepContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/StepIcon/stepIconClasses.ts b/packages/mui-material/src/StepIcon/stepIconClasses.ts index fb11f4602a8aba..8f82a75938d442 100644 --- a/packages/mui-material/src/StepIcon/stepIconClasses.ts +++ b/packages/mui-material/src/StepIcon/stepIconClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface StepIconClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/StepLabel/stepLabelClasses.ts b/packages/mui-material/src/StepLabel/stepLabelClasses.ts index 23d3a7327e49f4..44a05bcacb98d1 100644 --- a/packages/mui-material/src/StepLabel/stepLabelClasses.ts +++ b/packages/mui-material/src/StepLabel/stepLabelClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface StepLabelClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Stepper/stepperClasses.ts b/packages/mui-material/src/Stepper/stepperClasses.ts index 40a2280a463837..4166edebda19e9 100644 --- a/packages/mui-material/src/Stepper/stepperClasses.ts +++ b/packages/mui-material/src/Stepper/stepperClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface StepperClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/SvgIcon/svgIconClasses.ts b/packages/mui-material/src/SvgIcon/svgIconClasses.ts index 57f184b9dea499..d8cc4e78ecf5a5 100644 --- a/packages/mui-material/src/SvgIcon/svgIconClasses.ts +++ b/packages/mui-material/src/SvgIcon/svgIconClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SvgIconClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Switch/switchClasses.ts b/packages/mui-material/src/Switch/switchClasses.ts index f46fcb574983ca..b8c7a675c0e5d4 100644 --- a/packages/mui-material/src/Switch/switchClasses.ts +++ b/packages/mui-material/src/Switch/switchClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SwitchClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Tab/tabClasses.ts b/packages/mui-material/src/Tab/tabClasses.ts index cadef4fc5dc6e5..95954d86978861 100644 --- a/packages/mui-material/src/Tab/tabClasses.ts +++ b/packages/mui-material/src/Tab/tabClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TabClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts b/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts index 2e092c59233bdd..ea8d7ab63e6074 100644 --- a/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts +++ b/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TabScrollButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Table/tableClasses.ts b/packages/mui-material/src/Table/tableClasses.ts index 2ff62d8e14b950..4278108a0019b6 100644 --- a/packages/mui-material/src/Table/tableClasses.ts +++ b/packages/mui-material/src/Table/tableClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TableBody/tableBodyClasses.ts b/packages/mui-material/src/TableBody/tableBodyClasses.ts index ece7db887297e7..1aa025e00f22b1 100644 --- a/packages/mui-material/src/TableBody/tableBodyClasses.ts +++ b/packages/mui-material/src/TableBody/tableBodyClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableBodyClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TableCell/tableCellClasses.ts b/packages/mui-material/src/TableCell/tableCellClasses.ts index 2d47166eb2b377..7a676b6be23f5c 100644 --- a/packages/mui-material/src/TableCell/tableCellClasses.ts +++ b/packages/mui-material/src/TableCell/tableCellClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableCellClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TableContainer/tableContainerClasses.ts b/packages/mui-material/src/TableContainer/tableContainerClasses.ts index e65c43ffb0bd25..4ceec0e008395d 100644 --- a/packages/mui-material/src/TableContainer/tableContainerClasses.ts +++ b/packages/mui-material/src/TableContainer/tableContainerClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableContainerClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TableFooter/tableFooterClasses.ts b/packages/mui-material/src/TableFooter/tableFooterClasses.ts index c64afcee6c3ba5..ac37425380faed 100644 --- a/packages/mui-material/src/TableFooter/tableFooterClasses.ts +++ b/packages/mui-material/src/TableFooter/tableFooterClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableFooterClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TableHead/tableHeadClasses.ts b/packages/mui-material/src/TableHead/tableHeadClasses.ts index 7433738912e5f9..260fdc870468cc 100644 --- a/packages/mui-material/src/TableHead/tableHeadClasses.ts +++ b/packages/mui-material/src/TableHead/tableHeadClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableHeadClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TablePagination/tablePaginationClasses.ts b/packages/mui-material/src/TablePagination/tablePaginationClasses.ts index 433ab01452fc70..f73bc1a551ad34 100644 --- a/packages/mui-material/src/TablePagination/tablePaginationClasses.ts +++ b/packages/mui-material/src/TablePagination/tablePaginationClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TablePaginationClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TableRow/tableRowClasses.ts b/packages/mui-material/src/TableRow/tableRowClasses.ts index 00082a797e55ba..88c51f250f533b 100644 --- a/packages/mui-material/src/TableRow/tableRowClasses.ts +++ b/packages/mui-material/src/TableRow/tableRowClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableRowClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts b/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts index 4cbf71bf00aea8..9b9ac4e7477bef 100644 --- a/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts +++ b/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TableSortLabelClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Tabs/tabsClasses.ts b/packages/mui-material/src/Tabs/tabsClasses.ts index 7f6716837e5121..badc5400d2435a 100644 --- a/packages/mui-material/src/Tabs/tabsClasses.ts +++ b/packages/mui-material/src/Tabs/tabsClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TabsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/TextField/textFieldClasses.ts b/packages/mui-material/src/TextField/textFieldClasses.ts index fbd56b0bb9fd29..e4e10f1c1bc5f8 100644 --- a/packages/mui-material/src/TextField/textFieldClasses.ts +++ b/packages/mui-material/src/TextField/textFieldClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TextFieldClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts b/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts index bf0440f82ed4d9..6a97404baeccba 100644 --- a/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts +++ b/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ToggleButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts b/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts index beb8811e0cef33..130a330652e0be 100644 --- a/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts +++ b/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ToggleButtonGroupClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Toolbar/toolbarClasses.ts b/packages/mui-material/src/Toolbar/toolbarClasses.ts index 3b7f068d75b082..6c8ad19e60dc3d 100644 --- a/packages/mui-material/src/Toolbar/toolbarClasses.ts +++ b/packages/mui-material/src/Toolbar/toolbarClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface ToolbarClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Tooltip/tooltipClasses.ts b/packages/mui-material/src/Tooltip/tooltipClasses.ts index 385aff75b62e6c..39f9926d41a824 100644 --- a/packages/mui-material/src/Tooltip/tooltipClasses.ts +++ b/packages/mui-material/src/Tooltip/tooltipClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TooltipClasses { /** Styles applied to the Popper component. */ diff --git a/packages/mui-material/src/Typography/typographyClasses.ts b/packages/mui-material/src/Typography/typographyClasses.ts index f5589eb835435c..9468c820ca55aa 100644 --- a/packages/mui-material/src/Typography/typographyClasses.ts +++ b/packages/mui-material/src/Typography/typographyClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface TypographyClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts b/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts index 97437f862aa6b4..ef6ac488395784 100644 --- a/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts +++ b/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; import { GridClasses } from '@mui/system/Unstable_Grid'; export type Grid2ClassKey = keyof GridClasses; diff --git a/packages/mui-material/src/generateUtilityClass/index.ts b/packages/mui-material/src/generateUtilityClass/index.ts new file mode 100644 index 00000000000000..2a951ddb2045a4 --- /dev/null +++ b/packages/mui-material/src/generateUtilityClass/index.ts @@ -0,0 +1,17 @@ +import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; + +export type { GlobalStateSlot } from '@mui/utils'; +export const ProductClass = 'Mui-MaterialUI'; + +export default function generateBaseUtilityClass( + componentName: string, + slot: string, + globalStatePrefix = 'Mui', +) { + const slotClass = generateUtilityClass(componentName, slot, globalStatePrefix); + if (slot === 'root') { + return `${ProductClass} ${slotClass}`; + } + + return slotClass; +} diff --git a/packages/mui-material/src/internal/switchBaseClasses.ts b/packages/mui-material/src/internal/switchBaseClasses.ts index 5b667461486dfa..d03ec06ce1ca0b 100644 --- a/packages/mui-material/src/internal/switchBaseClasses.ts +++ b/packages/mui-material/src/internal/switchBaseClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { generateUtilityClasses } from '@mui/base'; +import generateUtilityClass from '../generateUtilityClass'; export interface SwitchBaseClasses { root: string; From 2d758677a906631f6922328065592edbd0fad674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 12:33:47 +0200 Subject: [PATCH 05/14] Do not export generateUtilityClass from Base --- packages/mui-base/src/index.d.ts | 6 ------ packages/mui-base/src/index.js | 5 ----- packages/mui-material/src/Accordion/accordionClasses.ts | 2 +- .../src/AccordionActions/accordionActionsClasses.ts | 2 +- .../src/AccordionDetails/accordionDetailsClasses.ts | 2 +- .../src/AccordionSummary/accordionSummaryClasses.ts | 2 +- packages/mui-material/src/Alert/alertClasses.ts | 2 +- packages/mui-material/src/AlertTitle/alertTitleClasses.ts | 2 +- packages/mui-material/src/AppBar/appBarClasses.ts | 2 +- .../mui-material/src/Autocomplete/autocompleteClasses.ts | 2 +- packages/mui-material/src/Avatar/avatarClasses.ts | 2 +- packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts | 2 +- packages/mui-material/src/Backdrop/backdropClasses.ts | 2 +- packages/mui-material/src/Badge/badgeClasses.ts | 4 ++-- .../src/BottomNavigation/bottomNavigationClasses.ts | 2 +- .../BottomNavigationAction/bottomNavigationActionClasses.ts | 2 +- packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts | 2 +- packages/mui-material/src/Button/buttonClasses.ts | 2 +- packages/mui-material/src/ButtonBase/buttonBaseClasses.ts | 2 +- packages/mui-material/src/ButtonBase/touchRippleClasses.ts | 2 +- packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts | 2 +- packages/mui-material/src/Card/cardClasses.ts | 2 +- .../src/CardActionArea/cardActionAreaClasses.ts | 2 +- packages/mui-material/src/CardActions/cardActionsClasses.ts | 2 +- packages/mui-material/src/CardContent/cardContentClasses.ts | 2 +- packages/mui-material/src/CardHeader/cardHeaderClasses.ts | 2 +- packages/mui-material/src/CardMedia/cardMediaClasses.ts | 2 +- packages/mui-material/src/Checkbox/checkboxClasses.ts | 2 +- packages/mui-material/src/Chip/chipClasses.ts | 2 +- .../src/CircularProgress/circularProgressClasses.ts | 2 +- packages/mui-material/src/Collapse/collapseClasses.ts | 2 +- packages/mui-material/src/Container/containerClasses.ts | 2 +- packages/mui-material/src/Dialog/dialogClasses.ts | 2 +- .../mui-material/src/DialogActions/dialogActionsClasses.ts | 2 +- .../mui-material/src/DialogContent/dialogContentClasses.ts | 2 +- .../src/DialogContentText/dialogContentTextClasses.ts | 2 +- packages/mui-material/src/DialogTitle/dialogTitleClasses.ts | 2 +- packages/mui-material/src/Divider/dividerClasses.ts | 2 +- packages/mui-material/src/Drawer/drawerClasses.ts | 2 +- packages/mui-material/src/Fab/fabClasses.ts | 2 +- packages/mui-material/src/FilledInput/filledInputClasses.ts | 3 ++- packages/mui-material/src/FormControl/formControlClasses.ts | 3 ++- .../src/FormControlLabel/formControlLabelClasses.ts | 3 ++- packages/mui-material/src/FormGroup/formGroupClasses.ts | 2 +- .../src/FormHelperText/formHelperTextClasses.ts | 2 +- packages/mui-material/src/FormLabel/formLabelClasses.ts | 2 +- packages/mui-material/src/Grid/gridClasses.ts | 2 +- packages/mui-material/src/Hidden/hiddenCssClasses.js | 2 +- packages/mui-material/src/Icon/iconClasses.ts | 2 +- packages/mui-material/src/IconButton/iconButtonClasses.ts | 2 +- packages/mui-material/src/ImageList/imageListClasses.ts | 2 +- .../mui-material/src/ImageListItem/imageListItemClasses.ts | 2 +- .../src/ImageListItemBar/imageListItemBarClasses.ts | 2 +- packages/mui-material/src/Input/inputClasses.ts | 3 ++- .../src/InputAdornment/inputAdornmentClasses.ts | 2 +- packages/mui-material/src/InputBase/inputBaseClasses.ts | 2 +- packages/mui-material/src/InputLabel/inputLabelClasses.ts | 2 +- .../src/LinearProgress/linearProgressClasses.ts | 2 +- packages/mui-material/src/Link/linkClasses.ts | 2 +- packages/mui-material/src/List/listClasses.ts | 2 +- packages/mui-material/src/ListItem/listItemClasses.ts | 2 +- .../src/ListItemAvatar/listItemAvatarClasses.ts | 2 +- .../src/ListItemButton/listItemButtonClasses.ts | 2 +- .../mui-material/src/ListItemIcon/listItemIconClasses.ts | 2 +- .../listItemSecondaryActionClasses.ts | 2 +- .../mui-material/src/ListItemText/listItemTextClasses.ts | 2 +- .../mui-material/src/ListSubheader/listSubheaderClasses.ts | 2 +- packages/mui-material/src/Menu/menuClasses.ts | 2 +- packages/mui-material/src/MenuItem/menuItemClasses.ts | 2 +- .../mui-material/src/MobileStepper/mobileStepperClasses.ts | 2 +- .../mui-material/src/NativeSelect/nativeSelectClasses.ts | 2 +- .../mui-material/src/OutlinedInput/outlinedInputClasses.ts | 3 ++- packages/mui-material/src/Pagination/paginationClasses.ts | 2 +- .../src/PaginationItem/paginationItemClasses.ts | 2 +- packages/mui-material/src/Paper/paperClasses.ts | 2 +- packages/mui-material/src/Popover/popoverClasses.ts | 2 +- packages/mui-material/src/Radio/radioClasses.ts | 2 +- packages/mui-material/src/Rating/ratingClasses.ts | 2 +- .../src/ScopedCssBaseline/scopedCssBaselineClasses.ts | 2 +- packages/mui-material/src/Select/selectClasses.ts | 2 +- packages/mui-material/src/Skeleton/skeletonClasses.ts | 2 +- packages/mui-material/src/Slider/Slider.js | 2 +- packages/mui-material/src/Snackbar/snackbarClasses.ts | 2 +- .../src/SnackbarContent/snackbarContentClasses.ts | 2 +- packages/mui-material/src/SpeedDial/speedDialClasses.ts | 2 +- .../src/SpeedDialAction/speedDialActionClasses.ts | 2 +- .../mui-material/src/SpeedDialIcon/speedDialIconClasses.ts | 2 +- packages/mui-material/src/Step/stepClasses.ts | 2 +- packages/mui-material/src/StepButton/stepButtonClasses.ts | 2 +- .../mui-material/src/StepConnector/stepConnectorClasses.ts | 2 +- packages/mui-material/src/StepContent/stepContentClasses.ts | 2 +- packages/mui-material/src/StepIcon/stepIconClasses.ts | 2 +- packages/mui-material/src/StepLabel/stepLabelClasses.ts | 2 +- packages/mui-material/src/Stepper/stepperClasses.ts | 2 +- packages/mui-material/src/SvgIcon/svgIconClasses.ts | 2 +- packages/mui-material/src/Switch/switchClasses.ts | 2 +- packages/mui-material/src/Tab/tabClasses.ts | 2 +- .../src/TabScrollButton/tabScrollButtonClasses.ts | 2 +- packages/mui-material/src/Table/tableClasses.ts | 2 +- packages/mui-material/src/TableBody/tableBodyClasses.ts | 2 +- packages/mui-material/src/TableCell/tableCellClasses.ts | 2 +- .../src/TableContainer/tableContainerClasses.ts | 2 +- packages/mui-material/src/TableFooter/tableFooterClasses.ts | 2 +- packages/mui-material/src/TableHead/tableHeadClasses.ts | 2 +- .../src/TablePagination/tablePaginationClasses.ts | 2 +- packages/mui-material/src/TableRow/tableRowClasses.ts | 2 +- .../src/TableSortLabel/tableSortLabelClasses.ts | 2 +- packages/mui-material/src/Tabs/tabsClasses.ts | 2 +- packages/mui-material/src/TextField/textFieldClasses.ts | 2 +- .../mui-material/src/ToggleButton/toggleButtonClasses.ts | 2 +- .../src/ToggleButtonGroup/toggleButtonGroupClasses.ts | 2 +- packages/mui-material/src/Toolbar/toolbarClasses.ts | 2 +- packages/mui-material/src/Tooltip/tooltipClasses.ts | 2 +- packages/mui-material/src/Typography/typographyClasses.ts | 2 +- packages/mui-material/src/Unstable_Grid2/grid2Classes.ts | 2 +- packages/mui-material/src/internal/switchBaseClasses.ts | 2 +- 116 files changed, 120 insertions(+), 126 deletions(-) diff --git a/packages/mui-base/src/index.d.ts b/packages/mui-base/src/index.d.ts index 1f375ba5604c4f..919a597b5a2455 100644 --- a/packages/mui-base/src/index.d.ts +++ b/packages/mui-base/src/index.d.ts @@ -14,12 +14,6 @@ export * from './ClickAwayListener'; export { default as unstable_composeClasses } from './composeClasses'; export * from './composeClasses'; -export { default as generateUtilityClass } from './generateUtilityClass'; -export * from './generateUtilityClass'; - -export { default as generateUtilityClasses } from './generateUtilityClasses'; -export * from './generateUtilityClasses'; - export { default as FormControlUnstyled } from './FormControlUnstyled'; export * from './FormControlUnstyled'; diff --git a/packages/mui-base/src/index.js b/packages/mui-base/src/index.js index ba57b8a3d2362e..a3e6bdf42f476f 100644 --- a/packages/mui-base/src/index.js +++ b/packages/mui-base/src/index.js @@ -12,11 +12,6 @@ export { default as ClickAwayListener } from './ClickAwayListener'; export { default as unstable_composeClasses } from './composeClasses'; -export { default as generateUtilityClass } from './generateUtilityClass'; -export * from './generateUtilityClass'; - -export { default as generateUtilityClasses } from './generateUtilityClasses'; - export { default as FormControlUnstyled } from './FormControlUnstyled'; export * from './FormControlUnstyled'; diff --git a/packages/mui-material/src/Accordion/accordionClasses.ts b/packages/mui-material/src/Accordion/accordionClasses.ts index c5a4c44bc5e6e3..c44fe27a2c2029 100644 --- a/packages/mui-material/src/Accordion/accordionClasses.ts +++ b/packages/mui-material/src/Accordion/accordionClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AccordionClasses { diff --git a/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts b/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts index 824a20fcc3da04..93be7c550e09b7 100644 --- a/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts +++ b/packages/mui-material/src/AccordionActions/accordionActionsClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AccordionActionsClasses { diff --git a/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts b/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts index 9fe5f2dff7d745..183f1a9d43f7ea 100644 --- a/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts +++ b/packages/mui-material/src/AccordionDetails/accordionDetailsClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AccordionDetailsClasses { diff --git a/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts b/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts index 6e016084218edb..38fa03fe47a59a 100644 --- a/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts +++ b/packages/mui-material/src/AccordionSummary/accordionSummaryClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AccordionSummaryClasses { diff --git a/packages/mui-material/src/Alert/alertClasses.ts b/packages/mui-material/src/Alert/alertClasses.ts index 2734982843dd25..a4cabd2161fb67 100644 --- a/packages/mui-material/src/Alert/alertClasses.ts +++ b/packages/mui-material/src/Alert/alertClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AlertClasses { diff --git a/packages/mui-material/src/AlertTitle/alertTitleClasses.ts b/packages/mui-material/src/AlertTitle/alertTitleClasses.ts index 91e548a375f0ca..1230004cca716a 100644 --- a/packages/mui-material/src/AlertTitle/alertTitleClasses.ts +++ b/packages/mui-material/src/AlertTitle/alertTitleClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AlertTitleClasses { diff --git a/packages/mui-material/src/AppBar/appBarClasses.ts b/packages/mui-material/src/AppBar/appBarClasses.ts index a6d0e1d168aacd..95a4a82a5eefff 100644 --- a/packages/mui-material/src/AppBar/appBarClasses.ts +++ b/packages/mui-material/src/AppBar/appBarClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AppBarClasses { diff --git a/packages/mui-material/src/Autocomplete/autocompleteClasses.ts b/packages/mui-material/src/Autocomplete/autocompleteClasses.ts index 531523ccae029c..e0e22b79f667e7 100644 --- a/packages/mui-material/src/Autocomplete/autocompleteClasses.ts +++ b/packages/mui-material/src/Autocomplete/autocompleteClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AutocompleteClasses { diff --git a/packages/mui-material/src/Avatar/avatarClasses.ts b/packages/mui-material/src/Avatar/avatarClasses.ts index 7c6dbc7c69011b..210b23afe2d24f 100644 --- a/packages/mui-material/src/Avatar/avatarClasses.ts +++ b/packages/mui-material/src/Avatar/avatarClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AvatarClasses { diff --git a/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts b/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts index e7b5cf5417d7c2..a7f013c4ea70bf 100644 --- a/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts +++ b/packages/mui-material/src/AvatarGroup/avatarGroupClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface AvatarGroupClasses { diff --git a/packages/mui-material/src/Backdrop/backdropClasses.ts b/packages/mui-material/src/Backdrop/backdropClasses.ts index 2bcecfff38781b..f26d53651e5797 100644 --- a/packages/mui-material/src/Backdrop/backdropClasses.ts +++ b/packages/mui-material/src/Backdrop/backdropClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface BackdropClasses { diff --git a/packages/mui-material/src/Badge/badgeClasses.ts b/packages/mui-material/src/Badge/badgeClasses.ts index 293c2aace4e237..931900650646e0 100644 --- a/packages/mui-material/src/Badge/badgeClasses.ts +++ b/packages/mui-material/src/Badge/badgeClasses.ts @@ -1,5 +1,5 @@ -import generateUtilityClasses from '@mui/base/generateUtilityClasses'; -import generateUtilityClass from '@mui/base/generateUtilityClass'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClass from '../generateUtilityClass'; export interface BadgeClasses { /** Class name applied to the root element. */ diff --git a/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts b/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts index 666f76e553c69d..5f44b2687e96b5 100644 --- a/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts +++ b/packages/mui-material/src/BottomNavigation/bottomNavigationClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface BottomNavigationClasses { diff --git a/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts b/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts index a6ea3a63e63cd2..fc3c1afaca0494 100644 --- a/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts +++ b/packages/mui-material/src/BottomNavigationAction/bottomNavigationActionClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface BottomNavigationActionClasses { diff --git a/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts b/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts index 371f42099ebf8b..ad3e01ed3a9311 100644 --- a/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts +++ b/packages/mui-material/src/Breadcrumbs/breadcrumbsClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface BreadcrumbsClasses { diff --git a/packages/mui-material/src/Button/buttonClasses.ts b/packages/mui-material/src/Button/buttonClasses.ts index 7a675ea05a30e5..0a8635cf5fcfb4 100644 --- a/packages/mui-material/src/Button/buttonClasses.ts +++ b/packages/mui-material/src/Button/buttonClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ButtonClasses { diff --git a/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts b/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts index 8f9c1411ab6b78..9116de5b000867 100644 --- a/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts +++ b/packages/mui-material/src/ButtonBase/buttonBaseClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ButtonBaseClasses { diff --git a/packages/mui-material/src/ButtonBase/touchRippleClasses.ts b/packages/mui-material/src/ButtonBase/touchRippleClasses.ts index f7548df245f9b1..28faffda539623 100644 --- a/packages/mui-material/src/ButtonBase/touchRippleClasses.ts +++ b/packages/mui-material/src/ButtonBase/touchRippleClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TouchRippleClasses { diff --git a/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts b/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts index 8e47091c7aa144..55dec11fdfe720 100644 --- a/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts +++ b/packages/mui-material/src/ButtonGroup/buttonGroupClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ButtonGroupClasses { diff --git a/packages/mui-material/src/Card/cardClasses.ts b/packages/mui-material/src/Card/cardClasses.ts index a3b078185bfd9b..c7ab69ae874aba 100644 --- a/packages/mui-material/src/Card/cardClasses.ts +++ b/packages/mui-material/src/Card/cardClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CardClasses { diff --git a/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts b/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts index d69150bf54a9fb..d40c3d6423f7ce 100644 --- a/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts +++ b/packages/mui-material/src/CardActionArea/cardActionAreaClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CardActionAreaClasses { diff --git a/packages/mui-material/src/CardActions/cardActionsClasses.ts b/packages/mui-material/src/CardActions/cardActionsClasses.ts index 5de770180b8c4b..e873b12f167d33 100644 --- a/packages/mui-material/src/CardActions/cardActionsClasses.ts +++ b/packages/mui-material/src/CardActions/cardActionsClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CardActionsClasses { diff --git a/packages/mui-material/src/CardContent/cardContentClasses.ts b/packages/mui-material/src/CardContent/cardContentClasses.ts index b0d0a22f9a66e3..57ff2c793258a3 100644 --- a/packages/mui-material/src/CardContent/cardContentClasses.ts +++ b/packages/mui-material/src/CardContent/cardContentClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CardContentClasses { diff --git a/packages/mui-material/src/CardHeader/cardHeaderClasses.ts b/packages/mui-material/src/CardHeader/cardHeaderClasses.ts index d5b6194eebf68f..8fcc1ac57a2e09 100644 --- a/packages/mui-material/src/CardHeader/cardHeaderClasses.ts +++ b/packages/mui-material/src/CardHeader/cardHeaderClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CardHeaderClasses { diff --git a/packages/mui-material/src/CardMedia/cardMediaClasses.ts b/packages/mui-material/src/CardMedia/cardMediaClasses.ts index 23cd4b2dd04c90..fb00f8e31216e8 100644 --- a/packages/mui-material/src/CardMedia/cardMediaClasses.ts +++ b/packages/mui-material/src/CardMedia/cardMediaClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CardMediaClasses { diff --git a/packages/mui-material/src/Checkbox/checkboxClasses.ts b/packages/mui-material/src/Checkbox/checkboxClasses.ts index a5df51ab1db2fb..885fd0ae631e66 100644 --- a/packages/mui-material/src/Checkbox/checkboxClasses.ts +++ b/packages/mui-material/src/Checkbox/checkboxClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CheckboxClasses { diff --git a/packages/mui-material/src/Chip/chipClasses.ts b/packages/mui-material/src/Chip/chipClasses.ts index 6c27efe0b13ac5..0c4688ea613475 100644 --- a/packages/mui-material/src/Chip/chipClasses.ts +++ b/packages/mui-material/src/Chip/chipClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ChipClasses { diff --git a/packages/mui-material/src/CircularProgress/circularProgressClasses.ts b/packages/mui-material/src/CircularProgress/circularProgressClasses.ts index 67aaaad9e3c073..fd402bd8ca9e1d 100644 --- a/packages/mui-material/src/CircularProgress/circularProgressClasses.ts +++ b/packages/mui-material/src/CircularProgress/circularProgressClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CircularProgressClasses { diff --git a/packages/mui-material/src/Collapse/collapseClasses.ts b/packages/mui-material/src/Collapse/collapseClasses.ts index 36f684a2c637df..d3f35e59416718 100644 --- a/packages/mui-material/src/Collapse/collapseClasses.ts +++ b/packages/mui-material/src/Collapse/collapseClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface CollapseClasses { diff --git a/packages/mui-material/src/Container/containerClasses.ts b/packages/mui-material/src/Container/containerClasses.ts index 9495334ac58240..fe7003f24b6519 100644 --- a/packages/mui-material/src/Container/containerClasses.ts +++ b/packages/mui-material/src/Container/containerClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; import { ContainerClasses } from '@mui/system'; diff --git a/packages/mui-material/src/Dialog/dialogClasses.ts b/packages/mui-material/src/Dialog/dialogClasses.ts index f59baf0d08da0e..ce2b4d1782c4c6 100644 --- a/packages/mui-material/src/Dialog/dialogClasses.ts +++ b/packages/mui-material/src/Dialog/dialogClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface DialogClasses { diff --git a/packages/mui-material/src/DialogActions/dialogActionsClasses.ts b/packages/mui-material/src/DialogActions/dialogActionsClasses.ts index 7e827e1507a300..e701815578ba03 100644 --- a/packages/mui-material/src/DialogActions/dialogActionsClasses.ts +++ b/packages/mui-material/src/DialogActions/dialogActionsClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface DialogActionsClasses { diff --git a/packages/mui-material/src/DialogContent/dialogContentClasses.ts b/packages/mui-material/src/DialogContent/dialogContentClasses.ts index d377b9cde33635..9942b65aeeb32d 100644 --- a/packages/mui-material/src/DialogContent/dialogContentClasses.ts +++ b/packages/mui-material/src/DialogContent/dialogContentClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface DialogContentClasses { diff --git a/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts b/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts index 30764ca5e33818..7212dc9d22ce2f 100644 --- a/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts +++ b/packages/mui-material/src/DialogContentText/dialogContentTextClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface DialogContentTextClasses { diff --git a/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts b/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts index 4bc0d06f3ebfab..eb13ef883daa26 100644 --- a/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts +++ b/packages/mui-material/src/DialogTitle/dialogTitleClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface DialogTitleClasses { diff --git a/packages/mui-material/src/Divider/dividerClasses.ts b/packages/mui-material/src/Divider/dividerClasses.ts index 3752a21aa8accb..32c2b242f13c23 100644 --- a/packages/mui-material/src/Divider/dividerClasses.ts +++ b/packages/mui-material/src/Divider/dividerClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface DividerClasses { diff --git a/packages/mui-material/src/Drawer/drawerClasses.ts b/packages/mui-material/src/Drawer/drawerClasses.ts index 7eabeba1221c1a..d9a6572f865533 100644 --- a/packages/mui-material/src/Drawer/drawerClasses.ts +++ b/packages/mui-material/src/Drawer/drawerClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface DrawerClasses { diff --git a/packages/mui-material/src/Fab/fabClasses.ts b/packages/mui-material/src/Fab/fabClasses.ts index ed539ebedf235e..3978d7050a0ecd 100644 --- a/packages/mui-material/src/Fab/fabClasses.ts +++ b/packages/mui-material/src/Fab/fabClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface FabClasses { diff --git a/packages/mui-material/src/FilledInput/filledInputClasses.ts b/packages/mui-material/src/FilledInput/filledInputClasses.ts index db34c384c3a500..67ec2bdb879b63 100644 --- a/packages/mui-material/src/FilledInput/filledInputClasses.ts +++ b/packages/mui-material/src/FilledInput/filledInputClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClasses, generateUtilityClass } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClass from '../generateUtilityClass'; import { inputBaseClasses } from '../InputBase'; export interface FilledInputClasses { diff --git a/packages/mui-material/src/FormControl/formControlClasses.ts b/packages/mui-material/src/FormControl/formControlClasses.ts index 6864d52a38ba45..383ab5b23bcac1 100644 --- a/packages/mui-material/src/FormControl/formControlClasses.ts +++ b/packages/mui-material/src/FormControl/formControlClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClasses, generateUtilityClass } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClass from '../generateUtilityClass'; export interface FormControlClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/FormControlLabel/formControlLabelClasses.ts b/packages/mui-material/src/FormControlLabel/formControlLabelClasses.ts index 0015af34bc4f1e..65b25aa6cccaa0 100644 --- a/packages/mui-material/src/FormControlLabel/formControlLabelClasses.ts +++ b/packages/mui-material/src/FormControlLabel/formControlLabelClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClasses, generateUtilityClass } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClass from '../generateUtilityClass'; export interface FormControlLabelClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/FormGroup/formGroupClasses.ts b/packages/mui-material/src/FormGroup/formGroupClasses.ts index f40a0d8069978e..5f819cfb1ea9a8 100644 --- a/packages/mui-material/src/FormGroup/formGroupClasses.ts +++ b/packages/mui-material/src/FormGroup/formGroupClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface FormGroupClasses { diff --git a/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts b/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts index 82f0bd1da2c0ab..63fc30711e2c58 100644 --- a/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts +++ b/packages/mui-material/src/FormHelperText/formHelperTextClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface FormHelperTextClasses { diff --git a/packages/mui-material/src/FormLabel/formLabelClasses.ts b/packages/mui-material/src/FormLabel/formLabelClasses.ts index 4755a4e0dab98e..ef2265d4bc80fa 100644 --- a/packages/mui-material/src/FormLabel/formLabelClasses.ts +++ b/packages/mui-material/src/FormLabel/formLabelClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface FormLabelClasses { diff --git a/packages/mui-material/src/Grid/gridClasses.ts b/packages/mui-material/src/Grid/gridClasses.ts index 62cb63c92dc334..98e24cbc5f0a16 100644 --- a/packages/mui-material/src/Grid/gridClasses.ts +++ b/packages/mui-material/src/Grid/gridClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface GridClasses { diff --git a/packages/mui-material/src/Hidden/hiddenCssClasses.js b/packages/mui-material/src/Hidden/hiddenCssClasses.js index 14815809ae9628..8863d10b19ca82 100644 --- a/packages/mui-material/src/Hidden/hiddenCssClasses.js +++ b/packages/mui-material/src/Hidden/hiddenCssClasses.js @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export function getHiddenCssUtilityClass(slot) { diff --git a/packages/mui-material/src/Icon/iconClasses.ts b/packages/mui-material/src/Icon/iconClasses.ts index 3b048c3529d1cd..6d6380600d1652 100644 --- a/packages/mui-material/src/Icon/iconClasses.ts +++ b/packages/mui-material/src/Icon/iconClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface IconClasses { diff --git a/packages/mui-material/src/IconButton/iconButtonClasses.ts b/packages/mui-material/src/IconButton/iconButtonClasses.ts index 67513295ea410a..21a90e237fb824 100644 --- a/packages/mui-material/src/IconButton/iconButtonClasses.ts +++ b/packages/mui-material/src/IconButton/iconButtonClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface IconButtonClasses { diff --git a/packages/mui-material/src/ImageList/imageListClasses.ts b/packages/mui-material/src/ImageList/imageListClasses.ts index 49a5bb2c8c10e6..2946d6e761a502 100644 --- a/packages/mui-material/src/ImageList/imageListClasses.ts +++ b/packages/mui-material/src/ImageList/imageListClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ImageListClasses { diff --git a/packages/mui-material/src/ImageListItem/imageListItemClasses.ts b/packages/mui-material/src/ImageListItem/imageListItemClasses.ts index d7150d3a30e763..955f01fab5e478 100644 --- a/packages/mui-material/src/ImageListItem/imageListItemClasses.ts +++ b/packages/mui-material/src/ImageListItem/imageListItemClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ImageListItemClasses { diff --git a/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts b/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts index 2d877ecc7984eb..cab414efe5a2e2 100644 --- a/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts +++ b/packages/mui-material/src/ImageListItemBar/imageListItemBarClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ImageListItemBarClasses { diff --git a/packages/mui-material/src/Input/inputClasses.ts b/packages/mui-material/src/Input/inputClasses.ts index 6030aff1edd0f4..bc553344a50e3d 100644 --- a/packages/mui-material/src/Input/inputClasses.ts +++ b/packages/mui-material/src/Input/inputClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClasses, generateUtilityClass } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClass from '../generateUtilityClass'; import { inputBaseClasses } from '../InputBase'; export interface InputClasses { diff --git a/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts b/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts index 4266e809f72114..b25a9dee39525c 100644 --- a/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts +++ b/packages/mui-material/src/InputAdornment/inputAdornmentClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface InputAdornmentClasses { diff --git a/packages/mui-material/src/InputBase/inputBaseClasses.ts b/packages/mui-material/src/InputBase/inputBaseClasses.ts index 9723b5a560e251..b78a951ec63ede 100644 --- a/packages/mui-material/src/InputBase/inputBaseClasses.ts +++ b/packages/mui-material/src/InputBase/inputBaseClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface InputBaseClasses { diff --git a/packages/mui-material/src/InputLabel/inputLabelClasses.ts b/packages/mui-material/src/InputLabel/inputLabelClasses.ts index e55a3ef68d8a83..a49929ce3b79f4 100644 --- a/packages/mui-material/src/InputLabel/inputLabelClasses.ts +++ b/packages/mui-material/src/InputLabel/inputLabelClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface InputLabelClasses { diff --git a/packages/mui-material/src/LinearProgress/linearProgressClasses.ts b/packages/mui-material/src/LinearProgress/linearProgressClasses.ts index 04c1178466b500..11eb79e8a44607 100644 --- a/packages/mui-material/src/LinearProgress/linearProgressClasses.ts +++ b/packages/mui-material/src/LinearProgress/linearProgressClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface LinearProgressClasses { diff --git a/packages/mui-material/src/Link/linkClasses.ts b/packages/mui-material/src/Link/linkClasses.ts index 1b76325587f697..dc2bff1d844853 100644 --- a/packages/mui-material/src/Link/linkClasses.ts +++ b/packages/mui-material/src/Link/linkClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface LinkClasses { diff --git a/packages/mui-material/src/List/listClasses.ts b/packages/mui-material/src/List/listClasses.ts index 7569c0533bc28d..1cf02244605dfa 100644 --- a/packages/mui-material/src/List/listClasses.ts +++ b/packages/mui-material/src/List/listClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListClasses { diff --git a/packages/mui-material/src/ListItem/listItemClasses.ts b/packages/mui-material/src/ListItem/listItemClasses.ts index f4acf89c38763f..0e281a6aafb7f0 100644 --- a/packages/mui-material/src/ListItem/listItemClasses.ts +++ b/packages/mui-material/src/ListItem/listItemClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListItemClasses { diff --git a/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts b/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts index 914155fd523ddc..f528e7b1ddd2ba 100644 --- a/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts +++ b/packages/mui-material/src/ListItemAvatar/listItemAvatarClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListItemAvatarClasses { diff --git a/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts b/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts index 4f2d827d4288d1..e70f645aef4646 100644 --- a/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts +++ b/packages/mui-material/src/ListItemButton/listItemButtonClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListItemButtonClasses { diff --git a/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts b/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts index aa6fdceae1ec8d..8f4e0105d25472 100644 --- a/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts +++ b/packages/mui-material/src/ListItemIcon/listItemIconClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListItemIconClasses { diff --git a/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts b/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts index 6dd809cedd643a..acddf1220741a3 100644 --- a/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts +++ b/packages/mui-material/src/ListItemSecondaryAction/listItemSecondaryActionClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListItemSecondaryActionClasses { diff --git a/packages/mui-material/src/ListItemText/listItemTextClasses.ts b/packages/mui-material/src/ListItemText/listItemTextClasses.ts index 2b11c5a6aa3b64..b4c47a38be8f88 100644 --- a/packages/mui-material/src/ListItemText/listItemTextClasses.ts +++ b/packages/mui-material/src/ListItemText/listItemTextClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListItemTextClasses { diff --git a/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts b/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts index ef9cb08b13b7cf..908966f5d0d709 100644 --- a/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts +++ b/packages/mui-material/src/ListSubheader/listSubheaderClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ListSubheaderClasses { diff --git a/packages/mui-material/src/Menu/menuClasses.ts b/packages/mui-material/src/Menu/menuClasses.ts index 700be2a997b7ce..e863bdae2d0937 100644 --- a/packages/mui-material/src/Menu/menuClasses.ts +++ b/packages/mui-material/src/Menu/menuClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface MenuClasses { diff --git a/packages/mui-material/src/MenuItem/menuItemClasses.ts b/packages/mui-material/src/MenuItem/menuItemClasses.ts index d8184348b76495..673f5f028b2140 100644 --- a/packages/mui-material/src/MenuItem/menuItemClasses.ts +++ b/packages/mui-material/src/MenuItem/menuItemClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface MenuItemClasses { diff --git a/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts b/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts index 1e660b3ff65086..c7cb0290c10d8d 100644 --- a/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts +++ b/packages/mui-material/src/MobileStepper/mobileStepperClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface MobileStepperClasses { diff --git a/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts b/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts index ab4999d59fd0f6..7dae35c59ad08b 100644 --- a/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts +++ b/packages/mui-material/src/NativeSelect/nativeSelectClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface NativeSelectClasses { diff --git a/packages/mui-material/src/OutlinedInput/outlinedInputClasses.ts b/packages/mui-material/src/OutlinedInput/outlinedInputClasses.ts index 30037c8b14e4f8..bc209e29c16627 100644 --- a/packages/mui-material/src/OutlinedInput/outlinedInputClasses.ts +++ b/packages/mui-material/src/OutlinedInput/outlinedInputClasses.ts @@ -1,4 +1,5 @@ -import { generateUtilityClasses, generateUtilityClass } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import generateUtilityClass from '../generateUtilityClass'; import { inputBaseClasses } from '../InputBase'; export interface OutlinedInputClasses { diff --git a/packages/mui-material/src/Pagination/paginationClasses.ts b/packages/mui-material/src/Pagination/paginationClasses.ts index 06a01a0920204d..0d235c03f98640 100644 --- a/packages/mui-material/src/Pagination/paginationClasses.ts +++ b/packages/mui-material/src/Pagination/paginationClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface PaginationClasses { diff --git a/packages/mui-material/src/PaginationItem/paginationItemClasses.ts b/packages/mui-material/src/PaginationItem/paginationItemClasses.ts index 996b1dec881c97..c5cce0f87b1f42 100644 --- a/packages/mui-material/src/PaginationItem/paginationItemClasses.ts +++ b/packages/mui-material/src/PaginationItem/paginationItemClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface PaginationItemClasses { diff --git a/packages/mui-material/src/Paper/paperClasses.ts b/packages/mui-material/src/Paper/paperClasses.ts index 83f069abc704f2..df9edc65a81804 100644 --- a/packages/mui-material/src/Paper/paperClasses.ts +++ b/packages/mui-material/src/Paper/paperClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface PaperClasses { diff --git a/packages/mui-material/src/Popover/popoverClasses.ts b/packages/mui-material/src/Popover/popoverClasses.ts index 85c826316ac88c..9e9b6f92188db9 100644 --- a/packages/mui-material/src/Popover/popoverClasses.ts +++ b/packages/mui-material/src/Popover/popoverClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface PopoverClasses { diff --git a/packages/mui-material/src/Radio/radioClasses.ts b/packages/mui-material/src/Radio/radioClasses.ts index 06accc2d393da2..2d69c7f28760c9 100644 --- a/packages/mui-material/src/Radio/radioClasses.ts +++ b/packages/mui-material/src/Radio/radioClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface RadioClasses { diff --git a/packages/mui-material/src/Rating/ratingClasses.ts b/packages/mui-material/src/Rating/ratingClasses.ts index 4d88214095155d..d49e83643146a3 100644 --- a/packages/mui-material/src/Rating/ratingClasses.ts +++ b/packages/mui-material/src/Rating/ratingClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface RatingClasses { diff --git a/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts b/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts index 98c3de561d3d41..f25edb8d9dc026 100644 --- a/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts +++ b/packages/mui-material/src/ScopedCssBaseline/scopedCssBaselineClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ScopedCssBaselineClasses { diff --git a/packages/mui-material/src/Select/selectClasses.ts b/packages/mui-material/src/Select/selectClasses.ts index d935bcc55b75f6..718cd4e34a5474 100644 --- a/packages/mui-material/src/Select/selectClasses.ts +++ b/packages/mui-material/src/Select/selectClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SelectClasses { diff --git a/packages/mui-material/src/Skeleton/skeletonClasses.ts b/packages/mui-material/src/Skeleton/skeletonClasses.ts index 72981cb41aa760..b57813f9d176b3 100644 --- a/packages/mui-material/src/Skeleton/skeletonClasses.ts +++ b/packages/mui-material/src/Skeleton/skeletonClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SkeletonClasses { diff --git a/packages/mui-material/src/Slider/Slider.js b/packages/mui-material/src/Slider/Slider.js index 9accffdf00a555..254dcb26a33d2e 100644 --- a/packages/mui-material/src/Slider/Slider.js +++ b/packages/mui-material/src/Slider/Slider.js @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; import { chainPropTypes } from '@mui/utils'; -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import SliderUnstyled, { SliderValueLabelUnstyled, sliderUnstyledClasses, diff --git a/packages/mui-material/src/Snackbar/snackbarClasses.ts b/packages/mui-material/src/Snackbar/snackbarClasses.ts index fa06da4b260a18..856f951ca2604d 100644 --- a/packages/mui-material/src/Snackbar/snackbarClasses.ts +++ b/packages/mui-material/src/Snackbar/snackbarClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SnackbarClasses { diff --git a/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts b/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts index dfbcc4ff3c019f..0c383afc0c27f6 100644 --- a/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts +++ b/packages/mui-material/src/SnackbarContent/snackbarContentClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SnackbarContentClasses { diff --git a/packages/mui-material/src/SpeedDial/speedDialClasses.ts b/packages/mui-material/src/SpeedDial/speedDialClasses.ts index b16dd1bf6af53f..bf2a71ada4942a 100644 --- a/packages/mui-material/src/SpeedDial/speedDialClasses.ts +++ b/packages/mui-material/src/SpeedDial/speedDialClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SpeedDialClasses { diff --git a/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts b/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts index 6d0af7ab5ab830..b25848998ac2c4 100644 --- a/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts +++ b/packages/mui-material/src/SpeedDialAction/speedDialActionClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SpeedDialActionClasses { diff --git a/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts b/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts index 6030071f1d46ee..b0bb324441b886 100644 --- a/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts +++ b/packages/mui-material/src/SpeedDialIcon/speedDialIconClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SpeedDialIconClasses { diff --git a/packages/mui-material/src/Step/stepClasses.ts b/packages/mui-material/src/Step/stepClasses.ts index 1b3bd866072e66..bdce180e2d9c2a 100644 --- a/packages/mui-material/src/Step/stepClasses.ts +++ b/packages/mui-material/src/Step/stepClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface StepClasses { diff --git a/packages/mui-material/src/StepButton/stepButtonClasses.ts b/packages/mui-material/src/StepButton/stepButtonClasses.ts index c4e1bb5dea1e36..33769f571a5d89 100644 --- a/packages/mui-material/src/StepButton/stepButtonClasses.ts +++ b/packages/mui-material/src/StepButton/stepButtonClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface StepButtonClasses { diff --git a/packages/mui-material/src/StepConnector/stepConnectorClasses.ts b/packages/mui-material/src/StepConnector/stepConnectorClasses.ts index b6d76e89791477..702ec2db5ffb77 100644 --- a/packages/mui-material/src/StepConnector/stepConnectorClasses.ts +++ b/packages/mui-material/src/StepConnector/stepConnectorClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface StepConnectorClasses { diff --git a/packages/mui-material/src/StepContent/stepContentClasses.ts b/packages/mui-material/src/StepContent/stepContentClasses.ts index fbc4cc974b91e0..8a8298d90fd2d4 100644 --- a/packages/mui-material/src/StepContent/stepContentClasses.ts +++ b/packages/mui-material/src/StepContent/stepContentClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface StepContentClasses { diff --git a/packages/mui-material/src/StepIcon/stepIconClasses.ts b/packages/mui-material/src/StepIcon/stepIconClasses.ts index 8f82a75938d442..d36d8262a7437a 100644 --- a/packages/mui-material/src/StepIcon/stepIconClasses.ts +++ b/packages/mui-material/src/StepIcon/stepIconClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface StepIconClasses { diff --git a/packages/mui-material/src/StepLabel/stepLabelClasses.ts b/packages/mui-material/src/StepLabel/stepLabelClasses.ts index 44a05bcacb98d1..6bb844167f665b 100644 --- a/packages/mui-material/src/StepLabel/stepLabelClasses.ts +++ b/packages/mui-material/src/StepLabel/stepLabelClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface StepLabelClasses { diff --git a/packages/mui-material/src/Stepper/stepperClasses.ts b/packages/mui-material/src/Stepper/stepperClasses.ts index 4166edebda19e9..bcad97a9a9019d 100644 --- a/packages/mui-material/src/Stepper/stepperClasses.ts +++ b/packages/mui-material/src/Stepper/stepperClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface StepperClasses { diff --git a/packages/mui-material/src/SvgIcon/svgIconClasses.ts b/packages/mui-material/src/SvgIcon/svgIconClasses.ts index d8cc4e78ecf5a5..0db8a1ac91a2a5 100644 --- a/packages/mui-material/src/SvgIcon/svgIconClasses.ts +++ b/packages/mui-material/src/SvgIcon/svgIconClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SvgIconClasses { diff --git a/packages/mui-material/src/Switch/switchClasses.ts b/packages/mui-material/src/Switch/switchClasses.ts index b8c7a675c0e5d4..ebbd403c09ef98 100644 --- a/packages/mui-material/src/Switch/switchClasses.ts +++ b/packages/mui-material/src/Switch/switchClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SwitchClasses { diff --git a/packages/mui-material/src/Tab/tabClasses.ts b/packages/mui-material/src/Tab/tabClasses.ts index 95954d86978861..8256d2d799f388 100644 --- a/packages/mui-material/src/Tab/tabClasses.ts +++ b/packages/mui-material/src/Tab/tabClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TabClasses { diff --git a/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts b/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts index ea8d7ab63e6074..ec5680c54069dc 100644 --- a/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts +++ b/packages/mui-material/src/TabScrollButton/tabScrollButtonClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TabScrollButtonClasses { diff --git a/packages/mui-material/src/Table/tableClasses.ts b/packages/mui-material/src/Table/tableClasses.ts index 4278108a0019b6..f752c0e251befe 100644 --- a/packages/mui-material/src/Table/tableClasses.ts +++ b/packages/mui-material/src/Table/tableClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableClasses { diff --git a/packages/mui-material/src/TableBody/tableBodyClasses.ts b/packages/mui-material/src/TableBody/tableBodyClasses.ts index 1aa025e00f22b1..c4854348fd8ba3 100644 --- a/packages/mui-material/src/TableBody/tableBodyClasses.ts +++ b/packages/mui-material/src/TableBody/tableBodyClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableBodyClasses { diff --git a/packages/mui-material/src/TableCell/tableCellClasses.ts b/packages/mui-material/src/TableCell/tableCellClasses.ts index 7a676b6be23f5c..f4c9f07452e5fd 100644 --- a/packages/mui-material/src/TableCell/tableCellClasses.ts +++ b/packages/mui-material/src/TableCell/tableCellClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableCellClasses { diff --git a/packages/mui-material/src/TableContainer/tableContainerClasses.ts b/packages/mui-material/src/TableContainer/tableContainerClasses.ts index 4ceec0e008395d..4adcfb49087f2e 100644 --- a/packages/mui-material/src/TableContainer/tableContainerClasses.ts +++ b/packages/mui-material/src/TableContainer/tableContainerClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableContainerClasses { diff --git a/packages/mui-material/src/TableFooter/tableFooterClasses.ts b/packages/mui-material/src/TableFooter/tableFooterClasses.ts index ac37425380faed..610ae98c4c4265 100644 --- a/packages/mui-material/src/TableFooter/tableFooterClasses.ts +++ b/packages/mui-material/src/TableFooter/tableFooterClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableFooterClasses { diff --git a/packages/mui-material/src/TableHead/tableHeadClasses.ts b/packages/mui-material/src/TableHead/tableHeadClasses.ts index 260fdc870468cc..ec1eed281b93bb 100644 --- a/packages/mui-material/src/TableHead/tableHeadClasses.ts +++ b/packages/mui-material/src/TableHead/tableHeadClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableHeadClasses { diff --git a/packages/mui-material/src/TablePagination/tablePaginationClasses.ts b/packages/mui-material/src/TablePagination/tablePaginationClasses.ts index f73bc1a551ad34..9eff0e4a60e60c 100644 --- a/packages/mui-material/src/TablePagination/tablePaginationClasses.ts +++ b/packages/mui-material/src/TablePagination/tablePaginationClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TablePaginationClasses { diff --git a/packages/mui-material/src/TableRow/tableRowClasses.ts b/packages/mui-material/src/TableRow/tableRowClasses.ts index 88c51f250f533b..cb124f14f6bfee 100644 --- a/packages/mui-material/src/TableRow/tableRowClasses.ts +++ b/packages/mui-material/src/TableRow/tableRowClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableRowClasses { diff --git a/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts b/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts index 9b9ac4e7477bef..eb7341bf3659b9 100644 --- a/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts +++ b/packages/mui-material/src/TableSortLabel/tableSortLabelClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TableSortLabelClasses { diff --git a/packages/mui-material/src/Tabs/tabsClasses.ts b/packages/mui-material/src/Tabs/tabsClasses.ts index badc5400d2435a..737875c2d42f79 100644 --- a/packages/mui-material/src/Tabs/tabsClasses.ts +++ b/packages/mui-material/src/Tabs/tabsClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TabsClasses { diff --git a/packages/mui-material/src/TextField/textFieldClasses.ts b/packages/mui-material/src/TextField/textFieldClasses.ts index e4e10f1c1bc5f8..b3222e631ddb05 100644 --- a/packages/mui-material/src/TextField/textFieldClasses.ts +++ b/packages/mui-material/src/TextField/textFieldClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TextFieldClasses { diff --git a/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts b/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts index 6a97404baeccba..6ef6c053a1ecc6 100644 --- a/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts +++ b/packages/mui-material/src/ToggleButton/toggleButtonClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ToggleButtonClasses { diff --git a/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts b/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts index 130a330652e0be..c14fdf8c15c818 100644 --- a/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts +++ b/packages/mui-material/src/ToggleButtonGroup/toggleButtonGroupClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ToggleButtonGroupClasses { diff --git a/packages/mui-material/src/Toolbar/toolbarClasses.ts b/packages/mui-material/src/Toolbar/toolbarClasses.ts index 6c8ad19e60dc3d..6f5e523fc61d03 100644 --- a/packages/mui-material/src/Toolbar/toolbarClasses.ts +++ b/packages/mui-material/src/Toolbar/toolbarClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface ToolbarClasses { diff --git a/packages/mui-material/src/Tooltip/tooltipClasses.ts b/packages/mui-material/src/Tooltip/tooltipClasses.ts index 39f9926d41a824..733ca74b2651e6 100644 --- a/packages/mui-material/src/Tooltip/tooltipClasses.ts +++ b/packages/mui-material/src/Tooltip/tooltipClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TooltipClasses { diff --git a/packages/mui-material/src/Typography/typographyClasses.ts b/packages/mui-material/src/Typography/typographyClasses.ts index 9468c820ca55aa..a0258415a33830 100644 --- a/packages/mui-material/src/Typography/typographyClasses.ts +++ b/packages/mui-material/src/Typography/typographyClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface TypographyClasses { diff --git a/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts b/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts index ef6ac488395784..388c31df3777e7 100644 --- a/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts +++ b/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; import { GridClasses } from '@mui/system/Unstable_Grid'; diff --git a/packages/mui-material/src/internal/switchBaseClasses.ts b/packages/mui-material/src/internal/switchBaseClasses.ts index d03ec06ce1ca0b..1062b29b2bbeba 100644 --- a/packages/mui-material/src/internal/switchBaseClasses.ts +++ b/packages/mui-material/src/internal/switchBaseClasses.ts @@ -1,4 +1,4 @@ -import { generateUtilityClasses } from '@mui/base'; +import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; export interface SwitchBaseClasses { From 35010b040f42ce6d6dea6aa54a06f89922bea12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 12:41:25 +0200 Subject: [PATCH 06/14] Fix TS errors --- packages/mui-joy/src/Breadcrumbs/breadcrumbsClasses.ts | 5 ++++- packages/mui-joy/src/Grid/gridClasses.ts | 5 ++++- packages/mui-joy/src/styles/components.d.ts | 2 +- packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts | 5 ++++- packages/mui-lab/src/Masonry/masonryClasses.ts | 5 ++++- packages/mui-lab/src/TabPanel/tabPanelClasses.ts | 5 ++++- packages/mui-lab/src/Timeline/timelineClasses.ts | 5 ++++- .../src/TimelineConnector/timelineConnectorClasses.ts | 5 ++++- .../mui-lab/src/TimelineContent/timelineContentClasses.ts | 5 ++++- packages/mui-lab/src/TimelineDot/timelineDotClasses.ts | 5 ++++- packages/mui-lab/src/TimelineItem/timelineItemClasses.ts | 5 ++++- .../timelineOppositeContentClasses.ts | 5 ++++- .../src/TimelineSeparator/timelineSeparatorClasses.ts | 5 ++++- packages/mui-lab/src/TreeItem/treeItemClasses.ts | 5 ++++- packages/mui-lab/src/TreeView/treeViewClasses.ts | 5 ++++- packages/mui-material-next/src/Button/buttonClasses.ts | 5 ++++- packages/mui-material-next/src/Button/touchRippleClasses.ts | 5 ++++- packages/mui-material-next/src/Input/inputClasses.ts | 5 ++++- packages/mui-material-next/src/Tab/tabClasses.ts | 5 ++++- .../src/TabScrollButton/tabScrollButtonClasses.ts | 5 ++++- .../src/TablePagination/tablePaginationClasses.ts | 5 ++++- packages/mui-material-next/src/Tabs/tabsClasses.ts | 5 ++++- 22 files changed, 85 insertions(+), 22 deletions(-) diff --git a/packages/mui-joy/src/Breadcrumbs/breadcrumbsClasses.ts b/packages/mui-joy/src/Breadcrumbs/breadcrumbsClasses.ts index 2d00e1149dcc7e..3d26ebc8734b5f 100644 --- a/packages/mui-joy/src/Breadcrumbs/breadcrumbsClasses.ts +++ b/packages/mui-joy/src/Breadcrumbs/breadcrumbsClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface BreadcrumbsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-joy/src/Grid/gridClasses.ts b/packages/mui-joy/src/Grid/gridClasses.ts index 07d876b50a414e..709a01c33bd7cd 100644 --- a/packages/mui-joy/src/Grid/gridClasses.ts +++ b/packages/mui-joy/src/Grid/gridClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; import { GridClasses } from '@mui/system/Unstable_Grid'; export type GridClassKey = keyof GridClasses; diff --git a/packages/mui-joy/src/styles/components.d.ts b/packages/mui-joy/src/styles/components.d.ts index 6b929fc16a3d4b..f021c952d4e5c9 100644 --- a/packages/mui-joy/src/styles/components.d.ts +++ b/packages/mui-joy/src/styles/components.d.ts @@ -1,4 +1,4 @@ -import { GlobalStateSlot } from '@mui/base'; +import { GlobalStateSlot } from '@mui/utils'; import { CSSInterpolation } from '@mui/system'; import { AspectRatioProps, diff --git a/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts b/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts index 0b7aa41d9a778c..dbf648bfcec50a 100644 --- a/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts +++ b/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface LoadingButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/Masonry/masonryClasses.ts b/packages/mui-lab/src/Masonry/masonryClasses.ts index 73f0843fbcd136..ac2bc0b5c32e27 100644 --- a/packages/mui-lab/src/Masonry/masonryClasses.ts +++ b/packages/mui-lab/src/Masonry/masonryClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface MasonryClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TabPanel/tabPanelClasses.ts b/packages/mui-lab/src/TabPanel/tabPanelClasses.ts index 6bdd526cf93c64..f93fb484b6e91e 100644 --- a/packages/mui-lab/src/TabPanel/tabPanelClasses.ts +++ b/packages/mui-lab/src/TabPanel/tabPanelClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TabPanelClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/Timeline/timelineClasses.ts b/packages/mui-lab/src/Timeline/timelineClasses.ts index 446241550ab509..b2107db2cd0dd3 100644 --- a/packages/mui-lab/src/Timeline/timelineClasses.ts +++ b/packages/mui-lab/src/Timeline/timelineClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export function getTimelineUtilityClass(slot: string) { return generateUtilityClass('MuiTimeline', slot); diff --git a/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts b/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts index 28b3d9bccd1bf7..49e579f15da9f0 100644 --- a/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts +++ b/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TimelineConnectorClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts b/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts index c5a7dfcf2fc526..ee1e1ff9aa9817 100644 --- a/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts +++ b/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TimelineContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts b/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts index ab0fab992122cd..03ffffb3d876e9 100644 --- a/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts +++ b/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TimelineDotClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts b/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts index fb0f1f6afe52c7..ae7a931024798e 100644 --- a/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts +++ b/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TimelineItemClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts b/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts index a206aba360b6b3..b404733bfbcbc4 100644 --- a/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts +++ b/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TimelineOppositeContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts b/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts index 5c75d17fe85bb7..3c2276e0c15941 100644 --- a/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts +++ b/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TimelineSeparatorClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TreeItem/treeItemClasses.ts b/packages/mui-lab/src/TreeItem/treeItemClasses.ts index c06ed73dcd5ab3..86da2504e2eca4 100644 --- a/packages/mui-lab/src/TreeItem/treeItemClasses.ts +++ b/packages/mui-lab/src/TreeItem/treeItemClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TreeItemClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TreeView/treeViewClasses.ts b/packages/mui-lab/src/TreeView/treeViewClasses.ts index 040a485e8cb23c..6a00ad141f3bff 100644 --- a/packages/mui-lab/src/TreeView/treeViewClasses.ts +++ b/packages/mui-lab/src/TreeView/treeViewClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TreeViewClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Button/buttonClasses.ts b/packages/mui-material-next/src/Button/buttonClasses.ts index 11e0c9504aadcd..80bb1fd0e7f68c 100644 --- a/packages/mui-material-next/src/Button/buttonClasses.ts +++ b/packages/mui-material-next/src/Button/buttonClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface ButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Button/touchRippleClasses.ts b/packages/mui-material-next/src/Button/touchRippleClasses.ts index f6e6e03bea80cc..76943ff1a63042 100644 --- a/packages/mui-material-next/src/Button/touchRippleClasses.ts +++ b/packages/mui-material-next/src/Button/touchRippleClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TouchRippleClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Input/inputClasses.ts b/packages/mui-material-next/src/Input/inputClasses.ts index ba4e53cb04ecd3..5fe848ed15c40a 100644 --- a/packages/mui-material-next/src/Input/inputClasses.ts +++ b/packages/mui-material-next/src/Input/inputClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClasses, generateUtilityClass } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface InputClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Tab/tabClasses.ts b/packages/mui-material-next/src/Tab/tabClasses.ts index cadef4fc5dc6e5..b87f22d95c7367 100644 --- a/packages/mui-material-next/src/Tab/tabClasses.ts +++ b/packages/mui-material-next/src/Tab/tabClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TabClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts b/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts index 2e092c59233bdd..76a33832a6a6b4 100644 --- a/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts +++ b/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TabScrollButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts b/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts index 433ab01452fc70..b27e95877d038f 100644 --- a/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts +++ b/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TablePaginationClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Tabs/tabsClasses.ts b/packages/mui-material-next/src/Tabs/tabsClasses.ts index 7f6716837e5121..096e10a63a3521 100644 --- a/packages/mui-material-next/src/Tabs/tabsClasses.ts +++ b/packages/mui-material-next/src/Tabs/tabsClasses.ts @@ -1,4 +1,7 @@ -import { generateUtilityClass, generateUtilityClasses } from '@mui/base'; +import { + unstable_generateUtilityClass as generateUtilityClass, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; export interface TabsClasses { /** Styles applied to the root element. */ From 4166ffbadd2215b26435de02d0e408330beae372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 13:00:43 +0200 Subject: [PATCH 07/14] Fix tests --- packages/mui-material/src/styles/createTheme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-material/src/styles/createTheme.js b/packages/mui-material/src/styles/createTheme.js index b3bf654cd483f5..18f999af86aeca 100644 --- a/packages/mui-material/src/styles/createTheme.js +++ b/packages/mui-material/src/styles/createTheme.js @@ -1,7 +1,7 @@ import { deepmerge } from '@mui/utils'; -import { generateUtilityClass } from '@mui/base'; import { createTheme as systemCreateTheme } from '@mui/system'; import MuiError from '@mui/utils/macros/MuiError.macro'; +import generateUtilityClass from '../generateUtilityClass'; import createMixins from './createMixins'; import createPalette from './createPalette'; import createTypography from './createTypography'; From 1d9dedd21500b4cc9d08e1598887c750bd7b41c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 13:23:02 +0200 Subject: [PATCH 08/14] Fix lint errors --- packages/mui-material/src/Container/containerClasses.ts | 2 +- packages/mui-material/src/Slider/Slider.js | 6 ++++-- packages/mui-material/src/Unstable_Grid2/grid2Classes.ts | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/mui-material/src/Container/containerClasses.ts b/packages/mui-material/src/Container/containerClasses.ts index fe7003f24b6519..addd887c9ef4a3 100644 --- a/packages/mui-material/src/Container/containerClasses.ts +++ b/packages/mui-material/src/Container/containerClasses.ts @@ -1,6 +1,6 @@ +import { ContainerClasses } from '@mui/system'; import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; -import { ContainerClasses } from '@mui/system'; export type { ContainerClassKey } from '@mui/system'; export type { ContainerClasses }; diff --git a/packages/mui-material/src/Slider/Slider.js b/packages/mui-material/src/Slider/Slider.js index 254dcb26a33d2e..37e95f9d82dfcc 100644 --- a/packages/mui-material/src/Slider/Slider.js +++ b/packages/mui-material/src/Slider/Slider.js @@ -1,8 +1,10 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { chainPropTypes } from '@mui/utils'; -import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +import { + chainPropTypes, + unstable_generateUtilityClasses as generateUtilityClasses, +} from '@mui/utils'; import SliderUnstyled, { SliderValueLabelUnstyled, sliderUnstyledClasses, diff --git a/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts b/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts index 388c31df3777e7..962a0717206b72 100644 --- a/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts +++ b/packages/mui-material/src/Unstable_Grid2/grid2Classes.ts @@ -1,6 +1,6 @@ +import { GridClasses } from '@mui/system/Unstable_Grid'; import { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; import generateUtilityClass from '../generateUtilityClass'; -import { GridClasses } from '@mui/system/Unstable_Grid'; export type Grid2ClassKey = keyof GridClasses; From f683f20f482afe26b568cd15a26b292a849068e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 13:29:12 +0200 Subject: [PATCH 09/14] Fix API docs generation --- docs/scripts/ApiBuilders/ComponentApiBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scripts/ApiBuilders/ComponentApiBuilder.ts b/docs/scripts/ApiBuilders/ComponentApiBuilder.ts index 3c84e154eb8e11..dfc965bebdd0d1 100644 --- a/docs/scripts/ApiBuilders/ComponentApiBuilder.ts +++ b/docs/scripts/ApiBuilders/ComponentApiBuilder.ts @@ -9,6 +9,7 @@ import * as prettier from 'prettier'; import remark from 'remark'; import remarkVisit from 'unist-util-visit'; import { defaultHandlers, parse as docgenParse, ReactDocgenApi } from 'react-docgen'; +import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; import muiDefaultPropsHandler from 'docs/src/modules/utils/defaultPropsHandler'; import { LANGUAGES } from 'docs/src/modules/constants'; import parseTest from 'docs/src/modules/utils/parseTest'; @@ -21,7 +22,6 @@ import createDescribeableProp, { } from 'docs/src/modules/utils/createDescribeableProp'; import generatePropDescription from 'docs/src/modules/utils/generatePropDescription'; import parseStyles, { Styles } from 'docs/src/modules/utils/parseStyles'; -import generateUtilityClass from '@mui/base/generateUtilityClass'; import * as ttp from 'typescript-to-proptypes'; import { getUnstyledFilename } from '../helpers'; import { ComponentInfo } from '../buildApiUtils'; From c7d5d975a9eafc367ea417e38d430fdf5589f171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Fri, 16 Sep 2022 13:29:36 +0200 Subject: [PATCH 10/14] Do not reexport Base's generateUtilityClass from Material UI --- packages/mui-material/src/index.d.ts | 6 +++--- packages/mui-material/src/index.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/mui-material/src/index.d.ts b/packages/mui-material/src/index.d.ts index 3d21ac2d8bbaee..143204a616269c 100644 --- a/packages/mui-material/src/index.d.ts +++ b/packages/mui-material/src/index.d.ts @@ -483,7 +483,7 @@ export { StyledEngineProvider } from './styles'; export { default as unstable_composeClasses } from '@mui/base/composeClasses'; -export { default as generateUtilityClass } from '@mui/base/generateUtilityClass'; -export * from '@mui/base/generateUtilityClass'; +export { default as generateUtilityClass } from './generateUtilityClass'; +export * from './generateUtilityClass'; -export { default as generateUtilityClasses } from '@mui/base/generateUtilityClasses'; +export { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; diff --git a/packages/mui-material/src/index.js b/packages/mui-material/src/index.js index 1aaf78d619f603..7b33a4dd3e8a49 100644 --- a/packages/mui-material/src/index.js +++ b/packages/mui-material/src/index.js @@ -412,7 +412,7 @@ export { StyledEngineProvider } from './styles'; export { default as unstable_composeClasses } from '@mui/base/composeClasses'; -export { default as generateUtilityClass } from '@mui/base/generateUtilityClass'; -export * from '@mui/base/generateUtilityClass'; +export { default as generateUtilityClass } from './generateUtilityClass'; +export * from './generateUtilityClass'; -export { default as generateUtilityClasses } from '@mui/base/generateUtilityClasses'; +export { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; From aa63bbb5291ff85084a027605f42c9e22d7f7590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Mon, 19 Sep 2022 12:57:21 +0200 Subject: [PATCH 11/14] Change product classes to Mui-product --- packages/mui-base/src/generateUtilityClass/index.ts | 2 +- packages/mui-material/src/generateUtilityClass/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mui-base/src/generateUtilityClass/index.ts b/packages/mui-base/src/generateUtilityClass/index.ts index c22d1d1053576d..7b8d3034f6ef49 100644 --- a/packages/mui-base/src/generateUtilityClass/index.ts +++ b/packages/mui-base/src/generateUtilityClass/index.ts @@ -1,7 +1,7 @@ import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; export type { GlobalStateSlot } from '@mui/utils'; -export const ProductClass = 'Mui-Base'; +export const ProductClass = 'Mui-base'; export default function generateBaseUtilityClass( componentName: string, diff --git a/packages/mui-material/src/generateUtilityClass/index.ts b/packages/mui-material/src/generateUtilityClass/index.ts index 2a951ddb2045a4..ac3121c8ec3601 100644 --- a/packages/mui-material/src/generateUtilityClass/index.ts +++ b/packages/mui-material/src/generateUtilityClass/index.ts @@ -1,7 +1,7 @@ import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; export type { GlobalStateSlot } from '@mui/utils'; -export const ProductClass = 'Mui-MaterialUI'; +export const ProductClass = 'Mui-material'; export default function generateBaseUtilityClass( componentName: string, From 895a8823d116de0523faa9fe62be25a3428b64c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Mon, 19 Sep 2022 16:25:32 +0200 Subject: [PATCH 12/14] Use @mui/material generateUtilityClass in lab and material-next --- packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts | 6 ++---- packages/mui-lab/src/Masonry/masonryClasses.ts | 6 ++---- packages/mui-lab/src/TabPanel/tabPanelClasses.ts | 6 ++---- packages/mui-lab/src/Timeline/timelineClasses.ts | 6 ++---- .../src/TimelineConnector/timelineConnectorClasses.ts | 6 ++---- .../mui-lab/src/TimelineContent/timelineContentClasses.ts | 6 ++---- packages/mui-lab/src/TimelineDot/timelineDotClasses.ts | 6 ++---- packages/mui-lab/src/TimelineItem/timelineItemClasses.ts | 6 ++---- .../timelineOppositeContentClasses.ts | 6 ++---- .../src/TimelineSeparator/timelineSeparatorClasses.ts | 6 ++---- packages/mui-lab/src/TreeItem/treeItemClasses.ts | 6 ++---- packages/mui-lab/src/TreeView/treeViewClasses.ts | 6 ++---- packages/mui-material-next/src/Button/buttonClasses.ts | 6 ++---- packages/mui-material-next/src/Button/touchRippleClasses.ts | 6 ++---- packages/mui-material-next/src/Input/inputClasses.ts | 6 ++---- packages/mui-material-next/src/Tab/tabClasses.ts | 6 ++---- .../src/TabScrollButton/tabScrollButtonClasses.ts | 6 ++---- .../src/TablePagination/tablePaginationClasses.ts | 6 ++---- packages/mui-material-next/src/Tabs/tabsClasses.ts | 6 ++---- packages/mui-material/src/generateUtilityClasses/index.ts | 1 + packages/mui-material/src/index.d.ts | 2 +- packages/mui-material/src/index.js | 2 +- 22 files changed, 41 insertions(+), 78 deletions(-) create mode 100644 packages/mui-material/src/generateUtilityClasses/index.ts diff --git a/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts b/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts index dbf648bfcec50a..f3139944a96eef 100644 --- a/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts +++ b/packages/mui-lab/src/LoadingButton/loadingButtonClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface LoadingButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/Masonry/masonryClasses.ts b/packages/mui-lab/src/Masonry/masonryClasses.ts index ac2bc0b5c32e27..63ce2d86327aaa 100644 --- a/packages/mui-lab/src/Masonry/masonryClasses.ts +++ b/packages/mui-lab/src/Masonry/masonryClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface MasonryClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TabPanel/tabPanelClasses.ts b/packages/mui-lab/src/TabPanel/tabPanelClasses.ts index f93fb484b6e91e..ff7aecfe3a9919 100644 --- a/packages/mui-lab/src/TabPanel/tabPanelClasses.ts +++ b/packages/mui-lab/src/TabPanel/tabPanelClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TabPanelClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/Timeline/timelineClasses.ts b/packages/mui-lab/src/Timeline/timelineClasses.ts index b2107db2cd0dd3..bcabb3ce62a6a8 100644 --- a/packages/mui-lab/src/Timeline/timelineClasses.ts +++ b/packages/mui-lab/src/Timeline/timelineClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export function getTimelineUtilityClass(slot: string) { return generateUtilityClass('MuiTimeline', slot); diff --git a/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts b/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts index 49e579f15da9f0..8eb528b173a4f0 100644 --- a/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts +++ b/packages/mui-lab/src/TimelineConnector/timelineConnectorClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TimelineConnectorClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts b/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts index ee1e1ff9aa9817..d343dd828227f8 100644 --- a/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts +++ b/packages/mui-lab/src/TimelineContent/timelineContentClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TimelineContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts b/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts index 03ffffb3d876e9..69bd855d10e1ab 100644 --- a/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts +++ b/packages/mui-lab/src/TimelineDot/timelineDotClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TimelineDotClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts b/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts index ae7a931024798e..903f58879cf2ac 100644 --- a/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts +++ b/packages/mui-lab/src/TimelineItem/timelineItemClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TimelineItemClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts b/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts index b404733bfbcbc4..edf2a803eab0df 100644 --- a/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts +++ b/packages/mui-lab/src/TimelineOppositeContent/timelineOppositeContentClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TimelineOppositeContentClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts b/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts index 3c2276e0c15941..349aeae42bfc43 100644 --- a/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts +++ b/packages/mui-lab/src/TimelineSeparator/timelineSeparatorClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TimelineSeparatorClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TreeItem/treeItemClasses.ts b/packages/mui-lab/src/TreeItem/treeItemClasses.ts index 86da2504e2eca4..368a888384af45 100644 --- a/packages/mui-lab/src/TreeItem/treeItemClasses.ts +++ b/packages/mui-lab/src/TreeItem/treeItemClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TreeItemClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-lab/src/TreeView/treeViewClasses.ts b/packages/mui-lab/src/TreeView/treeViewClasses.ts index 6a00ad141f3bff..dfaee08490bd4f 100644 --- a/packages/mui-lab/src/TreeView/treeViewClasses.ts +++ b/packages/mui-lab/src/TreeView/treeViewClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TreeViewClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Button/buttonClasses.ts b/packages/mui-material-next/src/Button/buttonClasses.ts index 80bb1fd0e7f68c..72aa7d02cb9143 100644 --- a/packages/mui-material-next/src/Button/buttonClasses.ts +++ b/packages/mui-material-next/src/Button/buttonClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface ButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Button/touchRippleClasses.ts b/packages/mui-material-next/src/Button/touchRippleClasses.ts index 76943ff1a63042..7975f4f7dd036c 100644 --- a/packages/mui-material-next/src/Button/touchRippleClasses.ts +++ b/packages/mui-material-next/src/Button/touchRippleClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TouchRippleClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Input/inputClasses.ts b/packages/mui-material-next/src/Input/inputClasses.ts index 5fe848ed15c40a..012a06a57bcf25 100644 --- a/packages/mui-material-next/src/Input/inputClasses.ts +++ b/packages/mui-material-next/src/Input/inputClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface InputClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Tab/tabClasses.ts b/packages/mui-material-next/src/Tab/tabClasses.ts index b87f22d95c7367..d9beb25caeef7a 100644 --- a/packages/mui-material-next/src/Tab/tabClasses.ts +++ b/packages/mui-material-next/src/Tab/tabClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TabClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts b/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts index 76a33832a6a6b4..d503c99d83c9b2 100644 --- a/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts +++ b/packages/mui-material-next/src/TabScrollButton/tabScrollButtonClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TabScrollButtonClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts b/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts index b27e95877d038f..a8243f70c3f7d8 100644 --- a/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts +++ b/packages/mui-material-next/src/TablePagination/tablePaginationClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TablePaginationClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material-next/src/Tabs/tabsClasses.ts b/packages/mui-material-next/src/Tabs/tabsClasses.ts index 096e10a63a3521..f986cf6e33c580 100644 --- a/packages/mui-material-next/src/Tabs/tabsClasses.ts +++ b/packages/mui-material-next/src/Tabs/tabsClasses.ts @@ -1,7 +1,5 @@ -import { - unstable_generateUtilityClass as generateUtilityClass, - unstable_generateUtilityClasses as generateUtilityClasses, -} from '@mui/utils'; +import generateUtilityClass from '@mui/material/generateUtilityClass'; +import generateUtilityClasses from '@mui/material/generateUtilityClasses'; export interface TabsClasses { /** Styles applied to the root element. */ diff --git a/packages/mui-material/src/generateUtilityClasses/index.ts b/packages/mui-material/src/generateUtilityClasses/index.ts new file mode 100644 index 00000000000000..cc94914f4095da --- /dev/null +++ b/packages/mui-material/src/generateUtilityClasses/index.ts @@ -0,0 +1 @@ +export { unstable_generateUtilityClasses as default } from '@mui/utils'; diff --git a/packages/mui-material/src/index.d.ts b/packages/mui-material/src/index.d.ts index 7efb5e3dac47cc..a6ad0741737152 100644 --- a/packages/mui-material/src/index.d.ts +++ b/packages/mui-material/src/index.d.ts @@ -486,7 +486,7 @@ export { default as unstable_composeClasses } from '@mui/base/composeClasses'; export { default as generateUtilityClass } from './generateUtilityClass'; export * from './generateUtilityClass'; -export { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +export { default as generateUtilityClasses } from './generateUtilityClasses'; export { default as Unstable_TrapFocus } from './Unstable_TrapFocus'; export * from './Unstable_TrapFocus'; diff --git a/packages/mui-material/src/index.js b/packages/mui-material/src/index.js index 6c30bbe1bbff30..44c0629fe6fc21 100644 --- a/packages/mui-material/src/index.js +++ b/packages/mui-material/src/index.js @@ -415,6 +415,6 @@ export { default as unstable_composeClasses } from '@mui/base/composeClasses'; export { default as generateUtilityClass } from './generateUtilityClass'; export * from './generateUtilityClass'; -export { unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils'; +export { default as generateUtilityClasses } from './generateUtilityClasses'; export { default as Unstable_TrapFocus } from './Unstable_TrapFocus'; From 81b4026b4ee35af2948dd752eaece21e339443bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Tue, 20 Sep 2022 10:16:31 +0200 Subject: [PATCH 13/14] Don't use hardcoded classes in tests --- .../SelectUnstyled/SelectUnstyled.test.tsx | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx b/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx index 0888eaefe68b27..9f2115c90c5f86 100644 --- a/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx +++ b/packages/mui-base/src/SelectUnstyled/SelectUnstyled.test.tsx @@ -1,7 +1,10 @@ import * as React from 'react'; import { expect } from 'chai'; import SelectUnstyled, { SelectOption, selectUnstyledClasses } from '@mui/base/SelectUnstyled'; -import OptionUnstyled, { OptionUnstyledProps } from '@mui/base/OptionUnstyled'; +import OptionUnstyled, { + OptionUnstyledProps, + optionUnstyledClasses, +} from '@mui/base/OptionUnstyled'; import OptionGroupUnstyled from '@mui/base/OptionGroupUnstyled'; import { createMount, @@ -144,11 +147,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'd' }); - expect(getByText('Dragon Fruit')).to.have.class('MuiOption-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'r' }); - expect(getByText('Dragon Fruit')).to.have.class('MuiOption-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'z' }); - expect(getByText('Dragon Fruit')).to.have.class('MuiOption-highlighted'); + expect(getByText('Dragon Fruit')).to.have.class(optionUnstyledClasses.highlighted); }); it('navigate to next element with same starting character on repeated keys', () => { @@ -171,11 +174,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); + expect(getByText('Cherry')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Calamondin')).to.have.class('MuiOption-highlighted'); + expect(getByText('Calamondin')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); + expect(getByText('Cherry')).to.have.class(optionUnstyledClasses.highlighted); }); it('navigate using the label prop', () => { @@ -210,11 +213,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'd' }); - expect(getByTestId('5')).to.have.class('MuiOption-highlighted'); + expect(getByTestId('5')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'r' }); - expect(getByTestId('5')).to.have.class('MuiOption-highlighted'); + expect(getByTestId('5')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'z' }); - expect(getByTestId('5')).to.have.class('MuiOption-highlighted'); + expect(getByTestId('5')).to.have.class(optionUnstyledClasses.highlighted); }); it('skips the non-stringifiable options', () => { @@ -240,11 +243,11 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); + expect(getByText('Cherry')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Calamondin')).to.have.class('MuiOption-highlighted'); + expect(getByText('Calamondin')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'c' }); - expect(getByText('Cherry')).to.have.class('MuiOption-highlighted'); + expect(getByText('Cherry')).to.have.class(optionUnstyledClasses.highlighted); }); it('navigate to options with diacritic characters', () => { @@ -266,12 +269,12 @@ describe('SelectUnstyled', () => { const listbox = getByRole('listbox'); userEvent.keyPress(listbox, { key: 'b' }); - expect(getByText('Ba')).to.have.class('MuiOption-highlighted'); + expect(getByText('Ba')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('Bą')).to.have.class('MuiOption-highlighted'); + expect(getByText('Bą')).to.have.class(optionUnstyledClasses.highlighted); }); it('navigate to next options with beginning diacritic characters', () => { @@ -294,17 +297,17 @@ describe('SelectUnstyled', () => { userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąa')).to.have.class('MuiOption-highlighted'); + expect(getByText('ąa')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'Alt' }); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąb')).to.have.class('MuiOption-highlighted'); + expect(getByText('ąb')).to.have.class(optionUnstyledClasses.highlighted); userEvent.keyPress(listbox, { key: 'Control' }); userEvent.keyPress(listbox, { key: 'AltGraph' }); userEvent.keyPress(listbox, { key: 'ą' }); - expect(getByText('ąc')).to.have.class('MuiOption-highlighted'); + expect(getByText('ąc')).to.have.class(optionUnstyledClasses.highlighted); }); }); From 61babab2576a1aaa74466c04d89a08e73381bb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Mon, 10 Oct 2022 13:29:19 +0200 Subject: [PATCH 14/14] Do not generate product-specific classes --- .../mui-base/src/generateUtilityClass/index.ts | 17 +---------------- .../src/generateUtilityClass/index.ts | 17 +---------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/packages/mui-base/src/generateUtilityClass/index.ts b/packages/mui-base/src/generateUtilityClass/index.ts index 7b8d3034f6ef49..19bb1127412e87 100644 --- a/packages/mui-base/src/generateUtilityClass/index.ts +++ b/packages/mui-base/src/generateUtilityClass/index.ts @@ -1,17 +1,2 @@ -import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; - +export { unstable_generateUtilityClass as default } from '@mui/utils'; export type { GlobalStateSlot } from '@mui/utils'; -export const ProductClass = 'Mui-base'; - -export default function generateBaseUtilityClass( - componentName: string, - slot: string, - globalStatePrefix = 'Mui', -) { - const slotClass = generateUtilityClass(componentName, slot, globalStatePrefix); - if (slot === 'root') { - return `${ProductClass} ${slotClass}`; - } - - return slotClass; -} diff --git a/packages/mui-material/src/generateUtilityClass/index.ts b/packages/mui-material/src/generateUtilityClass/index.ts index ac3121c8ec3601..19bb1127412e87 100644 --- a/packages/mui-material/src/generateUtilityClass/index.ts +++ b/packages/mui-material/src/generateUtilityClass/index.ts @@ -1,17 +1,2 @@ -import { unstable_generateUtilityClass as generateUtilityClass } from '@mui/utils'; - +export { unstable_generateUtilityClass as default } from '@mui/utils'; export type { GlobalStateSlot } from '@mui/utils'; -export const ProductClass = 'Mui-material'; - -export default function generateBaseUtilityClass( - componentName: string, - slot: string, - globalStatePrefix = 'Mui', -) { - const slotClass = generateUtilityClass(componentName, slot, globalStatePrefix); - if (slot === 'root') { - return `${ProductClass} ${slotClass}`; - } - - return slotClass; -}