Skip to content

1027279: Fixed issues and moved from changes in charts. #13

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.

Sign up for GitHub

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

Open
Yokesh-SF4393 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

1027279: Fixed issues and moved from changes in charts. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions .../Blazor.Toolkit.Samples.Client/Pages/Components/Charts/AxisConfiguration/AxisLabels.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@
LabelFormat="{value}B"
LabelPosition="@CurrentLabelPosition"
LabelIntersectAction="LabelIntersectAction.Rotate90">
<ChartAxisLabelStyle Color="@LabelColor" />
<ChartAxisMajorGridLines Width="0" />
<ChartAxisMajorTickLines Width="0" />
<ChartAxisMinorTickLines Width="0" />
Expand Down Expand Up @@ -679,6 +680,11 @@
CurrentLabelPosition = position;
}
}

private string LabelColor =>
CurrentLabelPosition == Syncfusion.Blazor.Toolkit.AxisPosition.Inside
? "black"
: null;

// EDGE LABEL STATE
private EdgeLabelPlacement CurrentEdgePlacement { get; set; }
Expand Down Expand Up @@ -964,6 +970,7 @@
LabelFormat=""{value}B""
LabelPosition=""@CurrentLabelPosition""
LabelIntersectAction=""LabelIntersectAction.Rotate90"">
<ChartAxisLabelStyle Color=""@LabelColor"" />
<ChartAxisMajorGridLines Width=""0"" />
<ChartAxisMajorTickLines Width=""0"" />
<ChartAxisMinorTickLines Width=""0"" />
Expand Down Expand Up @@ -1006,6 +1013,11 @@
CurrentLabelPosition = position;
}
}

private string LabelColor =>
CurrentLabelPosition == Syncfusion.Blazor.Toolkit.AxisPosition.Inside
? ""black""
: null;

private List<PopulationPoint> PopulationData = new()
{
Expand Down
5 changes: 0 additions & 5 deletions ...r.Toolkit.Samples.Client/Pages/Components/Charts/BubbleAndScatterCharts/BubbleChart.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,4 @@
_currentTheme = CurrentTheme;
}

}
{
_currentTheme = CurrentTheme;
}

}
5 changes: 4 additions & 1 deletion samples/Blazor.Toolkit.Samples.Client/Pages/Components/Charts/LineCharts/SteplineChart.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@
Fill="#0FAF9C"
Type="ChartSeriesType.StepLine">
<ChartMarker IsFilled="true">
<ChartDataLabel Visible="true" />
<ChartDataLabel Visible="true">
<ChartDataLabelFont Color="@TextColor"></ChartDataLabelFont>
</ChartDataLabel>
</ChartMarker>
</ChartSeries>

Expand Down Expand Up @@ -571,6 +573,7 @@
private string AustraliaColor => IsDarkTheme ? "#EE884E" : "#E3651D";
private string CustomizedSeriesColor =>
IsDarkTheme ? "#F44F80" : "#D71D55";
private string TextColor => IsDarkTheme ? "#E6EEF8" : "#0B1F3B";

// Current step position
private StepPosition CurrentStepPosition { get; set; } = StepPosition.Left;
Expand Down
24 changes: 15 additions & 9 deletions src/Components/Charts/Chart/Renderer/AxisRenderer/AxisTypeRenderer/DateTimeAxisRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ private void GetHour(DateTime minimum, DateTime maximum, ChartRangePadding range
if (rangePadding == ChartRangePadding.Round)
{
Min = GetTime(new DateTime(minimum.Year, minimum.Month, minimum.Day, hour, 0, 0));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, maximum.Day, endHour, 59, 59));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, maximum.Day, Math.Min(endHour, 23), 59, 59));
}
else
{
Min = GetTime(new DateTime(minimum.Year, minimum.Month, minimum.Day, hour + (int)-interval, 0, 0));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, maximum.Day, endHour + (int)interval, 0, 0));
DateTime minDateTime = new DateTime(minimum.Year, minimum.Month, minimum.Day, hour, 0, 0).AddHours((int)-interval);
DateTime maxDateTime = new DateTime(maximum.Year, maximum.Month, maximum.Day, endHour, 0, 0).AddHours((int)interval);
Min = GetTime(minDateTime);
Max = GetTime(maxDateTime);
}
}

Expand Down Expand Up @@ -194,12 +196,14 @@ private void ApplyMinutePadding(DateTime minimum, DateTime maximum, ChartRangePa
if (rangePadding == ChartRangePadding.Round)
{
Min = GetTime(new DateTime(minimum.Year, minimum.Month, minimum.Day, minimum.Hour, minute, 0));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, minimum.Day, maximum.Hour, endMinute, 59));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, minimum.Day, maximum.Hour, Math.Min(endMinute, 59), 59));
}
else
{
Min = GetTime(new DateTime(minimum.Year, maximum.Month, minimum.Day, minimum.Hour, minute + (int)-interval, 0));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, maximum.Day, maximum.Hour, endMinute + (int)interval, 0));
DateTime minDateTime = new DateTime(minimum.Year, minimum.Month, minimum.Day, minimum.Hour, minute, 0).AddMinutes((int)-interval);
DateTime maxDateTime = new DateTime(maximum.Year, maximum.Month, maximum.Day, maximum.Hour, endMinute, 0).AddMinutes((int)interval);
Min = GetTime(minDateTime);
Max = GetTime(maxDateTime);
}
}

Expand All @@ -214,12 +218,14 @@ private void ApplySecondPadding(DateTime minimum, DateTime maximum, ChartRangePa
if (rangePadding == ChartRangePadding.Round)
{
Min = GetTime(new DateTime(minimum.Year, minimum.Month, minimum.Day, minimum.Hour, minimum.Minute, second, 0));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, maximum.Day, maximum.Hour, maximum.Minute, endSecond, 0));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, maximum.Day, maximum.Hour, maximum.Minute, Math.Min(endSecond, 59), 0));
}
else
{
Min = GetTime(new DateTime(minimum.Year, minimum.Month, minimum.Day, minimum.Hour, minimum.Minute, second + (int)-interval, 0));
Max = GetTime(new DateTime(maximum.Year, maximum.Month, maximum.Day, maximum.Hour, maximum.Minute, endSecond + (int)interval, 0));
DateTime minDateTime = new DateTime(minimum.Year, minimum.Month, minimum.Day, minimum.Hour, minimum.Minute, second, 0).AddSeconds((int)-interval);
DateTime maxDateTime = new DateTime(maximum.Year, maximum.Month, maximum.Day, maximum.Hour, maximum.Minute, endSecond, 0).AddSeconds((int)interval);
Min = GetTime(minDateTime);
Max = GetTime(maxDateTime);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Components/Charts/Chart/Series/ChartSeries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,11 +1411,11 @@ public double ColumnWidthInPixel
get => _columnWidthInPixel;
set
{
if (Math.Abs(_columnWidthInPixel - value) > double.Epsilon)
if (_columnWidthInPixel != value)
{
_columnWidthInPixel = value;

if (Renderer is not null && Renderer.Series is not null && Renderer.Series.Visible)
if (Renderer != null && Renderer.Series != null && Renderer.Series.Visible)
{
Renderer?.UpdateDirection();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Charts/Chart/SfChart.razor.JsInterop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ private async Task ResizeChartAsync(Size availabelSize)
_isResizeTemplate = true;
_ = UpdateLegendTemplateAsync();
}
if (_isSizeSet && _selectionModule is not null)
if (_render.IsSizeSet && _selectionModule is not null)
{
_ = _selectionModule.RemoveSelectedElementsAsync();
_selectionModule.InvokeSelection();
Expand Down
Loading