@refinitiv-ui/efx-grid 6.0.78 → 6.0.79

package/lib/filter-dialog/lib/filter-dialog.js

@@ -73,7 +73,9 @@ const TEXT_FILTERS = [
 	DEFAULT_FILTERS[6],
 	DEFAULT_FILTERS[7],
 	DEFAULT_FILTERS[8],
-	DEFAULT_FILTERS[9]
+	DEFAULT_FILTERS[9],
+	DEFAULT_FILTERS[10],
+	DEFAULT_FILTERS[11]
 ];
 /** @type {Array.<Array>}
 * @private
@@ -736,7 +738,7 @@ class FilterDialog extends BasicElement {
 			var fdt = dateTimeType ? dateTimeType : this.fieldDataType.toLowerCase();
 			if(fdt === "number") {
 				filterItems = NUMBER_FILTERS;
-			} else if(fdt === "general" || fdt === "text") {
+			} else if(fdt === "string" || fdt === "text") {
 				filterItems = TEXT_FILTERS;
 			} else {
 				filterItems = DEFAULT_FILTERS;

package/lib/formatters/es6/TextFormatter.js

@@ -5,6 +5,10 @@ var onElementUpdated = function (element, ctx) {
 	element.textContent = ctx.value;
 };
 
+var onElementCreated = function (element, ctx) {
+	element.classList.add("text");
+};
+
 /** @constructor
 * @param {*=} options
 */
