Column Chart - Position data labels above, level or below bar if posi…

…tive, zero or negative, respectively. (#1270) Bar Chart - Position data labels right, level or left of bar if positive, zero or negative, respectively.
radzenhq · Dec 6, 2023 · 8ed441d · 8ed441d
1 parent c711a0c
commit 8ed441d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/Radzen.Blazor/RadzenBarSeries.razor.cs b/Radzen.Blazor/RadzenBarSeries.razor.cs
@@ -222,12 +222,16 @@ public override IEnumerable<ChartDataLabel> GetDataLabels(double offsetX, double
         {
             var list = new List<ChartDataLabel>();
 
+            (string Anchor, int Sign) position;
+
             foreach (var d in Data)
             {
-                list.Add(new ChartDataLabel 
-                { 
-                    Position = new Point() { X = TooltipX(d) + offsetX + 8, Y = TooltipY(d) + offsetY },
-                    TextAnchor = "start",
+                position = Value(d) < 0 ? ("end", -1) : Value(d) == 0 ? ("middle", 0) : ("start", 1);
+
+                list.Add(new ChartDataLabel
+                {
+                    Position = new Point() { X = TooltipX(d) + offsetX + (8 * position.Sign), Y = TooltipY(d) + offsetY },
+                    TextAnchor = position.Anchor,
                     Text = Chart.ValueAxis.Format(Chart.CategoryScale, Value(d))
                 });
             }

diff --git a/Radzen.Blazor/RadzenColumnSeries.razor.cs b/Radzen.Blazor/RadzenColumnSeries.razor.cs
@@ -154,11 +154,7 @@ internal override double TooltipX(TItem item)
         /// <inheritdoc />
         internal override double TooltipY(TItem item)
         {
-            var y = base.TooltipY(item);
-            var ticks = Chart.ValueScale.Ticks(Chart.ValueAxis.TickDistance);
-            var y0 = Chart.ValueScale.Scale(Math.Max(0, ticks.Start));
-
-            return Math.Min(y, y0);
+            return base.TooltipY(item);
         }
 
         /// <inheritdoc />
@@ -195,7 +191,23 @@ public override (object, Point) DataAt(double x, double y)
         /// <inheritdoc />
         public override IEnumerable<ChartDataLabel> GetDataLabels(double offsetX, double offsetY)
         {
-            return base.GetDataLabels(offsetX, offsetY - 16);
+            var list = new List<ChartDataLabel>();
+
+            int sign;
+
+            foreach (var d in Data)
+            {
+                sign = Value(d) < 0 ? -1 : Value(d) == 0 ? 0 : 1;
+
+                list.Add(new ChartDataLabel
+                {
+                    Position = new Point() { X = TooltipX(d) + offsetX, Y = TooltipY(d) - offsetY - (16 * sign) },
+                    TextAnchor = "middle",
+                    Text = Chart.ValueAxis.Format(Chart.ValueScale, Value(d))
+                });
+            }
+
+            return list;
         }
     }
 }