@refinitiv-ui/efx-grid 6.0.101 → 6.0.102

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

@@ -7,24 +7,10 @@ import ILayoutGrid from "./ILayoutGrid.js";
 import LayoutGrid from "./LayoutGrid.js";
 import ElementWrapper from "./components/ElementWrapper.js";
 import HScrollbar from "./components/HScrollbar.js";
+import CellBoundPainter from "./util/CellBoundPainter.js";
 /* eslint-enable */
 
 
-/** @private
-* @function
-* @param {number} idx
-* @param {number} limit
-* @return {number}
-*/
-let _validateIndex = function(idx, limit) {
-	if(idx > limit) {
-		return limit;
-	} else if(idx < 0) {
-		return 0;
-	}
-	return idx;
-};
-
 /** @constructor
  * @ignore
  * @param {Object=} options
@@ -109,26 +95,10 @@ VirtualizedLayoutGrid.prototype._rowBoundCache = null;
 * @private
 */
 VirtualizedLayoutGrid.prototype._rowSelDirty = false;
-/** @type {Element}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cellBound = null;
-/** @type {number}
+/** @type {Object}
 * @private
 */
-VirtualizedLayoutGrid.prototype._cbLftIdx = 0;
-/** @type {number}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cbRgtIdx = 0;
-/** @type {number}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cbTopIdx = 0;
-/** @type {number}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cbBtmIdx = 0;
+VirtualizedLayoutGrid.prototype._cellBoundPainter = null;
 /** @type {number}
 * @private
 */
@@ -181,6 +151,9 @@ VirtualizedLayoutGrid.prototype.dispose = function () {
 		clearTimeout(this._rowBoundTimer);
 		this._rowBoundTimer = 0;
 	}
