Fix split chart intermediate steps

Author: schaumb

CHANGELOG.md

@@ -5,7 +5,8 @@
 ### Fixed
 
 - Fix align on fake-split charts
-- Fix fake-split charts intermediate step jump.
+- Drilldown on split chart is fade.
+- Fix aggregate on split chart.
 - Do not interpolate hiding/showing legend
 - Fix aggregator interface for 'set' channel parameter:
   - From now not accepted the same dimension on the same channel.

src/chart/animator/animation.cpp

@@ -128,7 +128,7 @@ void Animation::addKeyframe(const Gen::PlotPtr &next,
 	auto begin = std::ref(intermediate0 ? intermediate0 : target);
 
 	auto &&intermediate1Instant =
-	    intermediate1 && strategy == RegroupStrategy::aggregate
+	    intermediate1 && strategy != RegroupStrategy::fade
 	    && begin.get()->getOptions()->looksTheSame(
 	        *intermediate1->getOptions());
 	begin = intermediate1 ? std::ref(intermediate1) : begin;

src/chart/options/options.cpp

@@ -111,7 +111,8 @@ Channels Options::shadowChannels() const
 	          &ch2 = shadow.at(ChannelId::noop);
 	     auto &&stacker : shadow.getDimensions({data(stackChannels),
 	         std::size_t{1} + secondary.has_value()})) {
-		ch1.removeSeries(stacker);
+		if (stackChannelType() != subAxisType() || !isSplit())
+			ch1.removeSeries(stacker);
 		ch2.removeSeries(stacker);
 	}
 
@@ -122,7 +123,7 @@ void Options::drilldownTo(const Options &other)
 {
 	auto &stackChannel = this->stackChannel();
 
-	if (this->split && !isSplit()) this->split = {};
+	if (!isSplit() || !other.isSplit()) this->split = {};
 
 	for (auto &&dim : other.getChannels().getDimensions())
 		if (!getChannels().isSeriesUsed(dim))
@@ -134,13 +135,14 @@ void Options::intersection(const Options &other)
 	for (auto &&dim : getChannels().getDimensions())
 		if (!other.getChannels().isSeriesUsed(dim))
 			getChannels().removeSeries(dim);
+
+	split = {};
 }
 
 bool Options::looksTheSame(const Options &other) const
 {
 	if (channels.anyAxisSet()
-	    && channels.at(ChannelId::label).isEmpty()
-	    && isSplit() == other.isSplit()) {
+	    && channels.at(ChannelId::label).isEmpty()) {
 		auto thisCopy = *this;
 		thisCopy.simplify();
 
@@ -155,8 +157,9 @@ bool Options::looksTheSame(const Options &other) const
 
 void Options::simplify()
 {
+	if (isSplit()) return;
+
 	//	remove all dimensions, only used at the end of stack
-	auto split = isSplit();
 	auto &stackChannel = this->stackChannel();
 
 	auto dimensions = stackChannel.dimensions();
@@ -170,8 +173,6 @@ void Options::simplify()
 	     ++dim) {
 		stackChannel.removeSeries(*dim);
 	}
-	if (split && !stackChannel.hasDimension())
-		stackChannel.addSeries(*dimensions.begin());
 }
 
 bool Options::operator==(const Options &other) const

test/e2e/test_cases/test_cases.json

@@ -2453,7 +2453,7 @@
 			"refs": ["e5678fa"]
 		},
 		"ww_noFade/wNoFade_Tests/Marker_transition_problem/area_column_time_sum": {
-			"refs": ["67ef3d7"]
+			"refs": ["727c6d5"]
 		},
 		"ww_noFade/wNoFade_Tests/Marker_transition_problem/area_orientation": {
 			"refs": ["8c0d580"]

test/e2e/tests/fixes.json

@@ -8,7 +8,7 @@
 			"refs": ["1732a49"]
 		},
 		"143": {
-			"refs": ["82f3abf"]
+			"refs": ["95b9c83"]
 		},
 		"144": {
 			"refs": ["fde02e4"]

test/e2e/tests/fixes/143.mjs

@@ -29,23 +29,49 @@ const testSteps = [
 			data,
 			config: {
 				y: 'Colors',
-				x: 'Val'
+				x: 'Val',
+				split: true
 			}
 		})
 	},
 	(chart) =>
 		chart.animate(
 			{
-				y: 'Val',
-				x: 'Letters',
-				split: true
+				y: ['Letters2', 'Val'],
+				x: 'Letters'
 			},
 			{ regroupStrategy: 'drilldown' }
 		),
 	(chart) =>
 		chart.animate({
-			y: ['Colors', 'Letters2', 'Val']
-		})
+			y: ['Letters2', 'Colors', 'Val']
+		},
+		{ regroupStrategy: 'drilldown' }
+		),
+	(chart) => chart.animate({
+		config: {
+			y: 'Colors',
+			x: 'Val'
+		}
+	}),
+	(chart) => chart.animate({
+		config: {
+			y: ['Letters2', 'Val'],
+			x: 'Letters',
+		}
+	}),
+	(chart) => chart.animate({
+		y: ['Letters2', 'Val']
+	}),
+	(chart) => chart.animate({
+		y: ['Letters2', 'Colors', 'Val']
+	}),
+	(chart) => chart.animate({
+		config: {
+			y: ['Letters2', 'Colors'],
+			x: 'Val'
+		}
+	})
 ]
 
 export default testSteps