Handle long extra messages in EmptyView

Suwayomi · Dec 20, 2024 · 1f7fe5f · 1f7fe5f
1 parent 083f98e
commit 1f7fe5f
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 22 deletions.
diff --git a/src/modules/browse/screens/Browse.tsx b/src/modules/browse/screens/Browse.tsx
@@ -60,7 +60,7 @@ export function Browse() {
                 <Tab value={Tabs.MIGRATE} sx={{ textTransform: 'none' }} label={t('migrate.title')} />
             </TabsMenu>
             <TabPanel index={Tabs.SOURCE} currentIndex={tabName}>
-                <Sources />
+                <Sources tabsMenuHeight={tabsMenuHeight} />
             </TabPanel>
             <TabPanel index={Tabs.EXTENSIONS} currentIndex={tabName}>
                 <Extensions tabsMenuHeight={tabsMenuHeight} />

diff --git a/src/modules/chapter/components/ChapterList.tsx b/src/modules/chapter/components/ChapterList.tsx
@@ -47,6 +47,7 @@ import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
 import { MediaQuery } from '@/modules/core/utils/MediaQuery.tsx';
 import { shouldForwardProp } from '@/modules/core/utils/ShouldForwardProp.ts';
 import { useChapterOptions } from '@/modules/chapter/hooks/useChapterOptions.tsx';
+import { getErrorMessage } from '@/lib/HelperFunctions.ts';
 
 type ChapterListHeaderProps = {
     scrollbarWidth: number;
@@ -175,7 +176,7 @@ export const ChapterList = ({
             <Stack sx={{ justifyContent: 'center', position: 'relative', flexGrow: 1 }}>
                 <EmptyViewAbsoluteCentered
                     message={t('global.error.label.failed_to_load_data')}
-                    messageExtra={error.message}
+                    messageExtra={getErrorMessage(error)}
                     retry={() => refetch().catch(defaultPromiseErrorHandler('ChapterList::refetch'))}
                 />
             </Stack>

diff --git a/src/modules/core/components/placeholder/EmptyView.tsx b/src/modules/core/components/placeholder/EmptyView.tsx
@@ -27,10 +27,11 @@ export interface EmptyViewProps {
     messageExtra?: JSX.Element | string;
     retry?: () => void;
     noFaces?: boolean;
+    topOffset?: number;
     sx?: SxProps<Theme>;
 }
 
-export function EmptyView({ message, messageExtra, retry, noFaces, sx }: EmptyViewProps) {
+export function EmptyView({ message, messageExtra, retry, noFaces, topOffset = 0, sx }: EmptyViewProps) {
     const { t } = useTranslation();
 
     const errorFace = useMemo(() => getRandomErrorFace(), []);
@@ -41,7 +42,9 @@ export function EmptyView({ message, messageExtra, retry, noFaces, sx }: EmptyVi
                 textAlign: 'center',
                 alignItems: 'center',
                 justifyContent: 'center',
-                height: '100%',
+                minWidth: '100%',
+                minHeight: `calc(100% - ${topOffset}px)`,
+                mt: `${topOffset}px`,
                 ...sx,
             }}
         >
@@ -51,7 +54,9 @@ export function EmptyView({ message, messageExtra, retry, noFaces, sx }: EmptyVi
                 </Typography>
             )}
             <Typography variant="h5">{message}</Typography>
-            {messageExtra}
+            <Typography variant="body1" sx={{ wordBreak: 'break-word' }}>
+                {messageExtra}
+            </Typography>
             {retry && <Button onClick={retry}>{t('global.button.retry')}</Button>}
         </Stack>
     );

diff --git a/src/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx b/src/modules/core/components/placeholder/EmptyViewAbsoluteCentered.tsx
@@ -14,10 +14,8 @@ export function EmptyViewAbsoluteCentered({ sx, ...emptyViewProps }: EmptyViewPr
             {...emptyViewProps}
             sx={{
                 position: 'absolute',
-                height: undefined,
-                top: '50%',
-                left: '50%',
-                transform: 'translate(-50%, -50%)',
+                top: 0,
+                left: 0,
                 ...sx,
             }}
         />

diff --git a/src/modules/extension/screens/Extensions.tsx b/src/modules/extension/screens/Extensions.tsx
@@ -207,6 +207,7 @@ export function Extensions({ tabsMenuHeight }: { tabsMenuHeight: number }) {
                         fetchExtensions().catch(defaultPromiseErrorHandler('Extensions::refetchExtensions'));
                     }
                 }}
+                topOffset={tabsMenuHeight}
             />
         );
     }

