@teselagen/ove 0.3.13 → 0.3.15

package/index.umd.js

@@ -57052,17 +57052,9 @@
   	return _domCreate;
   }
 
-  var _ie8DomDefine;
-  var hasRequired_ie8DomDefine;
-
-  function require_ie8DomDefine () {
-  	if (hasRequired_ie8DomDefine) return _ie8DomDefine;
-  	hasRequired_ie8DomDefine = 1;
-  	_ie8DomDefine = !require_descriptors() && !_fails(function () {
-  	  return Object.defineProperty(require_domCreate()('div'), 'a', { get: function () { return 7; } }).a != 7;
-  	});
-  	return _ie8DomDefine;
-  }
+  var _ie8DomDefine = !require_descriptors() && !_fails(function () {
+    return Object.defineProperty(require_domCreate()('div'), 'a', { get: function () { return 7; } }).a != 7;
+  });
 
   // 7.1.1 ToPrimitive(input [, PreferredType])
   var isObject$6 = _isObject;
@@ -57083,7 +57075,7 @@
   	if (hasRequired_objectDp) return _objectDp;
   	hasRequired_objectDp = 1;
   	var anObject = _anObject;
-  	var IE8_DOM_DEFINE = require_ie8DomDefine();
+  	var IE8_DOM_DEFINE = _ie8DomDefine;
   	var toPrimitive = _toPrimitive$1;
   	var dP = Object.defineProperty;
 
@@ -57110,10 +57102,10 @@
     };
   };
 
-  var dP$2 = require_objectDp();
+  var dP$1 = require_objectDp();
   var createDesc$3 = _propertyDesc;
   var _hide = require_descriptors() ? function (object, key, value) {
-    return dP$2.f(object, key, createDesc$3(1, value));
+    return dP$1.f(object, key, createDesc$3(1, value));
   } : function (object, key, value) {
     object[key] = value;
     return object;
@@ -57129,7 +57121,7 @@
   var ctx$1 = _ctx;
   var hide$2 = _hide;
   var has$d = _has;
-  var PROTOTYPE$2 = 'prototype';
+  var PROTOTYPE$1 = 'prototype';
 
   var $export$8 = function (type, name, source) {
     var IS_FORCED = type & $export$8.F;
@@ -57139,8 +57131,8 @@
     var IS_BIND = type & $export$8.B;
     var IS_WRAP = type & $export$8.W;
     var exports = IS_GLOBAL ? core$3 : core$3[name] || (core$3[name] = {});
-    var expProto = exports[PROTOTYPE$2];
-    var target = IS_GLOBAL ? global$4 : IS_STATIC ? global$4[name] : (global$4[name] || {})[PROTOTYPE$2];
+    var expProto = exports[PROTOTYPE$1];
+    var target = IS_GLOBAL ? global$4 : IS_STATIC ? global$4[name] : (global$4[name] || {})[PROTOTYPE$1];
     var key, own, out;
     if (IS_GLOBAL) source = name;
     for (key in source) {
@@ -57164,7 +57156,7 @@
             } return new C(a, b, c);
           } return C.apply(this, arguments);
         };
-        F[PROTOTYPE$2] = C[PROTOTYPE$2];
+        F[PROTOTYPE$1] = C[PROTOTYPE$1];
         return F;
       // make static versions for prototype methods
       })(out) : IS_PROTO && typeof out == 'function' ? ctx$1(Function.call, out) : out;
@@ -57301,14 +57293,14 @@
   var has$c = _has;
   var toIObject$4 = _toIobject;
   var arrayIndexOf = _arrayIncludes$1(false);
