Completely updated React, fixed #11, (hopefully)

goTorrentWebUI/node_modules/material-ui/es/Menu/Menu.js

@@ -1,24 +1,21 @@
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
-function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
-
+import _extends from 'babel-runtime/helpers/extends';
+import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
 // @inheritedComponent Popover
 
 import React from 'react';
-
+import PropTypes from 'prop-types';
 import { findDOMNode } from 'react-dom';
 import getScrollbarSize from 'dom-helpers/util/scrollbarSize';
 import withStyles from '../styles/withStyles';
 import Popover from '../Popover';
 import MenuList from './MenuList';
 
-
-const rtlOrigin = {
+const RTL_ORIGIN = {
   vertical: 'top',
   horizontal: 'right'
 };
 
-const ltrOrigin = {
+const LTR_ORIGIN = {
   vertical: 'top',
   horizontal: 'left'
 };
@@ -40,26 +37,22 @@ class Menu extends React.Component {
 
     return _temp = super(...args), this.getContentAnchorEl = () => {
       if (!this.menuList || !this.menuList.selectedItem) {
-        // $FlowFixMe
         return findDOMNode(this.menuList).firstChild;
       }
 
       return findDOMNode(this.menuList.selectedItem);
     }, this.menuList = undefined, this.focus = () => {
       if (this.menuList && this.menuList.selectedItem) {
-        // $FlowFixMe
         findDOMNode(this.menuList.selectedItem).focus();
         return;
       }
 
       const menuList = findDOMNode(this.menuList);
       if (menuList && menuList.firstChild) {
-        // $FlowFixMe
         menuList.firstChild.focus();
       }
     }, this.handleEnter = element => {
       const { theme } = this.props;
-
       const menuList = findDOMNode(this.menuList);
 
       // Focus so the scroll computation of the Popover works as expected.
@@ -67,12 +60,9 @@ class Menu extends React.Component {
 
       // Let's ignore that piece of logic if users are already overriding the width
       // of the menu.
-      // $FlowFixMe
       if (menuList && element.clientHeight < menuList.clientHeight && !menuList.style.width) {
         const size = `${getScrollbarSize()}px`;
-        // $FlowFixMe
         menuList.style[theme.direction === 'rtl' ? 'paddingLeft' : 'paddingRight'] = size;
-        // $FlowFixMe
         menuList.style.width = `calc(100% + ${size})`;
       }
 
@@ -83,8 +73,8 @@ class Menu extends React.Component {
       if (key === 'tab') {
         event.preventDefault();
 
-        if (this.props.onRequestClose) {
-          this.props.onRequestClose(event);
+        if (this.props.onClose) {
+          this.props.onClose(event);
         }
       }
     }, _temp;
@@ -96,14 +86,6 @@ class Menu extends React.Component {
     }
   }
 
-  componentDidUpdate(prevProps) {
-    if (!prevProps.open && this.props.open) {
-      // Needs to refocus as when a menu is rendered into another Modal,
-      // the first modal might change the focus to prevent any leak.
-      this.focus();
-    }
-  }
-
   render() {
     const _props = this.props,
           {
@@ -123,8 +105,8 @@ class Menu extends React.Component {
         getContentAnchorEl: this.getContentAnchorEl,
         classes: PopoverClasses,
         onEnter: this.handleEnter,
-        anchorOrigin: theme.direction === 'rtl' ? rtlOrigin : ltrOrigin,
-        transformOrigin: theme.direction === 'rtl' ? rtlOrigin : ltrOrigin,
+        anchorOrigin: theme.direction === 'rtl' ? RTL_ORIGIN : LTR_ORIGIN,
+        transformOrigin: theme.direction === 'rtl' ? RTL_ORIGIN : LTR_ORIGIN,
         PaperProps: _extends({}, PaperProps, {
           classes: _extends({}, PaperProps.classes, {
             root: classes.paper
@@ -134,7 +116,6 @@ class Menu extends React.Component {
       React.createElement(
         MenuList,
         _extends({
-          'data-mui-test': 'Menu',
           role: 'menu',
           onKeyDown: this.handleListKeyDown
         }, MenuListProps, {
@@ -148,8 +129,77 @@ class Menu extends React.Component {
   }
 }
 
+Menu.propTypes = process.env.NODE_ENV !== "production" ? {
+  /**
+   * The DOM element used to set the position of the menu.
+   */
+  anchorEl: PropTypes.object,
+  /**
+   * Menu contents, normally `MenuItem`s.
+   */
+  children: PropTypes.node,
+  /**
+   * Useful to extend the style applied to components.
+   */
+  classes: PropTypes.object.isRequired,
+  /**
+   * Properties applied to the `MenuList` element.
+   */
+  MenuListProps: PropTypes.object,
+  /**
+   * Callback fired when the component requests to be closed.
+   *
+   * @param {object} event The event source of the callback
+   */
+  onClose: PropTypes.func,
+  /**
+   * Callback fired before the Menu enters.
+   */
+  onEnter: PropTypes.func,
+  /**
+   * Callback fired when the Menu has entered.
+   */
+  onEntered: PropTypes.func,
+  /**
+   * Callback fired when the Menu is entering.
+   */
+  onEntering: PropTypes.func,
+  /**
+   * Callback fired before the Menu exits.
+   */
+  onExit: PropTypes.func,
+  /**
+   * Callback fired when the Menu has exited.
+   */
+  onExited: PropTypes.func,
+  /**
+   * Callback fired when the Menu is exiting.
+   */
+  onExiting: PropTypes.func,
+  /**
+   * If `true`, the menu is visible.
+   */
+  open: PropTypes.bool.isRequired,
+  /**
+   * @ignore
+   */
+  PaperProps: PropTypes.object,
+  /**
+   * `classes` property applied to the `Popover` element.
+   */
+  PopoverClasses: PropTypes.object,
+  /**
+   * @ignore
+   */
+  theme: PropTypes.object.isRequired,
+  /**
+   * The length of the transition in `ms`, or 'auto'
+   */
+  transitionDuration: PropTypes.oneOfType([PropTypes.number, PropTypes.shape({ enter: PropTypes.number, exit: PropTypes.number }), PropTypes.oneOf(['auto'])])
+} : {};
+
 Menu.defaultProps = {
-  open: false,
   transitionDuration: 'auto'
 };
-export default withStyles(styles, { withTheme: true, name: 'MuiMenu' })(Menu);
+
+export default withStyles(styles, { name: 'MuiMenu', withTheme: true })(Menu);