Merge pull request #313 from FormidableLabs/bug/update-tickValues

use tickFormat strings when no tickValues exist
FormidableLabs · Oct 19, 2017 · 2989e84 · 2989e84
2 parents 1647965 + 98f0294
commit 2989e84
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/victory-util/data.js b/src/victory-util/data.js
@@ -213,10 +213,13 @@ export default {
    * @returns {Array} an array of strings
    */
   getStringsFromAxes(props, axis) {
-    if (!props.tickValues || (!Array.isArray(props.tickValues) && !props.tickValues[axis])) {
-      return [];
+    const { tickValues, tickFormat } = props;
+    let tickValueArray;
+    if (!tickValues || (!Array.isArray(tickValues) && !tickValues[axis])) {
+      tickValueArray = tickFormat && Array.isArray(tickFormat) ? tickFormat : [];
+    } else {
+      tickValueArray = tickValues[axis] || tickValues;
     }
-    const tickValueArray = props.tickValues[axis] || props.tickValues;
     return tickValueArray.filter((val) => typeof val === "string");
   },