diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts index f8a320fd2..89fc5c698 100644 --- a/material-ui/material-ui.d.ts +++ b/material-ui/material-ui.d.ts @@ -1149,7 +1149,7 @@ declare namespace __MaterialUI { subtitleStyle?: React.CSSProperties; textStyle?: React.CSSProperties; style?: React.CSSProperties; - avatar: React.ReactElement | string; + avatar?: React.ReactElement | string; } export class CardHeader extends React.Component { } @@ -1535,6 +1535,7 @@ declare namespace __MaterialUI { onKeyboardFocus?: React.FocusEventHandler; onNestedListToggle?: (item: ListItem) => void; onClick?: React.MouseEventHandler; + onTouchTap?: TouchTapEventHandler; rightAvatar?: React.ReactElement; rightIcon?: React.ReactElement; rightIconButton?: React.ReactElement; @@ -1548,6 +1549,18 @@ declare namespace __MaterialUI { } } + namespace Hoc { + interface SelectableProps { + selectedItemStyle?: React.CSSProperties; + valueLink?: { value: any; requestChange: (e: TouchTapEvent, value: any) => void }; + value?: any; + onChange?: (e: TouchTapEvent, value: any) => void; + } + + // union types for higher order components in TypeScript 1.8: https://github.com/Microsoft/TypeScript/issues/4362 + export function SelectableContainerEnhance

(component: React.ComponentClass

): React.ComponentClass

; + } + // Old menu implementation. Being replaced by new "menus". namespace Menu { interface ItemTapEventHandler { @@ -4841,9 +4854,11 @@ declare namespace __MaterialUI { action?: string; autoHideDuration?: number; onActionTouchTap?: React.TouchEventHandler; - onShow?: () => void; - onDismiss?: () => void; - openOnMount?: boolean; + onDismiss?: () => void; // DEPRECATED + onRequestClose: (reason: string) => void; + onShow?: () => void; // DEPRECATED + open: boolean; + openOnMount?: boolean; // DEPRECATED style?: React.CSSProperties; } export class Snackbar extends React.Component { @@ -4851,7 +4866,7 @@ declare namespace __MaterialUI { namespace Tabs { interface TabProps extends React.Props { - label?: string; + label?: React.ReactNode; value?: string; selected?: boolean; width?: string; @@ -5418,6 +5433,11 @@ declare module 'material-ui/lib/font-icon' { export default FontIcon; } +declare module 'material-ui/lib/hoc/selectable-enhance' { + export import SelectableContainerEnhance = __MaterialUI.Hoc.SelectableContainerEnhance; + export default SelectableContainerEnhance; +} + declare module 'material-ui/lib/icon-button' { export import IconButton = __MaterialUI.IconButton; export default IconButton;