fix(animation): with animator hoc class settings combine support

arwes · Feb 10, 2021 · 60274e2 · 60274e2
1 parent fc2db15
commit 60274e2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/packages/animation/src/utils/filterClassAnimatorSettings/filterClassAnimatorSettings.test.ts b/packages/animation/src/utils/filterClassAnimatorSettings/filterClassAnimatorSettings.test.ts
@@ -19,6 +19,7 @@ test('Should filter flow activation values', () => {
   'animate',
   'root',
   'merge',
+  'combine',
   'manager',
   'useAnimateMount',
   'useAnimateEntering',

diff --git a/packages/animation/src/utils/filterClassAnimatorSettings/filterClassAnimatorSettings.ts b/packages/animation/src/utils/filterClassAnimatorSettings/filterClassAnimatorSettings.ts
@@ -5,6 +5,7 @@ const CLASS_ALLOWED_SETTINGS = [
   'animate',
   'root',
   'merge',
+  'combine',
   'manager',
   'useAnimateMount',
   'useAnimateEntering',

diff --git a/packages/animation/src/withAnimator/withAnimator.test.tsx b/packages/animation/src/withAnimator/withAnimator.test.tsx
@@ -192,6 +192,21 @@ test('Should "animator.merge" setting take priority in instance setting', () =>
   expect(animator).toMatchObject({ merge: false });
 });
 
+test('Should "animator.combine" setting take priority in instance setting', () => {
+  let animator: any;
+  const ExampleComponent: FC<ExampleComponentWithAnimatorProps> = props => {
+    animator = props.animator;
+    return null;
+  };
+  const ExampleNode = withAnimator({ combine: true })(ExampleComponent);
+  render(
+    <Animator>
+      <ExampleNode animator={{ combine: false }} />
+    </Animator>
+  );
+  expect(animator).toMatchObject({ combine: false });
+});
+
 test('Should "animator.manager" setting take priority in instance setting', () => {
   let animator: any;
   const ExampleComponent: FC<ExampleComponentWithAnimatorProps> = props => {