Merge pull request #3306 from newoga/#3305/left-nav

[LeftNav] Remove window-listenable mixin
mui · Feb 12, 2016 · 956c200 · 956c200
2 parents f0fc7e7 + c623471
commit 956c200
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/left-nav.jsx b/src/left-nav.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import EventListener from 'react-event-listener';
 import KeyCode from './utils/key-code';
 import autoPrefix from './styles/auto-prefix';
 import Transitions from './styles/transitions';
-import WindowListenable from './mixins/window-listenable';
 import Overlay from './overlay';
 import Paper from './paper';
 import getMuiTheme from './styles/getMuiTheme';
@@ -92,10 +92,6 @@ const LeftNav = React.createClass({
     muiTheme: React.PropTypes.object,
   },
 
-  mixins: [
-    WindowListenable,
-  ],
-
   getDefaultProps() {
     return {
       disableSwipeToOpen: false,
@@ -150,10 +146,6 @@ const LeftNav = React.createClass({
     this._disableSwipeHandling();
   },
 
-  windowListeners: {
-    keyup: '_onWindowKeyUp',
-  },
-
   getStyles() {
     const muiTheme = this.state.muiTheme;
     const theme = muiTheme.leftNav;
@@ -386,6 +378,7 @@ const LeftNav = React.createClass({
 
     return (
       <div>
+        <EventListener elementName="window" onKeyUp={this._onWindowKeyUp} />
         {overlay}
         <Paper
           ref="clickAwayableElement"