@refinitiv-ui/efx-grid 6.0.5 → 6.0.6

package/lib/types/es6/ColumnFormatting.d.ts

@@ -6,48 +6,48 @@ import {ElfUtil} from '../../tr-grid-util/es6/ElfUtil.js';
 declare namespace ColumnFormattingPlugin {
 
     type HeatmapOption = {
-        midPoint?: string,
-        mode?: string
+        midPoint?: string|null,
+        mode?: string|null
     };
 
     type ConditionalColorOption = {
-        conditions?: (any)[],
-        field?: string
+        conditions?: (any)[]|null,
+        field?: string|null
     };
 
     type BarOption = {
-        useMovementColor?: boolean,
-        showValues?: boolean,
-        alignment?: string,
-        field?: string,
-        textHidden?: boolean,
-        textWidth?: (number|string),
-        barColor?: string,
-        padding?: number,
-        percentageLabel?: boolean,
-        autoTextSizing?: boolean,
-        autoFitting?: boolean,
-        zeroValueHidden?: boolean
+        useMovementColor?: boolean|null,
+        showValues?: boolean|null,
+        alignment?: string|null,
+        field?: string|null,
+        textHidden?: boolean|null,
+        textWidth?: (number|string)|null,
+        barColor?: string|null,
+        padding?: number|null,
+        percentageLabel?: boolean|null,
+        autoTextSizing?: boolean|null,
+        autoFitting?: boolean|null,
+        zeroValueHidden?: boolean|null
     };
 
     type DisplayStyleOption = {
-        alignment?: string,
-        mode?: string,
-        bar?: ColumnFormattingPlugin.BarOption,
-        conditionalColor?: ColumnFormattingPlugin.ConditionalColorOption,
-        heatmap?: ColumnFormattingPlugin.HeatmapOption,
+        alignment?: string|null,
+        mode?: string|null,
+        bar?: ColumnFormattingPlugin.BarOption|null,
+        conditionalColor?: ColumnFormattingPlugin.ConditionalColorOption|null,
+        heatmap?: ColumnFormattingPlugin.HeatmapOption|null,
         general?: any
     };
 
     type ColumnFormatOptions = {
         valueFormatTab?: TextFormatting.FormatOptions,
-        displayStyleTab?: ColumnFormattingPlugin.DisplayStyleOption,
+        displayStyleTab?: ColumnFormattingPlugin.DisplayStyleOption|null,
         colorTextTab?: any,
-        fieldDataType?: string
+        fieldDataType?: string|null
     };
 
     type ColumnOptions = {
-        fieldDataType?: string
+        fieldDataType?: string|null
     };
 
 }
@@ -60,7 +60,9 @@ declare class ColumnFormattingPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
-    public getFieldList(): (string)[];
+    public getField(colIndex: number): string;
+
+    public getFieldList(): (string)[]|null;
 
     public getColumnCount(): number;
 
