amazing-react-charts 0.7.7 → 0.7.9

package/dist/core/LineChart.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -11,6 +11,8 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var React = _interopRequireWildcard(require("react"));
 
 var _echartsForReact = _interopRequireDefault(require("echarts-for-react"));
@@ -21,7 +23,7 @@ var _constants = require("../lib/constants");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -60,6 +62,12 @@ var LineChart = function LineChart(props) {
   var names = data.map(function (item) {
     return item.name;
   });
+
+  var formatLabel = function formatLabel(chartValues) {
+    var data = chartValues.data;
+    return yType === 'time' ? (0, _auxiliarFunctions.timeConvert)(Number(data)) + 'h' : (0, _auxiliarFunctions.takeLabelComplement)(Number(data), yComplement);
+  };
+
   var series = data.map(function (item) {
     return {
       name: item.name,
@@ -76,7 +84,14 @@ var LineChart = function LineChart(props) {
         position: 'top',
         fontSize: yType === 'time' ? 10 : 11.5,
         color: 'black',
-        distance: 1.1
+        distance: 1.1,
+        formatter: function formatter(item) {
+          if (typeof yComplement === 'function' && (0, _typeof2.default)(item) === 'object') {
+            return yComplement(item.data);
+          }
+
+          typeof yComplement === 'function' ? yComplement : formatLabel;
+        }
       }
     };
   });

package/dist/core/VerticalBarChart.js

@@ -134,7 +134,8 @@ var VerticalBarChart = function VerticalBarChart(props) {
       onClickBar = props.onClickBar,
       marginRightToolbox = props.marginRightToolbox,
       customMaxDomain = props.customMaxDomain,
-      interval = props.interval;
+      interval = props.interval,
+      scrollStart = props.scrollStart;
   var isCustomDomain = customMaxDomain ? customMaxDomain : _auxiliarFunctions.getDomain;
   var yData = data.map(function (item) {
     var results = data.map(function (item) {
@@ -241,13 +242,16 @@ var VerticalBarChart = function VerticalBarChart(props) {
     return "".concat(label, ": ").concat(labelPrint, " <br>") + "".concat(result, ": ").concat(values, " <br>") + complement;
   };
 
-  var scrollable = data.length > 12 ? [{
+  var arrayInitialSize = scrollStart || (dateFormat === 'yyyy-MM' ? 12 : 30);
+  var scrollable = data.length > arrayInitialSize ? [{
     type: 'inside',
+    start: (0, _auxiliarFunctions.getInitialValues)(xData.length, dateFormat, scrollStart),
     endValue: xData.length > 12 ? xData[11] : xData[xData.length - 1],
     zoomOnMouseWheel: 'shift'
   }, {
     show: true,
     type: 'slider',
+    start: (0, _auxiliarFunctions.getInitialValues)(xData.length, dateFormat, scrollStart),
     endValue: xData.length > 12 ? xData[11] : xData[xData.length - 1]
   }] : [];
   var options = {

package/dist/lib/auxiliarFunctions.js

@@ -112,7 +112,8 @@ var formatTime = function formatTime(text) {
 
 exports.formatTime = formatTime;
 
-var formatTooltip = function formatTooltip(text, dateFormat) {
+var formatTooltip = function formatTooltip(text) {
+  var dateFormat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'dd MMM';
   return (0, _format.default)(new Date(text), getDateFormatType(dateFormat, 'dd/MM/yyyy'), {
     locale: _ptBR.default
   });

package/package.json

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

package/src/core/LineChart.tsx

@@ -55,6 +55,14 @@ const LineChart = (props: IProps) => {
   const yData = data[0].values.map(item => item.result)
   const xData = data[0].values.map(item => item.label)
   const names = data.map(item => item.name)
+  
+  const formatLabel = (chartValues: { data: number }) => {
+    const { data } = chartValues
+
+    return yType === 'time'
+      ? timeConvert(Number(data as number)) + 'h'
+      : takeLabelComplement(Number(data), yComplement)
+  }
 
   const series = data.map(item => ({
     name: item.name,
@@ -71,7 +79,18 @@ const LineChart = (props: IProps) => {
       position: 'top',
       fontSize: yType === 'time' ? 10 : 11.5,
       color: 'black',
-      distance: 1.1
+      distance: 1.1,
+      formatter: (item: number | string | {data: number}) => {
+        if(typeof yComplement === 'function' && typeof item === 'object') {
+          return yComplement(item.data)
+        } 
+          
+        
+        typeof yComplement === 'function' 
+          ? yComplement 
+          : formatLabel
+
+      }
     }
   }))
 

package/src/core/VerticalBarChart.tsx

@@ -20,7 +20,8 @@ import {
   fixedTruncateLabel,
   takeLabelComplement,
   getWidthOpts,
-  getDateFormatType
+  getDateFormatType,
+  getInitialValues
 } from '../lib/auxiliarFunctions'
 import { WIDTH_STYLE } from '../lib/constants'
 
@@ -115,6 +116,7 @@ const VerticalBarChart = (props: IProps) => {
     marginRightToolbox,
     customMaxDomain,
     interval,
+    scrollStart
   } = props
 
   const isCustomDomain = customMaxDomain
@@ -241,17 +243,21 @@ const VerticalBarChart = (props: IProps) => {
     )
   }
 
+  const arrayInitialSize = scrollStart || (dateFormat === 'yyyy-MM' ? 12 : 30)
+
   const scrollable: ZoomProps[] =
-    data.length > 12
+    data.length > arrayInitialSize
       ? [
         {
           type: 'inside',
+          start: getInitialValues(xData.length, dateFormat, scrollStart),
           endValue: xData.length > 12 ? xData[11] : xData[xData.length - 1],
           zoomOnMouseWheel: 'shift'
         },
         {
           show: true,
           type: 'slider',
+          start: getInitialValues(xData.length, dateFormat, scrollStart),
           endValue: xData.length > 12 ? xData[11] : xData[xData.length - 1]
         }
       ]

package/src/lib/auxiliarFunctions.ts

@@ -157,11 +157,10 @@ export const toDate = (text: string, format?: string) =>
 export const formatTime = (text: string, dateFormat = 'dd MMM') =>
   format(new Date(text), dateFormat, { locale: ptBR })
 
-export const formatTooltip = (text: string, dateFormat?: string) =>
-  format(
-    new Date(text), getDateFormatType(dateFormat, 'dd/MM/yyyy'), {
-      locale: ptBR
-    })
+export const formatTooltip = (text: string, dateFormat = 'dd MMM') => format(
+  new Date(text), getDateFormatType(dateFormat, 'dd/MM/yyyy'), {
+    locale: ptBR
+  })
 
 export const formatTooltipWithHours = (text: string) =>
   format(new Date(text), 'dd/MM/yyyy HH:mm', { locale: ptBR })