wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-11 11:50:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7572 into material-ui-v014

Browse Source
This commit is contained in:
Nathan Brown
2016-02-25 18:47:50 -07:00
parent c89ea2bc1e 71eb05f620
commit cbab7452bb
406 changed files with 48645 additions and 6981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
material-ui/material-ui-tests.tsx
+6 -1
View File
@@ -18,9 +18,10 @@ import RaisedButton from "material-ui/lib/raised-button";
import FloatingActionButton from "material-ui/lib/floating-action-button";
import Card from "material-ui/lib/card/card";
import CardHeader from "material-ui/lib/card/card-header";
import DatePicker from "material-ui/lib/date-picker/date-picker";
import CardText from "material-ui/lib/card/card-text";
import CardActions from "material-ui/lib/card/card-actions";
import DatePicker from "material-ui/lib/date-picker/date-picker";
import TimePicker from "material-ui/lib/time-picker";
import Dialog from "material-ui/lib/dialog";
import DropDownMenu from "material-ui/lib/drop-down-menu";
import RadioButtonGroup from "material-ui/lib/radio-button-group";
@@ -186,11 +187,15 @@ 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
hintText="Hint Text" />;
// "http://material-ui.com/#/components/time-picker"
element = <TimePicker textFieldStyle={{width: '24px'}} />
// "http://material-ui.com/#/components/dialog"
let standardActions = [
{ text: 'Cancel' },
material-ui/material-ui.d.ts
Vendored
+2 -1
View File
@@ -1289,6 +1289,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, {}> {
@@ -5017,7 +5018,7 @@ declare namespace __MaterialUI {
format?: string;
pedantic?: boolean;
style?: __React.CSSProperties;
textFieldStye?: __React.CSSProperties;
textFieldStyle?: __React.CSSProperties;
autoOk?: boolean;
openDialog?: () => void;
onFocus?: React.FocusEventHandler;