From 8625400ef4f3c274ae8dd2b25d546cf5fd31bc81 Mon Sep 17 00:00:00 2001 From: Kevin Korach Date: Wed, 10 Nov 2021 10:51:42 -0800 Subject: [PATCH 1/8] [StaticDatePicker] Add className and slot to StaticWrapper (#29511) --- .../pickers/wrappers/StaticWrapper.tsx | 51 +++++++++++++++++-- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx index bf34dfff02a812..2d34ba873ec76c 100644 --- a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx +++ b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx @@ -1,17 +1,57 @@ import * as React from 'react'; import { styled } from '@mui/material/styles'; +import { + unstable_composeClasses as composeClasses, + generateUtilityClass, + generateUtilityClasses, +} from '@mui/core'; import { DIALOG_WIDTH } from '../constants/dimensions'; import { WrapperVariantContext, IsStaticVariantContext } from './WrapperVariantContext'; +import useThemeProps from '../../../../../mui-material/src/styles/useThemeProps'; + +export interface StaticWrapperClasses { + /** Styles applied to the root element. */ + root: string; +} + +export type StaticWrapperClassKey = keyof StaticWrapperClasses; + +export function getStaticWrapperUtilityClass(slot: string): string { + return generateUtilityClass('MuiStaticWrapper', slot); +} + +export const staticWrapperClasses: StaticWrapperClasses = generateUtilityClasses( + 'MuiStaticWrapper', + ['root'], +); + +const useUtilityClasses = (ownerState: StaticWrapperProps) => { + const { classes } = ownerState; + const slots = { + root: ['root'], + }; + + return composeClasses(slots, getStaticWrapperUtilityClass, classes); +}; export interface StaticWrapperProps { children?: React.ReactNode; + /** + * Override or extend the styles applied to the component. + */ + classes?: Partial; /** * Force static wrapper inner components to be rendered in mobile or desktop mode. */ displayStaticWrapperAs: 'desktop' | 'mobile'; } -const StaticWrapperRoot = styled('div', { skipSx: true })(({ theme }) => ({ +const StaticWrapperRoot = styled('div', { + name: 'MuiStaticWrapper', + slot: 'Root', + overridesResolver: (props, styles) => styles.root, + skipSx: true, +})(({ theme }) => ({ overflow: 'hidden', minWidth: DIALOG_WIDTH, display: 'flex', @@ -19,15 +59,18 @@ const StaticWrapperRoot = styled('div', { skipSx: true })(({ theme }) => ({ backgroundColor: theme.palette.background.paper, })); -function StaticWrapper(props: StaticWrapperProps) { - const { displayStaticWrapperAs, children } = props; +function StaticWrapper(inProps: StaticWrapperProps) { + const props = useThemeProps({ props: inProps, name: 'MuiStaticWrapper' }); + const { displayStaticWrapperAs, ...other } = props; + + const classes = useUtilityClasses(props); const isStatic = true; return ( - {children} + ); From 411c2c2cbe7a1bd9e4cc47f2470899a0d3f063c5 Mon Sep 17 00:00:00 2001 From: Kevin Korach Date: Thu, 11 Nov 2021 09:32:08 -0800 Subject: [PATCH 2/8] Change component name to MuiStaticWrapper --- .../src/internal/pickers/wrappers/StaticWrapper.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx index 2d34ba873ec76c..e3fc9d75085cbf 100644 --- a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx +++ b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx @@ -17,11 +17,11 @@ export interface StaticWrapperClasses { export type StaticWrapperClassKey = keyof StaticWrapperClasses; export function getStaticWrapperUtilityClass(slot: string): string { - return generateUtilityClass('MuiStaticWrapper', slot); + return generateUtilityClass('MuiPickerStaticWrapper', slot); } export const staticWrapperClasses: StaticWrapperClasses = generateUtilityClasses( - 'MuiStaticWrapper', + 'MuiPickerStaticWrapper', ['root'], ); @@ -47,7 +47,7 @@ export interface StaticWrapperProps { } const StaticWrapperRoot = styled('div', { - name: 'MuiStaticWrapper', + name: 'MuiPickerStaticWrapper', slot: 'Root', overridesResolver: (props, styles) => styles.root, skipSx: true, @@ -60,7 +60,7 @@ const StaticWrapperRoot = styled('div', { })); function StaticWrapper(inProps: StaticWrapperProps) { - const props = useThemeProps({ props: inProps, name: 'MuiStaticWrapper' }); + const props = useThemeProps({ props: inProps, name: 'MuiPickerStaticWrapper' }); const { displayStaticWrapperAs, ...other } = props; const classes = useUtilityClasses(props); From ab2754d9fb23fbdd196750e9319b447d8fa86062 Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Tue, 16 Nov 2021 13:36:16 +0100 Subject: [PATCH 3/8] Update packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx --- .../mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx index e3fc9d75085cbf..8f7e36fe530e90 100644 --- a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx +++ b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx @@ -7,7 +7,7 @@ import { } from '@mui/core'; import { DIALOG_WIDTH } from '../constants/dimensions'; import { WrapperVariantContext, IsStaticVariantContext } from './WrapperVariantContext'; -import useThemeProps from '../../../../../mui-material/src/styles/useThemeProps'; +import { useThemeProps } from '@mui/material/styles'; export interface StaticWrapperClasses { /** Styles applied to the root element. */ From b74ee8aa610f666c1ab82c77c037cb2adc3426e9 Mon Sep 17 00:00:00 2001 From: Kevin Korach Date: Tue, 16 Nov 2021 12:35:20 -0800 Subject: [PATCH 4/8] Add types and overrides for StaticWrapper --- packages/mui-lab/src/themeAugmentation/components.d.ts | 5 +++++ packages/mui-lab/src/themeAugmentation/overrides.d.ts | 2 ++ 2 files changed, 7 insertions(+) diff --git a/packages/mui-lab/src/themeAugmentation/components.d.ts b/packages/mui-lab/src/themeAugmentation/components.d.ts index f911e669d9b9fe..3ce25613903052 100644 --- a/packages/mui-lab/src/themeAugmentation/components.d.ts +++ b/packages/mui-lab/src/themeAugmentation/components.d.ts @@ -96,6 +96,11 @@ export interface LabComponents { styleOverrides?: ComponentsOverrides['MuiYearPicker']; variants?: ComponentsVariants['MuiYearPicker']; }; + MuiPickerStaticWrapper?: { + defaultProps?: ComponentsProps['MuiPickerStaticWrapper']; + styleOverrides?: ComponentsOverrides['MuiPickerStaticWrapper']; + variants?: ComponentsVariants['MuiPickerStaticWrapper']; + }; } declare module '@mui/material/styles' { diff --git a/packages/mui-lab/src/themeAugmentation/overrides.d.ts b/packages/mui-lab/src/themeAugmentation/overrides.d.ts index 19c755ac7a9599..54e69c483d9436 100644 --- a/packages/mui-lab/src/themeAugmentation/overrides.d.ts +++ b/packages/mui-lab/src/themeAugmentation/overrides.d.ts @@ -17,6 +17,7 @@ import { TimelineSeparatorClassKey } from '../TimelineSeparator'; import { TreeItemClassKey } from '../TreeItem'; import { TreeViewClassKey } from '../TreeView'; import { YearPickerClassKey } from '../YearPicker'; +import { StaticWrapperClassKey } from '../internal/pickers/wrappers/StaticWrapper'; // prettier-ignore export interface LabComponentNameToClassKey { @@ -39,6 +40,7 @@ export interface LabComponentNameToClassKey { MuiTreeItem: TreeItemClassKey; MuiTreeView: TreeViewClassKey; MuiYearPicker: YearPickerClassKey; + MuiPickerStaticWrapper: StaticWrapperClassKey; } declare module '@mui/material/styles' { From 2c6acea8acddf297788dc7ee5cbd886753be9a39 Mon Sep 17 00:00:00 2001 From: Kevin Korach Date: Tue, 16 Nov 2021 12:35:20 -0800 Subject: [PATCH 5/8] Add types and overrides for StaticWrapper --- .../mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx index 8f7e36fe530e90..885cbf6cc0372c 100644 --- a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx +++ b/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { styled } from '@mui/material/styles'; +import { styled, useThemeProps } from '@mui/material/styles'; import { unstable_composeClasses as composeClasses, generateUtilityClass, @@ -7,7 +7,6 @@ import { } from '@mui/core'; import { DIALOG_WIDTH } from '../constants/dimensions'; import { WrapperVariantContext, IsStaticVariantContext } from './WrapperVariantContext'; -import { useThemeProps } from '@mui/material/styles'; export interface StaticWrapperClasses { /** Styles applied to the root element. */ From e7ba4c622812ea5738cb4ca6067cdf76b452ddee Mon Sep 17 00:00:00 2001 From: Kevin Korach Date: Mon, 22 Nov 2021 11:59:28 -0800 Subject: [PATCH 6/8] Rename StaticWrapper to PickerStaticWrapper - Updated the static pickers that use it - Updated typescript defintions. --- .../src/StaticDatePicker/StaticDatePicker.tsx | 10 ++++++---- .../StaticDateRangePicker.tsx | 10 ++++++---- .../StaticDateTimePicker.tsx | 10 ++++++---- .../src/StaticTimePicker/StaticTimePicker.tsx | 10 ++++++---- ...ticWrapper.tsx => PickerStaticWrapper.tsx} | 20 +++++++++---------- .../src/themeAugmentation/overrides.d.ts | 4 ++-- 6 files changed, 36 insertions(+), 28 deletions(-) rename packages/mui-lab/src/internal/pickers/wrappers/{StaticWrapper.tsx => PickerStaticWrapper.tsx} (74%) diff --git a/packages/mui-lab/src/StaticDatePicker/StaticDatePicker.tsx b/packages/mui-lab/src/StaticDatePicker/StaticDatePicker.tsx index 158aaf8c732e0b..f361d4f430ab30 100644 --- a/packages/mui-lab/src/StaticDatePicker/StaticDatePicker.tsx +++ b/packages/mui-lab/src/StaticDatePicker/StaticDatePicker.tsx @@ -2,7 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { BaseDatePickerProps, useDatePickerDefaultizedProps } from '../DatePicker/shared'; import DatePickerToolbar from '../DatePicker/DatePickerToolbar'; -import StaticWrapper, { StaticWrapperProps } from '../internal/pickers/wrappers/StaticWrapper'; +import PickerStaticWrapper, { + PickerStaticWrapperProps, +} from '../internal/pickers/wrappers/PickerStaticWrapper'; import Picker from '../internal/pickers/Picker/Picker'; import { MuiPickersAdapter } from '../internal/pickers/hooks/useUtils'; import { useDateValidation } from '../internal/pickers/hooks/useValidation'; @@ -20,7 +22,7 @@ export interface StaticDatePickerProps extends BaseDatePickerPr * Force static wrapper inner components to be rendered in mobile or desktop mode. * @default 'mobile' */ - displayStaticWrapperAs?: StaticWrapperProps['displayStaticWrapperAs']; + displayStaticWrapperAs?: PickerStaticWrapperProps['displayStaticWrapperAs']; } type StaticDatePickerComponent = (( @@ -62,7 +64,7 @@ const StaticDatePicker = React.forwardRef(function StaticDatePicker( const DateInputProps = { ...inputProps, ...other, ref, validationError }; return ( - + ( DateInputProps={DateInputProps} {...other} /> - + ); }) as StaticDatePickerComponent; diff --git a/packages/mui-lab/src/StaticDateRangePicker/StaticDateRangePicker.tsx b/packages/mui-lab/src/StaticDateRangePicker/StaticDateRangePicker.tsx index 750103e53c8670..4d16af407ce746 100644 --- a/packages/mui-lab/src/StaticDateRangePicker/StaticDateRangePicker.tsx +++ b/packages/mui-lab/src/StaticDateRangePicker/StaticDateRangePicker.tsx @@ -1,7 +1,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { useThemeProps } from '@mui/material/styles'; -import StaticWrapper, { StaticWrapperProps } from '../internal/pickers/wrappers/StaticWrapper'; +import PickerStaticWrapper, { + PickerStaticWrapperProps, +} from '../internal/pickers/wrappers/PickerStaticWrapper'; import { useDefaultDates, useUtils } from '../internal/pickers/hooks/useUtils'; import { RangeInput, DateRange } from '../DateRangePicker/RangeTypes'; import { @@ -73,7 +75,7 @@ export interface StaticDateRangePickerProps * Force static wrapper inner components to be rendered in mobile or desktop mode. * @default 'mobile' */ - displayStaticWrapperAs?: StaticWrapperProps['displayStaticWrapperAs']; + displayStaticWrapperAs?: PickerStaticWrapperProps['displayStaticWrapperAs']; } type StaticDateRangePickerComponent = (( @@ -151,7 +153,7 @@ const StaticDateRangePicker = React.forwardRef(function StaticDateRangePicker + open={wrapperProps.open} DateInputProps={DateInputProps} @@ -163,7 +165,7 @@ const StaticDateRangePicker = React.forwardRef(function StaticDateRangePicker - + ); }) as StaticDateRangePickerComponent; diff --git a/packages/mui-lab/src/StaticDateTimePicker/StaticDateTimePicker.tsx b/packages/mui-lab/src/StaticDateTimePicker/StaticDateTimePicker.tsx index 504b8b14984b6a..280a814198fba2 100644 --- a/packages/mui-lab/src/StaticDateTimePicker/StaticDateTimePicker.tsx +++ b/packages/mui-lab/src/StaticDateTimePicker/StaticDateTimePicker.tsx @@ -5,7 +5,9 @@ import { useDateTimePickerDefaultizedProps, } from '../DateTimePicker/shared'; import DateTimePickerToolbar from '../DateTimePicker/DateTimePickerToolbar'; -import StaticWrapper, { StaticWrapperProps } from '../internal/pickers/wrappers/StaticWrapper'; +import PickerStaticWrapper, { + PickerStaticWrapperProps, +} from '../internal/pickers/wrappers/PickerStaticWrapper'; import Picker from '../internal/pickers/Picker/Picker'; import { MuiPickersAdapter } from '../internal/pickers/hooks/useUtils'; import { useDateTimeValidation } from '../internal/pickers/hooks/useValidation'; @@ -23,7 +25,7 @@ export interface StaticDateTimePickerProps extends BaseDateTime * Force static wrapper inner components to be rendered in mobile or desktop mode. * @default 'mobile' */ - displayStaticWrapperAs?: StaticWrapperProps['displayStaticWrapperAs']; + displayStaticWrapperAs?: PickerStaticWrapperProps['displayStaticWrapperAs']; } type StaticDateTimePickerComponent = (( @@ -65,7 +67,7 @@ const StaticDateTimePicker = React.forwardRef(function StaticDateTimePicker + - + ); }) as StaticDateTimePickerComponent; diff --git a/packages/mui-lab/src/StaticTimePicker/StaticTimePicker.tsx b/packages/mui-lab/src/StaticTimePicker/StaticTimePicker.tsx index 25c58e26403b39..cca9bef0c34bad 100644 --- a/packages/mui-lab/src/StaticTimePicker/StaticTimePicker.tsx +++ b/packages/mui-lab/src/StaticTimePicker/StaticTimePicker.tsx @@ -2,7 +2,9 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { BaseTimePickerProps, useTimePickerDefaultizedProps } from '../TimePicker/shared'; import TimePickerToolbar from '../TimePicker/TimePickerToolbar'; -import StaticWrapper, { StaticWrapperProps } from '../internal/pickers/wrappers/StaticWrapper'; +import PickerStaticWrapper, { + PickerStaticWrapperProps, +} from '../internal/pickers/wrappers/PickerStaticWrapper'; import Picker from '../internal/pickers/Picker/Picker'; import { MuiPickersAdapter } from '../internal/pickers/hooks/useUtils'; import { useTimeValidation } from '../internal/pickers/hooks/useValidation'; @@ -20,7 +22,7 @@ export interface StaticTimePickerProps extends BaseTimePickerPr * Force static wrapper inner components to be rendered in mobile or desktop mode. * @default 'mobile' */ - displayStaticWrapperAs?: StaticWrapperProps['displayStaticWrapperAs']; + displayStaticWrapperAs?: PickerStaticWrapperProps['displayStaticWrapperAs']; } type StaticTimePickerComponent = (( @@ -60,7 +62,7 @@ const StaticTimePicker = React.forwardRef(function StaticTimePicker( const DateInputProps = { ...inputProps, ...other, ref, validationError }; return ( - + {/* @ts-ignore time picker has no component slot for the calendar header */} ( DateInputProps={DateInputProps} {...other} /> - + ); }) as StaticTimePickerComponent; diff --git a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.tsx similarity index 74% rename from packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx rename to packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.tsx index 885cbf6cc0372c..d41ad90e1336fd 100644 --- a/packages/mui-lab/src/internal/pickers/wrappers/StaticWrapper.tsx +++ b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.tsx @@ -8,23 +8,23 @@ import { import { DIALOG_WIDTH } from '../constants/dimensions'; import { WrapperVariantContext, IsStaticVariantContext } from './WrapperVariantContext'; -export interface StaticWrapperClasses { +export interface PickerStaticWrapperClasses { /** Styles applied to the root element. */ root: string; } -export type StaticWrapperClassKey = keyof StaticWrapperClasses; +export type PickerStaticWrapperClassKey = keyof PickerStaticWrapperClasses; export function getStaticWrapperUtilityClass(slot: string): string { return generateUtilityClass('MuiPickerStaticWrapper', slot); } -export const staticWrapperClasses: StaticWrapperClasses = generateUtilityClasses( +export const pickerStaticWrapperClasses: PickerStaticWrapperClasses = generateUtilityClasses( 'MuiPickerStaticWrapper', ['root'], ); -const useUtilityClasses = (ownerState: StaticWrapperProps) => { +const useUtilityClasses = (ownerState: PickerStaticWrapperProps) => { const { classes } = ownerState; const slots = { root: ['root'], @@ -33,19 +33,19 @@ const useUtilityClasses = (ownerState: StaticWrapperProps) => { return composeClasses(slots, getStaticWrapperUtilityClass, classes); }; -export interface StaticWrapperProps { +export interface PickerStaticWrapperProps { children?: React.ReactNode; /** * Override or extend the styles applied to the component. */ - classes?: Partial; + classes?: Partial; /** * Force static wrapper inner components to be rendered in mobile or desktop mode. */ displayStaticWrapperAs: 'desktop' | 'mobile'; } -const StaticWrapperRoot = styled('div', { +const PickerStaticWrapperRoot = styled('div', { name: 'MuiPickerStaticWrapper', slot: 'Root', overridesResolver: (props, styles) => styles.root, @@ -58,7 +58,7 @@ const StaticWrapperRoot = styled('div', { backgroundColor: theme.palette.background.paper, })); -function StaticWrapper(inProps: StaticWrapperProps) { +function PickerStaticWrapper(inProps: PickerStaticWrapperProps) { const props = useThemeProps({ props: inProps, name: 'MuiPickerStaticWrapper' }); const { displayStaticWrapperAs, ...other } = props; @@ -69,10 +69,10 @@ function StaticWrapper(inProps: StaticWrapperProps) { return ( - + ); } -export default StaticWrapper; +export default PickerStaticWrapper; diff --git a/packages/mui-lab/src/themeAugmentation/overrides.d.ts b/packages/mui-lab/src/themeAugmentation/overrides.d.ts index 54e69c483d9436..aa0493ab114c93 100644 --- a/packages/mui-lab/src/themeAugmentation/overrides.d.ts +++ b/packages/mui-lab/src/themeAugmentation/overrides.d.ts @@ -17,7 +17,7 @@ import { TimelineSeparatorClassKey } from '../TimelineSeparator'; import { TreeItemClassKey } from '../TreeItem'; import { TreeViewClassKey } from '../TreeView'; import { YearPickerClassKey } from '../YearPicker'; -import { StaticWrapperClassKey } from '../internal/pickers/wrappers/StaticWrapper'; +import { PickerStaticWrapperClassKey } from '../internal/pickers/wrappers/PickerStaticWrapper'; // prettier-ignore export interface LabComponentNameToClassKey { @@ -40,7 +40,7 @@ export interface LabComponentNameToClassKey { MuiTreeItem: TreeItemClassKey; MuiTreeView: TreeViewClassKey; MuiYearPicker: YearPickerClassKey; - MuiPickerStaticWrapper: StaticWrapperClassKey; + MuiPickerStaticWrapper: PickerStaticWrapperClassKey; } declare module '@mui/material/styles' { From 316dd70da2c78b7227b097deec334dc6d92b0a42 Mon Sep 17 00:00:00 2001 From: Kevin Korach Date: Mon, 22 Nov 2021 12:17:53 -0800 Subject: [PATCH 7/8] Add test for PickerStaticWrapper --- .../wrappers/PickerStaticWrapper.test.tsx | 21 +++++++++++++++++++ .../pickers/wrappers/PickerStaticWrapper.tsx | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx diff --git a/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx new file mode 100644 index 00000000000000..fd417f639f3074 --- /dev/null +++ b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx @@ -0,0 +1,21 @@ +import { createRenderer, describeConformance } from 'test/utils'; +import PickerStaticWrapper, { pickerStaticWrapperClasses as classes } from './PickerStaticWrapper'; + +describe('', () => { + const { render } = createRenderer(); + + describeConformance(, () => ({ + classes, + muiName: 'MuiPickerStaticWrapper', + refInstanceof: undefined, + render, + skip: [ + 'componentProp', + 'componentsProp', + 'themeVariants', + 'propsSpread', + 'refForwarding', + 'rootClass', + ], + })); +}); diff --git a/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.tsx b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.tsx index d41ad90e1336fd..eae1c4ce5b47f5 100644 --- a/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.tsx +++ b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.tsx @@ -4,7 +4,7 @@ import { unstable_composeClasses as composeClasses, generateUtilityClass, generateUtilityClasses, -} from '@mui/core'; +} from '@mui/base'; import { DIALOG_WIDTH } from '../constants/dimensions'; import { WrapperVariantContext, IsStaticVariantContext } from './WrapperVariantContext'; From cdcb21234e5ded52b7db08e1ac5981fb47c875db Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Mon, 29 Nov 2021 12:45:20 +0100 Subject: [PATCH 8/8] Fix lint issue --- .../src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx index fd417f639f3074..de57a746da287a 100644 --- a/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx +++ b/packages/mui-lab/src/internal/pickers/wrappers/PickerStaticWrapper.test.tsx @@ -1,3 +1,4 @@ +import * as React from 'react'; import { createRenderer, describeConformance } from 'test/utils'; import PickerStaticWrapper, { pickerStaticWrapperClasses as classes } from './PickerStaticWrapper';