cx 24.3.1 → 24.3.2

package/dist/util.js

@@ -546,10 +546,12 @@ function findScrollableParent(sourceEl, horizontal) {
 }
 
 function getParentFrameBoundingClientRect(el) {
-	if (el.ownerDocument != document) {
+	// if the ownerDocument is null, the element itself is the document
+	var ownerDocument = el.ownerDocument || el;
+	if (ownerDocument != document) {
 		var frames = document.getElementsByTagName("iframe");
 		for (var i = 0; i < frames.length; i++) {
-			if (frames[i].contentDocument == el.ownerDocument) {
+			if (frames[i].contentDocument == ownerDocument) {
 				return frames[i].getBoundingClientRect();
 			}
 		}

package/dist/widgets.js

@@ -15775,10 +15775,7 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 				var headerTBody = e.target.parentElement.parentElement.parentElement;
 				var uniqueColId = e.currentTarget.dataset.uniqueColId;
 				var headerCell = findFirstChild(headerTBody, function (el) {
-					var _el$dataset;
-					return (
-						el.tagName == "TH" && ((_el$dataset = el.dataset) == null ? void 0 : _el$dataset.uniqueColId) == uniqueColId
-					);
+					return el.tagName == "TH" && el.dataset && el.dataset.uniqueColId == uniqueColId;
 				});
 				var scrollAreaEl = headerTBody.parentElement.parentElement;
 				var gridEl = scrollAreaEl.parentElement;
@@ -15871,13 +15868,14 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 		var headerRows = [];
 		if (!header) return null;
 		var skip = {};
-		header.children.forEach(function (line, lineIndex) {
+		var lineIndex = 0;
+		header.children.forEach(function (line) {
 			var empty = [true, true, true];
 			var result = [[], [], []];
 			line.children.forEach(function (hdinst, colIndex) {
 				var hdwidget = hdinst.widget;
 				var _loop = function _loop(l) {
-						var colKey = lineIndex + "-" + colIndex + "-" + l;
+						var colKey = lineIndex + l + "-" + colIndex;
 						if (skip[colKey]) return 0; // continue
 						if (Boolean(hdinst.data.fixed) != fixedColumns) return 0; // continue
 						var header = hdinst.components["header" + (l + 1)];
@@ -15934,8 +15932,7 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 								colSpan = header.data.colSpan;
 								rowSpan = header.data.rowSpan;
 								for (var r = 0; r < header.data.rowSpan; r++)
-									for (var c = 0; c < header.data.colSpan; c++)
-										skip[lineIndex + "-" + (colIndex + c) + "-" + (l + r)] = true;
+									for (var c = 0; c < header.data.colSpan; c++) skip[lineIndex + l + r + "-" + (colIndex + c)] = true;
 							}
 							if ((hdwidget.resizable || header.data.resizable) && header.data.colSpan < 2) {
 								resizer = _this3.renderResizer(instance, hdinst, header, colIndex);
@@ -16003,6 +16000,7 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 			result = result.filter(function (_, i) {
 				return !empty[i];
 			});
+			lineIndex += result.length;
 			if (result[0]) {
 				if (fixed && !fixedColumns) {
 					result[0].push(
@@ -16642,6 +16640,7 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 			mod["draggable"] = draggable;
 			mod["non-draggable"] = !draggable;
 			var wrap = function wrap(children) {
+				var skipCells = {};
 				return /*#__PURE__*/ jsx(
 					GridRowComponent,
 					{
@@ -16691,6 +16690,20 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 												maxWidth: width + "px",
 											});
 										}
+										if (skipCells[line + "-" + cellIndex]) return null;
+										if (data.colSpan > 1 || data.rowSpan > 1) {
+											for (var r = line; r < line + ((_data$rowSpan = data.rowSpan) != null ? _data$rowSpan : 1); r++) {
+												var _data$rowSpan;
+												for (
+													var c = cellIndex;
+													c < cellIndex + ((_data$colSpan = data.colSpan) != null ? _data$colSpan : 1);
+													c++
+												) {
+													var _data$colSpan;
+													skipCells[r + "-" + c] = true;
+												}
+											}
+										}
 										if (cellWrap) content = cellWrap(content);
 										return /*#__PURE__*/ jsx(
 											"td",

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "24.3.1",
+   "version": "24.3.2",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "main": "index.js",
    "jsnext:main": "src/index.js",

package/src/util/getParentFrameBoundingClientRect.js

@@ -1,8 +1,10 @@
 export function getParentFrameBoundingClientRect(el) {
-   if (el.ownerDocument != document) {
+   // if the ownerDocument is null, the element itself is the document
+   let ownerDocument = el.ownerDocument || el;
+   if (ownerDocument != document) {
       let frames = document.getElementsByTagName("iframe");
       for (let i = 0; i < frames.length; i++) {
-         if (frames[i].contentDocument == el.ownerDocument) {
+         if (frames[i].contentDocument == ownerDocument) {
             return frames[i].getBoundingClientRect();
          }
       }
@@ -14,6 +16,6 @@ export function getParentFrameBoundingClientRect(el) {
       right: window.innerWidth,
       bottom: window.innerHeight,
       width: window.innerWidth,
-      height: window.innerHeight
+      height: window.innerHeight,
    };
-}
+}