dhx-suite 9.0.4 → 9.1.1

package/codebase/types/ts-common/core.d.ts

@@ -32,5 +32,9 @@ export interface IContainerConfig {
 export declare const getStringWidth: (value: string, config?: IContainerConfig) => number;
 export declare const rgbToHex: (color: string) => string;
 export declare function getCloneObject(obj: any): any;
-export declare function getTextLines(ctx: any, text: string, maxWidth: number): string[];
+export declare function getTextLines({ ctx, text, maxWidth }: {
+    ctx: any;
+    text: any;
+    maxWidth: any;
+}): string[];
 export {};

package/codebase/types/ts-data/sources/datacollection.d.ts

@@ -1,7 +1,7 @@
 import { IEventSystem } from "../../ts-common/events";
 import { Id } from "../../ts-common/types";
 import { Sort } from "./datacollection/sort";
-import { DataCallback, DataEvents, IDataCollection, IDataItem, IDataProxy, IFilterCallback, IFilterConfig, IFilterMode, ISortMode, ITreeCollection, IUpdateObject, ReduceCallBack, Statuses, IDataEventsHandlersMap, DataDriver, IDataConfig, ISortConfig, IDataDriver, IFilterComplexMode, IFilter, IResetFilterConfig, IGroupDataConfig } from "./types";
+import { DataCallback, DataEvents, IDataCollection, IDataItem, IDataProxy, IFilterCallback, IFilterConfig, IFilterMode, ISortMode, ITreeCollection, IUpdateObject, ReduceCallBack, Statuses, IDataEventsHandlersMap, DataDriver, IDataConfig, ISortConfig, IDataDriver, IFilterComplexMode, IFilter, IResetFilterConfig, IGroupDataConfig, ISortingState } from "./types";
 import { TGroupOrder, IGroup } from "./datacollection/group";
 export declare class DataCollection<T extends IDataItem = IDataItem> implements IDataCollection<T> {
     loadData: Promise<any>;
@@ -18,9 +18,11 @@ export declare class DataCollection<T extends IDataItem = IDataItem> implements
     protected _meta: any;
     protected _range: [number, number];
     protected _loaded: boolean;
-    protected _initOrder: T[];
+    protected _initFilterOrder: T[];
+    protected _initSortOrder: T[];
     protected _filters: IFilter;
     protected _group: IGroup;
+    protected _sortingStates: ISortingState[];
     private _changes;
     private _loader;
     constructor(config?: any, events?: IEventSystem<any>);
@@ -52,7 +54,8 @@ export declare class DataCollection<T extends IDataItem = IDataItem> implements
     }): IFilter;
     find(conf: IFilterMode | DataCallback<T>): any;
     findAll(conf: IFilterMode | DataCallback<T>): any[];
-    sort(rule?: ISortMode, config?: ISortConfig): void;
+    sort(rule?: ISortMode, config?: ISortConfig, ignore?: boolean): void;
+    getSortingStates(): ISortMode[];
     copy(id: Id | Id[], index: number, target?: IDataCollection | ITreeCollection, targetId?: Id): Id | Id[];
     move(id: Id | Id[], index: number, target?: IDataCollection | ITreeCollection, targetId?: Id, newId?: Id): Id | Id[];
     forEach(callback: DataCallback<T>): void;

package/codebase/types/ts-data/sources/treecollection.d.ts

@@ -18,7 +18,7 @@ export declare class TreeCollection<T extends IDataItem = IDataItem> extends Dat
     removeAll(id?: Id): void;
     update(id: Id, newItem: IUpdateObject, silent?: boolean): void;
     getIndex(id: Id): number;
-    sort(rule?: ISortMode, config?: ISortConfig): void;
+    sort(rule?: ISortMode, config?: ISortConfig, ignore?: boolean): void;
     filter(rule?: IFilterMode | IFilterComplexMode | IFilterCallback, config?: ITreeFilterConfig, silent?: boolean): string;
     restoreOrder(): void;
     copy(id: Id, index: number, target?: IDataCollection | ITreeCollection, targetId?: Id): Id;
@@ -49,6 +49,7 @@ export declare class TreeCollection<T extends IDataItem = IDataItem> extends Dat
     protected _removeCore(id: any): void;
     protected _addToOrder(_order: any, obj: any, index: number): void;
     protected _parse_data(data: any, parent?: Id): void;
+    protected _parseItem(item: any): void;
     private _fastDeleteChilds;
     private _recursiveFilter;
     private _serialize;

package/codebase/types/ts-data/sources/types.d.ts

