Move the last update timestamp to the body (#472)
On small screens, the last update timestamp caused the pages title to get cut
This commit is contained in:
@@ -13,7 +13,7 @@ import Card from '@mui/material/Card';
|
|||||||
import CardContent from '@mui/material/CardContent';
|
import CardContent from '@mui/material/CardContent';
|
||||||
import IconButton from '@mui/material/IconButton';
|
import IconButton from '@mui/material/IconButton';
|
||||||
import Typography from '@mui/material/Typography';
|
import Typography from '@mui/material/Typography';
|
||||||
import React, { useCallback, useContext, useEffect, useMemo } from 'react';
|
import React, { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Link, useLocation } from 'react-router-dom';
|
import { Link, useLocation } from 'react-router-dom';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { t as translate } from 'i18next';
|
import { t as translate } from 'i18next';
|
||||||
@@ -27,12 +27,14 @@ import { TChapter } from '@/typings.ts';
|
|||||||
import { NavBarContext } from '@/components/context/NavbarContext.tsx';
|
import { NavBarContext } from '@/components/context/NavbarContext.tsx';
|
||||||
import { UpdateChecker } from '@/components/library/UpdateChecker.tsx';
|
import { UpdateChecker } from '@/components/library/UpdateChecker.tsx';
|
||||||
|
|
||||||
const StyledGroupedVirtuoso = styled(GroupedVirtuoso)(({ theme }) => ({
|
const StyledGroupedVirtuoso = styled(GroupedVirtuoso, { shouldForwardProp: (prop) => prop !== 'heightToSubtract' })<{
|
||||||
|
heightToSubtract: number;
|
||||||
|
}>(({ theme, heightToSubtract }) => ({
|
||||||
// 64px header
|
// 64px header
|
||||||
height: 'calc(100vh - 64px)',
|
height: `calc(100vh - 64px - ${heightToSubtract}px)`,
|
||||||
[theme.breakpoints.down('sm')]: {
|
[theme.breakpoints.down('sm')]: {
|
||||||
// 64px header (margin); 64px menu (margin);
|
// 64px header (margin); 64px menu (margin);
|
||||||
height: 'calc(100vh - 64px - 64px)',
|
height: `calc(100vh - 64px - 64px - ${heightToSubtract}px)`,
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@@ -118,6 +120,12 @@ export const Updates: React.FC = () => {
|
|||||||
const { data: downloaderData } = requestManager.useDownloadSubscription();
|
const { data: downloaderData } = requestManager.useDownloadSubscription();
|
||||||
const queue = (downloaderData?.downloadChanged.queue as DownloadType[]) ?? [];
|
const queue = (downloaderData?.downloadChanged.queue as DownloadType[]) ?? [];
|
||||||
|
|
||||||
|
const lastUpdateTimestampCompRef = useRef<HTMLElement>(null);
|
||||||
|
const [lastUpdateTimestampCompHeight, setLastUpdateTimestampCompHeight] = useState(0);
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
setLastUpdateTimestampCompHeight(lastUpdateTimestampCompRef.current?.clientHeight ?? 0);
|
||||||
|
}, [lastUpdateTimestampCompRef.current]);
|
||||||
|
|
||||||
const { data: lastUpdateTimestampData } = requestManager.useGetLastGlobalUpdateTimestamp({
|
const { data: lastUpdateTimestampData } = requestManager.useGetLastGlobalUpdateTimestamp({
|
||||||
/**
|
/**
|
||||||
* The {@link UpdateChecker} is responsible for updating the timestamp
|
* The {@link UpdateChecker} is responsible for updating the timestamp
|
||||||
@@ -129,16 +137,7 @@ export const Updates: React.FC = () => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setTitle(t('updates.title'));
|
setTitle(t('updates.title'));
|
||||||
|
|
||||||
setAction(
|
setAction(<UpdateChecker />);
|
||||||
<>
|
|
||||||
<Typography sx={{ marginRight: '10px' }}>
|
|
||||||
{t('library.settings.global_update.label.last_update', {
|
|
||||||
date: lastUpdateTimestamp ? new Date(+lastUpdateTimestamp).toLocaleString() : '-',
|
|
||||||
})}
|
|
||||||
</Typography>
|
|
||||||
<UpdateChecker />
|
|
||||||
</>,
|
|
||||||
);
|
|
||||||
}, [t, lastUpdateTimestamp]);
|
}, [t, lastUpdateTimestamp]);
|
||||||
|
|
||||||
const downloadForChapter = (chapter: TChapter) => {
|
const downloadForChapter = (chapter: TChapter) => {
|
||||||
@@ -166,7 +165,20 @@ export const Updates: React.FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
|
<Typography
|
||||||
|
ref={lastUpdateTimestampCompRef}
|
||||||
|
sx={{
|
||||||
|
marginLeft: '10px',
|
||||||
|
paddingTop: (theme) => ({ [theme.breakpoints.up('sm')]: { paddingTop: '6px' } }),
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{t('library.settings.global_update.label.last_update', {
|
||||||
|
date: lastUpdateTimestamp ? new Date(+lastUpdateTimestamp).toLocaleString() : '-',
|
||||||
|
})}
|
||||||
|
</Typography>
|
||||||
<StyledGroupedVirtuoso
|
<StyledGroupedVirtuoso
|
||||||
|
heightToSubtract={lastUpdateTimestampCompHeight}
|
||||||
style={{
|
style={{
|
||||||
// override Virtuoso default values and set them with class
|
// override Virtuoso default values and set them with class
|
||||||
height: 'undefined',
|
height: 'undefined',
|
||||||
@@ -246,5 +258,6 @@ export const Updates: React.FC = () => {
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user