aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
authorArmand Philippot <git@armandphilippot.com>2023-11-15 16:37:16 +0100
committerArmand Philippot <git@armandphilippot.com>2023-11-15 17:26:17 +0100
commitc826ad66df066b90b09009f2f4b83b56d018436e (patch)
tree6320b85c7a4fdedf8e4384eaca290c02ea2a71e2 /src/utils
parent0f38aee374029213a47ef7c29bd164093fe63c85 (diff)
refactor(hooks): rewrite useScrollPosition hook
* return the scroll position (both X and Y) * no longer accepts arguments * add tests
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/hooks/use-scroll-position.tsx13
-rw-r--r--src/utils/hooks/use-scroll-position/index.ts1
-rw-r--r--src/utils/hooks/use-scroll-position/use-scroll-position.test.ts25
-rw-r--r--src/utils/hooks/use-scroll-position/use-scroll-position.ts31
4 files changed, 57 insertions, 13 deletions
diff --git a/src/utils/hooks/use-scroll-position.tsx b/src/utils/hooks/use-scroll-position.tsx
deleted file mode 100644
index c6ae9fd..0000000
--- a/src/utils/hooks/use-scroll-position.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useEffect } from 'react';
-
-/**
- * Execute the given function based on scroll position.
- *
- * @param scrollHandler - A callback function.
- */
-export const useScrollPosition = (scrollHandler: () => void) => {
- useEffect(() => {
- window.addEventListener('scroll', scrollHandler);
- return () => window.removeEventListener('scroll', scrollHandler);
- }, [scrollHandler]);
-};
diff --git a/src/utils/hooks/use-scroll-position/index.ts b/src/utils/hooks/use-scroll-position/index.ts
new file mode 100644
index 0000000..8c11c1e
--- /dev/null
+++ b/src/utils/hooks/use-scroll-position/index.ts
@@ -0,0 +1 @@
+export * from './use-scroll-position';
diff --git a/src/utils/hooks/use-scroll-position/use-scroll-position.test.ts b/src/utils/hooks/use-scroll-position/use-scroll-position.test.ts
new file mode 100644
index 0000000..49370ae
--- /dev/null
+++ b/src/utils/hooks/use-scroll-position/use-scroll-position.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it } from '@jest/globals';
+import { fireEvent, renderHook } from '@testing-library/react';
+import { type ScrollPosition, useScrollPosition } from './use-scroll-position';
+
+describe('useScrollPosition', () => {
+ it('returns the scroll position based on window', () => {
+ const { result } = renderHook(() => useScrollPosition());
+
+ expect(result.current.x).toBe(0);
+ expect(result.current.y).toBe(0);
+
+ const newPos: ScrollPosition = {
+ x: 50,
+ y: 100,
+ };
+
+ fireEvent.scroll(window, { target: { scrollX: newPos.x } });
+
+ expect(result.current.x).toBe(newPos.x);
+
+ fireEvent.scroll(window, { target: { scrollY: newPos.y } });
+
+ expect(result.current.y).toBe(newPos.y);
+ });
+});
diff --git a/src/utils/hooks/use-scroll-position/use-scroll-position.ts b/src/utils/hooks/use-scroll-position/use-scroll-position.ts
new file mode 100644
index 0000000..e20fda5
--- /dev/null
+++ b/src/utils/hooks/use-scroll-position/use-scroll-position.ts
@@ -0,0 +1,31 @@
+import { useCallback, useEffect, useState } from 'react';
+
+export type ScrollPosition = {
+ x: number;
+ y: number;
+};
+
+const defaultPosition: ScrollPosition = { x: 0, y: 0 };
+
+/**
+ * React hook to retrieve the current scroll position based on window.
+ *
+ * @returns {ScrollPosition} The scroll position.
+ */
+export const useScrollPosition = (): ScrollPosition => {
+ const [pos, setPos] = useState(defaultPosition);
+
+ const updatePos = useCallback(() => {
+ setPos({ x: window.scrollX, y: window.scrollY });
+ }, []);
+
+ useEffect(() => {
+ if (typeof window === 'undefined') return undefined;
+
+ window.addEventListener('scroll', updatePos);
+
+ return () => window.removeEventListener('scroll', updatePos);
+ }, [updatePos]);
+
+ return pos;
+};