From e80bd1cf1f5453cac328d684e9b87a215eb83720 Mon Sep 17 00:00:00 2001
From: ysmoradi <ysmoradi@outlook.com>
Date: Thu, 29 Aug 2024 11:31:44 +0200
Subject: [PATCH 1/3] Make Bit.BlazorUI.Extras project linker friendly (#8439)

---
 .../Bit.BlazorUI.Extras.csproj                |  2 +-
 .../Chart/Interop/BitChartJsInterop.cs        | 64 ++++++++++++++++++-
 .../Extras/DataGrid/BitDataGridDemo.razor     |  7 --
 .../Extras/DataGrid/BitDataGridDemo.razor.cs  | 16 -----
 .../Boilerplate.Client.Core.csproj            |  2 +-
 .../wwwroot/index.html                        |  6 +-
 .../Boilerplate.Client.Web.csproj             |  4 +-
 .../Boilerplate.Client.Web/wwwroot/index.html |  4 --
 .../Components/App.razor                      |  4 --
 9 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj b/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj
index efe43245e2..d89ea8824f 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj
@@ -6,7 +6,7 @@
         <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <RootNamespace>Bit.BlazorUI</RootNamespace>
-        <IsTrimmable>false</IsTrimmable>
+        <IsTrimmable>true</IsTrimmable>
         <WarningLevel>0</WarningLevel>
         <ResolveStaticWebAssetsInputsDependsOn Condition="'$(TargetFramework)' == 'net8.0'">
             BeforeBuildTasks;
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
index 437d209021..ac6b7858eb 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
@@ -2,6 +2,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Bit.BlazorUI;
 
@@ -36,9 +37,68 @@ public static ValueTask RemoveChart(this IJSRuntime jsRuntime, string canvasId)
     /// <param name="jsRuntime"></param>
     /// <param name="chartConfig">The config for the new chart.</param>
     /// <returns></returns>
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartScatterConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartConfigBase<,>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartConfigBase<>))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonStringEnumConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(IndexableOptionConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(FloatingBarPointConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ClippingJsonConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonWriteOnlyConverter<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonObjectEnumConverter))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBaseConfigOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartIndexableOption<>))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarDataset<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleDataset))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartDataset<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineDataset<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieDataset))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaDataset))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarDataset))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLegend))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPosition))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTooltips))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartAnimation))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarScales))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartScales))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCategoryTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLinearCartesianTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLogarithmicTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTimeTicks))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarCategoryAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarLinearCartesianAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarLogarithmicAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarTimeAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianAxis<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCategoryAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLinearCartesianAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLogarithmicAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTimeAxis))]
+
     public static ValueTask<bool> SetupChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
     {
-        dynamic dynParam = StripNulls(chartConfig);
+        ExpandoObject dynParam = StripNulls(chartConfig);
         Dictionary<string, object> param = ConvertExpandoObjectToDictionary(dynParam);
         return jsRuntime.InvokeAsync<bool>("BitBlazorUI.BitChart.setupChart", param);
     }
@@ -93,7 +153,7 @@ private static Dictionary<string, object> RecursivelyConvertIDictToDict(IDiction
     /// <returns></returns>
     public static ValueTask<bool> UpdateChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
     {
-        dynamic dynParam = StripNulls(chartConfig);
+        ExpandoObject dynParam = StripNulls(chartConfig);
         Dictionary<string, object> param = ConvertExpandoObjectToDictionary(dynParam);
         return jsRuntime.InvokeAsync<bool>("BitBlazorUI.BitChart.updateChart", param);
     }
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor
index 256c13613d..91912fc93a 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor
@@ -16,12 +16,6 @@
                ComponentParameters="componentParameters"
                ComponentSubClasses="componentSubClasses"
                ComponentSubEnums="componentSubEnums">
-    @if (isLoadingAssemblies)
-    {
-        <LoadingComponent />
-    }
-    else
-    {
         <ComponentExampleBox Title="Basic" RazorCode="@example1RazorCode" CsharpCode="@example1CsharpCode" Id="example1">
             <ExamplePreview>
                 <div class="grid1">
@@ -114,5 +108,4 @@
                 </div>
             </ExamplePreview>
         </ComponentExampleBox>
-    }
 </ComponentDemo>
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor.cs
index 325b47632e..14be11e3b9 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Extras/DataGrid/BitDataGridDemo.razor.cs
@@ -342,10 +342,6 @@ also it's possible to add arbitrary Blazor components to your table cells.
         new CountryModel { Code = "VE", Name = "Venezuela", Medals = new MedalsModel { Gold = 1, Silver = 3, Bronze = 0 } },
     ];
 
