Merge pull request #33 from asmyshlyaev177/fix_history_rate_limits

fix: fix history pushState/replaceState rate limits
asmyshlyaev177 · Nov 20, 2024 · 9b7f5f9 · 9b7f5f9
2 parents 49b67cd + 35d1398
commit 9b7f5f9
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 50 deletions.
diff --git a/packages/urlstate/constants/constants.ts b/packages/urlstate/constants/constants.ts
@@ -1,4 +1,8 @@
+import { isSafari } from "../utils";
+
 export const SYMBOLS = {
   date: "⏲",
   undefined: "∙undefined",
 } as const;
+
+export const TIMEOUT = isSafari ? 330 : 70;
diff --git a/packages/urlstate/next/useUrlState/useUrlState.ts b/packages/urlstate/next/useUrlState/useUrlState.ts
@@ -115,7 +115,7 @@ export function useUrlState<T extends JSONCompatible>(
     reset: resetBase,
     getState,
   } = useUrlStateBase(_defaultState, router, ({ parse }) =>
-    isSSR()
+    isSSR
       ? parseSPObj(
           filterUnknownParams(_defaultState, _searchParams),
           _defaultState,

diff --git a/packages/urlstate/useSharedState/useSharedState.test.ts b/packages/urlstate/useSharedState/useSharedState.test.ts
@@ -2,13 +2,9 @@ import { act, renderHook } from '@testing-library/react';
 
 import { useSharedState } from './useSharedState';
 import * as subscribers from '../subscribers';
+import * as utils from '../utils'
 
-jest.mock('../utils.ts', () => ({
-  ...jest.requireActual('../utils.ts'),
-  isSSR: jest.fn(),
-}));
-
-import { isSSR, JSONCompatible } from '../utils';
+import { JSONCompatible } from '../utils';
 
 describe('useSharedState', () => {
   let state: typeof form;
@@ -27,7 +23,7 @@ describe('useSharedState', () => {
         it('always use getInitial', () => {
           const stateSpy = jest.spyOn(subscribers.stateMap, 'get');
           const stateSpySet = jest.spyOn(subscribers.stateMap, 'set');
-          jest.mocked(isSSR).mockReturnValue(true);
+          Object.defineProperty(utils, 'isSSR', { value: true })
           const hook1 = renderHook(() => useSharedState(state, getInitial));
 
           expect(hook1.result.current.state).toStrictEqual(initial);
@@ -43,7 +39,7 @@ describe('useSharedState', () => {
             .spyOn(subscribers.stateMap, 'set')
             .mockReturnValue(stateMock);
 
-          jest.mocked(isSSR).mockReturnValue(false);
+          Object.defineProperty(utils, 'isSSR', { value: false })
           const hook1 = renderHook(() => useSharedState(state, getInitial));
 
           expect(hook1.result.current.state).toStrictEqual(initial);
@@ -61,7 +57,7 @@ describe('useSharedState', () => {
             .spyOn(subscribers.stateMap, 'set')
             .mockReturnValue(stateMock);
 
-          jest.mocked(isSSR).mockReturnValue(false);
+          Object.defineProperty(utils, 'isSSR', { value: false })
           const hook1 = renderHook(() => useSharedState(state));
 
           expect(stateSpyGet).toHaveBeenCalledTimes(1);
@@ -80,7 +76,7 @@ describe('useSharedState', () => {
             .spyOn(subscribers.stateMap, 'set')
             .mockReturnValue(stateMock);
 
-          jest.mocked(isSSR).mockReturnValue(false);
+          Object.defineProperty(utils, 'isSSR', { value: false })
           const hook1 = renderHook(() => useSharedState(state));
 
           expect(stateSpyGet).toHaveBeenCalledTimes(1);

diff --git a/packages/urlstate/useSharedState/useSharedState.ts b/packages/urlstate/useSharedState/useSharedState.ts
@@ -29,7 +29,7 @@ export function useSharedState<T extends JSONCompatible>(
   const stateShape = React.useRef(defaultState);
 
   const [state, _setState] = React.useState(() => {
-    if (isSSR()) {
+    if (isSSR) {
       return _getInitial ? _getInitial?.() : stateShape.current;
     }