-  var IE_PROTO$2 = _sharedKey('IE_PROTO');
+  var IE_PROTO$1 = _sharedKey('IE_PROTO');
 
   var _objectKeysInternal = function (object, names) {
     var O = toIObject$4(object);
     var i = 0;
     var result = [];
     var key;
-    for (key in O) if (key != IE_PROTO$2) has$c(O, key) && result.push(key);
+    for (key in O) if (key != IE_PROTO$1) has$c(O, key) && result.push(key);
     // Don't enum bug & hidden keys
     while (names.length > i) if (has$c(O, key = names[i++])) {
       ~arrayIndexOf(result, key) || result.push(key);
@@ -57323,10 +57315,10 @@
 
   // 19.1.2.14 / 15.2.3.14 Object.keys(O)
   var $keys$3 = _objectKeysInternal;
-  var enumBugKeys$1 = _enumBugKeys;
+  var enumBugKeys = _enumBugKeys;
 
   var _objectKeys = Object.keys || function keys(O) {
-    return $keys$3(O, enumBugKeys$1);
+    return $keys$3(O, enumBugKeys);
   };
 
   var _objectGops = {};
@@ -57433,19 +57425,27 @@
 
   var _redefine = _hide;
 
-  var dP$1 = require_objectDp();
-  var anObject$4 = _anObject;
-  var getKeys$1 = _objectKeys;
+  var _objectDps;
+  var hasRequired_objectDps;
 
-  var _objectDps = require_descriptors() ? Object.defineProperties : function defineProperties(O, Properties) {
-    anObject$4(O);
-    var keys = getKeys$1(Properties);
-    var length = keys.length;
-    var i = 0;
-    var P;
-    while (length > i) dP$1.f(O, P = keys[i++], Properties[P]);
-    return O;
-  };
+  function require_objectDps () {
+  	if (hasRequired_objectDps) return _objectDps;
+  	hasRequired_objectDps = 1;
+  	var dP = require_objectDp();
+  	var anObject = _anObject;
+  	var getKeys = _objectKeys;
+
+  	_objectDps = require_descriptors() ? Object.defineProperties : function defineProperties(O, Properties) {
+  	  anObject(O);
+  	  var keys = getKeys(Properties);
+  	  var length = keys.length;
+  	  var i = 0;
+  	  var P;
+  	  while (length > i) dP.f(O, P = keys[i++], Properties[P]);
+  	  return O;
+  	};
+  	return _objectDps;
+  }
 
   var _html;
   var hasRequired_html;
@@ -57458,47 +57458,55 @@
   	return _html;
   }
 
-  // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-  var anObject$3 = _anObject;
-  var dPs = _objectDps;
-  var enumBugKeys = _enumBugKeys;
-  var IE_PROTO$1 = _sharedKey('IE_PROTO');
-  var Empty = function () { /* empty */ };
-  var PROTOTYPE$1 = 'prototype';
+  var _objectCreate;
+  var hasRequired_objectCreate;
 
-  // Create object with fake `null` prototype: use iframe Object with cleared prototype
-  var createDict = function () {
-    // Thrash, waste and sodomy: IE GC bug
-    var iframe = require_domCreate()('iframe');
-    var i = enumBugKeys.length;
-    var lt = '<';
-    var gt = '>';
-    var iframeDocument;
-    iframe.style.display = 'none';
-    require_html().appendChild(iframe);
-    iframe.src = 'javascript:'; // eslint-disable-line no-script-url
-    // createDict = iframe.contentWindow.Object;
-    // html.removeChild(iframe);
-    iframeDocument = iframe.contentWindow.document;
-    iframeDocument.open();
-    iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
-    iframeDocument.close();
-    createDict = iframeDocument.F;
-    while (i--) delete createDict[PROTOTYPE$1][enumBugKeys[i]];
-    return createDict();
-  };
-
-  var _objectCreate = Object.create || function create(O, Properties) {
-    var result;
-    if (O !== null) {
-      Empty[PROTOTYPE$1] = anObject$3(O);
-      result = new Empty();
-      Empty[PROTOTYPE$1] = null;
-      // add "__proto__" for Object.getPrototypeOf polyfill
-      result[IE_PROTO$1] = O;
-    } else result = createDict();
-    return Properties === undefined ? result : dPs(result, Properties);
-  };
+  function require_objectCreate () {
+  	if (hasRequired_objectCreate) return _objectCreate;
+  	hasRequired_objectCreate = 1;
+  	// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+  	var anObject = _anObject;
+  	var dPs = require_objectDps();
+  	var enumBugKeys = _enumBugKeys;
+  	var IE_PROTO = _sharedKey('IE_PROTO');
+  	var Empty = function () { /* empty */ };
+  	var PROTOTYPE = 'prototype';
+
+  	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+  	var createDict = function () {
+  	  // Thrash, waste and sodomy: IE GC bug
+  	  var iframe = require_domCreate()('iframe');
+  	  var i = enumBugKeys.length;
+  	  var lt = '<';
+  	  var gt = '>';
+  	  var iframeDocument;
+  	  iframe.style.display = 'none';
+  	  require_html().appendChild(iframe);
+  	  iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+  	  // createDict = iframe.contentWindow.Object;
+  	  // html.removeChild(iframe);
+  	  iframeDocument = iframe.contentWindow.document;
+  	  iframeDocument.open();
+  	  iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
+  	  iframeDocument.close();
+  	  createDict = iframeDocument.F;
+  	  while (i--) delete createDict[PROTOTYPE][enumBugKeys[i]];
+  	  return createDict();
+  	};
+
+  	_objectCreate = Object.create || function create(O, Properties) {
+  	  var result;
+  	  if (O !== null) {
+  	    Empty[PROTOTYPE] = anObject(O);
+  	    result = new Empty();
+  	    Empty[PROTOTYPE] = null;
+  	    // add "__proto__" for Object.getPrototypeOf polyfill
+  	    result[IE_PROTO] = O;
+  	  } else result = createDict();
+  	  return Properties === undefined ? result : dPs(result, Properties);
+  	};
+  	return _objectCreate;
+  }
 
   var _wks = {exports: {}};
 
@@ -57524,7 +57532,7 @@
     if (it && !has$b(it = stat ? it : it.prototype, TAG$1)) def(it, TAG$1, { configurable: true, value: tag });
   };
 
