Merge branch 'master' into allfunctionality

m2ms · Jan 22, 2021 · 2d72fa1 · 2d72fa1
2 parents f31cdcb + 2bb6a6f
commit 2d72fa1
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
@@ -292,8 +292,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]);
 
   const addSelectedMoleculesFromUnselectedSites = useCallback((joinedMoleculeLists, list) => {
     const result = [...joinedMoleculeLists];