@@ -68,7 +70,7 @@ declare class ColumnFormattingPlugin extends GridPlugin {
 
     public getColumnFormatOptions(colIndex: number): ColumnFormattingPlugin.ColumnFormatOptions;
 
-    public setColumnFormatOptions(colIndex: number, options?: ColumnFormattingPlugin.ColumnFormatOptions): void;
+    public setColumnFormatOptions(colIndex: number, options?: ColumnFormattingPlugin.ColumnFormatOptions|null): void;
 
     public setColumnAlignment(colIndex: number, align: string): void;
 
@@ -78,7 +80,7 @@ declare class ColumnFormattingPlugin extends GridPlugin {
 
     public isColumnHidden(colIndex: number): boolean;
 
-    public hideColumn(colIndex: number, opt_bool?: boolean): void;
+    public hideColumn(colIndex: number, opt_bool?: boolean|null): void;
 
     public showAllColumns(): void;
 

package/lib/types/es6/ColumnGrouping.d.ts

@@ -4,24 +4,24 @@ import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 declare namespace ColumnGroupingPlugin {
 
-    type Options = (ColumnGroupingPlugin.GroupDefinition)[];
+    type Options = (ColumnGroupingPlugin.GroupDefinition)[]|null;
 
-    type GroupDefinitions = (ColumnGroupingPlugin.GroupDefinition)[];
+    type GroupDefinitions = (ColumnGroupingPlugin.GroupDefinition)[]|null;
 
     type GroupDefinition = {
         id: string,
         name: string,
-        tooltip?: (boolean|string),
-        children: (string)[],
-        alignment?: string,
-        render?: ((...params: any[]) => any)
+        tooltip?: (boolean|string)|null,
+        children: (string)[]|null,
+        alignment?: string|null,
+        render?: ((...params: any[]) => any)|null
     };
 
 }
 
 declare class ColumnGroupingPlugin extends GridPlugin {
 
-    constructor(options?: ColumnGroupingPlugin.Options);
+    constructor(options?: ColumnGroupingPlugin.Options|null);
 
     public beforeProcessOption(optionName: string, optionValue: any): any;
 
@@ -37,23 +37,37 @@ declare class ColumnGroupingPlugin extends GridPlugin {
 
     public addColumnToGroup(column: any, groupId: string, colIndex: number): void;
 
-    public addGroup(groupDef: ColumnGroupingPlugin.GroupDefinition): boolean;
+    public addGroup(groupDef: ColumnGroupingPlugin.GroupDefinition|null): boolean;
 
-    public addColumnGrouping(groupDef: ColumnGroupingPlugin.GroupDefinition): void;
+    public addColumnGrouping(groupDef: ColumnGroupingPlugin.GroupDefinition|null): void;
 
     public removeGroup(groupId: string): any;
 
-    public setGroupDefinitions(groupDefs: ColumnGroupingPlugin.GroupDefinitions): void;
+    public setGroupDefinitions(groupDefs: ColumnGroupingPlugin.GroupDefinitions|null): void;
 
     public getGroupDefinitions(): ColumnGroupingPlugin.GroupDefinitions;
 
-    public setGroupDefinition(groupId: string, newDef: ColumnGroupingPlugin.GroupDefinition): void;
+    public setGroupDefinition(groupId: string, newDef: ColumnGroupingPlugin.GroupDefinition|null): void;
 
-    public getGroupDefinition(groupId: number): ColumnGroupingPlugin.GroupDefinition;
+    public getGroupDefinition(groupId: string): ColumnGroupingPlugin.GroupDefinition|null;
 
-    public setGroupChildren(groupId: string, newChildList: (string)[]): void;
+    public setGroupChildren(groupId: string, newChildList: (string)[]|null): void;
 
-    public getGroupChildren(groupId: number): ColumnGroupingPlugin.GroupDefinition;
+    public getGroupChildren(groupId: string): (string)[]|null;
+
+    public getChildColumnIndices(groupId: string): (number)[]|null;
+
+    public getGroupIds(colRef: string|number|null): (string)[]|null;
+
+    public getMaxGroupLevel(): number;
+
+    public getGroupLevel(groupId: string): number;
+
+    public getCellInfo(e: Element|Event|MouseEvent|null): any;
+
+    public moveColumnIntoGroup(from: number|string|null, to: number, groupId: string): void;
+
+    public setColumnParent(columnIndex: number|string|null, groupId: string): void;
 
 }
 

package/lib/types/es6/ColumnResizing.d.ts

@@ -50,11 +50,11 @@ declare class ColumnResizingPlugin extends GridPlugin {
 
     public setAllColumnWidths(colWidth: number, scalability?: boolean): boolean;
 
-    public getColumnWidths(): (number)[];
+    public getColumnWidths(): (number)[]|null;
 
     public resetAllColumnsToDefaultWidth(): boolean;
 
-    public getColumnSizeStates(): (any)[];
+    public getColumnSizeStates(): (any)[]|null;
 
     public setColumnSizeStates(columns: (any)[]|string): void;
 

package/lib/types/es6/ColumnStack.d.ts

@@ -10,18 +10,18 @@ import { preventDefault } from "../../tr-grid-util/es6/EventDispatcher.js";
 declare namespace ColumnStackPlugin {
 
     type Options = {
-        fields: (string)[]
+        fields: (string)[]|null
     };
 
     type ColumnOptions = {
-        stackId?: string,
-        stack?: (string|StackOptions)
+        stackId?: string|null,
+        stack?: (string|StackOptions)|null
     };
 
     type StackOptions = {
         id: string,
-        spreading?: boolean,
-        collapsed?: boolean
+        spreading?: boolean|null,
+        collapsed?: boolean|null
     };
 
 }
@@ -40,13 +40,13 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public getMemberIndices(colIndex: number): (number)[]|null;
 
-    public collapseGroup(colIndex: number, collapsed?: boolean): (number)[]|null;
+    public collapseGroup(colIndex: number, collapsed?: boolean|null): (number)[]|null;
 
     public expandGroup(colIndex: number): (number)[]|null;
 
-    public isColumnStackable(colIndices: (number)[]): boolean;
+    public isColumnStackable(colIndices: (number)[]|null): boolean;
 
-    public isColumnStacked(colIndices?: (number)[]): boolean;
+    public isColumnStacked(colIndices?: (number)[]|null): boolean;
 
     public isInactiveStackedColumn(colIndex: number): boolean;
 
@@ -58,21 +58,23 @@ declare class ColumnStackPlugin extends GridPlugin {
 
     public isColumnInCollection(colIndex: number): boolean;
 
+    public isInCollection(colIndex: number): boolean;
+
     public isColumnCollapsed(colIndex: number): boolean;
 
     public isColumnActive(colIndex: number): boolean;
 
     public getStackId(colIndex: number): string;
 
-    public stackColumns(colRefs?: (number|string)[], stackId?: string, options?: any): boolean;
+    public stackColumns(colRefs?: (number|string)[]|null, stackId?: string|null, options?: any): boolean;
 
-    public setStack(colRefs: (number|string)[]): boolean;
+    public setStack(colRefs?: (number|string)[]|null): boolean;
 
-    public unstackColumns(colIndices?: (number)[]): boolean;
+    public unstackColumns(colIndices?: (number)[]|null): boolean;
 
-    public removeAllStacks(enableUpdateUI?: boolean): boolean;
+    public removeAllStacks(enableUpdateUI?: boolean|null): boolean;
 
-    public swapColumn(colRef: number|Event, swappingIndex: number): boolean;
+    public swapColumn(colRef: number|Event|null, swappingIndex: number): boolean;
 
 }
 

package/lib/types/es6/CompositeGrid/ColumnSelectionPlugin.d.ts

@@ -1,7 +1,9 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
+import { isMac } from "../../../tr-grid-util/es6/Util.js";
+import { preventDefault } from "../../../tr-grid-util/es6/EventDispatcher.js";
+
 import Plugin from "./Plugin.js";
-import { ILayoutGrid, Core} from "../Core/index.js";
+import { ILayoutGrid, Core } from "../Core/index.js";
 
 declare class ColumnSelectionPlugin extends Plugin {
 

package/lib/types/es6/CompositeGrid/ColumnWidthAdjustingPlugin.d.ts

@@ -1,5 +1,4 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
 import Plugin from "./Plugin.js";
 import { Conflator } from "../Core/index.js";
 import TextWidthCalculator from "./TextWidthCalculator.js"

package/lib/types/es6/CompositeGrid/CompositeGrid.d.ts

@@ -4,7 +4,6 @@ import GridFormatter from "../GridFormatter";
 import Extensions from "../Extensions";
 import { Core, ElementWrapper, ILayoutGrid, DataTable, DataView, SortableTitlePlugin } from "../Core/index.js";
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
 import CollapsibleHeaderPlugin from "./CollapsibleHeaderPlugin.js";
 import ResizableTitlePlugin from "./ResizableTitlePlugin.js";
 import DragAndDropTitlePlugin from "./DragAndDropTitlePlugin.js";
@@ -50,6 +49,7 @@ declare namespace CompositeGrid {
         borders?: boolean,
         gridlines?: boolean,
         verticalLines?: boolean,
+        contentVerticalLines?: boolean,
         horizontalLines?: boolean,
         dataConflationRate?: number
     };

package/lib/types/es6/CompositeGrid/DragAndDropTitlePlugin.d.ts

@@ -1,5 +1,5 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
+import { preventDefault } from "../../../tr-grid-util/es6/EventDispatcher.js";
 import Plugin from "./Plugin.js";
 import { Core, ILayoutGrid } from "../Core/index.js";
 

package/lib/types/es6/CompositeGrid/DraggableContentPlugin.d.ts

@@ -1,5 +1,5 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
+import { preventDefault } from "../../../tr-grid-util/es6/EventDispatcher.js";
 import Plugin from "./Plugin.js";
 import { ElementWrapper, Core } from "../Core/index.js";
 
@@ -35,10 +35,6 @@ declare class DraggableContentPlugin extends Plugin {
 
     public setJETDragContent(content: any): void;
 
-    public setPermissionContentSection(): void;
-
-    public setPermissionTitleSection(): void;
-
 }
 
 export default DraggableContentPlugin;

package/lib/types/es6/CompositeGrid/Plugin.d.ts

@@ -1,5 +1,5 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
+import Dom from "../../../tr-grid-util/es6/Dom.js";
 import Core from "../Core/grid/Core.js"; // eslint-disable-line
 import EventDispatcher from "../Core/grid/event/EventDispatcher.js";
 import ElementWrapper from "../Core/grid/components/ElementWrapper.js"; // eslint-disable-line
@@ -20,6 +20,8 @@ declare class Plugin extends EventDispatcher {
 
 }
 
+declare function item(ary: any[]|any, at: number, item: any): void;
+
 declare function gridAPI(x: number, y: number): Element|null;
 
 declare function to(e: any): void;

package/lib/types/es6/CompositeGrid/ResizableTitlePlugin.d.ts

@@ -1,5 +1,6 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
+import Dom from "../../../tr-grid-util/es6/Dom.js";
+import { preventDefault } from "../../../tr-grid-util/es6/EventDispatcher.js";
 import Plugin from "./Plugin.js";
 import { Core } from "../Core/index.js";
 

package/lib/types/es6/CompositeGrid/RowSelectionPlugin.d.ts

@@ -1,5 +1,6 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
+import { isMac } from "../../../tr-grid-util/es6/Util.js";
+import { preventDefault } from "../../../tr-grid-util/es6/EventDispatcher.js";
 import Plugin from "./Plugin.js";
 import { Core, ILayoutGrid } from "../Core/index.js";
 

package/lib/types/es6/CompositeGrid/TextWidthCalculator.d.ts

@@ -1,4 +1,4 @@
-import Util from "../Core/grid/util/util.js";
+
 
 declare class TextWidthCalculator {
 

package/lib/types/es6/CompositeGrid/TreeIndentingPlugin.d.ts

@@ -1,5 +1,4 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
-import Util from "../Core/grid/util/util.js";
 import Plugin from "./Plugin.js";
 import { SectionSettings, ILayoutGrid } from "../Core/index.js";
 

package/lib/types/es6/ConditionalColoring.d.ts

@@ -15,6 +15,13 @@ declare namespace ConditionalColoringPlugin {
         field?: string
     };
 
+    type ConditionalColoringOptions = {
+        conditions?: (ConditionalColoringPlugin.Condition)[],
+        colorText?: (string|boolean),
+        tickColor?: (string|boolean),
+        field?: string
+    };
+
     type Condition = {
         expression?: (string|((...params: any[]) => any)),
         backgroundColor?: string,
@@ -47,11 +54,13 @@ declare class ConditionalColoringPlugin extends GridPlugin {
 
     public getConfigObject(gridOptions?: any): any;
 
+    public getColumnColoring(colIndex: number, options?: any): ConditionalColoringPlugin.ColumnOptions;
+
     public setColumnColoring(colIndex: number, columnOptions?: (ConditionalColoringPlugin.ColumnOptions|null)): void;
 
-    public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking), field?: string): void;
+    public setConditionalColoring(colIndex: number, coloringOptions?: (ConditionalColoringPlugin.ConditionalColoringOptions|null)): void;
 
-    public getColumnColoring(colIndex: number, out_obj?: any): any;
+    public setColumnBlinking(colIndex: number, blinkingOptions?: (boolean|ConditionalColoringPlugin.Blinking), field?: string): void;
 
     public blinkRow(rowIndex: number, blinkSignal: number, host?: any): void;
 

package/lib/types/es6/Core/data/ColumnStats.d.ts

@@ -2,7 +2,7 @@
 
 declare class ColumnStats {
 
-    constructor(source?: any, field?: string);
+    constructor(source?: any, field?: string|null);
 
     public dispose(): void;
 
@@ -10,9 +10,9 @@ declare class ColumnStats {
 
     public setField(field: string): void;
 
-    public disableOnDemandMode(opt_disabled?: boolean): void;
+    public disableOnDemandMode(opt_disabled?: boolean|null): void;
 
-    public setColumnDataGetter(func: ((...params: any[]) => any)): void;
+    public setColumnDataGetter(func: ((...params: any[]) => any)|null): void;
 
     public getColumnDataGetter(): ((...params: any[]) => any)|null;
 

package/lib/types/es6/Core/data/DataCache.d.ts

@@ -11,7 +11,7 @@ declare class DataCache extends EventDispatcher {
 
     public getSubscriptions(): any;
 
-    public addSubscription(sub: any, opt_primaryRic?: string, opt_values?: any): void;
+    public addSubscription(sub: any, opt_primaryRic?: string|null, opt_values?: any): void;
 
     public removeSubscription(sub: any): void;
 
@@ -23,9 +23,9 @@ declare class DataCache extends EventDispatcher {
 
     public getPrimaryRic(sub_id: string): string;
 
-    public clearAllData(opt_suppressEvent?: boolean): void;
+    public clearAllData(opt_suppressEvent?: boolean|null): void;
 
-    public clearColumnData(colId: (string)[]|string, opt_suppressEvent?: boolean): void;
+    public clearColumnData(colId: (string)[]|string|null, opt_suppressEvent?: boolean|null): void;
 
     public getData(rid: string, cid: string): any;
 
@@ -39,7 +39,7 @@ declare class DataCache extends EventDispatcher {
 
     public getRowData(rid: string): { [key: string]:  any };
 
-    public getMultipleRowData(rids: (string)[], opt_from?: number, opt_to?: number): (any)[];
+    public getMultipleRowData(rids: (string)[]|null, opt_from?: number|null, opt_to?: number|null): (any)[];
 
     public getAllRowData(): ({ [key: string]:  any })[];
 
@@ -47,13 +47,13 @@ declare class DataCache extends EventDispatcher {
 
     public hasDataCloudData(rid: string): boolean;
 
-    public setRowData(rid: string, values?: { [key: string]:  any }, opt_eventArg?: any): boolean;
+    public setRowData(rid: string, values?: { [key: string]:  any }|null, opt_eventArg?: any): boolean;
 
     public cloneRowData(rid: string): any;
 
-    public addStaticFields(fields: (string)[]): void;
+    public addStaticFields(fields: (string)[]|null): void;
 
-    public removeStaticFields(fields: (string)[]): void;
+    public removeStaticFields(fields: (string)[]|null): void;
 
     public resetStaticFields(): void;
 
@@ -63,11 +63,11 @@ declare class DataCache extends EventDispatcher {
 
     public log(opt_options?: any): void;
 
-    public setDataCloudSettings(userId: string, productId: string, url: string, opt_lang?: string): void;
+    public setDataCloudSettings(userId: string, productId: string, url: string, opt_lang?: string|null): void;
 
     public getDataCloudFields(): (string)[]|null;
 
-    public addDataCloudFields(fields: (string)[]|string): boolean;
+    public addDataCloudFields(fields: (string)[]|string|null): boolean;
 
     public removeDataCloudField(field: string): boolean;
 

package/lib/types/es6/Core/data/DataTable.d.ts

@@ -5,7 +5,7 @@ import SegmentCollection from "./SegmentCollection.js";
 
 declare namespace DataTable {
 
-    type SortLogic = ((...params: any[]) => any);
+    type SortLogic = ((...params: any[]) => any)|null;
 
 }
 
@@ -25,35 +25,35 @@ declare class DataTable extends DataCache {
 
     public getPreviousData(rid: string, cid: string): { [key: string]:  any };
 
-    public setColumnData(cid: string, valueList: (any)[], opt_ridList?: (string)[]): void;
+    public setColumnData(cid: string, valueList: (any)[], opt_ridList?: (string)[]|null): void;
 
     public setDataFromObjectMap(obj: { [key: string]:  any }): void;
 
-    public setDataFrom2DArray(ary: (any)[][], opt_cidList?: (string)[], opt_ridList?: (string)[]): void;
+    public setDataFrom2DArray(ary: (any)[][], opt_cidList?: (string)[]|null, opt_ridList?: (string)[]|null): void;
 
     public setDataAt(rowIndex: number, cid: string, value: any): boolean;
 
-    public setRowDataAt(rowIndex: number, values?: { [key: string]:  any }, opt_eventArg?: any): boolean;
+    public setRowDataAt(rowIndex: number, values?: { [key: string]:  any }|null, opt_eventArg?: any): boolean;
 
-    public addRow(values?: { [key: string]:  any }, rid?: string|null): string;
+    public addRow(values?: { [key: string]:  any }|null, rid?: string|null|null): string;
 
-    public addRows(rows: (any)[], rids?: (string)[]): void;
+    public addRows(rows: (any)[]|null, rids?: (string)[]|null): void;
 
-    public unshiftRow(opt_values?: { [key: string]:  any }, opt_rid?: string|null): string;
+    public unshiftRow(opt_values?: { [key: string]:  any }|null, opt_rid?: string|null|null): string;
 
-    public insertRow(rowRef?: string|number|null, values?: { [key: string]:  any }, rid?: string|null): string;
+    public insertRow(rowRef?: string|number|null|null, values?: { [key: string]:  any }|null, rid?: string|null|null): string;
 
-    public insertAfter(rowRef: string|number, opt_values?: any, opt_rid?: string): string;
+    public insertAfter(rowRef: string|number|null, opt_values?: any, opt_rid?: string|null): string;
 
-    public removeRow(rowRef: number|string): void;
+    public removeRow(rowRef: number|string|null): void;
 
-    public removeRows(refs: (number|string)[]): void;
+    public removeRows(refs: (number|string)[]|null): void;
 
-    public removeAllRows(suppressEvent?: boolean): void;
+    public removeAllRows(suppressEvent?: boolean|null): void;
 
-    public moveRow(fromIndex: (number)[]|number, toIndex: number, suppressEvent?: boolean): (string)[]|string|null;
+    public moveRow(fromIndex: (number)[]|number|null, toIndex: number, suppressEvent?: boolean|null): (string)[]|string|null;
 
-    public moveRows(startIndex: number|string, toIndex: number|string, opt_count?: number, suppressEvent?: boolean): (string)[]|null;
+    public moveRows(startIndex: number|string|null, toIndex: number|string|null, opt_count?: number|null, suppressEvent?: boolean|null): (string)[]|null;
 
     public swapRow(fromIndex: number, toIndex: number): void;
 
@@ -63,19 +63,19 @@ declare class DataTable extends DataCache {
 
     public setDataSource(source: any): void;
 
-    public sortOnce(cid: string|(string)[], sortOrders?: string|number|(string|number)[], customComparer?: DataTable.SortLogic, contextObj?: any): boolean;
+    public sortOnce(cid: string|(string)[]|null, sortOrders?: string|number|(string|number)[]|null, customComparer?: DataTable.SortLogic|null, contextObj?: any): boolean;
 
-    public setSortingLogic(func: DataTable.SortLogic): void;
+    public setSortingLogic(func: DataTable.SortLogic|null): void;
 
-    public setColumnSortingLogic(cid: string, func: DataTable.SortLogic): void;
+    public setColumnSortingLogic(cid: string, func: DataTable.SortLogic|null): void;
 
-    public freeze(bool?: boolean): boolean;
+    public freeze(bool?: boolean|null): boolean;
 
-    public unfreeze(bool?: boolean): boolean;
+    public unfreeze(bool?: boolean|null): boolean;
 
     public isFrozen(): boolean;
 
-    public setSegmentSeparator(rid: string, enabled?: boolean): boolean;
+    public setSegmentSeparator(rid: string, enabled?: boolean|null): boolean;
 
     public unsetAllSegmentSeparators(): boolean;
 
@@ -85,7 +85,7 @@ declare class DataTable extends DataCache {
 
     public getSegmentParentRowId(rid: string): string;
 
-    public getSegmentValues(rids?: (string)[]): (number)[]|null;
+    public getSegmentValues(rids?: (string)[]|null): (number)[]|null;
 
     public fillSegment(segmentId: string): void;
 
@@ -93,11 +93,11 @@ declare class DataTable extends DataCache {
 
     public addSegmentChild(segmentId: string, rid: string): boolean;
 
-    public addSegmentChildren(segmentId: string, rids: (string)[]): boolean;
+    public addSegmentChildren(segmentId: string, rids: (string)[]|null): boolean;
 
     public removeSegmentChild(segmentId: string, rid: string): boolean;
 
-    public removeSegmentChildren(segmentId: string, rids: (string)[]): boolean;
+    public removeSegmentChildren(segmentId: string, rids: (string)[]|null): boolean;
 
     public removeAllSegmentChildren(): boolean;
 
@@ -105,21 +105,21 @@ declare class DataTable extends DataCache {
 
     public getSegmentChildIds(segmentId: string): (string)[]|null;
 
-    public sortSegments(compare: ((...params: any[]) => any)): void;
+    public sortSegments(compare: ((...params: any[]) => any)|null): void;
 
-    public dispatchGlobalChange(suppressEvent?: boolean): void;
+    public dispatchGlobalChange(suppressEvent?: boolean|null): void;
 
     public static getSortingDefinitions(): void;
 
 }
 
-declare function rowIndex(cid: string, valueList: (any)[], opt_ridList?: (string)[]): void;
+declare function rowIndex(cid: string, valueList: (any)[], opt_ridList?: (string)[]|null): void;
 
-declare function prevFrozen(ary: (any)[][], opt_cidList?: (string)[], opt_ridList?: (string)[]): void;
+declare function prevFrozen(ary: (any)[][], opt_cidList?: (string)[]|null, opt_ridList?: (string)[]|null): void;
 
 declare function cid(): null;
 
-declare function logic(a: number, b: number, order: number, sortingDefs: (any[])[]): number;
+declare function logic(a: number, b: number, order: number, sortingDefs: (any[])[]|null): number;
 
 export default DataTable;
 export { DataTable };