Skip to content

[DataGrid] Refactor: create tooltip props #16086

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.

Sign up for GitHub

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

Merged
romgrk merged 2 commits into from
Jan 7, 2025
Merged

[DataGrid] Refactor: create tooltip props #16086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fba41fe
refactor: create tooltip props
romgrk Jan 6, 2025
6ad77ae
fix: types
romgrk Jan 7, 2025
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
6 changes: 6 additions & 0 deletions packages/x-data-grid/src/models/gridBaseSlots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,9 @@ export type SkeletonProps = {
width?: number | string;
height?: number | string;
};

export type TooltipProps = {
children: React.ReactElement<any, any>;
enterDelay?: number;
title: React.ReactNode;
};
21 changes: 13 additions & 8 deletions packages/x-data-grid/src/models/gridSlotsComponentsProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { SelectProps } from '@mui/material/Select';
import type { SwitchProps } from '@mui/material/Switch';
import type { IconButtonProps as MUIIconButtonProps } from '@mui/material/IconButton';
import type { InputAdornmentProps } from '@mui/material/InputAdornment';
import type { TooltipProps } from '@mui/material/Tooltip';
import type { TooltipProps as MUITooltipProps } from '@mui/material/Tooltip';
import type { InputLabelProps } from '@mui/material/InputLabel';
import type { PopperProps } from '@mui/material/Popper';
import type { TablePaginationProps } from '@mui/material/TablePagination';
Expand Down Expand Up @@ -44,6 +44,7 @@ import type {
LinearProgressProps,
MenuItemProps,
SkeletonProps,
TooltipProps,
} from './gridBaseSlots';

type RootProps = React.HTMLAttributes<HTMLDivElement> & Record<`data-${string}`, string>;
Expand Down Expand Up @@ -125,6 +126,7 @@ interface MaterialSlotProps {
baseLinearProgress: MUILinearProgressProps;
baseCircularProgress: MUICircularProgressProps;
baseMenuItem: MUIMenuItemProps;
baseTooltip: MUITooltipProps;
}

interface ElementSlotProps {
Expand Down Expand Up @@ -160,14 +162,17 @@ interface ElementSlotProps {
}

// Merge MUI types into base types to keep slotProps working.
type Select<A, B, K> = K extends keyof A ? A[K] : K extends keyof B ? B[K] : never;
type Merge<A, B> = {
[K in keyof A | keyof B]: K extends keyof A & keyof B
? A[K] & B[K]
: K extends keyof B
? B[K]
: K extends keyof A
? A[K]
: never;
[K in keyof A | keyof B]: K extends 'ref'
? Select<A, B, 'ref'>
: K extends keyof A & keyof B
? A[K] & B[K]
: K extends keyof B
? B[K]
: K extends keyof A
? A[K]
: never;
};
export type GridSlotProps = Merge<BaseSlotProps, MaterialSlotProps> & ElementSlotProps;

Expand Down