Small fixes (#10)

- fixed possible memory leak
- fixed possible missing subscription bug
- fixed bug of updating the state of an unmounted component

Author: nulldef

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbrellio/observable",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Observable library",
   "repository": "git@github.com:umbrellio/observable.git",
   "author": "Aleksei Bespalov <nulldefiner@gmail.com>",

src/multipleObserver.js

@@ -1,21 +1,27 @@
 import React from "react"
 
 const multipleObserver = stores => WrappedComponent => {
+  const reduceStates = stores => {
+    return stores.reduce((acc, { key, store }) => ({ ...acc, [key]: { ...store.getState() } }), {})
+  }
+
   return class extends React.Component {
     static displayName = `${stores.map(s => s.key).join(" ")} State Observer`
 
-    state = stores.reduce((acc, { key, store }) => ({ ...acc, [key]: { ...store } }), {})
+    state = reduceStates(stores)
     mounted = false
 
     componentDidMount () {
       this.mounted = true
       this.unsubscribes = stores.map(({ key, store }) => store.subscribe(data => {
         this.mounted && this.setState({ [key]: data })
       }))
+      this.setState(reduceStates(stores))
     }
 
     componentWillUnmount () {
       this.unsubscribes.forEach(fn => fn())
+      this.unsubscribes = []
       this.mounted = false
     }
 

src/observer.js

@@ -5,14 +5,20 @@ const observer = (store, { key, map }) => WrappedComponent => {
     static displayName = `${key} State Observer`
 
     state = { ...store.getState() }
+    mounted = false
 
-    constructor (props) {
-      super(props)
-      this.unsubscribe = store.subscribe(data => this.setState(data))
+    componentDidMount () {
+      this.mounted = true
+      this.unsubscribe = store.subscribe(data => {
+        this.mounted && this.setState(data)
+      })
+      this.setState({ ...store.getState() })
     }
 
     componentWillUnmount () {
       this.unsubscribe()
+      this.unsubscribe = null
+      this.mounted = false
     }
 
     render () {