From ab6e83507c7e16e3bda20edc8967541222458efc Mon Sep 17 00:00:00 2001
From: Rui Botto <rui.figueira@fe.up.pt>
Date: Mon, 31 Dec 2018 16:50:44 +0100
Subject: [PATCH 1/2] [TableCell] Add align prop typing to typescript
 definition

---
 packages/material-ui/src/TableCell/TableCell.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/material-ui/src/TableCell/TableCell.d.ts b/packages/material-ui/src/TableCell/TableCell.d.ts
index 51b16bb02d5981..9e1fb14f1fa14d 100644
--- a/packages/material-ui/src/TableCell/TableCell.d.ts
+++ b/packages/material-ui/src/TableCell/TableCell.d.ts
@@ -10,6 +10,7 @@ import { StandardProps } from '..';
  * here.
  */
 export interface TableCellProps extends StandardProps<TableCellBaseProps, TableCellClassKey> {
+  align?: 'inherit' | 'left' | 'center' | 'right' | 'justify';
   component?: React.ReactType<TableCellBaseProps>;
   numeric?: boolean;
   padding?: Padding;

From f3f3bae92c63b97e2f1671a191afbe05183deb37 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Mon, 31 Dec 2018 17:18:20 +0100
Subject: [PATCH 2/2] fix typescript error

---
 packages/material-ui/src/Grid/Grid.d.ts                       | 3 +--
 packages/material-ui/src/TableCell/TableCell.d.ts             | 3 ++-
 packages/material-ui/src/TablePagination/TablePagination.d.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/material-ui/src/Grid/Grid.d.ts b/packages/material-ui/src/Grid/Grid.d.ts
index 53fab3f82099b2..d73a84560b2e1b 100644
--- a/packages/material-ui/src/Grid/Grid.d.ts
+++ b/packages/material-ui/src/Grid/Grid.d.ts
@@ -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;
diff --git a/packages/material-ui/src/TableCell/TableCell.d.ts b/packages/material-ui/src/TableCell/TableCell.d.ts
index 9e1fb14f1fa14d..3b3797a01e6f7d 100644
--- a/packages/material-ui/src/TableCell/TableCell.d.ts
+++ b/packages/material-ui/src/TableCell/TableCell.d.ts
@@ -9,7 +9,8 @@ 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;
diff --git a/packages/material-ui/src/TablePagination/TablePagination.d.ts b/packages/material-ui/src/TablePagination/TablePagination.d.ts
index ce7b6f380fd31f..032904e685bc0d 100644
--- a/packages/material-ui/src/TablePagination/TablePagination.d.ts
+++ b/packages/material-ui/src/TablePagination/TablePagination.d.ts
@@ -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>;