Merge pull request #84 from georgejkaye/fix-vanishing-things

[fix] Fix replace items function
georgejkaye · Jan 30, 2024 · f8de21d · f8de21d
2 parents b9b3c62 + 3fd7de7
commit f8de21d
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/client/src/app/structs.ts b/client/src/app/structs.ts
@@ -45,14 +45,12 @@ export const replaceItems = <T>(
     eqCheck: (t1: T, t2: T) => boolean
 ) =>
     oldItems
-        .map(
+        .filter(
             (oldItem) =>
-                itemsToAdd.find((newItem) => eqCheck(oldItem, newItem)) ||
-                oldItem
-        )
-        .filter((item) =>
-            itemsToRemove.find((removedItem) => eqCheck(item, removedItem))
+                !itemsToAdd.find((newItem) => eqCheck(oldItem, newItem)) &&
+                !itemsToRemove.find((remItem) => eqCheck(oldItem, remItem))
         )
+        .concat(itemsToAdd)
 
 export const getDateString = (datetime: Date) => {
     let weekday = datetime.toLocaleDateString("en-GB", {