From be142f868d8eb9576e9c9d59c1ff2724faba8289 Mon Sep 17 00:00:00 2001
From: Daniel Lautzenheiser <lautzd@gmail.com>
Date: Fri, 26 Apr 2024 10:51:40 -0400
Subject: [PATCH] fix: card height with date field

---
 .../collections/entries/EntryListingCardGrid.tsx  | 15 +++++++++++----
 packages/core/src/constants/views.ts              |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/components/collections/entries/EntryListingCardGrid.tsx b/packages/core/src/components/collections/entries/EntryListingCardGrid.tsx
index 4b1812d54..0d39e8549 100644
--- a/packages/core/src/components/collections/entries/EntryListingCardGrid.tsx
+++ b/packages/core/src/components/collections/entries/EntryListingCardGrid.tsx
@@ -3,6 +3,7 @@ import AutoSizer from 'react-virtualized-auto-sizer';
 import { VariableSizeGrid as Grid } from 'react-window';
 
 import {
+  COLLECTION_CARD_DATE_HEIGHT,
   COLLECTION_CARD_HEIGHT,
   COLLECTION_CARD_HEIGHT_WITHOUT_IMAGE,
   COLLECTION_CARD_MARGIN,
@@ -64,7 +65,7 @@ const CardWrapper: FC<GridChildComponentProps<CardGridItemData>> = ({
   }
   const data = entryData[index];
   const cardHeight =
-    index < cardHeights.length ? cardHeights[index] + COLLECTION_CARD_MARGIN : style.height;
+    index < cardHeights.length ? cardHeights[index] + COLLECTION_CARD_MARGIN * 2 : style.height;
 
   return (
     <div
@@ -114,9 +115,15 @@ const EntryListingCardGrid: FC<EntryListingCardGridProps> = ({
   }, []);
 
   const getDefaultHeight = useCallback((data?: CollectionEntryData) => {
-    return isNotNullish(data?.imageFieldName)
+    const base = isNotNullish(data?.imageFieldName)
       ? COLLECTION_CARD_HEIGHT
       : COLLECTION_CARD_HEIGHT_WITHOUT_IMAGE;
+
+    if (isNotNullish(data?.dateFieldName)) {
+      return base + COLLECTION_CARD_DATE_HEIGHT;
+    }
+
+    return base;
   }, []);
 
   const [prevCardHeights, setPrevCardHeight] = useState<number[]>([]);
@@ -185,12 +192,12 @@ const EntryListingCardGrid: FC<EntryListingCardGridProps> = ({
                     }
 
                     if (cardHeights[i] > rowHeight && cardHeights[i]) {
-                      rowHeight = cardHeights[i] + COLLECTION_CARD_MARGIN;
+                      rowHeight = cardHeights[i] + COLLECTION_CARD_MARGIN * 2;
                     }
                   }
 
                   if (rowHeight === 0) {
-                    rowHeight = getDefaultHeight() + COLLECTION_CARD_MARGIN;
+                    rowHeight = getDefaultHeight() + COLLECTION_CARD_MARGIN * 2;
                   }
 
                   return rowHeight;
diff --git a/packages/core/src/constants/views.ts b/packages/core/src/constants/views.ts
index ed43bdb6e..75398a9eb 100644
--- a/packages/core/src/constants/views.ts
+++ b/packages/core/src/constants/views.ts
@@ -8,6 +8,7 @@ export const COLLECTION_CARD_WIDTH = 240;
 export const COLLECTION_CARD_HEIGHT = 204;
 export const COLLECTION_CARD_IMAGE_HEIGHT = 140;
 export const COLLECTION_CARD_HEIGHT_WITHOUT_IMAGE = 56;
+export const COLLECTION_CARD_DATE_HEIGHT = 24;
 export const COLLECTION_CARD_MARGIN = 10;
 
 export const EDITOR_SIZE_COMPACT = 'compact';