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

Added: animOptions support with Keyframes #25

Merged
merged 6 commits into from
May 9, 2023
Merged

Added: animOptions support with Keyframes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eaf07db
using keyframes for animation
dyuri Jan 2, 2023
a49d27b
subslide cleanup
dyuri Jan 2, 2023
5bf93f7
Merge branch 'main' into 24-keyframes
veghdev Mar 7, 2023
4233354
reverse step fix
dyuri Apr 11, 2023
18adfd0
test: fix, due to api change
veghdev Apr 15, 2023
149d23a
test: add animOptions
veghdev Apr 15, 2023
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
16 changes: 14 additions & 2 deletions src/__mocks__/vizzu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
class Control {
constructor(animation) {
this._animation = animation;
}

store() {
return this._animation;
}
}

class Vizzu {
constructor() {
this._snapshot = {};
Expand All @@ -7,9 +17,11 @@ class Vizzu {

off() {}

async animate() {
animate() {
this._snapshot = [...arguments][0];
return Promise.resolve();
const anim = Promise.resolve("test1");
anim.activated = Promise.resolve(new Control([...arguments][0]));
return anim;
}

store() {
Expand Down
134 changes: 94 additions & 40 deletions src/__tests__/assets/slides.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ const story = [
config: configAssets.config4,
style: styleAssets.style4,
filter: dataFilterAssets.filter4,
animOptions: { duration: 1 },
},
[
{
config: configAssets.config1,
style: styleAssets.style1,
filter: dataFilterAssets.filter1,
animOptions: { duration: 1 },
},
{
config: configAssets.config2,
Expand All @@ -49,50 +51,64 @@ const story = [
[
[
{
data: { filter: dataFilterAssets.filter1 },
config: configAssets.config1,
style: styleAssets.style1,
target: {
data: { filter: dataFilterAssets.filter1 },
config: configAssets.config1,
style: styleAssets.style1,
},
},
],
[
{
data: { filter: dataFilterAssets.filter2 },
config: configAssets.config2,
style: styleAssets.style2,
target: {
data: { filter: dataFilterAssets.filter2 },
config: configAssets.config2,
style: styleAssets.style2,
},
},
],
],
[
[
{
data: { filter: dataFilterAssets.filter3 },
config: configAssets.config3,
style: styleAssets.style3,
target: {
data: { filter: dataFilterAssets.filter3 },
config: configAssets.config3,
style: styleAssets.style3,
},
},
],
],
[
[
{
data: { filter: dataFilterAssets.filter4 },
config: configAssets.config4,
style: styleAssets.style4,
target: {
data: { filter: dataFilterAssets.filter4 },
config: configAssets.config4,
style: styleAssets.style4,
},
options: {
duration: 1,
},
},
],
],
[
[
{
data: { filter: dataFilterAssets.filter1 },
config: configAssets.config1,
style: styleAssets.style1,
target: {
data: { filter: dataFilterAssets.filter1 },
config: configAssets.config1,
style: styleAssets.style1,
},
options: {
duration: 1,
},
},
],
[
{
data: { filter: dataFilterAssets.filter2 },
config: configAssets.config2,
style: styleAssets.style2,
target: {
data: { filter: dataFilterAssets.filter2 },
config: configAssets.config2,
style: styleAssets.style2,
},
},
],
],
Expand All @@ -119,44 +135,78 @@ slides.push(
{
slides: [{ config: configAssets.config1 }],
},
[[[{ data: {}, config: configAssets.config1 }]]],
[[[{ target: { data: {}, config: configAssets.config1 } }]]],
],
[
"slides contain one slide with one step (object) with config and animOptions",
{
slides: [{ config: configAssets.config1, animOptions: { duration: 1 } }],
},
[
[
[
{
target: { data: {}, config: configAssets.config1 },
options: { duration: 1 },
},
],
],
],
],
[
"slides contain one slide with one step (list) with config",
{
slides: [[{ config: configAssets.config1 }]],
},
[[[{ data: {}, config: configAssets.config1 }]]],
[[[{ target: { data: {}, config: configAssets.config1 } }]]],
],
[
"slides contain one slide with one step (list) with config and animOptions",
{
slides: [
[{ config: configAssets.config1, animOptions: { duration: 1 } }],
],
},
[
[
[
{
target: { data: {}, config: configAssets.config1 },
options: { duration: 1 },
},
],
],
],
],
[
"object contains style and slides contain one slide with one step (object) with style",
{
style: styleAssets.style2,
slides: [{ style: styleAssets.style1 }],
},
[[[{ data: {}, style: styleAssets.style1 }]]],
[[[{ target: { data: {}, style: styleAssets.style1 } }]]],
],
[
"slides contain one slide with one step (object) with style",
{
slides: [{ style: styleAssets.style1 }],
},
[[[{ data: {}, style: styleAssets.style1 }]]],
[[[{ target: { data: {}, style: styleAssets.style1 } }]]],
],
[
"object contains style and slides contain one slide with one step (list) with style",
{
style: styleAssets.style2,
slides: [[{ style: styleAssets.style1 }]],
},
[[[{ data: {}, style: styleAssets.style1 }]]],
[[[{ target: { data: {}, style: styleAssets.style1 } }]]],
],
[
"slides contain one slide with one step (list) with style",
{
slides: [[{ style: styleAssets.style1 }]],
},
[[[{ data: {}, style: styleAssets.style1 }]]],
[[[{ target: { data: {}, style: styleAssets.style1 } }]]],
],
[
"object contains data and slides contain one slide with one step (object) with filter",
Expand All @@ -168,9 +218,11 @@ slides.push(
[
[
{
data: Object.assign({}, dataAssets.data1, {
filter: dataFilterAssets.filter1,
}),
target: {
data: Object.assign({}, dataAssets.data1, {
filter: dataFilterAssets.filter1,
}),
},
},
],
],
Expand All @@ -181,7 +233,7 @@ slides.push(
{
slides: [{ filter: dataFilterAssets.filter1 }],
},
[[[{ data: { filter: dataFilterAssets.filter1 } }]]],
[[[{ target: { data: { filter: dataFilterAssets.filter1 } } }]]],
],
[
"object contains style and slides contain one slide with one step (list) with filter",
Expand All @@ -193,9 +245,11 @@ slides.push(
[
[
{
data: Object.assign({}, dataAssets.data1, {
filter: dataFilterAssets.filter1,
}),
target: {
data: Object.assign({}, dataAssets.data1, {
filter: dataFilterAssets.filter1,
}),
},
},
],
],
Expand All @@ -206,7 +260,7 @@ slides.push(
{
slides: [[{ filter: dataFilterAssets.filter1 }]],
},
[[[{ data: { filter: dataFilterAssets.filter1 } }]]],
[[[{ target: { data: { filter: dataFilterAssets.filter1 } } }]]],
]
);

Expand All @@ -221,8 +275,8 @@ slides.push(
],
},
[
[[{ data: {}, config: configAssets.config1 }]],
[[{ config: configAssets.config2 }]],
[[{ target: { data: {}, config: configAssets.config1 } }]],
[[{ target: { config: configAssets.config2 } }]],
],
],
[
Expand All @@ -234,8 +288,8 @@ slides.push(
],
},
[
[[{ data: {}, config: configAssets.config1 }]],
[[{ config: configAssets.config2 }]],
[[{ target: { data: {}, config: configAssets.config1 } }]],
[[{ target: { config: configAssets.config2 } }]],
],
]
);
Expand Down
Loading