amazing-react-charts 0.4.9 → 0.4.10

package/dist/core/VerticalBarChart.js

@@ -236,7 +236,7 @@ var VerticalBarChart = function VerticalBarChart(props) {
         value = _chartValues$.value;
     var complement = tooltipComplement ? tooltipComplement : '';
     var values = yType === 'time' ? (0, _auxiliarFunctions.timeConvert)(Number(value)) + 'h' : (0, _auxiliarFunctions.takeLabelComplement)(Number(value), yComplement);
-    var labelPrint = xType === 'time' ? (0, _auxiliarFunctions.formatTooltip)(axisValueLabel) : axisValueLabel;
+    var labelPrint = xType === 'time' ? (0, _auxiliarFunctions.formatTooltip)(axisValueLabel, dateFormat === 'yyyy-MM' ? 'MMM/yy' : 'dd/MM/yyyy') : axisValueLabel;
     return "".concat(label, ": ").concat(labelPrint, " <br>") + "".concat(result, ": ").concat(values, " <br>") + complement;
   };
 
@@ -282,7 +282,7 @@ var VerticalBarChart = function VerticalBarChart(props) {
       axisLabel: {
         rotate: rotateLabel && rotateLabel,
         formatter: function formatter(item) {
-          return xType === 'time' ? (0, _auxiliarFunctions.formatTime)(item, dateFormat != null ? dateFormat : 'dd MMM') : specialLabel(item);
+          return xType === 'time' ? (0, _auxiliarFunctions.formatTime)(item, dateFormat === 'yyyy-MM' ? 'MMM/yy' : 'dd/MM/yyyy') : specialLabel(item);
         },
         interval: 0,
         fontSize: 11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amazing-react-charts",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "An amazing react charts package based in echarts",
   "license": "MIT",
   "main": "dist/index.js",

package/src/core/VerticalBarChart.tsx

@@ -226,7 +226,12 @@ const VerticalBarChart = (props: IProps) => {
         : takeLabelComplement(Number(value), yComplement)
 
     const labelPrint =
-      xType === 'time' ? formatTooltip(axisValueLabel) : axisValueLabel
+      xType === 'time' 
+        ? formatTooltip(
+          axisValueLabel,
+          dateFormat === 'yyyy-MM' ? 'MMM/yy' : 'dd/MM/yyyy'
+        )
+        : axisValueLabel
 
     return (
       `${label}: ${labelPrint} <br>` + `${result}: ${values} <br>` + complement
@@ -284,7 +289,7 @@ const VerticalBarChart = (props: IProps) => {
       axisLabel: {
         rotate: rotateLabel && rotateLabel,
         formatter: (item: string) => xType === 'time'
-          ? formatTime(item, dateFormat != null ? dateFormat : 'dd MMM')
+          ? formatTime(item, dateFormat === 'yyyy-MM' ? 'MMM/yy' : 'dd/MM/yyyy')
           : specialLabel(item),
         interval: 0,
         fontSize: 11