Bump deps

GMOD · Sep 20, 2024 · b71c4a6 · b71c4a6
1 parent c38308f
commit b71c4a6
Show file tree

Hide file tree

Showing 3 changed files with 194 additions and 177 deletions.
diff --git a/lib/src/components/msa/renderMSABlock.ts b/lib/src/components/msa/renderMSABlock.ts
@@ -98,8 +98,6 @@ function drawTiles({
     bgColor,
     colorSchemeName,
     colorScheme,
-    colStats,
-    colStatsSums,
     columns,
     colWidth,
     rowHeight,
@@ -117,16 +115,20 @@ function drawTiles({
         const color =
           colorSchemeName === 'clustalx_protein_dynamic'
             ? getClustalXColor(
-                colStats[xStart + i]!,
-                colStatsSums[xStart + i]!,
+                // use model.colStats dot notation here: delay use of colStats
+                // until absolutely needed
+                model.colStats[xStart + i]!,
+                model.colStatsSums[xStart + i]!,
                 model,
                 name,
                 xStart + i,
               )
             : colorSchemeName === 'percent_identity_dynamic'
               ? getPercentIdentityColor(
-                  colStats[xStart + i]!,
-                  colStatsSums[xStart + i]!,
+                  // use model.colStats dot notation here: delay use of
+                  // colStats until absolutely needed
+                  model.colStats[xStart + i]!,
+                  model.colStatsSums[xStart + i]!,
                   model,
                   name,
                   xStart + i,

diff --git a/lib/src/model.ts b/lib/src/model.ts
@@ -135,7 +135,7 @@ function stateModelFactory() {
         /**
          * #property
          */
-        hideGaps: true,
+        hideGaps: false,
 
         /**
          * #property
@@ -770,7 +770,10 @@ function stateModelFactory() {
        * #getter
        */
       get columns2d() {
-        return this.rows.map(r => r[1]).map(str => skipBlanks(this.blanks, str))
+        const { hideGaps } = self
+        return this.rows
+          .map(r => r[1])
+          .map(str => (hideGaps ? skipBlanks(this.blanks, str) : str))
       },
       /**
        * #getter
@@ -1067,12 +1070,17 @@ function stateModelFactory() {
        * #getter
        */
       get adapterTrackModels(): BasicTrack[] {
+        const { rowHeight, MSA, hideGaps, blanks } = self
         return (
-          self.MSA?.tracks.map(t => ({
+          MSA?.tracks.map(t => ({
             model: {
               ...t,
-              data: t.data ? skipBlanks(self.blanks, t.data) : undefined,
-              height: self.rowHeight,
+              data: t.data
+                ? hideGaps
+                  ? skipBlanks(blanks, t.data)
+                  : t.data
+                : undefined,
+              height: rowHeight,
             } as TextTrackModel,
             ReactComponent: TextTrack,
           })) || []
@@ -1426,10 +1434,12 @@ function stateModelFactory() {
         addDisposer(
           self,
           autorun(() => {
-            // eslint-disable-next-line  @typescript-eslint/no-unused-expressions
-            self.colStats
-            // eslint-disable-next-line  @typescript-eslint/no-unused-expressions
-            self.colStatsSums
+            if (self.colorSchemeName.includes('dynamic')) {
+              // eslint-disable-next-line  @typescript-eslint/no-unused-expressions
+              self.colStats
+              // eslint-disable-next-line  @typescript-eslint/no-unused-expressions
+              self.colStatsSums
+            }
             // eslint-disable-next-line  @typescript-eslint/no-unused-expressions
             self.columns
           }),