Skip to content

Commit 3973486

Browse files
authored
fix chart animations (#51)
1 parent 4b64c34 commit 3973486

11 files changed

Lines changed: 44 additions & 20 deletions

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 0.17.6 <small>2026-04-05</small>
2+
3+
## 🚀 Features
4+
- Add report title and record count to chart view
5+
6+
## 🐞 Bug Fixes
7+
- Fix chart animations
8+
19
# 0.17.5 <small>2026-04-04</small>
210

311
## 🚀 Features

docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# docker buildx create --driver=docker-container --name=container
44

5-
version="0.17.0"
5+
version="1.17.6"
66
build="mcr.microsoft.com/dotnet/sdk:8.0"
77
base="mcr.microsoft.com/dotnet/aspnet:8.0"
88
name="transformalize.orchard"

src/OrchardCore.BootswatchTheme.Settings/OrchardCore.BootswatchTheme.Settings.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
8-
<Version>1.17.5</Version>
9-
<FileVersion>1.17.5</FileVersion>
10-
<AssemblyVersion>1.17.5</AssemblyVersion>
8+
<Version>1.17.6</Version>
9+
<FileVersion>1.17.6</FileVersion>
10+
<AssemblyVersion>1.17.6</AssemblyVersion>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

src/OrchardCore.BootswatchTheme/OrchardCore.BootswatchTheme.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
8-
<Version>1.17.5</Version>
8+
<Version>1.17.6</Version>
99
<AssemblyName>BootswatchTheme</AssemblyName>
10-
<FileVersion>1.17.5</FileVersion>
11-
<AssemblyVersion>1.17.5</AssemblyVersion>
10+
<FileVersion>1.17.6</FileVersion>
11+
<AssemblyVersion>1.17.6</AssemblyVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

src/OrchardCore.Proxy/OrchardCore.Proxy.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<TargetFramework>net8.0</TargetFramework>
55
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
66
<RootNamespace>ProxyModule</RootNamespace>
7-
<Version>1.17.5</Version>
8-
<FileVersion>1.17.5</FileVersion>
9-
<AssemblyVersion>1.17.5</AssemblyVersion>
7+
<Version>1.17.6</Version>
8+
<FileVersion>1.17.6</FileVersion>
9+
<AssemblyVersion>1.17.6</AssemblyVersion>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1111
<Authors>Dale Newman</Authors>
1212
<Copyright>Copyright © 2023-2026</Copyright>

src/OrchardCore.Transformalize/OrchardCore.Transformalize.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<TargetFramework>net8.0</TargetFramework>
44
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
55
<RootNamespace>TransformalizeModule</RootNamespace>
6-
<Version>1.17.5</Version>
7-
<FileVersion>1.17.5</FileVersion>
8-
<AssemblyVersion>1.17.5</AssemblyVersion>
6+
<Version>1.17.6</Version>
7+
<FileVersion>1.17.6</FileVersion>
8+
<AssemblyVersion>1.17.6</AssemblyVersion>
99
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1010
<Authors>Dale Newman</Authors>
1111
<Copyright>Copyright © 2013-2026</Copyright>

src/OrchardCore.Transformalize/ResourceManifest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ static ResourceManagementOptionsConfiguration() {
395395
_manifest
396396
.DefineScript("charts-loader")
397397
.SetUrl($"~/{Common.ModuleName}/Scripts/chart/charts-loader.js")
398-
.SetVersion("1.0.0")
398+
.SetVersion("1.0.3")
399399
.SetDependencies("chart-js");
400400

401401
_manifest

src/OrchardCore.Transformalize/Views/Shared/Controls.cshtml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@
134134
};
135135
var currentLabel = chartTypeLabels.GetValueOrDefault(chartType, "Doughnut");
136136
<div class="d-flex justify-content-center gap-2 align-items-center flex-wrap">
137+
<small class="text-muted fw-semibold" style="white-space:nowrap;">
138+
@Model.Title
139+
@if (entity.Hits > 0) {
140+
<span class="fw-normal">&middot; @entity.Hits.ToString("#,##0")</span>
141+
}
142+
</small>
137143
<div class="btn-group btn-group-sm" role="group">
138144
<button class="btn btn-sm btn-outline-secondary" disabled style="min-width:80px;">@currentLabel</button>
139145
<button class="btn dropdown-toggle btn-sm btn-outline-secondary" data-bs-toggle="dropdown" aria-expanded="false" title="chart style">

src/OrchardCore.Transformalize/wwwroot/Scripts/chart/charts-loader.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ function toggleChartPct() {
4141
const options = {
4242
responsive: true,
4343
maintainAspectRatio: false,
44+
animation: false,
4445
onClick: (event, elements) => {
4546
if (!isFilterable || !elements.length) return;
4647
const clickedLabel = labels[elements[0].index];
@@ -163,6 +164,15 @@ function toggleChartPct() {
163164
});
164165

165166
chart.config._originalData = [...chart.data.datasets[0].data];
167+
168+
// Let the ResizeObserver settle, then trigger the entry animation
169+
requestAnimationFrame(() => {
170+
requestAnimationFrame(() => {
171+
chart.options.animation = { duration: 800, easing: 'easeInOutQuart' };
172+
chart.reset();
173+
chart.update();
174+
});
175+
});
166176
};
167177

168178
charts.forEach(chart => createChart(chart));

src/Site/Site.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
88
<DockerfileContext>..\..</DockerfileContext>
99
<DockerfileTag>transformalize.orchard</DockerfileTag>
10-
<Version>1.17.5</Version>
11-
<FileVersion>1.17.5</FileVersion>
12-
<AssemblyVersion>1.17.5</AssemblyVersion>
10+
<Version>1.17.6</Version>
11+
<FileVersion>1.17.6</FileVersion>
12+
<AssemblyVersion>1.17.6</AssemblyVersion>
1313
<ReleaseVersion>0.17.0</ReleaseVersion>
1414
<RazorRuntimeCompilation>true</RazorRuntimeCompilation>
1515
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>

0 commit comments

Comments
 (0)