Merge pull request #1227 from FormidableLabs/bug/parent-events-use-in…

…correct-key alter reduceChildren to fix parent events regression
FormidableLabs · Jan 9, 2019 · 8955aef · 8955aef
2 parents 5ebe716 + 5db0c8f
commit 8955aef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/demo/components/events-demo.js b/demo/components/events-demo.js
@@ -202,7 +202,7 @@ class App extends React.Component {
                         childName: ["area-3", "area-4"],
                         target: "data",
                         mutation: (props) => {
-                          const fill = props.style.fill;
+                          const fill = props.style && props.style.fill;
                           return fill === "gold" ? null : { style: { fill: "gold" } };
                         }
                       }

diff --git a/packages/victory-core/src/victory-util/helpers.js b/packages/victory-core/src/victory-util/helpers.js
@@ -231,9 +231,7 @@ function reduceChildren(
         memo = combine(memo, nestedResults);
       } else {
         const result = iteratee(child, childName, parent);
-        if (Array.isArray(result)) {
-          memo = result.reduce(combine, memo);
-        } else if (result) {
+        if (result) {
           memo = combine(memo, result);
         }
       }

diff --git a/packages/victory-core/src/victory-util/wrapper.js b/packages/victory-core/src/victory-util/wrapper.js
@@ -298,11 +298,14 @@ export default {
     };
 
     const initialMemo = { x: [], y: [] };
-    const combine = (memo, datum) => ({
-      x: datum.x !== undefined ? memo.x.concat(datum.x) : memo.x,
-      y: datum.y !== undefined ? memo.y.concat(datum.y) : memo.y
-    });
-
+    const combine = (memo, datum) => {
+      const x = Array.isArray(datum) ? datum.map((d) => d.x).filter(Boolean) : datum.x;
+      const y = Array.isArray(datum) ? datum.map((d) => d.y).filter(Boolean) : datum.y;
+      return {
+        x: x !== undefined ? memo.x.concat(x) : memo.x,
+        y: y !== undefined ? memo.y.concat(y) : memo.y
+      };
+    };
     return Helpers.reduceChildren(childComponents.slice(0), iteratee, {}, initialMemo, combine);
   },