Merge branch 'master' of https://github.com/6pac/SlickGrid

6pac · Dec 9, 2023 · b97d516 · b97d516
2 parents da72bb1 + e7ccc1d
commit b97d516
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/models/gridOption.interface.ts b/src/models/gridOption.interface.ts
@@ -108,8 +108,8 @@ export interface GridOption<C extends BaseColumn = BaseColumn> {
   /** Default cell Formatter that will be used by the grid */
   defaultFormatter?: Formatter;
 
-  /** Escape hatch geared towards testing Slickgrid in jsdom based environments to circumvent the lack of stylesheet.ownerNode and clientWidth calculations */
-  devMode?: false & { ownerNodeIndex?: number; containerClientWidth?: number; };
+  /** Escape hatch geared towards testing Slickgrid in JSDOM based environments to circumvent the lack of stylesheet.ownerNode and clientWidth calculations */
+  devMode?: false | { ownerNodeIndex?: number; containerClientWidth?: number; };
 
   /** Do we have paging enabled? */
   doPaging?: boolean;

diff --git a/src/slick.grid.ts b/src/slick.grid.ts
@@ -2468,7 +2468,7 @@ export class SlickGrid<TData = any, C extends Column<TData> = Column<TData>, O e
     if (!this.stylesheet) {
       const sheets: any = (this._options.shadowRoot || document).styleSheets;
 
-      if (typeof this.options.devMode?.ownerNodeIndex === "number" &&  this.options.devMode.ownerNodeIndex >= 0) {
+      if (this.options.devMode && typeof this.options.devMode?.ownerNodeIndex === "number" && this.options.devMode.ownerNodeIndex >= 0) {
         sheets[this.options.devMode.ownerNodeIndex].ownerNode = this._style;
       }
 
@@ -4290,7 +4290,7 @@ export class SlickGrid<TData = any, C extends Column<TData> = Column<TData>, O e
   }
 
   getViewportWidth() {
-    this.viewportW = parseFloat(Utils.innerSize(this._container, 'width') as unknown as string) || this.options.devMode?.containerClientWidth || 0;
+    this.viewportW = parseFloat(Utils.innerSize(this._container, 'width') as unknown as string) || (this.options.devMode && this.options.devMode.containerClientWidth) || 0;
     return this.viewportW;
   }