Skip to content

Commit 7430fc8

Browse files
type error is removed
1 parent ad6a8c2 commit 7430fc8

File tree

1 file changed

+28
-22
lines changed

1 file changed

+28
-22
lines changed

packages/mui-material/src/TablePagination/TablePagination.d.ts

+28-22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import * as React from 'react';
22
import { SxProps } from '@mui/system';
3+
import { FilledInputProps } from '@mui/material/FilledInput';
4+
import { OutlinedInputProps } from '@mui/material/OutlinedInput';
5+
import { InputProps as StandardInputProps } from '../Input';
36
import { Theme } from '../styles';
47
import { OverridableComponent, OverrideProps } from '../OverridableComponent';
58
import { TablePaginationActionsProps } from './TablePaginationActions';
@@ -18,7 +21,10 @@ export interface LabelDisplayedRowsArgs {
1821
/**
1922
* This type is kept for compatibility. Use `TablePaginationOwnProps` instead.
2023
*/
21-
export type TablePaginationBaseProps = Omit<TableCellProps, 'classes' | 'component' | 'children'>;
24+
export type TablePaginationBaseProps = Omit<
25+
TableCellProps,
26+
'classes' | 'component' | 'children' | 'variant'
27+
>;
2228

2329
export interface TablePaginationOwnProps extends TablePaginationBaseProps {
2430
/**
@@ -123,7 +129,7 @@ export interface TablePaginationOwnProps extends TablePaginationBaseProps {
123129
*
124130
* @default {}
125131
*/
126-
SelectProps?: Partial<SelectProps>;
132+
SelectProps?: SelectPropsVariant;
127133
/**
128134
* If `true`, show the first-page button.
129135
* @default false
@@ -147,19 +153,25 @@ export interface TablePaginationOwnProps extends TablePaginationBaseProps {
147153
*/
148154
sx?: SxProps<Theme>;
149155
}
150-
type SelectVariant = 'filled' | 'standard' | 'outlined';
151156

152-
/**
153-
export type SelectPropsByVariant<Variant extends SelectVariant = SelectVariant> =
154-
Variant extends 'filled'
155-
? TablePaginationOwnProps
156-
: Variant extends 'standard'
157-
? TablePaginationOwnProps
158-
: TablePaginationOwnProps;
159-
**/
157+
type TablePaginationVariants = 'filled' | 'standard' | 'outlined';
158+
159+
type SelectInputProps<Variant extends TablePaginationVariants> = Variant extends 'filled'
160+
? Partial<FilledInputProps>
161+
: Variant extends 'standard'
162+
? Partial<StandardInputProps>
163+
: Partial<OutlinedInputProps>;
164+
165+
export interface SelectPropsVariant<
166+
Variant extends TablePaginationVariants = TablePaginationVariants,
167+
> extends Partial<SelectProps> {
168+
variant?: Variant;
169+
InputProps?: SelectInputProps<Variant>;
170+
// ... (other variant-specific props)
171+
}
160172

161173
export interface TablePaginationTypeMap<AdditionalProps, RootComponent extends React.ElementType> {
162-
props: AdditionalProps & { SelectProps: { variant: SelectVariant } };
174+
props: AdditionalProps & TablePaginationOwnProps;
163175
defaultComponent: RootComponent;
164176
}
165177

@@ -177,21 +189,15 @@ export interface TablePaginationTypeMap<AdditionalProps, RootComponent extends R
177189
* - inherits [TableCell API](https://mui.com/material-ui/api/table-cell/)
178190
*/
179191

180-
declare const TablePagination: <
181-
AdditionalProps = {},
182-
RootComponent extends React.ElementType = React.JSXElementConstructor<TablePaginationBaseProps>,
183-
Variant extends SelectVariant = SelectVariant
184-
>(
185-
props: TablePaginationProps<AdditionalProps, RootComponent, Variant> & { variant?: Variant }
186-
) => JSX.Element;
192+
declare const TablePagination: OverridableComponent<
193+
TablePaginationTypeMap<{}, React.JSXElementConstructor<TablePaginationBaseProps>>
194+
>;
187195

188196
export type TablePaginationProps<
189-
AdditionalProps = {},
190197
RootComponent extends React.ElementType = React.JSXElementConstructor<TablePaginationBaseProps>,
191-
Variant extends SelectVariant = SelectVariant
198+
AdditionalProps = {},
192199
> = OverrideProps<TablePaginationTypeMap<AdditionalProps, RootComponent>, RootComponent> & {
193200
component?: React.ElementType;
194-
variant?: Variant;
195201
};
196202

197203
export default TablePagination;

0 commit comments

Comments
 (0)