diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index 4c69f3410..25ea89395 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -28,6 +28,9 @@ import Menu = require('material-ui/lib/menus/menu');
import MenuItem = require('material-ui/lib/menus/menu-item');
import MenuDivider = require('material-ui/lib/menus/menu-divider');
import ThemeManager = require('material-ui/lib/styles/theme-manager');
+import GridList = require('material-ui/lib/grid-list/grid-list');
+import GridTile = require('material-ui/lib/grid-list/grid-tile');
+
import NavigationClose = require("material-ui/lib/svg-icon"); // TODO: Should actually import the actual "material-ui/lib/svg-icons/navigation/close", but they aren't defined yet.
import FileFolder = require("material-ui/lib/svg-icon"); // TODO: Should actually import the actual "material-ui/lib/svg-icons/file/folder", but they aren't defined yet.
@@ -456,12 +459,29 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
hintText="Password Field"
floatingLabelText="Password"
type="password" />;
-
+
// "http://material-ui.com/#/components/time-picker"
// "http://material-ui.com/#/components/toolbars"
+
+ // "http://material-ui.com/#/components/grid-list"
+ element = ;
+
+ element = GridTile}
+ actionPosition="left"
+ titlePosition="top"
+ titleBackground="rgba(0, 0, 0, 0.4)"
+ cols={2}
+ rows={1} >
+ Children are Required!
+ ;
return element;
}
diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts
index ecd32ae06..f9f15b937 100644
--- a/material-ui/material-ui.d.ts
+++ b/material-ui/material-ui.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for material-ui v0.12.1
+// Type definitions for material-ui v0.13.1
// Project: https://github.com/callemall/material-ui
-// Definitions by: Nathan Brown
+// Definitions by: Nathan Brown , Oliver Herrmann
// Definitions: https://github.com/borisyankov/DefinitelyTyped
///
@@ -71,6 +71,9 @@ declare module "material-ui" {
export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle; // require('material-ui/lib/toolbar/toolbar-title');
export import Tooltip = __MaterialUI.Tooltip; // require('material-ui/lib/tooltip');
export import Utils = __MaterialUI.Utils; // require('material-ui/lib/utils/');
+
+ export import GridList = __MaterialUI.GridList.GridList; // require('material-ui/lib/gridlist/grid-list');
+ export import GridTile = __MaterialUI.GridList.GridTile; // require('material-ui/lib/gridlist/grid-tile');
// export type definitions
export type TouchTapEvent = __MaterialUI.TouchTapEvent;
@@ -1120,6 +1123,7 @@ declare namespace __MaterialUI {
tabItemContainerStyle?: React.CSSProperties;
tabWidth?: number;
value?: string | number;
+ tabTemplate?: __React.ComponentClass;
onChange?: (value: string | number, e: React.FormEvent, tab: Tab) => void;
}
@@ -1240,6 +1244,10 @@ declare namespace __MaterialUI {
defaultTime?: Date;
format?: string;
pedantic?: boolean;
+ style?: __React.CSSProperties;
+ textFieldStye?: __React.CSSProperties;
+ autoOk?: boolean;
+ openDialog?: () => void;
onFocus?: React.FocusEventHandler;
onTouchTap?: TouchTapEventHandler;
onChange?: (e: any, time: Date) => void;
@@ -1266,6 +1274,7 @@ declare namespace __MaterialUI {
underlineFocusStyle?: React.CSSProperties;
underlineDisabledStyle?: React.CSSProperties;
type?: string;
+ hintStyle?: React.CSSProperties;
disabled?: boolean;
isRtl?: boolean;
@@ -1470,6 +1479,34 @@ declare namespace __MaterialUI {
export class MenuDivider extends React.Component{
}
}
+
+ namespace GridList {
+
+ interface GridListProps extends React.Props {
+ cols?: number;
+ padding?: number;
+ cellHeight?: number;
+ }
+
+ export class GridList extends React.Component{
+ }
+
+ interface GridTileProps extends React.Props {
+ title?: string;
+ subtitle?: __React.ReactNode;
+ titlePosition?: string; //"top"|"bottom"
+ titleBackground?: string;
+ actionIcon?: __React.ReactElement;
+ actionPosition?: string; //"left"|"right"
+ cols?: number;
+ rows?: number;
+ rootClass?: string | __React.Component;
+ }
+
+ export class GridTile extends React.Component{
+ }
+
+ }
} // __MaterialUI
declare module 'material-ui/lib/app-bar' {
@@ -1952,6 +1989,16 @@ declare module "material-ui/lib/menus/menu-divider" {
export = MenuDivider;
}
+declare module "material-ui/lib/grid-list/grid-list" {
+ import GridList = __MaterialUI.GridList.GridList;
+ export = GridList;
+}
+
+declare module "material-ui/lib/grid-list/grid-tile" {
+ import GridTile = __MaterialUI.GridList.GridTile;
+ export = GridTile;
+}
+
declare module "material-ui/lib/styles/colors" {
import Colors = __MaterialUI.Styles.Colors;
export = Colors;