Skip to content
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

Jump to bottom

fix: fix setOptions not applying to duration options #215

Merged
merged 1 commit into from
Jul 25, 2023
Merged

fix: fix setOptions not applying to duration options #215

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
3 changes: 2 additions & 1 deletion packages/axes/src/Axes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,10 +504,11 @@ class Axes extends Component<AxesEvents> {
* ```
*/
public setOptions(options: AxesOption) {
this.options = {
this.options = {
...this.options,
...options,
};
this.animationManager.setOptions(options);
return this;
}

Expand Down
7 changes: 7 additions & 0 deletions packages/axes/src/animation/AnimationManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,13 @@ export abstract class AnimationManager {
);
}

public setOptions(options: AxesOption) {
this._options = {
...this._options,
...options,
};
}

private _createAnimationParam(
pos: Axis,
duration: number,
Expand Down
148 changes: 147 additions & 1 deletion packages/axes/test/unit/AnimationManager.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe("AnimationManager", () => {
let axis;
let options;

describe("method test", () => {
describe("Methods", () => {
beforeEach(() => {
axis = {
x: {
Expand Down Expand Up @@ -128,6 +128,137 @@ describe("AnimationManager", () => {
});
});

describe("Options", () => {
beforeEach(() => {
axis = {
x: {
range: [0, 1000],
bounce: [0, 0],
},
};
options = {
easing: (x) => { return x },
minimumDuration: 500,
maximumDuration: 1000,
};
axes = new Axes(axis, options);
const axisManager = new AxisManager(axis, options);
const eventManager = new EventManager(axes);
inst = new EasingManager({
options: options,
interruptManager: new InterruptManager(options),
eventManager,
axisManager,
});
eventManager.setAnimationManager(inst);
});
afterEach(() => {
axes.off();
});

describe("minimumDuration", () => {
it("should play animation longer than the time set in minimumDuration.", (done) => {
// Given
const startHandler = sinon.spy();
const endHandler = sinon.spy();
axes.on({
animationStart: startHandler,
animationEnd: endHandler,
});

// When
inst.setTo({ x: 300 }, 100);

// Then
setTimeout(() => {
expect(startHandler.calledOnce).to.be.true;
expect(endHandler.called).to.be.false;
}, 300);
setTimeout(() => {
expect(endHandler.calledOnce).to.be.true;
const result = inst.axisManager.get();
expect(result.x).to.be.equal(300);
done();
}, 600);
});

it("should apply changes in minimumDuration option after connected", (done) => {
// Given
const startHandler = sinon.spy();
const endHandler = sinon.spy();
axes.on({
animationStart: startHandler,
animationEnd: endHandler,
});

// When
inst.setOptions({ minimumDuration: 0 });
inst.setTo({ x: 300 }, 200);

// Then
setTimeout(() => {
expect(startHandler.calledOnce).to.be.true;
expect(endHandler.called).to.be.false;
}, 100);
setTimeout(() => {
expect(endHandler.calledOnce).to.be.true;
const result = inst.axisManager.get();
expect(result.x).to.be.equal(300);
done();
}, 300);
});
});

describe("maximumDuration", () => {
it("should play animation shorter than the time set in maximumDuration.", (done) => {
// Given
const startHandler = sinon.spy();
const endHandler = sinon.spy();
axes.on({
animationStart: startHandler,
animationEnd: endHandler,
});

// When
inst.setTo({ x: 300 }, 1500);

// Then
setTimeout(() => {
expect(endHandler.calledOnce).to.be.true;
const result = inst.axisManager.get();
expect(result.x).to.be.equal(300);
done();
}, 1100);
});

it("should apply changes in maximumDuration option after connected", (done) => {
// Given
const startHandler = sinon.spy();
const endHandler = sinon.spy();
axes.on({
animationStart: startHandler,
animationEnd: endHandler,
});

// When
inst.setOptions({ maximumDuration: 1500 });
inst.setTo({ x: 300 }, 1300);

// Then
setTimeout(() => {
expect(startHandler.calledOnce).to.be.true;
expect(endHandler.called).to.be.false;
}, 1300);
setTimeout(() => {
expect(endHandler.calledOnce).to.be.true;
const result = inst.axisManager.get();
expect(result.x).to.be.equal(300);
done();
}, 1600);
});
});
});

describe("animation test", () => {
beforeEach(() => {
axis = {
Expand Down Expand Up @@ -170,6 +301,7 @@ describe("AnimationManager", () => {
afterEach(() => {
axes.off();
});

it("should check 'setTo' method(duration: 0)", () => {
// Given
const changeHandler = sinon.spy();
Expand Down Expand Up @@ -197,6 +329,7 @@ describe("AnimationManager", () => {
z: -100,
});
});

it("should check 'setTo' method (outside)", () => {
// Given
const depaPos = inst.axisManager.get();
Expand Down Expand Up @@ -224,6 +357,7 @@ describe("AnimationManager", () => {
expect(changeHandler.getCall(0).args[0].isTrusted).to.be.false;
expect(self.axisManager.get()).to.be.eql({ x: 100, y: 0, z: 145 });
});

it("should check 'setTo' method (outside, duration)", (done) => {
// Given
const depaPos = inst.axisManager.get();
Expand Down Expand Up @@ -400,6 +534,7 @@ describe("AnimationManager", () => {
// When
inst.setBy(byPos, 1000);
});

it("should check 'setBy' method (outside, duration)", (done) => {
// Given
const depaPos = inst.axisManager.get();
Expand Down Expand Up @@ -432,6 +567,7 @@ describe("AnimationManager", () => {
// When
inst.setBy(byPos, 1000);
});

it("should check 'animateTo' method (inside)", (done) => {
// Given
const depaPos = inst.axisManager.get();
Expand Down Expand Up @@ -462,6 +598,7 @@ describe("AnimationManager", () => {
// When
inst.setTo(destPos, 500);
});

it("should check 'animateTo' method (outside)", (done) => {
// Given
const depaPos = inst.axisManager.get();
Expand Down Expand Up @@ -495,6 +632,7 @@ describe("AnimationManager", () => {
// When
inst.animateTo(destPos, 1000);
});

it("should check 'animateTo' with destPos that can cause floating point", (done) => {
// circular: true,
// duration: 102
Expand All @@ -515,6 +653,7 @@ describe("AnimationManager", () => {
done();
}, 200);
});

it("should check position when animation is running. then, start other animation", (done) => {
// Given
const startHandler = sinon.spy();
Expand Down Expand Up @@ -555,6 +694,7 @@ describe("AnimationManager", () => {
done();
}, 500);
});

[1, -1].forEach((direction) => {
it(`should check destPos when range changes dynamically during animateLoop(direction: ${direction}, circular: true)`, (done) => {
// Given
Expand Down Expand Up @@ -584,6 +724,7 @@ describe("AnimationManager", () => {
}
);
});

it(`should check destPos when range changes dynamically during animateLoop and change(direction: ${direction}, circular: true)`, (done) => {
// Given
const depaPos = { z: -100 };
Expand Down Expand Up @@ -623,6 +764,7 @@ describe("AnimationManager", () => {
);
});
});

it("should check 'updateAnimation' method (update destPos)", (done) => {
// Given
const startHandler = sinon.spy();
Expand Down Expand Up @@ -653,6 +795,7 @@ describe("AnimationManager", () => {
done();
}, 500);
});

it("should check 'updateAnimation' method (update duration)", (done) => {
// Given
const startHandler = sinon.spy();
Expand Down Expand Up @@ -685,6 +828,7 @@ describe("AnimationManager", () => {
done();
}, 700);
});

it("should check 'updateAnimation' method (multiple time, update both)", (done) => {
// Given
const startHandler = sinon.spy();
Expand Down Expand Up @@ -724,6 +868,7 @@ describe("AnimationManager", () => {
done();
}, 500);
});

it("should check 'updateAnimation' method (restart: true)", (done) => {
// Given
const startHandler = sinon.spy();
Expand Down Expand Up @@ -759,6 +904,7 @@ describe("AnimationManager", () => {
done();
}, 700);
});

it("should check 'stopAnimation' method", (done) => {
// Given
const startHandler = sinon.spy();
Expand Down