Merge pull request #592 from vizzuhq/bugfix_250

Flying out marker label fixed.

Author: schaumb

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Removed 'min' align property from the API which equivalent with the 'none'.
 - Markers are the same even if new record added.
+- Flying out marker label fixed.
 - Axis line hide/show at same time with axis labels/ticks/title.
 - Do not draw invisible axis line.
 

src/base/geom/rect.cpp

@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <compare>
 
 #include "base/math/floating.h"
 
@@ -92,10 +93,19 @@ Rect Rect::intersection(const Rect &rect) const
 
 bool Rect::intersects(const Rect &r) const
 {
-	using Math::Floating::less;
-	auto isOutside =
-	    less(right(), r.left()) || less(r.right(), left())
-	    || less(top(), r.bottom()) || less(r.top(), bottom());
+	using Math::Floating::is_zero;
+	using std::strong_order;
+	auto first = strong_order(right(), r.left());
+	auto second = strong_order(r.right(), left());
+	auto third = strong_order(top(), r.bottom());
+	auto fourth = strong_order(r.top(), bottom());
+
+	auto isOutside = is_lt(first) || is_lt(second) || is_lt(third)
+	              || is_lt(fourth)
+	              || ((is_eq(first) || is_eq(second))
+	                  && !is_zero(width()) && !is_zero(r.width()))
+	              || ((is_eq(third) || is_eq(fourth))
+	                  && !is_zero(height()) && !is_zero(r.height()));
 	return !isOutside;
 }
 

test/e2e/tests/fixes.json

@@ -19,6 +19,9 @@
 		"163": {
 			"refs": ["a82431f"]
 		},
+		"250": {
+			"refs": ["e140a3d"]
+		},
 		"252": {
 			"refs": ["00f01d9"]
 		},

test/e2e/tests/fixes/250.mjs

@@ -0,0 +1,31 @@
+const testSteps = [
+	(chart) =>
+		chart.animate({
+			data: {
+				series: [
+					{ name: 'Foo', values: ['Alice', 'Bob', 'Ted'] },
+					{ name: 'Bar', values: [15, 32, 12] },
+					{ name: 'Baz', values: [5, 3, 2] }
+				]
+			}
+		}),
+	(chart) =>
+		chart.animate({
+			config: {
+				x: 'Foo',
+				y: 'Bar',
+				label: 'Bar'
+			}
+		}),
+	(chart) =>
+		chart.animate({
+			config: {
+				x: { range: { min: -2, max: 2 } }
+			},
+			style: {
+				paddingRight: 100
+			}
+		})
+]
+
+export default testSteps