@refinitiv-ui/efx-grid 6.0.73 → 6.0.75

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

@@ -2466,6 +2466,32 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 				}
 			}
 		}
+
+		var idMap = {};
+		var newDataMap = {};
+		for (i = recordCount - 1; i >= 0; i--) {
+			record = records[i];
+			id = record[rowIdentifier];
+			rowDef = oldDataMap[id];
+			newDataMap[id] = record; // Assign a new data map to compare to the previous data
+			record[fieldSorting] = i;
+			if(idMap[id]) { // Prevent assign data in duplicate row
+				continue;
+			}
+			idMap[id] = true;
+			if (!rowDef) {
+				this.insertRow({ values: record}); // Insert last position
+			} else {
+				rowDef.setRowData(record);
+			}
+		}
+		// Check Remove previous data
+		for (var rowIdentifierName in oldDataMap) {
+			if (oldDataMap[rowIdentifierName] && !newDataMap[rowIdentifierName]) {
+				this.removeRow(oldDataMap[rowIdentifierName]); // Slow
+			}
+		}
+		this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
 	} else {
 		for (i = 0; i < rowDefCount; i++) {
 			record = records[i];
@@ -2475,38 +2501,17 @@ Grid.prototype.updateDataSet = function(records, rowIdentifier) {
 				this.removeRow(rowDefs[i]); // Need to use rowRef, can't use index in view
 			}
 		}
-	}
 
-	// Check Update and Insert
-	var idMap = {};
-	var newDataMap = {};
-	for (i = recordCount - 1; i >= 0; i--) {
-		record = records[i];
-		id = rowIdentifier ? record[rowIdentifier] : i;
-		rowDef = oldDataMap[id];
-		newDataMap[id] = record; // Assign a new data map to compare to the previous data
-		record[fieldSorting] = i;
-		if(idMap[id]) { // Prevent assign data in duplicate row
-			continue;
-		}
-		idMap[id] = true;
-		if (!rowDef) {
-			this.insertRow({ values: record}); // Insert last position
-		} else {
-			rowDef.setRowData(record);
-		}
-	}
-
-	// Check Remove previous data
-	for (var rowIdentifierName in oldDataMap) {
-		if (oldDataMap[rowIdentifierName] && !newDataMap[rowIdentifierName]) {
-			this.removeRow(oldDataMap[rowIdentifierName]); // Slow
+		for (i = 0; i < recordCount; i++) { // It will be sort by index when insert / update
+			record = records[i];
+			rowDef = oldDataMap[i];
+			if (!rowDef) {
+				this.insertRow({ values: record}); // Insert last position
+			} else {
+				rowDef.setRowData(record);
+			}
 		}
 	}
-
-	if(rowIdentifier) {
-		this._dt.sortOnce(ROW_DEF, "a", compareNumber, fieldSorting);
-	}
 };
 /** @private
 * @param {Array|Object} item

package/lib/tr-grid-cell-selection/es6/CellSelection.d.ts

@@ -3,6 +3,8 @@ import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 import { MouseDownTrait } from "../../tr-grid-util/es6/MouseDownTrait.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
 import { isIE, cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
+import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
+import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 declare namespace CellSelectionPlugin {
 

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

@@ -3,6 +3,8 @@ import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 import { MouseDownTrait } from "../../tr-grid-util/es6/MouseDownTrait.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
 import { isIE, cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
+import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
+import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 /** @typedef {Object} CellSelectionPlugin~Options
 * @description The options can be specified by `cellSelection` property of the main grid's options
@@ -65,6 +67,22 @@ var CellSelectionPlugin = function CellSelectionPlugin(options) {
 };
 Ext.inherits(CellSelectionPlugin, GridPlugin);
 
+/** @type {string}
+* @private
+*/
+CellSelectionPlugin._styles = prettifyCss([":host .tr-grid .cell.selection", ["background-image: none;", "background-color: var(--grid-selection-bgcolor);"]]);
+
+/** @private
+* @param {Object} grid core grid instance
+*/
+CellSelectionPlugin._applyStyles = function (grid) {
+  if (!grid || grid._cellSelectionStyles || !ElfUtil.isHaloTheme()) {
+    return;
+  }
+  grid._cellSelectionStyles = true; // Prevent loading the same style twice
+  injectCss(CellSelectionPlugin._styles, grid.getElement());
+};
+
 /** @type {Range}
 * @private
 */
