@refinitiv-ui/efx-grid 6.0.34 → 6.0.36

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

@@ -832,7 +832,8 @@ DataCache.prototype._insertRic = function (subId, ric, values) {
 	// We cannot cache event arguments because user may want to collect all the updates
 	this._onADCForNewRic(subId, ric);
 
-	if (!this.getRowData(rid)) { // Ensure that we have subscription id and ric from Quotes2
+	var rowData = this.getRowData(rid);
+	if (!rowData) { // Ensure that we have subscription id and ric from Quotes2
 		var tmp = values;
 
 		values = {}; // Clone a new object for duplicated ric
@@ -843,6 +844,11 @@ DataCache.prototype._insertRic = function (subId, ric, values) {
 
 		values["SUB_ID"] = subId;
 		values["RIC"] = ric;
+	} else {
+		var rowDef = rowData["ROW_DEF"];
+		if(rowDef && rowDef.isChain()){
+			values["SUB_ID"] = subId;
+		}
 	}
 
 	this.setRowData(rid, values);
@@ -879,6 +885,12 @@ DataCache.prototype._onQ2SubAdded = function (e) {
 		var sub = subs[i];
 		var ric = sub["ric"];
 
+		// chain subId fires twice, one with "_ci_" and one without "_ci_"
+		// the subId with "_ci_" should be ignore
+		if(sub["id"].indexOf("_ci_") >= 0){
+			continue;
+		}
+
 		this.addSubscription(sub, ric);
 
 		if (duplicateSubIds) { // There will be no network request for duplicate subs, and hence we need to update the data from our cache
@@ -903,6 +915,13 @@ DataCache.prototype._onQ2SubRemoved = function (e) {
 
 	for (var i = 0; i < len; ++i) {
 		var sub = subs[i];
+
+		// chain subId fires twice, one with "_ci_" and one without "_ci_"
+		// the subId with "_ci_" should be ignore
+		if(sub["id"].indexOf("_ci_") >= 0){
+			continue;
+		}
+
 		this.removeSubscription(sub);
 	}
 };

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

@@ -70,6 +70,8 @@ declare class DataTable extends DataCache {
 
     public setColumnSortingLogic(cid: string, func: DataTable.SortLogic|null): void;
 
+    public getColumnSortingLogic(cid?: string|null): DataTable.SortLogic|null;
+
     public freeze(bool?: boolean|null): boolean;
 
     public unfreeze(bool?: boolean|null): boolean;

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

@@ -882,7 +882,24 @@ DataTable.prototype.setSortingLogic = function(func) {
 * @param {DataTable.SortLogic} func Use null to remove current sorting logic
 */
 DataTable.prototype.setColumnSortingLogic = function(cid, func) {
-	this._compMap[cid] = func;
+	if(cid) {
+		this._compMap[cid] = func;
+	}
+};
+/** Get sorting logic for the specified field. Default logic is returned, if no logic is specified for the column
+* @public
+* @param {string=} cid
+* @return {DataTable.SortLogic}
+*/
+DataTable.prototype.getColumnSortingLogic = function(cid) {
+	if(cid) {
+		var logic = this._compMap[cid];
+		if(logic) {
+			return logic;
+		}
+	}
+
+	return this._compMap["_default"] || null;
 };
 
 /** Freeze data table so that no event is fired for data processing until executing {@link DataTable#unfreeze} method

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

@@ -80,6 +80,8 @@ declare class DataView extends EventDispatcher {
 
     public setColumnSortingLogic(cid: string, func: DataTable.SortLogic|null): void;
 
+    public getColumnSortingLogic(cid?: string|null): DataTable.SortLogic|null;
+
     public isSorting(): boolean;
 
     public hideRow(rId: string|number|null, hidden?: boolean|null): void;

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

@@ -783,6 +783,17 @@ DataView.prototype.setColumnSortingLogic = function(cid, func) {
 		this._dt.setColumnSortingLogic(cid, func);
 	}
 };
+/** Get sorting logic for the specified field. Default logic is returned, if no logic is specified for the column
+* @public
+* @param {string=} cid
+* @return {DataTable.SortLogic}
+*/
+DataView.prototype.getColumnSortingLogic = function(cid) {
+	if(this._dt) {
+		return this._dt.getColumnSortingLogic(cid);
+	}
+	return null;
+};
 /** Check if this view is in sorting mode
 * @public
 * @return {boolean}

package/lib/core/es6/grid/Core.d.ts

@@ -1,5 +1,6 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
 import GroupDefinitions from "../../../tr-grid-util/es6/GroupDefinitions.js"; // eslint-disable-line
+import { isEmptyObject } from "../../../tr-grid-util/es6/Util.js";
 import ElementWrapper from "./components/ElementWrapper.js";
 import ILayoutGrid from "./ILayoutGrid.js"; // eslint-disable-line
 import LayoutGrid from "./LayoutGrid.js";
@@ -32,6 +33,13 @@ declare namespace Core {
         dataSource: DataView|null
     };
 
+    type BatchInfo = {
+        reset?: string|null,
+        insertion?: string|null,
+        removal?: string|null,
+        moving?: string|null
+    };
+
     type CellReference = Core.MouseInfo|ElementWrapper|Element|null;
 
     type ColumnOptions = {
@@ -395,6 +403,10 @@ declare class Core extends ElementWrapper {
 
     public getColumnGroupChildIds(groupId: string): (string)[]|null;
 
+    public startBatch(batchType: string): boolean;
+
+    public stopBatch(batchType: string): boolean;
+
     public getColumnId(colIndex: number): string;
 
     public getColumnIds(): (string)[];

package/lib/core/es6/grid/Core.js

@@ -1,5 +1,6 @@
 import Ext from "../../../tr-grid-util/es6/Ext.js";
 import GroupDefinitions from "../../../tr-grid-util/es6/GroupDefinitions.js"; // eslint-disable-line
+import { isEmptyObject } from "../../../tr-grid-util/es6/Util.js";
 import ElementWrapper from "./components/ElementWrapper.js";
 import ILayoutGrid from "./ILayoutGrid.js"; // eslint-disable-line
 import LayoutGrid from "./LayoutGrid.js";
@@ -200,7 +201,9 @@ var Core = function (opt_initializer) {
 		"rowRemoved",
 		"columnPositionChanged",
 		"rowPositionChanged",
-		"beforeColumnBoundUpdate"
+		"beforeColumnBoundUpdate",
+		"beforeBatchOperation",
+		"afterBatchOperation"
 	);
 
 	// For debugging in advanced optimization mode
@@ -275,6 +278,15 @@ Core.SectionReference;
 */
 Core.MouseInfo;
 
+/** @typedef {Object} Core~BatchInfo
+* @private
+* @property {string=} reset //set columns
+* @property {string=} insertion //add cols
+* @property {string=} removal //remove cols
+* @property {string=} moving //reorder
+*/
+Core.BatchInfo;
+
 /** @typedef {Core.MouseInfo|ElementWrapper|Element} Core~CellReference
 * @description A section in core grid can be refered by the following object <br>
 * `{Core.MouseInfo}` : Object with valid x, y coordinates and section index <br>
@@ -529,6 +541,10 @@ Core.prototype._rowHeightTimerId = 0;
 * @private
 */
 Core.prototype._groupDefs = null;
+/** @type {BatchInfo}
+* @private
+*/
+Core.prototype._batches = null;
 //#region Public Methods
 
 /**
@@ -536,7 +552,7 @@ Core.prototype._groupDefs = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.45";
+	return "5.1.50";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -1475,6 +1491,10 @@ Core.prototype.removeColumnAt = function (index) {
 
 	if (this._hasListener("columnRemoved")) {
 		var e = {};
+		var batches = this._batches;
+		if(batches){
+			e["batches"] = batches;
+		}
 		e["atTheMiddle"] = true;
 		e["colIndex"] = index;
 		e["columns"] = "deprecated";
@@ -1745,6 +1765,7 @@ Core.prototype._moveColumn = function (fromCol, destCol) {
 		}
 	}
 	this._updateColumnBounds();
+	this._updateColumnSeparators();
 	return true;
 };
 
@@ -2075,6 +2096,7 @@ Core.prototype.setDefaultRowHeight = function (val, opt_includeTitle) {
 		this._syncRowHeights();
 		this._rowHeightSync = true;
 		this.setRowScrollingStep(this._rowScrollingStep);
+		this._updateColumnSeparators();
 	}
 };
 
@@ -2909,6 +2931,7 @@ Core.prototype.freezeColumn = function (frozenColIndex, numRightColumn) {
 
 	this._onColumnCountChanged(); // Activate horizontal scrollbar and column virtualization
 	this._updateScrollbarWidth(true, true);
+	this._updateColumnSeparators();
 };
 
 /** @private
@@ -4150,6 +4173,21 @@ Core.prototype._updateColumnBounds = function () {
 		section.updateColumnBounds(posAry, noBorderAry);
 	}
 };
+/* @private
+*/
+Core.prototype._updateColumnSeparators = function() {
+	var sectCount = this._settings.length;
+	if(!sectCount) {
+		return;
+	}
+
+	for(var i = 0; i < sectCount; i++) {
+		var section = this._settings[i].getSection();
+		if (section) {
+			section.updateColumnSeparators();
+		}
+	}
+};
 
 /** @public
 * @param {number} startColIndex INCLUSIVE
@@ -4319,6 +4357,40 @@ Core.prototype.getColumnGroupChildIds = function (groupId) {
 	}
 	return null;
 };
+
+/** @public
+* @param {string} batchType
+* @return {boolean}
+* @fires Core#beforeBatchOperation
+*/
+Core.prototype.startBatch = function (batchType) {
+	if(!batchType){
+		return false;
+	}
+	if(!this._batches){
+		this._batches = {};
+	}
+	this._batches[batchType] = batchType;
+	this._dispatch("beforeBatchOperation", { batches: this._batches, batchType: batchType });
+	return true;
+};
+/** @public
+* @param {string} batchType
+* @return {boolean}
+* @fires Core#afterBatchOperation
+*/
+Core.prototype.stopBatch = function (batchType) {
+	if(!batchType){
+		return false;
+	}
+	this._dispatch("afterBatchOperation", { batches: this._batches, batchType: batchType });
+
+	delete this._batches[batchType];
+	if(isEmptyObject(this._batches)){
+		this._batches = null;
+	}
+	return true;
+};
 //#endregion Public Methods
 
 //#region Private Methods
@@ -4562,6 +4634,10 @@ Core.prototype._dispatchColumnAddedEvent = function (at, count, atTheMiddle, ctx
 	if (this._hasListener("columnAdded")) {
 		var e = {};
 		e["atTheMiddle"] = atTheMiddle;
+		var batches = this._batches;
+		if(batches){
+			e["batches"] = batches;
+		}
 		if(count === 1) {
 			e["colIndex"] = at;
 			e["context"] = ctx;
@@ -4713,6 +4789,10 @@ Core.prototype._removeColumn = function (num) {  // TODO: change the logic to us
 
 	if (this._hasListener("columnRemoved")) {
 		var e = {};
+		var batches = this._batches;
+		if(batches){
+			e["batches"] = batches;
+		}
 		for (var c = colCount; --c >= newCount; ) {
 			var colDef = removedCols[c - newCount];
 			e["colIndex"] = c;
@@ -5177,6 +5257,8 @@ Core.prototype._onRowCountChanged = function (e) {
 	if(!forceUpdate) {
 		this._updateVScrollbar(); // Asynchronous
 	}
+
+	this._updateColumnSeparators();
 	if(prevRowCount < newRowCount) {
 		this._dispatch("rowAdded", e);
 	} else if(prevRowCount > newRowCount) {
@@ -5234,7 +5316,7 @@ Core.prototype._onRowHeightChanged = function (e) {
 				minSectionIndex >= this._startVScrollbarIndex);
 		}
 	}
-
+	this._updateColumnSeparators();
 	this._dispatchRowPositionChanged();
 };
 /** @private
@@ -5299,6 +5381,7 @@ Core.prototype._onColumnCountChanged = function () {
 	var pinnedRight = this._countPinnedRightColumns();
 
 	this._updateColumnBounds();
+	this._updateColumnSeparators();
 
 	if (this._hScrollbarEnabled && pinnedLeft + pinnedRight < this.getColumnCount()) {
 		this._hscrollbar.enable();
@@ -5580,6 +5663,7 @@ Core.prototype._syncLayoutToColumns = function (from, to, opt_forceDispatching)
 	var paneChanged = forceUpdate || (from < this.getHScrollStartIndex()) || (to > this.getFirstPinnedRightIndex());
 	this._updateScrollbarWidth(paneChanged, true /* contentChanged */);
 	this._updateColumnBounds();
+	this._updateColumnSeparators();
 	this._dispatchColumnPositionChanged();
 
 	if (dirty || opt_forceDispatching) {
@@ -5675,6 +5759,7 @@ Core.prototype._updateLayout = function () {
 		var section = this._settings[s].getSection();
 		section.updateLayout(); // Notify section about forced recalculation of the layout
 	}
+	this._updateColumnSeparators();
 };
 
 /** @private */

package/lib/core/es6/grid/ILayoutGrid.js

@@ -697,6 +697,10 @@ ILayoutGrid.prototype.calculateColumnBounds = function (lftIdx, rgtIdx, outPosit
 * @param {number=} topPx Top position of bound
 */
 ILayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx) {};
+/** @public
+* @ignore
+*/
+ILayoutGrid.prototype.updateColumnSeparators = function () {};
 
 export default ILayoutGrid;
 export { ILayoutGrid };

package/lib/core/es6/grid/LayoutGrid.d.ts

@@ -26,7 +26,11 @@ declare class LayoutGrid extends ElementWrapper {
 
     public setCellBounds(colIndex: number, rowIndex: number, width: number, height: number): void;
 
+    public updateColumnSeparators(): void;
+
 }
 
+declare function rgtPx(): void;
+
 export default LayoutGrid;
 export { LayoutGrid };

package/lib/core/es6/grid/LayoutGrid.js

@@ -269,7 +269,14 @@ LayoutGrid.prototype._colSelDirty = false;
 * @private
 */
 LayoutGrid.prototype._hscrollbar = null;
-
+/** @type {Element}
+* @private
+*/
+LayoutGrid.prototype._leftColumnSeparator = null;
+/** @type {Element}
+* @private
+*/
+LayoutGrid.prototype._rightColumnSeparator = null;
 
 /**
  * {@link ElementWrapper#dispose}
@@ -2236,8 +2243,7 @@ LayoutGrid.prototype.selectColumn = function (colIndex, selected) {
 
 		var boundLayer = this._boundLayer;
 		if(!boundLayer) {
-			boundLayer = this._boundLayer = document.createElement("div");
-			boundLayer.className = "cover-layer";
+			this._initBoundLayer();
 			this._updateLayers();
 		}
 	}
@@ -2409,6 +2415,92 @@ LayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderAry, topPx)
 	}
 };
 
+/** @public
+*/
+LayoutGrid.prototype.updateColumnSeparators = function () {
+	var pinnedLeftCount = this._hscrollbar.getPinnedLeftColumnCount();
+	var pinnedRightCount = this._hscrollbar.getPinnedRightColumnCount();
+	if ((pinnedLeftCount || pinnedRightCount) && !this._boundLayer) {
+		this._initBoundLayer();
+	}
+
+	var isScrollbarActive = false;
+	if(this._hscrollbar) {
+		isScrollbarActive = this._hscrollbar.isActive();
+	}
+
+	var boundLayer = this._boundLayer;
+
+	var colSeparator = this._leftColumnSeparator;
+	if (isScrollbarActive && pinnedLeftCount) {
+		if (!colSeparator) {
+			colSeparator = this._leftColumnSeparator = this._createColumnSeparator();
+		}
+		if (!colSeparator.parentNode) {
+			if (boundLayer.children.length) {
+				boundLayer.insertBefore(colSeparator, boundLayer.children[0]);
+			} else {
+				boundLayer.appendChild(colSeparator);
+			}
+		}
+
+		var rightPos = this._trackX.getLaneStart(pinnedLeftCount);
+		colSeparator.style.left = (rightPos - 1) + "px";
+		colSeparator.style.height = this._trackY.getTrackSize() + "px";
+	} else {
+		if (colSeparator && colSeparator.parentNode) {
+			this._boundLayer.removeChild(colSeparator);
+		}
+	}
+
+	colSeparator = this._rightColumnSeparator;
+	if (isScrollbarActive && pinnedRightCount) {
+		if (!colSeparator) {
+			colSeparator = this._rightColumnSeparator = this._createColumnSeparator();
+		}
+
+		if (!colSeparator.parentNode) {
+			if (boundLayer.children.length) {
+				boundLayer.insertBefore(colSeparator, boundLayer.children[0]);
+			} else {
+				boundLayer.appendChild(colSeparator);
+			}
+		}
+		var colCount = this.getColumnCount();
+		var colWidth = this._trackX.getLaneEnd(colCount - 1) - this._trackX.getLaneStart(colCount - pinnedRightCount);
+		var viewSize = this._getViewSize();
+
+		colSeparator.style.left = (viewSize - colWidth - this._rightSpaceSize) + "px";
+		colSeparator.style.height = this._trackY.getTrackSize() + "px";
+	} else {
+		if (colSeparator && colSeparator.parentNode) {
+			this._boundLayer.removeChild(colSeparator);
+		}
+	}
+};
+
+/** @private
+* @return {Element}
+*/
+LayoutGrid.prototype._createColumnSeparator = function() {
+	var colSeparator = document.createElement("div");
+	colSeparator.classList.add("column-separator");
+	return colSeparator;
+};
+
+/** @private
+* @return {Element}
+*/
+LayoutGrid.prototype._initBoundLayer = function () {
+	var boundLayer = this._boundLayer;
+	if(!boundLayer) {
+		boundLayer = this._boundLayer = document.createElement("div");
+		boundLayer.className = "cover-layer";
+		this._element.appendChild(boundLayer);
+	}
+	return boundLayer;
+};
+
 /**
  * @private
  * @param {number} indexX

package/lib/core/es6/grid/VirtualizedLayoutGrid.js

@@ -1102,6 +1102,12 @@ VirtualizedLayoutGrid.prototype.updateColumnBounds = function (posAry, noBorderA
 	this._grid.updateColumnBounds(posAry, noBorderAry, topPx);
 	this._updateRowBounds();
 };
+/** @public
+* @ignore
+*/
+VirtualizedLayoutGrid.prototype.updateColumnSeparators = function () {
+	this._grid.updateColumnSeparators();
+};
 /** @private
 */
 VirtualizedLayoutGrid.prototype._initBoundLayer = function () {

package/lib/core/es6/grid/plugins/SortableTitlePlugin.js

@@ -1541,6 +1541,9 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 	if (!this._dataSorting) { return; }
 
 	var sortCount = this._sortStates.length;
+	if(this._userManagedLogic && sortCount > 1) { // The logic is managed by the user. There is no point in using multi-column sorting
+		sortCount = 1;
+	}
 	var orders = null;
 	var sortLogics = null;
 	var c_ref = null;
@@ -1556,6 +1559,9 @@ SortableTitlePlugin.prototype._sortDataView = function (opt_action) {
 		} else {
 			c_ref = this.getColumnSortingFields();
 		}
+		if(this._userManagedLogic && c_ref.length > 1) {
+			c_ref = c_ref.slice(0, 1);
+		}
 	}
 
 	// Perform sorting even if there is no sort state