Merge pull request #99 from apexcharts/fix-axis-label-color

Fix axis label color

Author: joadan

docs/BlazorApexCharts.Docs.Server/Properties/launchSettings.json

@@ -11,7 +11,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "line-charts",
+      "launchUrl": "features/axis",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

docs/BlazorApexCharts.Docs/Components/ChartTypes/LineCharts/DataLabels.razor

@@ -63,7 +63,7 @@
                 },
 
                 Colors = new List<string> { "#77B6EA", "#545454" },
-                Markers = new Markers { Shape = ShapeEnum.Circle, Size = 5 },
+                Markers = new Markers { Shape = ShapeEnum.Circle, Size = 5, FillOpacity = new Opacity(0.8d) },
                 Stroke = new Stroke { Curve = Curve.Smooth },
                 Legend = new Legend
                 {

docs/BlazorApexCharts.Docs/Components/Features/Axis/AxisSamples.razor

@@ -2,18 +2,25 @@
 
 <DocExamples Title="Axis">
 
-       <CodeSnippet Title="Multiple Y Axis" ClassName=@typeof(MultipleYAxis).ToString()>
+
+
+
+    <CodeSnippet Title="Multiple Y Axis" ClassName=@typeof(MultipleYAxis).ToString()>
         <Snippet>
             <MultipleYAxis />
         </Snippet>
     </CodeSnippet>
 
-     <CodeSnippet Title="XAxis Groups" ClassName=@typeof(XAxisGroupsChart).ToString()>
+    <CodeSnippet Title="XAxis Groups" ClassName=@typeof(XAxisGroupsChart).ToString()>
         <Snippet>
             <XAxisGroupsChart />
         </Snippet>
     </CodeSnippet>
 
-
+    <CodeSnippet Title="Axis Style" ClassName=@typeof(AxisStyle).ToString()>
+        <Snippet>
+            <AxisStyle />
+        </Snippet>
+    </CodeSnippet>
 
 </DocExamples>

docs/BlazorApexCharts.Docs/Components/Features/Axis/AxisStyle.razor

@@ -0,0 +1,53 @@
+<DemoContainer>
+    <ApexChart TItem="Order"
+               Title="Order Net Value"
+               Options=options
+               Debug>
+
+        <ApexPointSeries TItem="Order"
+                         Items="Orders"
+                         Name="Value"
+                         XValue="@(e => e.Country)"
+                         YAggregate="@(e => e.Sum(e => e.GrossValue))"
+                         SeriesType="SeriesType.Bar" />
+
+    </ApexChart>
+</DemoContainer>
+
+@code {
+    private List<Order> Orders { get; set; } = SampleData.GetOrders();
+    private ApexChartOptions<Order> options { get; set; } = new();
+
+    protected override void OnInitialized()
+    {
+        options.Yaxis = new List<YAxis>();
+
+        options.Yaxis.Add(new YAxis
+            {
+                Title = new AxisTitle { Text = "Value" },
+                DecimalsInFloat = 0,
+                TickAmount=6,
+               
+                Labels = new YAxisLabels
+                {
+                    Style = new AxisLabelStyle { FontSize = "20px", Colors = new Color("red") }
+                }
+            });
+
+
+        options.Xaxis = new XAxis
+            {
+                Labels = new XAxisLabels
+                {
+                    Style = new AxisLabelStyle
+                    {
+                        FontSize = "18px",
+                        FontWeight = "bolder",
+                        Colors = new Color(new List<string> { "red", "blue", "Orange", "Green" })
+                    }
+                }
+            };
+
+    }
+
+}

src/Blazor-ApexCharts/ChartSerializer.cs

@@ -20,6 +20,8 @@ private JsonSerializerOptions GenerateOptions<TItem>() where TItem : class
             serializerOptions.Converters.Add(new DataPointConverter<TItem>());
             serializerOptions.Converters.Add(new SeriesConverter<TItem>());
             serializerOptions.Converters.Add(new CustomJsonStringEnumConverter());
+            serializerOptions.Converters.Add(new ValueOrListConverter<string>());
+            serializerOptions.Converters.Add(new ValueOrListConverter<double>());
 
             return serializerOptions;
         }

