@refinitiv-ui/efx-grid 6.0.6 → 6.0.7

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

@@ -562,6 +562,7 @@ DataTable.prototype.removeRows = function(refs) {
 			this._prevData[rid] = this._rows[rid];
 			this._removedRows[rid] = 1;
 			delete this._rows[rid];
+			// TODO: remove segments
 			dirty = true;
 		}
 	}
@@ -658,6 +659,7 @@ DataTable.prototype.moveRow = function(fromIndex, toIndex, suppressEvent) {
 
 	if(output) {
 		if(this._segments) {
+			this._segments.calcSegmentOrder(this._rids);
 			this._sort(null); // Reorder segment members
 		}
 		this._dispatchPositionChange(suppressEvent);
@@ -887,12 +889,19 @@ DataTable.prototype.isFrozen = function() {
 DataTable.prototype.setSegmentSeparator = function(rid, enabled) {
 	var change = false;
 	var memberCount = 0;
-	if(typeof rid === "string") {
+	if(rid && typeof rid === "string") {
 		if(enabled !== false) {
 			if(!this._segments) {
 				this._segments = new SegmentCollection();
 			}
+			if(this._autoSegmentFilling) {
+				var parentId = this._segments.getParentRowId(rid);
+				if(parentId) {
+					this._segments.removeSegmentChild(parentId, rid);
+				}
+			}
 			if(this._segments.addSegment(rid)) {
+				this._segments.calcSegmentOrder(this._rids);
 				change = true;
 			}
 		} else if(this._segments) {
@@ -1194,6 +1203,7 @@ DataTable.prototype.sortSegments = function (compare) {
 	}
 
 	if(dirty) {
+		this._segments.calcSegmentOrder(rids);
 		this._sort(null);
 		this._dispatchPositionChange();
 	}

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

@@ -34,6 +34,10 @@ declare class Segment {
 
     public setValue(val: number): void;
 
+    public getOrder(): number;
+
+    public setOrder(val: number): void;
+
 }
 
 export default Segment;

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

@@ -27,6 +27,10 @@ Segment.prototype._collapsed = false;
 * @private
 */
 Segment.prototype._value = 0;
+/** @type {number}
+* @private
+*/
+Segment.prototype._order = 0;
 
 
 /** @public
@@ -194,6 +198,18 @@ Segment.prototype.getValue = function() {
 Segment.prototype.setValue = function(val) {
 	this._value = val;
 };
+/** @public
+* @return {number}
+*/
+Segment.prototype.getOrder = function() {
+	return this._order;
+};
+/** @public
+* @param {number} val
+*/
+Segment.prototype.setOrder = function(val) {
+	this._order = val;
+};
 
 
 export default Segment;

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

@@ -50,6 +50,8 @@ declare class SegmentCollection {
 
     public fillSegments(rids: (string)[]|null): boolean;
 
+    public calcSegmentOrder(rids: (string)[]|null): void;
+
     public getSegmentValues(rids: (string)[]): (number)[]|null;
 
 }

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

@@ -38,6 +38,7 @@ SegmentCollection.prototype.addSegment = function(rid) {
 	if(rid && !this._segments[rid]) {
 		if(this._childToSegmentId[rid]) {
 			console.log("child of a segment cannot be set as a segment separator");
+			return false;
 		}
 		this._segments[rid] = new Segment(rid);
 		++this._segmentCount;
@@ -368,8 +369,27 @@ SegmentCollection.prototype.fillSegments = function(rids) {
 	return change;
 };
 /** @public
+* @param {Array.<string>} rids
+*/
+SegmentCollection.prototype.calcSegmentOrder = function(rids) {
+	var ridCount = rids ? rids.length : 0;
+	var segmentSeparators = this._segments;
+	var segmentCount = this._segmentCount;
+	var order = 0;
+	for(var i = 0; i < ridCount; ++i) {
+		var rid = rids[i];
+		var segment = segmentSeparators[rid];
+		if(segment) {
+			segment.setOrder(++order);
+			if(order >= segmentCount) {
+				break;
+			}
+		}
+	}
+};
+/** @public
 * @param {!Array.<string>} rids Array of row ids
-* @return {Array.<number>} Returns Array of segment values, if there are at least two segments, otherwise returns null
+* @return {Array.<number>} Returns Array of segment values, if there are at least one segment, otherwise returns null
 */
 SegmentCollection.prototype.getSegmentValues = function(rids) {
 	var rowCount = rids ? rids.length : 0;
@@ -379,51 +399,33 @@ SegmentCollection.prototype.getSegmentValues = function(rids) {
 	var segmentSeparators = this._segments;
 	var childToSegmentId = this._childToSegmentId;
 	var curSegment = null;
+	var prevSegment = null;
 	var segmentValues = new Array(rowCount);
-	var curSegmentCount = 0;
 	var segmentVal = 0;
-	var r = 0;
-	var childToIndex = {};
-	while(r < rowCount) {
+	var offset = 0;
+	for(var r = 0; r < rowCount; ++r) {
 		var rid = rids[r];
-		if(segmentSeparators[rid]) {
-			++curSegmentCount;
-			curSegment = segmentSeparators[rid];
-			segmentVal += 100;
-			segmentValues[r] = segmentVal;
-			curSegment.setValue(segmentVal);
-			if(curSegmentCount >= this._segmentCount) {
-				++r;
-				break;
-			}
+		curSegment = segmentSeparators[rid];
+		if(curSegment) {
+			offset = 0;
 		} else {
-			if(curSegmentCount) {
-				segmentValues[r] = segmentVal + 10;
+			var parentId = childToSegmentId[rid];
+			if(parentId) {
+				curSegment = segmentSeparators[parentId];
+				offset = 1;
 			} else {
-				segmentValues[r] = 0;
-			}
-			if(childToSegmentId[rid]) {
-				childToIndex[rid] = r;
+				offset = prevSegment ? 10 : 0;
 			}
 		}
-		++r;
-	}
-	if(curSegmentCount) {
-		while(r < rowCount) {
-			rid = rids[r];
-			segmentValues[r] = segmentVal + 10;
-			if(childToSegmentId[rid]) {
-				childToIndex[rid] = r;
-			}
-			++r;
-		}
-		for(var childId in childToIndex) {
-			curSegment = segmentSeparators[childToSegmentId[childId]];
-			segmentValues[childToIndex[childId]] = curSegment.getValue() + 1;
+
+		if(curSegment && prevSegment !== curSegment) {
+			prevSegment = curSegment;
+			segmentVal = curSegment.getOrder() * 100;
 		}
+		segmentValues[r] = segmentVal + offset;
 	}
 
-	return curSegmentCount ? segmentValues : null;
+	return prevSegment ? segmentValues : null;
 };
 
 

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

@@ -528,7 +528,7 @@ Core.prototype._rowHeightTimerId = 0;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.17";
+	return "5.1.20";
 };
 /** {@link ElementWrapper#dispose}
 * @override

package/lib/core/es6/grid/components/Cell.js

@@ -382,6 +382,9 @@ Cell.prototype.updateIcon = function(icon) {
 
 	var fi = this._frontIcon;
 	if (fi) {
+		if(fi.containItem(icon)) { // Check same icon which duplicate with insertItem in _frontIcon
+			return;
+		}
 		fi.clearItems();
 	}
 	this.insertFrontIcon(icon, 0);

package/lib/core/es6/grid/components/CellFloatingPanel.d.ts

@@ -7,6 +7,8 @@ declare class CellFloatingPanel extends ElementWrapper {
 
     public hasItem(): boolean;
 
+    public containItem(icon: Element|null): boolean;
+
     public insertItem(item: Element|null, opt_order?: number|null): void;
 
     public removeItem(elemRef?: (Element|string)|null): Element|null|null;

package/lib/core/es6/grid/components/CellFloatingPanel.js

@@ -23,6 +23,13 @@ CellFloatingPanel.prototype._items = [];
 CellFloatingPanel.prototype.hasItem = function () {
 	return !!this._items.length;
 };
+/** @public
+ * @param {Element} icon Element of item
+ * @returns {boolean}
+*/
+CellFloatingPanel.prototype.containItem = function (icon) {
+	return this._items.indexOf(icon) > -1;
+};
 /** @public
 * @param {Element} item
 * @param {number=} opt_order The greater the order, the farther the position to the right

package/lib/core/es6/grid/components/StretchedCells.js

@@ -129,7 +129,11 @@ StretchedCells.prototype.setCellCount = function (count) {
 * @return {Cell}
 */
 StretchedCells.prototype.getCell = function (rowIndex) {
-	return this._cells[rowIndex] || null;
+	var cell = this._cells[rowIndex];
+	if(cell && cell["getParent"]()) {
+		return cell;
+	}
+	return null;
 };
 /** @public
 * @ignore
@@ -176,13 +180,13 @@ StretchedCells.prototype.getColumnIndex = function (cellRef) {
 StretchedCells.prototype.getRowIndex = function (cellRef) {
 	if(cellRef) {
 		if(cellRef["getElement"]) {
-			return this._cells.indexOf(cellRef);
+			return cellRef["getParent"]() ? this._cells.indexOf(cellRef) : -1;
 		} else {
 			var cells = this._cells;
 			var rowCount = cells.length;
 			for(var r = 0; r < rowCount; ++r) {
 				var cell = cells[r];
-				if(cell && cell["getElement"]() === cellRef) {
+				if(cell && cell["getParent"]() && cell["getElement"]() === cellRef) {
 					return r;
 				}
 			}

package/lib/core/es6/index.d.ts

@@ -36,6 +36,7 @@ import ColumnStats from "./data/ColumnStats.js";
 import DataCache from "./data/DataCache.js";
 import DataTable from "./data/DataTable.js";
 import DataView from "./data/DataView.js";
+import SegmentCollection from "./data/SegmentCollection.js";
 
 
 

package/lib/core/es6/index.js

@@ -36,6 +36,7 @@ import ColumnStats from "./data/ColumnStats.js";
 import DataCache from "./data/DataCache.js";
 import DataTable from "./data/DataTable.js";
 import DataView from "./data/DataView.js";
+import SegmentCollection from "./data/SegmentCollection.js";
 
 // tsd-disable
 var tr = window["tr"];
@@ -60,6 +61,7 @@ tr.ColumnStats = ColumnStats;
 tr.DataCache = DataCache;
 tr.DataTable = DataTable;
 tr.DataView = DataView;
+tr.SegmentCollection = SegmentCollection;
 
 // Components
 grid.CellFloatingPanel = CellFloatingPanel;

package/lib/formatters/es6/index.d.ts

@@ -5,7 +5,7 @@ import CoralCheckboxFormatter from "./CoralCheckboxFormatter.js";
 import CoralComboBoxFormatter from "./CoralComboBoxFormatter.js";
 import CoralIconFormatter from "./CoralIconFormatter.js";
 import CoralInputFormatter from "./CoralInputFormatter.js";
-import CoralRadioButtonFormatter from "./CoralRadioButtonFormatter";
+import CoralRadioButtonFormatter from "./CoralRadioButtonFormatter.js";
 import CoralSelectFormatter from "./CoralSelectFormatter.js";
 import CoralToggleFormatter from "./CoralToggleFormatter.js";
 import DuplexEmeraldDateTimePickerFormatter from "./DuplexEmeraldDateTimePickerFormatter.js";

package/lib/formatters/es6/index.js

@@ -5,7 +5,7 @@ import CoralCheckboxFormatter from "./CoralCheckboxFormatter.js";
 import CoralComboBoxFormatter from "./CoralComboBoxFormatter.js";
 import CoralIconFormatter from "./CoralIconFormatter.js";
 import CoralInputFormatter from "./CoralInputFormatter.js";
-import CoralRadioButtonFormatter from "./CoralRadioButtonFormatter";
+import CoralRadioButtonFormatter from "./CoralRadioButtonFormatter.js";
 import CoralSelectFormatter from "./CoralSelectFormatter.js";
 import CoralToggleFormatter from "./CoralToggleFormatter.js";
 import DuplexEmeraldDateTimePickerFormatter from "./DuplexEmeraldDateTimePickerFormatter.js";

package/lib/grid/index.js

@@ -1,2 +1,2 @@
 import "./lib/efx-grid.js";
-window.EFX_GRID = { version: "6.0.6" };
+window.EFX_GRID = { version: "6.0.7" };

package/lib/tr-grid-cell-selection/es6/CellSelection.js

@@ -628,33 +628,39 @@ CellSelectionPlugin.prototype._setScrollInterval = function (dirVectors) {
       // updates scroll position
       this._hosts[0].setScrollTop(scrollToTop);
 
-      var vScrollView = this._hosts[0].getVScrollView();
+      var vScrollbar = this._hosts[0].getVScrollbar();
+
+      var rowVirtualizer = this._hosts[0].getRowVirtualizer();
 
       var isEndOfVerticalScroll = this._isEndOfVerticalScroll();
 
+      var vTrackHeight = vScrollbar.getHeight();
+      var scrollViewOffset = rowVirtualizer.getViewOffset(); // scrolling down
+
       if (isYPositive) {
-        var nextBottomVal = vScrollView.lastFullRow;
-
-        if (!!(this._prevRect && this._prevRect.bottom > nextBottomVal) && !isEndOfVerticalScroll) {
-          tgtRect.top = nextBottomVal;
-        } else {
-          if (isEndOfVerticalScroll) {
-            tgtRect.bottom = this._hosts[0].getRowCount();
-          } else {
-            tgtRect.bottom = nextBottomVal;
+        var nextBottomRowEndPos = rowVirtualizer.getContentStart(tgtRect.bottom + 1) - scrollViewOffset; //end position of next bottom row
+
+        if (nextBottomRowEndPos <= vTrackHeight) {
+          // while next row is in scroll view, extend to next bottom row
+          while (nextBottomRowEndPos <= vTrackHeight) {
+            tgtRect.bottom += 1;
+            nextBottomRowEndPos = rowVirtualizer.getContentStart(tgtRect.bottom + 1) - scrollViewOffset;
           }
+        } else if (isEndOfVerticalScroll) {
+          tgtRect.bottom = this._hosts[0].getRowCount();
         }
-      } else {
-        var nextTopVal = vScrollView.firstFullRow + 2;
-
-        if (!!(this._prevRect && this._prevRect.top < nextTopVal) && !isEndOfVerticalScroll) {
-          tgtRect.bottom = nextTopVal + 1;
-        } else {
-          if (isEndOfVerticalScroll) {
-            tgtRect.top = 1;
-          } else {
-            tgtRect.top = nextTopVal;
+      } // scrolling up
+      else {
+        var nextTopRowStartPos = rowVirtualizer.getContentStart(tgtRect.top - 1) - scrollViewOffset; //start position of next top row
+
+        if (nextTopRowStartPos >= 0) {
+          // while next row is in scroll view, extend to next top row
+          while (nextTopRowStartPos >= 0) {
+            tgtRect.top -= 1;
+            nextTopRowStartPos = rowVirtualizer.getContentStart(tgtRect.top - 1) - scrollViewOffset;
           }
+        } else if (isEndOfVerticalScroll) {
+          tgtRect.top = 1;
         }
       }
     }
@@ -667,28 +673,33 @@ CellSelectionPlugin.prototype._setScrollInterval = function (dirVectors) {
 
       var hScrollbar = this._hosts[0].getHScrollbar();
 
-      var hTrackWidth = hScrollbar.getTrackSize();
+      var hTrackWidth = hScrollbar.getTrackSize(); // scrolling right
 
       if (isXPositive) {
         var leftPinnedWidth = 0;
 
-        var leftPinnedCount = this._hosts[0].getPinnedLeftColumnCount();
+        var leftPinnedCount = this._hosts[0].getPinnedLeftColumnCount(); // getting width of left pinned columns
+
 
         if (leftPinnedCount) {
           leftPinnedWidth = this._hosts[0].getContentWidth() - hScrollbar.getContentWidth();
         }
 
-        var nextRightColEndPos = this._hosts[0].getColumnRight(tgtRect.right) - leftPinnedWidth;
+        var nextRightColEndPos = this._hosts[0].getColumnRight(tgtRect.right) - leftPinnedWidth; //end position of next right column
+        // if next column is in scroll view, extend to next right column
 
         if (nextRightColEndPos <= hTrackWidth) {
           tgtRect.right += 1;
         } else if (isEndOfHorizontalScroll) {
           tgtRect.right = this._hosts[0].getColumnCount();
         }
-      } else {
-        var nextLeftColEndPos = this._hosts[0].getColumnLeft(tgtRect.left - 1);
+      } // scrolling left
+      else {
+        var nextLeftColStartPos = this._hosts[0].getColumnLeft(tgtRect.left - 1); //start position of next left column
+        // if next column is in scroll view, extend to next left column
+
 
-        if (nextLeftColEndPos >= 0) {
+        if (nextLeftColStartPos >= 0) {
           tgtRect.left -= 1;
         } else if (isEndOfHorizontalScroll) {
           tgtRect.left = 0;

package/lib/types/es6/CellSelection.d.ts

@@ -7,14 +7,14 @@ import { isIE, cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Uti
 declare namespace CellSelectionPlugin {
 
     type Options = {
-        mode?: string,
-        multipleSelection?: boolean,
-        autoDeselecting?: boolean,
-        tabToSelect?: boolean,
-        selectionChanged?: ((...params: any[]) => any),
-        copy?: ((...params: any[]) => any),
-        beforeMouseDown?: ((...params: any[]) => any),
-        selectableSections?: any[]
+        mode?: string|null,
+        multipleSelection?: boolean|null,
+        autoDeselecting?: boolean|null,
+        tabToSelect?: boolean|null,
+        selectionChanged?: ((...params: any[]) => any)|null,
+        copy?: ((...params: any[]) => any)|null,
+        beforeMouseDown?: ((...params: any[]) => any)|null,
+        selectableSections?: any[]|null
     };
 
 }
@@ -41,7 +41,7 @@ declare class CellSelectionPlugin extends GridPlugin {
 
     public getLastSelectionBounds(opt_ret?: any): any;
 
-    public setSelectableSections(types?: (string|(string)[]|null)): void;
+    public setSelectableSections(types?: (string|(string)[]|null)|null): void;
 
     public selectSingleCell(anchor: any): void;
 
@@ -53,9 +53,9 @@ declare class CellSelectionPlugin extends GridPlugin {
 
     public getAnchorInfo(): any;
 
-    public getSelectedCells(): (any[])[];
+    public getSelectedCells(): (any[])[]|null;
 
-    public disableSelection(opt_disable?: boolean): void;
+    public disableSelection(opt_disable?: boolean|null): void;
 
     public setAutoDeselectingOnBlur(bool: boolean): void;
 

package/lib/types/es6/Core/data/Segment.d.ts

@@ -34,6 +34,10 @@ declare class Segment {
 
     public setValue(val: number): void;
 
+    public getOrder(): number;
+
+    public setOrder(val: number): void;
+
 }
 
 export default Segment;

package/lib/types/es6/Core/data/SegmentCollection.d.ts

@@ -50,6 +50,8 @@ declare class SegmentCollection {
 
     public fillSegments(rids: (string)[]|null): boolean;
 
+    public calcSegmentOrder(rids: (string)[]|null): void;
+
     public getSegmentValues(rids: (string)[]): (number)[]|null;
 
 }

package/lib/types/es6/Core/index.d.ts

@@ -36,6 +36,7 @@ import ColumnStats from "./data/ColumnStats.js";
 import DataCache from "./data/DataCache.js";
 import DataTable from "./data/DataTable.js";
 import DataView from "./data/DataView.js";
+import SegmentCollection from "./data/SegmentCollection.js";
 
 
 

package/lib/versions.json

@@ -5,7 +5,7 @@
 	"@grid/statistics-row": "1.0.13",
 	"@grid/zoom": "1.0.11",
 	"tr-grid-auto-tooltip": "1.1.5",
-	"tr-grid-cell-selection": "1.0.31",
+	"tr-grid-cell-selection": "1.0.32",
 	"tr-grid-checkbox": "1.0.59",
 	"tr-grid-column-fitter": "1.0.39",
 	"tr-grid-column-formatting": "0.9.34",
@@ -30,7 +30,7 @@
 	"tr-grid-rowcoloring": "1.0.20",
 	"tr-grid-textformatting": "1.0.44",
 	"tr-grid-titlewrap": "1.0.19",
-	"@grid/formatters": "1.0.48",
+	"@grid/formatters": "1.0.49",
 	"@grid/column-selection-dialog": "4.0.44",
 	"@grid/filter-dialog": "4.0.52",
 	"@grid/column-format-dialog": "4.0.42"

package/package.json

@@ -45,5 +45,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.6"
+	"version": "6.0.7"
 }