@devexpress/dx-chart-core - npm Package Compare versions

Comparing version 1.3.0 to 1.4.0

dist/dx-chart-core.es.js

 /**
  * Bundle of @devexpress/dx-chart-core
- * Generated: 2018-06-04
- * Version: 1.3.0
+ * Generated: 2018-06-22
+ * Version: 1.4.0
  * License: https://js.devexpress.com/Licensing
@@ -10,3 +10,3 @@ */
 import { scaleBand, scaleLinear } from 'd3-scale';
-import { arc, area, curveCatmullRom, line, pie, symbol, symbolCircle } from 'd3-shape';
+import { arc, area, curveCatmullRom, line, pie, stack, stackOffsetNone, stackOrderNone, symbol, symbolCircle } from 'd3-shape';
 
@@ -237,11 +237,15 @@ var HORIZONTAL = 'horizontal';
 
-var calculateDomainField = function calculateDomainField(field, data) {
+var calculateDomainField = function calculateDomainField(getFieldItem, data) {
   var domain = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var type = arguments[3];
 
-  var getFieldItem = function getFieldItem(object) {
-    return object[field];
+  var getCategories = function getCategories(prev, cur) {
+    var categories = getFieldItem(cur);
+    if (isDefined(categories)) {
+      return [].concat(toConsumableArray(prev), [categories]);
+    }
+    return prev;
   };
   if (type === BAND) {
-    return [].concat(toConsumableArray(domain), toConsumableArray(data.map(getFieldItem)));
+    return [].concat(toConsumableArray(domain), toConsumableArray(data.reduce(getCategories, [])));
   }
@@ -252,3 +256,5 @@ return extent([].concat(toConsumableArray(domain), toConsumableArray(extent(data, getFieldItem))));
 var getCorrectAxisType = function getCorrectAxisType(type, data, field) {
-  if (!type && typeof data[0][field] === 'string') {
+  if (!type && typeof data.find(function (item) {
+    return isDefined(item[field]);
+  })[field] === 'string') {
     return 'band';
@@ -271,7 +277,11 @@ }
     return _extends({}, domains, (_babelHelpers$extends2 = {}, defineProperty(_babelHelpers$extends2, axisName, {
-      domain: calculateDomainField(valueField + '-' + name + '-end', data, domains[axisName] && domains[axisName].domain, valueType),
+      domain: calculateDomainField(function (object) {
+        return object[valueField + '-' + name + '-stack'] && object[valueField + '-' + name + '-stack'][1];
+      }, data, domains[axisName] && domains[axisName].domain, valueType),
       orientation: VERTICAL,
       type: valueType
     }), defineProperty(_babelHelpers$extends2, argumentAxisName, {
-      domain: calculateDomainField(argumentField, data, domains[argumentAxisName] && domains[argumentAxisName].domain, argumentType),
+      domain: calculateDomainField(function (object) {
+        return object[argumentField];
+      }, data, domains[argumentAxisName] && domains[argumentAxisName].domain, argumentType),
       orientation: HORIZONTAL,
@@ -431,11 +441,14 @@ type: argumentType
 var computeLinePath = function computeLinePath(data, scales, argumentField, valueField, name) {
-  return data.map(function (dataItem) {
-    return {
-      x: scales.xScale(dataItem[argumentField]),
-      y: scales.yScale(dataItem[valueField + '-' + name + '-end']),
-      y1: scales.yScale(dataItem[valueField + '-' + name + '-start']),
-      id: dataItem[argumentField],
-      value: dataItem[valueField]
-    };
-  });
+  return data.reduce(function (result, dataItem) {
+    if (dataItem[argumentField] !== undefined && dataItem[valueField] !== undefined) {
+      return [].concat(toConsumableArray(result), [{
+        x: scales.xScale(dataItem[argumentField]),
+        y: scales.yScale(dataItem[valueField + '-' + name + '-stack'][1]),
+        y1: scales.yScale(dataItem[valueField + '-' + name + '-stack'][0]),
+        id: dataItem[argumentField],
+        value: dataItem[valueField]
+      }]);
+    }
+    return result;
+  }, []);
 };
@@ -454,3 +467,9 @@
 
-var xyScales = function xyScales(domainsOptions, argumentAxisName, domainName, layout, stacks, groupWidth, barWidth) {
+var xyScales = function xyScales(domainsOptions, argumentAxisName, domainName, layout) {
+  var stacks = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+  var _ref4 = arguments[5];
+  var _ref4$groupWidth = _ref4.groupWidth,
+      groupWidth = _ref4$groupWidth === undefined ? 1 : _ref4$groupWidth,
+      _ref4$barWidth = _ref4.barWidth,
+      barWidth = _ref4$barWidth === undefined ? 1 : _ref4$barWidth;
   var width = layout.width,
@@ -494,3 +513,3 @@ height = layout.height;
   return series.find(function (seriesItem) {
-    return seriesItem.name === name;
+    return seriesItem.uniqueName === name;
   });
@@ -507,3 +526,6 @@ };
 
-var pointAttributes = function pointAttributes(scales, size) {
+var pointAttributes = function pointAttributes(scales, _ref5) {
+  var _ref5$size = _ref5.size,
+      size = _ref5$size === undefined ? 7 : _ref5$size;
+
   var dPoint = symbol().size([size ** 2]).type(symbolCircle)();
@@ -520,5 +542,5 @@ var offSet = scales.xScale.bandwidth ? scales.xScale.bandwidth() / 2 : 0;
 
-var barPointAttributes = function barPointAttributes(scales, _, stack) {
+var barPointAttributes = function barPointAttributes(scales, _, stack$$1) {
   var bandwidth = scales.x0Scale.bandwidth();
-  var offset = scales.x0Scale(stack);
+  var offset = scales.x0Scale(stack$$1) || 0;
   return function (item) {
@@ -544,19 +566,38 @@ return {
 
+var getStacks = function getStacks(series) {
+  return series.reduce(function (prevValue, _ref, index) {
+    var valueField = _ref.valueField,
+        seriesStack = _ref.stack;
+
+    if (!prevValue[seriesStack]) {
+      return _extends({}, prevValue, defineProperty({}, seriesStack, {
+        keys: [valueField],
+        series: [index]
+      }));
+    }
+    return _extends({}, prevValue, defineProperty({}, seriesStack, {
+      keys: [].concat(toConsumableArray(prevValue[seriesStack].keys), [valueField]),
+      series: [].concat(toConsumableArray(prevValue[seriesStack].series), [index])
+    }));
+  }, {});
+};
+
 var processData = function processData(series, data) {
-  return data.map(function (singleData) {
-    return series.reduce(function (prevValue, _ref) {
-      var _babelHelpers$extends;
+  var stacks = getStacks(series);
 
-      var valueField = _ref.valueField,
-          name = _ref.name,
-          stack = _ref.stack;
+  var arrayOfStacks = Object.entries(stacks).reduce(function (prevValue, item) {
+    return _extends({}, prevValue, defineProperty({}, item[0], stack().keys(item[1].keys).order(stackOrderNone).offset(stackOffsetNone)(data)));
+  }, {});
 
-      var startValue = prevValue.collection[stack] || 0;
-      var endValue = startValue + singleData[valueField];
+  return data.map(function (singleData, dataIndex) {
+    return series.reduce(function (prevValue, _ref2, index) {
+      var valueField = _ref2.valueField,
+          name = _ref2.name,
+          seriesStack = _ref2.stack;
 
-      return {
-        singleData: _extends({}, prevValue.singleData, (_babelHelpers$extends = {}, defineProperty(_babelHelpers$extends, valueField + "-" + name + "-start", startValue), defineProperty(_babelHelpers$extends, valueField + "-" + name + "-end", endValue), _babelHelpers$extends)),
-        collection: _extends({}, prevValue.collection, defineProperty({}, stack, endValue))
-      };
-    }, { singleData: singleData, collection: {} }).singleData;
+      var seriesIndex = stacks[seriesStack].series.findIndex(function (item) {
+        return item === index;
+      });
+      return _extends({}, prevValue, defineProperty({}, valueField + '-' + name + '-stack', arrayOfStacks[seriesStack][seriesIndex][dataIndex]));
+    }, singleData);
   });
@@ -568,6 +609,6 @@ };
     var _singleSeries$stack = singleSeries.stack,
-        stack = _singleSeries$stack === undefined ? "stack" + index : _singleSeries$stack;
+        seriesStack = _singleSeries$stack === undefined ? 'stack' + index : _singleSeries$stack;
 
 
-    return [].concat(toConsumableArray(prevResult), [_extends({}, singleSeries, { stack: stack })]);
+    return [].concat(toConsumableArray(prevResult), [_extends({}, singleSeries, { stack: seriesStack })]);
   }, []);
@@ -578,5 +619,5 @@ };
   return series.reduce(function (prevResult, singleSeries) {
-    var stack = singleSeries.stack;
+    var seriesStack = singleSeries.stack;
 
-    return [].concat(toConsumableArray(prevResult), [stack]);
+    return [].concat(toConsumableArray(prevResult), [seriesStack]);
   }, []);
@@ -603,3 +644,18 @@ };
 
-export { domains, bBoxes, axisCoordinates, axesData, xyScales, pieAttributes, coordinates, findSeriesByName, lineAttributes, pointAttributes, barPointAttributes, seriesData, checkZeroStart, createScale, HORIZONTAL, VERTICAL, TOP, BOTTOM, LEFT, RIGHT, MIDDLE, END, START, BAND, processData, seriesWithStacks, stacks, palette, axisName };
+var prepareData = function prepareData(data, series, processingData) {
+  return processingData ? processingData(series, data) : data.map(function (singleData) {
+    return series.reduce(function (prevValue, _ref) {
+      var valueField = _ref.valueField,
+          name = _ref.name;
+
+      if (singleData[valueField] === undefined) {
+        return prevValue;
+      }
+
+      return _extends({}, prevValue, defineProperty({}, valueField + '-' + name + '-stack', [0, singleData[valueField]]));
+    }, singleData);
+  });
+};
+
+export { domains, bBoxes, axisCoordinates, axesData, xyScales, pieAttributes, coordinates, findSeriesByName, lineAttributes, pointAttributes, barPointAttributes, seriesData, checkZeroStart, createScale, HORIZONTAL, VERTICAL, TOP, BOTTOM, LEFT, RIGHT, MIDDLE, END, START, BAND, processData, seriesWithStacks, stacks, palette, axisName, prepareData };
 //# sourceMappingURL=dx-chart-core.es.js.map

dist/dx-chart-core.umd.js

 /**
  * Bundle of @devexpress/dx-chart-core
- * Generated: 2018-06-04
- * Version: 1.3.0
+ * Generated: 2018-06-22
+ * Version: 1.4.0
  * License: https://js.devexpress.com/Licensing
@@ -238,11 +238,15 @@ */
 
-var calculateDomainField = function calculateDomainField(field, data) {
+var calculateDomainField = function calculateDomainField(getFieldItem, data) {
   var domain = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var type = arguments[3];
 
-  var getFieldItem = function getFieldItem(object) {
-    return object[field];
+  var getCategories = function getCategories(prev, cur) {
+    var categories = getFieldItem(cur);
+    if (isDefined(categories)) {
+      return [].concat(toConsumableArray(prev), [categories]);
+    }
+    return prev;
   };
   if (type === BAND) {
-    return [].concat(toConsumableArray(domain), toConsumableArray(data.map(getFieldItem)));
+    return [].concat(toConsumableArray(domain), toConsumableArray(data.reduce(getCategories, [])));
   }
@@ -253,3 +257,5 @@ return d3Array.extent([].concat(toConsumableArray(domain), toConsumableArray(d3Array.extent(data, getFieldItem))));
 var getCorrectAxisType = function getCorrectAxisType(type, data, field) {
-  if (!type && typeof data[0][field] === 'string') {
+  if (!type && typeof data.find(function (item) {
+    return isDefined(item[field]);
+  })[field] === 'string') {
     return 'band';
@@ -272,7 +278,11 @@ }
     return _extends({}, domains, (_babelHelpers$extends2 = {}, defineProperty(_babelHelpers$extends2, axisName, {
-      domain: calculateDomainField(valueField + '-' + name + '-end', data, domains[axisName] && domains[axisName].domain, valueType),
+      domain: calculateDomainField(function (object) {
+        return object[valueField + '-' + name + '-stack'] && object[valueField + '-' + name + '-stack'][1];
+      }, data, domains[axisName] && domains[axisName].domain, valueType),
       orientation: VERTICAL,
       type: valueType
     }), defineProperty(_babelHelpers$extends2, argumentAxisName, {
-      domain: calculateDomainField(argumentField, data, domains[argumentAxisName] && domains[argumentAxisName].domain, argumentType),
+      domain: calculateDomainField(function (object) {
+        return object[argumentField];
+      }, data, domains[argumentAxisName] && domains[argumentAxisName].domain, argumentType),
       orientation: HORIZONTAL,
@@ -432,11 +442,14 @@ type: argumentType
 var computeLinePath = function computeLinePath(data, scales, argumentField, valueField, name) {
-  return data.map(function (dataItem) {
-    return {
-      x: scales.xScale(dataItem[argumentField]),
-      y: scales.yScale(dataItem[valueField + '-' + name + '-end']),
-      y1: scales.yScale(dataItem[valueField + '-' + name + '-start']),
-      id: dataItem[argumentField],
-      value: dataItem[valueField]
-    };
-  });
+  return data.reduce(function (result, dataItem) {
+    if (dataItem[argumentField] !== undefined && dataItem[valueField] !== undefined) {
+      return [].concat(toConsumableArray(result), [{
+        x: scales.xScale(dataItem[argumentField]),
+        y: scales.yScale(dataItem[valueField + '-' + name + '-stack'][1]),
+        y1: scales.yScale(dataItem[valueField + '-' + name + '-stack'][0]),
+        id: dataItem[argumentField],
+        value: dataItem[valueField]
+      }]);
+    }
+    return result;
+  }, []);
 };
@@ -455,3 +468,9 @@
 
-var xyScales = function xyScales(domainsOptions, argumentAxisName, domainName, layout, stacks, groupWidth, barWidth) {
+var xyScales = function xyScales(domainsOptions, argumentAxisName, domainName, layout) {
+  var stacks = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+  var _ref4 = arguments[5];
+  var _ref4$groupWidth = _ref4.groupWidth,
+      groupWidth = _ref4$groupWidth === undefined ? 1 : _ref4$groupWidth,
+      _ref4$barWidth = _ref4.barWidth,
+      barWidth = _ref4$barWidth === undefined ? 1 : _ref4$barWidth;
   var width = layout.width,
@@ -495,3 +514,3 @@ height = layout.height;
   return series.find(function (seriesItem) {
-    return seriesItem.name === name;
+    return seriesItem.uniqueName === name;
   });
@@ -508,3 +527,6 @@ };
 
-var pointAttributes = function pointAttributes(scales, size) {
+var pointAttributes = function pointAttributes(scales, _ref5) {
+  var _ref5$size = _ref5.size,
+      size = _ref5$size === undefined ? 7 : _ref5$size;
+
   var dPoint = d3Shape.symbol().size([size ** 2]).type(d3Shape.symbolCircle)();
@@ -521,5 +543,5 @@ var offSet = scales.xScale.bandwidth ? scales.xScale.bandwidth() / 2 : 0;
 
-var barPointAttributes = function barPointAttributes(scales, _, stack) {
+var barPointAttributes = function barPointAttributes(scales, _, stack$$1) {
   var bandwidth = scales.x0Scale.bandwidth();
-  var offset = scales.x0Scale(stack);
+  var offset = scales.x0Scale(stack$$1) || 0;
   return function (item) {
@@ -545,19 +567,38 @@ return {
 
+var getStacks = function getStacks(series) {
+  return series.reduce(function (prevValue, _ref, index) {
+    var valueField = _ref.valueField,
+        seriesStack = _ref.stack;
+
+    if (!prevValue[seriesStack]) {
+      return _extends({}, prevValue, defineProperty({}, seriesStack, {
+        keys: [valueField],
+        series: [index]
+      }));
+    }
+    return _extends({}, prevValue, defineProperty({}, seriesStack, {
+      keys: [].concat(toConsumableArray(prevValue[seriesStack].keys), [valueField]),
+      series: [].concat(toConsumableArray(prevValue[seriesStack].series), [index])
+    }));
+  }, {});
+};
+
 var processData = function processData(series, data) {
-  return data.map(function (singleData) {
-    return series.reduce(function (prevValue, _ref) {
-      var _babelHelpers$extends;
+  var stacks = getStacks(series);
 
-      var valueField = _ref.valueField,
-          name = _ref.name,
-          stack = _ref.stack;
+  var arrayOfStacks = Object.entries(stacks).reduce(function (prevValue, item) {
+    return _extends({}, prevValue, defineProperty({}, item[0], d3Shape.stack().keys(item[1].keys).order(d3Shape.stackOrderNone).offset(d3Shape.stackOffsetNone)(data)));
+  }, {});
 
-      var startValue = prevValue.collection[stack] || 0;
-      var endValue = startValue + singleData[valueField];
+  return data.map(function (singleData, dataIndex) {
+    return series.reduce(function (prevValue, _ref2, index) {
+      var valueField = _ref2.valueField,
+          name = _ref2.name,
+          seriesStack = _ref2.stack;
 
-      return {
-        singleData: _extends({}, prevValue.singleData, (_babelHelpers$extends = {}, defineProperty(_babelHelpers$extends, valueField + "-" + name + "-start", startValue), defineProperty(_babelHelpers$extends, valueField + "-" + name + "-end", endValue), _babelHelpers$extends)),
-        collection: _extends({}, prevValue.collection, defineProperty({}, stack, endValue))
-      };
-    }, { singleData: singleData, collection: {} }).singleData;
+      var seriesIndex = stacks[seriesStack].series.findIndex(function (item) {
+        return item === index;
+      });
+      return _extends({}, prevValue, defineProperty({}, valueField + '-' + name + '-stack', arrayOfStacks[seriesStack][seriesIndex][dataIndex]));
+    }, singleData);
   });
@@ -569,6 +610,6 @@ };
     var _singleSeries$stack = singleSeries.stack,
-        stack = _singleSeries$stack === undefined ? "stack" + index : _singleSeries$stack;
+        seriesStack = _singleSeries$stack === undefined ? 'stack' + index : _singleSeries$stack;
 
 
-    return [].concat(toConsumableArray(prevResult), [_extends({}, singleSeries, { stack: stack })]);
+    return [].concat(toConsumableArray(prevResult), [_extends({}, singleSeries, { stack: seriesStack })]);
   }, []);
@@ -579,5 +620,5 @@ };
   return series.reduce(function (prevResult, singleSeries) {
-    var stack = singleSeries.stack;
+    var seriesStack = singleSeries.stack;
 
-    return [].concat(toConsumableArray(prevResult), [stack]);
+    return [].concat(toConsumableArray(prevResult), [seriesStack]);
   }, []);
@@ -604,2 +645,17 @@ };
 
+var prepareData = function prepareData(data, series, processingData) {
+  return processingData ? processingData(series, data) : data.map(function (singleData) {
+    return series.reduce(function (prevValue, _ref) {
+      var valueField = _ref.valueField,
+          name = _ref.name;
+
+      if (singleData[valueField] === undefined) {
+        return prevValue;
+      }
+
+      return _extends({}, prevValue, defineProperty({}, valueField + '-' + name + '-stack', [0, singleData[valueField]]));
+    }, singleData);
+  });
+};
+
 exports.domains = domains;
@@ -634,2 +690,3 @@ exports.bBoxes = bBoxes;
 exports.axisName = axisName;
+exports.prepareData = prepareData;
 
@@ -636,0 +693,0 @@ Object.defineProperty(exports, '__esModule', { value: true });

package.json

 {
   "name": "@devexpress/dx-chart-core",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Core library for the DevExtreme Reactive Chart component",
@@ -51,3 +51,3 @@ "author": {
     "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-plugin-filenames": "^1.2.0",
+    "eslint-plugin-filenames": "^1.3.2",
     "eslint-plugin-import": "^2.12.0",
@@ -62,5 +62,5 @@ "eslint-plugin-jest": "^21.17.0",
     "d3-array": "^1.2.1",
-    "d3-scale": "^2.0.0",
+    "d3-scale": "^2.1.0",
     "d3-shape": "^1.2.0"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

96214

increased by13.14%

Lines of code

1062

increased by10.51%

Dependency changes

• Updatedd3-scale@^2.1.0