@teselagen/ove 0.5.27 → 0.5.29

package/index.cjs.js

@@ -69607,8 +69607,6 @@ var DraggableCore$1 = /* @__PURE__ */ function(_React$Component) {
       if (_this.props.disabled || !(e2.target instanceof ownerDocument.defaultView.Node) || _this.props.handle && !(0, _domFns.matchesSelectorAndParentsTo)(e2.target, _this.props.handle, thisNode) || _this.props.cancel && (0, _domFns.matchesSelectorAndParentsTo)(e2.target, _this.props.cancel, thisNode)) {
         return;
       }
-      if (e2.type === "touchstart")
-        e2.preventDefault();
       var touchIdentifier = (0, _domFns.getTouchIdentifier)(e2);
       _this.setState({
         touchIdentifier
@@ -117907,10 +117905,10 @@ const _Sequence = class _Sequence extends React$2.Component {
     }, containerStyle);
     const width = rowSeqLen * charWidth2;
     let inner2;
-    const shared = __spreadProps(__spreadValues({}, isSafari ? { letterSpacing: "3px" } : {}), {
+    const shared = {
       y: height2 - height2 / 4,
       className: "ve-monospace-font " + (isReverse ? " ve-sequence-reverse" : "")
-    });
+    };
     if (scrollData) {
       const numChunks = Math.ceil(rowSeqLen / chunkSize);
       const chunkWidth = chunkSize * charWidth2;
@@ -117924,12 +117922,13 @@ const _Sequence = class _Sequence extends React$2.Component {
         const x = i * chunkWidth;
         if (x > visibleEnd || x + textLength < visibleStart)
           return null;
+        const tlToUse = Math.max(0, textLength - fudge - fudge2);
         return /* @__PURE__ */ React$2.createElement(
           "text",
           __spreadValues({
             key: i
           }, __spreadProps(__spreadValues({}, shared), {
-            textLength: Math.max(0, textLength - fudge - fudge2),
+            textLength: tlToUse,
             x: x + fudge / 2,
             lengthAdjust: "spacing"
           })),
@@ -117937,16 +117936,22 @@ const _Sequence = class _Sequence extends React$2.Component {
         );
       });
     } else {
+      const tlToUse = Math.max(
+        0,
+        (alignmentData ? seqReadWidth : width) - fudge - fudge2
+      );
       inner2 = /* @__PURE__ */ React$2.createElement(
         "text",
         __spreadValues({}, __spreadProps(__spreadValues({}, shared), {
           x: 0 + fudge / 2,
-          textLength: Math.max(
-            0,
-            (alignmentData ? seqReadWidth : width) - fudge - fudge2
-          )
+          textLength: tlToUse
         })),
-        getBoldRegion({ sequence: sequence2, overlapToBold, rowStart, sequenceLength })
+        getBoldRegion({
+          sequence: sequence2,
+          overlapToBold,
+          rowStart,
+          sequenceLength
+        })
       );
     }
     return /* @__PURE__ */ React$2.createElement(
@@ -118058,6 +118063,9 @@ const _ColoredSequence = class _ColoredSequence extends React$2.Component {
 __name(_ColoredSequence, "ColoredSequence");
 let ColoredSequence = _ColoredSequence;
 function getBoldRegion({ sequence: sequence2, overlapToBold, rowStart, sequenceLength }) {
+  if (isSafari) {
+    return sequence2;
+  }
   const toRet = [];
   const [a2, b3] = overlapToBold || [];
   for (let index2 = rowStart; index2 < sequence2.length + rowStart; index2++) {
@@ -119361,13 +119369,14 @@ function getStructuredBases({
     forward ? r2.basesNoInserts : r2.basesNoInserts.split("").reverse().join("")
   );
   r2.basesNoInsertsWithMetaData = basesForRange.split("").map((b3, i) => {
+    var _a2, _b2;
     const indexOfBase = i + annotationRange.start;
     let seqForBase = fullSequence && fullSequence[indexOfBase] || "";
     if (!forward) {
       seqForBase = getComplementSequenceString(seqForBase);
     }
     const isMatch = seqForBase.toLowerCase() === b3.toLowerCase();
-    const isAmbiguousMatch = !isMatch && ambiguous_dna_values[b3.toUpperCase()].length > 1 && ambiguous_dna_values[b3.toUpperCase()].includes(seqForBase.toUpperCase());
+    const isAmbiguousMatch = !isMatch && ((_a2 = ambiguous_dna_values[b3.toUpperCase()]) == null ? void 0 : _a2.length) > 1 && ((_b2 = ambiguous_dna_values[b3.toUpperCase()]) == null ? void 0 : _b2.includes(seqForBase.toUpperCase()));
     return {
       b: b3,
       isMatch,
@@ -122401,8 +122410,8 @@ function showFileDialog({ multiple = false, onSelect }) {
 }
 __name(showFileDialog, "showFileDialog");
 const name = "@teselagen/ove";
-const version = "0.5.26";
-const main = "./src/index.js";
+const version = "0.5.28";
+const main = "./index.js";
 const type = "module";
 const exports$1 = {
   ".": {
@@ -126443,14 +126452,12 @@ const editorClicked = /* @__PURE__ */ __name(function({
   shiftHeld,
   updateSelectionOrCaret: updateSelectionOrCaret2
 }) {
-  console.log(`asdfasfwaofijaweofj`);
   const timeDif = (/* @__PURE__ */ new Date()).getTime() - dragInProgress;
   if (!dragInProgress || 200 > timeDif) {
     updateSelectionOrCaret2(shiftHeld, nearestCaretPos);
   }
 }, "editorClicked");
 const editorDragStarted = /* @__PURE__ */ __name(function(opts2) {
-  console.log(`wewfwf`);
   document == null ? void 0 : document.body.classList.add("sequenceDragging");
   window.__veDragging = true;
   caretPositionOnDragStart = opts2.nearestCaretPos;
@@ -134131,9 +134138,7 @@ function CircularView(props) {
           "svg",
           {
             key: "circViewSvg",
-            onTouch: true,
             onClick: (event) => {
-              console.log(`23232323`);
               instantiated && getNearestCursorPositionToMouseEvent(
                 event,
                 toPass,

package/index.es.js

@@ -69589,8 +69589,6 @@ var DraggableCore$1 = /* @__PURE__ */ function(_React$Component) {
       if (_this.props.disabled || !(e2.target instanceof ownerDocument.defaultView.Node) || _this.props.handle && !(0, _domFns.matchesSelectorAndParentsTo)(e2.target, _this.props.handle, thisNode) || _this.props.cancel && (0, _domFns.matchesSelectorAndParentsTo)(e2.target, _this.props.cancel, thisNode)) {
         return;
       }
-      if (e2.type === "touchstart")
-        e2.preventDefault();
       var touchIdentifier = (0, _domFns.getTouchIdentifier)(e2);
       _this.setState({
         touchIdentifier
@@ -117889,10 +117887,10 @@ const _Sequence = class _Sequence extends React__default$1.Component {
     }, containerStyle);
     const width = rowSeqLen * charWidth2;
     let inner2;
-    const shared = __spreadProps(__spreadValues({}, isSafari ? { letterSpacing: "3px" } : {}), {
+    const shared = {
       y: height2 - height2 / 4,
       className: "ve-monospace-font " + (isReverse ? " ve-sequence-reverse" : "")
-    });
+    };
     if (scrollData) {
       const numChunks = Math.ceil(rowSeqLen / chunkSize);
       const chunkWidth = chunkSize * charWidth2;
@@ -117906,12 +117904,13 @@ const _Sequence = class _Sequence extends React__default$1.Component {
         const x = i * chunkWidth;
         if (x > visibleEnd || x + textLength < visibleStart)
           return null;
+        const tlToUse = Math.max(0, textLength - fudge - fudge2);
         return /* @__PURE__ */ React__default$1.createElement(
           "text",
           __spreadValues({
             key: i
           }, __spreadProps(__spreadValues({}, shared), {
-            textLength: Math.max(0, textLength - fudge - fudge2),
+            textLength: tlToUse,
             x: x + fudge / 2,
             lengthAdjust: "spacing"
           })),
@@ -117919,16 +117918,22 @@ const _Sequence = class _Sequence extends React__default$1.Component {
         );
       });
     } else {
+      const tlToUse = Math.max(
+        0,
+        (alignmentData ? seqReadWidth : width) - fudge - fudge2
+      );
       inner2 = /* @__PURE__ */ React__default$1.createElement(
         "text",
         __spreadValues({}, __spreadProps(__spreadValues({}, shared), {
           x: 0 + fudge / 2,
-          textLength: Math.max(
-            0,
-            (alignmentData ? seqReadWidth : width) - fudge - fudge2
-          )
+          textLength: tlToUse
         })),
-        getBoldRegion({ sequence: sequence2, overlapToBold, rowStart, sequenceLength })
+        getBoldRegion({
+          sequence: sequence2,
+          overlapToBold,
+          rowStart,
+          sequenceLength
+        })
       );
     }
     return /* @__PURE__ */ React__default$1.createElement(
@@ -118040,6 +118045,9 @@ const _ColoredSequence = class _ColoredSequence extends React__default$1.Compone
 __name(_ColoredSequence, "ColoredSequence");
 let ColoredSequence = _ColoredSequence;
 function getBoldRegion({ sequence: sequence2, overlapToBold, rowStart, sequenceLength }) {
+  if (isSafari) {
+    return sequence2;
+  }
   const toRet = [];
   const [a2, b3] = overlapToBold || [];
   for (let index2 = rowStart; index2 < sequence2.length + rowStart; index2++) {
@@ -119343,13 +119351,14 @@ function getStructuredBases({
     forward ? r2.basesNoInserts : r2.basesNoInserts.split("").reverse().join("")
   );
   r2.basesNoInsertsWithMetaData = basesForRange.split("").map((b3, i) => {
+    var _a2, _b2;
     const indexOfBase = i + annotationRange.start;
     let seqForBase = fullSequence && fullSequence[indexOfBase] || "";
     if (!forward) {
       seqForBase = getComplementSequenceString(seqForBase);
     }
     const isMatch = seqForBase.toLowerCase() === b3.toLowerCase();
-    const isAmbiguousMatch = !isMatch && ambiguous_dna_values[b3.toUpperCase()].length > 1 && ambiguous_dna_values[b3.toUpperCase()].includes(seqForBase.toUpperCase());
+    const isAmbiguousMatch = !isMatch && ((_a2 = ambiguous_dna_values[b3.toUpperCase()]) == null ? void 0 : _a2.length) > 1 && ((_b2 = ambiguous_dna_values[b3.toUpperCase()]) == null ? void 0 : _b2.includes(seqForBase.toUpperCase()));
     return {
       b: b3,
       isMatch,
@@ -122383,8 +122392,8 @@ function showFileDialog({ multiple = false, onSelect }) {
 }
 __name(showFileDialog, "showFileDialog");
 const name = "@teselagen/ove";
-const version = "0.5.26";
-const main = "./src/index.js";
+const version = "0.5.28";
+const main = "./index.js";
 const type = "module";
 const exports$1 = {
   ".": {
@@ -126425,14 +126434,12 @@ const editorClicked = /* @__PURE__ */ __name(function({
   shiftHeld,
   updateSelectionOrCaret: updateSelectionOrCaret2
 }) {
-  console.log(`asdfasfwaofijaweofj`);
   const timeDif = (/* @__PURE__ */ new Date()).getTime() - dragInProgress;
   if (!dragInProgress || 200 > timeDif) {
     updateSelectionOrCaret2(shiftHeld, nearestCaretPos);
   }
 }, "editorClicked");
 const editorDragStarted = /* @__PURE__ */ __name(function(opts2) {
-  console.log(`wewfwf`);
   document == null ? void 0 : document.body.classList.add("sequenceDragging");
   window.__veDragging = true;
   caretPositionOnDragStart = opts2.nearestCaretPos;
@@ -134113,9 +134120,7 @@ function CircularView(props) {
           "svg",
           {
             key: "circViewSvg",
-            onTouch: true,
             onClick: (event) => {
-              console.log(`23232323`);
               instantiated && getNearestCursorPositionToMouseEvent(
                 event,
                 toPass,

package/index.umd.js

@@ -98732,8 +98732,6 @@ ${latestSubscriptionCallbackError.current.stack}
         if (_this.props.disabled || !(e2.target instanceof ownerDocument.defaultView.Node) || _this.props.handle && !(0, _domFns.matchesSelectorAndParentsTo)(e2.target, _this.props.handle, thisNode) || _this.props.cancel && (0, _domFns.matchesSelectorAndParentsTo)(e2.target, _this.props.cancel, thisNode)) {
           return;
         }
-        if (e2.type === "touchstart")
-          e2.preventDefault();
         var touchIdentifier = (0, _domFns.getTouchIdentifier)(e2);
         _this.setState({
           touchIdentifier
@@ -146363,10 +146361,10 @@ ${seq.sequence}
       }, containerStyle);
       const width = rowSeqLen * charWidth2;
       let inner2;
-      const shared = __spreadProps(__spreadValues({}, isSafari ? { letterSpacing: "3px" } : {}), {
+      const shared = {
         y: height2 - height2 / 4,
         className: "ve-monospace-font " + (isReverse ? " ve-sequence-reverse" : "")
-      });
+      };
       if (scrollData) {
         const numChunks = Math.ceil(rowSeqLen / chunkSize);
         const chunkWidth = chunkSize * charWidth2;
@@ -146380,12 +146378,13 @@ ${seq.sequence}
           const x2 = i2 * chunkWidth;
           if (x2 > visibleEnd || x2 + textLength < visibleStart)
             return null;
+          const tlToUse = Math.max(0, textLength - fudge - fudge2);
           return /* @__PURE__ */ React$2.createElement(
             "text",
             __spreadValues({
               key: i2
             }, __spreadProps(__spreadValues({}, shared), {
-              textLength: Math.max(0, textLength - fudge - fudge2),
+              textLength: tlToUse,
               x: x2 + fudge / 2,
               lengthAdjust: "spacing"
             })),
@@ -146393,16 +146392,22 @@ ${seq.sequence}
           );
         });
       } else {
+        const tlToUse = Math.max(
+          0,
+          (alignmentData ? seqReadWidth : width) - fudge - fudge2
+        );
         inner2 = /* @__PURE__ */ React$2.createElement(
           "text",
           __spreadValues({}, __spreadProps(__spreadValues({}, shared), {
             x: 0 + fudge / 2,
-            textLength: Math.max(
-              0,
-              (alignmentData ? seqReadWidth : width) - fudge - fudge2
-            )
+            textLength: tlToUse
           })),
-          getBoldRegion({ sequence: sequence2, overlapToBold, rowStart, sequenceLength })
+          getBoldRegion({
+            sequence: sequence2,
+            overlapToBold,
+            rowStart,
+            sequenceLength
+          })
         );
       }
       return /* @__PURE__ */ React$2.createElement(
@@ -146514,6 +146519,9 @@ ${seq.sequence}
   __name(_ColoredSequence, "ColoredSequence");
   let ColoredSequence = _ColoredSequence;
   function getBoldRegion({ sequence: sequence2, overlapToBold, rowStart, sequenceLength }) {
+    if (isSafari) {
+      return sequence2;
+    }
     const toRet = [];
     const [a2, b3] = overlapToBold || [];
     for (let index2 = rowStart; index2 < sequence2.length + rowStart; index2++) {
@@ -147817,13 +147825,14 @@ double click --> edit`}`;
       forward ? r2.basesNoInserts : r2.basesNoInserts.split("").reverse().join("")
     );
     r2.basesNoInsertsWithMetaData = basesForRange.split("").map((b3, i2) => {
+      var _a2, _b2;
       const indexOfBase = i2 + annotationRange.start;
       let seqForBase = fullSequence && fullSequence[indexOfBase] || "";
       if (!forward) {
         seqForBase = getComplementSequenceString(seqForBase);
       }
       const isMatch = seqForBase.toLowerCase() === b3.toLowerCase();
-      const isAmbiguousMatch = !isMatch && ambiguous_dna_values[b3.toUpperCase()].length > 1 && ambiguous_dna_values[b3.toUpperCase()].includes(seqForBase.toUpperCase());
+      const isAmbiguousMatch = !isMatch && ((_a2 = ambiguous_dna_values[b3.toUpperCase()]) == null ? void 0 : _a2.length) > 1 && ((_b2 = ambiguous_dna_values[b3.toUpperCase()]) == null ? void 0 : _b2.includes(seqForBase.toUpperCase()));
       return {
         b: b3,
         isMatch,
@@ -150823,8 +150832,8 @@ Part of ${annotation.translationType} Translation from BPs ${annotation.start +
   }
   __name(showFileDialog, "showFileDialog");
   const name = "@teselagen/ove";
-  const version = "0.5.26";
-  const main = "./src/index.js";
+  const version = "0.5.28";
+  const main = "./index.js";
   const type = "module";
   const exports$1 = {
     ".": {
@@ -153260,14 +153269,12 @@ Part of ${annotation.translationType} Translation from BPs ${annotation.start +
     shiftHeld,
     updateSelectionOrCaret: updateSelectionOrCaret2
   }) {
-    console.log(`asdfasfwaofijaweofj`);
     const timeDif = (/* @__PURE__ */ new Date()).getTime() - dragInProgress;
     if (!dragInProgress || 200 > timeDif) {
       updateSelectionOrCaret2(shiftHeld, nearestCaretPos);
     }
   }, "editorClicked");
   const editorDragStarted = /* @__PURE__ */ __name(function(opts2) {
-    console.log(`wewfwf`);
     document == null ? void 0 : document.body.classList.add("sequenceDragging");
     window.__veDragging = true;
     caretPositionOnDragStart = opts2.nearestCaretPos;
@@ -160948,9 +160955,7 @@ Part of ${annotation.translationType} Translation from BPs ${annotation.start +
             "svg",
             {
               key: "circViewSvg",
-              onTouch: true,
               onClick: (event) => {
-                console.log(`23232323`);
                 instantiated && getNearestCursorPositionToMouseEvent(
                   event,
                   toPass,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@teselagen/ove",
-  "version": "0.5.27",
-  "main": "./src/index.js",
+  "version": "0.5.29",
+  "main": "./index.js",
   "exports": {
     ".": {
       "import": "./index.es.js",

package/src/CircularView/index.js

@@ -822,9 +822,7 @@ export function CircularView(props) {
         >
           <svg
             key="circViewSvg"
-            onTouch
             onClick={event => {
-              console.log(`23232323`)
               instantiated &&
                 getNearestCursorPositionToMouseEvent(
                   event,

package/src/RowItem/Sequence.js

@@ -90,7 +90,6 @@ class Sequence extends React.Component {
 
     let inner;
     const shared = {
-      ...(isSafari ? { letterSpacing: "3px" } : {}),
       y: height - height / 4,
       className:
         "ve-monospace-font " + (isReverse ? " ve-sequence-reverse" : "")
@@ -108,12 +107,13 @@ class Sequence extends React.Component {
         const textLength = charWidth * seqChunk.length;
         const x = i * chunkWidth;
         if (x > visibleEnd || x + textLength < visibleStart) return null;
+        const tlToUse = Math.max(0, textLength - fudge - fudge2);
         return (
           <text
             key={i}
             {...{
               ...shared,
-              textLength: Math.max(0, textLength - fudge - fudge2),
+              textLength: tlToUse,
               x: x + fudge / 2,
               lengthAdjust: "spacing"
             }}
@@ -123,18 +123,24 @@ class Sequence extends React.Component {
         );
       });
     } else {
+      const tlToUse = Math.max(
+        0,
+        (alignmentData ? seqReadWidth : width) - fudge - fudge2
+      );
       inner = (
         <text
           {...{
             ...shared,
             x: 0 + fudge / 2,
-            textLength: Math.max(
-              0,
-              (alignmentData ? seqReadWidth : width) - fudge - fudge2
-            )
+            textLength: tlToUse
           }}
         >
-          {getBoldRegion({ sequence, overlapToBold, rowStart, sequenceLength })}
+          {getBoldRegion({
+            sequence,
+            overlapToBold,
+            rowStart,
+            sequenceLength
+          })}
         </text>
       );
     }
@@ -257,6 +263,10 @@ class ColoredSequence extends React.Component {
 }
 
 function getBoldRegion({ sequence, overlapToBold, rowStart, sequenceLength }) {
+  if (isSafari) {
+    // safari doesn't support text length with tspans so we can't bold the sequence - https://github.com/TeselaGen/tg-oss/issues/80
+    return sequence;
+  }
   const toRet = [];
   const [a, b] = overlapToBold || [];
   for (let index = rowStart; index < sequence.length + rowStart; index++) {

package/src/RowItem/StackedAnnotations/getStructuredBases.js

@@ -71,8 +71,8 @@ export function getStructuredBases({
     const isMatch = seqForBase.toLowerCase() === b.toLowerCase();
     const isAmbiguousMatch =
       !isMatch &&
-      ambiguous_dna_values[b.toUpperCase()].length > 1 &&
-      ambiguous_dna_values[b.toUpperCase()].includes(seqForBase.toUpperCase());
+      ambiguous_dna_values[b.toUpperCase()]?.length > 1 &&
+      ambiguous_dna_values[b.toUpperCase()]?.includes(seqForBase.toUpperCase());
     return {
       b,
       isMatch,

package/src/style.css

@@ -12,9 +12,6 @@
   font-style: normal;
   font-display: block;
 }
-.veEditor {
-  cursor:'pointer'
-}
 .ve-monospace-font {
   font-family: Menlo, Monaco, monospace;
   font-size: 10px;

package/src/withEditorInteractions/clickAndDragUtils.js

@@ -73,7 +73,6 @@ export const editorClicked = function ({
   shiftHeld,
   updateSelectionOrCaret
 }) {
-  console.log(`asdfasfwaofijaweofj`)
   const timeDif = new Date().getTime() - dragInProgress;
   if (!dragInProgress || 200 > timeDif) {
     //if the drag is less than 200 ms it probably isn't a real drag!
@@ -83,7 +82,6 @@ export const editorClicked = function ({
 };
 
 export const editorDragStarted = function (opts) {
-  console.log(`wewfwf`)
   document?.body.classList.add("sequenceDragging"); //needed to prevent the input bubble from losing focus post user drag
   window.__veDragging = true;
 

package/style.css

@@ -11991,9 +11991,6 @@ tspan.vePart {
   font-style: normal;
   font-display: block;
 }
-.veEditor {
-  cursor:'pointer'
-}
 .ve-monospace-font {
   font-family: Menlo, Monaco, monospace;
   font-size: 10px;