@refinitiv-ui/efx-grid 6.0.35 → 6.0.36

package/lib/core/dist/core.js

@@ -4765,6 +4765,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 () {};
 
 /* harmony default export */ const grid_ILayoutGrid = (ILayoutGrid);
 
@@ -8754,7 +8758,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}
@@ -10721,8 +10732,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();
 		}
 	}
@@ -10894,6 +10904,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
@@ -12764,7 +12860,8 @@ DataCache_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
@@ -12775,6 +12872,11 @@ DataCache_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);
@@ -12811,6 +12913,12 @@ DataCache_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
@@ -12835,6 +12943,13 @@ DataCache_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);
 	}
 };
@@ -24973,6 +25088,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 () {
@@ -25738,7 +25859,7 @@ Core_Core.prototype._batches = null;
 * @return {string}
 */
 Core_Core.getVersion = function () {
-	return "5.1.48";
+	return "5.1.50";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -26951,6 +27072,7 @@ Core_Core.prototype._moveColumn = function (fromCol, destCol) {
 		}
 	}
 	this._updateColumnBounds();
+	this._updateColumnSeparators();
 	return true;
 };
 
@@ -27281,6 +27403,7 @@ Core_Core.prototype.setDefaultRowHeight = function (val, opt_includeTitle) {
 		this._syncRowHeights();
 		this._rowHeightSync = true;
 		this.setRowScrollingStep(this._rowScrollingStep);
+		this._updateColumnSeparators();
 	}
 };
 
@@ -28115,6 +28238,7 @@ Core_Core.prototype.freezeColumn = function (frozenColIndex, numRightColumn) {
 
 	this._onColumnCountChanged(); // Activate horizontal scrollbar and column virtualization
 	this._updateScrollbarWidth(true, true);
+	this._updateColumnSeparators();
 };
 
 /** @private
@@ -29356,6 +29480,21 @@ Core_Core.prototype._updateColumnBounds = function () {
 		section.updateColumnBounds(posAry, noBorderAry);
 	}
 };
+/* @private
+*/
+Core_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
@@ -30425,6 +30564,8 @@ Core_Core.prototype._onRowCountChanged = function (e) {
 	if(!forceUpdate) {
 		this._updateVScrollbar(); // Asynchronous
 	}
+
+	this._updateColumnSeparators();
 	if(prevRowCount < newRowCount) {
 		this._dispatch("rowAdded", e);
 	} else if(prevRowCount > newRowCount) {
@@ -30482,7 +30623,7 @@ Core_Core.prototype._onRowHeightChanged = function (e) {
 				minSectionIndex >= this._startVScrollbarIndex);
 		}
 	}
-
+	this._updateColumnSeparators();
 	this._dispatchRowPositionChanged();
 };
 /** @private
@@ -30547,6 +30688,7 @@ Core_Core.prototype._onColumnCountChanged = function () {
 	var pinnedRight = this._countPinnedRightColumns();
 
 	this._updateColumnBounds();
+	this._updateColumnSeparators();
 
 	if (this._hScrollbarEnabled && pinnedLeft + pinnedRight < this.getColumnCount()) {
 		this._hscrollbar.enable();
@@ -30828,6 +30970,7 @@ Core_Core.prototype._syncLayoutToColumns = function (from, to, opt_forceDispatch
 	var paneChanged = forceUpdate || (from < this.getHScrollStartIndex()) || (to > this.getFirstPinnedRightIndex());
 	this._updateScrollbarWidth(paneChanged, true /* contentChanged */);
 	this._updateColumnBounds();
+	this._updateColumnSeparators();
 	this._dispatchColumnPositionChanged();
 
 	if (dirty || opt_forceDispatching) {
@@ -30923,6 +31066,7 @@ Core_Core.prototype._updateLayout = function () {
 		var section = this._settings[s].getSection();
 		section.updateLayout(); // Notify section about forced recalculation of the layout
 	}
+	this._updateColumnSeparators();
 };
 
 /** @private */