+	if(this._cellBoundPainter) {
+		this._cellBoundPainter.dispose();
+	}
 };
 /** @override */
 VirtualizedLayoutGrid.prototype.setWidth = function (px) {
@@ -1008,26 +981,20 @@ VirtualizedLayoutGrid.prototype.selectCell = function (colIndex, rowIndex, selec
 * @param {number} height
 */
 VirtualizedLayoutGrid.prototype.setCellBounds = function (colIndex, rowIndex, width, height) {
-	let cellBound = this._cellBound;
-	if(!cellBound) {
-		cellBound = this._cellBound = document.createElement("div");
-		cellBound.className = "selection-bound";
+	let boundLayer = this._initBoundLayer();
+	let cellBoundPainter = this._cellBoundPainter;
+	if(!cellBoundPainter) {
+		cellBoundPainter = this._cellBoundPainter = new CellBoundPainter({
+			boundLayer: boundLayer,
+			layoutX: this.getHorizontalLayout(),
+			layoutY: this._layoutY,
+			hscrollbar: this._hscrollbar,
+			calculateColumnBounds: this.calculateColumnBounds.bind(this)
+		});
 	}
-	this._initBoundLayer();
-
-	// Validate inputs
-	let rgtIndex = colIndex + width; // Exclusive
-	let btmIndex = rowIndex + height; // Exclusive
 
 	let colCount = this.getColumnCount();
-	let rowCount = this._layoutY.getLaneCount();
-
-	this._cbLftIdx = _validateIndex(colIndex, colCount);
-	this._cbRgtIdx = _validateIndex(rgtIndex, colCount);
-	this._cbTopIdx = _validateIndex(rowIndex, rowCount);
-	this._cbBtmIdx = _validateIndex(btmIndex, rowCount);
-
-	this._updateCellBounds();
+	cellBoundPainter.setCellBounds(colIndex, rowIndex, width, height, colCount);
 };
 /** @public
 * @ignore
@@ -1046,59 +1013,6 @@ VirtualizedLayoutGrid.prototype.getHorizontalLayout = function () {
 VirtualizedLayoutGrid.prototype.calculateColumnBounds = function (lftIdx, rgtIdx, outPositions, outNoBorders) {
 	this._grid.calculateColumnBounds(lftIdx, rgtIdx, outPositions, outNoBorders);
 };
-/** @private
-*/
-VirtualizedLayoutGrid.prototype._updateCellBounds = function () {
-	let cellBound = this._cellBound;
-	if(!cellBound) {
-		return;
-	}
-
-	let layoutX = this.getHorizontalLayout();
-	let layoutY = this._layoutY;
-	let lftIdx = this._cbLftIdx;
-	let rgtIdx = this._cbRgtIdx; // Exclusive
-	let topIdx = this._cbTopIdx;
-	let btmIdx = this._cbBtmIdx; // Exclusive
-	let lftPx, rgtPx, topPx, btmPx;
-	lftPx = rgtPx = topPx = btmPx = 0;
-	if(lftIdx < rgtIdx && topIdx < btmIdx) {
-		lftPx = layoutX.getLaneStart(lftIdx);
-		rgtPx = layoutX.getLaneEnd(rgtIdx - 1);
-		topPx = layoutY.getLaneStart(topIdx);
-		btmPx = layoutY.getLaneEnd(btmIdx - 1);
-	}
-
-	let width = rgtPx - lftPx;
-	let height = btmPx - topPx;
-	let noBorders = [false, false];
-	if(width > 0 && height > 0 && this._hscrollbar) {
-		let positions = [0, 0];
-		this.calculateColumnBounds(lftIdx, rgtIdx - 1, positions, noBorders);
-		lftPx = positions[0];
-		rgtPx = positions[1];
-		width = rgtPx - lftPx;
-	}
-
-	if(width > 0) {
-		cellBound.style.left = lftPx + "px";
-		cellBound.style.top = topPx + "px";
-		cellBound.style.width = width + "px";
-		cellBound.style.height = height + "px";
-
-		cellBound.classList.toggle("no-left-bound", noBorders[0]);
-		cellBound.classList.toggle("no-right-bound", noBorders[1]);
-
-		if(this._boundLayer) {
-			this._boundLayer.appendChild(cellBound);
-		}
-	} else {
-		let pn = cellBound.parentNode;
-		if(pn) {
-			pn.removeChild(cellBound);
-		}
-	}
-};
 /** @public
 * @ignore
 * @param {!Array.<Array>} posAry Left and right bound positions in pixel
@@ -1116,6 +1030,7 @@ VirtualizedLayoutGrid.prototype.updateColumnSeparators = function () {
 	this._grid.updateColumnSeparators();
 };
 /** @private
+* @return {Element}
 */
 VirtualizedLayoutGrid.prototype._initBoundLayer = function () {
 	let boundLayer = this._boundLayer;
@@ -1124,6 +1039,7 @@ VirtualizedLayoutGrid.prototype._initBoundLayer = function () {
 		boundLayer.className = "cover-layer";
 		this._element.appendChild(boundLayer);
 	}
+	return boundLayer;
 };
 /** @private
 */
@@ -1136,7 +1052,11 @@ VirtualizedLayoutGrid.prototype._requestUpdatingRowBounds = function () {
 */
 VirtualizedLayoutGrid.prototype._updateRowBounds = function () {
 	this._rowBoundTimer = 0;
-	this._updateCellBounds();
+
+	let cellBoundPainter = this._cellBoundPainter;
+	if(cellBoundPainter) {
+		cellBoundPainter.updateCellBounds();
+	}
 
 	if(!this._rowSelDirty) {
 		return;

package/lib/core/es6/grid/util/CellBoundPainter.d.ts

@@ -0,0 +1,16 @@
+
+
+declare class CellBoundPainter {
+
+    constructor(ctx: any);
+
+    public dispose(): void;
+
+    public setCellBounds(colIndex: number, rowIndex: number, width: number, height: number, colCount: number): void;
+
+    public updateCellBounds(): void;
+
+}
+
+export default CellBoundPainter;
+export { CellBoundPainter };

package/lib/core/es6/grid/util/CellBoundPainter.js

@@ -0,0 +1,171 @@
+/** @private
+* @function
+* @param {number} idx
+* @param {number} limit
+* @return {number}
+*/
+let _validateIndex = function(idx, limit) {
+	if(idx > limit) {
+		return limit;
+	} else if(idx < 0) {
+		return 0;
+	}
+	return idx;
+};
+
+/** @constructor
+* @param {Object} ctx
+*/
+let CellBoundPainter = function (ctx) {
+	this._boundLayer = ctx.boundLayer;
+	this._layoutX = ctx.layoutX;
+	this._layoutY = ctx.layoutY;
+	this._hscrollbar = ctx.hscrollbar;
+	this._calculateColumnBounds = ctx.calculateColumnBounds;
+};
+
+/** @type {Element}
+* @private
+*/
+CellBoundPainter.prototype._boundLayer = null;
+/** @type {!TrackLayout}
+* @private
+*/
+CellBoundPainter.prototype._layoutX;
+/** @type {!TrackLayout}
+* @private
+*/
+CellBoundPainter.prototype._layoutY;
+/** @type {HScrollbar}
+* @private
+*/
+CellBoundPainter.prototype._hscrollbar;
+/** @type {Function}
+* @private
+*/
+CellBoundPainter.prototype._calculateColumnBounds;
+/** @type {Element}
+* @private
+*/
+CellBoundPainter.prototype._cellBound = null;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbLftIdx = 0;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbRgtIdx = 0;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbTopIdx = 0;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbBtmIdx = 0;
+
+/** @public
+*/
+CellBoundPainter.prototype.dispose = function () {
+	let cellBound = this._cellBound;
+	if(cellBound) {
+		let pn = cellBound.parentNode;
+		if(pn) {
+			pn.removeChild(cellBound);
+		}
+		this._cellBound = null;
+	}
+	this._boundLayer = null;
+	this._layoutX = null;
+	this._layoutY = null;
+	this._hscrollbar = null;
+	this._calculateColumnBounds = null;
+};
+
+/** @public
+* @param {number} colIndex
+* @param {number} rowIndex
+* @param {number} width
+* @param {number} height
+* @param {number} colCount
+*/
+CellBoundPainter.prototype.setCellBounds = function (colIndex, rowIndex, width, height, colCount) {
+	let cellBound = this._cellBound;
+	if(!cellBound) {
+		cellBound = this._cellBound = document.createElement("div");
+		cellBound.className = "selection-bound";
+	}
+
+	// Validate inputs
+	let rgtIndex = colIndex + width; // Exclusive
+	let btmIndex = rowIndex + height; // Exclusive
+
+	let rowCount = this._layoutY.getLaneCount();
+
+	this._cbLftIdx = _validateIndex(colIndex, colCount);
+	this._cbRgtIdx = _validateIndex(rgtIndex, colCount);
+	this._cbTopIdx = _validateIndex(rowIndex, rowCount);
+	this._cbBtmIdx = _validateIndex(btmIndex, rowCount);
+
+	this.updateCellBounds();
+};
+
+/** @public
+*/
+CellBoundPainter.prototype.updateCellBounds = function() {
+	let cellBound = this._cellBound;
+	if(!cellBound) {
+		return;
+	}
+
+	let layoutX = this._layoutX;
+	let layoutY = this._layoutY;
+	let lftIdx = this._cbLftIdx;
+	let rgtIdx = this._cbRgtIdx; // Exclusive
+	let topIdx = this._cbTopIdx;
+	let btmIdx = this._cbBtmIdx; // Exclusive
+	let lftPx, rgtPx, topPx, btmPx;
+	lftPx = rgtPx = topPx = btmPx = 0;
+	if(lftIdx < rgtIdx && topIdx < btmIdx) {
+		lftPx = layoutX.getLaneStart(lftIdx);
+		rgtPx = layoutX.getLaneEnd(rgtIdx - 1);
+		topPx = layoutY.getLaneStart(topIdx);
+		btmPx = layoutY.getLaneEnd(btmIdx - 1);
+	}
+
+	let width = rgtPx - lftPx;
+	let height = btmPx - topPx;
+	let noBorders = [false, false];
+	if(width > 0 && height > 0 && this._hscrollbar) {
+		let positions = [0, 0];
+		this._calculateColumnBounds(lftIdx, rgtIdx - 1, positions, noBorders);
+		lftPx = positions[0];
+		rgtPx = positions[1];
+		width = rgtPx - lftPx;
+	}
+
+	if(width > 0) {
+		cellBound.style.left = lftPx + "px";
+		cellBound.style.top = topPx + "px";
+		cellBound.style.width = width + "px";
+		cellBound.style.height = height + "px";
+
+		cellBound.classList.toggle("no-left-bound", noBorders[0]);
+		cellBound.classList.toggle("no-right-bound", noBorders[1]);
+
+		if(this._boundLayer) {
+			this._boundLayer.appendChild(cellBound);
+		}
+	} else {
+		let pn = cellBound.parentNode;
+		if(pn) {
+			pn.removeChild(cellBound);
+		}
+	}
+};
+
+CellBoundPainter._proto = CellBoundPainter.prototype;
+
+export default CellBoundPainter;
+export { CellBoundPainter };

package/lib/grid/index.js

@@ -1,3 +1,3 @@
 import {Grid} from "./lib/efx-grid.js";
 export {Grid}
-window.EFX_GRID = { version: "6.0.101" };
+window.EFX_GRID = { version: "6.0.102" };

package/lib/rt-grid/dist/rt-grid.js

@@ -14372,6 +14372,11 @@ RowDefinition.prototype._toRealTimeRow = function() {
 	this._parent = null;
 	this._depthLevel = 0;
 
+	// Add static value to the new allocated row
+	if(this._staticValues) {
+		this.setRowData(this._staticValues);
+	}
+
 	this.subscribeForUpdates();
 };
 
@@ -14390,8 +14395,12 @@ RowDefinition.prototype.unlinkChain = function() {
 		}
 	}
 
+	let staticData = this._getStaticRowData();
 	this.unsubscribeForUpdates();
 
+	// Restore static data
+	this.setStaticRowData(staticData);
+
 	let view = this._view;
 	if(view) {
 		let rid = this.getRowId();