Merge pull request #4537 from vizath/IE-polyfill-fix

[ClickAwayListener] Add better support for IE11
mui · Jun 29, 2016 · 6041d9c · 6041d9c
2 parents 6a94615 + fb43c59
commit 6041d9c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -20,6 +20,7 @@
     "android:setup-port": "adb reverse tcp:8081 tcp:8081"
   },
   "dependencies": {
+    "babel-polyfill": "^6.9.1",
     "react-title-component": "^1.0.1",
     "simple-assign": "^0.1.0"
   },

diff --git a/docs/webpack-dev-server.config.js b/docs/webpack-dev-server.config.js
@@ -8,6 +8,7 @@ const config = {
   entry: [
     'webpack/hot/dev-server',
     'webpack/hot/only-dev-server',
+    './node_modules/babel-polyfill/lib/index.js',
     path.resolve(__dirname, 'src/app/app.js'),
   ],
   // Webpack config options on how to obtain modules
@@ -44,9 +45,6 @@ const config = {
       {from: 'src/www/index.html'},
     ]),
   ],
-  externals: {
-    fs: 'js', // To remove once https://github.com/benjamn/recast/pull/238 is released
-  },
   module: {
     // Allow loading of non-es
     loaders: [

diff --git a/docs/webpack-production.config.js b/docs/webpack-production.config.js
@@ -6,6 +6,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const config = {
   // Entry point to the project
   entry: [
+    './node_modules/babel-polyfill/lib/index.js',
     path.resolve(__dirname, 'src/app/app.js'),
   ],
   // Webpack config options on how to obtain modules
@@ -56,9 +57,6 @@ const config = {
       {from: 'src/www/versions.json'},
     ]),
   ],
-  externals: {
-    fs: 'fs', // To remove once https://github.com/benjamn/recast/pull/238 is released
-  },
   module: {
     // Allow loading of non-es5 js files.
     loaders: [

diff --git a/src/internal/ClickAwayListener.js b/src/internal/ClickAwayListener.js
@@ -21,6 +21,7 @@ export default class ClickAwayListener extends Component {
   };
 
   componentDidMount() {
+    this.isCurrentlyMounted = true;
     if (this.props.onClickAway) {
       bind(this.handleClickAway);
     }
@@ -36,6 +37,7 @@ export default class ClickAwayListener extends Component {
   }
 
   componentWillUnmount() {
+    this.isCurrentlyMounted = false;
     unbind(this.handleClickAway);
   }
 
@@ -44,10 +46,13 @@ export default class ClickAwayListener extends Component {
       return;
     }
 
-    const el = ReactDOM.findDOMNode(this);
+    // IE11 support, which trigger the handleClickAway even after the unbind
+    if (this.isCurrentlyMounted) {
+      const el = ReactDOM.findDOMNode(this);
 
-    if (document.documentElement.contains(event.target) && !isDescendant(el, event.target)) {
-      this.props.onClickAway(event);
+      if (document.documentElement.contains(event.target) && !isDescendant(el, event.target)) {
+        this.props.onClickAway(event);
+      }
     }
   };