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

Comparing version 1.7.2 to 1.8.0-beta.1

dist/dx-chart-core.es.js

 /**
  * Bundle of @devexpress/dx-chart-core
- * Generated: 2018-08-31
- * Version: 1.7.2
+ * Generated: 2018-09-07
+ * Version: 1.8.0-beta.1
  * License: https://js.devexpress.com/Licensing
@@ -226,8 +226,10 @@ */
 
-var collectAxesTypes = function collectAxesTypes(axes) {
+var collectAxesOptions = function collectAxesOptions(axes) {
   return axes.reduce(function (domains, _ref) {
     var name = _ref.name,
-        type = _ref.type;
+        type = _ref.type,
+        tickFormat = _ref.tickFormat;
     return _extends({}, domains, defineProperty({}, name, {
-      type: type
+      type: type,
+      tickFormat: tickFormat
     }));
@@ -260,10 +262,10 @@ }, {});
   }
-  return type;
+  return type || 'linear';
 };
 
 var getFieldStack = function getFieldStack(index, object) {
-  return object && object[index] ? object[index] : undefined;
+  return object && isDefined(object[index]) ? object[index] : undefined;
 };
 
-var calculateDomain = function calculateDomain(series, data, axesTypes, argumentAxisName) {
+var calculateDomain = function calculateDomain(series, data, axesOptions, argumentAxisName, startFromZero) {
   return series.reduce(function (domains, _ref2) {
@@ -282,7 +284,8 @@ var _babelHelpers$extends2;
         return getFieldStack(1, object[valueField + '-' + name + '-stack']);
-      }, function (object) {
+      }, startFromZero[axisName] ? function (object) {
         return getFieldStack(0, object[valueField + '-' + name + '-stack']);
-      }, data, domains[axisName] && domains[axisName].domain, valueType),
+      } : undefined, data, domains[axisName] && domains[axisName].domain, valueType),
       orientation: VERTICAL,
-      type: valueType
+      type: valueType,
+      tickFormat: domains[axisName] && domains[axisName].tickFormat
     }), defineProperty(_babelHelpers$extends2, argumentAxisName, {
@@ -293,11 +296,8 @@ domain: calculateDomainField(function (object) {
       orientation: HORIZONTAL,
-      type: argumentType
+      type: argumentType,
+      tickFormat: domains[argumentAxisName] && domains[argumentAxisName].tickFormat
     }), _babelHelpers$extends2));
-  }, axesTypes);
+  }, axesOptions);
 };
 
-var adjustRangeToZero = function adjustRangeToZero(range) {
-  return [Math.min(range[0], 0), Math.max(0, range[1])];
-};
-
 var recalculateDomain = function recalculateDomain(range, currentDomain) {
@@ -307,13 +307,8 @@ return {
     type: currentDomain.type,
-    orientation: currentDomain.orientation
+    orientation: currentDomain.orientation,
+    tickFormat: currentDomain.tickFormat
   };
 };
 
-var adjustDomains = function adjustDomains(axes, calculatedDomains, startFromZero) {
-  var adjustedDomainsBySeries = Object.keys(calculatedDomains).reduce(function (domains, name) {
-    var currentDomain = domains[name];
-    var range = startFromZero[name] ? adjustRangeToZero(currentDomain.domain) : currentDomain.domain;
-    return _extends({}, domains, defineProperty({}, name, recalculateDomain(range, currentDomain)));
-  }, calculatedDomains);
-
+var adjustDomains = function adjustDomains(axes, calculatedDomains) {
   return axes.reduce(function (domains, _ref3) {
@@ -326,5 +321,10 @@ var name = _ref3.name,
     return _extends({}, domains, defineProperty({}, name, recalculateDomain([isDefined(min) ? min : currentDomain.domain[0], isDefined(max) ? max : currentDomain.domain[1]], currentDomain)));
-  }, adjustedDomainsBySeries);
+  }, calculatedDomains);
 };
 
