diff --git a/apps/readest-app/src/app/reader/components/BooksGrid.tsx b/apps/readest-app/src/app/reader/components/BooksGrid.tsx index 86b09a9d..92495117 100644 --- a/apps/readest-app/src/app/reader/components/BooksGrid.tsx +++ b/apps/readest-app/src/app/reader/components/BooksGrid.tsx @@ -182,6 +182,7 @@ const BooksGrid: React.FC = ({ bookKeys, onCloseBook }) => { section={section} pageinfo={pageinfo} isHoveredAnim={false} + gridInsets={gridInsets} /> {isFontLayoutSettingsDialogOpen && } diff --git a/apps/readest-app/src/app/reader/components/FooterBar.tsx b/apps/readest-app/src/app/reader/components/FooterBar.tsx index 55d4f629..0b48a66a 100644 --- a/apps/readest-app/src/app/reader/components/FooterBar.tsx +++ b/apps/readest-app/src/app/reader/components/FooterBar.tsx @@ -21,6 +21,7 @@ import { eventDispatcher } from '@/utils/event'; import { viewPagination } from '../hooks/usePagination'; import { saveViewSettings } from '../utils/viewSettingsHelper'; import { PageInfo } from '@/types/book'; +import { Insets } from '@/types/misc'; import Button from '@/components/Button'; import Slider from '@/components/Slider'; import TTSControl from './tts/TTSControl'; @@ -31,6 +32,7 @@ interface FooterBarProps { section?: PageInfo; pageinfo?: PageInfo; isHoveredAnim: boolean; + gridInsets: Insets; } const FooterBar: React.FC = ({ @@ -39,6 +41,7 @@ const FooterBar: React.FC = ({ section, pageinfo, isHoveredAnim, + gridInsets, }) => { const _ = useTranslation(); const { envConfig, appService } = useEnv(); @@ -199,9 +202,7 @@ const FooterBar: React.FC = ({ : 'pointer-events-none invisible translate-y-full overflow-hidden pb-0 pt-0 ease-in', )} style={{ - bottom: appService?.hasSafeAreaInset - ? 'calc(env(safe-area-inset-bottom) + 64px)' - : '64px', + bottom: appService?.hasSafeAreaInset ? `${gridInsets.bottom + 64}px` : '64px', }} >
@@ -255,9 +256,7 @@ const FooterBar: React.FC = ({ : 'pointer-events-none invisible translate-y-full overflow-hidden pb-0 pt-0 ease-in', )} style={{ - bottom: appService?.hasSafeAreaInset - ? 'calc(env(safe-area-inset-bottom) + 64px)' - : '64px', + bottom: appService?.hasSafeAreaInset ? `${gridInsets.bottom + 64}px` : '64px', }} > = ({
- {/* Desktop footer bar */} -
+ {/* Desktop / Pad footer bar */} +