@refinitiv-ui/efx-grid 6.0.4 → 6.0.6

package/lib/core/es6/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/core/es6/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/core/es6/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 };

package/lib/core/es6/data/DataTable.js

@@ -246,7 +246,15 @@ DataTable.prototype.setRowData = function(rid, values, eventArg) { // Data chang
 			this._prevData[rid] = this._rows[rid]; // Move reference from the removed row to history
 			delete this._rows[rid];
 			if(this._segments) {
-				segmentChanged = this._segments.containsSegment(rid); // TODO: Handle this case where the segment separator row is removed
+				var segment = this._segments.getSegment(rid);
+				if(segment) {
+					if(this._segments.removeSegment(rid)) {
+						segmentChanged = true;
+						if(!this._segments.getSegmentCount()) {
+							this._segments = null;
+						}
+					}
+				}
 			}
 			for(var i = this._rids.length; --i >= 0;) {
 				if(this._rids[i] === rid) {
@@ -1449,18 +1457,33 @@ DataTable._performMultiLevelSorting = function(dataRows, sortingDefs, segmentVal
 		return null;
 	}
 
+	var sortLogic;
 	// Populate data for each definition
 	for(var c = 0; c < defCount; ++c) {
 		var sortingDef = sortingDefs[c];
-		var columnId = sortingDef[0];
 		var rows = sortingDef[1];
-		if(rows) {
-			rows.length = rowCount;
-		} else {
-			rows = sortingDef[1] = new Array(rowCount);
-		}
-		for(var r = 0; r < rowCount; ++r) {
-			rows[r] = dataRows[r][columnId];
+		sortLogic = sortingDef[2];
+		var rowSorting = sortLogic["rowSorting"];
+		var r;
+		if(rowSorting) {
+			if(rows) {
+				rows.length = rowCount;
+				for(r = 0; r < rowCount; ++r) {
+					rows[r] = dataRows[r];
+				}
+			} else {
+				rows = sortingDef[1] = dataRows;
+			}
+		}	else {
+			if(rows) {
+				rows.length = rowCount;
+			} else {
+				rows = sortingDef[1] = new Array(rowCount);
+			}
+			var columnId = sortingDef[0];
+			for(r = 0; r < rowCount; ++r) {
+				rows[r] = dataRows[r][columnId];
+			}
 		}
 	}
 
@@ -1486,7 +1509,7 @@ DataTable._performMultiLevelSorting = function(dataRows, sortingDefs, segmentVal
 	}
 
 	var sortOrder = 0;
-	var sortLogic, sortContext;
+	var sortContext;
 	if(defCount > 1) {
 		sortLogic = DataTable._multiColumnCompareLogic;
 		sortContext = sortingDefs;

package/lib/core/es6/data/DataView.d.ts

@@ -9,7 +9,7 @@ import { Conflator } from "../../../tr-grid-util/es6/Conflator.js";
 
 declare class DataView extends EventDispatcher {
 
-    constructor(source?: DataTable|DataView);
+    constructor(source?: DataTable|DataView|null);
 
     public dispose(): void;
 
@@ -17,15 +17,15 @@ declare class DataView extends EventDispatcher {
 
     public getRowData(rid: string): { [key: string]:  any };
 
-    public getColumnData(cid: string, inclNonDataRow?: boolean): any[];
+    public getColumnData(cid: string, inclNonDataRow?: boolean|null): any[];
 
     public getRowId(rowIndex: number): string;
 
-    public getAllRowIds(shallowCopy?: boolean, inclNonDataRow?: boolean): (string)[];
+    public getAllRowIds(shallowCopy?: boolean|null, inclNonDataRow?: boolean|null): (string)[];
 
-    public getVisibleRowIds(shallowCopy?: boolean): (string)[];
+    public getVisibleRowIds(shallowCopy?: boolean|null): (string)[];
 
-    public getSortedRowIds(shallowCopy?: boolean): (string)[];
+    public getSortedRowIds(shallowCopy?: boolean|null): (string)[];
 
     public getRowIndex(rid: string): number;
 
@@ -37,27 +37,27 @@ declare class DataView extends EventDispatcher {
 
     public getPreviousData(rid: string, cid: 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(): (any)[];
 
     public setData(rid: string, cid: string, value: any): 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 setColumnData(cid: string, valueList: any[], opt_ridList?: (string)[]): void;
+    public setColumnData(cid: string, valueList: any[]|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 insertRow(rowRef: string|number, opt_values?: { [key: string]:  any }, opt_rid?: string|null): string;
+    public insertRow(rowRef: string|number|null, opt_values?: { [key: string]:  any }|null, opt_rid?: string|null|null): string;
 
-    public removeRow(rowRef: number|string): void;
+    public removeRow(rowRef: number|string|null): void;
 
-    public removeRows(rowRefs: (number|string)[]): void;
+    public removeRows(rowRefs: (number|string)[]|null): void;
 
-    public moveRow(fromRef: (number|string)[]|number|string, toRef: number|string): (string)[]|string|null;
+    public moveRow(fromRef: (number|string)[]|number|string|null, toRef: number|string|null): (string)[]|string|null;
 
     public swapRow(fromIndex: number, toIndex: number): void;
 
@@ -65,43 +65,43 @@ declare class DataView extends EventDispatcher {
 
     public getDataSource(): DataTable|DataView|null;
 
-    public setDataSource(source?: (DataTable|DataView)): void;
+    public setDataSource(source?: (DataTable|DataView)|null): void;
 
     public setConflationRate(milliSecond: number): void;
 
     public getConflationRate(): number;
 
-    public sort(cid: string|(string)[], opt_sortOrder?: string|number|(string|number)[], sortLogics?: ((...params: any[]) => any)|(((...params: any[]) => any))[], noOptimization?: boolean): void;
+    public sort(cid: string|(string)[]|null, opt_sortOrder?: string|number|(string|number)[]|null, sortLogics?: ((...params: any[]) => any)|(((...params: any[]) => any))[]|null, noOptimization?: boolean|null): void;
 
-    public sortOnce(cid: string|(string)[], opt_sortOrder?: string|number|(string|number)[]): void;
+    public sortOnce(cid: string|(string)[]|null, opt_sortOrder?: string|number|(string|number)[]|null): void;
 
-    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 isSorting(): boolean;
 
-    public hideRow(rId: string|number, opt_show?: boolean): void;
+    public hideRow(rId: string|number|null, hidden?: boolean|null): void;
 
-    public hideRows(rowRefs: (string|number)[], opt_show?: boolean): void;
+    public hideRows(rowRefs: (string|number)[]|null, hidden?: boolean|null): void;
 
-    public showRows(rowRefs: (string|number)[], opt_show?: boolean): void;
+    public showRows(rowRefs: (string|number)[]|null, shown?: boolean|null): void;
 
     public unhideAllRows(): void;
 
     public hasHiddenRow(): boolean;
 
-    public filterIn(cid: string|((...params: any[]) => any), value?: any, opt_filteringOut?: boolean): boolean;
+    public filterIn(cid: string|((...params: any[]) => any), value?: any, opt_filteringOut?: boolean|null): boolean;
 
     public filterOut(cid: string|((...params: any[]) => any), value?: any): boolean;
 
-    public filterInOnce(cid: string|((...params: any[]) => any), value?: any, opt_filteringOut?: boolean): void;
+    public filterInOnce(cid: string|((...params: any[]) => any)|null, value?: any, opt_filteringOut?: boolean|null): void;
 
     public filterOutOnce(cid: string|((...params: any[]) => any), value?: any): void;
 
     public clearFilter(): void;
 
-    public disablePageCorrection(opt_disable?: boolean): void;
+    public disablePageCorrection(opt_disable?: boolean|null): void;
 
     public setPage(pageIndex: number): boolean;
 
@@ -133,25 +133,25 @@ declare class DataView extends EventDispatcher {
 
     public setPageSize(pageSize: number): void;
 
-    public groupBy(cid: string|((...params: any[]) => any)|(string|((...params: any[]) => any))[], opt_predefinedGroups?: any[]): void;
+    public groupBy(cid: string|((...params: any[]) => any)|(string|((...params: any[]) => any))[]|null, opt_predefinedGroups?: any[]|null): void;
 
     public addGroup(value: any|any[]): void;
 
-    public sortGroups(compare?: ((...params: any[]) => any)): void;
+    public sortGroups(compare?: ((...params: any[]) => any)|null): void;
 
-    public moveGroup(groupRef: number|string, destIndex: number): void;
+    public moveGroup(groupRef: number|string|null, destIndex: number): void;
 
-    public setPredefinedGroups(predefinedGroups: any[]): void;
+    public setPredefinedGroups(predefinedGroups: any[]|null): void;
 
-    public addFooter(opt_num?: number): void;
+    public addFooter(opt_num?: number|null): void;
 
     public removeFooter(): void;
 
     public getGroupByRowId(rowId: string): DataView|null;
 
-    public getGroup(groupRef: number|string): DataView|null;
+    public getGroup(groupRef: number|string|null): DataView|null;
 
-    public getAllGroups(out_ary?: any[]): (DataView)[];
+    public getAllGroups(out_ary?: any[]|null): (DataView)[];
 
     public getGroupList(): (string)[]|null;
 
@@ -165,67 +165,67 @@ declare class DataView extends EventDispatcher {
 
     public getGroupRows(): null;
 
-    public getGroupLevel(rowRef?: (number|string)): number;
+    public getGroupLevel(rowRef?: (number|string)|null): number;
 
-    public enableColumnStats(cid: string, opt_enabled?: boolean, opt_refId?: string): ColumnStats|null;
+    public enableColumnStats(cid: string, opt_enabled?: boolean|null, opt_refId?: string|null): ColumnStats|null;
 
     public getColumnStats(cid: string): ColumnStats|null;
 
-    public hide(opt_hidden?: boolean): boolean;
+    public hide(opt_hidden?: boolean|null): boolean;
 
     public isHidden(): boolean;
 
     public isHiddenRow(rowId: string): boolean;
 
-    public collapse(opt_collapsed?: boolean): void;
+    public collapse(opt_collapsed?: boolean|null): void;
 
-    public collapseAllGroups(opt_collapsed?: boolean): void;
+    public collapseAllGroups(opt_collapsed?: boolean|null): void;
 
     public toggleCollapsedState(): void;
 
     public isCollapsed(): boolean;
 
-    public enableContentAsHeader(bool?: boolean): void;
+    public enableContentAsHeader(bool?: boolean|null): void;
 
     public getVisibleRowCount(): number;
 
-    public isRowDataInGroup(rowData: any, groupID?: string): boolean;
+    public isRowDataInGroup(rowData: any, groupID?: string|null): boolean;
 
-    public isRowIdInGroup(rowId: string, groupID?: string): boolean;
+    public isRowIdInGroup(rowId: string, groupID?: string|null): boolean;
 
-    public addRowExpansion(rid: string, count?: number): void;
+    public addRowExpansion(rid: string, count?: number|null): void;
 
     public removeRowExpansion(rid: string): void;
 
-    public toggleRowExpansion(rowRef: string|number, force?: boolean, count?: number): void;
+    public toggleRowExpansion(rowRef: string|number|null, force?: boolean|null, count?: number|null): void;
 
     public removeAllRowExpansions(): void;
 
-    public getExpansionParents(from?: number, to?: number): (string)[]|null;
+    public getExpansionParents(from?: number|null, to?: number|null): (string)[]|null;
 
     public isRowExpansion(rid: string): boolean;
 
     public hasRowExpansion(rid: string): boolean;
 
-    public getRowExpansionId(rid: string, idx?: number): string;
+    public getRowExpansionId(rid: string, idx?: number|null): string;
 
     public getRowExpansionIndex(rid: string): number;
 
-    public searchAll(searchLogic: ((...params: any[]) => any), opt_out?: (string)[]): (string)[];
+    public searchAll(searchLogic: ((...params: any[]) => any)|null, opt_out?: (string)[]|null): (string)[];
 
-    public searchPrev(rowRef: number|string, searchLogic: ((...params: any[]) => any)): number;
+    public searchPrev(rowRef: number|string|null, searchLogic: ((...params: any[]) => any)|null): number;
 
-    public searchNext(rowRef: number|string, searchLogic: ((...params: any[]) => any)): number;
+    public searchNext(rowRef: number|string|null, searchLogic: ((...params: any[]) => any)|null): number;
 
-    public stall(opt_bool?: boolean): boolean;
+    public stall(opt_bool?: boolean|null): boolean;
 
-    public enableAutoGroupRemoval(opt_bool?: boolean): boolean;
+    public enableAutoGroupRemoval(opt_bool?: boolean|null): boolean;
 
-    public enableAutoGroupHiding(opt_bool?: boolean): boolean;
+    public enableAutoGroupHiding(opt_bool?: boolean|null): boolean;
 
     public synchronizeRowOrder(): void;
 
-    public setSegmentSeparator(rowRef: string|number, enabled?: boolean): boolean;
+    public setSegmentSeparator(rowRef: string|number|null, enabled?: boolean|null): boolean;
 
     public unsetAllSegmentSeparators(): boolean;
 
@@ -235,39 +235,39 @@ declare class DataView extends EventDispatcher {
 
     public getSegmentParentRowId(rid: string): string;
 
-    public collapseSegment(rowRef: string|number, collapsed?: boolean): boolean;
+    public collapseSegment(rowRef: string|number|null, collapsed?: boolean|null): boolean;
 
-    public expandSegment(rowRef: string|number, expanded?: boolean): boolean;
+    public expandSegment(rowRef: string|number|null, expanded?: boolean|null): boolean;
 
     public expandAllSegments(): boolean;
 
-    public isSegmentCollapsed(rowRef: string|number): boolean;
+    public isSegmentCollapsed(rowRef: string|number|null): boolean;
 
-    public fillSegment(segmentRef: string|number): void;
+    public fillSegment(segmentRef: string|number|null): void;
 
     public fillSegments(): void;
 
-    public addSegmentChild(segmentRef: string|number, rowRef: string|number): boolean;
+    public addSegmentChild(segmentRef: string|number|null, rowRef: string|number|null): boolean;
 
-    public addSegmentChildren(segmentRef: string|number, rowRefs: (string|number)[]): boolean;
+    public addSegmentChildren(segmentRef: string|number|null, rowRefs: (string|number)[]|null): boolean;
 
-    public removeSegmentChild(segmentRef: string|number, rowRef: string|number): boolean;
+    public removeSegmentChild(segmentRef: string|number|null, rowRef: string|number|null): boolean;
 
-    public removeSegmentChildren(segmentRef: string|number, rowRefs: (string|number)[]): boolean;
+    public removeSegmentChildren(segmentRef: string|number|null, rowRefs: (string|number)[]|null): boolean;
 
     public removeAllSegmentChildren(): boolean;
 
     public getSegmentIds(): (string)[]|null;
 
-    public getSegmentChildIds(segmentRef: string|number): (string)[]|null;
+    public getSegmentChildIds(segmentRef: string|number|null): (string)[]|null;
 
-    public sortSegments(compare: ((...params: any[]) => any)): void;
+    public sortSegments(compare: ((...params: any[]) => any)|null): void;
 
     public getWrapSize(): number;
 
     public getWrappedViews(): (WrappedView)[]|null;
 
-    public wrapView(wrapSize?: number): void;
+    public wrapView(wrapSize?: number|null): void;
 
     public dump(opt_options?: any): (any)[];
 
@@ -281,7 +281,7 @@ declare function fromRids(fromIndex: number, toIndex: number): void;
 
 declare function criteria(value: any|any[]): void;
 
-declare function len(compare?: ((...params: any[]) => any)): void;
+declare function len(compare?: ((...params: any[]) => any)|null): void;
 
 declare function complexData(opt_options?: any): void;