-    [AutoInject] LazyAssemblyLoader lazyAssemblyLoader = default!;
-
-    private bool isLoadingAssemblies = true;
-
     protected override async Task OnInitAsync()
     {
         allCountries = _countries.AsQueryable();
@@ -420,18 +416,6 @@ protected override async Task OnInitAsync()
             }
         };
 
-        try
-        {
-            if (OperatingSystem.IsBrowser())
-            {
-                await lazyAssemblyLoader.LoadAssembliesAsync(["Newtonsoft.Json.wasm", "System.Private.Xml.wasm", "System.Data.Common.wasm"]);
-            }
-        }
-        finally
-        {
-            isLoadingAssemblies = false;
-        }
-
         await base.OnInitAsync();
     }
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
index 363a3a590d..7e2d059a00 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj
@@ -24,7 +24,7 @@
         <PackageReference Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Bit.Besql" Version="8.11.0-pre-04" />
         <PackageReference Condition=" '$(signalr)' == 'true' OR '$(signalr)' == ''" Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.8" />
         <PackageReference Condition=" '$(offlineDb)' == 'true' OR '$(offlineDb)' == ''" Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
-        <PackageReference Condition=" '$(sample)' == 'Admin' OR '$(sample)' == ''" Include="Bit.BlazorUI.Extras" Version="8.11.0-pre-04" />
+        <PackageReference Include="Bit.BlazorUI.Extras" Version="8.11.0-pre-04" />
         <!--/-:msbuild-conditional:noEmit -->
         <PackageReference Include="Bit.CodeAnalyzers" Version="8.11.0-pre-04" PrivateAssets="all" />
         <PackageReference Include="Bit.SourceGenerators" Version="8.11.0-pre-04" PrivateAssets="all" />
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
index adae667121..a94b77a0ab 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/index.html
@@ -23,9 +23,7 @@
     <link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
-    <!--#if (sample == "Admin")-->
     <link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
-    <!--#endif-->
     <link rel="stylesheet" href="_content/Boilerplate.Client.Core/styles/app.css" />
     <link rel="stylesheet" href="_content/Boilerplate.Client.Core/Boilerplate.Client.Core.bundle.scp.css" />
     <link rel="stylesheet" href="Boilerplate.Client.Maui.styles.css" />
@@ -140,10 +138,8 @@
     <script src="_framework/blazor.webview.js" autostart="false"></script>
     <script src="_content/Bit.Butil/bit-butil.js"></script>
     <script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></script>
-    <!--#if (sample == "Admin")-->
-    <script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></script>
-    <!--#endif-->
     <script src="_content/Boilerplate.Client.Core/scripts/app.js"></script>
+    <script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></script>
 
 </body>
 
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
index a029fa332e..102630f898 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj
@@ -52,11 +52,11 @@
     </ItemGroup>
 
     <!--/+:msbuild-conditional:noEmit -->
-    <ItemGroup Condition=" ('$(sample)' == 'Admin' OR '$(sample)' == '') AND ('$(offlineDb)' == 'false' OR '$(offlineDb)' == '')">
+    <ItemGroup Condition="'$(offlineDb)' == 'false' OR '$(offlineDb)' == ''">
         <BlazorWebAssemblyLazyLoad Include="System.Private.Xml.wasm" />
         <BlazorWebAssemblyLazyLoad Include="System.Data.Common.wasm" />
     </ItemGroup>
