merge prefilledState with defaultState in reducers on redux-specific …

…actions

packages/redux-subspace/src/actions/processAction.js

@@ -8,9 +8,10 @@
 
 import hasNamespace from '../actions/hasNamespace'
 import isGlobal from '../actions/isGlobal'
+import isReduxSpecific from '../actions/reduxSpecific'
 
 const processAction = (namespace) => (action, callback, defaultValue) => {
-    if (!namespace || isGlobal(action)) {
+    if (!namespace || isGlobal(action) || isReduxSpecific(action)) {
         return callback(action)
     } else if (hasNamespace(action, namespace)) {
         return callback({...action, type: action.type.substring(namespace.length + 1)})

packages/redux-subspace/src/actions/reduxSpecific.js

@@ -0,0 +1,13 @@
+/**
+ * Copyright 2017, IOOF Holdings Limited.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const REDUX_PREFIX = '@@redux/'
+
+const reduxSpecific = (action) => action.type.startsWith(REDUX_PREFIX)
+
+export default reduxSpecific

packages/redux-subspace/src/reducers/namespaced.js

@@ -15,8 +15,6 @@ export default (namespace) => {
             return reducer(state, action)
         }
 
-        const defaultState = reducer(state, action)
-
-        return actionProcessor(action, (transformedAction) => reducer(state, transformedAction), defaultState)
+        return actionProcessor(action, (transformedAction) => reducer(state, transformedAction), state)
     }
 }