@refinitiv-ui/efx-grid 6.0.134 → 6.0.136

package/lib/rt-grid/es6/DataConnector.d.ts

@@ -9,6 +9,8 @@ declare class DataConnector extends EventDispatcher {
 
     constructor();
 
+    public dispose(): void;
+
     public getAllRics(): (string)[]|null;
 
     public hasRic(): boolean;

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

@@ -11,8 +11,8 @@ import RowDefinition from "./RowDefinition.js"; // eslint-disable-line
 */
 let DataConnector = function () {
 	let t = this;
-	t._commitRicsChanges = t._commitRicsChanges.bind(this);
-	t._commitFieldsChanges = t._commitFieldsChanges.bind(this);
+	t._commitRicsChanges = t._commitRicsChanges.bind(t);
+	t._commitFieldsChanges = t._commitFieldsChanges.bind(t);
 	t._fieldChangedConflator = new Conflator(0, t._commitFieldsChanges);
 	t._ricChangedConflator = new Conflator(0, t._commitRicsChanges);
 	t._fields = new ReferenceCounter();
@@ -21,8 +21,6 @@ let DataConnector = function () {
 };
 Ext.inherits(DataConnector, EventDispatcher);
 
-
-//#region Private Members
 /** @type {Conflator}
 * @private
 */
@@ -43,7 +41,16 @@ DataConnector.prototype._rics = null;
 * @private
 */
 DataConnector.prototype._fields = null;
-//#endregion Private Members
+
+/** @public
+*/
+DataConnector.prototype.dispose = function () {
+	this.removeAllEventListeners();
+
+	this._rowDefMap = this._fields = this._rics = null;
+	this._fieldChangedConflator.reset();
+	this._ricChangedConflator.reset();
+};
 
 /** Get all ric with no duplication
  * @public

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

@@ -632,7 +632,9 @@ Grid.prototype.dispose = function() {
 	this.removeAllRows(); // Some conflators are reset
 	this._sorter.dispose();
 	this._grid.dispose();
-	this._connector.reset();
+	this._snapshot.dispose();
+	this._connector.dispose();
+	this._connector = null;
 
 	if(!this._sharedDataSource) { // Make sure that this is the final grid, and its data is disposed
 		if(this._subs) {
@@ -1643,7 +1645,7 @@ Grid.prototype.replaceColumn = function (columnOption, colRef) {
  * @param {Object} response
  */
 Grid.prototype._onFieldLoadedSuccess = function (field, colDef, response) {
-	if (response && response.id) {
+	if(this._connector && response && response.id) {
 		let fieldDef = response;
 		if (colDef && colDef.getField() === field) {
 			if (colDef.isDefaultName() && fieldDef.name) {
@@ -1668,12 +1670,14 @@ Grid.prototype._onFieldLoadedError = function (err) {
  * @param {string} referrer
  */
 Grid.prototype._onFieldLoaded = function (field, referrer) {
-	// For time series, we need to wait until the field is loadedm, then we can insert a child from the field data.
-	if(FieldDefinition.isTimeSeries(field)) {
-		let colDef = this.getColumnDefinitionById(referrer); // The 'referrer' is a column ID that was just added
-		this._populateTimeSeriesChildren(colDef);
+	if(this._connector) {
+		// For time series, we need to wait until the field is loadedm, then we can insert a child from the field data.
+		if(FieldDefinition.isTimeSeries(field)) {
+			let colDef = this.getColumnDefinitionById(referrer); // The 'referrer' is a column ID that was just added
+			this._populateTimeSeriesChildren(colDef);
+		}
+		this._connector.addFields(field, referrer);
 	}
-	this._connector.addFields(field, referrer);
 };
 
 /**
@@ -2694,6 +2698,7 @@ Grid.prototype.removeAllRows = function() {
 
 	this._dc.clearAllData();
 	this._dt.clearAllData();
+	this._dt.setClassificationSource(this._dc);
 	this._clearDataUpdates();
 
 	rowDefs.forEach(RowDefinition.dispose); // Each individual subscription is unsubscribed along with disposed rowDef

package/lib/rt-grid/es6/SnapshotFiller.d.ts

@@ -8,7 +8,7 @@ declare class SnapshotFiller extends EventDispatcher {
 
     constructor();
 
-    public static readonly _mockAdc: any;
+    public dispose(rtk: any): void;
 
     public setRTK(rtk: any): void;
 

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

@@ -20,7 +20,11 @@ let SnapshotFiller = function () {
 };
 Ext.inherits(SnapshotFiller, EventDispatcher);
 
-//#region Private Members
+/** @private
+* @type {Object}
+*/
+SnapshotFiller._mockAdc = null;
+
 /** @type {number}
 * @private
 */
@@ -41,23 +45,27 @@ SnapshotFiller.prototype._rtk;
 * @private
 */
 SnapshotFiller.prototype._adcOptions = null;
-//#endregion Private Members
+
 
 /** @public
 * @param {*} rtk RTK instance
 */
-SnapshotFiller.prototype.setRTK = function (rtk) {
-	this._rtk = rtk;
+SnapshotFiller.prototype.dispose = function () {
+	this.removeAllEventListeners();
+	if(this._timerId) {
+		clearTimeout(this._timerId);
+		this._timerId = 0;
+	}
+	this._rics = this._fields = this._rtk = this._adcOptions = null;
 };
 
-/** 
-* @public
-* @type {Object}
+/** @public
+* @param {*} rtk RTK instance
 */
-SnapshotFiller._mockAdc = null;
-
-/**
-* @public
+SnapshotFiller.prototype.setRTK = function (rtk) {
+	this._rtk = rtk;
+};
+/** @public
 * @param {string} str 
 * @param {*} value 
 */
@@ -68,8 +76,7 @@ SnapshotFiller.setMockAdc = function(str, value) {
 	SnapshotFiller._mockAdc[str] = value;
 };
 
-/**
-* @public
+/** @public
 * @param {string} str 
 * @return {*} 
 */
@@ -80,8 +87,7 @@ SnapshotFiller.getMockAdc = function(str) {
 	return SnapshotFiller._mockAdc[str];
 };
 
-/**
-* @public
+/** @public
 */
 SnapshotFiller.clearMockAdc = function() {
 	SnapshotFiller._mockAdc = null;

package/lib/tr-grid-in-cell-editing/es6/InCellEditing.d.ts

@@ -84,10 +84,12 @@ declare class InCellEditingPlugin extends GridPlugin {
 
     public disableDblClick(opt_disabled?: boolean|null): void;
 
-    public showStarterText(bool?: boolean|null): void;
+    public showStarterText(shown?: boolean|null): void;
 
     public _requestUpdateStarterText(): void;
 
+    public updateStarterText(shown?: boolean|null): void;
+
     public isEditing(): boolean;
 
     public getTextBox(columnIndex?: number|null, grid?: any): Element|null;

package/lib/tr-grid-in-cell-editing/es6/InCellEditing.js

@@ -417,8 +417,7 @@ InCellEditingPlugin._styles = prettifyCss([
 	],
 	":host .starter-text", [
 		"padding: var(--grid-cell-padding,0 8px 0 8px);",
-		"pointer-events: none;",
-		"line-height: 28px" // WARNING: hardcode, it can be calculate with row height
+		"pointer-events: none;"
 	]
 ]);
 
@@ -1113,14 +1112,13 @@ InCellEditingPlugin.prototype._onGridKeyDown = function (e) {
 };
 
 /**
-* @description Show starter text when the grid is no ric
+* @description Show starter text when the grid has no ric
 * @public
-* @param {boolean=} bool
+* @param {boolean=} shown
 */
-InCellEditingPlugin.prototype.showStarterText = function (bool) {
-	this._requestUpdateStarterText();
+InCellEditingPlugin.prototype.showStarterText = function (shown) {
+	this.updateStarterText(shown !== false);
 };
-
 /**
 * @description Request to show starter text
 * @public
@@ -1132,25 +1130,26 @@ InCellEditingPlugin.prototype._requestUpdateStarterText = function () {
 	if(this._updateStarterTextConflator.conflate()){
 		return;
 	}
-	this._updateStaterText();
+	this.updateStarterText();
 };
 
 /**
-* @private
-* @param {boolean=} force
+* @public
+* @description Updates the starter text to either show or hide it.
+* @param {boolean=} shown Forces the display of the starter text if "true", if "false" it hides the starter text. If not given as a parameter, it automates updating the display of the starter text
 */
-InCellEditingPlugin.prototype._updateStaterText = function (force) {
+InCellEditingPlugin.prototype.updateStarterText = function (shown) {
 	if(!this._realTimeGrid || !this._starterText) {
 		return;
 	}
 	// TODO: handled grid have ric but no one rows.
 	let popup;
 	if(!this._starterTextPopup) {
-		popup = this._starterTextPopup = this._createStaterTextElement();
+		popup = this._starterTextPopup = this._createStarterTextElement();
 	} else {
 		popup = this._starterTextPopup;
 	}
-	if(force === false || this._realTimeGrid.hasRic()) {
+	if(shown === false || this._realTimeGrid.hasRic()) {
 		popup.hide();
 		return;
 	}
@@ -1177,8 +1176,9 @@ InCellEditingPlugin.prototype._updateStaterText = function (force) {
 		let popupElem = popup.getElement();
 		popupElem.style.top = pos.y + "px";
 		popupElem.style.left = pos.x + "px";
+		popupElem.style.lineHeight = editableCell.getHeight() + "px";
 	}
-	popup.show(force, grid.getParent());
+	popup.show(shown, grid.getParent());
 };
 
 /** @private
@@ -1188,10 +1188,14 @@ InCellEditingPlugin.prototype._getFirstEditableColumnIndex = function () {
 	if(this._readonly) {
 		return -1;
 	}
+	let grid = this._hosts[0];
+	if(!grid) {
+		return -1;
+	}
 	let colCount = this.getColumnCount();
 	let editableCol = -1;
 	for (let i = 0; i < colCount; i++) {
-		if(this.isColumnEditable(i)) { // this._editableContent already check in this method
+		if(grid.isColumnVisible(i) && this.isColumnEditable(i)) { // this._editableContent already check in this method
 			editableCol = i;
 			break;
 		}
@@ -1202,7 +1206,7 @@ InCellEditingPlugin.prototype._getFirstEditableColumnIndex = function () {
 /** @private
 * @return {Object}
 */
-InCellEditingPlugin.prototype._createStaterTextElement = function () {
+InCellEditingPlugin.prototype._createStarterTextElement = function () {
 	let container = document.createElement("div");
 	container.textContent = this._starterText;
 	container.className = "starter-text";
@@ -1392,9 +1396,9 @@ InCellEditingPlugin.prototype.isColumnEditable = function (colIndex) {
 InCellEditingPlugin.prototype.enableReadonly = function (enabled) {
 	this._readonly = enabled !== false;
 	if(this._readonly) {
-		this._updateStaterText(false);
+		this.updateStarterText(false);
 	} else {
-		this._updateStaterText();
+		this.updateStarterText();
 	}
 };
 /**
@@ -1642,7 +1646,7 @@ InCellEditingPlugin.prototype._openEditor = function (e, host, arg) {
 
 	// Dispatch an event for user to setup stuff
 	t._dispatch("editorOpened", arg); // User may modify the editor
-	t._updateStaterText(false); // Currently Starter text open doesn't have the ric, it needs to be forcefully hide
+	t.updateStarterText(false); // Currently Starter text open doesn't have the ric, it needs to be forcefully hide
 
 	inputElement.focus();
 	if(typeof inputElement.select === "function") {

package/lib/tr-grid-util/es6/RowPainter.js

@@ -143,10 +143,10 @@ RowPainter._styles = prettifyCss([
 		"font-family: Arial;"
 	],
 	".tr-grid .expander.closed", [
-		"transform: translate(0px, -1px) rotate(-90deg);"
+		"transform: rotate(-90deg);"
 	],
 	".tr-grid .cell.closed .expander", [
-		"transform: translate(0px, -1px) rotate(-90deg);"
+		"transform: rotate(-90deg);"
 	],
 	".tr-grid .tr-lg .cell.folder.content-header", [ // Used for header row in contentAsHeader mode, espectially with solar theme
 	  "background-color: inherit;"

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

@@ -84,10 +84,12 @@ declare class InCellEditingPlugin extends GridPlugin {
 
     public disableDblClick(opt_disabled?: boolean|null): void;
 
-    public showStarterText(bool?: boolean|null): void;
+    public showStarterText(shown?: boolean|null): void;
 
     public _requestUpdateStarterText(): void;
 
+    public updateStarterText(shown?: boolean|null): void;
+
     public isEditing(): boolean;
 
     public getTextBox(columnIndex?: number|null, grid?: any): Element|null;

package/lib/types/es6/RealtimeGrid/DataConnector.d.ts

@@ -9,6 +9,8 @@ declare class DataConnector extends EventDispatcher {
 
     constructor();
 
+    public dispose(): void;
+
     public getAllRics(): (string)[]|null;
 
     public hasRic(): boolean;

package/lib/types/es6/RealtimeGrid/SnapshotFiller.d.ts

@@ -8,7 +8,7 @@ declare class SnapshotFiller extends EventDispatcher {
 
     constructor();
 
-    public static readonly _mockAdc: any;
+    public dispose(rtk: any): void;
 
     public setRTK(rtk: any): void;
 

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.167",
+	"tr-grid-util": "1.3.168",
 	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.21",
 	"@grid/row-segmenting": "1.0.35",
@@ -19,7 +19,7 @@
 	"tr-grid-contextmenu": "1.0.44",
 	"tr-grid-filter-input": "0.9.43",
 	"tr-grid-heat-map": "1.0.30",
-	"tr-grid-in-cell-editing": "1.0.90",
+	"tr-grid-in-cell-editing": "1.0.93",
 	"tr-grid-pagination": "1.0.24",
 	"tr-grid-percent-bar": "1.0.24",
 	"tr-grid-range-bar": "2.0.9",

package/package.json

@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.134"
+	"version": "6.0.136"
 }