Updated 'material-ui' to v0.13.1

This commit is contained in:
herrmanno
2015-11-06 14:44:46 +01:00
parent 35989a3ab4
commit b17944af72
2 changed files with 70 additions and 3 deletions
+21 -1
View File
@@ -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 = <GridList
cols={3}
padding={50}
cellHeight={200} />;
element = <GridTile
title="GridTileTitle"
actionIcon={<h1>GridTile</h1>}
actionPosition="left"
titlePosition="top"
titleBackground="rgba(0, 0, 0, 0.4)"
cols={2}
rows={1} >
<h1>Children are Required!</h1>
</GridTile>;
return element;
}
+49 -2
View File
@@ -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 <https://github.com/ngbrown>
// Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
///<reference path='../react/react.d.ts' />
@@ -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<any>;
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<MenuDividerProps, {}>{
}
}
namespace GridList {
interface GridListProps extends React.Props<GridList> {
cols?: number;
padding?: number;
cellHeight?: number;
}
export class GridList extends React.Component<GridListProps, {}>{
}
interface GridTileProps extends React.Props<GridTile> {
title?: string;
subtitle?: __React.ReactNode;
titlePosition?: string; //"top"|"bottom"
titleBackground?: string;
actionIcon?: __React.ReactElement<any>;
actionPosition?: string; //"left"|"right"
cols?: number;
rows?: number;
rootClass?: string | __React.Component<any,any>;
}
export class GridTile extends React.Component<GridTileProps, {}>{
}
}
} // __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;