+var computedExtension = function computedExtension(extension) {
+  var defaultExtension = [{ type: 'linear', constructor: scaleLinear }, { type: 'band', constructor: scaleBand }];
+  return extension.concat(defaultExtension);
+};
+
 var domains = function domains() {
@@ -337,5 +337,5 @@ var axes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
 
-  var axesTypes = collectAxesTypes(axes);
-  var calculatedDomains = calculateDomain(series, data, axesTypes, argumentAxisName);
-  return adjustDomains(axes, calculatedDomains, startFromZero);
+  var axesOptions = collectAxesOptions(axes);
+  var calculatedDomains = calculateDomain(series, data, axesOptions, argumentAxisName, startFromZero);
+  return adjustDomains(axes, calculatedDomains);
 };
@@ -359,16 +359,21 @@
 
-var createScale = function createScale(_ref, width, height) {
+var createScale = function createScale(_ref, width, height, constructor) {
   var domain = _ref.domain,
-      orientation = _ref.orientation,
-      type = _ref.type;
-  var padding = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  return (type !== BAND ? scaleLinear() : scaleBand().paddingInner(padding).paddingOuter(padding / 2)).domain(domain).range(orientation === HORIZONTAL ? [0, width] : [height, 0]);
+      orientation = _ref.orientation;
+  var padding = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+
+  var scale = constructor();
+  if (scale.paddingInner) {
+    scale.paddingInner(padding).paddingOuter(padding / 2);
+  }
+  return scale.domain(domain).range(orientation === HORIZONTAL ? [0, width] : [height, 0]);
 };
 
+var getWidth = function getWidth(scale) {
+  return scale.bandwidth ? scale.bandwidth() : 0;
+};
+
 var getTicks = function getTicks(scale) {
   return scale.ticks ? scale.ticks() : scale.domain();
 };
-var getOffset = function getOffset(scale) {
-  return scale.bandwidth ? scale.bandwidth() / 2 : 0;
-};
 var getDominantBaseline = function getDominantBaseline(orientation, position) {
@@ -387,9 +392,17 @@ if (orientation === HORIZONTAL) {
 
-var calculateAxisCoordinates = function calculateAxisCoordinates(scale, width, height, orientation, position, tickSize, indentFromAxis) {
+var getFormat = function getFormat(scale, tickFormat) {
+  if (scale.tickFormat) {
+    return tickFormat ? tickFormat(scale) : scale.tickFormat();
+  }
+  return function (tick) {
+    return tick;
+  };
+};
+
+var calculateAxisCoordinates = function calculateAxisCoordinates(scale, orientation, position, tickSize, indentFromAxis, tickFormat) {
   var ticks = getTicks(scale);
-  var offset = getOffset(scale);
+  var offset = getWidth(scale) / 2;
   var dominantBaseline = getDominantBaseline(orientation, position);
   var textAnchor = getTextAnchor(orientation, position);
-
-  var getTickCoordinates = function getTickCoordinates(tick) {
+  var getTickCoordinates = function getTickCoordinates(tick, index) {
     var coordinates = scale(tick) + offset;
@@ -404,5 +417,6 @@ if (orientation === HORIZONTAL) {
         y2: position === TOP ? 0 : tickSize,
-        text: tick,
+        text: getFormat(scale, tickFormat)(tick),
         xText: coordinates,
-        yText: position === TOP ? -tickSize - indentFromAxis : tickSize + indentFromAxis
+        yText: position === TOP ? -tickSize - indentFromAxis : tickSize + indentFromAxis,
+        key: index
       };
@@ -417,5 +431,6 @@ }
       x2: position === LEFT ? 0 : tickSize,
-      text: tick,
+      text: getFormat(scale, tickFormat)(tick),
       xText: position === LEFT ? -tickSize - indentFromAxis : tickSize + indentFromAxis,
-      yText: coordinates
+      yText: coordinates,
+      key: index
     };
@@ -428,6 +443,6 @@ };
 
-var axisCoordinates = function axisCoordinates(domainOptions, position, width, height, tickSize, indentFromAxis) {
-  var scale = createScale(domainOptions, width, height);
+var axisCoordinates = function axisCoordinates(domainOptions, position, width, height, tickSize, indentFromAxis, constructor) {
+  var scale = createScale(domainOptions, width, height, constructor);
 
-  return calculateAxisCoordinates(scale, width, height, domainOptions.orientation, position, tickSize, indentFromAxis);
+  return calculateAxisCoordinates(scale, domainOptions.orientation, position, tickSize, indentFromAxis, domainOptions.tickFormat);
 };
@@ -442,5 +457,4 @@
 var getX = function getX(_ref) {
-  var x = _ref.x,
-      width = _ref.width;
-  return x + width / 2;
+  var x = _ref.x;
+  return x;
 };
@@ -464,8 +478,17 @@ var getY = function getY(_ref2) {
 
-var xyScales = function xyScales(argumentDomainOptions, valueDomainOptions, _ref4, groupWidth) {
+var getConstructor = function getConstructor(scaleExtension, type) {
+  return scaleExtension.find(function (item) {
+    return item.type === type;
+  }).constructor;
+};
+
+var xyScales = function xyScales(argumentDomainOptions, valueDomainOptions, _ref4, groupWidth, scaleExtension) {
   var width = _ref4.width,
       height = _ref4.height;
+
+  var xConstructor = getConstructor(scaleExtension, argumentDomainOptions.type);
+  var yConstructor = getConstructor(scaleExtension, valueDomainOptions.type);
   return {
-    xScale: createScale(argumentDomainOptions, width, height, 1 - groupWidth),
-    yScale: createScale(valueDomainOptions, width, height)
+    xScale: createScale(argumentDomainOptions, width, height, xConstructor, 1 - groupWidth),
+    yScale: createScale(valueDomainOptions, width, height, yConstructor)
   };
@@ -511,6 +534,5 @@ };
       return [].concat(toConsumableArray(result), [{
-        x: xScale(dataItem[argumentField]),
+        x: xScale(dataItem[argumentField]) + getWidth(xScale) / 2,
         y: yScale(dataItem[valueField + '-' + name + '-stack'][1]),
         y1: yScale(dataItem[valueField + '-' + name + '-stack'][0]),
-        width: xScale.bandwidth ? xScale.bandwidth() : 0,
         id: index,
@@ -531,13 +553,13 @@ value: dataItem[valueField]
       barWidth = _ref10$barWidth === undefined ? 0.9 : _ref10$barWidth;
+  var scaleExtension = arguments[8];
 
   var rawCoordinates = coordinates(data, { xScale: xScale, yScale: yScale }, argumentField, valueField, name);
-  var bandwidth = xScale.bandwidth ? xScale.bandwidth() : 0;
+  var width = getWidth(xScale);
   var x0Scale = createScale({
-    type: 'band',
     domain: stacks
-  }, bandwidth, bandwidth, 1 - barWidth);
+  }, width, width, getConstructor(scaleExtension, 'band'), 1 - barWidth);
   return rawCoordinates.map(function (item) {
     return _extends({}, item, {
-      width: x0Scale.bandwidth(),
-      x: item.x + x0Scale(stack$$1)
+      width: getWidth(x0Scale),
+      x: item.x - width / 2 + x0Scale(stack$$1)
     });
@@ -693,3 +715,3 @@ });
 
-export { domains, bBoxes, axisCoordinates, axesData, dArea, dLine, dSpline, xyScales, pieAttributes, coordinates, barCoordinates, findSeriesByName, dBar, pointAttributes, seriesData, checkZeroStart, createScale, HORIZONTAL, VERTICAL, TOP, BOTTOM, LEFT, RIGHT, MIDDLE, END, START, BAND, processData, seriesWithStacks, stacks, palette, axisName, prepareData };
+export { computedExtension, domains, bBoxes, axisCoordinates, axesData, dArea, dLine, dSpline, xyScales, pieAttributes, coordinates, barCoordinates, findSeriesByName, dBar, pointAttributes, seriesData, checkZeroStart, createScale, getWidth, 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-08-31
- * Version: 1.7.2
+ * Generated: 2018-09-07
+ * Version: 1.8.0-beta.1
  * License: https://js.devexpress.com/Licensing
@@ -228,8 +228,10 @@ */
 
-var collectAxesTypes = function collectAxesTypes(axes) {
+var collectAxesOptions = function collectAxesOptions(axes) {
   return axes.reduce(function (domains, _ref) {
     var name = _ref.name,
-        type = _ref.type;
+        type = _ref.type,
+        tickFormat = _ref.tickFormat;
     return _extends({}, domains, defineProperty({}, name, {
-      type: type
+      type: type,
+      tickFormat: tickFormat
     }));
@@ -262,10 +264,10 @@ }, {});
   }
-  return type;
+  return type || 'linear';
 };
 
 var getFieldStack = function getFieldStack(index, object) {
-  return object && object[index] ? object[index] : undefined;
+  return object && isDefined(object[index]) ? object[index] : undefined;
 };
 
-var calculateDomain = function calculateDomain(series, data, axesTypes, argumentAxisName) {
+var calculateDomain = function calculateDomain(series, data, axesOptions, argumentAxisName, startFromZero) {
   return series.reduce(function (domains, _ref2) {
@@ -284,7 +286,8 @@ var _babelHelpers$extends2;
         return getFieldStack(1, object[valueField + '-' + name + '-stack']);
-      }, function (object) {
+      }, startFromZero[axisName] ? function (object) {
         return getFieldStack(0, object[valueField + '-' + name + '-stack']);
-      }, data, domains[axisName] && domains[axisName].domain, valueType),
+      } : undefined, data, domains[axisName] && domains[axisName].domain, valueType),
       orientation: VERTICAL,
-      type: valueType
+      type: valueType,
+      tickFormat: domains[axisName] && domains[axisName].tickFormat
     }), defineProperty(_babelHelpers$extends2, argumentAxisName, {
@@ -295,11 +298,8 @@ domain: calculateDomainField(function (object) {
       orientation: HORIZONTAL,
-      type: argumentType
+      type: argumentType,
+      tickFormat: domains[argumentAxisName] && domains[argumentAxisName].tickFormat
     }), _babelHelpers$extends2));
-  }, axesTypes);
+  }, axesOptions);
 };
 
-var adjustRangeToZero = function adjustRangeToZero(range) {
-  return [Math.min(range[0], 0), Math.max(0, range[1])];
-};
-
 var recalculateDomain = function recalculateDomain(range, currentDomain) {
@@ -309,13 +309,8 @@ return {
     type: currentDomain.type,
-    orientation: currentDomain.orientation
+    orientation: currentDomain.orientation,
+    tickFormat: currentDomain.tickFormat
   };
 };
 
-var adjustDomains = function adjustDomains(axes, calculatedDomains, startFromZero) {
-  var adjustedDomainsBySeries = Object.keys(calculatedDomains).reduce(function (domains, name) {
-    var currentDomain = domains[name];
-    var range = startFromZero[name] ? adjustRangeToZero(currentDomain.domain) : currentDomain.domain;
-    return _extends({}, domains, defineProperty({}, name, recalculateDomain(range, currentDomain)));
-  }, calculatedDomains);
-
+var adjustDomains = function adjustDomains(axes, calculatedDomains) {
   return axes.reduce(function (domains, _ref3) {
@@ -328,5 +323,10 @@ var name = _ref3.name,
     return _extends({}, domains, defineProperty({}, name, recalculateDomain([isDefined(min) ? min : currentDomain.domain[0], isDefined(max) ? max : currentDomain.domain[1]], currentDomain)));
-  }, adjustedDomainsBySeries);
+  }, calculatedDomains);
 };
 
+var computedExtension = function computedExtension(extension) {
+  var defaultExtension = [{ type: 'linear', constructor: d3Scale.scaleLinear }, { type: 'band', constructor: d3Scale.scaleBand }];
+  return extension.concat(defaultExtension);
+};
+
 var domains = function domains() {
@@ -339,5 +339,5 @@ var axes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
 
-  var axesTypes = collectAxesTypes(axes);
-  var calculatedDomains = calculateDomain(series, data, axesTypes, argumentAxisName);
-  return adjustDomains(axes, calculatedDomains, startFromZero);
+  var axesOptions = collectAxesOptions(axes);
+  var calculatedDomains = calculateDomain(series, data, axesOptions, argumentAxisName, startFromZero);
+  return adjustDomains(axes, calculatedDomains);
 };
@@ -361,16 +361,21 @@
 
-var createScale = function createScale(_ref, width, height) {
+var createScale = function createScale(_ref, width, height, constructor) {
   var domain = _ref.domain,
-      orientation = _ref.orientation,
-      type = _ref.type;
-  var padding = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-  return (type !== BAND ? d3Scale.scaleLinear() : d3Scale.scaleBand().paddingInner(padding).paddingOuter(padding / 2)).domain(domain).range(orientation === HORIZONTAL ? [0, width] : [height, 0]);
+      orientation = _ref.orientation;
+  var padding = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+
+  var scale = constructor();
+  if (scale.paddingInner) {
+    scale.paddingInner(padding).paddingOuter(padding / 2);
+  }
+  return scale.domain(domain).range(orientation === HORIZONTAL ? [0, width] : [height, 0]);
 };
 
+var getWidth = function getWidth(scale) {
+  return scale.bandwidth ? scale.bandwidth() : 0;
+};
+
 var getTicks = function getTicks(scale) {
   return scale.ticks ? scale.ticks() : scale.domain();
 };
-var getOffset = function getOffset(scale) {
-  return scale.bandwidth ? scale.bandwidth() / 2 : 0;
-};
 var getDominantBaseline = function getDominantBaseline(orientation, position) {
@@ -389,9 +394,17 @@ if (orientation === HORIZONTAL) {
 
-var calculateAxisCoordinates = function calculateAxisCoordinates(scale, width, height, orientation, position, tickSize, indentFromAxis) {
+var getFormat = function getFormat(scale, tickFormat) {
+  if (scale.tickFormat) {
+    return tickFormat ? tickFormat(scale) : scale.tickFormat();
+  }
+  return function (tick) {
+    return tick;
+  };
+};
+
+var calculateAxisCoordinates = function calculateAxisCoordinates(scale, orientation, position, tickSize, indentFromAxis, tickFormat) {
   var ticks = getTicks(scale);
-  var offset = getOffset(scale);
+  var offset = getWidth(scale) / 2;
   var dominantBaseline = getDominantBaseline(orientation, position);
   var textAnchor = getTextAnchor(orientation, position);
-
-  var getTickCoordinates = function getTickCoordinates(tick) {
+  var getTickCoordinates = function getTickCoordinates(tick, index) {
     var coordinates = scale(tick) + offset;
@@ -406,5 +419,6 @@ if (orientation === HORIZONTAL) {
         y2: position === TOP ? 0 : tickSize,
-        text: tick,
+        text: getFormat(scale, tickFormat)(tick),
         xText: coordinates,
-        yText: position === TOP ? -tickSize - indentFromAxis : tickSize + indentFromAxis
+        yText: position === TOP ? -tickSize - indentFromAxis : tickSize + indentFromAxis,
+        key: index
       };
@@ -419,5 +433,6 @@ }
       x2: position === LEFT ? 0 : tickSize,
-      text: tick,
+      text: getFormat(scale, tickFormat)(tick),
       xText: position === LEFT ? -tickSize - indentFromAxis : tickSize + indentFromAxis,
-      yText: coordinates
+      yText: coordinates,
+      key: index
     };
@@ -430,6 +445,6 @@ };
 
-var axisCoordinates = function axisCoordinates(domainOptions, position, width, height, tickSize, indentFromAxis) {
-  var scale = createScale(domainOptions, width, height);
+var axisCoordinates = function axisCoordinates(domainOptions, position, width, height, tickSize, indentFromAxis, constructor) {
+  var scale = createScale(domainOptions, width, height, constructor);
 
-  return calculateAxisCoordinates(scale, width, height, domainOptions.orientation, position, tickSize, indentFromAxis);
+  return calculateAxisCoordinates(scale, domainOptions.orientation, position, tickSize, indentFromAxis, domainOptions.tickFormat);
 };
@@ -444,5 +459,4 @@
 var getX = function getX(_ref) {
-  var x = _ref.x,
-      width = _ref.width;
-  return x + width / 2;
+  var x = _ref.x;
+  return x;
 };
@@ -466,8 +480,17 @@ var getY = function getY(_ref2) {
 
-var xyScales = function xyScales(argumentDomainOptions, valueDomainOptions, _ref4, groupWidth) {
+var getConstructor = function getConstructor(scaleExtension, type) {
+  return scaleExtension.find(function (item) {
+    return item.type === type;
+  }).constructor;
+};
+
+var xyScales = function xyScales(argumentDomainOptions, valueDomainOptions, _ref4, groupWidth, scaleExtension) {
   var width = _ref4.width,
       height = _ref4.height;
+
+  var xConstructor = getConstructor(scaleExtension, argumentDomainOptions.type);
+  var yConstructor = getConstructor(scaleExtension, valueDomainOptions.type);
   return {
-    xScale: createScale(argumentDomainOptions, width, height, 1 - groupWidth),
-    yScale: createScale(valueDomainOptions, width, height)
+    xScale: createScale(argumentDomainOptions, width, height, xConstructor, 1 - groupWidth),
+    yScale: createScale(valueDomainOptions, width, height, yConstructor)
   };
@@ -513,6 +536,5 @@ };
       return [].concat(toConsumableArray(result), [{
-        x: xScale(dataItem[argumentField]),
+        x: xScale(dataItem[argumentField]) + getWidth(xScale) / 2,
         y: yScale(dataItem[valueField + '-' + name + '-stack'][1]),
         y1: yScale(dataItem[valueField + '-' + name + '-stack'][0]),
-        width: xScale.bandwidth ? xScale.bandwidth() : 0,
         id: index,
@@ -533,13 +555,13 @@ value: dataItem[valueField]
       barWidth = _ref10$barWidth === undefined ? 0.9 : _ref10$barWidth;
+  var scaleExtension = arguments[8];
 
   var rawCoordinates = coordinates(data, { xScale: xScale, yScale: yScale }, argumentField, valueField, name);
-  var bandwidth = xScale.bandwidth ? xScale.bandwidth() : 0;
+  var width = getWidth(xScale);
   var x0Scale = createScale({
-    type: 'band',
     domain: stacks
-  }, bandwidth, bandwidth, 1 - barWidth);
+  }, width, width, getConstructor(scaleExtension, 'band'), 1 - barWidth);
   return rawCoordinates.map(function (item) {
     return _extends({}, item, {
-      width: x0Scale.bandwidth(),
-      x: item.x + x0Scale(stack$$1)
+      width: getWidth(x0Scale),
+      x: item.x - width / 2 + x0Scale(stack$$1)
     });
@@ -695,2 +717,3 @@ });
 
+exports.computedExtension = computedExtension;
 exports.domains = domains;
@@ -713,2 +736,3 @@ exports.bBoxes = bBoxes;
 exports.createScale = createScale;
+exports.getWidth = getWidth;
 exports.HORIZONTAL = HORIZONTAL;
@@ -715,0 +739,0 @@ exports.VERTICAL = VERTICAL;

package.json

 {
   "name": "@devexpress/dx-chart-core",
-  "version": "1.7.2",
+  "version": "1.8.0-beta.1",
   "description": "Core library for the DevExtreme Reactive Chart component",
@@ -64,3 +64,3 @@ "author": {
   },
-  "gitHead": "729b6fc94cb43b3ef1537cb4775d390261882a87"
+  "gitHead": "8fb5dc5f32b4a02a8922917f07398b48902ecc5c"
 }

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

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

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

Improved metrics

Total package byte prevSize

115068

increased by4.11%

Lines of code

1157

increased by3.58%

Worsened metrics

Number of low quality alerts

1

increased byInfinity%

No dependency changes