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.

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

[TableCell] Add align to the TypeScript definition #14046

Merged
merged 2 commits into from
Jan 1, 2019
Merged

[TableCell] Add align to the TypeScript definition #14046

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
ab6e835
[TableCell] Add align prop typing to typescript definition
rfbotto Dec 31, 2018
f3f3bae
fix typescript error
oliviertassinari Dec 31, 2018
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
3 changes: 1 addition & 2 deletions packages/material-ui/src/Grid/Grid.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ export type GridSize = 'auto' | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12
export interface GridProps
extends StandardProps<
React.HTMLAttributes<HTMLElement> & Partial<Record<Breakpoint, boolean | GridSize>>,
GridClassKey,
'hidden'
GridClassKey
> {
alignContent?: GridContentAlignment;
alignItems?: GridItemsAlignment;
Expand Down
4 changes: 3 additions & 1 deletion packages/material-ui/src/TableCell/TableCell.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import { StandardProps } from '..';
* Since it is not decided via prop, we have create loose typings
* here.
*/
export interface TableCellProps extends StandardProps<TableCellBaseProps, TableCellClassKey> {
export interface TableCellProps
extends StandardProps<TableCellBaseProps, TableCellClassKey, 'align'> {
align?: 'inherit' | 'left' | 'center' | 'right' | 'justify';
component?: React.ReactType<TableCellBaseProps>;
numeric?: boolean;
padding?: Padding;
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui/src/TablePagination/TablePagination.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface LabelDisplayedRowsArgs {
}

export interface TablePaginationProps
extends StandardProps<TablePaginationBaseProps, TablePaginationClassKey> {
extends StandardProps<TablePaginationBaseProps, TablePaginationClassKey, 'component'> {
ActionsComponent?: React.ReactType<TablePaginationActionsProps>;
backIconButtonProps?: Partial<IconButtonProps>;
component?: React.ReactType<TablePaginationBaseProps>;
Expand Down