@datagrok/helm 2.3.0 → 2.3.1

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "author": {
     "name": "Oleksandra Serhiienko",
     "email": "oserhiienko@datagrok.ai"
   },
   "description": "Provides support for HELM notation (importing, detecting, rendering, conversion).",
+  "sources-backup": [
+    "helm/JSDraw/Scilligence.JSDraw2.Lite-uncompressed.js",
+    "helm/JSDraw/Pistoia.HELM-uncompressed.js"
+  ],
   "sources": [
     "https://ajax.googleapis.com/ajax/libs/dojo/1.10.4/dojo/dojo.js.uncompressed.js",
     "css/helm.css"
@@ -24,7 +28,7 @@
   "devDependencies": {
     "@datagrok-libraries/helm-web-editor": "^1.1.5",
     "@datagrok-libraries/js-draw-lite": "^0.0.3",
-    "@datagrok/bio": "^2.13.2",
+    "@datagrok/bio": "^2.13.3",
     "@datagrok/chem": "^1.9.2",
     "@types/node": "17.0.45",
     "@types/wu": "latest",

package/src/package.ts

@@ -66,12 +66,12 @@ export async function initHelm(): Promise<void> {
           await initHelmLoadAndPatchDojo();
           _package.logger.debug(`${logPrefix}, dojox loaded and patched`);
 
-          // through webpack.config.ts/alias
-          require('vendor/helm-web-editor');
-
+          // Alternatively load old bundles by package.json/sources
           _package.logger.debug(`${logPrefix}, HelmWebEditor awaiting …`);
+          require('vendor/helm-web-editor'); // through webpack.config.ts/alias
           await window.helmWebEditor$.initPromise;
           _package.logger.debug(`${logPrefix}, HelmWebEditor loaded`);
+
           org.helm.webeditor.kCaseSensitive = true; // GROK-13880
 
           _package.logger.debug(`${logPrefix}, scil.Utils.alert patch`);

package/src/utils/helm-grid-cell-renderer.ts

@@ -18,6 +18,8 @@ import {ILogger} from '@datagrok-libraries/bio/src/utils/logger';
 import {getGridCellRendererBack} from '@datagrok-libraries/bio/src/utils/cell-renderer-back-base';
 
 import {_package, getMonomerLib} from '../package';
+import {IMonomerLib} from '@datagrok-libraries/bio/src/types/index';
+import {GridCell, GridCellStyle, x} from 'datagrok-api/dg';
 
 class WrapLogger implements ILogger {
   constructor(
@@ -44,18 +46,13 @@ class WrapLogger implements ILogger {
 export class HelmGridCellRendererBack extends CellRendererBackAsyncBase<HelmProps, HelmAux> {
   private _auxList: (HelmAux | null)[];
 
+  private monomerLib: IMonomerLib | null = null;
+
   constructor(
     gridCol: DG.GridColumn | null,
     tableCol: DG.Column<string>,
   ) {
     super(gridCol, tableCol, new WrapLogger(_package.logger) /* _package.logger */, true);
-
-    const monomerLib = getMonomerLib();
-    if (!monomerLib)
-      throw new Error('Helm package is not initialized yet.');
-    this.subs.push(monomerLib.onChanged.subscribe(() => {
-      this.reset();
-    }));
   }
 
   protected override reset(): void {
@@ -159,10 +156,22 @@ export class HelmGridCellRendererBack extends CellRendererBackAsyncBase<HelmProp
     }
   }
 
+  public override render(g: CanvasRenderingContext2D,
+    x: number, y: number, w: number, h: number,
+    gridCell: GridCell, cellStyle: GridCellStyle) {
+    if (!this.monomerLib) {
+      this.monomerLib = getMonomerLib();
+      if (this.monomerLib) {
+        this.subs.push(this.monomerLib.onChanged.subscribe(this.monomerLibOnChanged.bind(this)));
+      }
+    }
+    super.render(g, x, y, w, h, gridCell, cellStyle);
+  }
+
   // -- Handle events --
+
   private monomerLibOnChanged(_value: any): void {
     this.reset();
-    this.invalidateGrid();
   }
 
   static getOrCreate(gridCell: DG.GridCell): HelmGridCellRendererBack {

package/webpack.config.js

@@ -35,7 +35,7 @@ module.exports = {
       {test: /\.css$/, use: ['style-loader', 'css-loader'], exclude: [/node_modules/, /vendor/]},
     ],
   },
-  devtool: 'source-map',
+  devtool: mode !== 'production' ? 'inline-source-map' : 'source-map',
   externals: {
     'datagrok-api/dg': 'DG',
     'datagrok-api/grok': 'grok',