-  var create$4 = _objectCreate;
+  var create$4 = require_objectCreate();
   var descriptor = _propertyDesc;
   var setToStringTag$2 = _setToStringTag;
   var IteratorPrototype = {};
@@ -58133,7 +58141,7 @@
   var toIObject$1 = _toIobject;
   var toPrimitive$1 = _toPrimitive$1;
   var has$8 = _has;
-  var IE8_DOM_DEFINE = require_ie8DomDefine();
+  var IE8_DOM_DEFINE = _ie8DomDefine;
   var gOPD$2 = Object.getOwnPropertyDescriptor;
 
   _objectGopd.f = require_descriptors() ? gOPD$2 : function getOwnPropertyDescriptor(O, P) {
@@ -58167,7 +58175,7 @@
   var toIObject = _toIobject;
   var toPrimitive = _toPrimitive$1;
   var createDesc = _propertyDesc;
-  var _create$1 = _objectCreate;
+  var _create$1 = require_objectCreate();
   var gOPNExt = _objectGopnExt;
   var $GOPD = _objectGopd;
   var $GOPS = _objectGops;
@@ -58477,7 +58485,7 @@
 
   var $export = _export;
   // 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
-  $export($export.S, 'Object', { create: _objectCreate });
+  $export($export.S, 'Object', { create: require_objectCreate() });
 
   var $Object = _coreExports.Object;
   var create$3 = function create(P, D) {
@@ -90746,11 +90754,11 @@
   function getSort(text, queryString) {
     let ret;
     if (text === queryString)
-      ret = 0;
+      ret = -1;
     else if (text.includes(queryString))
-      ret = 0.9;
+      ret = text.indexOf(queryString);
     else
-      ret = 1;
+      ret = text.length;
     return ret;
   }
 
@@ -135008,8 +135016,8 @@
       maxRangeLength
     );
     let overlaps = [];
-    normalizedRangeA.forEach(function(nonCircularRangeA, iA) {
-      normalizedRangeB.forEach(function(nonCircularRangeB, iB) {
+    normalizedRangeA.forEach(function(nonCircularRangeA) {
+      normalizedRangeB.forEach(function(nonCircularRangeB) {
         const overlap = getOverlapOfNonCircularRanges(
           nonCircularRangeA,
           nonCircularRangeB
@@ -135021,7 +135029,7 @@
     });
     if (joinIfPossible && normalizedRangeA.length === 2 && normalizedRangeB.length === 2 && maxRangeLength) {
       const joinedOverlap = {};
-      overlaps = lodashExports.flatMap(overlaps, (o, i) => {
+      overlaps = lodashExports.flatMap(overlaps, (o) => {
         if (o.start === 0) {
           joinedOverlap.end = o.end;
           return [];
@@ -135511,7 +135519,7 @@
     });
   }
 
-  function flipRelativeRange(innerRange, outerRange, sequenceLength, options) {
+  function flipRelativeRange(innerRange, outerRange, sequenceLength) {
     const isFullyContained = isRangeWithinRange(
       innerRange,
       outerRange,
@@ -135523,7 +135531,7 @@
       return flipNonFullyContainedRange(innerRange, outerRange, sequenceLength);
     }
   }
-  function flipNonFullyContainedRange(innerRange, outerRange, sequenceLength, options) {
+  function flipNonFullyContainedRange(innerRange, outerRange, sequenceLength) {
     const outerFullyContained = isRangeWithinRange(
       outerRange,
       innerRange,
@@ -135564,9 +135572,8 @@
         sequenceLength
       );
       if (overlaps.length >= 1) {
-        let overlapExtendsForward;
         const firstOverlap = overlaps[0];
-        overlapExtendsForward = firstOverlap.start !== outerRange.start;
+        const overlapExtendsForward = firstOverlap.start !== outerRange.start;
         const flippedTruncatedInner = flipFullyContainedRange(
           firstOverlap,
           outerRange,
@@ -135587,7 +135594,7 @@
     }
     return flippedInnerRange;
   }
-  function flipFullyContainedRange(innerRange, outerRange, sequenceLength, options) {
+  function flipFullyContainedRange(innerRange, outerRange, sequenceLength) {
     const translateBy = -outerRange.start;
     const translatedOuterRange = translateRange(
       outerRange,
@@ -135715,6 +135722,7 @@
         rangesAlreadyAddedToYOffset.push(range);
         return true;
       }
+      return false;
     });
     if (!openYOffsetFound) {
       yOffset = YOffsetLevelsWithRanges.length;
@@ -152418,7 +152426,6 @@
     }
     function parseLocus(line) {
       result = createInitialSequence(options);
-      let locusName;
       let circular;
       let gbDivision;
       let date;
@@ -152429,7 +152436,7 @@
         );
         addMessage("Import Warning: Locus line contains no values: " + line);
       }
-      locusName = lineArr[1];
+      const locusName = lineArr[1];
       for (let i = 1; i < lineArr.length; i++) {
         if (lineArr[i].match(/circular/gi)) {
           circular = true;
@@ -152576,10 +152583,10 @@
       }
     }
     function parseFeatureNote(line) {
-      let newLine, lineArr;
+      let newLine;
       newLine = line.trimLeft();
       newLine = newLine.replace(/^\/|"$/g, "");
-      lineArr = newLine.split(/="|=/);
+      const lineArr = newLine.split(/="|=/);
       let val = lineArr.slice(1).join("=");
       if (val) {
         val = val.replace(/\\/g, " ");
@@ -166047,7 +166054,6 @@
     if (serSeq.sequence.symbols) {
       serSeq.sequence = serSeq.sequence.symbols.split("");
     }
-    let tmp;
     let dnaType;
     if (serSeq.isProtein) {
       dnaType = "";
@@ -166064,7 +166070,7 @@
     line += " ";
     line += StringUtil.lpad(String(serSeq.sequence.length), " ", 11);
     line += serSeq.isProtein ? " aa " : " bp ";
-    tmp = "";
+    const tmp = "";
     line += StringUtil.lpad(tmp, " ", 3);
     line += StringUtil.rpad(dnaType, " ", 6);
     line += "  ";
@@ -170564,6 +170570,7 @@
     if (!editorState) {
       return editorReducer({}, {});
     }
+    const sequenceLength = selectors.sequenceLengthSelector(editorState);
     const { findTool, annotationsToSupport = {} } = editorState;
     const visibilities = getVisibilities(editorState);
     let annotationToAdd;
@@ -170574,7 +170581,13 @@
     ].forEach(([n, type, annotationTypePlural]) => {
       const vals = getFormValues(n)(state);
       if (vals) {
-        annotationToAdd = getAnnToAdd(vals, n, type, annotationTypePlural);
+        annotationToAdd = getAnnToAdd(
+          vals,
+          n,
+          type,
+          annotationTypePlural,
+          sequenceLength
+        );
       }
     });
     const toReturn = {
@@ -170598,7 +170611,6 @@
       editorState,
       ownProps.additionalEnzymes
     );
-    const sequenceLength = selectors.sequenceLengthSelector(editorState);
     const { matchedSearchLayer, searchLayers, matchesTotal } = getSearchLayersAndMatch(editorState);
     const annotationSearchMatches = selectors.annotationSearchSelector(editorState);
     const _sequenceDataToUse = getSequenceDataToUse(
@@ -170874,21 +170886,26 @@
       };
     }
   );
-  const getAnnToAdd = defaultMemoize((vals, n, type, annotationTypePlural) => {
-    const annToAdd = {
-      color: getFeatureToColorMap({ includeHidden: true })[vals.type || "primer_bind"],
-      //we won't have the correct color yet so we set it here
-      ...vals,
-      formName: n,
-      type,
-      annotationTypePlural,
-      name: vals.name || "Untitled"
-    };
-    if (!vals.useLinkedOligo) {
-      delete annToAdd.bases;
+  const getAnnToAdd = defaultMemoize(
+    (vals, n, type, annotationTypePlural, sequenceLength) => {
+      const annToAdd = normalizeRange(
+        {
+          color: getFeatureToColorMap({ includeHidden: true })[vals.type || "primer_bind"],
+          //we won't have the correct color yet so we set it here
+          ...vals,
+          formName: n,
+          type,
+          annotationTypePlural,
+          name: vals.name || "Untitled"
+        },
+        sequenceLength
+      );
+      if (!vals.useLinkedOligo) {
+        delete annToAdd.bases;
+      }
+      return annToAdd;
     }
-    return annToAdd;
-  });
+  );
   const getSeqDataWithAnnToAdd = defaultMemoize(
     (seqData, ann, allowMultipleFeatureDirections) => {
       if (ann) {
@@ -188761,7 +188778,7 @@ double click --> edit`}`;
   }
 
   const name = "@teselagen/ove";
-  const version = "0.3.12";
+  const version = "0.3.14";
   const main = "./src/index.js";
   const exports$1 = {
   	".": {
@@ -202384,30 +202401,30 @@ double click --> edit`}`;
     formatStart = (val) => {
       const { isProtein } = this.props.sequenceData || {};
       if (isProtein) {
-        return (val + 2) / 3;
+        return lodashExports.round((val + 2) / 3);
       }
-      return val;
+      return lodashExports.round(val);
     };
     formatEnd = (val) => {
       const { isProtein } = this.props.sequenceData || {};
       if (isProtein) {
-        return val / 3;
+        return lodashExports.round(val / 3);
       }
-      return val;
+      return lodashExports.round(val);
     };
     parseStart = (val) => {
       const { isProtein } = this.props.sequenceData || {};
       if (isProtein) {
-        return val * 3 - 2;
+        return lodashExports.round(val * 3 - 2);
       }
-      return val;
+      return lodashExports.round(val);
     };
     parseEnd = (val) => {
       const { isProtein } = this.props.sequenceData || {};
       if (isProtein) {
-        return val * 3;
+        return lodashExports.round(val * 3);
       }
-      return val;
+      return lodashExports.round(val);
     };
     renderLocations = (props) => {
       const { fields } = props;
@@ -208752,7 +208769,7 @@ ${seqDataToCopy}\r
         {
           className: "veReadOnlySelect",
           disabled: !onSave || disableSetReadOnly,
-          onChange: (val) => console.log(`val:`, val) || handleReadOnlyChange(val === "readOnly", this.props),
+          onChange: (val) => handleReadOnlyChange(val === "readOnly", this.props),
           value: readOnly ? "readOnly" : "editable",
           options: [
             { label: "Read Only", value: "readOnly" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teselagen/ove",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "main": "./src/index.js",
   "exports": {
     ".": {
@@ -15,7 +15,7 @@
   "dependencies": {
     "@teselagen/sequence-utils": "0.3.7",
     "@teselagen/range-utils": "0.3.7",
-    "@teselagen/ui": "0.3.12",
+    "@teselagen/ui": "0.3.13",
     "@teselagen/file-utils": "0.3.9",
     "@teselagen/bounce-loader": "0.3.7",
     "@teselagen/bio-parsers": "0.3.8",

package/src/ToolBar/editTool.js

@@ -2,7 +2,6 @@ import React, { useState } from "react";
 import { Icon } from "@blueprintjs/core";
 import ToolbarItem from "./ToolbarItem";
 import { connectToEditor } from "../withEditorProps";
-import { func } from "prop-types";
 
 export default connectToEditor(editorState => {
   return {

package/src/helperComponents/AddOrEditAnnotationDialog/index.js

@@ -39,7 +39,7 @@ import { store, view } from "@risingstack/react-easy-state";
 
 import withEditorProps from "../../withEditorProps";
 import { withProps } from "recompose";
-import { map, flatMap } from "lodash";
+import { map, flatMap, round } from "lodash";
 import "./style.css";
 
 class AddOrEditAnnotationDialog extends React.Component {
@@ -58,30 +58,30 @@ class AddOrEditAnnotationDialog extends React.Component {
   formatStart = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return (val + 2) / 3;
+      return round((val + 2) / 3);
     }
-    return val;
+    return round(val);
   };
   formatEnd = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return val / 3;
+      return round(val / 3);
     }
-    return val;
+    return round(val);
   };
   parseStart = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return val * 3 - 2;
+      return round(val * 3 - 2);
     }
-    return val;
+    return round(val);
   };
   parseEnd = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return val * 3;
+      return round(val * 3);
     }
-    return val;
+    return round(val);
   };
   renderLocations = props => {
     const { fields } = props;

package/src/helperComponents/PropertiesDialog/GeneralProperties.js

@@ -105,7 +105,6 @@ class GeneralProperties extends React.Component {
                 className={"veReadOnlySelect"}
                 disabled={!onSave || disableSetReadOnly}
                 onChange={val =>
-                  console.log(`val:`, val) ||
                   handleReadOnlyChange(val === "readOnly", this.props)
                 }
                 value={readOnly ? "readOnly" : "editable"}

package/src/withEditorProps/index.js

@@ -571,6 +571,7 @@ function mapStateToProps(state, ownProps) {
   if (!editorState) {
     return editorReducer({}, {});
   }
+  const sequenceLength = s.sequenceLengthSelector(editorState);
 
   const { findTool, annotationsToSupport = {} } = editorState;
   const visibilities = getVisibilities(editorState);
@@ -582,7 +583,13 @@ function mapStateToProps(state, ownProps) {
   ].forEach(([n, type, annotationTypePlural]) => {
     const vals = getFormValues(n)(state);
     if (vals) {
-      annotationToAdd = getAnnToAdd(vals, n, type, annotationTypePlural);
+      annotationToAdd = getAnnToAdd(
+        vals,
+        n,
+        type,
+        annotationTypePlural,
+        sequenceLength
+      );
     }
   });
 
@@ -613,7 +620,6 @@ function mapStateToProps(state, ownProps) {
     editorState,
     ownProps.additionalEnzymes
   );
-  const sequenceLength = s.sequenceLengthSelector(editorState);
 
   const { matchedSearchLayer, searchLayers, matchesTotal } =
     getSearchLayersAndMatch(editorState);
@@ -955,22 +961,28 @@ const getFindTool = createSelector(
   }
 );
 
-const getAnnToAdd = defaultMemoize((vals, n, type, annotationTypePlural) => {
-  const annToAdd = {
-    color: getFeatureToColorMap({ includeHidden: true })[
-      vals.type || "primer_bind"
-    ], //we won't have the correct color yet so we set it here
-    ...vals,
-    formName: n,
-    type,
-    annotationTypePlural,
-    name: vals.name || "Untitled"
-  };
-  if (!vals.useLinkedOligo) {
-    delete annToAdd.bases;
+const getAnnToAdd = defaultMemoize(
+  (vals, n, type, annotationTypePlural, sequenceLength) => {
+    const annToAdd = normalizeRange(
+      {
+        color: getFeatureToColorMap({ includeHidden: true })[
+          vals.type || "primer_bind"
+        ], //we won't have the correct color yet so we set it here
+        ...vals,
+        formName: n,
+        type,
+        annotationTypePlural,
+        name: vals.name || "Untitled"
+      },
+      sequenceLength
+    );
+
+    if (!vals.useLinkedOligo) {
+      delete annToAdd.bases;
+    }
+    return annToAdd;
   }
-  return annToAdd;
-});
+);
 const getSeqDataWithAnnToAdd = defaultMemoize(
   (seqData, ann, allowMultipleFeatureDirections) => {
     if (ann) {