src/Blazor-ApexCharts/Models/ApexChartOptions.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System;
 using System.Runtime.Serialization;
+using System.Linq;
 
 namespace ApexCharts
 {
@@ -1439,7 +1440,7 @@ public class DatetimeFormatter
 
     public class AxisLabelStyle
     {
-        public Color? Colors { get; set; }
+        public Color Colors { get; set; }
         public string CssClass { get; set; }
         public string FontFamily { get; set; }
         public string FontSize { get; set; }
@@ -1564,42 +1565,45 @@ public enum TickAmountEnum { DataPoints };
 
     public enum XAxisType { Category, Datetime, Numeric };
 
-
-    public struct Download
+    public class ValueOrList<T> 
     {
-        public bool? Bool;
-        public string String;
+        private readonly T _str;
+        private readonly List<T> _list;
+        public bool IsList { get; private set; }
 
-        public static implicit operator Download(bool Bool) => new Download { Bool = Bool };
-        public static implicit operator Download(string String) => new Download { String = String };
-    }
+        public T GetValue => _str;
+        public IEnumerable<T> GetList => _list;
 
-    public struct Color
-    {
-        public string String;
-        public List<string> StringArray;
+        public ValueOrList(T value)
+        {
+            _str = value;
+        }
 
-        public static implicit operator Color(string String) => new Color { String = String };
-        public static implicit operator Color(List<string> StringArray) => new Color { StringArray = StringArray };
+        public ValueOrList(IEnumerable<T> list)
+        {
+            IsList = true;
+            _list = list.ToList();
+        }
     }
 
-    public struct Opacity
-    {
-        public double? Double;
-        public List<double> DoubleArray;
 
-        public static implicit operator Opacity(double Double) => new Opacity { Double = Double };
-        public static implicit operator Opacity(List<double> DoubleArray) => new Opacity { DoubleArray = DoubleArray };
+    public class Color : ValueOrList<string>
+    {
+        public Color(string value) : base(value)
+        {
+        }
+        public Color(IEnumerable<string> list) : base(list)
+        {
+        }
     }
 
-    public struct ShapeUnion
+    public class Opacity : ValueOrList<double>
     {
-        public ShapeEnum? Enum;
-        public List<string> StringArray;
-
-        public static implicit operator ShapeUnion(ShapeEnum Enum) => new ShapeUnion { Enum = Enum };
-        public static implicit operator ShapeUnion(List<string> StringArray) => new ShapeUnion { StringArray = StringArray };
+        public Opacity(double value) : base(value)
+        {
+        }
+        public Opacity(IEnumerable<double> list) : base(list)
+        {
+        }
     }
-
-   
 }

src/Blazor-ApexCharts/Models/Converters/SeriesConverter.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 
 namespace ApexCharts.Models
 {

src/Blazor-ApexCharts/Models/Converters/ValueOrListConverter.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace ApexCharts.Models
+{
+
+    public class ValueOrListConverter<T> : JsonConverter<ValueOrList<T>>
+    {
+        public override ValueOrList<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override bool CanConvert(Type typeToConvert) =>  typeof(ValueOrList<T>).IsAssignableFrom(typeToConvert);
+
+        public override void Write(Utf8JsonWriter writer, ValueOrList<T> value, JsonSerializerOptions options)
+        {
+            if (value == null)
+            {
+                JsonSerializer.Serialize(writer, null, options);
+            }
+            else
+            {
+                if (value.IsList)
+                {
+                    JsonSerializer.Serialize(writer, value.GetList, typeof(IEnumerable<T>), options);
+                }
+                else
+                {
+                    JsonSerializer.Serialize(writer, value.GetValue, typeof(T), options);
+                }
+            }
+        }
+    }
+
+}
+