@@ -18,12 +18,14 @@ export interface ILazyConfig {
     delay?: number;
     prepare?: number;
 }
+export type TSortDir = "asc" | "desc";
 export interface ISortMode {
     by?: string | number;
-    dir?: string;
+    dir?: TSortDir;
     as?: (a: any) => any;
     rule?: (a: any, b: any) => number;
 }
+export type ISortingState = ISortMode & ISortConfig;
 export type IFilterCallback = (obj: any) => boolean;
 export interface IFilterMode {
     by?: Id;
@@ -117,6 +119,7 @@ export interface IDataCollection<T extends IDataItem = IDataItem> {
     map(callback: DataCallback<T>): T[];
     mapRange(from: number, to: number, callback: DataCallback<T>): T[];
     sort(rule?: ISortMode, config?: ISortConfig): void;
+    getSortingStates(): ISortingState[];
     serialize(driver?: DataDriver): T[];
     copy(id: Id | Id[], index: number, target?: IDataCollection | ITreeCollection, targetId?: Id): Id | Id[];
     move(id: Id | Id[], index: number, target?: IDataCollection | ITreeCollection, targetId?: Id): Id | Id[];

package/codebase/types/ts-grid/sources/ExtendedGrid.d.ts

@@ -1,18 +1,28 @@
-import { IGridConfig, ICol, IRow, IFooter, IHeader, IGroupOrderItem, IExtendedGrid, IExtendedGridConfig } from "./types";
+import { IGridConfig, ICol, IRow, IFooter, IHeader, IGroupOrderItem, IExtendedGrid, IExtendedGridConfig, ISubViewCell } from "./types";
 import { IDataCollection, IDataItem } from "../../ts-data";
 import { ScrollView } from "../../ts-common/ScrollView";
+import { Id } from "../../ts-common/types";
 import { Grid } from "./Grid";
 export declare class ExtendedGrid extends Grid implements IExtendedGrid {
     scrollView: ScrollView;
     config: IExtendedGridConfig;
     constructor(container: HTMLElement | string | null, config?: IExtendedGridConfig);
+    expand(rowId: Id): void;
+    collapse(rowId: Id): void;
+    expandAll(): void;
+    collapseAll(): void;
+    getSubRow(id: Id): ISubViewCell | null;
     protected _createView(): any;
+    protected _setHTMLEventHandlers(): void;
     protected _setEventHandlers(): void;
+    protected _setSort(): void;
     protected getNormalizeContentHeight(row: IFooter | IHeader, col: ICol, config: IGridConfig): number;
     protected _prepareData(data: IDataItem[] | IDataCollection): IDataItem[] | IRow[];
     protected _prepareDataFromTo(data: IDataCollection, from: number, to: number): IDataItem[];
     protected _dragStart(event: any): void;
     protected _group(order: IGroupOrderItem[]): void;
+    protected _expand(row: IRow): boolean;
+    protected _collapse(row: IRow): boolean;
     private _lazyLoad;
     private _getGhostItem;
     private _dragStartColumn;

package/codebase/types/ts-grid/sources/Grid.d.ts

@@ -2,10 +2,10 @@ import { IEventSystem } from "../../ts-common/events";
 import { IKeyManager } from "../../ts-common/KeyManager";
 import { Id, ITouchParam } from "../../ts-common/types";
 import { View } from "../../ts-common/view";
-import { DataEvents, DragEvents, IDataCollection, IDataEventsHandlersMap, IDataItem, IDragEventsHandlersMap } from "../../ts-data";
+import { DataEvents, DragEvents, IDataCollection, IDataEventsHandlersMap, IDataItem, IDragEventsHandlersMap, TSortDir } from "../../ts-data";
 import { Exporter } from "./Exporter";
 import { ISelection } from "./Selection";
-import { Dirs, EditorType, GridEvents, IAdjustBy, ICellRect, ICol, IContentList, ICoords, IEventHandlersMap, IGrid, IGridConfig, IRow, IScrollState, ISpan, GridSystemEvents, ISystemEventHandlersMap, IColumnsWidth, ISortingState, SortFunction, IHeaderFilter, IAdjustColumns, IDirection, IFooter, IHeader, INormalizeColumnsParams, ISummaryList } from "./types";
+import { EditorType, GridEvents, IAdjustBy, ICellRect, ICol, IContentList, ICoords, IEventHandlersMap, IGrid, IGridConfig, IRow, IScrollState, ISpan, GridSystemEvents, ISystemEventHandlersMap, IColumnsWidth, SortFunction, IHeaderFilter, IAdjustColumns, IDirection, IFooter, IHeader, INormalizeColumnsParams, ISummaryList, ISortingStates } from "./types";
 export declare class Grid extends View implements IGrid {
     version: string;
     name: "grid";
@@ -21,10 +21,7 @@ export declare class Grid extends View implements IGrid {
     protected _scroll: IScrollState;
     protected _events: IEventSystem<GridSystemEvents, ISystemEventHandlersMap>;
     protected _htmlEvents: any;
-    protected _sortState: {
-        by: Id;
-        dir: Dirs;
-    };
+    protected _sortingStates: ISortingStates;
     protected _activeFilters: object;
     private _filterData;
     private _hiddenFilters;
@@ -54,12 +51,13 @@ export declare class Grid extends View implements IGrid {
     removeSpan(rowId: Id, colId: Id): void;
     editCell(rowId: Id, colId: Id, editorType?: EditorType): void;
     editEnd(withoutSave?: boolean): void;
-    getSortingState(): ISortingState;
     getHeaderFilter(colId: Id): IHeaderFilter;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
-    edit(rowId: Id, colId: Id, editorType?: EditorType): void;
-    paint(): void;
     getSummary(colId?: Id): ISummaryList;
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
+    getSortingState(): {
+        dir?: TSortDir;
+        by?: Id;
+    };
     protected _createView(): any;
     protected _parseColumns(configChanged?: boolean): void;
     protected normalizeColumns({ config, columns, configChanged }: INormalizeColumnsParams): void;
@@ -67,9 +65,11 @@ export declare class Grid extends View implements IGrid {
     protected _parseData(): void;
     protected _createCollection(): void;
     protected _getRowIndex(rowId: Id): number;
+    protected _setHTMLEventHandlers(): void;
     protected _setEventHandlers(): void;
     protected _addEmptyRow(): void;
-    protected _sort(by: Id, sortAs?: SortFunction): void;
+    protected _sort(by: Id, sortAs?: SortFunction, smartSorting?: boolean): void;
+    protected _setSort(): void;
     protected _clearTouchTimer(): void;
     protected _checkFilters(reset?: boolean): void;
     protected _setUniqueData(sync?: boolean): void;

package/codebase/types/ts-grid/sources/ProGrid.d.ts

@@ -1,15 +1,15 @@
 import { ScrollView } from "../../ts-common/ScrollView";
-import { ITreeEventHandlersMap, TreeGridCollection, TreeGridEvents } from "../../ts-treegrid";
-import { EditorType, GridEvents, IAdjustBy, ICellRect, ICol, IContentList, ICoords, IEventHandlersMap, IHeaderFilter, IProGrid, IProGridConfig, ISortingState, ISpan, ISummaryList } from "./types";
+import { TreeGridCollection } from "../../ts-treegrid";
+import { EditorType, GridEvents, IAdjustBy, ICellRect, ICol, IContentList, ICoords, IEventHandlersMap, IHeaderFilter, IProGrid, IProGridConfig, ISpan, ISubViewCell, ISummaryList } from "./types";
 import { IKeyManager } from "../../ts-common/KeyManager";
 import { IEventSystem } from "../../ts-common/events";
 import { Id } from "../../ts-common/types";
-import { DataEvents, DragEvents, IDataEventsHandlersMap, IDragEventsHandlersMap, IDataCollection, IDataItem } from "../../ts-data";
+import { DataEvents, DragEvents, IDataEventsHandlersMap, IDragEventsHandlersMap, IDataCollection, IDataItem, TSortDir } from "../../ts-data";
 import { ISelection } from "./Selection";
 export declare class ProGrid implements IProGrid {
     config: IProGridConfig;
     scrollView: ScrollView;
-    events: IEventSystem<GridEvents | DataEvents | DragEvents | TreeGridEvents, IEventHandlersMap & IDataEventsHandlersMap & IDragEventsHandlersMap & ITreeEventHandlersMap>;
+    events: IEventSystem<GridEvents | DataEvents | DragEvents, IEventHandlersMap & IDataEventsHandlersMap & IDragEventsHandlersMap>;
     name: string;
     data: IDataCollection<IDataItem> & TreeGridCollection;
     selection: ISelection;
@@ -45,9 +45,14 @@ export declare class ProGrid implements IProGrid {
     removeSpan(rowId: Id, colId: Id): void;
     editCell(rowId: Id, colId: Id, editorType?: EditorType): void;
     editEnd(withoutSave?: boolean): void;
-    getSortingState(): ISortingState;
     getHeaderFilter(colId: Id): IHeaderFilter;
     getSummary(colId?: Id): ISummaryList;
+    getSubRow(id: Id): ISubViewCell | null;
     getRootNode(): HTMLElement;
     getRootView(): void;
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
+    getSortingState(): {
+        dir?: TSortDir;
+        by?: Id;
+    };
 }

package/codebase/types/ts-grid/sources/helpers/cells.d.ts

@@ -1,7 +1,7 @@
 import { ICell, ICol, IGrid, IRow, ISpan } from "./../types";
 import { Id } from "../../../ts-common/types";
 export declare function getWidth(columns: ICol[], colspan: number, index: number): number;
-export declare function getHeight(rows: IRow[], span: ISpan): number;
+export declare function getSpanHeight(rows: IRow[], span: ISpan): number;
 export declare function getReducedColspan(columns: ICol[], colId: Id, colspan: number): number;
 export declare function getReducedRowspan(initialRows: IRow[], currRows: IRow[], rowIndex: number, span: ISpan): number;
 export declare function normalizeCell(cell: ICell, grid: IGrid): ICell;

package/codebase/types/ts-grid/sources/helpers/data.d.ts

@@ -1,5 +1,6 @@
 import { IContainerConfig } from "../../../ts-common/core";
-import { ICol, IColumnsWidth, IGridConfig, IRow, AdjustTargetType, TOption } from "./../types";
+import { ICol, IColumnsWidth, IGridConfig, IRow, AdjustTargetType, TOption, IScrollState, IRange, ISizes } from "./../types";
+export declare function getTotalRowHeight(row: IRow): number;
 export declare function normalizeArray(obj: any, name: string): void;
 export declare function measureTextHeight({ text, width, lineHeight, font, htmlEnable, }: {
     text?: string;
@@ -9,17 +10,16 @@ export declare function measureTextHeight({ text, width, lineHeight, font, htmlE
     htmlEnable?: boolean;
 }): number;
 export declare function countColumns(config: IGridConfig, columns: ICol[]): number;
-export declare function calculatePositions(width: number, height: number, scroll: any, conf: IGridConfig, data: IRow[]): {
-    xStart: number;
-    xEnd: number;
-    yStart: number;
-    yEnd: number;
-};
-export declare function getUnique(arr: any[], name: string, multiselection: boolean): any[];
-export declare const getMaxRowHeight: (row: IRow, cols: ICol[], config?: IContainerConfig) => number;
+export declare function calculateVisibleRange(viewPortSize: ISizes, scroll: IScrollState, config: IGridConfig, data: IRow[]): IRange;
+export declare function getUnique(arr: any[], name: string, multiselection: boolean, editorType: ICol["editorType"]): any[];
+export declare const getMaxRowHeight: ({ cols, row, config, }: {
+    row: IRow;
+    cols: ICol[];
+    config?: IContainerConfig;
+}) => number;
 export declare const getCalculatedRowHeight: (height: number, config?: {
     rowHeight: number;
-    padding?: number;
+    verticalOffset?: number;
 }) => number;
 export declare const getTreeCellWidthOffset: (row: IRow, toArrow?: boolean) => number;
 export declare const getMaxColsWidth: (rows: IRow[], cols: ICol[], config: IContainerConfig, target: AdjustTargetType) => IColumnsWidth;

package/codebase/types/ts-grid/sources/helpers/default.d.ts

@@ -1,2 +1,3 @@
-import { IGroup } from "../types";
+import { IGroup, ISubRowConfig } from "../types";
 export declare const getGroupDefaultConfig: (config?: IGroup | boolean) => IGroup;
+export declare const defaultSubRowConfig: Omit<ISubRowConfig, "view">;

package/codebase/types/ts-grid/sources/types.d.ts

@@ -2,7 +2,7 @@ import { IEventSystem } from "../../ts-common/events";
 import { IKeyManager } from "../../ts-common/KeyManager";
 import { IAlign } from "../../ts-common/html";
 import { Position } from "../../ts-message";
-import { IDataCollection, IDragConfig, ICsvDriverConfig, IDataItem, IDragInfo, DataCollection } from "../../ts-data";
+import { IDataCollection, IDragConfig, ICsvDriverConfig, IDataItem, IDragInfo, DataCollection, ISortMode, TSortDir } from "../../ts-data";
 import { Combobox } from "../../ts-combobox";
 import { IHandlers, Id } from "../../ts-common/types";
 import { ScrollView } from "../../ts-common/ScrollView";
@@ -13,6 +13,7 @@ import { IGroupOrder, TDisplayMode } from "../../ts-data/sources/datacollection/
 import { IGroupItem } from "./ui/group/panel";
 import { ITreeGrid, ITreeGridConfig } from "../../ts-treegrid";
 import { ISelection } from "./Selection";
+import { IProCell, IViewConstructor } from "../../ts-layout";
 export interface IGrid {
     data: IDataCollection;
     name: "grid" | string;
@@ -47,15 +48,24 @@ export interface IGrid {
     removeSpan(rowId: Id, colId: Id): void;
     editCell(rowId: Id, colId: Id, editorType?: EditorType): void;
     editEnd(withoutSave?: boolean): void;
-    getSortingState(): ISortingState;
     getHeaderFilter(colId: Id): IHeaderFilter;
     getRootNode(): HTMLElement;
     getSummary(colId?: Id): ISummaryList;
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/suite/migration/ */
+    getSortingState(): {
+        dir?: TSortDir;
+        by?: Id;
+    };
 }
 export interface IExtendedGrid extends IGrid {
     name: "progrid" | string;
     scrollView: ScrollView;
     config: IExtendedGridConfig;
+    getSubRow(id: Id): ISubViewCell | null;
+    expand(rowId: Id): void;
+    collapse(rowId: Id): void;
+    expandAll(): void;
+    collapseAll(): void;
 }
 export interface IProGrid extends ITreeGrid {
     config: IProGridConfig;
@@ -75,6 +85,7 @@ export interface IGridConfig extends IDragConfig {
     rightSplit?: number;
     bottomSplit?: number;
     sortable?: boolean;
+    multiSort?: boolean;
     editable?: boolean;
     resizable?: boolean;
     groupable?: boolean;
@@ -100,17 +111,17 @@ export interface IGridConfig extends IDragConfig {
     summary?: ISummary;
     hotkeys?: IHandlers;
     rootParent?: Id;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     groupTitleTemplate?: (groupName: string, groupItems: IDataItem[]) => string;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     editing?: boolean;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     headerSort?: boolean;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     columnsAutoWidth?: boolean;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     fitToContainer?: boolean;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     splitAt?: number;
     $width?: number;
     $height?: number;
@@ -134,15 +145,19 @@ export interface IGridConfig extends IDragConfig {
     $scrollBarWidth?: IScrollBarWidth;
     $data?: any[];
     $grouped?: IGroupItem[];
+    $subRowCells?: Map<Id, ISubRowCell>;
 }
 export type IProGridConfig = IExtendedGridConfig & ITreeGridConfig;
 export interface IExtendedGridConfig extends IGridConfig {
+    subRowConfig?: ((row: IRow) => ISubRowConfig) | ISubRowConfig;
+    subRow?: (row: IRow) => string | IViewConstructor;
     height?: number | "auto";
     autoHeight?: boolean;
     headerAutoHeight?: boolean;
     footerAutoHeight?: boolean;
     group?: boolean | IGroup;
     dragItem?: IDragType;
+    multiSort?: boolean;
 }
 export interface IRendererConfig extends Required<IProGridConfig> {
     scroll?: IScrollState;
@@ -158,8 +173,7 @@ export interface IRendererConfig extends Required<IProGridConfig> {
     footerHeight?: number;
     events?: IEventSystem<GridEvents, IEventHandlersMap>;
     selection: any;
-    sortBy?: Id;
-    sortDir?: string;
+    sort: ISortingStates;
     filterLocation?: string;
     content?: IContentList;
     gridId?: string;
@@ -207,6 +221,10 @@ export declare enum GridEvents {
     afterRowHide = "afterRowHide",
     beforeRowShow = "beforeRowShow",
     afterRowShow = "afterRowShow",
+    beforeCollapse = "beforeCollapse",
+    afterCollapse = "afterCollapse",
+    beforeExpand = "beforeExpand",
+    afterExpand = "afterExpand",
     beforeRowDrag = "beforeRowDrag",
     dragRowStart = "dragRowStart",
     dragRowOut = "dragRowOut",
@@ -235,8 +253,8 @@ export declare enum GridEvents {
 export interface IEventHandlersMap {
     [key: string]: (...args: any[]) => any;
     [GridEvents.scroll]: (scrollState: ICoords) => void;
-    [GridEvents.beforeSort]: (column: ICol, dir: Dirs) => void | boolean;
-    [GridEvents.afterSort]: (column: ICol, dir: Dirs) => void;
+    [GridEvents.beforeSort]: (column: ICol, dir: TSortDir) => void | boolean;
+    [GridEvents.afterSort]: (column: ICol, dir: TSortDir) => void;
     [GridEvents.filterChange]: (value: string | string[], colId: Id, filterId: TContentFilter, silent?: boolean) => void;
     [GridEvents.beforeFilter]: (value: string, colId: Id) => void | boolean;
     [GridEvents.beforeResizeStart]: (column: ICol, event: MouseEvent) => boolean | void;
@@ -271,6 +289,10 @@ export interface IEventHandlersMap {
     [GridEvents.afterRowHide]: (row: IRow) => void;
     [GridEvents.beforeRowShow]: (row: IRow) => boolean | void;
     [GridEvents.afterRowShow]: (row: IRow) => void;
+    [GridEvents.beforeCollapse]: (rowId: Id) => boolean | void;
+    [GridEvents.afterCollapse]: (rowId: Id) => void;
+    [GridEvents.beforeExpand]: (rowId: Id) => boolean | void;
+    [GridEvents.afterExpand]: (rowId: Id) => void;
     [GridEvents.beforeRowDrag]: (data: IDragInfo, event: MouseEvent) => void | boolean;
     [GridEvents.dragRowStart]: (data: IDragInfo, event: MouseEvent) => void;
     [GridEvents.dragRowOut]: (data: IDragInfo, event: MouseEvent) => void;
@@ -291,7 +313,7 @@ export interface IEventHandlersMap {
     [GridEvents.afterColumnDrag]: (data: IDragInfo, event: MouseEvent) => void;
     [GridEvents.beforeRowResize]: (row: IRow, event: Event, currentHeight: number) => boolean;
     [GridEvents.afterRowResize]: (row: IRow, event: Event, currentHeight: number) => void;
-    [GridEvents.groupPanelItemClick]: (id: string, event: Event) => void;
+    [GridEvents.groupPanelItemClick]: (id: string, event: MouseEvent | TouchEvent) => void;
     [GridEvents.groupPanelItemMouseDown]: (id: string, event: MouseEvent | TouchEvent) => void;
     [GridEvents.expand]: (rowId: Id) => void;
 }
@@ -343,15 +365,15 @@ export interface ICol {
     dateFormat?: string;
     summary?: TSummary;
     gravity?: number;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     format?: string;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     editing?: boolean;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     headerSort?: boolean;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     columnsAutoWidth?: boolean;
-    /** @deprecated See a documentation: https://docs.dhtmlx.com/ */
+    /** @deprecated See a documentation: https://docs.dhtmlx.com/suite/migration/ */
     fitToContainer?: boolean;
     $cellCss?: {
         [key: string]: string;
@@ -368,7 +390,10 @@ export interface IRow {
     height?: number;
     hidden?: boolean;
     [key: string]: any;
+    $index?: number;
     $height?: number;
+    $opened?: boolean;
+    $subRowHeight?: number;
 }
 export interface ISpan {
     row: Id;
@@ -410,6 +435,22 @@ export interface IFooter extends IContent {
         value: string;
     } & ISummaryList, header: IFooter, column: ICol) => string | boolean;
 }
+export interface ISubViewCell extends ISubRowConfig {
+    view: string | any;
+    element: HTMLElement | null;
+}
+export interface ISubRowCell extends ISubRowConfig {
+    cell?: IProCell;
+}
+export interface ISubRowConfig {
+    expanded?: boolean;
+    preserve?: boolean;
+    toggleIcon?: boolean;
+    height?: number;
+    padding?: number | string;
+    fullWidth?: boolean;
+    css?: string;
+}
 export interface ISummaryList {
     [key: string]: string | number | null;
 }
@@ -457,6 +498,12 @@ export interface IScrollState {
     left: number;
     top: number;
 }
+export interface IRange {
+    xStart: number;
+    xEnd: number;
+    yStart: number;
+    yEnd: number;
+}
 interface IFixedColumns {
     left: ICol[];
     right: ICol[];
@@ -466,11 +513,11 @@ interface IFixedRows {
     bottom: IRow[];
 }
 type RenderFrom = "leftFixedCols" | "rightFixedCols" | "topFixedRows" | "bottomFixedRows" | "render";
-export interface ISortingState {
-    dir: Dirs;
-    by: Id;
-}
 export type EditorType = "input" | "select" | "datePicker" | "checkbox" | "combobox" | "multiselect" | "textarea";
+export interface ISort extends Omit<ISortMode, "as" | "rule"> {
+    permanent?: boolean;
+}
+export type ISortingStates = ISort[];
 export interface IComboEditorConfig {
     newOptions?: boolean;
     readOnly?: boolean;
@@ -596,7 +643,6 @@ export interface ICsvExportConfig extends ICsvDriverConfig {
     rowDelimiter?: string;
     columnDelimiter?: string;
 }
-export type Dirs = "asc" | "desc";
 export interface ICoords {
     x: number;
     y: number;

package/codebase/types/ts-grid/sources/ui/Cells.d.ts

@@ -1,4 +1,4 @@
-import { GridEvents, GridSystemEvents, ICol, ICoords, IGridConfig, IRendererConfig, ISpan, Split } from "../types";
+import { GridEvents, GridSystemEvents, ICoords, IGridConfig, IRendererConfig, ISpan, Split } from "../types";
 import { IDataCollection } from "../../../ts-data";
 type mouseEvents = GridEvents.cellClick | GridEvents.cellMouseOver | GridEvents.cellMouseDown | GridEvents.cellDblClick | GridEvents.cellRightClick;
 type touchEvents = GridSystemEvents.cellTouchEnd | GridSystemEvents.cellTouchMove;
@@ -13,7 +13,6 @@ export declare function getHandlers(row: number, column: number, conf: IRenderer
     ontouchmove: (number | GridSystemEvents | IRendererConfig | typeof handleMouse)[];
     ontouchend: (number | GridSystemEvents | IRendererConfig | typeof handleMouse)[];
 };
-export declare function getTreeCell(content: any, row: any, col: ICol, conf: IRendererConfig): any;
 export declare function getCells(conf: IRendererConfig): any[];
 export declare function getSpans(config: IRendererConfig, mode?: Split): any[];
 export declare function getShifts(conf: IRendererConfig): ICoords;

package/codebase/types/ts-grid/sources/ui/SubRows.d.ts

@@ -0,0 +1,4 @@
+import { VNode } from "../../../ts-common/dom";
+import { IProGrid, IRendererConfig, IRow } from "../types";
+export declare function getSubRowContent(config: IRendererConfig): VNode[];
+export declare function setSubRowCell(grid: IProGrid, rows: IRow[]): void;

package/codebase/types/ts-grid/sources/ui/editors/ComboboxEditor.d.ts

@@ -14,4 +14,5 @@ export declare class ComboboxEditor implements IEditor {
     endEdit(withoutSave?: boolean): void;
     toHTML(): any;
     protected _initHandlers(): void;
+    private _setCustomOptions;
 }

package/codebase/types/ts-grid/sources/ui/group/panel.d.ts

@@ -4,9 +4,10 @@ export interface IGroupItem {
     label: string;
     closable?: boolean;
     sortable?: boolean;
-    sort?: "asc" | "desc";
+    sortDir?: "asc" | "desc" | null;
+    sortOrder?: number | null;
     mode?: "basic" | "drop";
     notGrouped?: boolean;
 }
-export declare function getGroupItem({ id, label, sort, mode, sortable, closable, }: IGroupItem): any;
+export declare function getGroupItem({ id, label, sortDir, sortOrder, mode, sortable, closable, }: IGroupItem): any;
 export declare function getGroupPanel(grouped: IGroupItem[], grid: IProGrid): any;

package/codebase/types/ts-grid/sources/ui/render.d.ts

@@ -1,5 +1,5 @@
-import { IGrid, IGridConfig, IProGrid, IRendererConfig, IRow } from "../types";
-export declare function getRenderConfig(obj: any, data: IRow[], wrapperSizes: any): IRendererConfig;
+import { IGrid, IGridConfig, IProGrid, IRendererConfig, IRow, ISizes } from "../types";
+export declare function getRenderConfig(obj: any, data: IRow[], wrapperSizes: ISizes): IRendererConfig;
 export declare function getElementSizes(element: HTMLElement | any): {
     width: number;
     height: number;

package/codebase/types/ts-layout/sources/ProCell.d.ts

@@ -3,7 +3,7 @@ import { Cell } from "./Cell";
 import { ILayout, ICellConfig, IProCell } from "./types";
 export declare class ProCell extends Cell implements IProCell {
     scrollView: ScrollView;
-    constructor(parent: string | HTMLElement | ILayout, config: ICellConfig);
+    constructor(parent: string | HTMLElement | ILayout | null, config: ICellConfig);
     private _getFirstRootView;
     toVDOM(nodes?: any[]): any;
 }

package/codebase/types/ts-layout/sources/types.d.ts

@@ -52,7 +52,7 @@ export interface ILayoutConfig extends ICellConfig {
 }
 export type IViewFn = (cfg: any) => VNode;
 export interface IViewConstructor {
-    new: (container: HTMLElement | string, config: any) => IView;
+    new: (container: HTMLElement | string | null, config: any) => IView;
 }
 export interface ICell extends IView {
     id: string;

package/codebase/types/ts-treegrid/sources/TreeGrid.d.ts

@@ -2,12 +2,12 @@ import { GridEvents, IEventHandlersMap, ExtendedGrid, ICellRect, IColumnsWidth,
 import { IEventSystem } from "../../ts-common/events";
 import { DataEvents, DragEvents, IDataEventsHandlersMap, IDragEventsHandlersMap } from "../../ts-data";
 import { TreeGridCollection } from "./TreeGridCollection";
-import { ITreeEventHandlersMap, ITreeGrid, ITreeGridConfig, TreeGridEvents } from "./types";
+import { ITreeGrid, ITreeGridConfig } from "./types";
 import { Id } from "../../ts-common/types";
 export declare class TreeGrid extends ExtendedGrid implements ITreeGrid {
     config: ITreeGridConfig;
     data: TreeGridCollection;
-    events: IEventSystem<DataEvents | GridEvents | DragEvents | TreeGridEvents, IEventHandlersMap & IDataEventsHandlersMap & IDragEventsHandlersMap & ITreeEventHandlersMap>;
+    events: IEventSystem<DataEvents | GridEvents | DragEvents, IEventHandlersMap & IDataEventsHandlersMap & IDragEventsHandlersMap>;
     constructor(container: HTMLElement | string | null, config: ITreeGridConfig);
     expand(rowId: Id): void;
     collapse(rowId: Id): void;
@@ -23,6 +23,4 @@ export declare class TreeGrid extends ExtendedGrid implements ITreeGrid {
     protected _applyLocalFilter(beforePrepareData?: boolean): void;
     protected _setEventHandlers(): void;
     private _serialize;
-    private _expand;
-    private _collapse;
 }

package/codebase/types/ts-treegrid/sources/TreeGridCollection.d.ts

@@ -1,9 +1,9 @@
 import { IEventSystem } from "../../ts-common/events";
 import { DataCallback, DataDriver, DataEvents, IDataItem, TreeCollection } from "../../ts-data";
-import { TreeGridEvents } from "./types";
 import { Id } from "../../ts-common/types";
+import { GridEvents } from "../../ts-grid";
 export declare class TreeGridCollection extends TreeCollection {
-    constructor(config?: any, events?: IEventSystem<DataEvents | TreeGridEvents>);
+    constructor(config?: any, events?: IEventSystem<DataEvents | GridEvents>);
     eachChild(id: Id, cb: any, direct?: boolean, checkItem?: (item: IDataItem) => boolean): void;
     getMaxLevel(): number;
     getLevel(id: Id): number;

package/codebase/types/ts-treegrid/sources/types.d.ts

@@ -10,25 +10,7 @@ export interface ITreeGridConfig extends IExtendedGridConfig {
     collapsed?: boolean;
 }
 export interface ITreeGrid extends IExtendedGrid {
-    events: IEventSystem<DataEvents | GridEvents | DragEvents | TreeGridEvents, IEventHandlersMap & IDataEventsHandlersMap & IDragEventsHandlersMap & ITreeEventHandlersMap>;
+    events: IEventSystem<DataEvents | GridEvents | DragEvents, IEventHandlersMap & IDataEventsHandlersMap & IDragEventsHandlersMap>;
     config: ITreeGridConfig;
     data: TreeGridCollection;
-    scrollTo(rowId: Id, colId: Id): void;
-    expand(rowId: Id): void;
-    collapse(rowId: Id): void;
-    expandAll(): void;
-    collapseAll(): void;
-}
-export declare enum TreeGridEvents {
-    beforeCollapse = "beforeCollapse",
-    afterCollapse = "afterCollapse",
-    beforeExpand = "beforeExpand",
-    afterExpand = "afterExpand"
-}
-export interface ITreeEventHandlersMap {
-    [key: string]: (...args: any[]) => any;
-    [TreeGridEvents.beforeCollapse]: (rowId: Id) => boolean | void;
-    [TreeGridEvents.afterCollapse]: (rowId: Id) => any;
-    [TreeGridEvents.beforeExpand]: (rowId: Id) => boolean | void;
-    [TreeGridEvents.afterExpand]: (rowId: Id) => any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhx-suite",
-  "version": "9.0.4",
+  "version": "9.1.1",
   "description": "dhtmlxSuite widget",
   "homepage":"https://docs.dhtmlx.com",
   "license":"GPL",