Merge pull request #151 from aruljenithberkmans/main

Fix the trackball label line draw over the trackball label template in MAUI Charts.

Author: PaulAndersonS

maui/src/Charts/Area/CartesianChartArea.cs

@@ -107,6 +107,7 @@ public CartesianChartArea(SfCartesianChart chart)
 			_axisLayout.InputTransparent = true;
 			Add(_annotationLayout);
 			Add(_behaviorLayout);
+			_behaviorLayout.ZIndex = this.Children.Count;
 			BatchCommit();
 		}
 
@@ -137,6 +138,10 @@ protected override void UpdateAreaCore()
 				AreaBounds.SubtractThickness(PlotAreaMargin),
 				_cartesianPlotArea._chart.TitleHeight);
 
+			//Need to set the trackballview padding to display the trackball template exact position
+			if (cartesianChart is SfCartesianChart chart)
+				chart._trackballView.Padding = PlotAreaMargin;
+
 			UpdateVisibleSeries(); //series create segment logics.
 
 			if (cartesianChart is SfCartesianChart sfChart)

maui/src/Charts/Behaviors/ChartTrackballBehavior.cs

@@ -772,7 +772,7 @@ public void Show(float pointX, float pointY)
 		/// </summary>
 		public void Hide()
 		{
-			if (CartesianChart?.BehaviorLayout.Children.Count > 0)
+			if (CartesianChart?._trackballView.Children.Count > 0)
 			{
 				RemoveTrackballTemplateInfo(CartesianChart);
 			}
@@ -959,7 +959,7 @@ internal void DrawElements(ICanvas canvas, Rect dirtyRect)
 
 			foreach (var item in _axisPointInfos)
 			{
-				if (ShowLabel && !item.HasTrackballAxisTemplate)
+				if (!item.HasTrackballAxisTemplate)
 				{
 					item.Helper.Draw(canvas);
 				}
@@ -1097,9 +1097,9 @@ void UpdateTrackballPointInfos(float pointX, float pointY)
 			{
 				foreach (var info in PreviousPointInfos)
 				{
-					if (CartesianChart.BehaviorLayout.Contains(info.ContentTemplateView))
+					if (info.ContentTemplateView != null && CartesianChart._trackballView.Contains(info.ContentTemplateView))
 					{
-						CartesianChart.BehaviorLayout.Remove(info.ContentTemplateView);
+						CartesianChart._trackballView.Remove(info.ContentTemplateView);
 					}
 				}
 
@@ -1110,9 +1110,9 @@ void UpdateTrackballPointInfos(float pointX, float pointY)
 			{
 				foreach (var info in _previousAxisPointInfos)
 				{
-					if (CartesianChart.BehaviorLayout.Contains(info.AxisTemplateView))
+					if (CartesianChart._trackballView.Contains(info.AxisTemplateView) && info.AxisTemplateView != null)
 					{
-						CartesianChart.BehaviorLayout.Remove(info.AxisTemplateView);
+						CartesianChart._trackballView.Remove(info.AxisTemplateView);
 					}
 				}
 
@@ -1252,7 +1252,7 @@ void GenerateAxisTrackballInfos(float leastX)
 						{
 							Duration = double.NaN
 						};
-						CartesianChart.BehaviorLayout.Add(trackballTemp);
+						CartesianChart._trackballView.Add(trackballTemp);
 						trackballTemp.Helper.CanNosePointTarget = true;
 						trackballTemp.Background = TrackballBackground;
 						ContentList.Add(trackballTemp);
@@ -1868,9 +1868,9 @@ void RemoveTrackballInfo(TrackballPointInfo pointInfo)
 				{
 					foreach (var info in PreviousPointInfos)
 					{
-						if (info.DataItem == pointInfo.DataItem && info.Series == pointInfo.Series)
+						if (info.DataItem == pointInfo.DataItem && info.Series == pointInfo.Series && info.ContentTemplateView != null)
 						{
-							CartesianChart?.BehaviorLayout.Remove(info.ContentTemplateView);
+							CartesianChart?._trackballView.Remove(info.ContentTemplateView);
 							PreviousPointInfos.Remove(info);
 
 							return;
@@ -1940,21 +1940,21 @@ bool IsRectContainsPoints(TrackballPointInfo pointInfo)
 
 		SfTooltip? GetOrCreateTrackballView(SfCartesianChart chart, TrackballPointInfo? prevTrackballInfo)
 		{
-			var trackballView = prevTrackballInfo?.ContentTemplateView as SfTooltip;
+			var trackballTooltip = prevTrackballInfo?.ContentTemplateView as SfTooltip;
 
-			if (trackballView == null && ShowLabel)
+			if (trackballTooltip == null && ShowLabel)
 			{
-				trackballView = new SfTooltip
+				trackballTooltip = new SfTooltip
 				{
 					Background = _actualLabelStyle.Background
 				};
-				chart.BehaviorLayout.Add(trackballView);
-				trackballView.Duration = double.NaN;
-				trackballView.Helper.CanNosePointTarget = true;
-				ContentList.Add(trackballView);
+				chart._trackballView.Add(trackballTooltip);
+				trackballTooltip.Duration = double.NaN;
+				trackballTooltip.Helper.CanNosePointTarget = true;
+				ContentList.Add(trackballTooltip);
 			}
 
-			return trackballView;
+			return trackballTooltip;
 		}
 
 		static View? GetTheTrackballTemplate(DataTemplate trackballTemplate, object bindingContext)
@@ -1977,7 +1977,7 @@ void RemoveTrackballTemplateInfo(SfCartesianChart cartesianChart)
 			{
 				foreach (var item in ContentList)
 				{
-					cartesianChart.BehaviorLayout.Remove(item);
+					cartesianChart._trackballView.Remove(item);
 				}
 			}
 		}