@refinitiv-ui/efx-grid 6.0.124 → 6.0.125

package/lib/grid/index.js

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

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

@@ -60,6 +60,8 @@ declare class Popup extends EventDispatcher {
 
     public setZIndexReference(elem: Element|null): void;
 
+    public updateZIndex(): void;
+
     public show(opt_shown?: boolean|null, parentElement?: Element|null): void;
 
     public hide(opt_hidden?: boolean|null): void;

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

@@ -508,6 +508,25 @@ let _setElementZIndex = function (elem, zIndex) {
 		}
 	}
 };
+/** Recalculate popup's z-index based on existing elements and references.
+* @public
+*/
+Popup.prototype.updateZIndex = function () {
+	let zIndex = _getElementZIndex(this._elem.parentNode);
+	let aez = _getElementZIndex(this._attachedElem);
+	let rez = _getElementZIndex(this._zIndexRef);
+	if(zIndex < aez) {
+		zIndex = aez;
+	}
+	if(zIndex < rez) {
+		zIndex = rez;
+	}
+	if(zIndex) {
+		++zIndex;
+	}
+	_setElementZIndex(this._elem, zIndex);
+	_setElementZIndex(this._overlay, zIndex);
+};
 /** @public
 * @param {boolean=} opt_shown
 * @param {Element=} parentElement
@@ -540,26 +559,12 @@ Popup.prototype.show = function (opt_shown, parentElement) {
 	if (shown) {
 		t._inDoc = true;
 
-		let zIndex = _getElementZIndex(parentElement);
 		if (!(parentElement instanceof Element)) {
 			parentElement = t._parentElement;
 		}
 		if (t._uiBlocking) {
 			t._attachOverlay(parentElement);
 		}
-		let aez = _getElementZIndex(t._attachedElem);
-		let rez = _getElementZIndex(t._zIndexRef);
-		if(zIndex < aez) {
-			zIndex = aez;
-		}
-		if(zIndex < rez) {
-			zIndex = rez;
-		}
-		if(zIndex) {
-			++zIndex;
-		}
-		_setElementZIndex(t._elem, zIndex);
-		_setElementZIndex(t._overlay, zIndex);
 
 		parentElement.appendChild(t._elem);
 		parentElement.addEventListener("scroll", t._onScroll, true); // TODO: Remove the listener
@@ -583,12 +588,15 @@ Popup.prototype.show = function (opt_shown, parentElement) {
 		Dom.removeParent(t._overlay);
 	}
 
-	evtType = shown ? "shown" : "hidden";
-	t._evtArg["type"] = evtType;
-	t._dispatch(evtType, t._evtArg);
+
 
 	if (shown) {
 		t.updatePosition(); // Position has to be updated after firing the event, for client element to be resized
+		t._evtArg["type"] = "shown";
+		t._dispatch("shown", t._evtArg);
+	} else {
+		t._evtArg["type"] = "hidden";
+		t._dispatch("hidden", t._evtArg);
 	}
 };
 /** @public
@@ -720,6 +728,8 @@ Popup.prototype.updatePosition = function (fallback) {
 
 	if (!t._inDoc) { return; }
 
+	t.updateZIndex();
+
 	if (t._attachedElem) {
 		if (!t._attachedElem.offsetWidth) { // Check if attached element is visible in the DOM
 			return; // If the element has has no parent

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

@@ -21,7 +21,8 @@ declare namespace RowSegmentingPlugin {
         nonSegmentSeparatorBinding?: ((...params: any[]) => any)|null,
         sortingLogic?: ((...params: any[]) => any)|null,
         rowSpanningField?: string|null,
-        segmentIdField?: string|null
+        segmentIdField?: string|null,
+        displayColumn?: (string|number)|null
     };
 
 }
@@ -48,6 +49,8 @@ declare class RowSegmentingPlugin extends GridPlugin {
 
     public getSegmentParentRowId(rowRef: string|number|null): string;
 
+    public _resolveDisplayColumn(): number;
+
     public setSegmentSeparator(rowRef: string|number|null, enabled?: boolean|null): boolean;
 
     public setSegmentClassification(rowRef: string|number|null, fields: string|(string)[]|null): boolean;

package/lib/versions.json

@@ -1,5 +1,5 @@
 {
-	"tr-grid-util": "1.3.159",
+	"tr-grid-util": "1.3.160",
 	"tr-grid-printer": "1.0.18",
 	"@grid/column-dragging": "1.0.21",
 	"@grid/row-segmenting": "1.0.34",

package/package.json

@@ -69,5 +69,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "6.0.124"
+	"version": "6.0.125"
 }