Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed OnLegendClick on NoAxisChart #485

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<DemoContainer>
<ApexChart TItem="Order"
Title="Order Gross Value" Options=options Debug>
Title="Order Gross Value" Options=options>

<ApexPointSeries TItem="Order"
Items="Orders"
Expand All @@ -25,6 +25,5 @@
return w.config.series[seriesIndex];}"
};


}
}
}
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<DemoContainer>
<ApexChart TItem="Order"
Title="Order Value">
Title="Order Value" OnXAxisLabelClick=XAxisLabelClick>

<ApexPointSeries TItem="Order"
Items="orders"
Name="Gross Value"
SeriesType="SeriesType.Radar"
XValue="@(e => e.Country)"
YAggregate="@(e => e.Sum(e => e.GrossValue))"
OrderByDescending="e=>e.Y"
ShowDataLabels />
ShowDataLabels
OrderByDescending="e=>e.Y" />

<ApexPointSeries TItem="Order"
Items="orders"
Name="Net Value"
SeriesType="SeriesType.Radar"
XValue="@(e => e.Country)"
YAggregate="@(e => e.Sum(e => e.NetValue))"
OrderByDescending="e=>e.Y"
/>
OrderByDescending="e=>e.Y" />
</ApexChart>
</DemoContainer>

@code {
private List<Order> orders { get; set; } = SampleData.GetOrders();



}
private void XAxisLabelClick(XAxisLabelClicked<Order> data)
{
var gg = data.LabelIndex;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
<Basic />
</Snippet>
</CodeSnippet>

<CodeSnippet Title="No Axis Chart" ClassName=@typeof(NoAxisChart).ToString()>
<Snippet>
<NoAxisChart />
</Snippet>
</CodeSnippet>
</ChildContent>


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<DemoContainer>
<ApexChart TItem="Order"
Title="Order Gross Value" OnLegendClicked="LegendClicked">

<ApexPointSeries TItem="Order"
Items="Orders"
Name="Gross Value"
SeriesType="SeriesType.Pie"
XValue="@(e => e.Country)"
YAggregate="@(e => e.Sum(e => e.GrossValue))"
OrderByDescending="e=>e.Y"
/>
</ApexChart>

@if(currentLegend != null)
{
<Alert BackgroundColor="TablerColor.Primary">
<h3>You clicked @currentLegend.DataPoint.X</h3>

</Alert>
}

</DemoContainer>

@code {
private List<Order> Orders { get; set; } = SampleData.GetOrders();


private LegendClicked<Order> currentLegend = null;
protected override void OnInitialized()
{

}

private void LegendClicked(LegendClicked<Order> data)
{
currentLegend = data;
}
}
16 changes: 14 additions & 2 deletions src/Blazor-ApexCharts/Internal/JSHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,23 @@ public void JSSelected(JSSelection jsSelection)
[JSInvokable]
public void JSLegendClicked(JSLegendClicked jsLegendClicked)
{
var series = ChartReference.Options.Series.ElementAt(jsLegendClicked.SeriesIndex);
Series<TItem> series = null;
IDataPoint<TItem> point = null;
if (ChartReference.IsNoAxisChart)
{
series = ChartReference.Options.Series.First();
point = series.Data.ElementAt(jsLegendClicked.SeriesIndex);
}
else
{
series = ChartReference.Options.Series.ElementAt(jsLegendClicked.SeriesIndex);
}

var legendClicked = new LegendClicked<TItem>
{
Series = series,
Collapsed = jsLegendClicked.Collapsed
Collapsed = jsLegendClicked.Collapsed,
DataPoint = point,
};

//Invert if Toggle series is set to flase (default == true)
Expand Down
8 changes: 7 additions & 1 deletion src/Blazor-ApexCharts/Series/LegendClicked.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ public class LegendClicked<TItem> where TItem : class
/// <summary>
/// Specifies whether the series associated with the legend item is collapsed
/// </summary>
public bool Collapsed { get; set; }
public bool Collapsed { get; set; }

/// <summary>
/// The clicked datapoint, Only valid for no axis charts
/// </summary>
public IDataPoint<TItem> DataPoint { get; set; }

}
}
Loading