@@ -254,6 +272,7 @@ CellSelectionPlugin.prototype.initialize = function (host, options) {
   if (this._hosts.length === 1) {
     this.config(options);
   }
+  CellSelectionPlugin._applyStyles(host);
 };
 
 /** Prevent memory leak, when we leave witout unlisten.

package/lib/tr-grid-range-bar/es6/RangeBar.js

@@ -494,9 +494,17 @@ RangeBarPlugin.prototype._onPostSectionBinding = function (e) {
         cell.setTooltip(textTooltip); // WARNING: this may be confuse with auto-tooltip extension
       }
 
+      var span;
+      if (high == null && low == null && last == null) {
+        // Empty case
+        span = document.createElement("span");
+        span.textContent = "";
+        cell.setContent(span);
+        continue;
+      }
       if (high == null || low == null || high < low) {
-        // Invalid cases
-        var span = document.createElement("span");
+        // Empty low or high case
+        span = document.createElement("span");
         span.textContent = "N/A";
         cell.setContent(span);
         continue;
@@ -545,8 +553,17 @@ RangeBarPlugin.prototype._onPostSectionBinding = function (e) {
           var highNormalize = _normalizeValue(low, high, last);
           rangeBar.range = [highNormalize, lastNormalize];
         }
-        // else {} // It is not necessary to apply a range in the case of equal low and high values
+        if (low === high) {
+          // low equal high case (avoid normalize to infinity)
+          rangeBar.range = [-100, 100];
+          lastNormalize = last < low ? -100 : 100; // topValue will be left or right
+        }
 
+        if (last == null) {
+          // only last is empty (low and high should have value)
+          rangeBar.range = [];
+          lastNormalize = null;
+        }
         rangeBar.topValue = lastNormalize;
         if (this.valueLabel) {
           rangeBar.topLabel = last;

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

@@ -3,6 +3,8 @@ import { GridPlugin } from "../../tr-grid-util/es6/GridPlugin.js";
 import { MouseDownTrait } from "../../tr-grid-util/es6/MouseDownTrait.js";
 import { EventDispatcher } from "../../tr-grid-util/es6/EventDispatcher.js";
 import { isIE, cloneObject, prepareTSVContent } from "../../tr-grid-util/es6/Util.js";
+import { ElfUtil } from "../../tr-grid-util/es6/ElfUtil.js";
+import { injectCss, prettifyCss } from "../../tr-grid-util/es6/Util.js";
 
 declare namespace CellSelectionPlugin {
 

package/lib/versions.json

@@ -6,7 +6,7 @@
 	"@grid/statistics-row": "1.0.15",
 	"@grid/zoom": "1.0.11",
 	"tr-grid-auto-tooltip": "1.1.6",
-	"tr-grid-cell-selection": "1.0.33",
+	"tr-grid-cell-selection": "1.0.34",
 	"tr-grid-checkbox": "1.0.60",
 	"tr-grid-column-fitter": "1.0.39",
 	"tr-grid-column-formatting": "0.9.35",
@@ -22,7 +22,7 @@
 	"tr-grid-in-cell-editing": "1.0.81",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.22",
-	"tr-grid-range-bar": "2.0.5",
+	"tr-grid-range-bar": "2.0.6",
 	"tr-grid-row-dragging": "1.0.31",
 	"tr-grid-row-filtering": "1.0.65",
 	"tr-grid-row-grouping": "1.0.82",

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.73"
+	"version": "6.0.75"
 }