From 9358a0683978a4cfd3265b61fa8f61b60cf3035d Mon Sep 17 00:00:00 2001
From: Huang Xin <chrox.huang@gmail.com>
Date: Sun, 21 Dec 2025 15:52:57 +0800
Subject: [PATCH] compat(layout): grid layout with fit covers on older
 browsers, closes #2745 (#2756)

---
 .../src/app/library/components/BookItem.tsx     | 10 ++++++++--
 .../src/app/library/components/GroupItem.tsx    |  4 ++--
 .../app/library/components/GroupingModal.tsx    |  1 +
 apps/readest-app/src/components/BookCover.tsx   | 17 +++++++++--------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/apps/readest-app/src/app/library/components/BookItem.tsx b/apps/readest-app/src/app/library/components/BookItem.tsx
index 7f65893e..cfb355ca 100644
--- a/apps/readest-app/src/app/library/components/BookItem.tsx
+++ b/apps/readest-app/src/app/library/components/BookItem.tsx
@@ -61,13 +61,19 @@ const BookItem: React.FC<BookItemProps> = ({
     >
       <div
         className={clsx(
-          'relative flex aspect-[28/41] justify-center',
+          'relative flex aspect-[28/41] justify-center rounded',
           coverFit === 'crop' && 'overflow-hidden shadow-md',
           mode === 'grid' && 'items-end',
           mode === 'list' && 'min-w-20 items-center',
         )}
       >
-        <BookCover mode={mode} book={book} coverFit={coverFit} showSpine={false} />
+        <BookCover
+          mode={mode}
+          book={book}
+          coverFit={coverFit}
+          showSpine={false}
+          imageClassName='rounded shadow-md'
+        />
         {bookSelected && (
           <div className='absolute inset-0 bg-black opacity-30 transition-opacity duration-300'></div>
         )}
diff --git a/apps/readest-app/src/app/library/components/GroupItem.tsx b/apps/readest-app/src/app/library/components/GroupItem.tsx
index 6644dba5..b8f0c085 100644
--- a/apps/readest-app/src/app/library/components/GroupItem.tsx
+++ b/apps/readest-app/src/app/library/components/GroupItem.tsx
@@ -99,7 +99,7 @@ const GroupItem: React.FC<GroupItemProps> = ({ mode, group, isSelectMode, groupS
     <div className={clsx('group-item', appService?.hasContextMenu ? 'cursor-pointer' : '')}>
       <div
         className={clsx(
-          'relative flex overflow-hidden',
+          'relative flex overflow-hidden rounded',
           mode === 'grid' && 'bg-base-100 aspect-[28/41] items-center justify-center shadow-md',
           mode === 'list' && 'items-center justify-start gap-4 py-2',
         )}
@@ -139,7 +139,7 @@ const GroupItem: React.FC<GroupItemProps> = ({ mode, group, isSelectMode, groupS
                   mode === 'list' && 'flex-shrink-0',
                 )}
               >
-                <BookCover book={book} isPreview />
+                <BookCover book={book} isPreview imageClassName='rounded-[2px]' />
               </div>
             ))}
           </div>
diff --git a/apps/readest-app/src/app/library/components/GroupingModal.tsx b/apps/readest-app/src/app/library/components/GroupingModal.tsx
index 5e009951..b5dc4e06 100644
--- a/apps/readest-app/src/app/library/components/GroupingModal.tsx
+++ b/apps/readest-app/src/app/library/components/GroupingModal.tsx
@@ -102,6 +102,7 @@ const GroupingModal: React.FC<GroupingModalProps> = ({
     setShowInput(true);
     setIsRenaming(false);
     setOriginalGroupName(null);
+    setSelectedGroup(null);
   };
 
   const handleRenameGroup = () => {
diff --git a/apps/readest-app/src/components/BookCover.tsx b/apps/readest-app/src/components/BookCover.tsx
index e3628ce1..774d65b3 100644
--- a/apps/readest-app/src/components/BookCover.tsx
+++ b/apps/readest-app/src/components/BookCover.tsx
@@ -83,13 +83,13 @@ const BookCover: React.FC<BookCoverProps> = memo<BookCoverProps>(
             />
           </>
         ) : (
-          <div
-            className={clsx(
-              'flex h-full w-full justify-center',
-              mode === 'grid' ? 'items-end' : 'items-center',
-            )}
-          >
-            <div className='relative inline-block'>
+          <div className={clsx('flex h-full w-full justify-start')}>
+            <div
+              className={clsx(
+                'flex h-full max-h-full items-end',
+                mode === 'grid' ? 'items-end' : 'items-center',
+              )}
+            >
               <Image
                 src={book.metadata?.coverImageUrl || book.coverImageUrl!}
                 alt={book.title}
@@ -112,9 +112,10 @@ const BookCover: React.FC<BookCoverProps> = memo<BookCoverProps>(
 
         <div
           className={clsx(
-            'fallback-cover invisible absolute inset-0 rounded-none p-2',
+            'fallback-cover invisible absolute inset-0 p-2',
             'text-neutral-content text-center font-serif font-medium',
             isPreview ? 'bg-base-200/50' : 'bg-base-100',
+            imageClassName,
           )}
         >
           <div className='flex h-1/2 items-center justify-center'>