@refinitiv-ui/efx-grid 6.0.168 → 6.1.0

package/lib/tr-grid-column-fitter/es6/ColumnFitter.js

@@ -2,7 +2,7 @@ import { Ext } from '../../tr-grid-util/es6/Ext.js';
 import { GridPlugin } from '../../tr-grid-util/es6/GridPlugin.js';
 
 /** @typedef {Object} ColumnFitterPlugin~Options
-* @description The options can be specified by `columnFitting` property of the main grid's options
+* @description The options can be specified by `columnFitter` property of the main grid's options
 * @property {boolean=} proportion=false Proportionally expand columns, if there is enough space
 * @property {boolean=} constraint=false Prevents column width to go lower than its content size
 * @property {(boolean|number)=} autoAdjust=false Automatic column width adjusting on each data update
@@ -35,7 +35,9 @@ let ColumnFitterPlugin = function (options) {
 	this._dummyCells = [];
 	this._cellPaddings = [];
 
-	this.config(options);
+	if(options) {
+		this.config({ "columnFitter": options });
+	}
 };
 Ext.inherits(ColumnFitterPlugin, GridPlugin);
 
@@ -109,7 +111,7 @@ ColumnFitterPlugin.prototype.hasMultiTableSupport = function () {
 
 /** @public
 * @param {Object} host core grid object
-* @param {Object=} options
+* @param {Object=} options Grid configuration object
 */
 ColumnFitterPlugin.prototype.initialize = function (host, options) {
 	if (this._hosts.indexOf(host) >= 0) { return; }
@@ -118,11 +120,8 @@ ColumnFitterPlugin.prototype.initialize = function (host, options) {
 	this._synchronousRendering = true;
 	this._hosts.push(host);
 
-	if (options) {
-		let pluginOptions = options["columnFitting"] || {}; // Avoid using properties from the main object
-		pluginOptions.columns = options["columns"]; // Retrieved property defined in the column
-		this.config(pluginOptions);
-	}
+	this.config(options);
+
 	if (this._autoAdjust) {
 		host.listen("postSectionDataBinding", this._onPostSectionDataBinding);
 	}
@@ -141,6 +140,8 @@ ColumnFitterPlugin.prototype.unload = function (host) {
 	host.unlisten("postSectionDataBinding", this._onPostSectionDataBinding);
 	host.unlisten("columnAdded", this._onColumnAdded);
 
+	this._dispose();
+
 	if (!this._hosts.length) {
 		if (this._timerId) {
 			clearTimeout(this._timerId);
@@ -151,7 +152,7 @@ ColumnFitterPlugin.prototype.unload = function (host) {
 
 
 /** @public
-* @param {ColumnFitterPlugin~Options=} options
+* @param {Object=} options Grid configuration object
 */
 ColumnFitterPlugin.prototype.config = function (options) {
 	if (!options) { return; }
@@ -170,10 +171,15 @@ ColumnFitterPlugin.prototype.config = function (options) {
 		}
 	}
 
-	this._proportion = ColumnFitterPlugin._readBoolean(options, "proportion", this._proportion);
-	this._constraint = ColumnFitterPlugin._readBoolean(options, "constraint", this._constraint);
-	this._title = ColumnFitterPlugin._readBoolean(options, "title", this._title);
-	this._shrinkable = ColumnFitterPlugin._readBoolean(options, "shrinkable", this._shrinkable);
+	let expOptions = options["columnFitter"] || options["columnFitting"];
+	if(!expOptions) {
+		return;
+	}
+
+	this._proportion = ColumnFitterPlugin._readBoolean(expOptions, "proportion", this._proportion);
+	this._constraint = ColumnFitterPlugin._readBoolean(expOptions, "constraint", this._constraint);
+	this._title = ColumnFitterPlugin._readBoolean(expOptions, "title", this._title);
+	this._shrinkable = ColumnFitterPlugin._readBoolean(expOptions, "shrinkable", this._shrinkable);
 
 	if (this._proportion) {
 		let host = this._hosts[this._hosts.length - 1];
@@ -182,7 +188,7 @@ ColumnFitterPlugin.prototype.config = function (options) {
 		}
 	}
 
-	let val = options["autoAdjust"] || options["autoAdjusting"];
+	let val = expOptions["autoAdjust"] || expOptions["autoAdjusting"];
 	if (val != null) {
 		this._autoAdjust = val ? true : false;
 		if (typeof val === "number") {
@@ -190,7 +196,7 @@ ColumnFitterPlugin.prototype.config = function (options) {
 		}
 	}
 
-	let paddingSize = /** @type {number} */(options["paddingSize"]);
+	let paddingSize = /** @type {number} */(expOptions["paddingSize"]);
 	if (paddingSize != null) {
 		this._defaultPadding = false;
 		this._paddingSize = paddingSize;
@@ -226,7 +232,7 @@ ColumnFitterPlugin.prototype.getConfigObject = function (gridOptions) {
 		}
 	}
 
-	let extOptions = obj.columnFitting;
+	let extOptions = obj.columnFitting; // 2_DO: return columnFitter instead of columnFitting
 	if (!extOptions) {
 		extOptions = obj.columnFitting = {};
 	}

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

@@ -278,7 +278,7 @@ ElfUtil.isHaloTheme = function (themeName) {
 		themeName = ElfUtil.getThemeName();
 	}
 	if(themeName) {
-		return themeName.indexOf("halo") >= 0;
+		return themeName.indexOf("halo") >= 0 || themeName.indexOf("ds") >= 0; // Temporary workaround to make extensions support ds-theme
 	}
 
 	return false;

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

@@ -32,7 +32,7 @@ declare class ColumnFitterPlugin extends GridPlugin {
 
     public unload(host: any): void;
 
-    public config(options?: ColumnFitterPlugin.Options|null): void;
+    public config(options?: any): void;
 
     public getConfigObject(gridOptions?: any): any;
 

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.176",
+	"tr-grid-util": "1.3.178",
 	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.22",
 	"@grid/row-segmenting": "2.0.3",
@@ -8,7 +8,7 @@
 	"tr-grid-auto-tooltip": "1.1.9",
 	"tr-grid-cell-selection": "1.1.0",
 	"tr-grid-checkbox": "1.0.70",
-	"tr-grid-column-fitter": "1.0.41",
+	"tr-grid-column-fitter": "1.0.42",
 	"tr-grid-column-formatting": "0.9.36",
 	"tr-grid-column-grouping": "2.0.0",
 	"tr-grid-column-resizing": "1.0.29",
@@ -31,7 +31,7 @@
 	"tr-grid-textformatting": "1.0.49",
 	"tr-grid-titlewrap": "1.0.22",
 	"@grid/formatters": "1.0.56",
-	"@grid/column-selection-dialog": "4.0.61",
-	"@grid/filter-dialog": "4.0.79",
+	"@grid/column-selection-dialog": "4.1.3",
+	"@grid/filter-dialog": "4.0.81",
 	"@grid/column-format-dialog": "4.0.45"
 }

package/package.json

@@ -35,21 +35,29 @@
 	},
 	"exports": {
 		".": "./lib/grid/index.js",
+		"./themes/ds/dark": "./lib/grid/themes/ds/dark.js",
+		"./themes/ds/light": "./lib/grid/themes/ds/light.js",
 		"./themes/halo/dark": "./lib/grid/themes/halo/dark.js",
 		"./themes/halo/light": "./lib/grid/themes/halo/light.js",
 		"./themes/solar/charcoal": "./lib/grid/themes/solar/charcoal.js",
 		"./themes/solar/pearl": "./lib/grid/themes/solar/pearl.js",
 		"./column-format-dialog": "./lib/column-format-dialog/lib/column-format-dialog.js",
+		"./column-format-dialog/themes/ds/dark": "./lib/column-format-dialog/themes/ds/dark.js",
+		"./column-format-dialog/themes/ds/light": "./lib/column-format-dialog/themes/ds/light.js",
 		"./column-format-dialog/themes/halo/dark": "./lib/column-format-dialog/themes/halo/dark.js",
 		"./column-format-dialog/themes/halo/light": "./lib/column-format-dialog/themes/halo/light.js",
 		"./column-format-dialog/themes/solar/charcoal": "./lib/column-format-dialog/themes/solar/charcoal.js",
 		"./column-format-dialog/themes/solar/pearl": "./lib/column-format-dialog/themes/solar/pearl.js",
 		"./column-selection-dialog": "./lib/column-selection-dialog/lib/column-selection-dialog.js",
+		"./column-selection-dialog/themes/ds/dark": "./lib/column-selection-dialog/themes/ds/dark.js",
+		"./column-selection-dialog/themes/ds/light": "./lib/column-selection-dialog/themes/ds/light.js",
 		"./column-selection-dialog/themes/halo/dark": "./lib/column-selection-dialog/themes/halo/dark.js",
 		"./column-selection-dialog/themes/halo/light": "./lib/column-selection-dialog/themes/halo/light.js",
 		"./column-selection-dialog/themes/solar/charcoal": "./lib/column-selection-dialog/themes/solar/charcoal.js",
 		"./column-selection-dialog/themes/solar/pearl": "./lib/column-selection-dialog/themes/solar/pearl.js",
 		"./filter-dialog": "./lib/filter-dialog/lib/filter-dialog.js",
+		"./filter-dialog/themes/ds/dark": "./lib/filter-dialog/themes/ds/dark.js",
+		"./filter-dialog/themes/ds/light": "./lib/filter-dialog/themes/ds/light.js",
 		"./filter-dialog/themes/halo/dark": "./lib/filter-dialog/themes/halo/dark.js",
 		"./filter-dialog/themes/halo/light": "./lib/filter-dialog/themes/halo/light.js",
 		"./filter-dialog/themes/solar/charcoal": "./lib/filter-dialog/themes/solar/charcoal.js",
@@ -69,5 +77,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.168"
+	"version": "6.1.0"
 }