chore: fix lint

react-component · Apr 19, 2018 · e1d27b9 · e1d27b9
1 parent f64f09f
commit e1d27b9
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 99 deletions.
diff --git a/examples/selectedKeys.js b/examples/selectedKeys.js
@@ -139,7 +139,6 @@ class Test extends React.Component {
       <div style={{ width: 400 }}>{this.getMenu()}</div>
     </div>);
   }
-};
-
+}
 
 ReactDOM.render(<Test />, document.getElementById('__react-content'));
diff --git a/package.json b/package.json
@@ -75,7 +75,6 @@
   "dependencies": {
     "babel-runtime": "6.x",
     "classnames": "2.x",
-    "create-react-class": "^15.5.2",
     "dom-scroll-into-view": "1.x",
     "mini-store": "^1.1.0",
     "prop-types": "^15.5.6",

diff --git a/src/Menu.jsx b/src/Menu.jsx
@@ -184,7 +184,7 @@ export default class Menu extends React.Component {
   }
 
   render() {
-    let { children, ...props } = this.props;
+    let { ...props } = this.props;
     props.className += ` ${props.prefixCls}-root`;
     props = {
       ...props,
@@ -194,11 +194,11 @@ export default class Menu extends React.Component {
       onSelect: this.onSelect,
       openTransitionName: this.getOpenTransitionName(),
       parentMenu: this,
-    }
+    };
     return (
       <Provider store={this.store}>
-        <SubPopupMenu {...props} ref={c => this.innerMenu = c}>{children}</SubPopupMenu>
+        <SubPopupMenu {...props} ref={c => this.innerMenu = c}>{this.props.children}</SubPopupMenu>
       </Provider>
     );
   }
-};
+}
diff --git a/src/MenuItem.jsx b/src/MenuItem.jsx
@@ -26,23 +26,20 @@ export class MenuItem extends React.Component {
     onDestroy: PropTypes.func,
     onMouseEnter: PropTypes.func,
     onMouseLeave: PropTypes.func,
+    multiple: PropTypes.bool,
+    isSelected: PropTypes.bool,
+    manualRef: PropTypes.func,
   };
 
   static defaultProps = {
     onSelect: noop,
     onMouseEnter: noop,
     onMouseLeave: noop,
+    manualRef: noop,
   };
 
   constructor(props) {
     super(props);
-  } 
-
-  componentWillUnmount() {
-    const props = this.props;
-    if (props.onDestroy) {
-      props.onDestroy(props.eventKey);
-    }
   }
 
   componentDidMount() {
@@ -60,6 +57,13 @@ export class MenuItem extends React.Component {
     this.callRef();
   }
 
+  componentWillUnmount() {
+    const props = this.props;
+    if (props.onDestroy) {
+      props.onDestroy(props.eventKey);
+    }
+  }
+
   onKeyDown = (e) => {
     const keyCode = e.keyCode;
     if (keyCode === KeyCode.ENTER) {

diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx
@@ -6,6 +6,7 @@ class MenuItemGroup extends React.Component {
     renderMenuItem: PropTypes.func,
     index: PropTypes.number,
     className: PropTypes.string,
+    subMenuKey: PropTypes.string,
     rootPrefixCls: PropTypes.string,
   };
 

diff --git a/src/SubMenu.jsx b/src/SubMenu.jsx
@@ -58,6 +58,9 @@ export class SubMenu extends React.Component {
     onTitleMouseLeave: PropTypes.func,
     onTitleClick: PropTypes.func,
     isOpen: PropTypes.bool,
+    store: PropTypes.object,
+    mode: PropTypes.oneOf(['horizontal', 'vertical', 'vertical-left', 'vertical-right', 'inline']),
+    manualRef: PropTypes.func,
   };
 
   static defaultProps = {
@@ -66,6 +69,8 @@ export class SubMenu extends React.Component {
     onTitleMouseEnter: noop,
     onTitleMouseLeave: noop,
     onTitleClick: noop,
+    manualRef: noop,
+    mode: 'vertical',
     title: '',
   };
 
@@ -90,20 +95,6 @@ export class SubMenu extends React.Component {
     this.componentDidUpdate();
   }
 
-  adjustWidth = () => {
-    /* istanbul ignore if */
-    if (!this.subMenuTitle || !this.menuInstance) {
-      return;
-    }
-    const popupMenu = ReactDOM.findDOMNode(this.menuInstance);
-    if (popupMenu.offsetWidth >= this.subMenuTitle.offsetWidth) {
-      return;
-    }
-
-    /* istanbul ignore next */
-    popupMenu.style.minWidth = `${this.subMenuTitle.offsetWidth}px`;
-  };
-
   componentDidUpdate() {
     const { mode, parentMenu, manualRef } = this.props;
 
@@ -134,9 +125,9 @@ export class SubMenu extends React.Component {
     if (this.mouseenterTimeout) {
       clearTimeout(this.mouseenterTimeout);
     }
-  };
+  }
 
-  onDestroy(key) {
+  onDestroy = (key) => {
     this.props.onDestroy(key);
   };
 
@@ -325,6 +316,24 @@ export class SubMenu extends React.Component {
     return this.props.openKeys.indexOf(this.props.eventKey) !== -1;
   }
 
+  adjustWidth = () => {
+    /* istanbul ignore if */
+    if (!this.subMenuTitle || !this.menuInstance) {
+      return;
+    }
+    const popupMenu = ReactDOM.findDOMNode(this.menuInstance);
+    if (popupMenu.offsetWidth >= this.subMenuTitle.offsetWidth) {
+      return;
+    }
+
+    /* istanbul ignore next */
+    popupMenu.style.minWidth = `${this.subMenuTitle.offsetWidth}px`;
+  };
+
+  saveSubMenuTitle = (subMenuTitle) => {
+    this.subMenuTitle = subMenuTitle;
+  }
+
   renderChildren(children) {
     const props = this.props;
     const baseProps = {
@@ -394,10 +403,6 @@ export class SubMenu extends React.Component {
     );
   }
 
-  saveSubMenuTitle = (subMenuTitle) => {
-    this.subMenuTitle = subMenuTitle;
-  }
-
   render() {
     const props = this.props;
     const isOpen = props.isOpen;
@@ -490,7 +495,7 @@ export class SubMenu extends React.Component {
       </li>
     );
   }
-};
+}
 
 const connected = connect(({ openKeys, activeKey, selectedKeys }, { eventKey, subMenuKey }) => ({
   isOpen: openKeys.indexOf(eventKey) > -1,