From 29043f152bc51d3cb41412749b2936d729725536 Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Wed, 27 May 2020 12:22:00 -0400
Subject: [PATCH] Consider all timestamps for bar measuring (#7421)

* Consider all timestamps for bar measuring
* Fix watched tests for updated file names
* Add test of sparse bar time scales
---
 karma.conf.js                                 |   2 +-
 src/scales/scale.time.js                      |   2 +-
 .../scale.time/bar-large-gap-between-data.js  |  57 ++++++++++++++++++
 .../scale.time/bar-large-gap-between-data.png | Bin 0 -> 8928 bytes
 4 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/scale.time/bar-large-gap-between-data.js
 create mode 100644 test/fixtures/scale.time/bar-large-gap-between-data.png

diff --git a/karma.conf.js b/karma.conf.js
index a4ec3cd59..2f5f8d8f3 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -14,7 +14,7 @@ module.exports = function(karma) {
 	// we will prefer the unminified build which is easier to browse and works
 	// better with source mapping. In other cases, pick the minified build to
 	// make sure that the minification process (terser) doesn't break anything.
-	const regex = args.watch ? /Chart\.js$/ : /Chart\.min\.js$/;
+	const regex = args.watch ? /chart\.js$/ : /chart\.min\.js$/;
 	const build = builds.filter(v => v.output.file.match(regex))[0];
 
 	if (args.watch) {
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index a6b505c7e..ec8d61e71 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -686,7 +686,7 @@ class TimeScale extends Scale {
 		me._majorUnit = !tickOpts.major.enabled || me._unit === 'year' ? undefined
 			: determineMajorUnit(me._unit);
 		me._table = buildLookupTable(getTimestampsForTable(me), min, max, distribution);
-		me._offsets = computeOffsets(me._table, getDataTimestamps(me), min, max, options);
+		me._offsets = computeOffsets(me._table, timestamps, min, max, options);
 
 		if (options.reverse) {
 			ticks.reverse();
diff --git a/test/fixtures/scale.time/bar-large-gap-between-data.js b/test/fixtures/scale.time/bar-large-gap-between-data.js
new file mode 100644
index 000000000..7b1017251
--- /dev/null
+++ b/test/fixtures/scale.time/bar-large-gap-between-data.js
@@ -0,0 +1,57 @@
+var date = moment('May 24 2020', 'MMM DD YYYY');
+
+module.exports = {
+	threshold: 0.05,
+	config: {
+		type: 'bar',
+		data: {
+			datasets: [{
+				backgroundColor: 'rgba(255, 0, 0, 0.5)',
+				data: [
+					{
+						x: date.clone().add(-2, 'day'),
+						y: 20,
+					},
+					{
+						x: date.clone().add(-1, 'day'),
+						y: 30,
+					},
+					{
+						x: date,
+						y: 40,
+					},
+					{
+						x: date.clone().add(1, 'day'),
+						y: 50,
+					},
+					{
+						x: date.clone().add(7, 'day'),
+						y: 10,
+					}
+				]
+			}]
+		},
+		options: {
+			legend: false,
+			scales: {
+				x: {
+					display: false,
+					type: 'time',
+					distribution: 'linear',
+					ticks: {
+						source: 'auto'
+					},
+					time: {
+						unit: 'day'
+					}
+				},
+				y: {
+					display: false
+				}
+			}
+		}
+	},
+	options: {
+		spriteText: true
+	}
+};
diff --git a/test/fixtures/scale.time/bar-large-gap-between-data.png b/test/fixtures/scale.time/bar-large-gap-between-data.png
new file mode 100644
index 0000000000000000000000000000000000000000..c228f066dd4c43bc5d2cff6da003f9f8e3583fee
GIT binary patch
literal 8928
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
L%7jyEGzb0(SaSC~

literal 0
Hc-jL100001

-- 
2.47.2