chore(release): publish version 5.8.2

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.8.2](https://github.com/6pac/SlickGrid/compare/5.8.1...5.8.2) (2024-03-16)
+
+### Bug Fixes
+
+* `column.editor` and `gridOptions.editorFactory` type changed ([#995](https://github.com/6pac/SlickGrid/issues/995)) ([e02cf64](https://github.com/6pac/SlickGrid/commit/e02cf641a393528ae366edacf86b8f3eec6ef8a5))
+* realtime trading demo grouping wasn't working ([#991](https://github.com/6pac/SlickGrid/issues/991)) ([180e4e7](https://github.com/6pac/SlickGrid/commit/180e4e7725383f25dca251191a0027788c7f29a2))
+
 ## [5.8.1](https://github.com/6pac/SlickGrid/compare/5.8.0...5.8.1) (2024-02-13)
 
 ### Bug Fixes

dist/cjs/index.js

@@ -6613,7 +6613,7 @@ var SlickGrid = class {
     this.externalPubSub = externalPubSub;
     //////////////////////////////////////////////////////////////////////////////////////////////
     // Public API
-    __publicField(this, "slickGridVersion", "5.8.1");
+    __publicField(this, "slickGridVersion", "5.8.2");
     /** optional grid state clientId */
     __publicField(this, "cid", "");
     // Events
@@ -9063,11 +9063,12 @@ var SlickGrid = class {
     }
     this.getEditorLock()?.activate(this.editController), this.activeCellNode.classList.add("editable");
     let useEditor = editor || this.getEditor(this.activeRow, this.activeCell);
+    if (!useEditor || typeof useEditor != "function")
+      return;
     !editor && !useEditor.suppressClearOnEdit && Utils30.emptyElement(this.activeCellNode);
     let metadata = this.data?.getItemMetadata?.(this.activeRow);
     metadata = metadata?.columns;
-    let columnMetaData = metadata && (metadata[columnDef.id] || metadata[this.activeCell]);
-    this.currentEditor = new useEditor({
+    let columnMetaData = metadata && (metadata[columnDef.id] || metadata[this.activeCell]), editorArgs = {
       grid: this,
       gridPosition: this.absBox(this._container),
       position: this.absBox(this.activeCellNode),
@@ -9078,7 +9079,8 @@ var SlickGrid = class {
       event: e,
       commitChanges: this.commitEditAndSetFocus.bind(this),
       cancelChanges: this.cancelEditAndSetFocus.bind(this)
-    }), item && this.currentEditor && (this.currentEditor.loadValue(item), preClickModeOn && this.currentEditor?.preClick && this.currentEditor.preClick()), this.serializedEditorValue = this.currentEditor?.serializeValue(), this.currentEditor?.position && this.handleActiveCellPositionChange();
+    };
+    this.currentEditor = new useEditor(editorArgs), item && this.currentEditor && (this.currentEditor.loadValue(item), preClickModeOn && this.currentEditor?.preClick && this.currentEditor.preClick()), this.serializedEditorValue = this.currentEditor?.serializeValue(), this.currentEditor?.position && this.handleActiveCellPositionChange();
   }
   commitEditAndSetFocus() {
     this.getEditorLock()?.commitCurrentEdit() && (this.setFocus(), this._options.autoEdit && !this._options.autoCommitEdit && this.navigateDown());
@@ -9805,7 +9807,7 @@ var SlickRemoteModel = class {
  * Distributed under MIT license.
  * All rights reserved.
  *
- * SlickGrid v5.8.1
+ * SlickGrid v5.8.2
  *
  * NOTES:
  *     Cell/row DOM manipulations are done directly bypassing JS DOM manipulation methods.

dist/esm/index.js

@@ -6510,7 +6510,7 @@ var SlickGrid = class {
     this.externalPubSub = externalPubSub;
     //////////////////////////////////////////////////////////////////////////////////////////////
     // Public API
-    __publicField(this, "slickGridVersion", "5.8.1");
+    __publicField(this, "slickGridVersion", "5.8.2");
     /** optional grid state clientId */
     __publicField(this, "cid", "");
     // Events
@@ -8960,11 +8960,12 @@ var SlickGrid = class {
     }
     this.getEditorLock()?.activate(this.editController), this.activeCellNode.classList.add("editable");
     let useEditor = editor || this.getEditor(this.activeRow, this.activeCell);
+    if (!useEditor || typeof useEditor != "function")
+      return;
     !editor && !useEditor.suppressClearOnEdit && Utils30.emptyElement(this.activeCellNode);
     let metadata = this.data?.getItemMetadata?.(this.activeRow);
     metadata = metadata?.columns;
-    let columnMetaData = metadata && (metadata[columnDef.id] || metadata[this.activeCell]);
-    this.currentEditor = new useEditor({
+    let columnMetaData = metadata && (metadata[columnDef.id] || metadata[this.activeCell]), editorArgs = {
       grid: this,
       gridPosition: this.absBox(this._container),
       position: this.absBox(this.activeCellNode),
@@ -8975,7 +8976,8 @@ var SlickGrid = class {
       event: e,
       commitChanges: this.commitEditAndSetFocus.bind(this),
       cancelChanges: this.cancelEditAndSetFocus.bind(this)
-    }), item && this.currentEditor && (this.currentEditor.loadValue(item), preClickModeOn && this.currentEditor?.preClick && this.currentEditor.preClick()), this.serializedEditorValue = this.currentEditor?.serializeValue(), this.currentEditor?.position && this.handleActiveCellPositionChange();
+    };
+    this.currentEditor = new useEditor(editorArgs), item && this.currentEditor && (this.currentEditor.loadValue(item), preClickModeOn && this.currentEditor?.preClick && this.currentEditor.preClick()), this.serializedEditorValue = this.currentEditor?.serializeValue(), this.currentEditor?.position && this.handleActiveCellPositionChange();
   }
   commitEditAndSetFocus() {
     this.getEditorLock()?.commitCurrentEdit() && (this.setFocus(), this._options.autoEdit && !this._options.autoCommitEdit && this.navigateDown());
@@ -9787,7 +9789,7 @@ export {
  * Distributed under MIT license.
  * All rights reserved.
  *
- * SlickGrid v5.8.1
+ * SlickGrid v5.8.2
  *
  * NOTES:
  *     Cell/row DOM manipulations are done directly bypassing JS DOM manipulation methods.

dist/types/models/column.interface.d.ts

@@ -1,9 +1,10 @@
-import type { AutoSize, CellMenuOption, CustomTooltipOption, Editor, EditorValidator, Formatter, FormatterResultWithHtml, FormatterResultWithText, GroupTotalsFormatter, Grouping, HeaderButtonsOrMenu } from './index';
+import type { AutoSize, CellMenuOption, CustomTooltipOption, Editor, EditorConstructor, EditorValidator, Formatter, FormatterResultWithHtml, FormatterResultWithText, GroupTotalsFormatter, Grouping, HeaderButtonsOrMenu } from './index';
 import type { SlickGrid } from '../slick.grid';
 type PathsToStringProps<T> = T extends string | number | boolean | Date ? [] : {
     [K in Extract<keyof T, string>]: [K, ...PathsToStringProps<T[K]>];
 }[Extract<keyof T, string>];
-type Join<T extends any[], D extends string> = T extends [] ? never : T extends [infer F] ? F : T extends [infer F, ...infer R] ? F extends string ? string extends F ? string : `${F}${D}${Join<R, D>}` : never : string;
+type AllowedJoinTypes = string | number | boolean;
+type Join<T extends (AllowedJoinTypes | unknown)[], D extends string> = T extends [] ? never : T extends [infer F] ? F : T extends [infer F, ...infer R] ? F extends AllowedJoinTypes ? string extends F ? string : `${F}${D}${Join<Extract<R, AllowedJoinTypes[]>, D>}` : never : string;
 export type FormatterOverrideCallback = (row: number, cell: number, val: any, columnDef: Column, item: any, grid: SlickGrid) => string | FormatterResultWithHtml | FormatterResultWithText;
 export interface Column<TData = any> {
     /** Defaults to false, should we always render the column? */
@@ -45,9 +46,7 @@ export interface Column<TData = any> {
      */
     disableTooltip?: boolean;
     /** Any inline editor function that implements Editor for the cell value or ColumnEditor */
-    editor?: Editor | {
-        model?: Editor;
-    } | null;
+    editor?: Editor | EditorConstructor | null;
     /** Editor number fixed decimal places */
     editorFixedDecimalPlaces?: number;
     /** Default to false, which leads to exclude the column title from the Column Picker. */

dist/types/models/editor.interface.d.ts

@@ -1,5 +1,4 @@
-import type { EditorArguments } from './editorArguments.interface';
-import type { EditorValidationResult } from './editorValidationResult.interface';
+import type { Column, EditorArguments, EditorValidationResult, GridOption } from './index';
 /**
  * SlickGrid Editor interface, more info can be found on the SlickGrid repo
  * https://github.com/6pac/SlickGrid/wiki/Writing-custom-cell-editors
@@ -60,12 +59,16 @@ export interface Editor {
     isValueChanged: () => boolean;
     /** Update the Editor DOM element value with a provided value, we can optionally apply the value to the item dataContext object */
     setValue?: (value: any, isApplyingValue?: boolean, triggerOnCompositeEditorChange?: boolean) => void;
-    suppressClearOnEdit?: boolean;
     /**
      * Validate user input and return the result along with the validation message.
      * if the input is valid then the validation result output would be returning { valid:true, msg:null }
      * The first argument "targetElm" is ONLY used internally by the Composite Editor in most cases you want to make this null or undefined
      */
     validate: (targetElm?: HTMLElement, options?: any) => EditorValidationResult;
 }
+export type EditorConstructor = {
+    new <TData = any, C extends Column<TData> = Column<TData>, O extends GridOption<C> = GridOption<C>>(args: EditorArguments<TData, C, O>): Editor;
+    /** Static flag used in makeActiveCellEditable. */
+    suppressClearOnEdit?: boolean;
+};
 //# sourceMappingURL=editor.interface.d.ts.map