fix: refactor zoom constraints #162
Conversation
| @@ -83,18 +86,7 @@ export class ScaleModel extends ViewportModel { | |||
| this.state = cloneUnsafe(config.scale); | |||
| this.autoScaleModel = new AutoScaleViewportSubModel(this); | |||
| this.offsets = this.config.components.offsets; | |||
| this.addXConstraint((initialState, state) => { | |||
There was a problem hiding this comment.
Are u sure that we don't need calling this.addXConstraint here?
There was a problem hiding this comment.
Before first PR here was lines below:
this.addXConstraint((initialState, state) =>
zoomConstraint(initialState, state, this.config.components.chart, this.getBounds),
);
There was a problem hiding this comment.
This constraint is the function which was removed in constaints.ts
src/chart/model/scale.model.ts
Outdated
| @@ -222,6 +232,12 @@ export class ScaleModel extends ViewportModel { | |||
| const zoomX = this.calculateZoomX(xStart, xEnd); | |||
| const state = { ...initialState, zoomX, xStart, xEnd }; | |||
| const constrainedState = this.scalePostProcessor(initialState, state); | |||
| const zoomIn = constrainedState.xStart > initialState.xStart || constrainedState.xEnd < initialState.xEnd; | |||
There was a problem hiding this comment.
xStart for constrained state can be moved to left, but viewport can be the same, if xEnd moved to left too.
You should check here constrainedState.xEnd - constrainedState.xStart< initialState.xEnd - initialState.xStart;
| @@ -222,6 +236,12 @@ export class ScaleModel extends ViewportModel { | |||
| const zoomX = this.calculateZoomX(xStart, xEnd); | |||
| const state = { ...initialState, zoomX, xStart, xEnd }; | |||
| const constrainedState = this.scalePostProcessor(initialState, state); | |||
| const zoomIn = constrainedState.xEnd - constrainedState.xStart < initialState.xEnd - initialState.xStart; | |||
There was a problem hiding this comment.
should we add here return case where constrained state === initialState or it handles already? We need avoid extra calculations, because for now chart-react is unstable in some streams, and can call zoom functions call several times
There was a problem hiding this comment.
Added early return check if the same x/y scale 👍
No description provided.