From 695b84d2e357af1381a41ecf1f85962f7c17b91e Mon Sep 17 00:00:00 2001 From: Scott Dickerson Date: Thu, 13 Dec 2018 11:50:41 -0600 Subject: [PATCH 1/3] fix(helper-method): getBaseProps incorrect handles when eventKey is 0 --- packages/victory-bar/src/helper-methods.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/victory-bar/src/helper-methods.js b/packages/victory-bar/src/helper-methods.js index 2b8d1f6fc..d51584ba1 100644 --- a/packages/victory-bar/src/helper-methods.js +++ b/packages/victory-bar/src/helper-methods.js @@ -1,4 +1,4 @@ -import { assign } from "lodash"; +import { assign, isNil } from "lodash"; import { Helpers, LabelHelpers, Data, Domain, Scale } from "victory-core"; const getBarPosition = (props, datum) => { @@ -42,13 +42,15 @@ const getBaseProps = (props, fallbackProps) => { alignment, barRatio, cornerRadius, data, domain, events, height, horizontal, origin, padding, polar, scale, sharedEvents, standalone, style, theme, width, labels, name, barWidth, getPath } = props; - const initialChildProps = { parent: { - domain, scale, width, height, data, standalone, name, - theme, polar, origin, padding, style: style.parent - } }; + const initialChildProps = { + parent: { + domain, scale, width, height, data, standalone, name, + theme, polar, origin, padding, style: style.parent + } + }; return data.reduce((childProps, datum, index) => { - const eventKey = datum.eventKey || index; + const eventKey = !isNil(datum.eventKey) ? datum.eventKey : index; const { x, y, y0, x0 } = getBarPosition(props, datum); const dataProps = { alignment, barRatio, cornerRadius, data, datum, horizontal, index, polar, origin, From 16b56a7af3934e11f52679fcce0f8defedb1ce05 Mon Sep 17 00:00:00 2001 From: Scott Dickerson Date: Thu, 13 Dec 2018 11:55:45 -0600 Subject: [PATCH 2/3] chore(helper-methods): undo formatting --- packages/victory-bar/src/helper-methods.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/victory-bar/src/helper-methods.js b/packages/victory-bar/src/helper-methods.js index d51584ba1..438f28f4f 100644 --- a/packages/victory-bar/src/helper-methods.js +++ b/packages/victory-bar/src/helper-methods.js @@ -42,12 +42,10 @@ const getBaseProps = (props, fallbackProps) => { alignment, barRatio, cornerRadius, data, domain, events, height, horizontal, origin, padding, polar, scale, sharedEvents, standalone, style, theme, width, labels, name, barWidth, getPath } = props; - const initialChildProps = { - parent: { + const initialChildProps = { parent: { domain, scale, width, height, data, standalone, name, theme, polar, origin, padding, style: style.parent - } - }; + } }; return data.reduce((childProps, datum, index) => { const eventKey = !isNil(datum.eventKey) ? datum.eventKey : index; From 144ebe14fe17790e5e7419e51942ebde563ab7cd Mon Sep 17 00:00:00 2001 From: Scott Dickerson Date: Thu, 13 Dec 2018 11:56:19 -0600 Subject: [PATCH 3/3] chore(helper-methods): undo formatting --- packages/victory-bar/src/helper-methods.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/victory-bar/src/helper-methods.js b/packages/victory-bar/src/helper-methods.js index 438f28f4f..0c65aa7c8 100644 --- a/packages/victory-bar/src/helper-methods.js +++ b/packages/victory-bar/src/helper-methods.js @@ -43,8 +43,8 @@ const getBaseProps = (props, fallbackProps) => { polar, scale, sharedEvents, standalone, style, theme, width, labels, name, barWidth, getPath } = props; const initialChildProps = { parent: { - domain, scale, width, height, data, standalone, name, - theme, polar, origin, padding, style: style.parent + domain, scale, width, height, data, standalone, name, + theme, polar, origin, padding, style: style.parent } }; return data.reduce((childProps, datum, index) => {