Merge remote-tracking branch 'origin/develop' into develop

2017-11-04 15:42:03 +00:00 · 2017-11-04 15:42:03 +00:00 · ae844a048f
commit ae844a048f
parent 107f83f84f 3fd5937687
1 changed files with 3 additions and 5 deletions
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@ -26,11 +26,9 @@ class MenuOption extends React.Component {
        this._onClick = this._onClick.bind(this);
    }

-    getDefaultProps() {
-        return {
+    static defaultProps = {
        disabled: false,
    };
-    }

    _onMouseEnter() {
        this.props.onMouseEnter(this.props.dropdownKey);