@@ -20,7 +24,8 @@ TextFormatter.create = function (options) {
 	var defaultOpt = {
 		tagName: "div",
 		refName: "TextFormatter",
-		onElementUpdated: onElementUpdated
+		onElementUpdated: onElementUpdated,
+		onElementCreated: onElementCreated
 	};
 
 	return FormatterBuilder.create(options, defaultOpt);

package/lib/grid/index.js

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

package/lib/tr-grid-checkbox/es6/Checkbox.js

@@ -1111,12 +1111,12 @@ CheckboxPlugin.prototype._getSectionState = function (sectionSettings) {
 	}
 };
 /** @private
-* @param {Object} sectionSettings Grid sectionSettings object
+* @param {Object} sectionSettings Section or SectionSettings
 * @param {number} rowIndex
 * @return {Element}
 */
 CheckboxPlugin.prototype._getCheckbox = function (sectionSettings, rowIndex) {
-	var section = sectionSettings.getSection();
+	var section = sectionSettings.getSection ? sectionSettings.getSection() : sectionSettings;
 	var chkbox = /** @type{Element} */(section.getCellContent(this._displayColumn, rowIndex));
 	if (!chkbox) {
 		return null;
@@ -1444,9 +1444,30 @@ CheckboxPlugin.prototype._onCheckboxClicked = function (e) {
 * @param {Event} e
 */
 CheckboxPlugin.prototype._onCheckboxKeydown = function (e) {
-	if(e.keyCode === 32) {
+	var keyCode = e.keyCode;
+	if(keyCode === 32) {
+		this._onCheckboxMousedown(e); // Set anchor if no shift key is pressed
 		this._onCheckboxChanged(e, true);
 		e.preventDefault();
+	} if(keyCode === 38 || keyCode === 40) { // Arrow key up and down
+		var host = this._hosts[0];
+		var pos = host.getRelativePosition(e.currentTarget);
+		if(pos.sectionType === "content") {
+			var dv = host.getDataSource();
+			var offset = (keyCode === 38) ? -1 : 1;
+			var nextIndex = pos.rowIndex + offset;
+			var rowId = dv.getRowId(nextIndex);
+			if(rowId) {
+				host.scrollToRow(null, nextIndex);
+				var chkbox = this._getCheckbox(pos.section, nextIndex);
+				if(chkbox) {
+					chkbox.focus();
+				}
+				e.preventDefault();
+			}
+		}
+
+
 	}
 };
 /** @private

package/lib/tr-grid-row-grouping/es6/RowGrouping.d.ts

@@ -111,6 +111,8 @@ declare class RowGroupingPlugin extends GridPlugin {
 
     public enableFooterRow(opt_num?: (boolean|number)|null): void;
 
+    public getFooterRowCount(): number;
+
 }
 
 declare function isNonFunction(obj: any): boolean;

package/lib/tr-grid-row-grouping/es6/RowGrouping.js

@@ -650,7 +650,7 @@ RowGroupingPlugin.prototype.getConfigObject = function (gridOptions) {
 		extOptions.headerSpanning = this._headerSpanning;
 	}
 	if(this._footerSpanning) {
-		extOptions.headerSpanning = this._footerSpanning;
+		extOptions.footerSpanning = this._footerSpanning;
 	}
 	if(this._autoGroupSorting) {
 		extOptions.autoGroupSorting = this._autoGroupSorting;
@@ -1165,6 +1165,13 @@ RowGroupingPlugin.prototype._onGroupAdded = function (e) {
 	if (this._footerRows) {
 		e.newGroup.addFooter(this._footerRows);
 	}
+	var newGroup = e.newGroup;
+	// WARNING: contentAsHeader mode is overwrite arrow hidden to boolean
+	if(!this._contentAsHeader && newGroup.disableCollapsing) {
+		if(this._isArrowHidden(newGroup)) {
+			newGroup.disableCollapsing();
+		}
+	}
 	this._dispatch("groupAdded", e);
 
 	if (this._autoGroupSorting) {
@@ -1502,6 +1509,9 @@ RowGroupingPlugin.prototype._onCellClicked = function (e) {
 	var grpView = dv.getGroupByRowId(rowId);
 	if (grpView) {
 		changed = true;
+		if(grpView.isCollapsible && !grpView.isCollapsible()) { // Prevent applied styles
+			return;
+		}
 		grpView.collapse(!collapsed);
 	} else if (this._contentAsHeader) {
 		changed = true;
@@ -1656,6 +1666,13 @@ RowGroupingPlugin.prototype.enableFooterRow = function (opt_num) {
 	this._footerRows = /** @type{number} */(opt_num);
 };
 
+/** @public
+* @return {number}
+*/
+RowGroupingPlugin.prototype.getFooterRowCount = function () {
+	return this._footerRows;
+};
+
 /** @function
 * @param {Object} obj
 * @return {boolean}

package/lib/tr-grid-util/es6/GridPlugin.d.ts

@@ -1,6 +1,8 @@
 import {Ext} from "./Ext.js";
 import {EventDispatcher} from "./EventDispatcher.js";
 import {Deferred} from "./Deferred.js";
+import {injectCss} from "./Util.js";
+import {ElfUtil} from "./ElfUtil.js";
 
 declare class GridPlugin extends EventDispatcher {
 
@@ -44,6 +46,12 @@ declare class GridPlugin extends EventDispatcher {
 
     public static requestPlugin(ref: any, pluginRef: any, configObj?: any, compositeGrid?: any, realTimeGrid?: any): Promise<any>|null;
 
+    public applyStaticStyles(styleCalculator: ((...params: any[]) => any)|null): void;
+
+    public applyStyles(cssString: string, nameSpace?: string|null, replaceable?: boolean|null): void;
+
+    public revokeStyles(host: any, nameSpace: string): void;
+
 }
 
 declare function gridAPI(gridType: string, wrapperInstance: any): void;

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

@@ -1,6 +1,8 @@
 import {Ext} from "./Ext.js";
 import {EventDispatcher} from "./EventDispatcher.js";
 import {Deferred} from "./Deferred.js";
+import {injectCss} from "./Util.js";
+import {ElfUtil} from "./ElfUtil.js";
 
 /** This class is designed to be a base class for other tr.Grid plug-ins. It provide commonly used functionalities by the plug-ins.
 * @constructor
@@ -816,6 +818,99 @@ GridPlugin.prototype._mockKeyboardEvent = function(keyCode, context) {
 
 	return evt;
 };
+
+/** @type {Object}
+* @private
+*/
+GridPlugin._staticStyles = {};
+
+/** @type {Object}
+* @private
+*/
+GridPlugin._themeLoaders = {};
+
+/** @private
+* @param {Function} styleCalculator
+* @param {Object} colors
+*/
+GridPlugin._themeLoadSuccess = function(styleCalculator, colors) {
+	var extName = this.getName();
+	var styles = GridPlugin._staticStyles[extName] = styleCalculator(colors);
+	this.applyStyles(styles, extName);
+};
+
+/** @public
+* @param {Function} styleCalculator
+*/
+GridPlugin.prototype.applyStaticStyles = function(styleCalculator) {
+	var extName = this.getName();
+	var styles = GridPlugin._staticStyles[extName];
+	if (!styles) {
+		if (styleCalculator) {
+			if (!GridPlugin._themeLoaders[extName]) {
+				GridPlugin._themeLoaders[extName] = ElfUtil.getThemeColors();
+			}
+			GridPlugin._themeLoaders[extName]
+				.then(GridPlugin._themeLoadSuccess.bind(this, styleCalculator));
+		}
+	} else {
+		this.applyStyles(styles, extName);
+	}
+};
+
+/** @public
+* @param {string} cssString
+* @param {string=} nameSpace
+* @param {boolean=} replaceable
+*/
+GridPlugin.prototype.applyStyles = function(cssString, nameSpace, replaceable) {
+	if (!nameSpace) {
+		nameSpace = this.getName();
+	}
+
+	var intNameSpace = "_style" + nameSpace;
+
+	var hosts = this._hosts;
+	var len = hosts.length;
+	if (!len) {
+		return;
+	}
+
+	var i, host;
+	if (!replaceable) {
+		for (i = 0; i < len; i++) {
+			host = hosts[i];
+			if (!host[intNameSpace]) {
+				injectCss(cssString, host.getElement());
+				host[intNameSpace] = true;
+			}
+		}
+	} else {
+		for (i = 0; i < len; i++) {
+			host = hosts[i];
+			this.revokeStyles(host, nameSpace);
+			host[intNameSpace] = injectCss(cssString, host.getElement());
+		}
+	}
+};
+
+/** @public
+* @param {Object} host
+* @param {string} nameSpace
+*/
+GridPlugin.prototype.revokeStyles = function(host, nameSpace) {
+	if (!host || !nameSpace) {
+		return;
+	}
+
+	nameSpace = "_style" + nameSpace;
+	var styleTag = host[nameSpace];
+	if (styleTag && styleTag.nodeType === 1) {
+		styleTag.parentNode.removeChild(styleTag);
+		host[nameSpace] = null;
+	}
+};
+
 /** Export the plugin to the given object by attaching it to tr and tr.grid namespaces
 * @public
 * @function

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

@@ -111,6 +111,8 @@ declare class RowGroupingPlugin extends GridPlugin {
 
     public enableFooterRow(opt_num?: (boolean|number)|null): void;
 
+    public getFooterRowCount(): number;
+
 }
 
 declare function isNonFunction(obj: any): boolean;

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.134",
+	"tr-grid-util": "1.3.135",
 	"tr-grid-printer": "1.0.17",
 	"@grid/column-dragging": "1.0.15",
 	"@grid/row-segmenting": "1.0.30",
@@ -7,7 +7,7 @@
 	"@grid/zoom": "1.0.11",
 	"tr-grid-auto-tooltip": "1.1.6",
 	"tr-grid-cell-selection": "1.0.34",
-	"tr-grid-checkbox": "1.0.61",
+	"tr-grid-checkbox": "1.0.62",
 	"tr-grid-column-fitter": "1.0.39",
 	"tr-grid-column-formatting": "0.9.35",
 	"tr-grid-column-grouping": "1.0.57",
@@ -25,13 +25,13 @@
 	"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",
+	"tr-grid-row-grouping": "1.0.84",
 	"tr-grid-row-selection": "1.0.25",
 	"tr-grid-rowcoloring": "1.0.25",
 	"tr-grid-textformatting": "1.0.46",
 	"tr-grid-titlewrap": "1.0.20",
-	"@grid/formatters": "1.0.50",
+	"@grid/formatters": "1.0.51",
 	"@grid/column-selection-dialog": "4.0.55",
-	"@grid/filter-dialog": "4.0.60",
+	"@grid/filter-dialog": "4.0.61",
 	"@grid/column-format-dialog": "4.0.44"
 }

package/package.json

@@ -66,5 +66,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.78"
+	"version": "6.0.79"
 }