From 8f13596446c8f3febb0c91e39d6b65c25a0238ec Mon Sep 17 00:00:00 2001 From: raultsc Date: Sat, 20 Feb 2016 17:15:05 +0200 Subject: [PATCH] removed menuItems prop from SelectField. Fixes #8189 --- material-ui/material-ui-tests.tsx | 25 +++++++------------------ material-ui/material-ui.d.ts | 6 ++---- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx index ffd9b1814..8dd780c8b 100644 --- a/material-ui/material-ui-tests.tsx +++ b/material-ui/material-ui-tests.tsx @@ -428,35 +428,24 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen disabled={true} defaultValue="Disabled With Value" />; - //Select Fields - let arbitraryArrayMenuItems = [ - { - id: 0, - name: "zero", - }, - ]; element = ; + hintText = "Hint Text" />; element = ; + displayMember="name" />; element = ; + displayMember = "name" />; element = ; + onChange={ this.selectFieldChangeHandler } />; //Floating Hint Text Labels element = implemen 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} diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts index 09d43bb86..ce3388825 100644 --- a/material-ui/material-ui.d.ts +++ b/material-ui/material-ui.d.ts @@ -72,7 +72,7 @@ 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'); @@ -785,8 +785,6 @@ declare namespace __MaterialUI { displayMember?: string; valueMember?: string; autoWidth?: boolean; - menuItems: Menu.MenuItemRequest[]; - menuItemStyle?: React.CSSProperties; selectedIndex?: number; underlineStyle?: React.CSSProperties; underlineFocusStyle?: React.CSSProperties; @@ -3280,4 +3278,4 @@ declare module "material-ui/lib/svg-icons" { export var ToggleStarBorder: __MaterialUI.SvgIcon; export var ToggleStarHalf: __MaterialUI.SvgIcon; export var ToggleStar: __MaterialUI.SvgIcon; -} \ No newline at end of file +}