Merge pull request #6746 from kirill-chaban/master

Update material-ui.d.ts
This commit is contained in:
Masahiro Wakame
2016-01-11 22:54:15 +09:00
2 changed files with 3 additions and 1 deletions

View File

@@ -18,11 +18,11 @@ import RaisedButton = require("material-ui/lib/raised-button");
import FloatingActionButton = require("material-ui/lib/floating-action-button");
import Card = require("material-ui/lib/card/card");
import CardHeader = require("material-ui/lib/card/card-header");
import DatePicker = require("material-ui/lib/date-picker/date-picker");
import CardText = require("material-ui/lib/card/card-text");
import CardActions = require("material-ui/lib/card/card-actions");
import Dialog = require("material-ui/lib/dialog");
import DropDownMenu = require("material-ui/lib/drop-down-menu");
import DatePicker = require("material-ui/lib/date-picker/date-picker");
import RadioButtonGroup = require("material-ui/lib/radio-button-group");
import RadioButton = require("material-ui/lib/radio-button");
import Toggle = require("material-ui/lib/toggle");
@@ -187,6 +187,7 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen
</Card>;
// "http://material-ui.com/#/components/date-picker"
element = <DatePicker style={{ color: 'red' }} />;
element = <DatePicker
floatingLabelText="Floating Label Text" />;
element = <DatePicker

View File

@@ -337,6 +337,7 @@ declare namespace __MaterialUI {
onTouchTap?: React.TouchEventHandler;
shouldDisableDate?: (day: Date) => boolean;
showYearSelector?: boolean;
style?: React.CSSProperties;
textFieldStyle?: React.CSSProperties;
}
export class DatePicker extends React.Component<DatePickerProps, {}> {