Prevent skip change event in AltStore

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["react", "es2015", "stage-2"]
+}

package.json

@@ -1,16 +1,17 @@
 {
-  "name": "alt-container",
-  "version": "1.1.1",
+  "name": "@hogangnono/alt-container",
+  "version": "1.1.2",
   "description": "A flux container for alt",
   "main": "lib/AltContainer.js",
   "scripts": {
     "clean": "rimraf lib && rimraf utils",
     "build": "babel src --out-dir lib --stage 0",
+    "prepublishOnly": "npm run build",
     "test": "npm run clean && npm run build && mocha -u exports -R nyan --require ./test/babel test"
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:altjs/container.git"
+    "url": "git@github.com:hogangnono/container.git"
   },
   "keywords": [
     "altcontainer",
@@ -22,28 +23,38 @@
     "flux",
     "react"
   ],
-  "author": "Josh Perez <josh@goatslacker.com>",
+  "author": "hogangnono",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/altjs/container/issues"
+    "url": "https://github.com/hogangnono/container/issues"
   },
-  "homepage": "https://github.com/altjs/container",
+  "homepage": "https://github.com/hogangnono/container",
   "dependencies": {
+    "babel-cli": "^6.26.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-react": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
+    "create-react-class": "^15.6.2",
     "object.assign": "^4.0.1",
-    "prop-types": "^15.5.10"
+    "prop-types": "^15.5.10",
+    "underscore": "^1.8.3"
   },
   "devDependencies": {
     "alt": "0.17.4",
     "alt-utils": "1.0.0",
-    "babel": "5.8.23",
-    "babel-core": "5.8.25",
+    "babel-core": "^6.26.0",
     "chai": "3.3.0",
     "jsdom": "6.5.1",
     "mocha": "2.3.3",
-    "react": "0.14.0",
-    "react-addons-test-utils": "0.14.0",
-    "react-dom": "0.14.0",
+    "react": "^16.2.0",
+    "react-addons-test-utils": "^15.6.2",
+    "react-dom": "^16.2.0",
     "rimraf": "2.4.3",
     "sinon": "1.17.1"
+  },
+  "publishConfig": {
+    "registry": "https://npm.housefeed.com"
   }
 }

src/AltContainer.js

@@ -57,7 +57,8 @@
  */
 import React from 'react'
 import PropTypes from 'prop-types';
-import assign from 'object.assign'
+import assign from 'object.assign';
+import _ from 'underscore';
 
 const id = it => it
 const getStateFromStore = (store, props) => {
@@ -117,11 +118,11 @@ const getStateFromStores = (props) => {
 // what about propTypes?
 class AltContainer extends React.Component {
   static contextTypes = {
-    flux: PropTypes.object,
+    flux: PropTypes.object
   }
 
   static childContextTypes = {
-    flux: PropTypes.object,
+    flux: PropTypes.object
   }
 
   getChildContext() {
@@ -153,6 +154,13 @@ class AltContainer extends React.Component {
   componentDidMount() {
     this._registerStores(this.props)
     if (this.props.onMount) this.props.onMount(this.props, this.context)
+
+    const nextState = reduceState(this.props);
+
+    // Update states when changed before binding listeners
+    if (!_.isEqual(this.state, nextState)) {
+      this.setState(nextState);
+    }
   }
 
   componentWillUnmount() {
@@ -224,18 +232,30 @@ class AltContainer extends React.Component {
 
     // Does not wrap child in a div if we don't have to.
     if (Array.isArray(children)) {
-      return React.createElement(Node, null, children.map((child, i) => {
-        return React.cloneElement(child, assign(
-          { key: i },
-          this.getProps()
-        ))
-      }))
+      return (
+        <React.Fragment>
+          {children.map((child, i) => {
+            if (React.isValidElement(child) && typeof child.type === 'string') {
+              return React.cloneElement(child, { key: i });
+            }
+
+            return React.cloneElement(child, assign(
+              { key: i },
+              this.getProps()
+            ));
+          })}
+        </React.Fragment>
+      );
     } else if (children) {
-      return React.cloneElement(children, this.getProps())
+      if (React.isValidElement(children) && typeof children.type === 'string') {
+        return children;
+      } else {
+        return React.cloneElement(children, this.getProps())
+      }
     } else {
       return React.createElement(Node, this.getProps())
     }
   }
 }
 
-export default AltContainer
+export default AltContainer;

src/AltContainerLegacy.js

@@ -58,8 +58,9 @@
 import React from 'react'
 import mixinContainer from './mixinContainer'
 import assign from 'object.assign'
+import createReactClass from 'create-react-class';
 
-const AltContainer = React.createClass(assign({
+const AltContainer = createReactClass(assign({
   displayName: 'AltContainer',
 
   render() {

src/AltNativeContainerLegacy.js

@@ -7,8 +7,9 @@
 import React from 'react-native'
 import mixinContainer from './mixinContainer'
 import assign from 'object.assign'
+import createReactClass from 'create-react-class';
 
-const AltNativeContainer = React.createClass(assign({
+const AltNativeContainer = createReactClass(assign({
   displayName: 'AltNativeContainer',
 
   render() {

src/mixinContainer.js

@@ -1,6 +1,7 @@
 /*eslint-disable*/
 import assign from 'object.assign'
 import PropTypes from 'prop-types';
+import _ from 'underscore';
 
 const id = it => it
 
@@ -55,6 +56,13 @@ const mixinContainer = (React) => {
     componentDidMount() {
       this.registerStores(this.props)
       if (this.props.onMount) this.props.onMount(this.props, this.context)
+
+      const nextState = reduceState(this.props);
+
+      // Update states when changed before binding listeners
+      if (!_.isEqual(this.state, nextState)) {
+        this.setState(nextState);
+      }
     },
 
     componentWillUnmount() {
@@ -160,6 +168,7 @@ const mixinContainer = (React) => {
 
     altRender(Node) {
       var children = this.props.children
+
       // Custom rendering function
       if (typeof this.props.render === 'function') {
         return this.props.render(this.getProps())
@@ -169,14 +178,26 @@ const mixinContainer = (React) => {
 
       // Does not wrap child in a div if we don't have to.
       if (Array.isArray(children)) {
-        return React.createElement(Node, null, children.map((child, i) => {
-          return cloneElement(child, assign(
-            { key: i },
-            this.getProps()
-          ))
-        }, this))
+        return (
+          <React.Fragment>
+            {children.map((child, i) => {
+              if (React.isValidElement(child) && typeof child.type === 'string') {
+                return React.cloneElement(child, { key: i });
+              }
+
+              return cloneElement(child, assign(
+                { key: i },
+                this.getProps()
+              ));
+            })}
+          </React.Fragment>
+        );
       } else if (children) {
-        return cloneElement(children, this.getProps())
+        if (React.isValidElement(children) && typeof children.type === 'string') {
+          return children;
+        } else {
+          return cloneElement(children, this.getProps())
+        }
       } else {
         return React.createElement(Node, this.getProps())
       }