Updated to blazor 3.2

joadan · joadan · commit 0b1d1da125ca · 2020-05-23T09:34:47.000+02:00
Removed chart playground
diff --git a/Blazor-ApexCharts.sln b/Blazor-ApexCharts.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29521.150
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor-ApexCharts", "src\Blazor-ApexCharts\Blazor-ApexCharts.csproj", "{4AE79EC9-B419-430D-A70F-FE9AF8A1A4B3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChartsPlayground", "samples\ChartsPlayground\ChartsPlayground.csproj", "{84AD28BD-4C2A-4C15-81D8-255D2887268A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChartSamples", "samples\ChartSamples\ChartSamples.csproj", "{0EA8C13B-FD72-4A65-81A3-51D5537608FC}"
 EndProject
 Global
@@ -19,10 +17,6 @@ Global
 		{4AE79EC9-B419-430D-A70F-FE9AF8A1A4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AE79EC9-B419-430D-A70F-FE9AF8A1A4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4AE79EC9-B419-430D-A70F-FE9AF8A1A4B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84AD28BD-4C2A-4C15-81D8-255D2887268A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84AD28BD-4C2A-4C15-81D8-255D2887268A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84AD28BD-4C2A-4C15-81D8-255D2887268A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84AD28BD-4C2A-4C15-81D8-255D2887268A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0EA8C13B-FD72-4A65-81A3-51D5537608FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EA8C13B-FD72-4A65-81A3-51D5537608FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0EA8C13B-FD72-4A65-81A3-51D5537608FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/samples/ChartSamples/ChartSamples.csproj b/samples/ChartSamples/ChartSamples.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-rc1.20223.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Blazor-ApexCharts/ApexChart.razor.cs b/src/Blazor-ApexCharts/ApexChart.razor.cs
@@ -8,7 +8,6 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-
 namespace ApexCharts
 {
     public partial class ApexChart<TItem> : IDisposable where TItem : class
@@ -47,10 +46,10 @@ protected override void OnParametersSet()
             if (Options.Chart == null) { Options.Chart = new Chart(); }
 
             if (Options.Chart.Type != ChartType ||
-           Options.Chart.Width?.ToString() != Width?.ToString() ||
-           Options.Chart.Height?.ToString() != Height?.ToString() ||
-           Options.Xaxis?.Type != XAxisType ||
-           Options.Title?.Text != Title)
+            Options.Chart.Width?.ToString() != Width?.ToString() ||
+            Options.Chart.Height?.ToString() != Height?.ToString() ||
+            Options.Xaxis?.Type != XAxisType ||
+            Options.Title?.Text != Title)
             {
                 Options.ForceRender = true;
             }
@@ -74,13 +73,12 @@ protected override void OnParametersSet()
                 if (Options.Title == null) { Options.Title = new Title(); }
                 Options.Title.Text = Title;
             }
-
-
-
         }
 
         private void SetDatalabels()
         {
+            if (Options?.Series == null) { return; }
+
             if (Options.DataLabels == null) { Options.DataLabels = new DataLabels(); }
             if (Options.DataLabels.EnabledOnSeries == null) { Options.DataLabels.EnabledOnSeries = new List<double>(); }
 
@@ -137,7 +135,6 @@ public void FixLineDataSelection()
         {
             if ((Options.Chart.Type == ChartType.Line || Options.Chart.Type == ChartType.Area) && OnDataPointSelection.HasDelegate)
             {
-
                 if (Options.Tooltip == null) { Options.Tooltip = new Tooltip(); }
                 if (Options.Markers == null) { Options.Markers = new Markers(); }
 
@@ -148,7 +145,6 @@ public void FixLineDataSelection()
 
                 Options.Tooltip.Intersect = true;
                 Options.Tooltip.Shared = false;
-
             }
         }
 
@@ -170,17 +166,14 @@ private async Task UpdateChart()
             var jsonOptions = JsonSerializer.Serialize(Options, serializerOptions);
             await JSRuntime.InvokeVoidAsync("blazor_apexchart.renderChart", ObjectReference, ChartContainer, jsonOptions);
             await OnDataPointSelection.InvokeAsync(null);
-
         }
 
-
         public void Dispose()
         {
             GC.SuppressFinalize(this);
             if (Options.Chart?.ChartId != null && isReady)
             {
                 InvokeAsync(async () => { await JSRuntime.InvokeVoidAsync("blazor_apexchart.destroyChart", Options.Chart.ChartId); });
-
             }
 
             if (ObjectReference != null)
diff --git a/src/Blazor-ApexCharts/Blazor-ApexCharts.csproj b/src/Blazor-ApexCharts/Blazor-ApexCharts.csproj
@@ -15,8 +15,8 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.4" />
   </ItemGroup>
 
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using System.Text.Json.Serialization;`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`
`11`		`-`
`12`	`11`	`namespace ApexCharts`
`13`	`12`	`{`
`14`	`13`	`public partial class ApexChart<TItem> : IDisposable where TItem : class`
`@@ -47,10 +46,10 @@ protected override void OnParametersSet()`
`47`	`46`	`if (Options.Chart == null) { Options.Chart = new Chart(); }`
`48`	`47`
`49`	`48`	`if (Options.Chart.Type != ChartType \|\|`
`50`		`- Options.Chart.Width?.ToString() != Width?.ToString() \|\|`
`51`		`- Options.Chart.Height?.ToString() != Height?.ToString() \|\|`
`52`		`- Options.Xaxis?.Type != XAxisType \|\|`
`53`		`- Options.Title?.Text != Title)`
	`49`	`+ Options.Chart.Width?.ToString() != Width?.ToString() \|\|`
	`50`	`+ Options.Chart.Height?.ToString() != Height?.ToString() \|\|`
	`51`	`+ Options.Xaxis?.Type != XAxisType \|\|`
	`52`	`+ Options.Title?.Text != Title)`
`54`	`53`	`{`
`55`	`54`	`Options.ForceRender = true;`
`56`	`55`	`}`
`@@ -74,13 +73,12 @@ protected override void OnParametersSet()`
`74`	`73`	`if (Options.Title == null) { Options.Title = new Title(); }`
`75`	`74`	`Options.Title.Text = Title;`
`76`	`75`	`}`
`77`		`-`
`78`		`-`
`79`		`-`
`80`	`76`	`}`
`81`	`77`
`82`	`78`	`private void SetDatalabels()`
`83`	`79`	`{`
	`80`	`+ if (Options?.Series == null) { return; }`
	`81`	`+`
`84`	`82`	`if (Options.DataLabels == null) { Options.DataLabels = new DataLabels(); }`
`85`	`83`	`if (Options.DataLabels.EnabledOnSeries == null) { Options.DataLabels.EnabledOnSeries = new List<double>(); }`
`86`	`84`
`@@ -137,7 +135,6 @@ public void FixLineDataSelection()`
`137`	`135`	`{`
`138`	`136`	`if ((Options.Chart.Type == ChartType.Line \|\| Options.Chart.Type == ChartType.Area) && OnDataPointSelection.HasDelegate)`
`139`	`137`	`{`
`140`		`-`
`141`	`138`	`if (Options.Tooltip == null) { Options.Tooltip = new Tooltip(); }`
`142`	`139`	`if (Options.Markers == null) { Options.Markers = new Markers(); }`
`143`	`140`
`@@ -148,7 +145,6 @@ public void FixLineDataSelection()`
`148`	`145`
`149`	`146`	`Options.Tooltip.Intersect = true;`
`150`	`147`	`Options.Tooltip.Shared = false;`
`151`		`-`
`152`	`148`	`}`
`153`	`149`	`}`
`154`	`150`
`@@ -170,17 +166,14 @@ private async Task UpdateChart()`
`170`	`166`	`var jsonOptions = JsonSerializer.Serialize(Options, serializerOptions);`
`171`	`167`	`await JSRuntime.InvokeVoidAsync("blazor_apexchart.renderChart", ObjectReference, ChartContainer, jsonOptions);`
`172`	`168`	`await OnDataPointSelection.InvokeAsync(null);`
`173`		`-`
`174`	`169`	`}`
`175`	`170`
`176`		`-`
`177`	`171`	`public void Dispose()`
`178`	`172`	`{`
`179`	`173`	`GC.SuppressFinalize(this);`
`180`	`174`	`if (Options.Chart?.ChartId != null && isReady)`
`181`	`175`	`{`
`182`	`176`	`InvokeAsync(async () => { await JSRuntime.InvokeVoidAsync("blazor_apexchart.destroyChart", Options.Chart.ChartId); });`
`183`		`-`
`184`	`177`	`}`
`185`	`178`
`186`	`179`	`if (ObjectReference != null)`