diff --git a/src/pages/home/home-page.tsx b/src/pages/home/home-page.tsx index 51c85f7..513a4cd 100644 --- a/src/pages/home/home-page.tsx +++ b/src/pages/home/home-page.tsx @@ -16,7 +16,7 @@ import { useSetFooterCurrentPage, useSetIsPullToRefreshEnabled, } from '@/widgets/sub-layout/use-sub-layout'; -import { useStore } from '@/shared/model/store'; +import { useMenuOnStore, useStore } from '@/shared/model/store'; import { useHomeBannerListMutation } from '@/entities/home/api/use-home-banner-list-mutation'; import { BannerList, @@ -30,8 +30,9 @@ import { snackBar } from '@/shared/lib'; export const HomePage = () => { const { openBiometricRegistrationPopup, checkAlarmLink } = useAppBridge(); const { mutateAsync: homeBannerList } = useHomeBannerListMutation(); + const { menuOn } = useMenuOnStore(); - useSetIsPullToRefreshEnabled(true); + useSetIsPullToRefreshEnabled(!menuOn); useSetHeaderTitle(''); useSetHeaderType(HeaderType.Home); useSetFooterMode(true); diff --git a/src/widgets/pull-to-refresh/pull-to-refresh.tsx b/src/widgets/pull-to-refresh/pull-to-refresh.tsx index a2e6a77..a00ce19 100644 --- a/src/widgets/pull-to-refresh/pull-to-refresh.tsx +++ b/src/widgets/pull-to-refresh/pull-to-refresh.tsx @@ -209,7 +209,7 @@ export const PullToRefresh: React.FC = ({ // pullDownRef.current!.style.opacity = (yDistanceMoved / 65).toString(); childrenRef.current!.style.overflow = 'visible'; childrenRef.current!.style.transform = `translate(0px, ${appr(yDistanceMoved)}px)`; - pullDownRef.current!.style.visibility = 'visible'; + // pullDownRef.current!.style.visibility = 'visible'; }; const onEnd = (): void => { @@ -234,18 +234,22 @@ export const PullToRefresh: React.FC = ({ return (
- {/* + { + /*
{refreshingContent}
- */} + */ + }
{children} - {/* + { + /*
{refreshingContent}
- */} + */ + }
);