fixed delete board error

Keith-Web3 · May 13, 2023 · 74e4a67 · 74e4a67
1 parent 4030028
commit 74e4a67
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/shared/NavBar.tsx b/src/components/shared/NavBar.tsx
@@ -67,7 +67,7 @@ const NavBar: React.FC<{
                   variants={boardVariants}
                   key={idx}
                   className={`navbar__board ${
-                    board.id === currentBoard.id ? 'active' : ''
+                    board.id === currentBoard?.id ? 'active' : ''
                   }`}
                   onClick={() => setCurrentBoard(board.id)}
                 >

diff --git a/src/components/store/store.tsx b/src/components/store/store.tsx
@@ -82,9 +82,13 @@ const useStore = create<State & Action>()(
           | 'normal',
       deleteBoard: function (boardId) {
         const newBoards = get().boards.filter(board => board.id !== boardId)
+        let adjacentBoardIdx = get().boards.findIndex(
+          board => board.id === boardId
+        )
+        adjacentBoardIdx = adjacentBoardIdx > 0 ? adjacentBoardIdx - 1 : 0
 
         set(() => ({ boards: newBoards }))
-        get().setCurrentBoard(0)
+        get().setCurrentBoard(get().boards[adjacentBoardIdx]?.id || 0)
         get().setModalType({ modalType: '', showModal: false })
       },
       deleteTask: function (boardId, taskId) {