-    <ItemGroup Condition="'$(sample)' == 'Admin' OR '$(sample)' == ''">
+    <ItemGroup>
         <BlazorWebAssemblyLazyLoad Include="Newtonsoft.Json.wasm" />
     </ItemGroup>
     <!--/-:msbuild-conditional:noEmit -->
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
index 99e7826a74..bf34de5e76 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/index.html
@@ -28,9 +28,7 @@
     <link href="_content/Bit.BlazorUI/styles/bit.blazorui.css" rel="stylesheet" />
     <link href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" rel="stylesheet" />
     <link href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" rel="stylesheet" />
-    <!--#if (sample == "Admin") -->
     <link href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" rel="stylesheet" />
-    <!--#endif -->
     <link href="_content/Boilerplate.Client.Core/styles/app.css" rel="stylesheet" />
     <link href="_content/Boilerplate.Client.Core/Boilerplate.Client.Core.bundle.scp.css" rel="stylesheet" />
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
@@ -216,8 +214,6 @@
     <!--#endif -->
     <script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></script>
     <script src="_content/Boilerplate.Client.Core/scripts/app.js"></script>
-    <!--#if (sample == "Admin") -->
     <script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></script>
-    <!--#endif -->
 </body>
 </html>
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
index 54c526614a..c0061dd302 100644
--- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
+++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor
@@ -44,9 +44,7 @@
     <Link rel="stylesheet" href="_content/Bit.BlazorUI/styles/bit.blazorui.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Icons/styles/bit.blazorui.icons.css" />
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Assets/styles/bit.blazorui.assets.css" />
-    @*#if (sample == "Admin")*@
     <Link rel="stylesheet" href="_content/Bit.BlazorUI.Extras/styles/bit.blazorui.extras.css" />
-    @*#endif*@
     <Link rel="stylesheet" href="_content/Boilerplate.Client.Core/styles/app.css" />
     <Link rel="stylesheet" href="_content/Boilerplate.Client.Core/Boilerplate.Client.Core.bundle.scp.css" />
 
@@ -86,9 +84,7 @@
         @*#endif*@
         <Script src="_content/Bit.BlazorUI/scripts/bit.blazorui.js"></Script>
         <Script src="_content/Boilerplate.Client.Core/scripts/app.js"></Script>
-        @*#if (sample == "Admin")*@
         <Script src="_content/Bit.BlazorUI.Extras/scripts/bit.blazorui.extras.js"></Script>
-        @*#endif*@
     }
 </body>
 

From 27944a273b47879fd87b752d9ca2feca75fe96c9 Mon Sep 17 00:00:00 2001
From: ysmoradi <ysmoradi@outlook.com>
Date: Thu, 29 Aug 2024 12:09:43 +0200
Subject: [PATCH 2/3] fix

---
 .../Components/Chart/Interop/BitChartJsInterop.cs            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
index ac6b7858eb..538c7bb4d8 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
@@ -95,10 +95,9 @@ public static ValueTask RemoveChart(this IJSRuntime jsRuntime, string canvasId)
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLinearCartesianAxis))]
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLogarithmicAxis))]
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTimeAxis))]
-
     public static ValueTask<bool> SetupChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
     {
-        ExpandoObject dynParam = StripNulls(chartConfig);
+        var dynParam = StripNulls(chartConfig);
         Dictionary<string, object> param = ConvertExpandoObjectToDictionary(dynParam);
         return jsRuntime.InvokeAsync<bool>("BitBlazorUI.BitChart.setupChart", param);
     }
