Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[material] Remove dependency to @mui/base #42907

Merged
merged 25 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix popper
  • Loading branch information
mnajdova committed Jul 11, 2024
commit eb713065ffab9839dfd9a2a94cebe9fc577a7ed0
11 changes: 6 additions & 5 deletions packages/mui-material/src/Popper/BasePopper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
} from '@mui/utils';
import { createPopper, Instance, Modifier, Placement, State, VirtualElement } from '@popperjs/core';
import PropTypes from 'prop-types';
import composeClasses from '../utils/composeClasses';
import { Portal } from '../Portal';
import composeClasses from '@mui/utils/composeClasses';
import Portal from '../Portal';
import { getPopperUtilityClass } from './popperClasses';
import { useSlotProps } from '../utils/useSlotProps';
import { WithOptionalOwnerState } from '../utils/types';
Expand Down Expand Up @@ -66,12 +66,13 @@ function isVirtualElement(element: HTMLElement | VirtualElement): element is Vir
return !isHTMLElement(element);
}

const useUtilityClasses = () => {
const useUtilityClasses = (ownerState: any) => {
const { classes } = ownerState;
const slots = {
root: ['root'],
};

return composeClasses(slots, getPopperUtilityClass);
return composeClasses(slots, getPopperUtilityClass, classes);
};

const defaultPopperOptions = {};
Expand Down Expand Up @@ -215,7 +216,7 @@ const PopperTooltip = React.forwardRef(function PopperTooltip<
childProps.TransitionProps = TransitionProps;
}

const classes = useUtilityClasses();
const classes = useUtilityClasses(props);
const Root = slots.root ?? 'div';

const rootProps: WithOptionalOwnerState<PopperRootSlotProps> = useSlotProps({
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-material/src/Popper/Popper.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use client';
import { Popper as BasePopper } from './BasePopper';
import { PopperProps as BasePopperProps } from './BasePopper.types';
import { SxProps } from '@mui/system';
import { useRtl } from '@mui/system/RtlProvider';
import refType from '@mui/utils/refType';
import HTMLElementType from '@mui/utils/HTMLElementType';
import PropTypes from 'prop-types';
import * as React from 'react';
import { Popper as BasePopper } from './BasePopper';
import { PopperProps as BasePopperProps } from './BasePopper.types';
import { Theme } from '../styles';
import { styled } from '../zero-styled';
import { useDefaultProps } from '../DefaultPropsProvider';
Expand Down
1 change: 1 addition & 0 deletions packages/mui-material/src/Popper/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
'use client';
export { default } from './Popper';
export * from './popperClasses';
4 changes: 3 additions & 1 deletion packages/mui-material/src/Popper/popperClasses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ export function getPopperUtilityClass(slot: string): string {
return generateUtilityClass('MuiPopper', slot);
}

export const popperClasses: PopperClasses = generateUtilityClasses('MuiPopper', ['root']);
const popperClasses: PopperClasses = generateUtilityClasses('MuiPopper', ['root']);

export default popperClasses;
2 changes: 1 addition & 1 deletion packages/mui-material/src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ export * from './GlobalStyles';
*/
export { StyledEngineProvider } from './styles';

export { default as unstable_composeClasses } from './utils/composeClasses';
export { unstable_composeClasses } from '@mui/utils';

export { default as generateUtilityClass } from './generateUtilityClass';
export * from './generateUtilityClass';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ export { default as useAutocomplete } from './useAutocomplete';
export { default as GlobalStyles } from './GlobalStyles';
export * from './GlobalStyles';

export { default as unstable_composeClasses } from './utils/composeClasses';
export { unstable_composeClasses } from '@mui/utils';

export { default as generateUtilityClass } from './generateUtilityClass';
export * from './generateUtilityClass';
Expand Down
58 changes: 0 additions & 58 deletions packages/mui-material/src/utils/composeClasses.test.ts

This file was deleted.

30 changes: 0 additions & 30 deletions packages/mui-material/src/utils/composeClasses.ts

This file was deleted.