Set the page hotkey scope only once (#11626)
The `useEffect` in the `PageChangeEffect` component that sets the page's hotkey scope is run 4-5 times every time the page changes. It should be executed only once when the location changes. The re-runs are due to unstable dependencies that shouldn't re-trigger the `useEffect`. This PR minimizes the re-runs of the `useEffect`. In the following video, I discuss a more global pattern. The documentation for the `useEffectEvent` hook: https://react.dev/learn/separating-events-from-effects#extracting-non-reactive-logic-out-of-effects. https://github.com/user-attachments/assets/8c0c238b-f1c4-4bbb-b083-0825f7176599
This commit is contained in:
committed by
GitHub
parent
21c3edf8d6
commit
1ba0c24071
@ -2,27 +2,31 @@ import { matchPath, useLocation } from 'react-router-dom';
|
|||||||
|
|
||||||
import { AppBasePath } from '@/types/AppBasePath';
|
import { AppBasePath } from '@/types/AppBasePath';
|
||||||
import { isNonEmptyString } from '@sniptt/guards';
|
import { isNonEmptyString } from '@sniptt/guards';
|
||||||
|
import { useCallback } from 'react';
|
||||||
import { isDefined } from 'twenty-shared/utils';
|
import { isDefined } from 'twenty-shared/utils';
|
||||||
|
|
||||||
|
const addTrailingSlash = (path: string) =>
|
||||||
|
path.endsWith('/') ? path : path + '/';
|
||||||
|
|
||||||
|
const getConstructedPath = (path: string, basePath?: AppBasePath) => {
|
||||||
|
if (!isNonEmptyString(basePath)) return path;
|
||||||
|
|
||||||
|
return addTrailingSlash(basePath) + path;
|
||||||
|
};
|
||||||
|
|
||||||
export const useIsMatchingLocation = () => {
|
export const useIsMatchingLocation = () => {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
|
||||||
const addTrailingSlash = (path: string) =>
|
const isMatchingLocation = useCallback(
|
||||||
path.endsWith('/') ? path : path + '/';
|
(path: string, basePath?: AppBasePath) => {
|
||||||
|
const match = matchPath(
|
||||||
const getConstructedPath = (path: string, basePath?: AppBasePath) => {
|
getConstructedPath(path, basePath),
|
||||||
if (!isNonEmptyString(basePath)) return path;
|
location.pathname,
|
||||||
|
);
|
||||||
return addTrailingSlash(basePath) + path;
|
return isDefined(match);
|
||||||
};
|
},
|
||||||
|
[location.pathname],
|
||||||
const isMatchingLocation = (path: string, basePath?: AppBasePath) => {
|
);
|
||||||
const match = matchPath(
|
|
||||||
getConstructedPath(path, basePath),
|
|
||||||
location.pathname,
|
|
||||||
);
|
|
||||||
return isDefined(match);
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
isMatchingLocation,
|
isMatchingLocation,
|
||||||
|
|||||||
Reference in New Issue
Block a user