victory-bar 36.0.0 → 36.2.2

package/src/bar.js

@@ -1,100 +1,9 @@
-import React from "react";
+import { assign } from "lodash";
 import PropTypes from "prop-types";
-import { Helpers, CommonProps, Path } from "victory-core";
-import { assign, isPlainObject, isNil } from "lodash";
-
-import {
-  getVerticalBarPath,
-  getHorizontalBarPath,
-  getVerticalPolarBarPath,
-  getCustomBarPath
-} from "./path-helper-methods";
-
-const getBarPath = (props, width, cornerRadius) => {
-  if (props.getPath) {
-    return getCustomBarPath(props, width);
-  }
-
-  return props.horizontal
-    ? getHorizontalBarPath(props, width, cornerRadius)
-    : getVerticalBarPath(props, width, cornerRadius);
-};
-
-const getPolarBarPath = (props, cornerRadius) => {
-  // TODO Radial bars
-  return getVerticalPolarBarPath(props, cornerRadius);
-};
-
-const getBarWidth = (barWidth, props) => {
-  const { scale, data, defaultBarWidth, style } = props;
-  if (barWidth) {
-    return Helpers.evaluateProp(barWidth, props);
-  } else if (style.width) {
-    return style.width;
-  }
-  const range = scale.x.range();
-  const extent = Math.abs(range[1] - range[0]);
-  const bars = data.length + 2;
-  const barRatio = props.barRatio || 0.5;
-  const defaultWidth =
-    barRatio * (data.length < 2 ? defaultBarWidth : extent / bars);
-  return Math.max(1, defaultWidth);
-};
-
-const getCornerRadiusFromObject = (cornerRadius, props) => {
-  const realCornerRadius = {
-    topLeft: 0,
-    topRight: 0,
-    bottomLeft: 0,
-    bottomRight: 0
-  };
-  const updateCornerRadius = (corner, fallback) => {
-    if (!isNil(cornerRadius[corner])) {
-      realCornerRadius[corner] = Helpers.evaluateProp(
-        cornerRadius[corner],
-        props
-      );
-    } else if (!isNil(cornerRadius[fallback])) {
-      realCornerRadius[corner] = Helpers.evaluateProp(
-        cornerRadius[fallback],
-        props
-      );
-    }
-  };
-  updateCornerRadius("topLeft", "top");
-  updateCornerRadius("topRight", "top");
-  updateCornerRadius("bottomLeft", "bottom");
-  updateCornerRadius("bottomRight", "bottom");
-  return realCornerRadius;
-};
-
-const getCornerRadius = (cornerRadius, props) => {
-  const realCornerRadius = {
-    topLeft: 0,
-    topRight: 0,
-    bottomLeft: 0,
-    bottomRight: 0
-  };
-  if (!cornerRadius) {
-    return realCornerRadius;
-  }
-  if (isPlainObject(cornerRadius)) {
-    return getCornerRadiusFromObject(cornerRadius, props);
-  } else {
-    realCornerRadius.topLeft = Helpers.evaluateProp(cornerRadius, props);
-    realCornerRadius.topRight = Helpers.evaluateProp(cornerRadius, props);
-    return realCornerRadius;
-  }
-};
-
-const getStyle = (style = {}, props) => {
-  if (props.disableInlineStyles) {
-    return {};
-  }
-  const stroke = style.fill || "black";
-  const baseStyle = { fill: "black", stroke };
-  return Helpers.evaluateStyle(assign(baseStyle, style), props);
-};
+import React from "react";
+import { CommonProps, Helpers, Path } from "victory-core";
+import { getStyle, getBarWidth, getCornerRadius } from "./bar-helper-methods";
+import { getPolarBarPath, getBarPath } from "./path-helper-methods";
 
 const evaluateProps = (props) => {
   /**

package/src/helper-methods.js

@@ -1,11 +1,11 @@
 import { assign, isNil } from "lodash";
 import {
-  Helpers,
-  LabelHelpers,
+  Collection,
   Data,
   Domain,
-  Scale,
-  Collection
+  Helpers,
+  LabelHelpers,
+  Scale
 } from "victory-core";
 
 export const getBarPosition = (props, datum) => {

package/src/index.js

@@ -4,5 +4,9 @@ export { getBarPosition } from "./helper-methods";
 export {
   getVerticalBarPath,
   getHorizontalBarPath,
-  getVerticalPolarBarPath
+  getVerticalPolarBarPath,
+  getCustomBarPath,
+  getPolarBarPath,
+  getBarPath
 } from "./path-helper-methods";
+export { getBarWidth, getStyle, getCornerRadius } from "./bar-helper-methods";

package/src/path-helper-methods.js

@@ -407,3 +407,18 @@ export const getVerticalPolarBarPath = (props, cornerRadius) => {
   }, "");
   return `${path} z`;
 };
+
+export const getBarPath = (props, width, cornerRadius) => {
+  if (props.getPath) {
+    return getCustomBarPath(props, width);
+  }
+
+  return props.horizontal
+    ? getHorizontalBarPath(props, width, cornerRadius)
+    : getVerticalBarPath(props, width, cornerRadius);
+};
+
+export const getPolarBarPath = (props, cornerRadius) => {
+  // TODO Radial bars
+  return getVerticalPolarBarPath(props, cornerRadius);
+};