Skip to content

Commit

Permalink
Remove the generic parameter of the Chart component
Browse files Browse the repository at this point in the history
Currently there's no benefit to having a generic parameter there. I don't know why we didn't remove it before but better now than never.
  • Loading branch information
Joelius300 committed Nov 2, 2020
1 parent 632df4d commit fb6e678
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@using System.Drawing
@layout SampleLayout

<Chart TConfig="BarConfig" Config="_config" @ref="_chart"></Chart>
<Chart Config="_config" @ref="_chart"></Chart>

<button @onclick="RandomizeData">Randomize Data</button>
<button @onclick="AddDataset">Add Dataset</button>
Expand All @@ -15,7 +15,7 @@
private const int InitalCount = 7;
private BarConfig _config;
private Random _rng = new Random();
private Chart<BarConfig> _chart;
private Chart _chart;

protected override void OnInitialized()
{
Expand Down
4 changes: 2 additions & 2 deletions ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Stacked.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
@using ChartJs.Blazor.BarChart.Axes
@layout SampleLayout

<Chart TConfig="BarConfig" Config="_config" @ref="_chart"></Chart>
<Chart Config="_config" @ref="_chart"></Chart>

<button @onclick="RandomizeData">Randomize Data</button>

@code {
private const int InitalCount = 7;
private BarConfig _config;
private Random _rng = new Random();
private Chart<BarConfig> _chart;
private Chart _chart;

protected override void OnInitialized()
{
Expand Down
4 changes: 2 additions & 2 deletions ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Vertical.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@using System.Drawing
@layout SampleLayout

<Chart TConfig="BarConfig" Config="_config" @ref="_chart"></Chart>
<Chart Config="_config" @ref="_chart"></Chart>

<button @onclick="RandomizeData">Randomize Data</button>
<button @onclick="AddDataset">Add Dataset</button>
Expand All @@ -15,7 +15,7 @@
private const int InitalCount = 7;
private BarConfig _config;
private Random _rng = new Random();
private Chart<BarConfig> _chart;
private Chart _chart;

protected override void OnInitialized()
{
Expand Down
4 changes: 2 additions & 2 deletions ChartJs.Blazor.Samples/Client/Pages/Charts/Line/Basic.razor
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@using ChartJs.Blazor.LineChart
@layout SampleLayout

<Chart TConfig="LineConfig" Config="_config" @ref="_chart"></Chart>
<Chart Config="_config" @ref="_chart"></Chart>

<button @onclick="RandomizeData">Randomize Data</button>
<button @onclick="AddDataset">Add Dataset</button>
Expand All @@ -14,7 +14,7 @@
private const int InitalCount = 7;
private LineConfig _config;
private Random _rng = new Random();
private Chart<LineConfig> _chart;
private Chart _chart;

protected override void OnInitialized()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@foreach (Variant variant in _variants)
{
<div class="chart-container">
<Chart TConfig="LineConfig" Config="GetConfig(variant)"></Chart>
<Chart Config="GetConfig(variant)"></Chart>
</div>
}
</div>
Expand Down
4 changes: 2 additions & 2 deletions ChartJs.Blazor.Samples/Client/Pages/Charts/Pie.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@using System.Drawing
@layout SampleLayout

<Chart TConfig="PieConfig" Config="_config" @ref="_chart"></Chart>
<Chart Config="_config" @ref="_chart"></Chart>

<button @onclick="RandomizeData">Randomize Data</button>
<button @onclick="AddDataset">Add Dataset</button>
Expand All @@ -13,7 +13,7 @@
private const int InitalCount = 5;
private PieConfig _config;
private Random _rng = new Random();
private Chart<PieConfig> _chart;
private Chart _chart;

protected override void OnInitialized()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@layout SampleLayout
@inject IJSRuntime jsRuntime

<Chart TConfig="LineConfig" Config="_config" SetupCompletedCallback="@SetupCompletedCallback"></Chart>
<Chart Config="_config" SetupCompletedCallback="@SetupCompletedCallback"></Chart>

@code {
private const int InitalCount = 7;
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ In order to use the classes for a pie chart, we need to add `@using ChartJs.Blaz
Then we can add a `Chart` component anywhere in the markup like so:

```html
<Chart TConfig="PieConfig" Config="_config"></Chart>
<Chart Config="_config"></Chart>
```

The only thing left to do now is to provide the data and chart configuration by declaring an instance variable which we reference in the `Chart` component.
Expand Down Expand Up @@ -202,7 +202,7 @@ If you run into an issue, we recommend you to do the following steps:
* ***Alternative Option*** - manually invoke the `ReferenceConverter` constructor to avoid the linker optimizing it away. Example:

```csharp
private ReferenceConverter ReferenceConverter = new ReferenceConverter(typeof(Chart<PieConfig>));
private ReferenceConverter ReferenceConverter = new ReferenceConverter(typeof(Chart));
```

# Contributors
Expand Down
2 changes: 0 additions & 2 deletions src/ChartJs.Blazor/Chart.razor
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
@typeparam TConfig

<canvas id="@Config.CanvasId" width="@Width" height="@Height"></canvas>
5 changes: 2 additions & 3 deletions src/ChartJs.Blazor/Chart.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ namespace ChartJs.Blazor
/// <summary>
/// Represents a Chart.js chart.
/// </summary>
/// <typeparam name="TConfig">The type of config to pass to Chart.js.</typeparam>
public partial class Chart<TConfig> where TConfig : ConfigBase
public partial class Chart
{
/// <summary>
/// This event is fired when the chart has been setup through interop and
Expand All @@ -31,7 +30,7 @@ public partial class Chart<TConfig> where TConfig : ConfigBase
/// Gets or sets the configuration of the chart.
/// </summary>
[Parameter]
public TConfig Config { get; set; }
public ConfigBase Config { get; set; }

/// <summary>
/// Gets or sets the width of the canvas HTML element.
Expand Down

0 comments on commit fb6e678

Please sign in to comment.