Fix inRange for full circle

Author: kurkle

src/elements/element.arc.js

@@ -92,11 +92,17 @@ class Arc extends Element {
 	constructor(cfg) {
 		super();
 
+		/** @type object */
 		this.options = undefined;
+		/** @type number */
 		this.circumference = undefined;
+		/** @type number */
 		this.startAngle = undefined;
+		/** @type number */
 		this.endAngle = undefined;
+		/** @type number */
 		this.innerRadius = undefined;
+		/** @type number */
 		this.outerRadius = undefined;
 
 		if (cfg) {
@@ -112,13 +118,14 @@ class Arc extends Element {
 	inRange(chartX, chartY, useFinalPosition) {
 		const point = this.getProps(['x', 'y'], useFinalPosition);
 		const {angle, distance} = getAngleFromPoint(point, {x: chartX, y: chartY});
-		const {startAngle, endAngle, innerRadius, outerRadius} = this.getProps([
+		const {startAngle, endAngle, innerRadius, outerRadius, circumference} = this.getProps([
 			'startAngle',
 			'endAngle',
 			'innerRadius',
-			'outerRadius'
+			'outerRadius',
+			'circumference'
 		], useFinalPosition);
-		const betweenAngles = _angleBetween(angle, startAngle, endAngle);
+		const betweenAngles = circumference >= TAU || _angleBetween(angle, startAngle, endAngle);
 		const withinRadius = (distance >= innerRadius && distance <= outerRadius);
 
 		return (betweenAngles && withinRadius);

test/specs/element.arc.tests.js

@@ -19,6 +19,21 @@ describe('Arc element tests', function() {
 		expect(arc.inRange(-1.0 * Math.sqrt(7), Math.sqrt(7))).toBe(false);
 	});
 
+	it ('should determine if in range, when full circle', function() {
+		// Mock out the arc as if the controller put it there
+		var arc = new Chart.elements.Arc({
+			startAngle: -Math.PI,
+			endAngle: Math.PI * 1.5,
+			x: 0,
+			y: 0,
+			innerRadius: 0,
+			outerRadius: 10,
+			circumference: Math.PI * 2
+		});
+
+		expect(arc.inRange(7, 7)).toBe(true);
+	});
+
 	it ('should get the tooltip position', function() {
 		// Mock out the arc as if the controller put it there
 		var arc = new Chart.elements.Arc({