Merge pull request #640 from vizzuhq/keyframe_fix

Keyframe fix

Author: veghdev

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.17.1] - 2025-08-24
+
+### Fixed
+
+- Fix Keyframe marker modifications on source chart.
+
 ## [0.17.0] - 2025-07-31
 
 ### Fixed

src/chart/animator/keyframe.cpp

@@ -61,11 +61,11 @@ void Keyframe::prepareActual()
 {
 if (Gen::Plot::dimensionMatch(*source, *target)) {
 if (Gen::Plot::hasMarkerChange(*source, *target))
-copyTarget();
+copySourceTarget();
 Gen::Plot::mergeMarkersAndCellInfo(*source, *target);
 }
 else {
-copyTarget();
+copySourceTarget();
 target->prependMarkers(*source);
 source->appendMarkers(*targetCopy);
 }
@@ -80,7 +80,7 @@ void Keyframe::prepareActualMarkersInfo()
 {
 const auto &origTMI = target->getMarkersInfo();
 auto &smi = source->getMarkersInfo();
-if (!smi.empty()) copyTarget();
+if (!smi.empty()) copySourceTarget();
 
 for (auto &tmi = target->getMarkersInfo(); auto &&item : smi)
 tmi.insert(std::pair{item.first, Gen::Plot::MarkerInfo{}});
@@ -89,14 +89,20 @@ void Keyframe::prepareActualMarkersInfo()
 smi.insert(std::pair{item.first, Gen::Plot::MarkerInfo{}});
 }
 
-void Keyframe::copyTarget()
+void Keyframe::copySourceTarget()
 {
 if (!targetCopy) {
 targetCopy = target;
 target = std::make_shared<Gen::Plot>(*targetCopy);
 target->getStyle().setup();
 target->detachOptions();
 }
+if (!sourceCopy) {
+sourceCopy = source;
+source = std::make_shared<Gen::Plot>(*sourceCopy);
+source->getStyle().setup();
+source->detachOptions();
+}
 }
 
 }

src/chart/animator/keyframe.h

@@ -28,13 +28,14 @@ class Keyframe : public Planner
 Gen::PlotPtr source;
 Gen::PlotPtr target;
 Gen::PlotPtr actual;
+Gen::PlotPtr sourceCopy;
 Gen::PlotPtr targetCopy;
 
 void init(const Gen::PlotPtr &plot,
  const Data::DataTable &dataTable);
 void prepareActual();
 void prepareActualMarkersInfo();
-void copyTarget();
+void copySourceTarget();
 };
 
 }

src/chart/main/version.cpp

@@ -2,6 +2,6 @@
 
 #include "base/app/version.h"
 
-const App::Version Vizzu::Main::version(0, 17, 0);
+const App::Version Vizzu::Main::version(0, 17, 1);
 
 const char *const Vizzu::Main::siteUrl = "https://vizzu.io/";

test/e2e/tests/fixes.json

@@ -75,6 +75,9 @@
 },
 "55278793": {
 "refs": ["3932754"]
+},
+"keyframes": {
+"refs": ["cdb3779"]
 }
 }
 }

test/e2e/tests/fixes/keyframes.mjs

@@ -0,0 +1,87 @@
+import data from '../../test_data/music_data.mjs'
+
+const testSteps = [
+(chart) => {
+chart.feature('tooltip', true)
+return chart.animate({ data })
+},
+(chart) =>
+chart.animate([
+{
+target: {
+data: {
+filter: (input) => input.Genres === 'Pop'
+},
+config: {
+channels: {
+x: {
+set: [{ name: 'Genres' }]
+},
+y: {
+set: [{ name: 'Popularity' }, { name: 'Kinds' }]
+},
+color: {
+set: [{ name: 'Kinds' }]
+},
+label: {
+set: [{ name: 'Popularity' }]
+}
+}
+}
+}
+},
+{
+target: {
+data: {
+filter: (input) => input.Genres === 'Pop'
+},
+config: {
+channels: {
+x: {
+set: [{ name: 'Genres' }]
+},
+y: {
+set: [{ name: 'Popularity' }]
+},
+color: {
+set: [{ name: 'Kinds' }]
+},
+label: {
+set: [{ name: 'Popularity' }]
+}
+},
+geometry: 'circle'
+}
+}
+},
+{
+target: {
+data: {
+filter: null
+},
+config: {
+channels: {
+x: {
+set: []
+},
+y: {
+set: [{ name: 'Popularity' }, { name: 'Kinds' }, { name: 'Genres' }]
+},
+color: {
+set: [{ name: 'Kinds' }]
+},
+lightness: {
+set: [{ name: 'Genres' }]
+},
+label: {
+set: [{ name: 'Genres' }, { name: 'Popularity' }]
+}
+},
+geometry: 'rectangle'
+}
+}
+}
+])
+]
+
+export default testSteps