@datagrok/helm 2.1.32 → 2.1.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.1.32",
+  "version": "2.1.34",
   "author": {
     "name": "Oleksandra Serhiienko",
     "email": "oserhiienko@datagrok.ai"
@@ -15,9 +15,9 @@
     "helm/JSDraw/Pistoia.HELM-uncompressed.js"
   ],
   "dependencies": {
-    "@datagrok-libraries/bio": "^5.40.7",
-    "@datagrok-libraries/chem-meta": "^1.2.3",
-    "@datagrok-libraries/utils": "^4.1.45",
+    "@datagrok-libraries/bio": "^5.40.8",
+    "@datagrok-libraries/chem-meta": "^1.2.5",
+    "@datagrok-libraries/utils": "^4.2.1",
     "cash-dom": "^8.1.1",
     "datagrok-api": "^1.17.0",
     "dayjs": "^1.10.6",

package/src/cell-renderer.ts

@@ -8,7 +8,7 @@ import {printLeftOrCentered} from '@datagrok-libraries/bio/src/utils/cell-render
 import {errorToConsole} from '@datagrok-libraries/utils/src/to-console';
 
 import {findMonomers, parseHelm, removeGapsFromHelm} from './utils';
-import {IEditor, HelmMonomerPlacer, IEditorMolAtom, ISeqMonomer} from './helm-monomer-placer';
+import {IEditor, HelmMonomerPlacer, IEditorMolAtom, ISeqMonomer, Temps} from './helm-monomer-placer';
 import {IMonomerLib} from '@datagrok-libraries/bio/src/types/index';
 
 // import {_package} from './package'; // NullError: method not found: '_package' on null
@@ -139,6 +139,26 @@ function getHoveredMonomerFallback(
   return hoveredSeqMonomer;
 }
 
+type RendererGridCellTemp = {
+  [Temps.helmMonomerPlacer]: HelmMonomerPlacer;
+}
+
+function getRendererGridCellTemp(gridCell: DG.GridCell
+): [DG.GridColumn | null, DG.Column | null, RendererGridCellTemp] {
+  /** Primarily store/get MonomerPlacer at GridColumn, fallback at (Table) Column for scatter plot tooltip  */
+  let temp: RendererGridCellTemp | null = null;
+
+  let gridCol: DG.GridColumn | null = null;
+  try { gridCol = gridCell.gridColumn; } catch { gridCol = null; }
+  temp = gridCol ? gridCol.temp as RendererGridCellTemp : null;
+
+  const tableCol: DG.Column = gridCell.cell.column;
+  if (!temp) temp = tableCol.temp;
+
+  if (temp === null) throw new Error(`Monomer placer store (GridColumn or Column) not found.`);
+  return [gridCol, tableCol, temp];
+}
+
 /** Helm cell renderer in case of no missed monomer draws with JSDraw2.Editor (webeditor),
  * in case of missed monomers presented, draws linear sequences aligned in width per monomer.
  */
@@ -153,16 +173,15 @@ export class HelmCellRenderer extends DG.GridCellRenderer {
 
   onMouseMove(gridCell: DG.GridCell, e: MouseEvent): void {
     try {
-      /* Can not do anything without tableColumn containing temp */
-      let tableCol: DG.Column | null = null;
-      try { tableCol = gridCell.tableColumn; } catch { }
+      const [_gridCol, tableCol, temp] = getRendererGridCellTemp(gridCell);
+      const helmPlacer = temp[Temps.helmMonomerPlacer];
+      /* Can not do anything without tableColumn */
       if (!tableCol) return;
 
       /** {@link gridCell}.bounds */ const gcb = gridCell.bounds;
       const argsX = e.offsetX - gcb.x;
       const argsY = e.offsetY - gcb.y;
 
-      const helmPlacer = HelmMonomerPlacer.getOrCreate(gridCell.gridColumn, tableCol);
       const editor: IEditor | null = helmPlacer.getEditor(gridCell.tableRowIndex!);
       let seqMonomer: ISeqMonomer | null;
       let missedMonomers: Set<string> = new Set<string>(); // of .size = 0
@@ -225,10 +244,11 @@ export class HelmCellRenderer extends DG.GridCellRenderer {
   ) {
     g.save();
     try {
+      const [gridCol, tableCol, temp] = getRendererGridCellTemp(gridCell);
       /* Can not do anything without tableColumn containing temp */
-      let tableCol: DG.Column | null = null;
-      try { tableCol = gridCell.tableColumn; } catch { }
       if (!tableCol) return;
+      let helmPlacer = temp[Temps.helmMonomerPlacer];
+      if (!helmPlacer) helmPlacer = temp[Temps.helmMonomerPlacer] = new HelmMonomerPlacer(gridCol, tableCol);
 
       const grid = gridCell.gridRow !== -1 ? gridCell.grid : undefined;
       const missedColor = 'red';
@@ -239,7 +259,6 @@ export class HelmCellRenderer extends DG.GridCellRenderer {
       const monomerList = parseHelm(seq);
       const monomers: Set<string> = new Set<string>(monomerList);
       const missedMonomers: Set<string> = findMonomers(monomerList);
-      const helmPlacer = HelmMonomerPlacer.getOrCreate(gridCell.gridColumn, tableCol);
 
       if (missedMonomers.size == 0) {
         // Recreate host to avoid hanging in window.dojox.gfx.svg.Text.prototype.getTextWidth

package/src/helm-monomer-placer.ts

@@ -43,7 +43,7 @@ export interface ISeqMonomer {
 }
 
 export class HelmMonomerPlacer {
-  private readonly grid: DG.Grid;
+  private readonly grid: DG.Grid | null;
   public readonly monomerLib: IMonomerLib;
 
   private _allPartsList: (string[] | null)[];
@@ -56,11 +56,11 @@ export class HelmMonomerPlacer {
 
   private subs: Unsubscribable[] = [];
 
-  protected constructor(
-    public readonly gridCol: DG.GridColumn,
+  public constructor(
+    public readonly gridCol: DG.GridColumn | null,
     public readonly col: DG.Column<string>
   ) {
-    this.grid = this.gridCol.grid;
+    this.grid = this.gridCol ? this.gridCol.grid : null;
     this.reset();
     if (this.grid) {
       this.subs.push(this.col.dataFrame.onDataChanged.subscribe(() => {
@@ -72,7 +72,7 @@ export class HelmMonomerPlacer {
       }));
       this.subs.push(grok.events.onViewRemoved.subscribe((view: DG.View) => {
         try {
-          if (this.gridCol.grid.view?.id === view.id) this.destroy();
+          if (this.grid && this.grid.view?.id === view.id) this.destroy();
         } catch (err: any) {
           console.error(err);
         }
@@ -148,12 +148,6 @@ export class HelmMonomerPlacer {
     if (this.grid) this.grid.invalidate();
   }
 
-  public static getOrCreate(gridCol: DG.GridColumn, col: DG.Column<string>): HelmMonomerPlacer {
-    let res: HelmMonomerPlacer = gridCol.temp[Temps.helmMonomerPlacer];
-    if (!res) res = gridCol.temp[Temps.helmMonomerPlacer] = new HelmMonomerPlacer(gridCol, col);
-    return res;
-  }
-
   public setEditor(tableRowIndex: number, editor: IEditor) {
     this._editorList![tableRowIndex] = editor;
   }
@@ -164,6 +158,6 @@ export class HelmMonomerPlacer {
 }
 
 export function getAllParts(seq: string | null): string[] {
-  const monomerList: string[] = seq ? parseHelm(seq) : [];
-  return seq ? getParts(monomerList, seq) : [];
+  const monomerList: string[] = !!seq ? parseHelm(seq) : [];
+  return !!seq ? getParts(monomerList, seq) : [];
 }

package/src/utils/index.ts

@@ -24,7 +24,7 @@ export function removeGapsFromHelm(srcHelm: string): string {
 export function getParts(subParts: string[], s: string): string[] {
   const j = 0;
   const allParts: string[] = [];
-  for (let k = 0; k < subParts.length; ++k) {
+  for (let k = 0; k < (subParts ?? []).length; ++k) {
     const indexOfMonomer = s.indexOf(subParts[k]);
     const helmBeforeMonomer = s.slice(j, indexOfMonomer);
     allParts.push(helmBeforeMonomer);