Skip to content

fix(bar-race): fix interpolation #13066

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

Merged
pissang merged 1 commit into from
Jul 31, 2020
Merged

fix(bar-race): fix interpolation #13066

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
13 changes: 7 additions & 6 deletions src/chart/bar/BarView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ class BarView extends ChartView {
else if (__DEV__) {
console.warn('Only cartesian2d and polar supported for bar.');
}

this._isFirstFrame = false;
}

incrementalPrepareRender(seriesModel: BarSeriesModel): void {
Expand Down Expand Up @@ -199,8 +197,11 @@ class BarView extends ChartView {
const axisSort = coord.type === 'cartesian2d' && axis2DModel.get('sort')
&& axis2DModel.get('sortSeriesIndex') === seriesModel.seriesIndex;
const realtimeSort = axisSort && axis2DModel.get('realtimeSort');
if (realtimeSort && this._isFirstFrame) {

// If no data in the first frame, wait for data to initSort
if (realtimeSort && this._isFirstFrame && data.count()) {
this._initSort(data, isHorizontalOrRadial, baseAxis as Axis2D, api);
this._isFirstFrame = false;
return;
}

Expand Down Expand Up @@ -385,7 +386,7 @@ class BarView extends ChartView {
this._data = data;

if (lastAnimator) {
lastAnimator.during(percent => {
lastAnimator.during(() => {
const orderMap = (idx: number) => {
const el = (data.getItemGraphicEl(idx) as Rect);
if (el) {
Expand Down Expand Up @@ -499,7 +500,7 @@ class BarView extends ChartView {
* bars are both out of sight, we don't wish to trigger reorder action
* as long as the order in the view doesn't change.
*/
if (oldOrder[i].ordinalNumber !== newOrder[i].ordinalNumber) {
if (!oldOrder[i] || oldOrder[i].ordinalNumber !== newOrder[i].ordinalNumber) {
const action = {
type: 'changeAxisOrder',
componentType: baseAxis.dim + 'Axis',
Expand All @@ -525,7 +526,7 @@ class BarView extends ChartView {
axisId: baseAxis.index,
sortInfo: this._dataSort(
data,
idx => parseInt(data.get(isHorizontal ? 'y' : 'x', idx) as string, 10) || 0
idx => parseFloat(data.get(isHorizontal ? 'y' : 'x', idx) as string) || 0
)
} as Payload;
api.dispatchAction(action);
Expand Down
17 changes: 12 additions & 5 deletions src/util/graphic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,12 +601,19 @@ function animateOrSetLabel<Props extends PathProps>(
interpolated[i] = (rawValues as [])[i];
}
else {
/**
* startValues may be undefined if no data in last setOption but
* have data in this setOption. Use the data in this setOption
* as interpolated value.
*/
const startValues = host.startValue as number[];
const value = interpolateNumber(
startValues && startValues[i] ? startValues[i] : 0,
(interpolateValues as number[])[i],
percent
);
const value = startValues == null
? (rawValues as [])[i]
: interpolateNumber(
startValues && startValues[i] ? startValues[i] : 0,
(interpolateValues as number[])[i],
percent
);
interpolated[i] = numberUtil.round(value), precision;
}
}
Expand Down