@refinitiv-ui/efx-grid 6.0.3 → 6.0.4

package/lib/rt-grid/es6/ColumnDefinition.d.ts

@@ -62,9 +62,7 @@ declare class ColumnDefinition {
 
     public getRenderer(): ((...params: any[]) => any);
 
-    public getHeaderRenderer(): ((...params: any[]) => any);
-
-    public getSorter(): ((...params: any[]) => any);
+    public getHeaderRenderer(): ((...params: any[]) => any)|null;
 
     public getName(): string;
 
@@ -128,8 +126,12 @@ declare class ColumnDefinition {
 
     public activateRenderer(id?: string, func?: ((...params: any[]) => any)): boolean;
 
+    public getSorter(): ((...params: any[]) => any)|null;
+
     public setSorter(func?: ColumnDefinition.SortLogic): void;
 
+    public isRowSorting(): boolean;
+
     public setName(str: string): void;
 
     public getUserModel(): any;

package/lib/rt-grid/es6/ColumnDefinition.js

@@ -105,16 +105,12 @@ var _toAlignment = function(str) {
 var ColumnDefinition = function(columnOption, hostGrid) {
 	this._defaultRenderer = this._defaultRenderer.bind(this);
 	this._customRenderer = this._customRenderer.bind(this);
-	this._defaultSorter = this._defaultSorter.bind(this);
-	this._dataSorter = this._dataSorter.bind(this);
-	this._rowDefSorter = this._rowDefSorter.bind(this);
 
 	this._id = "" + ColumnDefinition._runningId++;
 	this._internalRenderer = this._defaultRenderer;
 	this._internalSorter = this._defaultSorter;
 
 	this._eventArg = {"colDef": this}; // WARNING: Circular reference
-	this._sortContext = {"colDef": this};
 	if(hostGrid) {
 		this._updateContext("grid", hostGrid);
 		this._updateContext("core", hostGrid["getCoreGrid"]()); // TODO: Handle multiple core grids
@@ -183,15 +179,6 @@ ColumnDefinition.prototype._activatedRenderer = null;
 * @private
 */
 ColumnDefinition.prototype._rendererMap = null;
-/** @type {!Function}
-* @private
-*/
-ColumnDefinition.prototype._internalSorter;
-/** Workaround to provide user a context during the sorting process
-* @type {Object}
-* @private
-*/
-ColumnDefinition.prototype._sortContext = null;
 /** @type {Function}
 * @private
 */
@@ -437,25 +424,6 @@ ColumnDefinition.prototype.getRenderer = function() {
 ColumnDefinition.prototype.getHeaderRenderer = function() {
 	return this._headerRenderer;
 };
-/** @public
-* @return {!Function}
-*/
-ColumnDefinition.prototype.getSorter = function() {
-	return this._internalSorter;
-};
-/** Internal method for preparing sort context
-* @public
-* @ignore
-* @param {number} colIndex
-* @return {!Function}
-*/
-ColumnDefinition.prototype._prepareSortContext = function(colIndex) {
-	// TODO: Context does not get updated when column is moved or removed
-	this._sortContext["colIndex"] = colIndex;
-	this._sortContext["field"] = this._field;
-
-	return this._internalSorter;
-};
 
 /** @public
 * @return {string}
@@ -853,21 +821,27 @@ ColumnDefinition.prototype.activateRenderer = function(id, func) {
 	this.setRenderer(renderer);
 	return this._activatedRenderer ? true : false;
 };
+
+/** @public
+* @return {Function}
+*/
+ColumnDefinition.prototype.getSorter = function() {
+	return this._userSorter;
+};
 /** @public
 * @param {ColumnDefinition~SortLogic=} func
 */
 ColumnDefinition.prototype.setSorter = function(func) {
-	if(typeof func === "function") {
-		this._userSorter = func;
-		if(this._rowSorting == null) {
-			this._internalSorter = this._realTimeField ? this._dataSorter : this._rowDefSorter;
-		} else {
-			this._internalSorter = !this._rowSorting ? this._dataSorter : this._rowDefSorter;
-		}
-	} else {
-		this._userSorter = null;
-		this._internalSorter = this._defaultSorter;
+	this._userSorter = (typeof func === "function") ? func : null;
+};
+/** @public
+* @return {boolean}
+*/
+ColumnDefinition.prototype.isRowSorting = function() {
+	if(this._rowSorting == null) {
+		return !this._realTimeField;
 	}
+	return this._rowSorting ? true : false;
 };
 
 /** To allow user change column name in run-time (language change or localization)
@@ -986,78 +960,13 @@ ColumnDefinition.prototype._customRenderer = function(e) {
 		}
 	}
 };
-/** @private
-* @param {RowDefinition} rowDefA
-* @param {RowDefinition} rowDefB
-* @param {number} order
-* @return {number}
-*/
-ColumnDefinition.prototype._defaultSorter = function(rowDefA, rowDefB, order) {
-	var orderA = rowDefA.getGroupOrder();
-	var orderB = rowDefB.getGroupOrder();
-	if(orderA !== orderB) {
-		return orderA - orderB; // Regardless of sort order
-	}
-
-	var a = rowDefA.getData(this._field);
-	var b = rowDefB.getData(this._field);
-
-	if(a == null || a !== a) {
-		if(b == null || b !== b) {
-			return 0;
-		}
-		return 1;
-	}
-	if(b == null || b !== b) {
-		return -1;
-	}
-
-	if(a < b) {
-		return -order;
-	}
-	if(b < a) {
-		return order;
-	}
-	return 0;
-};
-/** @private
-* @param {RowDefinition} rowDefA
-* @param {RowDefinition} rowDefB
-* @param {number} order
-* @return {number}
-*/
-ColumnDefinition.prototype._dataSorter = function(rowDefA, rowDefB, order) {
-	var orderA = rowDefA.getGroupOrder();
-	var orderB = rowDefB.getGroupOrder();
-	if(orderA !== orderB) {
-		return orderA - orderB; // Regardless of sort order
-	}
 
-	var a = rowDefA.getData(this._field);
-	var b = rowDefB.getData(this._field);
-	return this._userSorter(a, b, order, this._sortContext);
-};
-/** @private
-* @param {RowDefinition} rowDefA
-* @param {RowDefinition} rowDefB
-* @param {number} order
-* @return {number}
-*/
-ColumnDefinition.prototype._rowDefSorter = function(rowDefA, rowDefB, order) {
-	var orderA = rowDefA.getGroupOrder();
-	var orderB = rowDefB.getGroupOrder();
-	if(orderA !== orderB) {
-		return orderA - orderB; // Regardless of sort order
-	}
-
-	return this._userSorter(rowDefA, rowDefB, order, this._sortContext);
-};
 /** @private
 * @param {string} propName
 * @param {*} val
 */
 ColumnDefinition.prototype._updateContext = function(propName, val) {
-	this._eventArg[propName] = this._sortContext[propName] = val;
+	this._eventArg[propName] = val;
 };
 
 /** @public

package/lib/rt-grid/es6/DataConnector.d.ts

@@ -9,13 +9,13 @@ declare class DataConnector extends EventDispatcher {
 
     constructor();
 
-    public getAllRics(): (string)[];
+    public getAllRics(): (string)[]|null;
 
-    public getAllRowDefs(): (RowDefinition)[];
+    public getAllRowDefs(): (RowDefinition)[]|null;
 
     public getAllFields(): (string)[];
 
-    public getRowDefByRic(ric: string): (RowDefinition)[];
+    public getRowDefByRic(ric: string): (RowDefinition)[]|null;
 
     public addRic(rowDef: RowDefinition): boolean;
 

package/lib/rt-grid/es6/Grid.d.ts

@@ -12,10 +12,10 @@ import SnapshotFiller from "./SnapshotFiller.js";
 import StyleLoader from "./StyleLoader.js";
 import FieldDefinition from "./FieldDefinition.js";
 import DataConnector from "./DataConnector.js";
+import RowDefSorter from "./RowDefSorter.js";
 
 import { Core } from "../../core/es6/grid/Core.js";
 import { SortableTitlePlugin } from "../../core/es6/grid/plugins/SortableTitlePlugin.js";
-import { DragAndDropTitlePlugin } from "../../core/es6/grid/plugins/DragAndDropTitlePlugin.js";
 import { DataCache } from "../../core/es6/data/DataCache.js";
 import { DataTable } from "../../core/es6/data/DataTable.js";
 import { DataView } from "../../core/es6/data/DataView.js";
@@ -71,7 +71,9 @@ declare namespace Grid {
         autoDateConversion?: boolean,
         textSelect?: boolean,
         lang?: string,
-        scrollbarParent?: Element
+        scrollbarParent?: Element,
+        formulaEngine?: boolean,
+        adcPollingInterval?: number
     };
 
     type RowReference = number|string|RowDefinition;
@@ -86,7 +88,7 @@ declare class Grid extends EventDispatcher {
 
     public dispose(): void;
 
-    public getElement(): Element;
+    public getElement(): Element|null;
 
     public removeEventListeners(): void;
 
@@ -108,12 +110,14 @@ declare class Grid extends EventDispatcher {
 
     public getRelativePosition(obj: ElementWrapper|Element|Event|MouseEvent): any;
 
-    public getCoreGrid(): Core;
+    public getCoreGrid(): Core|null;
 
     public initialize(gridOption?: Grid.GridOptions): void;
 
     public getConfigObject(gridOptions?: any): any;
 
+    public setLocale(lang: string): void;
+
     public insertColumn(columnOption: ColumnDefinition.Options|string, idx?: number): void;
 
     public setColumns(columns: (any)[]): void;
@@ -160,9 +164,9 @@ declare class Grid extends EventDispatcher {
 
     public updateDataSet(records: (any)[], rowIdentifier: string): void;
 
-    public removeRow(rowRef: Grid.RowReference): RowDefinition;
+    public removeRow(rowRef: Grid.RowReference): RowDefinition|null;
 
-    public removeRows(rowRefs: (Grid.RowReference)[]): (RowDefinition)[];
+    public removeRows(rowRefs: (Grid.RowReference)[]): (RowDefinition)[]|null;
 
     public removeAllRows(): void;
 
@@ -194,9 +198,9 @@ declare class Grid extends EventDispatcher {
 
     public getColumnDataType(colIndex: number): string;
 
-    public getColumnDefinition(colIndex: number): ColumnDefinition;
+    public getColumnDefinition(colIndex: number): ColumnDefinition|null;
 
-    public getRowDefinition(rowRef: number|string): RowDefinition;
+    public getRowDefinition(rowRef: number|string): RowDefinition|null;
 
     public getRowDefinitions(): (RowDefinition)[];
 
@@ -234,7 +238,7 @@ declare class Grid extends EventDispatcher {
 
     public clearSort(): void;
 
-    public getDataView(): DataView;
+    public getDataView(): DataView|null;
 
     public setPage(pageIndex: number): boolean;
 
@@ -256,6 +260,10 @@ declare class Grid extends EventDispatcher {
 
     public getExtension(str: string): any;
 
+    public activateADCPolling(activated?: boolean): void;
+
+    public refreshADCData(): boolean;
+
     public logDT(opt_options?: any): void;
 
     public logDV(opt_options?: any): void;