Merge pull request #1758 from beto-rodriguez/update-blazor

Update blazor
beto-rodriguez · Jan 7, 2025 · 64bd372 · 64bd372
2 parents d55236b + 03d7b2c
commit 64bd372
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -352,3 +352,5 @@ nuget.exe
 build/pack.singed.ps1
 /src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/wwwroot/domInterop.js
 /src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/wwwroot/domInterop.js.map
+/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/domInterop.js
+/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/domInterop.js.map
diff --git a/samples/BlazorSample/BlazorSample.csproj b/samples/BlazorSample/BlazorSample.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/BlazorSample/Pages/Events/AddPointOnClick.razor b/samples/BlazorSample/Pages/Events/AddPointOnClick.razor
@@ -35,7 +35,7 @@
         data.Add(new ObservablePoint(dataCoordinates.X, dataCoordinates.Y));
 
         // You can also get all the points or visual elements in a given location.
-        var points = _chart.GetPointsAt(new LvcPoint(p.X, p.Y));
-        var visuals = _chart.GetVisualsAt(new LvcPoint(p.X, p.Y));
+        var points = _chart.GetPointsAt(new LvcPointD(p.X, p.Y));
+        var visuals = _chart.GetVisualsAt(new LvcPointD(p.X, p.Y));
 	}
 }
diff --git a/samples/BlazorSample/Pages/General/Scrollable.razor b/samples/BlazorSample/Pages/General/Scrollable.razor
@@ -51,7 +51,7 @@
         _mainChart.UpdateStarted += OnChart_Updated;
     }
 
-    private void OnChart_Updated(IChartView<SkiaSharpDrawingContext> chart)
+    private void OnChart_Updated(IChartView chart)
     {
         var vm = ViewModel;
         var cartesianChart = (CartesianChart)chart;

diff --git a/src/LiveChartsCore/LiveCharts.cs b/src/LiveChartsCore/LiveCharts.cs
@@ -30,6 +30,9 @@ namespace LiveChartsCore;
 /// </summary>
 public static class LiveCharts
 {
+    private static bool s_useGPU = false;
+    private static bool s_gpuSetByUser = false;
+
     /// <summary>
     /// A constant that indicates that the tool tip should not add the current label.
     /// </summary>
@@ -60,7 +63,11 @@ public static class LiveCharts
     /// Gets or sets a value indicating whether LiveCharts should use a hardware graphics API
     /// to render the charts.
     /// </summary>
-    public static bool UseGPU { get; set; } = false;
+    public static bool UseGPU
+    {
+        get => s_useGPU;
+        set { s_useGPU = value; s_gpuSetByUser = true; }
+    }
 
     /// <summary>
     /// Gets a value indicating whether LiveCharts has a backend registered.
@@ -141,4 +148,10 @@ public static TimeSpan AsTimeSpan(this double ticks)
         if (ticks < 0) ticks = 0;
         return TimeSpan.FromTicks((long)ticks);
     }
+
+    internal static void SetUseGPUIfNotSetByUser(bool value)
+    {
+        if (s_gpuSetByUser) return;
+        s_useGPU = value;
+    }
 }
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/Chart.razor b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/Chart.razor
@@ -25,23 +25,23 @@
 @*Ideally this component should be abstract, is it posible in Blazor?*@
 
 <div class="lvc-content">
-	@*
+    @*
         This is an old tooltip that uses HTML and css, instead we now handle also this and draw it.
         <DefaultTooltip @ref="Tooltip" Class="@TooltipClass" />
     *@
 
-	<JsFlexibleContainer @ref="_jsFlexibleContainer" Class="@ContainerActualClass">
-		<Content>
-			<div class="lvc-canvas-container" @ref="CanvasContainerElement">
-				<MotionCanvas
-					@ref="motionCanvas"
-					OnPointerDownCallback="OnPointerDown"
-					OnPointerMoveCallback="OnPointerMove"
-					OnPointerUpCallback="OnPointerUp"
+    <JsFlexibleContainer @ref="_jsFlexibleContainer" Class="@ContainerActualClass">
+        <Content>
+            <div class="lvc-canvas-container" @ref="CanvasContainerElement">
+                <MotionCanvas
+                    @ref="motionCanvas"
+                    OnPointerDownCallback="OnPointerDown"
+                    OnPointerMoveCallback="OnPointerMove"
+                    OnPointerUpCallback="OnPointerUp"
                     OnPointerOutCallback="OnPointerOut"
-					OnWheelCallback="OnWheel">
-				</MotionCanvas>
-			</div>
-		</Content>
-	</JsFlexibleContainer>
+                    OnWheelCallback="OnWheel">
+                </MotionCanvas>
+            </div>
+        </Content>
+    </JsFlexibleContainer>
 </div>
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/Chart.razor.cs b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/Chart.razor.cs
@@ -72,6 +72,13 @@ protected override void OnInitialized()
     {
         base.OnInitialized();
 
+        // on blazor by default we use the GPU
+        // just because it looks MUCH better
+        // the user can disable this feature by calling
+        // LiveCharts.UseGPU = false;
+        // or by setting the UseGPU property to false in the chart
+        LiveCharts.SetUseGPUIfNotSetByUser(true);
+
         LiveCharts.Configure(config => config.UseDefaults());
 
         _visualsObserver = new CollectionDeepObserver<ChartElement>(
@@ -190,7 +197,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     /// <inheritdoc cref="IChartView.Legend" />
     [Parameter]
-    public IChartLegend? Legend { get; set; } = LiveCharts.DefaultSettings.GetTheme().DefaultLegend();
+    public IChartLegend? Legend { get; set; }
 
     /// <inheritdoc cref="IChartView.LegendTextPaint" />
     [Parameter]

diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/LiveChartsCore.SkiaSharpView.Blazor.csproj
@@ -35,26 +35,10 @@
     <NoWarn>$(NoWarn);BL0007</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <TypeScriptNoImplicitAny>True</TypeScriptNoImplicitAny>
-    <TypeScriptOutFile></TypeScriptOutFile>
-    <TypeScriptTarget>ES6</TypeScriptTarget>
-  </PropertyGroup>
-
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <TypeScriptNoImplicitAny>True</TypeScriptNoImplicitAny>
-    <TypeScriptOutFile></TypeScriptOutFile>
-    <TypeScriptTarget>ES6</TypeScriptTarget>
-  </PropertyGroup>
-
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <ItemGroup>
-    <TypeScriptCompile Include="wwwroot/*.ts" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="SkiaSharp.Views.Blazor" Version="$(SkiaSharpVersion)" />
     <PackageReference Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="7.3.0" />
@@ -63,7 +47,7 @@
     <PackageReference Condition="$(TargetFramework) == 'net6.0'" Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
     <PackageReference Condition="$(TargetFramework) == 'net8.0'" Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
 
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.1.5">
+    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.7.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -74,8 +58,6 @@
     <ProjectReference Include="..\LiveChartsCore.SkiaSharp\LiveChartsCore.SkiaSharpView.csproj" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
-
   <ItemGroup>
     <None Include="images\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>

diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/tsconfig.json b/src/skiasharp/LiveChartsCore.SkiaSharpView.Blazor/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "noImplicitAny": false,
+        "noEmitOnError": true,
+        "removeComments": false,
+        "sourceMap": true,
+        "target": "ES6",
+        "outDir": "wwwroot/"
+    },
+    "include": [
+        "wwwroot/domInterop.ts"
+    ],
+    "exclude": [
+        "node_modules"
+    ]
+}