Use initialActiveRoutes/Params/Query instead of initialActiveState

Author: mjackson

modules/mixins/ActiveContext.js

@@ -30,22 +30,24 @@ function queryIsActive(activeQuery, query) {
 var ActiveContext = {
 
   propTypes: {
-    initialActiveState: React.PropTypes.object
+    initialActiveRoutes: React.PropTypes.array.isRequired,
+    initialActiveParams: React.PropTypes.object.isRequired,
+    initialActiveQuery: React.PropTypes.object.isRequired
   },
 
   getDefaultProps: function () {
     return {
-      initialActiveState: {}
+      initialActiveRoutes: [],
+      initialActiveParams: {},
+      initialActiveQuery: {}
     };
   },
 
   getInitialState: function () {
-    var state = this.props.initialActiveState;
-
     return {
-      activeRoutes: state.activeRoutes || [],
-      activeParams: state.activeParams || {},
-      activeQuery: state.activeQuery || {}
+      activeRoutes: this.props.initialActiveRoutes,
+      activeParams: this.props.initialActiveParams,
+      activeQuery: this.props.initialActiveQuery
     };
   },
 

modules/mixins/__tests__/ActiveContext-test.js

@@ -24,9 +24,7 @@ describe('ActiveContext', function () {
       beforeEach(function () {
         component = ReactTestUtils.renderIntoDocument(
           App({
-            initialActiveState: {
-              activeRoutes: [ route ]
-            }
+            initialActiveRoutes: [ route ]
           })
         );
       });
@@ -45,11 +43,9 @@ describe('ActiveContext', function () {
       beforeEach(function () {
         component = ReactTestUtils.renderIntoDocument(
           App({
-            initialActiveState: {
-              activeRoutes: [ route ],
-              activeParams: { id: '123', show: 'true', variant: 456 },
-              activeQuery: { search: 'abc', limit: 789 }
-            }
+            initialActiveRoutes: [ route ],
+            initialActiveParams: { id: '123', show: 'true', variant: 456 },
+            initialActiveQuery: { search: 'abc', limit: 789 }
           })
         );
       });
@@ -82,10 +78,8 @@ describe('ActiveContext', function () {
       beforeEach(function () {
         component = ReactTestUtils.renderIntoDocument(
           App({
-            initialActiveState: {
-              activeRoutes: [ route ],
-              activeParams: { id: 123 }
-            }
+            initialActiveRoutes: [ route ],
+            initialActiveParams: { id: 123 }
           })
         );
       });