Add umount and check for window before mount

egdbear · Dec 14, 2018 · 71e85d3 · 71e85d3
1 parent 4640704
commit 71e85d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -10,15 +10,22 @@ export default class MediaQuery extends React.Component {
   mql = null;
 
   componentDidMount() {
+    if (typeof window !== 'object') return;
+
     const { media } = this.props;
     const mediaToMatch = mediaQueries[media] || media;
     this.mql = window.matchMedia(mediaToMatch);
     this.mql.addListener(this.onMediaChange);
+
     if (this.mql.matches) {
-      this.setState({ matched: true });
+      this.onMediaChange();
     }
   }
 
+  componentWillUnmount() {
+    this.mql = null;
+  }
+
   onMediaChange = () => {
     this.setState({ matched: this.mql.matches });
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-simple-matchmedia",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "description": "React component used for matching media queries",
   "main": "build/index.cjs.js",
   "module": "build/index.es.js",