@refinitiv-ui/efx-grid 6.0.37 → 6.0.39

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

@@ -359,6 +359,8 @@ declare class Core extends ElementWrapper {
 
     public synchronizeVScrollbar(subGrid: Core|null): void;
 
+    public synchronizeHScrollbar(subGrid: Core|null): void;
+
     public updateRowData(sectionRef?: Core.SectionReference|null, fromRowIndex?: number|null, lastRowIndex?: number|null, userParam?: any): void;
 
     public rerender(): void;

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

@@ -91,6 +91,7 @@ var Core = function (opt_initializer) {
 	_t._onVScroll = _t._onVScroll.bind(_t);
 	_t._onHScroll = _t._onHScroll.bind(_t);
 	_t._onSyncVScroll = _t._onSyncVScroll.bind(_t);
+	_t._onSyncHScroll = _t._onSyncHScroll.bind(_t);
 	_t.updateLayout = _t.updateLayout.bind(_t);
 	_t._onRowRefresh = _t._onRowRefresh.bind(_t);
 	_t._onVScrollEnabled = _t._onVScrollEnabled.bind(_t);
@@ -203,7 +204,8 @@ var Core = function (opt_initializer) {
 		"rowPositionChanged",
 		"beforeColumnBoundUpdate",
 		"beforeBatchOperation",
-		"afterBatchOperation"
+		"afterBatchOperation",
+		"pinningChanged"
 	);
 
 	// For debugging in advanced optimization mode
@@ -552,7 +554,7 @@ Core.prototype._batches = null;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.50";
+	return "5.1.55";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -594,6 +596,12 @@ Core.prototype.dispose = function () {
 		mainScrolbar.unlisten("scroll", this._onSyncVScroll);
 		this._vscrollbar._mainScrollbar = null;
 	}
+	mainScrolbar = this._hscrollbar._mainScrollbar;
+	if(mainScrolbar) {
+		mainScrolbar.unlisten("scroll", this._onSyncHScroll);
+		this._hscrollbar._mainScrollbar = null;
+	}
+
 	this._vscrollbar.dispose();
 	this._hscrollbar.dispose();
 	this._rowHeightConflator.dispose();
@@ -2907,10 +2915,14 @@ Core.prototype.freezeColumn = function (frozenColIndex, numRightColumn) {
 	var colCount = this.getColumnCount();
 	var leftPinnedCount = 0;
 	var rightPinnedCount = 0;
+	var dirty = false;
 	if (frozenColIndex || frozenColIndex === 0) {
 		this._hScrollbarEnabled = true;
 		leftPinnedCount = (frozenColIndex >= 0) ? frozenColIndex + 1 : 0;
-		this._pinnedLeftColumnCount = leftPinnedCount; // This variable is used for caching
+		if (this._pinnedLeftColumnCount !== leftPinnedCount) {
+			dirty = true;
+			this._pinnedLeftColumnCount = leftPinnedCount; // This variable is used for caching
+		}
 
 		for (i = 0; i < colCount; ++i) {
 			colDef = this._getColumnDef(i);
@@ -2921,7 +2933,10 @@ Core.prototype.freezeColumn = function (frozenColIndex, numRightColumn) {
 	}
 	if(numRightColumn != null) {
 		rightPinnedCount = numRightColumn > 0 ? numRightColumn : 0;
-		this._pinnedRightColumnCount = rightPinnedCount; // This variable is used for caching
+		if (this._pinnedRightColumnCount !== rightPinnedCount) {
+			dirty = true;
+			this._pinnedRightColumnCount = rightPinnedCount; // This variable is used for caching
+		}
 
 		for (i = colCount; --i >= 0;) {
 			colDef = this._getColumnDef(i);
@@ -2932,6 +2947,12 @@ Core.prototype.freezeColumn = function (frozenColIndex, numRightColumn) {
 	this._onColumnCountChanged(); // Activate horizontal scrollbar and column virtualization
 	this._updateScrollbarWidth(true, true);
 	this._updateColumnSeparators();
+
+	if (dirty) {
+		if (!this._isEventDispatching("pinningChanged")) {
+			this._dispatch("pinningChanged", {});
+		}
+	}
 };
 
 /** @private
@@ -3756,6 +3777,26 @@ Core.prototype.synchronizeVScrollbar = function (subGrid) {
 	this._vscrollbar.listen("scroll", subGrid._onSyncVScroll);
 };
 
+/** Synchronize two horizontal scrollbars of two grid, by hiding its scrollbar and using the one from the given grid
+* @public
+* @param {Core} subGrid
+*/
+Core.prototype.synchronizeHScrollbar = function (subGrid) {
+	subGrid.unlisten("mousemove", subGrid._onMouseMove);
+	subGrid.listen("mousemove", this._onMouseMove);
+
+	var hscrollbar = subGrid.getHScrollbar();
+	hscrollbar._mainScrollbar = this._hscrollbar; // HACK
+
+	hscrollbar.setStyle("visibility", "hidden");
+	hscrollbar.setStyle("pointerEvents", "none");
+	hscrollbar.disableMouseWheel(); // Disable sub-grid wheel behavior
+	hscrollbar.attachToExternalElement(this._hscrollbar.getParent()); // MouseWheel event is still available on the main
+
+	// TODO: Check if we need to re-append this._hscrollbar to move it to the front over other grid elements.
+	this._hscrollbar.listen("scroll", subGrid._onSyncHScroll);
+};
+
 /** Fires data binding event without actual change in the data source. <br>
 * This will force visual elements to be re-rendered with the latest data in the data source.
 * @public
@@ -3898,7 +3939,7 @@ Core.prototype.getHorizontalLayout = function () {
 * @ignore
 * @param {number} colIndex
 * @param {boolean} bool
-* @param {number} flag Default is 0
+* @param {number} flag
 * @return {boolean}
 */
 Core.prototype.setColumnVisibility = function (colIndex, bool, flag) {
@@ -3918,6 +3959,16 @@ Core.prototype.setColumnVisibility = function (colIndex, bool, flag) {
 	}
 	return false;
 };
+/** Get visibility state for the specified flag. This is for internal use only
+* @public
+* @ignore
+* @param {number} colIndex
+* @param {number=} flag
+* @return {boolean}
+*/
+Core.prototype.getColumnVisibility = function (colIndex, flag) {
+	return this._layoutX.getLaneVisibilityBit(colIndex, flag);
+};
 
 /** @public
 * @param {number} size
@@ -5411,6 +5462,12 @@ Core.prototype._onSyncVScroll = function (e) {
 	this._vscrollbar.setScrollTop(e.scrollTop);
 };
 /** @private
+* @param {Object} e
+*/
+Core.prototype._onSyncHScroll = function (e) {
+	this._hscrollbar.setScrollLeft(e.scrollLeft);
+};
+/** @private
 * @return {number} index of footer section
 */
 Core.prototype._getFooterStartIndex = function () {

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

@@ -12,6 +12,7 @@ declare namespace SortableTitlePlugin {
 
     type InitialSort = {
         colIndex: number,
+        field: string,
         sortOrder?: SortableTitlePlugin.SortOrder|null,
         order?: SortableTitlePlugin.SortOrder|null
     };
@@ -19,6 +20,8 @@ declare namespace SortableTitlePlugin {
     type ColumnOptions = {
         sortable?: boolean|null,
         sortBy?: string|null,
+        sort?: string|null,
+        sortOrder?: string|null,
         sortLogic?: DataTable.SortLogic|null,
         sortingLogic?: DataTable.SortLogic|null,
         sorter?: DataTable.SortLogic|null,

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

@@ -82,6 +82,7 @@ Ext.inherits(SortableTitlePlugin, EventDispatcher);
 /** The sorting object which will be used for initialSort config.
  * @typedef {Object} SortableTitlePlugin~InitialSort
  * @property {number} colIndex Index of the column
+ * @property {string} field field of the column
  * @property {SortableTitlePlugin~SortOrder=} sortOrder=null Set to "d" for descending order and "a" for ascending order
  * @property {SortableTitlePlugin~SortOrder=} order Alias of sortOrder
  */
@@ -91,6 +92,8 @@ SortableTitlePlugin.InitialSort;
  * @typedef {Object} SortableTitlePlugin~ColumnOptions
  * @property {boolean=} sortable=false If enable, the column can be sorted by user click
  * @property {string=} sortBy Field to be used for sorting. If defined, user can click at the header section to sort the column
+ * @property {string=} sort="" Deprecated Alias to `sortOrder`
+ * @property {string=} sortOrder="" The column can be sorted in ascending and descending order by specifying the order "a", "d". This option will sort the column when it is initialized or inserted at runtime.
  * @property {DataTable.SortLogic=} sortLogic=null Custom compare function for sorting
  * @property {DataTable.SortLogic=} sortingLogic Alias to `sortLogic`
  * @property {DataTable.SortLogic=} sorter Alias to `sortLogic`
@@ -295,7 +298,7 @@ SortableTitlePlugin.prototype.afterInit = function () {
 	// Set logic to the data source, since the data source not available during the initialization
 	t.setSortLogics(t._sortLogic);
 
-	var userInput = t._initialSort;
+	var userInput = t._initialSort; // This will be passed from the user when they want to start with initialize sort
 	if (userInput != null) {
 		if(Array.isArray(userInput)) {
 			if(t._maxCount === 1) { // TODO: max count could be part of sortColumns method
@@ -444,14 +447,32 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 
 	if (!host) return obj;
 
-	var len = host.getColumnCount();
-	var col, opt, field;
-	for(var i = 0; i < len; ++i) {
+	var sortedColumns = this.getSortedColumns();
+	var col, i, len;
+	// Multiple column sorting cannot retain the sort order in the column option.
+	if(this._maxCount === 1 && sortedColumns != null) {
+		// assign sorting state to each columns
+		len = sortedColumns.length;
+		for (i = 0; i < len; i++) {
+			var sortedColumn = sortedColumns[i];
+			var colIndex = sortedColumn["colIndex"];
+			col = columns[colIndex];
+			if (!col) {
+				col = columns[colIndex] = {};
+			}
+			col["sortOrder"] = sortedColumn["sortOrder"];
+		}
+	}
+
+	len = host.getColumnCount();
+	var opt, field;
+	for(i = 0; i < len; ++i) {
 		col = columns[i];
 		if (!col) {
 			col = columns[i] = {};
 		}
 
+		// TODO: We should get the state from the core, instead of getting the sort options.
 		opt = this._getSortOptions(i);
 
 		if (!opt) { continue; }
@@ -465,7 +486,7 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 		}
 		field = opt["field"];
 		if (field) {
-			if(col["field"] !== field) {
+			if(col["field"] != null && col["field"] !== field) { // Core does not have field properties, so when you try to call getConfigObject in Core, it will return sortBy too.
 				col["sortBy"] = field;
 			} // else The default value is an empty sortBy, which refers to the same column field by default.
 
@@ -481,7 +502,7 @@ SortableTitlePlugin.prototype.getConfigObject = function (gridOptions) {
 		extOptions = obj["sorting"] = {};
 	}
 
-	var val = this.getSortedColumns();
+	var val = sortedColumns;
 	if(val != null) {
 		extOptions["initialSort"] = val;
 	}
@@ -988,7 +1009,14 @@ SortableTitlePlugin.prototype.disableTwoStateSorting = function (disabled) {
 * @param {boolean=} bool=true, if set to false it will be unfreeze indicator
 */
 SortableTitlePlugin.prototype.freezeIndicator = function (bool) {
+	var prevState = this._frozenIndicator;
 	this._frozenIndicator = bool !== false;
+	if(prevState && !this._frozenIndicator) { // from frozen to unfrozen, update the ui
+		for (var i = this._hosts.length; --i >= 0;) {
+			this._updateSortableIndicator(i);
+		}
+	}
+
 };
 /** @public
 * @param {boolean=} disabled
@@ -1064,7 +1092,7 @@ SortableTitlePlugin.prototype._initialSortByColumnField = function (options) {
 	var colCount = columns ?  columns.length : 0;
 	for (var i = 0; i < colCount; i++) {
 		var column = columns[i];
-		var sortOrder = column["defaultSort"] || column["sort"]; // composite and rt grid option for default sort order
+		var sortOrder = column["defaultSort"]; // composite and rt grid option for default sort order
 		if (sortOrder) {
 			// TODO: Support multi-column sorting
 			return {
@@ -1494,6 +1522,12 @@ SortableTitlePlugin.prototype._onColumnAdded = function (e) {
 	} else {
 		t.disableColumnSorting(colIndex, true);
 	}
+
+	var sortOrder = column["sortOrder"] || column["sort"];
+	if(sortOrder != null) {
+		t.clearSortState(); // clear previous sorting state
+		t.sortColumn(colIndex, sortOrder);
+	}
 };
 
 /** @private

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

@@ -60,7 +60,9 @@ declare class TrackLayout {
 
     public showLane(index: number, opt_val?: boolean|null): boolean;
 
-    public hideLane(index: number, opt_hidden?: boolean|null, opt_bitIndex?: number|null): boolean;
+    public hideLane(index: number, hidden?: boolean|null, bitIndex?: number|null): boolean;
+
+    public getLaneVisibilityBit(index: number, bitIndex?: number|null): boolean;
 
     public show(opt_shown?: boolean|null): void;
 

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

@@ -477,18 +477,18 @@ TrackLayout.prototype.showLane = function (index, opt_val) {
 };
 /** @public
 * @param {number} index
-* @param {boolean=} opt_hidden
-* @param {number=} opt_bitIndex
+* @param {boolean=} hidden
+* @param {number=} bitIndex
 * @return {boolean}
 */
-TrackLayout.prototype.hideLane = function (index, opt_hidden, opt_bitIndex) {
+TrackLayout.prototype.hideLane = function (index, hidden, bitIndex) {
 	if (index < 0 || index >= this._laneCount) { return false; }
 
 	var col = this._newColumn(index);
 	var prevVis = !col.invisibility;
 
-	var bit = (opt_bitIndex != null) ? this._bits[opt_bitIndex] : 1;
-	if(opt_hidden !== false) {
+	var bit = (bitIndex != null) ? this._bits[bitIndex] : 1;
+	if(hidden !== false) {
 		col.invisibility |= bit; // Add invisibility bit
 	} else {
 		col.invisibility &= ~bit; // Remove invisibility bit
@@ -499,6 +499,24 @@ TrackLayout.prototype.hideLane = function (index, opt_hidden, opt_bitIndex) {
 	}
 	return false;
 };
+/** Return true if the lane does not exist nor is not hidden. Return false only if the lane is hidden by the specified bit
+* @public
+* @param {number} index
+* @param {number=} bitIndex
+* @return {boolean}
+*/
+TrackLayout.prototype.getLaneVisibilityBit = function (index, bitIndex) {
+	if (index >= 0 && index < this._laneCount) {
+		var col = this._cols[index];
+		if(col) {
+			var bit = (bitIndex != null) ? this._bits[bitIndex] : 1;
+			if(col.invisibility & bit) {
+				return false;
+			}
+		}
+	}
+	return true;
+};
 /** @public
 * @param {boolean=} opt_shown
 */

package/lib/grid/index.js

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