cx 24.3.0 → 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

@@ -2201,15 +2201,22 @@ function captureMouse2(e, _ref) {
 	surface.className = "cxb-mousecapture";
 	surface.style.cursor = cursor || getComputedStyle(e.currentTarget).cursor;
 	document.body.appendChild(surface);
+
+	// In case when the event originates from an iframe,
+	// we use that document as events do not bubble up.   //
+	var parentDocument = e.target.ownerDocument;
+	var options = {
+		capture: true,
+	};
 	var active = true;
-	surface.addEventListener("mousemove", move);
-	surface.addEventListener("mouseup", end);
-	if (onDblClick) surface.addEventListener("dblclick", doubleClick);
+	parentDocument.addEventListener("mousemove", move, options);
+	parentDocument.addEventListener("mouseup", end, options);
+	if (onDblClick) parentDocument.addEventListener("dblclick", doubleClick);
 	function tear() {
 		if (surface == null) return;
-		surface.removeEventListener("mousemove", move);
-		surface.removeEventListener("mouseup", end);
-		if (onDblClick) surface.removeEventListener("dblclick", onDblClick);
+		parentDocument.removeEventListener("mousemove", move, options);
+		parentDocument.removeEventListener("mouseup", end, options);
+		if (onDblClick) parentDocument.removeEventListener("dblclick", onDblClick, options);
 		document.body.removeChild(surface);
 		surface = null;
 	}
@@ -15768,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;
@@ -15864,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)];
@@ -15927,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);
@@ -15996,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(
@@ -16009,28 +16014,29 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 						),
 					);
 				}
-				headerRows.push(
-					/*#__PURE__*/ jsx(
-						"tbody",
-						{
-							className: CSS.element(baseClass, "header"),
-							children: result.map(function (h, i) {
-								return /*#__PURE__*/ jsx(
-									"tr",
-									{
-										children: h,
-									},
-									i,
-								);
-							}),
-						},
-						"h" + key + lineIndex,
-					),
+				headerRows.push.apply(
+					headerRows,
+					result.map(function (h, i) {
+						return /*#__PURE__*/ jsx(
+							"tr",
+							{
+								children: h,
+							},
+							lineIndex + "-" + i,
+						);
+					}),
 				);
 			}
 		});
 		if (headerRows.length == 0) return null;
