Merge pull request #6591 from tsv2013/master

DatePicker: hintText, floatingLabelText

material-ui/material-ui-tests.tsx

@@ -16,6 +16,7 @@ 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");
@@ -165,7 +166,10 @@ class MaterialUiTests extends React.Component<{}, {}> implements React.LinkedSta
             </Card>;
 
         // "http://material-ui.com/#/components/date-picker"
-
+        element = <DatePicker
+            floatingLabelText="Floating Label Text" />;
+        element = <DatePicker
+            hintText="Hint Text" />;
 
         // "http://material-ui.com/#/components/dialog"
         let standardActions = [

material-ui/material-ui.d.ts

@@ -306,6 +306,8 @@ declare namespace __MaterialUI {
             autoOk?: boolean;
             defaultDate?: Date;
             formatDate?: string;
+            hintText?: string;
+            floatingLabelText?: string;
             hideToolbarYearChange?: boolean;
             maxDate?: Date;
             minDate?: Date;