fix(AccordionContent): refactor for useCSSKeyframesAnimationController()

packages/vkui/src/components/Accordion/Accordion.module.css

@@ -7,6 +7,95 @@
 }
 
 .AccordionContent__in {
-  max-block-size: 0;
-  transition: max-height 100ms ease-in-out;
+  --vkui_internal--AccordionContent_height: initial;
+
+  animation-duration: 100ms;
+  animation-timing-function: ease-in-out;
+  animation-fill-mode: forwards;
+}
+
+@media (--reduce-motion) {
+  .AccordionContent__in {
+    animation-duration: 300ms;
+    animation-timing-function: linear;
+  }
+}
+
+.AccordionContent__in--enter {
+  animation-name: animation-collapse;
+}
+
+@media (--reduce-motion) {
+  .AccordionContent__in--enter {
+    animation-name: animation-fade-in;
+  }
+}
+
+.AccordionContent__in--entered {
+  block-size: var(--vkui_internal--AccordionContent_height);
+}
+
+.AccordionContent__in--exit {
+  animation-name: animation-expand;
+}
+
+@media (--reduce-motion) {
+  .AccordionContent__in--exit {
+    animation-name: animation-fade-out;
+  }
+}
+
+.AccordionContent__in--exited {
+  block-size: 0;
+}
+
+@keyframes animation-collapse {
+  0% {
+    block-size: 0;
+  }
+
+  100% {
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
+}
+@keyframes animation-expand {
+  0% {
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
+
+  100% {
+    block-size: 0;
+  }
+}
+@keyframes animation-fade-in {
+  0% {
+    opacity: 0;
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
+
+  50% {
+    opacity: 0;
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
+
+  100% {
+    opacity: 1;
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
+}
+@keyframes animation-fade-out {
+  0% {
+    opacity: 1;
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
+
+  50% {
+    opacity: 0;
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
+
+  100% {
+    opacity: 0;
+    block-size: var(--vkui_internal--AccordionContent_height);
+  }
 }

packages/vkui/src/components/Accordion/AccordionContent.tsx

@@ -1,48 +1,22 @@
 import * as React from 'react';
 import { classNames } from '@vkontakte/vkjs';
 import { useExternRef } from '../../hooks/useExternRef';
-import { useGlobalEventListener } from '../../hooks/useGlobalEventListener';
-import { useDOM } from '../../lib/dom';
+import { useCSSKeyframesAnimationController } from '../../lib/animation';
 import { useIsomorphicLayoutEffect } from '../../lib/useIsomorphicLayoutEffect';
 import { HasRef, HasRootRef } from '../../types';
 import { AccordionContext } from './AccordionContext';
 import styles from './Accordion.module.css';
 
-/**
- * Функция расчета max-height, для скрытия или раскрытия контента.
- */
-function calcMaxHeight(expanded: boolean, el: HTMLElement | null): string {
-  if (!expanded) {
-    return '0px';
-  }
+const CUSTOM_PROPERTY_ACCORDION_CONTENT_HEIGHT = '--vkui_internal--AccordionContent_height';
 
-  // В первый рендеринг нельзя узнать высоту элемента
-  if (el === null) {
-    return 'inherit';
-  }
-
-  return `${el.scrollHeight}px`;
-}
-
-/**
- * Хук для скрывания или раскрывания контента. Возвращает стили для in элемента.
- */
-function useAccordionContent(expanded: boolean) {
-  const ref = React.useRef<HTMLDivElement | null>(null);
-
-  const maxHeight = calcMaxHeight(expanded, ref.current);
-
-  const resize = () => {
-    const el = ref.current;
-    el!.style.maxHeight = calcMaxHeight(expanded, el);
-  };
-
-  const { window } = useDOM();
-  useGlobalEventListener(window, 'resize', resize);
-  useIsomorphicLayoutEffect(resize, []);
-
-  return [ref, { maxHeight }] as const;
-}
+const stateClassNames = {
+  enter: styles['AccordionContent__in--enter'],
+  entering: styles['AccordionContent__in--enter'],
+  entered: styles['AccordionContent__in--entered'],
+  exit: styles['AccordionContent__in--exit'],
+  exiting: styles['AccordionContent__in--exit'],
+  exited: styles['AccordionContent__in--exited'],
+};
 
 export interface AccordionContentProps
   extends HasRootRef<HTMLDivElement>,
@@ -58,9 +32,31 @@
 }: AccordionContentProps) => {
   const { expanded, labelId, contentId } = React.useContext(AccordionContext);
 
-  const [ref, inStyle] = useAccordionContent(expanded);
+  const inRef = useExternRef(getRef);
+  const [animationState, animationHandlers] = useCSSKeyframesAnimationController(
+    expanded ? 'enter' : 'exit',
+    undefined,
+    true,
+  );
+
+  useIsomorphicLayoutEffect(() => {
+    const inEl = inRef.current;
+
+    if (!inEl) {
+      return;
+    }
 
-  const inRef = useExternRef(ref, getRef);
+    switch (animationState) {
+      case 'enter':
+      case 'exit':
+        inEl.style.setProperty(CUSTOM_PROPERTY_ACCORDION_CONTENT_HEIGHT, `${inEl.scrollHeight}px`);
+        break;
+      case 'entered':
+      case 'exited':
+        inEl.style.removeProperty(CUSTOM_PROPERTY_ACCORDION_CONTENT_HEIGHT);
+        break;
+    }
+  }, [animationState, inRef]);
 
   return (
     <div
@@ -72,7 +68,11 @@
       className={classNames(styles['AccordionContent'], className)}
       {...restProps}
     >
-      <div ref={inRef} className={styles['AccordionContent__in']} style={inStyle}>
+      <div
+        ref={inRef}
+        className={classNames(styles['AccordionContent__in'], stateClassNames[animationState])}
+        {...animationHandlers}
+      >
         {children}
       </div>
     </div>

packages/vkui/src/lib/animation/useCSSKeyframesAnimationController.test.ts

@@ -3,7 +3,7 @@ import { renderHook } from '@testing-library/react';
 import { useCSSKeyframesAnimationController } from './useCSSKeyframesAnimationController';
 
 describe(useCSSKeyframesAnimationController, () => {
-  describe.each([false, true])('`noAnimation` prop is `%s`', (noAnimation) => {
+  describe.each([false, true])('`disableInitAnimation` prop is `%s`', (disableInitAnimation) => {
     const callbacks = {
       onEnter: jest.fn(),
       onEntering: jest.fn(),
@@ -23,13 +23,13 @@ describe(useCSSKeyframesAnimationController, () => {
 
     it('should enter', () => {
       const { result } = renderHook(() =>
-        useCSSKeyframesAnimationController('enter', callbacks, noAnimation),
+        useCSSKeyframesAnimationController('enter', callbacks, disableInitAnimation),
       );
 
-      !noAnimation && expect(result.current[0]).toBe('enter');
+      !disableInitAnimation && expect(result.current[0]).toBe('enter');
 
       act(result.current[1].onAnimationStart);
-      if (!noAnimation) {
+      if (!disableInitAnimation) {
         expect(result.current[0]).toBe('entering');
         expect(callbacks.onEntering).toHaveBeenCalledTimes(1);
       }
@@ -40,12 +40,14 @@ describe(useCSSKeyframesAnimationController, () => {
     });
 
     it('should exit', () => {
-      const { result } = renderHook(() => useCSSKeyframesAnimationController('exit', callbacks));
+      const { result } = renderHook(() =>
+        useCSSKeyframesAnimationController('exit', callbacks, disableInitAnimation),
+      );
 
-      !noAnimation && expect(result.current[0]).toBe('exit');
+      !disableInitAnimation && expect(result.current[0]).toBe('exit');
 
       act(result.current[1].onAnimationStart);
-      if (!noAnimation) {
+      if (!disableInitAnimation) {
         expect(result.current[0]).toBe('exiting');
         expect(callbacks.onExiting).toHaveBeenCalledTimes(1);
       }

packages/vkui/src/lib/animation/useCSSKeyframesAnimationController.ts

@@ -26,8 +26,9 @@ export const useCSSKeyframesAnimationController = (
     onExiting: onExitingProp = noop,
     onExited: onExitedProp = noop,
   }: UseCSSAnimationControllerCallback = {},
-  noAnimation = false,
+  disableInitAnimation = false,
 ): [AnimationState, AnimationHandlers] => {
+  const isFirstInitRef = React.useRef(disableInitAnimation);
   const [state, setState] = React.useState<AnimationState>(stateProp);
   const [willBeEnter, setWillBeEnter] = React.useState(stateProp === 'enter');
   const [willBeExit, setWillBeExit] = React.useState(stateProp === 'exit');
@@ -73,7 +74,7 @@ export const useCSSKeyframesAnimationController = (
     function updateState() {
       switch (stateProp) {
         case 'enter':
-          if (noAnimation && state === 'enter') {
+          if (isFirstInitRef.current && state === 'enter') {
             entered();
             break;
           }
@@ -87,7 +88,7 @@ export const useCSSKeyframesAnimationController = (
           onEnter();
           break;
         case 'exit':
-          if (noAnimation && state === 'exit') {
+          if (isFirstInitRef.current && state === 'exit') {
             exited();
             break;
           }
@@ -101,8 +102,10 @@ export const useCSSKeyframesAnimationController = (
           onExit();
           break;
       }
+
+      isFirstInitRef.current = false;
     },
-    [state, stateProp, willBeEnter, willBeExit, noAnimation, entered, exited, onEnter, onExit],
+    [state, stateProp, willBeEnter, willBeExit, entered, exited, onEnter, onExit],
   );
 
   return [state, { onAnimationStart, onAnimationEnd }];