-		return headerRows;
+		return /*#__PURE__*/ jsx(
+			"tbody",
+			{
+				className: CSS.element(baseClass, "header"),
+				children: headerRows,
+			},
+			"h" + key,
+		);
 	};
 	_proto.onHeaderMouseMove = function onHeaderMouseMove(e, column, columnInstance, gridInstance, headerLine) {
 		var _headerInstance$widge;
@@ -16634,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,
 					{
@@ -16683,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.0",
+   "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/data/Expression.js

@@ -1,212 +1,212 @@
-import { computable } from "./computable";
-import { Format } from "../util/Format";
-import { Binding } from "./Binding";
-
-import { quoteStr } from "../util/quote";
-import { isDigit } from "../util/isDigit";
-import { isFunction } from "../util/isFunction";
-
-/*
-   Helper usage example
-
-   Expression.registerHelper('_', _);
-   let e = Expression.compile('_.min({data})');
- */
-
-let expCache = {},
-   helpers = {},
-   helperNames = [],
-   helperValues = [],
-   expFatArrows = null;
-
-function getExpr(expr) {
-   if (expr.memoize) return expr;
-
-   function memoize() {
-      let lastValue,
-         lastRunBindings = {},
-         lastRunResults = {},
-         getters = {},
-         currentData,
-         len = -1;
-
-      let get = function (bindingWithFormat) {
-         let getter = getters[bindingWithFormat];
-         if (!getter) {
-            let binding = bindingWithFormat,
-               format;
-            let colonIndex = bindingWithFormat.indexOf(":");
-            if (colonIndex != -1) {
-               format = Format.parse(bindingWithFormat.substring(colonIndex + 1));
-               binding = bindingWithFormat.substring(0, colonIndex);
-            } else {
-               let nullSeparatorIndex = bindingWithFormat.indexOf(":");
-               if (nullSeparatorIndex != -1) {
-                  format = Format.parse(bindingWithFormat.substring(nullSeparatorIndex));
-                  binding = bindingWithFormat.substring(0, nullSeparatorIndex - 1);
-               }
-            }
-            let b = Binding.get(binding);
-            getter = (data) => {
-               let value = b.value(data);
-               lastRunBindings[len] = b.value;
-               lastRunResults[len] = value;
-               len++;
-               return value;
-            };
-
-            if (format) {
-               let valueGetter = getter;
-               getter = (data) => format(valueGetter(data));
-            }
-
-            getters[bindingWithFormat] = getter;
-         }
-         return getter(currentData);
-      };
-
-      return function (data) {
-         let i = 0;
-         for (; i < len; i++) if (lastRunBindings[i](data) !== lastRunResults[i]) break;
-         if (i !== len) {
-            len = 0;
-            currentData = data;
-            lastValue = expr(get);
-         }
-         return lastValue;
-      };
-   }
-
-   let result = memoize();
-   result.memoize = memoize;
-   return result;
-}
-
-export function expression(str) {
-   if (isFunction(str)) return getExpr(str);
-
-   let r = expCache[str];
-   if (r) return r;
-
-   let quote = false;
-
-   let termStart = -1,
-      curlyBrackets = 0,
-      percentExpression;
-
-   let fb = ["return ("];
-
-   let args = {};
-   let formats = [];
-   let subExpr = 0;
-
-   for (let i = 0; i < str.length; i++) {
-      let c = str[i];
-      switch (c) {
-         case "{":
-            if (curlyBrackets > 0) curlyBrackets++;
-            else {
-               if (!quote && termStart < 0 && (str[i + 1] != "{" || str[i - 1] == "%")) {
-                  termStart = i + 1;
-                  curlyBrackets = 1;
-                  percentExpression = str[i - 1] == "%";
-                  if (percentExpression) fb.pop(); //%
-               } else if (str[i - 1] != "{") fb.push(c);
-            }
-            break;
-
-         case "}":
-            if (termStart >= 0) {
-               if (--curlyBrackets == 0) {
-                  let term = str.substring(termStart, i);
-                  let formatStart = 0;
-                  if (term[0] == "[") formatStart = term.indexOf("]");
-                  let colon = term.indexOf(":", formatStart > 0 ? formatStart : 0);
-                  let binding = colon == -1 ? term : term.substring(0, colon);
-                  let format = colon == -1 ? null : term.substring(colon + 1);
-                  if (colon == -1) {
-                     let nullSepIndex = binding.indexOf("|", formatStart);
-                     if (nullSepIndex != -1) {
-                        format = binding.substring(nullSepIndex);
-                        binding = binding.substring(0, nullSepIndex);
-                     }
-                  }
-                  let argName = binding.replace(/\./g, "_");
-                  if (isDigit(argName[0])) argName = "$" + argName;
-                  if (percentExpression || (binding[0] == "[" && binding[binding.length - 1] == "]")) {
-                     argName = `expr${++subExpr}`;
-                     args[argName] = expression(percentExpression ? binding : binding.substring(1, binding.length - 1));
-                  } else args[argName] = binding;
-                  if (format) {
-                     let formatter = "fmt" + formats.length;
-                     fb.push(formatter, "(", argName, ", ", quoteStr(format), ")");
-                     formats.push(Format.parse(format));
-                  } else fb.push(argName);
-                  termStart = -1;
-               }
-            } else fb.push(c);
-
-            break;
-
-         case '"':
-         case "'":
-            if (curlyBrackets == 0) {
-               if (!quote) quote = c;
-               else if (str[i - 1] != "\\" && quote == c) quote = false;
-               fb.push(c);
-            }
-            break;
-
-         default:
-            if (termStart < 0) fb.push(c);
-            break;
-      }
-   }
-
-   fb.push(")");
-
-   let body = fb.join("");
-
-   if (expFatArrows) body = expFatArrows(body);
-
-   //console.log(body);
-   let keys = Object.keys(args);
-
-   try {
-      let compute = new Function("fmt", ...formats.map((f, i) => "fmt" + i), ...keys, ...helperNames, body).bind(
-         Format,
-         Format.value,
-         ...formats,
-         ...helperValues
-      );
-      let selector = computable(...keys.map((k) => args[k]), compute);
-      expCache[str] = selector;
-      return selector;
-   } catch (err) {
-      throw new Error(`Failed to parse expression: '${str}'. Error: ${err.message}`);
-   }
-}
-
-export const Expression = {
-   get: function (str) {
-      return expression(str);
-   },
-
-   compile: function (str) {
-      return this.get(str).memoize();
-   },
-
-   registerHelper: function (name, helper) {
-      helpers[name] = helper;
-      helperNames = Object.keys(helpers);
-      helperValues = helperNames.map((n) => helpers[n]);
-   },
-};
-
-export function plugFatArrowExpansion(impl) {
-   expFatArrows = impl;
-}
-
-export function invalidateExpressionCache() {
-   expCache = {};
-}
+import { computable } from "./computable";
+import { Format } from "../util/Format";
+import { Binding } from "./Binding";
+
+import { quoteStr } from "../util/quote";
+import { isDigit } from "../util/isDigit";
+import { isFunction } from "../util/isFunction";
+
+/*
+   Helper usage example
+
+   Expression.registerHelper('_', _);
+   let e = Expression.compile('_.min({data})');
+ */
+
+let expCache = {},
+   helpers = {},
+   helperNames = [],
+   helperValues = [],
+   expFatArrows = null;
+
+function getExpr(expr) {
+   if (expr.memoize) return expr;
+
+   function memoize() {
+      let lastValue,
+         lastRunBindings = {},
+         lastRunResults = {},
+         getters = {},
+         currentData,
+         len = -1;
+
+      let get = function (bindingWithFormat) {
+         let getter = getters[bindingWithFormat];
+         if (!getter) {
+            let binding = bindingWithFormat,
+               format;
+            let colonIndex = bindingWithFormat.indexOf(":");
+            if (colonIndex != -1) {
+               format = Format.parse(bindingWithFormat.substring(colonIndex + 1));
+               binding = bindingWithFormat.substring(0, colonIndex);
+            } else {
+               let nullSeparatorIndex = bindingWithFormat.indexOf(":");
+               if (nullSeparatorIndex != -1) {
+                  format = Format.parse(bindingWithFormat.substring(nullSeparatorIndex));
+                  binding = bindingWithFormat.substring(0, nullSeparatorIndex - 1);
+               }
+            }
+            let b = Binding.get(binding);
+            getter = (data) => {
+               let value = b.value(data);
+               lastRunBindings[len] = b.value;
+               lastRunResults[len] = value;
+               len++;
+               return value;
+            };
+
+            if (format) {
+               let valueGetter = getter;
+               getter = (data) => format(valueGetter(data));
+            }
+
+            getters[bindingWithFormat] = getter;
+         }
+         return getter(currentData);
+      };
+
+      return function (data) {
+         let i = 0;
+         for (; i < len; i++) if (lastRunBindings[i](data) !== lastRunResults[i]) break;
+         if (i !== len) {
+            len = 0;
+            currentData = data;
+            lastValue = expr(get);
+         }
+         return lastValue;
+      };
+   }
+
+   let result = memoize();
+   result.memoize = memoize;
+   return result;
+}
+
+export function expression(str) {
+   if (isFunction(str)) return getExpr(str);
+
+   let r = expCache[str];
+   if (r) return r;
+
+   let quote = false;
+
+   let termStart = -1,
+      curlyBrackets = 0,
+      percentExpression;
+
+   let fb = ["return ("];
+
+   let args = {};
+   let formats = [];
+   let subExpr = 0;
+
+   for (let i = 0; i < str.length; i++) {
+      let c = str[i];
+      switch (c) {
+         case "{":
+            if (curlyBrackets > 0) curlyBrackets++;
+            else {
+               if (!quote && termStart < 0 && (str[i + 1] != "{" || str[i - 1] == "%")) {
+                  termStart = i + 1;
+                  curlyBrackets = 1;
+                  percentExpression = str[i - 1] == "%";
+                  if (percentExpression) fb.pop(); //%
+               } else if (str[i - 1] != "{") fb.push(c);
+            }
+            break;
+
+         case "}":
+            if (termStart >= 0) {
+               if (--curlyBrackets == 0) {
+                  let term = str.substring(termStart, i);
+                  let formatStart = 0;
+                  if (term[0] == "[") formatStart = term.indexOf("]");
+                  let colon = term.indexOf(":", formatStart > 0 ? formatStart : 0);
+                  let binding = colon == -1 ? term : term.substring(0, colon);
+                  let format = colon == -1 ? null : term.substring(colon + 1);
+                  if (colon == -1) {
+                     let nullSepIndex = binding.indexOf("|", formatStart);
+                     if (nullSepIndex != -1) {
+                        format = binding.substring(nullSepIndex);
+                        binding = binding.substring(0, nullSepIndex);
+                     }
+                  }
+                  let argName = binding.replace(/\./g, "_");
+                  if (isDigit(argName[0])) argName = "$" + argName;
+                  if (percentExpression || (binding[0] == "[" && binding[binding.length - 1] == "]")) {
+                     argName = `expr${++subExpr}`;
+                     args[argName] = expression(percentExpression ? binding : binding.substring(1, binding.length - 1));
+                  } else args[argName] = binding;
+                  if (format) {
+                     let formatter = "fmt" + formats.length;
+                     fb.push(formatter, "(", argName, ", ", quoteStr(format), ")");
+                     formats.push(Format.parse(format));
+                  } else fb.push(argName);
+                  termStart = -1;
+               }
+            } else fb.push(c);
+
+            break;
+
+         case '"':
+         case "'":
+            if (curlyBrackets == 0) {
+               if (!quote) quote = c;
+               else if (str[i - 1] != "\\" && quote == c) quote = false;
+               fb.push(c);
+            }
+            break;
+
+         default:
+            if (termStart < 0) fb.push(c);
+            break;
+      }
+   }
+
+   fb.push(")");
+
+   let body = fb.join("");
+
+   if (expFatArrows) body = expFatArrows(body);
+
+   //console.log(body);
+   let keys = Object.keys(args);
+
+   try {
+      let compute = new Function("fmt", ...formats.map((f, i) => "fmt" + i), ...keys, ...helperNames, body).bind(
+         Format,
+         Format.value,
+         ...formats,
+         ...helperValues
+      );
+      let selector = computable(...keys.map((k) => args[k]), compute);
+      expCache[str] = selector;
+      return selector;
+   } catch (err) {
+      throw new Error(`Failed to parse expression: '${str}'. Error: ${err.message}`);
+   }
+}
+
+export const Expression = {
+   get: function (str) {
+      return expression(str);
+   },
+
+   compile: function (str) {
+      return this.get(str).memoize();
+   },
+
+   registerHelper: function (name, helper) {
+      helpers[name] = helper;
+      helperNames = Object.keys(helpers);
+      helperValues = helperNames.map((n) => helpers[n]);
+   },
+};
+
+export function plugFatArrowExpansion(impl) {
+   expFatArrows = impl;
+}
+
+export function invalidateExpressionCache() {
+   expCache = {};
+}