Merge branch 'master' into remove-docgen

Author: DanC5

src/components/InfiniteScrollPaginator/InfiniteScroll.tsx

@@ -117,11 +117,11 @@ export const InfiniteScroll: React.FC<InfiniteScrollProps> = (props) => {
   useEffect(() => {
     const scrollElement = useWindow ? window : scrollComponent.current?.parentNode;
     if (scrollElement) {
-      scrollElement.addEventListener('mousewheel', mousewheelListener, useCapture);
+      scrollElement.addEventListener('wheel', mousewheelListener, { passive: false });
     }
     return () => {
       if (scrollElement) {
-        scrollElement.removeEventListener('mousewheel', mousewheelListener, useCapture);
+        scrollElement.removeEventListener('wheel', mousewheelListener, useCapture);
       }
     };
   }, [useCapture, useWindow]);

src/components/InfiniteScrollPaginator/__tests__/InfiniteScroll.test.js

@@ -50,11 +50,9 @@ describe('InfiniteScroll', () => {
       const addEventListenerSpy = useWindow ? windowAddEventListenerSpy : divAddEventListenerSpy;
 
       expect(addEventListenerSpy).toHaveBeenCalledWith('scroll', expect.any(Function), useCapture);
-      expect(addEventListenerSpy).toHaveBeenCalledWith(
-        'mousewheel',
-        expect.any(Function),
-        useCapture,
-      );
+      expect(addEventListenerSpy).toHaveBeenCalledWith('wheel', expect.any(Function), {
+        passive: false,
+      });
       expect(addEventListenerSpy).toHaveBeenCalledWith('resize', expect.any(Function), useCapture);
     },
   );
@@ -84,11 +82,9 @@ describe('InfiniteScroll', () => {
         expect.any(Function),
         useCapture,
       );
-      expect(removeEventListenerSpy).toHaveBeenCalledWith(
-        'mousewheel',
-        expect.any(Function),
-        useCapture,
-      );
+      expect(removeEventListenerSpy).toHaveBeenCalledWith('wheel', expect.any(Function), {
+        passive: false,
+      });
       expect(removeEventListenerSpy).toHaveBeenCalledWith(
         'resize',
         expect.any(Function),