From b92e527efa5b15482c0e37968cdc45e0d98501c2 Mon Sep 17 00:00:00 2001 From: "shyyko.serhiy@gmail.com" Date: Sat, 10 Oct 2015 19:50:41 +0300 Subject: [PATCH] added style and className props to each Table component. added colSpan to TableHeaderColumnProps and TableRowColumnProps. --- material-ui/material-ui.d.ts | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts index 627d91b582..f7ec027ae8 100644 --- a/material-ui/material-ui.d.ts +++ b/material-ui/material-ui.d.ts @@ -319,7 +319,7 @@ declare namespace __MaterialUI { minDate?: Date; mode?: string; onDismiss?: () => void; - + // e is always null onChange?: (e: any, d: Date) => void; @@ -672,7 +672,7 @@ declare namespace __MaterialUI { labelPosition?: string; style?: React.CSSProperties; value?: string; - + onCheck?: (e: React.FormEvent, selected: string) => void; } export class RadioButton extends React.Component { @@ -1054,7 +1054,7 @@ declare namespace __MaterialUI { value?: string; selected?: boolean; width?: string; - + // Called by Tabs component onActive?: (tab: Tab) => void; @@ -1079,7 +1079,12 @@ declare namespace __MaterialUI { } namespace Table { - interface TableProps extends React.Props { + interface HasStyleAndClassNameProps extends React.Props { + style?: React.CSSProperties; + className?: string; + } + + interface TableProps extends HasStyleAndClassNameProps
{ allRowsSelected?: boolean; fixedFooter?: boolean; fixedHeader?: boolean; @@ -1096,7 +1101,7 @@ declare namespace __MaterialUI { export class Table extends React.Component { } - interface TableBodyProps extends React.Props { + interface TableBodyProps extends HasStyleAndClassNameProps { allRowsSelected?: boolean; deselectOnClickaway?: boolean; displayRowCheckbox?: boolean; @@ -1115,13 +1120,13 @@ declare namespace __MaterialUI { export class TableBody extends React.Component { } - interface TableFooterProps extends React.Props { + interface TableFooterProps extends HasStyleAndClassNameProps { adjustForCheckbox?: boolean; } export class TableFooter extends React.Component { } - interface TableHeaderProps extends React.Props { + interface TableHeaderProps extends HasStyleAndClassNameProps { adjustForCheckbox?: boolean; displaySelectAll?: boolean; enableSelectAll?: boolean; @@ -1131,7 +1136,8 @@ declare namespace __MaterialUI { export class TableHeader extends React.Component { } - interface TableHeaderColumnProps extends React.Props { + interface TableHeaderColumnProps extends HasStyleAndClassNameProps { + colSpan?: number; columnNumber?: number; onClick?: (e: React.MouseEvent, column: number) => void; tooltip?: string; @@ -1140,7 +1146,7 @@ declare namespace __MaterialUI { export class TableHeaderColumn extends React.Component { } - interface TableRowProps extends React.Props { + interface TableRowProps extends HasStyleAndClassNameProps { displayBorder?: boolean; hoverable?: boolean; onCellClick?: (e: React.MouseEvent, row: number, column: number) => void; @@ -1157,7 +1163,8 @@ declare namespace __MaterialUI { export class TableRow extends React.Component { } - interface TableRowColumnProps extends React.Props { + interface TableRowColumnProps extends HasStyleAndClassNameProps { + colSpan?: number; columnNumber?: number; hoverable?: boolean; onHover?: (e: React.MouseEvent, column: number) => void;