Fix startOf function for isoWeek (#23)

Fix startOf function for isoWeek
chartjs · Aug 10, 2020 · fca6f72 · fca6f72
1 parent 18d1a9b
commit fca6f72
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -72,7 +72,9 @@ Chart._adapters._date.override({
 
 	startOf: function(time, unit, weekday) {
 		if (unit === 'isoWeek') {
-			return this._create(time).isoWeekday(weekday).valueOf();
+			weekday = Math.trunc(Math.min(Math.max(0, weekday), 6));
+			const dateTime = this._create(time);
+			return dateTime.minus({days: (dateTime.weekday < weekday ? 7 : 0) + dateTime.weekday - weekday}).startOf('day').valueOf();
 		}
 		return unit ? this._create(time).startOf(unit).valueOf() : time;
 	},

diff --git a/test/specs/luxon-adapter.spec.js b/test/specs/luxon-adapter.spec.js
@@ -62,4 +62,49 @@ describe('Luxon Adapter', function() {
 		expect(adapter.format(1559056227321, formats.millisecond)).toEqual('3:10:27.321 PM');
 		expect(adapter.format(1559056227321, formats.datetime)).toEqual('May 28, 2019, 3:10:27 PM');
 	});
+
+	it('should startOf correctly using isoWeek preset', function() {
+		const adapter = new _adapters._date();
+
+		const dayOfWeekNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+		const daysInMonth = DateTime.local().daysInMonth;
+
+		for (const dayOfWeek of dayOfWeekNames) {
+			for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
+				const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
+				const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', dayOfWeekNames.indexOf(dayOfWeek));
+				expect(adapter.format(startOf, 'ccc')).toEqual(dayOfWeek);
+				expect(startOf.day).not.toBeGreaterThan(dt.day);
+			}
+		}
+
+		for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
+			const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
+			const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', false);
+			expect(adapter.format(startOf, 'ccc')).toEqual('Sun');
+			expect(startOf.day).not.toBeGreaterThan(dt.day);
+		}
+
+		for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
+			const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
+			const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', true);
+			expect(adapter.format(startOf, 'ccc')).toEqual('Mon');
+			expect(startOf.day).not.toBeGreaterThan(dt.day);
+		}
+
+		for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
+			const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
+			const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', 100);
+			expect(adapter.format(startOf, 'ccc')).toEqual('Sat');
+			expect(startOf.day).not.toBeGreaterThan(dt.day);
+		}
+
+		for (let dayOfMonth=1; dayOfMonth<=daysInMonth; dayOfMonth++) {
+			const dt = DateTime.fromObject({day: dayOfMonth, hour: 8, minute: 30});
+			const startOf = adapter.startOf(dt.valueOf(), 'isoWeek', -100);
+			expect(adapter.format(startOf, 'ccc')).toEqual('Sun');
+			expect(startOf.day).not.toBeGreaterThan(dt.day);
+		}
+
+	});
 });