- fixed some automatic merge problems

m2ms · Dec 10, 2020 · 2bb6a6f · 2bb6a6f
1 parent f1ee726
commit 2bb6a6f
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/js/components/preview/molecule/moleculeList.js b/js/components/preview/molecule/moleculeList.js
@@ -289,8 +289,20 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei
     }
   }, [getJoinedMoleculeList, getAllMoleculeList, searchString]);
 
-  // Used for MoleculeListSortFilterDialog when using textSearch
-  const joinedMoleculeListsCopy = useMemo(() => [...joinedMoleculeLists], [joinedMoleculeLists]);
+  const addSelectedMoleculesFromUnselectedSites = useCallback((joinedMoleculeLists, list) => {
+    const result = [...joinedMoleculeLists];
+    list?.forEach(moleculeID => {
+      const foundJoinedMolecule = result.find(mol => mol.id === moleculeID);
+      if (!foundJoinedMolecule) {
+        const molecule = getAllMoleculeList.find(mol => mol.id === moleculeID);
+        if (molecule) {
+          result.push(molecule);
+        }
+      }
+    });
+
+    return result;
+  }, [getAllMoleculeList]);
 
   joinedMoleculeLists = useMemo(
     () => addSelectedMoleculesFromUnselectedSites(joinedMoleculeLists, proteinList),