@hzab/edit-table 0.1.13-alpha.1 → 0.1.13

package/dist/index.js

@@ -2,13 +2,13 @@ import { forwardRef as e, useCallback as t, useEffect as n, useImperativeHandle
 import { Checkbox as s, DatePicker as c, Empty as l, Input as u, Popover as d, Spin as f, TimePicker as p } from "antd";
 import { ReactGrid as m, getCellProperty as h, isAlphaNumericKey as g, isNavigationKey as _ } from "@silevis/reactgrid";
 import { antdComponents as v, customComponents as y } from "@hzab/form-render";
-import { InfoCircleOutlined as b, MinusCircleOutlined as x, PlusCircleOutlined as S } from "@ant-design/icons";
-import { Fragment as C, jsx as w, jsxs as T } from "react/jsx-runtime";
-import { c as E } from "react/compiler-runtime";
-import { getVal as D } from "@hzab/utils/src/formily/field";
+import { InfoCircleOutlined as ee, MinusCircleOutlined as b, PlusCircleOutlined as x } from "@ant-design/icons";
+import { Fragment as S, jsx as C, jsxs as w } from "react/jsx-runtime";
+import { c as T } from "react/compiler-runtime";
+import { getVal as E } from "@hzab/utils/src/formily/field";
 import "@silevis/reactgrid/styles.css";
 //#region src/common/childAntdComponent.ts
-var O = {
+var D = {
 	"DatePicker.MonthPicker": c.MonthPicker,
 	"DatePicker.QuarterPicker": c.QuarterPicker,
 	"DatePicker.RangePicker": c.RangePicker,
@@ -19,7 +19,7 @@ var O = {
 	"Input.Search": u.Search,
 	"Input.TextArea": u.TextArea,
 	"TimePicker.RangePicker": p.RangePicker
-}, k = [
+}, O = [
 	"DatePicker",
 	"DatePicker.MonthPicker",
 	"DatePicker.QuarterPicker",
@@ -28,7 +28,7 @@ var O = {
 	"DatePicker.WeekPicker",
 	"DatePicker.YearPicker",
 	"TimePicker.RangePicker"
-], A = (e, t = {}) => {
+], k = (e, t = {}) => {
 	class r {
 		getCompatibleCell(e) {
 			let t;
@@ -61,7 +61,8 @@ var O = {
 			});
 		}
 		getClassName(e, t) {
-			return "";
+			let n = window.gridHighlightRowId;
+			return n && e.rowId === n ? "custom-highlights-row" : "";
 		}
 		handleCompositionEnd(e, t) {
 			return {
@@ -71,7 +72,7 @@ var O = {
 		}
 		render(r, s, c) {
 			var l;
-			let [u, f] = o(!1), [p, m] = o(!1), h = (r == null ? void 0 : r.columnId) + (r == null ? void 0 : r.rowId), [v, y] = o(r == null ? void 0 : r.text), [x, S] = o(!1), C = a(r == null ? void 0 : r.text), E = a(), D = a(null), O = a(null), A = (e) => {
+			let [u, f] = o(!1), [p, m] = o(!1), h = (r == null ? void 0 : r.columnId) + (r == null ? void 0 : r.rowId), [v, y] = o(r == null ? void 0 : r.text), [b, x] = o(!1), S = a(r == null ? void 0 : r.text), T = a(), E = a(null), D = a(null), k = (e) => {
 				let t = Array.from(e.children);
 				if (t.length === 0) return e.clientHeight;
 				let n = Infinity, r = -Infinity;
@@ -82,16 +83,16 @@ var O = {
 				return Math.max(0, Math.ceil(r - n));
 			};
 			n(() => {
-				let e = D.current, t = r == null ? void 0 : r.onRowHeightChange;
+				let e = E.current, t = r == null ? void 0 : r.onRowHeightChange;
 				if (!e || !t || (r == null ? void 0 : r.rowId) == null || typeof (r == null ? void 0 : r.rowId) == "string" && r.rowId.indexOf("header-") === 0) return;
 				let n = e.firstElementChild, i = n || e;
-				if (O.current === null) {
+				if (D.current === null) {
 					let t = getComputedStyle(e);
-					O.current = (parseFloat(t.paddingTop) || 0) + (parseFloat(t.paddingBottom) || 0);
+					D.current = (parseFloat(t.paddingTop) || 0) + (parseFloat(t.paddingBottom) || 0);
 				}
-				let a = n ? O.current : 0, o = new ResizeObserver(() => {
+				let a = n ? D.current : 0, o = new ResizeObserver(() => {
 					Array.from(i.children).forEach((e) => o.observe(e));
-					let e = A(i) + a;
+					let e = k(i) + a;
 					t(r == null ? void 0 : r.rowId, e, r == null ? void 0 : r.columnId);
 				});
 				return o.observe(i), Array.from(i.children).forEach((e) => o.observe(e)), () => o.disconnect();
@@ -102,7 +103,7 @@ var O = {
 				u,
 				v
 			]), n(() => {
-				y(r == null ? void 0 : r.text), C.current = r == null ? void 0 : r.text;
+				y(r == null ? void 0 : r.text), S.current = r == null ? void 0 : r.text;
 			}, [r == null ? void 0 : r.text]), n(() => {
 				function e(e) {
 					window.gridEditId != h && f(!1);
@@ -111,7 +112,7 @@ var O = {
 					document.removeEventListener("click", e);
 				};
 			}, []);
-			let j = (e) => {
+			let A = (e) => {
 				var t;
 				let n = !1, i = !1;
 				for (let t of (r == null ? void 0 : r.validatorList) || []) {
@@ -119,7 +120,7 @@ var O = {
 					t != null && (a = t.pattern) != null && a.test(e) && (n = !0);
 					break;
 				}
-				i = !n && Array.isArray(r == null ? void 0 : r.validatorList) && (r == null || (t = r.validatorList) == null ? void 0 : t.length) > 0, S(i);
+				i = !n && Array.isArray(r == null ? void 0 : r.validatorList) && (r == null || (t = r.validatorList) == null ? void 0 : t.length) > 0, x(i);
 			};
 			n(() => {
 				if (!p) return;
@@ -135,30 +136,30 @@ var O = {
 				}, 0);
 				return () => clearTimeout(e);
 			}, [p]);
-			let M = () => {
-				let e = C.current;
+			let j = () => {
+				let e = S.current;
 				c(this.getCompatibleCell({
 					...r,
 					text: e,
 					selectedValue: e
 				}), !0);
-			}, N = i(() => k != null && k.includes(r == null ? void 0 : r.type) ? {
+			}, M = i(() => O != null && O.includes(r == null ? void 0 : r.type) ? {
 				open: p,
 				onOpenChange: (e) => {
-					E.current && clearTimeout(E.current), E.current = setTimeout(() => {
+					T.current && clearTimeout(T.current), T.current = setTimeout(() => {
 						m(e);
 					}, 80);
 				}
 			} : {}, [r]);
 			return n(() => {
-				!u && r.type == "Upload" && window.uploadEdit && window.uploadEdit == h && (window.uploadEdit = null, M());
-			}, [u, v]), /* @__PURE__ */ T("div", {
-				ref: D,
+				!u && r.type == "Upload" && window.uploadEdit && window.uploadEdit == h && (window.uploadEdit = null, j());
+			}, [u, v]), /* @__PURE__ */ w("div", {
+				ref: E,
 				className: `base-hoc ${u ? "base-hoc-edit" : ""}`,
 				onDoubleClick: (e) => {
 					r != null && r.nonEditable || (r.type === "Upload" && (window.uploadEdit = h), f(!0));
 				},
-				children: [/* @__PURE__ */ w(e, {
+				children: [/* @__PURE__ */ C(e, {
 					...t,
 					onPointerDown: (e) => e.stopPropagation(),
 					componentProps: {
@@ -172,10 +173,10 @@ var O = {
 						onChange: (e) => {
 							var t, n;
 							let r = (t = e == null || (n = e.target) == null ? void 0 : n.value) == null ? e : t;
-							y(r), C.current = r, j(r);
+							y(r), S.current = r, A(r);
 						},
 						onBlur: (e) => {
-							M(), k != null && k.includes(r == null ? void 0 : r.type) || f(!1);
+							j(), O != null && O.includes(r == null ? void 0 : r.type) || f(!1);
 						},
 						onPointerDown: (e) => {
 							e.stopPropagation();
@@ -183,30 +184,30 @@ var O = {
 						onKeyDown: (e) => {
 							(g(e.keyCode) || _(e.keyCode)) && e.stopPropagation();
 						},
-						...N,
+						...M,
 						...(r == null ? void 0 : r.getField) && (r == null ? void 0 : r.getField()["x-component-props"]) || {}
 					},
 					pattern: u ? "" : "readPretty",
 					cell: r
-				}), x && /* @__PURE__ */ w(d, {
+				}), b && /* @__PURE__ */ C(d, {
 					content: (l = r == null ? void 0 : r.validatorMessage) == null ? "该字段不合法" : l,
-					children: /* @__PURE__ */ w(b, { className: "validator-icon" })
+					children: /* @__PURE__ */ C(ee, { className: "validator-icon" })
 				})]
 			});
 		}
 	}
 	return new r();
-}, j = (e) => {
+}, A = (e) => {
 	let { pattern: t, cell: n, componentProps: r, Com: a, cellRender: o } = e, s = i(() => {
 		var e;
-		if (n != null && n.getField) return D({
+		if (n != null && n.getField) return E({
 			...(n == null ? void 0 : n.getField) && (n == null ? void 0 : n.getField()),
 			enum: (n == null || (e = n.getField()) == null ? void 0 : e.enum) || (n == null ? void 0 : n.values)
 		}, { [(n == null ? void 0 : n.getField) && (n == null ? void 0 : n.getField().name)]: n.text });
 	}, [n]);
-	return o && o(e) ? /* @__PURE__ */ w(o, { ...e }) : /* @__PURE__ */ w("div", {
+	return o && o(e) ? /* @__PURE__ */ C(o, { ...e }) : /* @__PURE__ */ C("div", {
 		className: "base-hoc-inner",
-		children: t == "readPretty" ? /* @__PURE__ */ w("div", { children: s }) : /* @__PURE__ */ w(a, {
+		children: t == "readPretty" ? /* @__PURE__ */ C("div", { children: s }) : /* @__PURE__ */ C(a, {
 			className: "rg-input",
 			ref: (e) => {
 				e && e.focus({ preventScroll: !0 });
@@ -214,20 +215,20 @@ var O = {
 			...r
 		})
 	});
-}, M = (e) => {
-	let t = E(5), n = e == null ? void 0 : e.componentProps, r;
+}, j = (e) => {
+	let t = T(5), n = e == null ? void 0 : e.componentProps, r;
 	t[0] === n ? r = t[1] : (r = {
 		...n,
 		type: "number"
 	}, t[0] = n, t[1] = r);
 	let i;
-	return t[2] !== e || t[3] !== r ? (i = /* @__PURE__ */ w(j, {
+	return t[2] !== e || t[3] !== r ? (i = /* @__PURE__ */ C(A, {
 		...e,
 		componentProps: r,
 		Com: u
 	}), t[2] = e, t[3] = r, t[4] = i) : i = t[4], i;
-}, N = (e) => {
-	let t = E(21), { cell: r } = e, { setExpandKeys: i, expandKeys: a, rowKey: s, setNewDataSource: c, record: l } = r, [u, d] = o(!1), f;
+}, M = (e) => {
+	let t = T(21), { cell: r } = e, { setExpandKeys: i, expandKeys: a, rowKey: s, setNewDataSource: c, record: l } = r, [u, d] = o(!1), f;
 	t[0] !== l || t[1] !== s || t[2] !== c ? (f = (e) => {
 		c((t) => {
 			var n;
@@ -250,24 +251,24 @@ var O = {
 		i((e) => e != null && e.includes(l == null ? void 0 : l[s]) ? e == null ? void 0 : e.filter((e) => e != (l == null ? void 0 : l[s])) : [...e, l == null ? void 0 : l[s]]), d(!u), p(!u);
 	}, t[11] = u, t[12] = p, t[13] = l, t[14] = s, t[15] = i, t[16] = _) : _ = t[16];
 	let v = _, y;
-	return t[17] !== u || t[18] !== v || t[19] !== (l == null ? void 0 : l.children) ? (y = /* @__PURE__ */ w("div", {
+	return t[17] !== u || t[18] !== v || t[19] !== (l == null ? void 0 : l.children) ? (y = /* @__PURE__ */ C("div", {
 		className: "expandList-template",
-		children: l != null && l.children ? /* @__PURE__ */ w(C, { children: w(u ? x : S, {
+		children: l != null && l.children ? /* @__PURE__ */ C(S, { children: C(u ? b : x, {
 			className: "expandList-template-icon",
 			onClick: v
-		}) }) : /* @__PURE__ */ w("div", { style: { width: 14 } })
+		}) }) : /* @__PURE__ */ C("div", { style: { width: 14 } })
 	}), t[17] = u, t[18] = v, t[19] = l == null ? void 0 : l.children, t[20] = y) : y = t[20], y;
 };
 //#endregion
 //#region src/common/utils.ts
-function P(e) {
+function N(e) {
 	return typeof e == "object" && !!e;
 }
-var F = (e) => {
+var P = (e) => {
 	var t;
-	return typeof (e == null ? void 0 : e.title) == "function" ? P(e == null ? void 0 : e.title()) ? e == null || (t = e.title()) == null ? void 0 : t.props.children : String(e == null ? void 0 : e.title()) || "" : String(e == null ? void 0 : e.title) || "";
+	return typeof (e == null ? void 0 : e.title) == "function" ? N(e == null ? void 0 : e.title()) ? e == null || (t = e.title()) == null ? void 0 : t.props.children : String(e == null ? void 0 : e.title()) || "" : String(e == null ? void 0 : e.title) || "";
 };
-function ee(e, t = 40) {
+function te(e, t = 40) {
 	let n = (e) => e.reduce((e, t) => {
 		var r;
 		return (r = t.children) != null && r.length ? [...e, ...n(t.children)] : [...e, t];
@@ -298,14 +299,14 @@ function ee(e, t = 40) {
 		cells: []
 	})), u = (e) => {
 		var t;
-		return (t = ["rowSelection", "ExpandListTemplate"]) != null && t.includes(e == null ? void 0 : e.type) ? e == null ? void 0 : e.type : P(typeof (e == null ? void 0 : e.title) == "function" ? e == null ? void 0 : e.title() : null) ? `${e == null ? void 0 : e.dataIndex}` : "header";
+		return (t = ["rowSelection", "ExpandListTemplate"]) != null && t.includes(e == null ? void 0 : e.type) ? e == null ? void 0 : e.type : N(typeof (e == null ? void 0 : e.title) == "function" ? e == null ? void 0 : e.title() : null) ? `${e == null ? void 0 : e.dataIndex}` : "header";
 	}, d = (e, t = 0) => {
 		e.forEach((e) => {
 			if (e._isLeaf) {
 				let n = {
 					...e,
 					type: u(e),
-					text: F(e),
+					text: P(e),
 					dataIndex: e.dataIndex,
 					width: e.width,
 					rowspan: e.rowspan,
@@ -319,7 +320,7 @@ function ee(e, t = 40) {
 			} else l[t].cells.push({
 				...e,
 				type: u(e),
-				text: F(e),
+				text: P(e),
 				colspan: e.colspan,
 				style: e != null && e.style ? e == null ? void 0 : e.style : {
 					background: "rgba(128, 128, 128, 0.1)",
@@ -338,7 +339,7 @@ function ee(e, t = 40) {
 				n.push({
 					...e,
 					type: u(e),
-					text: F(e),
+					text: P(e),
 					dataIndex: e.dataIndex,
 					width: e.width,
 					rowspan: t === a - 1 ? 1 : void 0,
@@ -369,7 +370,7 @@ function ee(e, t = 40) {
 		n ? p.push(n) : p.push({
 			...e,
 			type: u(e),
-			text: F(e),
+			text: P(e),
 			dataIndex: e.dataIndex,
 			width: e.width,
 			rowspan: 1,
@@ -386,7 +387,7 @@ function ee(e, t = 40) {
 		});
 	}), l;
 }
-function te(e) {
+function ne(e) {
 	let t = [];
 	function n(e) {
 		e.forEach((e) => {
@@ -410,7 +411,7 @@ function te(e) {
 }
 //#endregion
 //#region src/common/useDynamicHeight.ts
-var ne = (e) => {
+var re = (e) => {
 	let { wrapRef: r, rowHeight: i, setRows: s } = e, c = a({}), l = a(), u = a({
 		top: 0,
 		left: 0
@@ -545,38 +546,60 @@ var ne = (e) => {
 };
 //#endregion
 //#region src/index.tsx
-function I(e, t) {
+function ie(e, t, n) {
+	if (!Array.isArray(e) || !Array.isArray(t) || t.length === 0) return e;
+	let r = /* @__PURE__ */ new Map();
+	t.forEach((e) => {
+		(e == null ? void 0 : e[n]) != null && r.set(String(e[n]), e), (e == null ? void 0 : e.id) != null && r.set(String(e.id), e);
+	});
+	let i = (e) => Array.isArray(e) ? e.map((e) => {
+		var t;
+		let a = r.get(String((t = e == null ? void 0 : e[n]) == null ? e == null ? void 0 : e.id : t)), o = e == null ? void 0 : e.children, s = o && i(o);
+		if (!a) return s === o ? e : {
+			...e,
+			children: s
+		};
+		let { children: c, ...l } = a;
+		return {
+			...e,
+			...l,
+			...o === void 0 ? {} : { children: s }
+		};
+	}) : e;
+	return i(e);
+}
+function F(e, t) {
 	var c;
-	let { columns: u, dataSource: d, formulaConfig: p, onChange: h, reactGridProps: g = {}, onEditSubmit: _, headerRowHeight: b = 44, rowHeight: x = 44, reactGridStyle: S, className: C, Slots: E, rowSelection: D, rowKey: k = "id", query: F, loading: I, isExpand: re = !1, getList: ie, onRow: L } = e, [R, ae] = o([]), [z, B] = o([]);
+	let { columns: u, dataSource: d, formulaConfig: p, onChange: h, reactGridProps: g = {}, onEditSubmit: _, headerRowHeight: ee = 48, rowHeight: b = 48, reactGridStyle: x, className: S, Slots: T, rowSelection: E, rowKey: O = "id", query: P, loading: F, isExpand: ae = !1, getList: oe, setList: I, onRow: L } = e, [R, se] = o([]), [z, B] = o([]);
 	a([]);
-	let [V, oe] = o([]), [H, se] = o([]), [U, W] = o([]), [G, ce] = o([]), [le, ue] = o([]), [de, K] = o([]), q = a(), fe = a(), J = a(null), pe = a(), Y = a([]);
+	let [V, ce] = o([]), [H, le] = o([]), [U, W] = o([]), [G, ue] = o([]), [de, fe] = o([]), [pe, K] = o([]), q = a(), me = a(), J = a(null), he = a(), Y = a([]);
 	Y.current = G;
-	let { handleRowHeightChange: me, armScrollProtect: X, restoreScroll: Z, SCROLL_RESET_GUARD_MS: he, rowsRef: Q, rowHeights: ge } = ne({
+	let { handleRowHeightChange: ge, armScrollProtect: X, restoreScroll: Z, SCROLL_RESET_GUARD_MS: _e, rowsRef: Q, rowHeights: ve } = re({
 		wrapRef: J,
-		rowHeight: x,
+		rowHeight: b,
 		setRows: B
 	});
 	r(t, () => ({ rows: z }));
-	let $ = (e, t = 0) => {
+	let ye = (e, t = 0) => {
 		e == null || e.forEach((e) => {
-			e.level = t + 1, e != null && e.children && $(e == null ? void 0 : e.children, e.level);
+			e.level = t + 1, e != null && e.children && ye(e == null ? void 0 : e.children, e.level);
 		});
 	};
 	n(() => {
-		$(d), W(((e) => {
+		ye(d), W(((e) => {
 			let t = [], n = (e) => {
 				for (let a of e || []) {
 					var r, i;
-					t.push(a), a != null && (r = a.children) != null && r.length && (i = Y.current) != null && i.includes(a == null ? void 0 : a[k]) && n(a.children);
+					t.push(a), a != null && (r = a.children) != null && r.length && (i = Y.current) != null && i.includes(a == null ? void 0 : a[O]) && n(a.children);
 				}
 			};
 			return n(e), t;
 		})(d));
 	}, [d]), n(() => {
 		let e = z.map((e) => e.rowId);
-		e != null && e.includes(q.current) || K([]);
+		e != null && e.includes(q.current) || (K([]), window.gridHighlightRowId = null);
 	}, [z]);
-	let _e = (e) => {
+	let be = (e) => {
 		var t, n;
 		let r = e == null || (t = e.cells) == null || (t = t[0]) == null ? void 0 : t.record, i = ["_$actions", "rowSelection"], a = { id: e == null ? void 0 : e.rowId };
 		return e == null || (n = e.cells) == null || n.forEach((e) => {
@@ -588,46 +611,46 @@ function I(e, t) {
 	};
 	n(() => {
 		if (Array.isArray(u) && (u == null ? void 0 : u.length) > 0) {
-			re && u.unshift({
+			ae && u.unshift({
 				type: "ExpandListTemplate",
 				width: 14,
 				key: "ExpandListTemplate",
 				nonEditable: !0,
-				style: (D == null ? void 0 : D.style) || { background: "rgba(128, 128, 128, 0.1)" }
-			}), D && u.unshift({
+				style: (E == null ? void 0 : E.style) || { background: "rgba(128, 128, 128, 0.1)" }
+			}), E && u.unshift({
 				type: "rowSelection",
 				nonEditable: !0,
-				width: (D == null ? void 0 : D.width) || 30,
+				width: (E == null ? void 0 : E.width) || 30,
 				key: "rowSelection",
-				style: (D == null ? void 0 : D.style) || {
+				style: (E == null ? void 0 : E.style) || {
 					background: "rgba(128, 128, 128, 0.1)",
 					display: "flex",
 					justifyContent: "center"
 				}
-			}), ae(ee(u, b));
-			let e = te(u);
-			oe(e == null ? void 0 : e.map((e, t) => ({
+			}), se(te(u, ee));
+			let e = ne(u);
+			ce(e == null ? void 0 : e.map((e, t) => ({
 				...e,
 				columnId: (e == null ? void 0 : e.dataIndex) || (e == null ? void 0 : e.key) || (e == null ? void 0 : e.name) || ""
 			})));
 		}
-	}, [u, D]);
-	let ve = {}, ye = (e) => {
+	}, [u, E]);
+	let $ = {}, xe = (e) => {
 		e == null || e.forEach((e) => {
-			if (P(typeof (e == null ? void 0 : e.title) == "function" ? e == null ? void 0 : e.title() : null)) {
+			if (N(typeof (e == null ? void 0 : e.title) == "function" ? e == null ? void 0 : e.title() : null)) {
 				let t = e == null ? void 0 : e.title;
-				ve[e == null ? void 0 : e.dataIndex] = A(t);
+				$[e == null ? void 0 : e.dataIndex] = k(t);
 			}
-			e != null && e.children && ye(e == null ? void 0 : e.children);
+			e != null && e.children && xe(e == null ? void 0 : e.children);
 		});
 	};
 	n(() => {
-		ye(u), ue(ve);
+		xe(u), fe($);
 	}, [u]), n(() => {
 		let e = V == null ? void 0 : V.map((e) => e == null ? void 0 : e.columnId), t = U == null ? void 0 : U.map((t, n) => {
-			let r = ge[t[k]], i = r && Object.keys(r).length > 0 ? Math.max(x, ...Object.values(r).map(Number)) : x;
+			let r = ve[t[O]], i = r && Object.keys(r).length > 0 ? Math.max(b, ...Object.values(r).map(Number)) : b;
 			return {
-				rowId: t[k],
+				rowId: t[O],
 				height: i,
 				cells: e == null ? void 0 : e.map((e, r) => {
 					var i;
@@ -645,7 +668,7 @@ function I(e, t) {
 					return {
 						...o,
 						record: t,
-						rowId: t[k] || (o == null ? void 0 : o.type),
+						rowId: t[O] || (o == null ? void 0 : o.type),
 						type: c,
 						nonEditable: (o == null ? void 0 : o.pattern) == "readPretty" ? !0 : o == null ? void 0 : o.nonEditable,
 						text: String(s || ""),
@@ -659,11 +682,11 @@ function I(e, t) {
 						...(o == null ? void 0 : o.onCell) && (o == null ? void 0 : o.onCell(t, n, r)) || {},
 						...(o == null ? void 0 : o.cellProps) || {},
 						setNewDataSource: W,
-						setExpandKeys: ce,
-						rowKey: k,
+						setExpandKeys: ue,
+						rowKey: O,
 						expandKeys: G,
-						Slots: E,
-						onRowHeightChange: me,
+						Slots: T,
+						onRowHeightChange: ge,
 						...a
 					};
 				})
@@ -675,122 +698,133 @@ function I(e, t) {
 		V,
 		R
 	]);
-	let be = async (e) => {
+	let Se = async (e) => {
 		if (!Array.isArray(e) || e.length === 0) return;
-		let t = [], n = (Q.current || []).map((e) => ({
+		let t = [], n = d, r = (Q.current || []).map((e) => ({
 			...e,
 			cells: [...e.cells]
-		}));
+		})), i = [];
 		if (e.forEach((e) => {
-			let r = n.findIndex((t) => t.rowId == e.rowId), i = V.findIndex((t) => t.columnId == e.columnId);
-			if (r !== -1 && i !== -1) {
-				if (n[r].cells[i] = { ...e.newCell }, pe.current = { ...e.newCell }, t.push(_e(n[r])), p) for (let e in p) {
+			let n = r.findIndex((t) => t.rowId == e.rowId), a = V.findIndex((t) => t.columnId == e.columnId);
+			if (n !== -1 && a !== -1) {
+				if (i.push({
+					rowId: e.rowId,
+					columnId: e.columnId,
+					previousCell: e.previousCell
+				}), r[n].cells[a] = { ...e.newCell }, he.current = { ...e.newCell }, t.push(be(r[n])), p) for (let e in p) {
 					let t = p[e], i = V.findIndex((t) => t.columnId == e);
 					if (i === -1) continue;
 					let a = {
-						...n[r].cells[i],
-						text: (t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(n[r])),
-						value: (t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(n[r])),
-						style: (t == null ? void 0 : t.setCellStyle) && (t == null ? void 0 : t.setCellStyle((t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(n[r])) || n[r]))
+						...r[n].cells[i],
+						text: (t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(r[n])),
+						value: (t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(r[n])),
+						style: (t == null ? void 0 : t.setCellStyle) && (t == null ? void 0 : t.setCellStyle((t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(r[n])) || r[n]))
 					};
-					n[r].cells[i] = a;
+					r[n].cells[i] = a;
 				}
-				h && h(n[r]);
+				h && h(r[n]);
 			}
-		}), Q.current = n, X(he), B(n), Z(), _) try {
+		}), Q.current = r, X(_e), B(r), Z(), I && t.length > 0 && I((e) => ie(e, t, O)), _) try {
 			await _(t);
 		} catch (e) {
-			ie && ie();
+			let t = (Q.current || []).map((e) => ({
+				...e,
+				cells: [...e.cells]
+			}));
+			i.forEach(({ rowId: e, columnId: n, previousCell: r }) => {
+				let i = t.findIndex((t) => t.rowId == e), a = V.findIndex((e) => e.columnId == n);
+				i === -1 || a === -1 || !r || (t[i].cells[a] = { ...r });
+			}), Q.current = t, B(t), Z(), I == null || I(n), oe && oe();
 		}
-	}, xe = i(() => {
+	}, Ce = i(() => {
 		let t = {
 			...v || {},
 			...y || {},
-			...O
+			...D
 		}, n = {};
-		for (let r in t) n[r] = A((n) => /* @__PURE__ */ w(j, {
+		for (let r in t) n[r] = k((n) => /* @__PURE__ */ C(A, {
 			...n,
 			...e,
 			Com: t[r]
 		}));
 		return n;
-	}, [v, y]), Se = (e) => {
+	}, [v, y]), we = (e) => {
 		let t = z == null ? void 0 : z.find((t) => {
 			var n;
 			return (t == null ? void 0 : t.rowId) == (e == null || (n = e.cell) == null ? void 0 : n.rowId);
 		});
-		return /* @__PURE__ */ T("div", {
+		return /* @__PURE__ */ w("div", {
 			onPointerDown: (e) => e.stopPropagation(),
 			children: [
-				(E == null ? void 0 : E.tableActionsSlot) && /* @__PURE__ */ w(E.tableActionsSlot, {
+				(T == null ? void 0 : T.tableActionsSlot) && /* @__PURE__ */ C(T.tableActionsSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				}),
-				(E == null ? void 0 : E.actionPrefixSlot) && /* @__PURE__ */ w(E.actionPrefixSlot, {
+				(T == null ? void 0 : T.actionPrefixSlot) && /* @__PURE__ */ C(T.actionPrefixSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				}),
-				(E == null ? void 0 : E.actionCenterSlot) && /* @__PURE__ */ w(E.actionCenterSlot, {
+				(T == null ? void 0 : T.actionCenterSlot) && /* @__PURE__ */ C(T.actionCenterSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				}),
-				(E == null ? void 0 : E.actionSuffixSlot) && /* @__PURE__ */ w(E.actionSuffixSlot, {
+				(T == null ? void 0 : T.actionSuffixSlot) && /* @__PURE__ */ C(T.actionSuffixSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				})
 			]
 		});
 	};
-	function Ce(e) {
+	function Te(e) {
 		let t = [];
 		function n(e) {
 			for (let r of e) t.push(r), r.children && r.children.length && n(r.children);
 		}
 		return n(e), t;
 	}
-	let we = (e) => {
+	let Ee = (e) => {
 		var t, n, r, i, a, o;
-		let { record: c, rowId: l } = e == null ? void 0 : e.cell, u = (t = Ce(d)) == null ? void 0 : t.filter((e) => {
+		let { record: c, rowId: l } = e == null ? void 0 : e.cell, u = (t = Te(d)) == null ? void 0 : t.filter((e) => {
 			var t;
-			return !(D != null && (t = D.getCheckboxProps) != null && (t = t.call(D, e)) != null && t.disabled);
-		}), f = typeof (D == null ? void 0 : D.getCheckboxProps) == "function" ? D == null || (n = D.getCheckboxProps) == null ? void 0 : n.call(D, c) : {};
-		return /* @__PURE__ */ w(s, {
+			return !(E != null && (t = E.getCheckboxProps) != null && (t = t.call(E, e)) != null && t.disabled);
+		}), f = typeof (E == null ? void 0 : E.getCheckboxProps) == "function" ? E == null || (n = E.getCheckboxProps) == null ? void 0 : n.call(E, c) : {};
+		return /* @__PURE__ */ C(s, {
 			...e == null ? void 0 : e.componentProps,
-			checked: (D == null || (r = D.selectedRowKeys) == null ? void 0 : r.includes(c && c[k] || "")) || !l && (D == null || (i = D.selectedRowKeys) == null ? void 0 : i.length) == (u == null ? void 0 : u.length) && (u == null ? void 0 : u.length) > 0,
-			indeterminate: !l && (D == null || (a = D.selectedRowKeys) == null ? void 0 : a.length) > 0 && (D == null || (o = D.selectedRowKeys) == null ? void 0 : o.length) < (u == null ? void 0 : u.length),
+			checked: (E == null || (r = E.selectedRowKeys) == null ? void 0 : r.includes(c && c[O] || "")) || !l && (E == null || (i = E.selectedRowKeys) == null ? void 0 : i.length) == (u == null ? void 0 : u.length) && (u == null ? void 0 : u.length) > 0,
+			indeterminate: !l && (E == null || (a = E.selectedRowKeys) == null ? void 0 : a.length) > 0 && (E == null || (o = E.selectedRowKeys) == null ? void 0 : o.length) < (u == null ? void 0 : u.length),
 			onChange: (e) => {
 				if (e.target.checked && l) {
-					let e = [...D == null ? void 0 : D.selectedRowKeys, c[k]], t = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[k]));
-					D == null || D.onChange(e, t);
+					let e = [...E == null ? void 0 : E.selectedRowKeys, c[O]], t = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[O]));
+					E == null || E.onChange(e, t);
 				} else if (!e.target.checked && l) {
 					var t, n;
-					let e = D == null || (t = D.selectedRowKeys) == null ? void 0 : t.filter((e) => e != c[k]), r = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[k]));
-					D == null || D.onChange(D == null || (n = D.selectedRowKeys) == null ? void 0 : n.filter((e) => e != c[k]), r);
+					let e = E == null || (t = E.selectedRowKeys) == null ? void 0 : t.filter((e) => e != c[O]), r = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[O]));
+					E == null || E.onChange(E == null || (n = E.selectedRowKeys) == null ? void 0 : n.filter((e) => e != c[O]), r);
 				} else if (e.target.checked && !l) {
-					let e = u == null ? void 0 : u.map((e) => e[k]), t = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[k]));
-					D == null || D.onChange(u == null ? void 0 : u.map((e) => e[k]), t);
-				} else !e.target.checked && !l && (D == null || D.onChange([], []));
+					let e = u == null ? void 0 : u.map((e) => e[O]), t = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[O]));
+					E == null || E.onChange(u == null ? void 0 : u.map((e) => e[O]), t);
+				} else !e.target.checked && !l && (E == null || E.onChange([], []));
 			},
 			...f
 		});
 	};
 	n(() => {
-		if (D) {
+		if (E) {
 			var e;
-			let t = (e = Ce(d)) == null ? void 0 : e.filter((e) => {
+			let t = (e = Te(d)) == null ? void 0 : e.filter((e) => {
 				var t;
-				return !(D != null && (t = D.getCheckboxProps) != null && (t = t.call(D, e)) != null && t.disabled);
-			}), n = t == null ? void 0 : t.filter((e) => H == null ? void 0 : H.includes(e[k]));
-			D == null || D.onChange(H, n);
+				return !(E != null && (t = E.getCheckboxProps) != null && (t = t.call(E, e)) != null && t.disabled);
+			}), n = t == null ? void 0 : t.filter((e) => H == null ? void 0 : H.includes(e[O]));
+			E == null || E.onChange(H, n);
 		}
 	}, [H, d]), n(() => {
-		se([]);
-	}, [F == null ? void 0 : F.pageNum]);
-	let Te = i(() => {
+		le([]);
+	}, [P == null ? void 0 : P.pageNum]);
+	let De = i(() => {
 		let e = {};
-		for (let t in g == null ? void 0 : g.customCellTemplates) e[t] = A(g == null ? void 0 : g.customCellTemplates[t]);
+		for (let t in g == null ? void 0 : g.customCellTemplates) e[t] = k(g == null ? void 0 : g.customCellTemplates[t]);
 		return e;
-	}, [g == null ? void 0 : g.customCellTemplates]), Ee = (e, t) => {
+	}, [g == null ? void 0 : g.customCellTemplates]), Oe = (e, t) => {
 		var n;
 		let r = t == null || (n = t.find((t) => (t == null ? void 0 : t.rowId) == (e == null ? void 0 : e.rowId))) == null || (n = n.cells) == null ? void 0 : n.map((t) => ({
 			columnId: t == null ? void 0 : t.columnId,
@@ -798,51 +832,51 @@ function I(e, t) {
 			className: "custom-highlights-row",
 			borderColor: "transparent"
 		}));
-		q.current = e == null ? void 0 : e.rowId, K(r);
+		q.current = e == null ? void 0 : e.rowId, window.gridHighlightRowId = e == null ? void 0 : e.rowId, K(r);
 	};
-	return /* @__PURE__ */ w(f, {
-		spinning: I,
-		children: /* @__PURE__ */ T("div", {
+	return /* @__PURE__ */ C(f, {
+		spinning: F,
+		children: /* @__PURE__ */ w("div", {
 			ref: J,
-			className: `grid-container ${C}`,
-			style: S,
-			children: [/* @__PURE__ */ w(m, {
-				ref: fe,
+			className: `grid-container ${S}`,
+			style: x,
+			children: [/* @__PURE__ */ C(m, {
+				ref: me,
 				rows: z,
 				columns: V,
-				onCellsChanged: be,
+				onCellsChanged: Se,
 				enableFillHandle: !0,
 				enableRangeSelection: !0,
 				horizontalStickyBreakpoint: 120,
 				...g,
-				highlights: (c = g == null ? void 0 : g.highlights) == null ? de : c,
+				highlights: (c = g == null ? void 0 : g.highlights) == null ? pe : c,
 				onFocusLocationChanging: (e) => {
 					var t, n;
 					let r = (e == null ? void 0 : e.columnId) + (e == null ? void 0 : e.rowId);
-					return window.gridEditId = r, typeof (e == null ? void 0 : e.rowId) == "string" && (e == null || (t = e.rowId) == null ? void 0 : t.indexOf("header-")) > -1 || (g != null && g.isRowHighlights && e != null && e.columnId && Ee(e, z), (n = [
+					return window.gridEditId = r, typeof (e == null ? void 0 : e.rowId) == "string" && (e == null || (t = e.rowId) == null ? void 0 : t.indexOf("header-")) > -1 || (g != null && g.isRowHighlights && e != null && e.columnId && Oe(e, z), (n = [
 						"_$actions",
 						"rowSelection",
 						"ExpandListTemplate"
 					]) != null && n.includes(e == null ? void 0 : e.columnId)) ? !1 : g != null && g.onFocusLocationChanging ? g == null ? void 0 : g.onFocusLocationChanging(e, z) : e;
 				},
 				customCellTemplates: {
-					ExpandListTemplate: A(N),
-					...xe,
-					...Te,
-					...le,
-					_$actions: A(Se),
-					rowSelection: A(we),
-					Number: A(M, e)
+					ExpandListTemplate: k(M),
+					...Ce,
+					...De,
+					...de,
+					_$actions: k(we),
+					rowSelection: k(Ee),
+					Number: k(j, e)
 				}
-			}, (d == null ? void 0 : d.length) == 0 ? 0 : 1), (d == null ? void 0 : d.length) <= 0 && /* @__PURE__ */ w("div", {
+			}, (d == null ? void 0 : d.length) == 0 ? 0 : 1), (d == null ? void 0 : d.length) <= 0 && /* @__PURE__ */ C("div", {
 				className: "grid-container-empty",
-				children: /* @__PURE__ */ w(l, { image: l.PRESENTED_IMAGE_SIMPLE })
+				children: /* @__PURE__ */ C(l, { image: l.PRESENTED_IMAGE_SIMPLE })
 			})]
 		})
 	});
 }
-var re = e(I);
+var ae = e(F);
 //#endregion
-export { re as default };
+export { ae as default };
 
 //# sourceMappingURL=index.js.map