From e2bf22f3aedbe5e75a30939caf52791a5812dab7 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 17 Mar 2023 15:08:13 +0800
Subject: [PATCH] Update current item when deleting items if current item is
 deleted

---
 .../components/templates/homeFeed/HighlightsLayout.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/web/components/templates/homeFeed/HighlightsLayout.tsx b/packages/web/components/templates/homeFeed/HighlightsLayout.tsx
index feee69d4b..637942125 100644
--- a/packages/web/components/templates/homeFeed/HighlightsLayout.tsx
+++ b/packages/web/components/templates/homeFeed/HighlightsLayout.tsx
@@ -55,9 +55,17 @@ export function HighlightItemsLayout(
             (h) => h.id !== action.highlightId
           )
         }
-        return state.filter(
+        const result = state.filter(
           (item) => item.node.highlights && item.node.highlights.length > 0
         )
+        if (
+          item &&
+          item == currentItem &&
+          (item.node.highlights?.length ?? 0) < 1
+        ) {
+          setCurrentItem(result.length > 0 ? result[0] : undefined)
+        }
+        return result
       default:
         throw new Error()
     }