@datagrok/bio 2.21.7 → 2.21.9

package/package.json

@@ -5,7 +5,7 @@
     "name": "Leonid Stolbov",
     "email": "lstolbov@datagrok.ai"
   },
-  "version": "2.21.7",
+  "version": "2.21.9",
   "description": "Bioinformatics support (import/export of sequences, conversion, visualization, analysis). [See more](https://github.com/datagrok-ai/public/blob/master/packages/Bio/README.md) for details.",
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
   ],
   "dependencies": {
     "@biowasm/aioli": "^3.1.0",
-    "@datagrok-libraries/bio": "^5.52.2",
+    "@datagrok-libraries/bio": "^5.53.0",
     "@datagrok-libraries/chem-meta": "^1.2.7",
     "@datagrok-libraries/math": "^1.2.4",
     "@datagrok-libraries/ml": "^6.10.0",

package/src/widgets/sequence-scrolling-widget.ts

@@ -30,20 +30,26 @@ export function handleSequenceHeaderRendering() {
         if (!gCol)
           continue;
 
-        let positionStatsViewerAddedOnce = false;
-
+        let positionStatsViewerAddedOnce = !!grid.tableView && Array.from(grid.tableView.viewers).some((v) => v.type === 'Sequence Position Statistics');
+        const isMSA = sh.isMsa();
         const ifNan = (a: number, els: number) => (Number.isNaN(a) ? els : a);
         const getStart = () => ifNan(Math.max(Number.parseInt(seqCol.getTag(bioTAGS.positionShift) ?? '0'), 0), 0) + 1;
         const getCurrent = () => ifNan(Number.parseInt(seqCol.getTag(bioTAGS.selectedPosition) ?? '-2'), -2);
         const getFontSize = () => MonomerPlacer.getFontSettings(seqCol).fontWidth;
-        // get the maximum length of sequences by randomly taking 10 sequences;
-        let maxSeqLen = 0;
-        for (let i = 0; i < Math.min(30, seqCol.categories.length); i++) {
-          const row = Math.floor(Math.random() * seqCol.categories.length - 1);
-          const seq = sh.splitter(seqCol.categories[row]);
-          if (seq)
-            maxSeqLen = Math.max(maxSeqLen, seq.length);
+        // get the maximum length of seqs by getting the primitive length first and then splitting it with correct splitter;
+        let pseudoMaxLenIndex = 0;
+        let pseudoMaxLength = 0;
+        const cats = seqCol.categories;
+        for (let i = 0; i < cats.length; i++) {
+          const seq = cats[i];
+          if (seq && seq.length > pseudoMaxLength) {
+            pseudoMaxLength = seq.length;
+            pseudoMaxLenIndex = i;
+          }
         }
+        const seq = cats[pseudoMaxLenIndex];
+        const split = sh.splitter(seq);
+        const maxSeqLen = split ? split.length : 30;
 
         // makes no sense to have scroller if we have shorter than 50 positions
         if (maxSeqLen < 50)
@@ -60,9 +66,9 @@ export function handleSequenceHeaderRendering() {
               const cur = getCurrent();
               if (start !== scrollerRange.start)
                 seqCol.setTag(bioTAGS.positionShift, (scrollerRange.start - 1).toString());
-              if (scrollerCur >= 0 && cur !== scrollerCur) {
+              if (cur !== scrollerCur) {
                 seqCol.setTag(bioTAGS.selectedPosition, (scrollerCur).toString());
-                if (!positionStatsViewerAddedOnce && grid.tableView) {
+                if (scrollerCur >= 0 && !positionStatsViewerAddedOnce && grid.tableView) {
                   positionStatsViewerAddedOnce = true;
                   const v = grid.tableView.addViewer('Sequence Position Statistics', {sequenceColumnName: seqCol.name});
                   grid.tableView.dockManager.dock(v, DG.DOCK_TYPE.DOWN, null, 'Sequence Position Statistics', 0.4);
@@ -78,8 +84,10 @@ export function handleSequenceHeaderRendering() {
           if (!cell || !cell.isColHeader || cell?.gridColumn?.name !== gCol?.name)
             return;
           const cellBounds = e.bounds;
-          if (!cellBounds || cellBounds.height <= 50)
+          if (!cellBounds || cellBounds.height <= 50) {
+            scroller.headerHeight = 0;
             return;
+          }
 
           const headerTitleSpace = 20;
           const availableTitleSpace = cellBounds.height - defaultHeaderHeight;
@@ -114,11 +122,10 @@ export function handleSequenceHeaderRendering() {
 
           const titleShift = Math.max(0, availableTitleSpace ?? 0) > headerTitleSpace ? headerTitleSpace : 0;
           const font = getFontSize();
-          scroller.positionWidth = font + 8;
+          scroller.positionWidth = font + (isMSA ? 8 : 0);
           const start = getStart();
-          //const positionXShift = start > 1 ? font + 8 : 0;
-          // pass in the event to the scroller so it can internally preventDefault if all is well
-          scroller.draw(cellBounds.x, cellBounds.y + titleShift, cellBounds.width, cellBounds.height - titleShift, getCurrent(), start, e);
+          const startPadding = isMSA ? 0 : 4;
+          scroller.draw(cellBounds.x + startPadding, cellBounds.y + titleShift, cellBounds.width - startPadding, cellBounds.height - titleShift, getCurrent(), start, e);
         }));
       }
     }, 1000);