diff --git a/src/modules/manga/components/MangaGrid.tsx b/src/modules/manga/components/MangaGrid.tsx
@@ -238,6 +238,7 @@ export const MangaGrid: React.FC<IMangaGridProps> = ({
     isLoading,
     message,
     messageExtra,
+    topOffset,
     hasNextPage,
     loadMore,
     gridLayout,
@@ -348,6 +349,7 @@ export const MangaGrid: React.FC<IMangaGridProps> = ({
                 message={message ?? t('manga.error.label.no_mangas_found')}
                 messageExtra={messageExtra}
                 retry={retry}
+                topOffset={topOffset}
             />
         );
     }

diff --git a/src/modules/migration/screens/Migration.tsx b/src/modules/migration/screens/Migration.tsx
@@ -104,6 +104,7 @@ export const Migration = ({ tabsMenuHeight }: { tabsMenuHeight: number }) => {
                 message={t('global.error.label.failed_to_load_data')}
                 messageExtra={error.message}
                 retry={() => refetch().catch(defaultPromiseErrorHandler('Migration::refetch'))}
+                topOffset={tabsMenuHeight}
             />
         );
     }

diff --git a/src/modules/source/screens/SourceMangas.tsx b/src/modules/source/screens/SourceMangas.tsx
@@ -53,6 +53,7 @@ import { MangaIdInfo } from '@/modules/manga/Manga.types.ts';
 import { GridLayout } from '@/modules/core/Core.types.ts';
 import { AppRoutes } from '@/modules/core/AppRoute.constants.ts';
 import { getErrorMessage } from '@/lib/HelperFunctions.ts';
+import { useResizeObserver } from '@/modules/core/hooks/useResizeObserver.tsx';
 
 const DEFAULT_SOURCE: Pick<SourceType, 'id'> = { id: '-1' };
 
@@ -249,6 +250,16 @@ export function SourceMangas() {
     const currentQuery = useRef(query);
     const currentAbortRequest = useRef<(reason: any) => void>(() => {});
 
+    const contentTypeMenuRef = useRef<HTMLDivElement>(null);
+    const [contentTypeMenuHeight, setContentTypeMenuHeight] = useState(0);
+    useResizeObserver(
+        contentTypeMenuRef,
+        useCallback(
+            () => setContentTypeMenuHeight(contentTypeMenuRef.current?.clientHeight ?? 0),
+            [contentTypeMenuRef],
+        ),
+    );
+
     const didSearchChange = currentQuery.current !== query;
     if (didSearchChange && contentType === SourceContentType.SEARCH) {
         currentQuery.current = query;
@@ -428,9 +439,11 @@ export function SourceMangas() {
         };
     }, [t, source]);
 
+    const EmptyViewComponent = mangas.length ? EmptyView : EmptyViewAbsoluteCentered;
+
     return (
         <StyledGridWrapper>
-            <ContentTypeMenu sx={{ top: `${appBarHeight}px` }}>
+            <ContentTypeMenu ref={contentTypeMenuRef} sx={{ top: `${appBarHeight}px` }}>
                 <ContentTypeButton
                     variant={contentType === SourceContentType.POPULAR ? 'contained' : 'outlined'}
                     startIcon={<FavoriteIcon />}
@@ -466,25 +479,20 @@ export function SourceMangas() {
                     loadMore={loadMore}
                     message={message}
                     messageExtra={messageExtra}
+                    topOffset={contentTypeMenuHeight}
                     isLoading={isLoading}
                     gridLayout={sourceGridLayout}
                     mode="source"
                     inLibraryIndicator
                 />
             )}
 
-            {error && !mangas.length && (
-                <EmptyViewAbsoluteCentered
-                    message={t('global.error.label.failed_to_load_data')}
-                    messageExtra={error.message}
-                    retry={() => loadPage(lastPageNum).catch(defaultPromiseErrorHandler('SourceMangas::refetch'))}
-                />
-            )}
-            {error && !!mangas.length && (
-                <EmptyView
+            {error && (
+                <EmptyViewComponent
                     message={t('global.error.label.failed_to_load_data')}
-                    messageExtra={error.message}
+                    messageExtra={getErrorMessage(error)}
                     retry={() => loadPage(lastPageNum).catch(defaultPromiseErrorHandler('SourceMangas::refetch'))}
+                    topOffset={contentTypeMenuHeight}
                 />
             )}
 

diff --git a/src/modules/source/screens/Sources.tsx b/src/modules/source/screens/Sources.tsx
@@ -62,7 +62,7 @@ function groupByLang<Source extends Pick<SourceType, 'id' | 'name' | 'lang'>>(
     return result;
 }
 
-export function Sources() {
+export function Sources({ tabsMenuHeight }: { tabsMenuHeight: number }) {
     const { t } = useTranslation();
     const { setAction } = useContext(NavBarContext);
 
@@ -138,12 +138,15 @@ export function Sources() {
                 message={t('global.error.label.failed_to_load_data')}
                 messageExtra={error.message}
                 retry={() => refetch().catch(defaultPromiseErrorHandler('Sources::refetch'))}
+                topOffset={tabsMenuHeight}
             />
         );
     }
 
     if (sources?.length === 0) {
-        return <EmptyViewAbsoluteCentered message={t('source.error.label.no_sources_found')} />;
+        return (
+            <EmptyViewAbsoluteCentered message={t('source.error.label.no_sources_found')} topOffset={tabsMenuHeight} />
+        );
     }
 
     return (
-Original file line number
+Diff line change
@@ Expand Up @@
                             fetchExtensions().catch(defaultPromiseErrorHandler('Extensions::refetchExtensions'));
                         }
                     }}
+                    topOffset={tabsMenuHeight}
                 />
             );
         }
@@ Expand Down @@