Simplified unselectNodesAndEdges

packages/svelte/src/lib/store/index.ts

@@ -178,47 +178,23 @@ export function createStore({
     }
   }
 
-  function resetSelectedItem<T extends Node | Edge>(ids: string[]) {
+  function resetSelected(elements: Node[] | Edge[]) {
-    return (item: T) => {
+    let resetSomeElements = false;
-      if (item.selected && ids.includes(item.id)) {
+    elements.forEach((element) => {
-        return {
+      if (element.selected) {
-          ...item,
+        element.selected = false;
-          selected: false
+        resetSomeElements = true;
-        };
       }
-
+    });
-      return item;
+    return resetSomeElements;
-    };
   }
 
   function unselectNodesAndEdges(params?: { nodes?: Node[]; edges?: Edge[] }) {
-    const selectedNodeIds = (params?.nodes ? params.nodes : get(store.nodes))
+    const resetNodes = resetSelected(params?.nodes || get(store.nodes));
-      .filter((node) => node.selected)
+    if (resetNodes) store.nodes.set(get(store.nodes));
-      .map((node) => node.id);
-    const selectedEdgeIds = (params?.edges ? params.edges : get(store.edges))
-      .filter((edge) => edge.selected)
-      .map((edge) => edge.id);
 
-    if (selectedNodeIds.length) {
+    const resetEdges = resetSelected(params?.edges || get(store.edges));
-      const nodeLookup = get(store.nodeLookup);
+    if (resetEdges) store.edges.set(get(store.edges));
-      selectedNodeIds.forEach((id) => {
-        const node = nodeLookup.get(id);
-        if (node) {
-          node.selected = false;
-        }
-      });
-      store.nodes.set(get(store.nodes));
-    }
-
-    if (selectedEdgeIds.length) {
-      const edgeLookup = get(store.edgeLookup);
-      selectedEdgeIds.forEach((id) => {
-        const edge = edgeLookup.get(id);
-        if (edge) {
-          edge.selected = false;
-        }
-      });
-    }
   }
 
   store.deleteKeyPressed.subscribe(async (deleteKeyPressed) => {