Merge pull request #516 from apexcharts/update-tabblazor

joadan · web-flow · commit 55d0b0c37e34 · 2024-10-07T08:32:09.000+02:00
Updated to latest TabBlazor
diff --git a/docs/BlazorApexCharts.Docs.Server/Pages/_Host.cshtml b/docs/BlazorApexCharts.Docs.Server/Pages/_Host.cshtml
@@ -13,7 +13,7 @@
     <title>Blazor ApexCharts Docs</title>
     <base href="~/" />
 
-    <link rel="stylesheet" href="@("https://unpkg.com/@tabler/core@1.0.0-beta15/dist/css/tabler.min.css")">
+    <link rel="stylesheet" href="@("https://unpkg.com/@tabler/core@1.0.0-beta21/dist/css/tabler.min.css")">
     <link rel="stylesheet" href="_content/TabBlazor/css/tabblazor.min.css" />
     <script src="_content/TabBlazor/js/tabblazor.js"></script>
 
diff --git a/docs/BlazorApexCharts.Docs.Wasm/BlazorApexCharts.Docs.Wasm.csproj b/docs/BlazorApexCharts.Docs.Wasm/BlazorApexCharts.Docs.Wasm.csproj
@@ -5,10 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" PrivateAssets="all" />
-    <PackageReference Include="PublishSPAforGitHubPages.Build" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
+    <PackageReference Include="PublishSPAforGitHubPages.Build" Version="3.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+	  <PackageReference Include="TabBlazor" Version="0.12.2-alpha" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/docs/BlazorApexCharts.Docs.Wasm/Program.cs b/docs/BlazorApexCharts.Docs.Wasm/Program.cs
@@ -25,6 +25,8 @@ public static async Task Main(string[] args)
             //builder.Services.AddSingleton(serviceProvider => (IJSInProcessRuntime)serviceProvider.GetRequiredService<IJSRuntime>());
             builder.Services.AddSingleton(serviceProvider => (IJSUnmarshalledRuntime)serviceProvider.GetRequiredService<IJSRuntime>());
 
+            var dummy = new TabBlazor.TablerOptions();
+
             await builder.Build().RunAsync();
         }
     }
diff --git a/docs/BlazorApexCharts.Docs.Wasm/wwwroot/index.html b/docs/BlazorApexCharts.Docs.Wasm/wwwroot/index.html
@@ -8,7 +8,7 @@
     <title>Blazor ApexCharts Documentation</title>
     <base href="/" />
 
-    <link rel="stylesheet" href="https://unpkg.com/@tabler/core@1.0.0-beta15/dist/css/tabler.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/@tabler/core@1.0.0-beta21/dist/css/tabler.min.css">
     <link rel="stylesheet" href="_content/TabBlazor/css/tabblazor.min.css" />
     <script src="_content/TabBlazor/js/tabblazor.js"></script>
 
diff --git a/docs/BlazorApexCharts.Docs/BlazorApexCharts.Docs.csproj b/docs/BlazorApexCharts.Docs/BlazorApexCharts.Docs.csproj
@@ -12,9 +12,9 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="35.4.1" />
     <PackageReference Include="ColorCode.HTML" Version="2.0.15" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="TabBlazor" Version="0.7.2-alpha" />
