fix(HorizontalScroll): fix scroll when mouse over arrow (#7882)

(cherry picked from commit f198947)
VKCOM · Nov 5, 2024 · 046d49b · 046d49b
1 parent fe06453
commit 046d49b
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 28 deletions.
diff --git a/packages/vkui/src/components/HorizontalScroll/HorizontalScroll.test.tsx b/packages/vkui/src/components/HorizontalScroll/HorizontalScroll.test.tsx
@@ -19,6 +19,11 @@ const setup = (element: HTMLElement, startScrollLeft = 0) => {
 
   jest.spyOn(element.firstElementChild!, 'scrollWidth', 'get').mockImplementation(() => 500);
 
+  // @ts-expect-error: TS2322 есть другой тип, но в компоненте он не используется
+  element.scrollBy = (options?: ScrollToOptions) => {
+    scrollLeft = scrollLeft + (options?.left || 0);
+  };
+
   return {
     get scrollLeft() {
       return scrollLeft;
@@ -176,6 +181,34 @@ describe('HorizontalScroll', () => {
       expect(mockedData.scrollLeft).toBe(200);
     });
   });
+
+  it('scroll by arrow', () => {
+    const ref: React.MutableRefObject<HTMLDivElement | null> = {
+      current: null,
+    };
+    render(
+      <HorizontalScroll getRef={ref} data-testid="horizontal-scroll">
+        <div style={{ width: '1800px', height: '50px' }} />
+      </HorizontalScroll>,
+    );
+
+    const mockedData = setup(ref.current!, 50);
+
+    fireEvent.mouseEnter(screen.getByTestId('horizontal-scroll'));
+
+    const arrowLeft = screen.getByTestId('ScrollArrowLeft');
+    const arrowRight = screen.getByTestId('ScrollArrowRight');
+
+    fireEvent.wheel(arrowRight, {
+      deltaX: 20,
+    });
+    expect(mockedData.scrollLeft).toBe(70);
+
+    fireEvent.wheel(arrowLeft, {
+      deltaX: 20,
+    });
+    expect(mockedData.scrollLeft).toBe(90);
+  });
 });
 
 function mockRef(element: HTMLDivElement) {

diff --git a/packages/vkui/src/components/HorizontalScroll/HorizontalScroll.tsx b/packages/vkui/src/components/HorizontalScroll/HorizontalScroll.tsx
@@ -1,8 +1,7 @@
 import * as React from 'react';
-import { classNames, noop } from '@vkontakte/vkjs';
+import { classNames } from '@vkontakte/vkjs';
 import { useAdaptivityHasPointer } from '../../hooks/useAdaptivityHasPointer';
 import { useDirection } from '../../hooks/useDirection';
-import { useEventListener } from '../../hooks/useEventListener';
 import { useExternRef } from '../../hooks/useExternRef';
 import { easeInOutSine } from '../../lib/fx';
 import type { HasRef, HTMLAttributesWithRootRef } from '../../types';
@@ -236,44 +235,33 @@ export const HorizontalScroll = ({
     }
   }, [showArrows, hasPointer, scrollerRef, setCanScrollStart, setCanScrollEnd]);
 
-  const scrollEvent = useEventListener('scroll', calculateArrowsVisibility);
-  React.useEffect(
-    function addScrollerRefToScrollEvent() {
-      if (!scrollerRef.current) {
-        return noop;
-      }
+  React.useEffect(calculateArrowsVisibility, [calculateArrowsVisibility, children]);
 
-      scrollEvent.add(scrollerRef.current);
-      return scrollEvent.remove;
+  const _onWheel = React.useCallback(
+    (e: React.WheelEvent) => {
+      scrollerRef.current!.scrollBy({ left: e.deltaX + e.deltaY, behavior: 'auto' });
     },
-    [scrollEvent, scrollerRef],
+    [scrollerRef],
   );
 
-  React.useEffect(calculateArrowsVisibility, [calculateArrowsVisibility, children]);
-
   /**
    * Прокрутка с помощью любого колеса мыши
    */
-  const onwheel = React.useCallback(
-    (e: WheelEvent) => {
-      scrollerRef.current!.scrollBy({ left: e.deltaX + e.deltaY, behavior: 'auto' });
+  const onScrollWheel = React.useCallback(
+    (e: React.WheelEvent) => {
+      _onWheel(e);
       e.preventDefault();
     },
-    [scrollerRef],
+    [_onWheel],
   );
 
-  const wheelEvent = useEventListener('wheel', onwheel);
-  React.useEffect(
-    function addScrollerRefToWheelEvent() {
-      if (!scrollerRef.current || !scrollOnAnyWheel) {
-        return noop;
+  const onArrowWheel = React.useCallback(
+    (e: React.WheelEvent) => {
+      if (e.deltaX || (e.deltaY && scrollOnAnyWheel)) {
+        _onWheel(e);
       }
-
-      wheelEvent.add(scrollerRef.current);
-
-      return wheelEvent.remove;
     },
-    [wheelEvent, scrollerRef, scrollOnAnyWheel],
+    [_onWheel, scrollOnAnyWheel],
   );
 
   return (
@@ -300,6 +288,7 @@ export const HorizontalScroll = ({
             styles['HorizontalScroll__arrowLeft'],
           )}
           onClick={scrollToLeft}
+          onWheel={onArrowWheel}
         />
       )}
       {showArrows && (hasPointer || hasPointer === undefined) && canScrollRight && (
@@ -315,9 +304,15 @@ export const HorizontalScroll = ({
             styles['HorizontalScroll__arrowRight'],
           )}
           onClick={scrollToRight}
+          onWheel={onArrowWheel}
         />
       )}
-      <div className={styles['HorizontalScroll__in']} ref={scrollerRef}>
+      <div
+        className={styles['HorizontalScroll__in']}
+        ref={scrollerRef}
+        onScroll={calculateArrowsVisibility}
+        onWheel={scrollOnAnyWheel ? onScrollWheel : undefined}
+      >
         <div className={styles['HorizontalScroll__in-wrapper']}>{children}</div>
       </div>
     </RootComponent>