@refinitiv-ui/efx-grid 6.0.32 → 6.0.33

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

@@ -339,8 +339,12 @@ declare class Core extends ElementWrapper {
 
     public enableRowVirtualization(opt_enabled: boolean): void;
 
+    public isRowVirtualizationEnabled(): boolean;
+
     public enableColumnVirtualization(opt_enabled?: boolean|null): void;
 
+    public isColumnVirtualizationEnabled(): boolean;
+
     public setRowScrollingStep(rowCount: number): void;
 
     public getVMouseWheelHandler(): ((...params: any[]) => any)|null;

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

@@ -536,7 +536,7 @@ Core.prototype._groupDefs = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.41";
+	return "5.1.42";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -672,10 +672,10 @@ Core.prototype.getConfigObject = function (gridOptions) {
 		}
 	}
 
-	if(this._rowHighlighting) {
-		obj["rowHighlighting"] = true;
-	}
-	obj["columnVirtualization"] = this._colVirtualizer.isEnabled();
+	// It will be overwrite in rt-grid or atlas-blotter
+	obj["rowVirtualization"] = this.isRowVirtualizationEnabled();
+	obj["columnVirtualization"] = this.isColumnVirtualizationEnabled();
+	obj["rowHighlighting"] = this._rowHighlighting;
 
 	if(this._fixFrozenTopSections) {
 		obj["topFreezingCount"] = this._startVScrollbarIndex >= 0 ? (this._startVScrollbarIndex + 1) : false;
@@ -688,7 +688,13 @@ Core.prototype.getConfigObject = function (gridOptions) {
 	if(this._rowScrollingStep) {
 		obj["stepScroll"] = (this._rowScrollingStep === 1) ? true : this._rowScrollingStep;
 	}
-	obj["autoHideScrollbar"] = this._vscrollbar.getAutoHide(); // this._hscrollbar has the same settings
+
+	var val = this._vscrollbar.getAutoHide();
+	if(val !== true) {
+		// TODO: check this._hscrollbar and this._vscrollbar can be difference config
+		obj["autoHideScrollbar"] = val; // this._hscrollbar has the same settings
+	}
+
 	var wheelSpeed = this._vscrollbar.getMouseWheelSpeed();
 	if(wheelSpeed) {
 		obj["linearWheelScrolling"] = wheelSpeed;
@@ -3661,6 +3667,14 @@ Core.prototype.enableRowVirtualization = function (opt_enabled) {
 		this._rowVirtualizer.deactivate();
 	}
 };
+
+/** @public
+* @return {boolean}
+*/
+Core.prototype.isRowVirtualizationEnabled = function () {
+	return this._rowVirtualizer.isEnabled();
+};
+
 /** No runtime support
 * @public
 * @param {boolean=} opt_enabled
@@ -3675,6 +3689,13 @@ Core.prototype.enableColumnVirtualization = function (opt_enabled) {
 	}
 };
 
+/** @public
+* @return {boolean}
+*/
+Core.prototype.isColumnVirtualizationEnabled = function () {
+	return this._colVirtualizer.isEnabled();
+};
+
 /** Scrolling step will be multiple of the default row height in pixels. For example, if default row height is 32 pixel and row scrolling step is 2, <br>
 * then the actual scrolling step for vertical scrollbar will be (32 * 2) = 64 pixels
 * @public

package/lib/core/es6/grid/plugins/SortableTitlePlugin.d.ts

@@ -4,6 +4,7 @@ import Core from "../Core.js";
 import ILayoutGrid from "../ILayoutGrid.js";
 import ElementWrapper from "../components/ElementWrapper.js";
 import DataTable from "../../data/DataTable.js";
+import { isEmptyObject } from "../../../../tr-grid-util/es6/Util.js";
 
 declare namespace SortableTitlePlugin {
 

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

@@ -5,6 +5,7 @@ import Core from "../Core.js";
 import ILayoutGrid from "../ILayoutGrid.js";
 import ElementWrapper from "../components/ElementWrapper.js";
 import DataTable from "../../data/DataTable.js";
+import { isEmptyObject } from "../../../../tr-grid-util/es6/Util.js";
 /* eslint-enable */
 
 /** Fired when user click and before the sorting operation.
@@ -464,7 +465,10 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 		}
 		field = opt["field"];
 		if (field) {
-			col["sortBy"] = field;
+			if(col["field"] !== field) {
+				col["sortBy"] = field;
+			} // else The default value is an empty sortBy, which refers to the same column field by default.
+
 			if (this._sortingSequenceMap && this._sortingSequenceMap[field]) {
 				col["sortingSequence"] = this._sortingSequenceMap[field];
 			}
@@ -477,16 +481,32 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 		extOptions = obj["sorting"] = {};
 	}
 
-	extOptions["initialSort"] = this.getSortedColumns();
-	extOptions["sortableIndicator"] = this._sortableIndicator;
+	var val = this.getSortedColumns();
+	if(val != null) {
+		extOptions["initialSort"] = val;
+	}
+
+	val = this._sortableIndicator;
+	if(val !== false) {
+		extOptions["sortableIndicator"] = val;
+	}
+
 	if(this._maxCount !== 1) {
 		extOptions["multiColumn"] = this._maxCount === -1 ? true : this._maxCount;
 	}
 	if(this._dblClickAllowed) {
 		extOptions["disableDoubleClickToSort"] = !this._dblClickAllowed;
 	}
-	extOptions["sortableColumns"] = this._sortableColumns;
-	extOptions["indicatorOnly"] = !this._dataSorting;
+
+	val = this._sortableColumns;
+	if(val !== true) {
+		extOptions["sortableColumns"] = val;
+	}
+
+	val = this._dataSorting;
+	if(val !== true) {
+		extOptions["indicatorOnly"] = val;
+	}
 	// extOptions["mode"] = this._mode;
 	if(this._disabled) {
 		extOptions["disabled"] = true;
@@ -503,6 +523,10 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 		extOptions["sortingSequence"] = sortingSeq.slice();
 	}
 
+	if(isEmptyObject(obj["sorting"])) {
+		delete obj["sorting"];
+	}
+
 	return obj;
 };
 

package/lib/grid/index.js

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