Various fixes (#11448)
# Scrollbar fix Fixes https://github.com/twentyhq/twenty/issues/11403 <img width="1512" alt="image" src="https://github.com/user-attachments/assets/b13fe0f2-8c61-4ea8-9ea1-e61e571a90da" /> --------- Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import {
|
||||
createSearchParams,
|
||||
matchPath,
|
||||
useLocation,
|
||||
useNavigate,
|
||||
@ -60,15 +61,27 @@ export const PageChangeEffect = () => {
|
||||
}, [location, previousLocation]);
|
||||
|
||||
const [searchParams] = useSearchParams();
|
||||
const navigationParams = searchParams.get('animateModal')
|
||||
? `?animateModal=${searchParams.get('animateModal')}`
|
||||
: '';
|
||||
|
||||
useEffect(() => {
|
||||
if (isDefined(pageChangeEffectNavigateLocation)) {
|
||||
navigate(pageChangeEffectNavigateLocation + navigationParams);
|
||||
const hasQueryParams = pageChangeEffectNavigateLocation.includes('?');
|
||||
|
||||
const navigationParams = createSearchParams({
|
||||
...(searchParams.get('animateModal')
|
||||
? { animateModal: searchParams.get('animateModal') ?? 'false' }
|
||||
: {}),
|
||||
});
|
||||
|
||||
if (hasQueryParams) {
|
||||
navigate(pageChangeEffectNavigateLocation);
|
||||
} else {
|
||||
navigate({
|
||||
pathname: pageChangeEffectNavigateLocation,
|
||||
search: navigationParams.toString(),
|
||||
});
|
||||
}
|
||||
}
|
||||
}, [navigate, pageChangeEffectNavigateLocation, navigationParams]);
|
||||
}, [navigate, pageChangeEffectNavigateLocation, searchParams]);
|
||||
|
||||
useEffect(() => {
|
||||
const isLeavingRecordIndexPage = !!matchPath(
|
||||
|
||||
Reference in New Issue
Block a user