Merge pull request #243 from hyperapp/feat/actions-return-sub-state

Return the state fragment to the caller if the action is a reducer.
jorgebucaran · Jun 23, 2017 · 04c84d4 · 04c84d4
2 parents 76af871 + 4e21e24
commit 04c84d4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/app.js b/src/app.js
@@ -44,11 +44,11 @@ export default function(app) {
             emit
           )
 
-          if (result == null || typeof result.then === "function") {
-            return result
+          if (result != null && typeof result.then !== "function") {
+            render((state = merge(state, emit("update", result))), view)
           }
 
-          render((state = merge(state, emit("update", result))), view)
+          return result
         }
       } else {
         init(namespace[key] || (namespace[key] = {}), action, name)