@@ -153,7 +152,7 @@ private static Dictionary<string, object> RecursivelyConvertIDictToDict(IDiction
     /// <returns></returns>
     public static ValueTask<bool> UpdateChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
     {
-        ExpandoObject dynParam = StripNulls(chartConfig);
+        var dynParam = StripNulls(chartConfig);
         Dictionary<string, object> param = ConvertExpandoObjectToDictionary(dynParam);
         return jsRuntime.InvokeAsync<bool>("BitBlazorUI.BitChart.updateChart", param);
     }

From cf95d8ab987fe307c9eca2b2998e44ddc73119ba Mon Sep 17 00:00:00 2001
From: ysmoradi <ysmoradi@outlook.com>
Date: Thu, 29 Aug 2024 12:37:01 +0200
Subject: [PATCH 3/3] fix

---
 .../Components/Chart/BitChart.razor.cs        | 63 ++++++++++++++++++-
 .../Chart/Interop/BitChartJsInterop.cs        | 59 -----------------
 2 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/BitChart.razor.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/BitChart.razor.cs
index d2dcd76444..af56d99829 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/BitChart.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/BitChart.razor.cs
@@ -1,5 +1,7 @@
 // a fork from https://github.com/mariusmuntean/ChartJs.Blazor
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace Bit.BlazorUI;
 
 /// <summary>
@@ -9,8 +11,6 @@ public partial class BitChart : IAsyncDisposable
 {
     [Inject] private IJSRuntime _js { get; set; }
 
-
-
     /// <summary>
     /// The configuration of the chart.
     /// </summary>
@@ -48,7 +48,64 @@ public partial class BitChart : IAsyncDisposable
     [Parameter] public IEnumerable<string>? DateAdapterScripts { get; set; }
 
 
-
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartScatterConfig))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartConfigBase<,>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartConfigBase<>))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonStringEnumConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(IndexableOptionConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(FloatingBarPointConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ClippingJsonConverter))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonWriteOnlyConverter<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonObjectEnumConverter))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBaseConfigOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarOptions))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartIndexableOption<>))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarDataset<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleDataset))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartDataset<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineDataset<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieDataset))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaDataset))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarDataset))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLegend))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPosition))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTooltips))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartAnimation))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarScales))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartScales))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCategoryTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLinearCartesianTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLogarithmicTicks))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTimeTicks))]
+
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarCategoryAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarLinearCartesianAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarLogarithmicAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarTimeAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianAxis<>))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCategoryAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLinearCartesianAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLogarithmicAxis))]
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTimeAxis))]
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
index 538c7bb4d8..ae47a5a9b4 100644
--- a/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
+++ b/src/BlazorUI/Bit.BlazorUI.Extras/Components/Chart/Interop/BitChartJsInterop.cs
@@ -2,7 +2,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Bit.BlazorUI;
 
@@ -37,64 +36,6 @@ public static ValueTask RemoveChart(this IJSRuntime jsRuntime, string canvasId)
     /// <param name="jsRuntime"></param>
     /// <param name="chartConfig">The config for the new chart.</param>
     /// <returns></returns>
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarConfig))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleConfig))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineConfig))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieConfig))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaConfig))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarConfig))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartScatterConfig))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartConfigBase<,>))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartConfigBase<>))]
-
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonStringEnumConverter))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(IndexableOptionConverter))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(FloatingBarPointConverter))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ClippingJsonConverter))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonWriteOnlyConverter<>))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(JsonObjectEnumConverter))]
-
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarOptions))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleOptions))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBaseConfigOptions))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineOptions))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieOptions))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaOptions))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarOptions))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartIndexableOption<>))]
-
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarDataset<>))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBubbleDataset))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartDataset<>))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLineDataset<>))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPieDataset))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPolarAreaDataset))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartRadarDataset))]
-
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLegend))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartPosition))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTooltips))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartAnimation))]
-
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarScales))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartScales))]
-
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianTicks))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCategoryTicks))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLinearCartesianTicks))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLogarithmicTicks))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTimeTicks))]
-
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarCategoryAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarLinearCartesianAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarLogarithmicAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartBarTimeAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCartesianAxis<>))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartCategoryAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLinearCartesianAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartLogarithmicAxis))]
-    [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BitChartTimeAxis))]
     public static ValueTask<bool> SetupChart(this IJSRuntime jsRuntime, BitChartConfigBase chartConfig)
     {
         var dynParam = StripNulls(chartConfig);