diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx index 792260a9a..b5efc7794 100644 --- a/material-ui/material-ui-tests.tsx +++ b/material-ui/material-ui-tests.tsx @@ -54,6 +54,7 @@ interface MaterialUiTestsState { showDialogStandardActions: boolean; showDialogCustomActions: boolean; showDialogScrollable: boolean; + value: number; } class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implements React.LinkedStateMixin { @@ -247,14 +248,13 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen // "http://material-ui.com/#/components/dropdown-menu" - let menuItems = [ - { payload: '1', text: 'Never' }, - { payload: '2', text: 'Every Night' }, - { payload: '3', text: 'Weeknights' }, - { payload: '4', text: 'Weekends' }, - { payload: '5', text: 'Weekly' }, - ]; - element = ; + element = this.touchTapEventHandler(e)}> + + + + + + ; // "http://material-ui.com/#/components/icons" element = ; @@ -432,35 +432,36 @@ class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> implemen disabled={true} defaultValue="Disabled With Value" />; - //Select Fields + // "http://www.material-ui.com/#/components/select-field" let arbitraryArrayMenuItems = [ - { - id: 0, - name: "zero", - }, + , ]; element = ; + hintText = "Hint Text"> + arbitraryArrayMenuItems + ; element = ; + displayMember="name"> + arbitraryArrayMenuItems + ; element = ; + displayMember = "name"> + arbitraryArrayMenuItems + ; element = ; + onChange={ this.selectFieldChangeHandler }> + arbitraryArrayMenuItems + ; //Floating Hint Text Labels element = { } - interface DropDownIconProps extends React.Props { - menuItems: Menu.MenuItemRequest[]; - closeOnMenuItemTouchTap?: boolean; - iconStyle?: React.CSSProperties; - iconClassName?: string; - iconLigature?: string; - - onChange?: Menu.ItemTapEventHandler; - } - export class DropDownIcon extends React.Component { - } - interface DropDownMenuProps extends React.Props { displayMember?: string; valueMember?: string; autoWidth?: boolean; - menuItems: Menu.MenuItemRequest[]; - menuItemStyle?: React.CSSProperties; selectedIndex?: number; underlineStyle?: React.CSSProperties; iconStyle?: React.CSSProperties; @@ -466,8 +451,6 @@ declare namespace __MaterialUI { disabled?: boolean; valueLink?: ReactLink; value?: any; - - onChange?: Menu.ItemTapEventHandler; } export class DropDownMenu extends React.Component { } @@ -565,8 +548,6 @@ declare namespace __MaterialUI { docked?: boolean; open?: boolean; header?: React.ReactElement; - menuItems?: Menu.MenuItemRequest[]; - onChange?: Menu.ItemTapEventHandler; onNavOpen?: () => void; onNavClose?: () => void; onRequestChange?: (t: boolean) => void; @@ -648,71 +629,6 @@ declare namespace __MaterialUI { export function SelectableContainerEnhance

(component: React.ComponentClass

): React.ComponentClass

; } - // Old menu implementation. Being replaced by new "menus". - namespace Menu { - interface ItemTapEventHandler { - (e: TouchTapEvent, index: number, menuItem: MenuItemRequest): void; - } - - // almost extends MenuItemProps, but certain required items are generated in Menu and not passed here. - interface MenuItemRequest extends React.Props { - // use value from MenuItem.Types.* - type?: string; - - text?: string; - data?: string; - payload?: string; - icon?: React.ReactElement; - attribute?: string; - number?: string; - toggle?: boolean; - onTouchTap?: TouchTapEventHandler; - isDisabled?: boolean; - style?: React.CSSProperties; - - // for MenuItems.Types.NESTED - items?: MenuItemRequest[]; - - // for custom text or payloads - [propertyName: string]: any; - } - - interface MenuProps extends React.Props

{ - index: number; - text?: string; - menuItems: MenuItemRequest[]; - zDepth?: number; - active?: boolean; - onItemTap?: ItemTapEventHandler; - menuItemStyle?: React.CSSProperties; - style?: React.CSSProperties; - } - export class Menu extends React.Component { - } - - interface MenuItemProps extends React.Props { - index: number; - icon?: React.ReactElement; - iconClassName?: string; - iconRightClassName?: string; - iconStyle?: React.CSSProperties; - iconRightStyle?: React.CSSProperties; - attribute?: string; - number?: string; - data?: string; - toggle?: boolean; - onTouchTap?: (e: React.MouseEvent, key: number) => void; - onToggle?: (e: React.MouseEvent, key: number, toggled: boolean) => void; - selected?: boolean; - active?: boolean; - style?: React.CSSProperties; - value?: any; - } - export class MenuItem extends React.Component { - static Types: { LINK: string, SUBHEADER: string, NESTED: string, } - } - } - export namespace Mixins { interface ClickAwayable extends React.Mixin { } @@ -847,8 +763,6 @@ declare namespace __MaterialUI { displayMember?: string; valueMember?: string; autoWidth?: boolean; - menuItems?: Menu.MenuItemRequest[]; - menuItemStyle?: React.CSSProperties; selectedIndex?: number; underlineStyle?: React.CSSProperties; iconStyle?: React.CSSProperties; @@ -1719,13 +1633,8 @@ declare module 'material-ui/lib/dialog' { export default Dialog; } -declare module 'material-ui/lib/drop-down-icon' { - export import DropDownIcon = __MaterialUI.DropDownIcon; - export default DropDownIcon; -} - declare module 'material-ui/lib/drop-down-menu' { - export import DropDownMenu = __MaterialUI.DropDownMenu; + export import DropDownMenu = __MaterialUI.Menus.DropDownMenu; export default DropDownMenu; } @@ -1734,6 +1643,11 @@ declare module 'material-ui/lib/DropDownMenu/DropDownMenu' { export default DropDownMenu; } +declare module 'material-ui/lib/DropDownMenu' { + export import DropDownMenu = __MaterialUI.Menus.DropDownMenu; + export default DropDownMenu; +} + declare module 'material-ui/lib/enhanced-button' { export import EnhancedButton = __MaterialUI.EnhancedButton; export default EnhancedButton; @@ -1789,16 +1703,6 @@ declare module 'material-ui/lib/lists/list-item' { export default ListItem; } -declare module 'material-ui/lib/menu/menu' { - export import Menu = __MaterialUI.Menu.Menu; - export default Menu; -} - -declare module 'material-ui/lib/menu/menu-item' { - export import MenuItem = __MaterialUI.Menu.MenuItem; - export default MenuItem; -} - declare module 'material-ui/lib/mixins/' { export import ClickAwayable = __MaterialUI.Mixins.ClickAwayable; // require('material-ui/lib/mixins/click-awayable'); export import WindowListenable = __MaterialUI.Mixins.WindowListenable; // require('material-ui/lib/mixins/window-listenable');