@teselagen/ove 0.8.20 → 0.8.22

package/src/selectors/searchLayersSelector.js

@@ -15,10 +15,12 @@ function searchLayersSelector(
   dnaOrAA,
   isProtein,
   proteinSequence,
-  mismatchesAllowed
+  mismatchesAllowed,
+  tempSearchLayers = []
 ) {
+  const toReturn = [...tempSearchLayers]
   if (!searchString || !isOpen) {
-    return [];
+    return toReturn;
   }
   if (isProtein) {
     const searchingDna = dnaOrAA === "DNA";
@@ -35,7 +37,7 @@ function searchLayersSelector(
     ).sort(({ start }, { start: start2 }) => {
       return start - start2;
     });
-    return searchingDna
+    const r = searchingDna
       ? matches
       : matches.map(({ start, end, ...rest }) => ({
           ...rest,
@@ -43,6 +45,10 @@ function searchLayersSelector(
           start: start * 3,
           end: end * 3 + 2
         }));
+    return [
+      ...toReturn,
+      ...r
+    ];
   }
 
   // Use findApproxMatches when literal matching DNA with mismatches allowed
@@ -69,11 +75,10 @@ function searchLayersSelector(
         forward: true
       }))
       .sort((a, b) => a.start - b.start);
-
-    return matches.map(match => ({
+    return [...toReturn, ...matches.map(match => ({
       ...match,
       className: "veSearchLayer"
-    }));
+    }))];
   }
 
   // Use regular findSequenceMatches for all other cases
@@ -85,14 +90,14 @@ function searchLayersSelector(
   }).sort(({ start }, { start: start2 }) => {
     return start - start2;
   });
-  return matches.map(match => ({
+  return [...toReturn, ...matches.map(match => ({
     ...match,
     forward: !match.bottomStrand,
     className:
       "veSearchLayer " +
       (match.bottomStrand ? " veSearchLayerBottomStrand" : ""),
     isSearchLayer: true
-  }));
+  }))];
 }
 
 export default createSelector(
@@ -105,5 +110,6 @@ export default createSelector(
   state => state.sequenceData.isProtein,
   state => state.sequenceData.proteinSequence,
   state => state.findTool && state.findTool.mismatchesAllowed,
+  state => state.temporaryAnnotations.searchLayers,
   searchLayersSelector
 );

package/src/selectors/temporaryAnnotationsSelector.js

@@ -0,0 +1 @@
+export default editor => editor.temporaryAnnotations;

package/src/updateEditor.js

@@ -14,7 +14,8 @@ export default function updateEditor(
     annotationVisibility,
     annotationsToSupport,
     findTool,
-    justPassingPartialSeqData
+    justPassingPartialSeqData,
+    temporaryAnnotations
   } = initialValues;
   const currentEditor = store.getState().VectorEditor[editorName] || {};
   const isAlreadyProteinEditor =
@@ -174,6 +175,9 @@ export default function updateEditor(
           //if we have sequence data coming in make sure to tidy it up for the user :)
           annotationsAsObjects: true
         })
+      }),
+      ...(temporaryAnnotations && {
+        temporaryAnnotations
       })
     };
   }