+    <PackageReference Include="TabBlazor" Version="0.12.2-alpha" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/docs/BlazorApexCharts.Docs/Components/ChartTypes/LineCharts/DataLabels.razor b/docs/BlazorApexCharts.Docs/Components/ChartTypes/LineCharts/DataLabels.razor
@@ -68,7 +68,7 @@
                 Legend = new Legend
                 {
                     Position = LegendPosition.Top,
-                    HorizontalAlign = Align.Right,
+                    HorizontalAlign = ApexCharts.Align.Right,
                     Floating = true,
                     OffsetX = -5,
                     OffsetY = -25
diff --git a/docs/BlazorApexCharts.Docs/Components/ChartTypes/LineCharts/DataLabelsTickBetween.razor b/docs/BlazorApexCharts.Docs/Components/ChartTypes/LineCharts/DataLabelsTickBetween.razor
@@ -67,7 +67,7 @@
                 Legend = new Legend
                 {
                     Position = LegendPosition.Top,
-                    HorizontalAlign = Align.Right,
+                    HorizontalAlign = ApexCharts.Align.Right,
                     Floating = true,
                     OffsetX = -5,
                     OffsetY = -25
diff --git a/docs/BlazorApexCharts.Docs/Components/Features/Legend/Basic.razor b/docs/BlazorApexCharts.Docs/Components/Features/Legend/Basic.razor
@@ -20,6 +20,6 @@
 
     protected override void OnInitialized()
     {
-        options.Legend = new Legend { Position = LegendPosition.Top, FontSize ="20px", HorizontalAlign = Align.Center };
+        options.Legend = new Legend { Position = LegendPosition.Top, FontSize = "20px", HorizontalAlign = ApexCharts.Align.Center };
     }
     }
diff --git a/docs/BlazorApexCharts.Docs/Components/Methods/MultiCharts/ShowHide.razor b/docs/BlazorApexCharts.Docs/Components/Methods/MultiCharts/ShowHide.razor
@@ -69,7 +69,7 @@
 
     protected override void OnInitialized()
     {
-        options1.Legend = new Legend { HorizontalAlign = Align.Center, Position = LegendPosition.Top };
+        options1.Legend = new Legend { HorizontalAlign = ApexCharts.Align.Center, Position = LegendPosition.Top };
         options2.Legend = new Legend { Show = false };
     }
 
diff --git a/src/Blazor-ApexCharts/Blazor-ApexCharts.csproj b/src/Blazor-ApexCharts/Blazor-ApexCharts.csproj
@@ -27,8 +27,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-	<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
+	<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
   </ItemGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ public static async Task Main(string[] args)`
`25`	`25`	`//builder.Services.AddSingleton(serviceProvider => (IJSInProcessRuntime)serviceProvider.GetRequiredService<IJSRuntime>());`
`26`	`26`	`builder.Services.AddSingleton(serviceProvider => (IJSUnmarshalledRuntime)serviceProvider.GetRequiredService<IJSRuntime>());`
`27`	`27`
	`28`	`+ var dummy = new TabBlazor.TablerOptions();`
	`29`	`+`
`28`	`30`	`await builder.Build().RunAsync();`
`29`	`31`	`}`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@`
`68`	`68`	`Legend = new Legend`
`69`	`69`	`{`
`70`	`70`	`Position = LegendPosition.Top,`
`71`		`- HorizontalAlign = Align.Right,`
	`71`	`+ HorizontalAlign = ApexCharts.Align.Right,`
`72`	`72`	`Floating = true,`
`73`	`73`	`OffsetX = -5,`
`74`	`74`	`OffsetY = -25`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`Legend = new Legend`
`68`	`68`	`{`
`69`	`69`	`Position = LegendPosition.Top,`
`70`		`- HorizontalAlign = Align.Right,`
	`70`	`+ HorizontalAlign = ApexCharts.Align.Right,`
`71`	`71`	`Floating = true,`
`72`	`72`	`OffsetX = -5,`
`73`	`73`	`OffsetY = -25`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@`
`20`	`20`
`21`	`21`	`protected override void OnInitialized()`
`22`	`22`	`{`
`23`		`- options.Legend = new Legend { Position = LegendPosition.Top, FontSize ="20px", HorizontalAlign = Align.Center };`
	`23`	`+ options.Legend = new Legend { Position = LegendPosition.Top, FontSize = "20px", HorizontalAlign = ApexCharts.Align.Center };`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`
`70`	`70`	`protected override void OnInitialized()`
`71`	`71`	`{`
`72`		`- options1.Legend = new Legend { HorizontalAlign = Align.Center, Position = LegendPosition.Top };`
	`72`	`+ options1.Legend = new Legend { HorizontalAlign = ApexCharts.Align.Center, Position = LegendPosition.Top };`
`73`	`73`	`options2.Legend = new Legend { Show = false };`
`74`	`74`	`}`
`75`	`75`