@hzab/edit-table 0.1.13-alpha.0 → 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,19 +72,30 @@ 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);
+			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;
+				for (let e of t) {
+					let t = e.getBoundingClientRect(), i = getComputedStyle(e), a = parseFloat(i.marginTop) || 0, o = parseFloat(i.marginBottom) || 0;
+					n = Math.min(n, t.top - a), r = Math.max(r, t.bottom + 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 = () => t(r == null ? void 0 : r.rowId, i.scrollHeight + a, r == null ? void 0 : r.columnId);
-				o();
-				let s = new ResizeObserver(o);
-				return s.observe(i), () => s.disconnect();
+				let a = n ? D.current : 0, o = new ResizeObserver(() => {
+					Array.from(i.children).forEach((e) => o.observe(e));
+					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();
 			}, [
 				r == null ? void 0 : r.rowId,
 				r == null ? void 0 : r.columnId,
@@ -91,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);
@@ -108,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;
@@ -125,29 +137,29 @@ var O = {
 				return () => clearTimeout(e);
 			}, [p]);
 			let j = () => {
-				let e = C.current;
+				let e = S.current;
 				c(this.getCompatibleCell({
 					...r,
 					text: e,
 					selectedValue: e
 				}), !0);
-			}, M = 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, j());
-			}, [u, v]), /* @__PURE__ */ T("div", {
-				ref: D,
+			}, [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: {
@@ -161,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, A(r);
+							y(r), S.current = r, A(r);
 						},
 						onBlur: (e) => {
-							j(), 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();
@@ -177,46 +189,46 @@ var O = {
 					},
 					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();
+				e && e.focus({ preventScroll: !0 });
 			},
 			...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;
-}, ee = (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;
@@ -239,12 +251,12 @@ 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
@@ -398,13 +410,101 @@ function ne(e) {
 	return n(e), t;
 }
 //#endregion
-//#region src/index.tsx
-function F(e, c) {
-	var u;
-	let { columns: d, dataSource: p, formulaConfig: h, onChange: g, reactGridProps: _ = {}, onEditSubmit: b, headerRowHeight: x = 44, rowHeight: S = 44, reactGridStyle: C, className: E, Slots: D, rowSelection: k, rowKey: P = "id", query: F, loading: I, isExpand: re = !1, getList: L, onRow: R } = e, [z, ie] = o([]), [B, V] = o([]), H = a([]), [U, ae] = o([]), [W, oe] = o([]), [G, K] = o([]), [se, ce] = o([]), [le, ue] = o([]), [de, q] = o([]), J = a(), [Y, fe] = o({}), X = a({}), Z = a(), pe = a(), Q = a(), $ = t(() => {
-		Z.current = void 0;
-		let e = X.current;
-		Object.keys(e).length !== 0 && (X.current = {}, fe((t) => {
+//#region src/common/useDynamicHeight.ts
+var re = (e) => {
+	let { wrapRef: r, rowHeight: i, setRows: s } = e, c = a({}), l = a(), u = a({
+		top: 0,
+		left: 0
+	}), d = a(0), f = a([]), [p, m] = o({}), h = t((e = 500) => {
+		let t = r.current;
+		t && (u.current = {
+			top: t.scrollTop,
+			left: t.scrollLeft
+		}, d.current = Math.max(d.current || 0, Date.now() + e));
+	}, []), g = t(() => {
+		let e = r.current;
+		if (!e) return;
+		let { top: t, left: n } = u.current;
+		requestAnimationFrame(() => {
+			requestAnimationFrame(() => {
+				e.scrollTop !== t && (e.scrollTop = t), e.scrollLeft !== n && (e.scrollLeft = n);
+			});
+		});
+	}, []);
+	n(() => {
+		let e = r.current;
+		if (!e) return;
+		let t = () => {
+			e.querySelectorAll(".rg-hidden-element").forEach((e) => {
+				if (e.__focusScrollPatched) return;
+				e.__focusScrollPatched = !0;
+				let t = e.focus.bind(e);
+				e.focus = (e) => t({
+					preventScroll: !0,
+					...e || {}
+				});
+			});
+		};
+		t();
+		let n = new MutationObserver(t);
+		return n.observe(e, {
+			childList: !0,
+			subtree: !0
+		}), () => n.disconnect();
+	}, []), n(() => {
+		let e = r.current;
+		if (!e || e.__scrollGuard) return;
+		e.__scrollGuard = !0;
+		let t = Object.getOwnPropertyDescriptor(Element.prototype, "scrollTop");
+		Object.defineProperty(e, "scrollTop", {
+			configurable: !0,
+			get() {
+				return t.get.call(e);
+			},
+			set(n) {
+				let r = Number(n) || 0, i = t.get.call(e), a = r - i;
+				a !== 0 && Math.abs(a) <= 3 || (r === 0 && i > 50 && console.warn("[CellEditTable] 检测到程序化滚动回顶部: ", i, "->", r, (/* @__PURE__ */ Error()).stack), t.set.call(e, r));
+			}
+		});
+		let n = e.scrollTo.bind(e);
+		e.scrollTo = (r, i) => {
+			if (typeof r == "object" && r) {
+				if (r.top != null) {
+					let n = t.get.call(e), i = Number(r.top) - n;
+					if (i !== 0 && Math.abs(i) <= 3) return;
+				}
+				return n(r);
+			}
+			if (typeof r == "number" && typeof i == "number") {
+				let n = i - t.get.call(e);
+				if (n !== 0 && Math.abs(n) <= 3) return;
+			}
+			return n(r, i);
+		};
+		let i = e.scrollBy.bind(e);
+		e.scrollBy = (e, t) => {
+			if (typeof e == "object" && e) return e.top != null && Math.abs(Number(e.top)) <= 3 ? void 0 : i(e);
+			if (!(typeof e == "number" && typeof t == "number" && Math.abs(t) <= 3)) return i(e, t);
+		};
+	}, []), n(() => {
+		let e = r.current;
+		if (!e) return;
+		let t = () => {
+			if (Date.now() < d.current && (e.scrollTop === 0 && u.current.top > 50 || e.scrollLeft === 0 && u.current.left > 50)) {
+				e.scrollTop = u.current.top, e.scrollLeft = u.current.left;
+				return;
+			}
+			u.current = {
+				top: e.scrollTop,
+				left: e.scrollLeft
+			};
+		};
+		return e.addEventListener("scroll", t, !0), () => e.removeEventListener("scroll", t, !0);
+	}, []);
+	let _ = t(() => {
+		l.current = void 0;
+		let e = c.current;
+		Object.keys(e).length !== 0 && (c.current = {}, m((t) => {
 			let n = t;
 			for (let r in e) {
 				let i = { ...n[r] || {} }, a = !1;
@@ -416,38 +516,90 @@ function F(e, c) {
 			}
 			return n === t ? t : n;
 		}));
-	}, []), me = t((e, t, n) => {
-		let r = Math.max(Number(t) || 0, S), i = String(e), a = n || "_", o = X.current[i] = X.current[i] || {};
-		o[a] !== r && (o[a] = r, Z.current || (Z.current = requestAnimationFrame($)));
-	}, [S, $]);
-	n(() => () => {
-		Z.current && cancelAnimationFrame(Z.current);
+	}, []), v = t((e, t, n) => {
+		let r = Math.max(Number(t) || 0, i), a = String(e), o = n || "_", s = c.current[a] = c.current[a] || {};
+		s[o] !== r && (s[o] = r, l.current || (l.current = requestAnimationFrame(_)));
+	}, [i, _]);
+	return n(() => () => {
+		l.current && cancelAnimationFrame(l.current);
 	}, []), n(() => {
-		V((e) => {
+		s((e) => {
 			if (!Array.isArray(e) || e.length === 0) return e;
 			let t = !1, n = e.map((e) => {
 				if (typeof (e == null ? void 0 : e.rowId) == "string" && e.rowId.indexOf("header-") === 0) return e;
-				let n = Y[e.rowId], r = n && Object.keys(n).length > 0 ? Math.max(S, ...Object.values(n).map(Number)) : S;
+				let n = p[e.rowId], r = n && Object.keys(n).length > 0 ? Math.max(i, ...Object.values(n).map(Number)) : i;
 				return e.height === r ? e : (t = !0, {
 					...e,
 					height: r
 				});
-			});
-			return t ? n : e;
+			}), r = t ? n : e;
+			return f.current = r, r;
 		});
-	}, [Y, S]), r(c, () => ({ rows: B }));
-	let he = (e, t = 0) => {
+	}, [p, i]), {
+		handleRowHeightChange: v,
+		armScrollProtect: h,
+		restoreScroll: g,
+		SCROLL_RESET_GUARD_MS: 3e3,
+		rowsRef: f,
+		rowHeights: p
+	};
+};
+//#endregion
+//#region src/index.tsx
+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: 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, 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: ge, armScrollProtect: X, restoreScroll: Z, SCROLL_RESET_GUARD_MS: _e, rowsRef: Q, rowHeights: ve } = re({
+		wrapRef: J,
+		rowHeight: b,
+		setRows: B
+	});
+	r(t, () => ({ rows: z }));
+	let ye = (e, t = 0) => {
 		e == null || e.forEach((e) => {
-			e.level = t + 1, e != null && e.children && he(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(() => {
-		he(p), K(p);
-	}, [p]), n(() => {
-		let e = B.map((e) => e.rowId);
-		e != null && e.includes(J.current) || q([]);
-	}, [B]);
-	let ge = (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[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([]), window.gridHighlightRowId = null);
+	}, [z]);
+	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) => {
@@ -458,54 +610,54 @@ function F(e, c) {
 		};
 	};
 	n(() => {
-		if (Array.isArray(d) && (d == null ? void 0 : d.length) > 0) {
-			re && d.unshift({
+		if (Array.isArray(u) && (u == null ? void 0 : u.length) > 0) {
+			ae && u.unshift({
 				type: "ExpandListTemplate",
 				width: 14,
 				key: "ExpandListTemplate",
 				nonEditable: !0,
-				style: (k == null ? void 0 : k.style) || { background: "rgba(128, 128, 128, 0.1)" }
-			}), k && d.unshift({
+				style: (E == null ? void 0 : E.style) || { background: "rgba(128, 128, 128, 0.1)" }
+			}), E && u.unshift({
 				type: "rowSelection",
 				nonEditable: !0,
-				width: (k == null ? void 0 : k.width) || 30,
+				width: (E == null ? void 0 : E.width) || 30,
 				key: "rowSelection",
-				style: (k == null ? void 0 : k.style) || {
+				style: (E == null ? void 0 : E.style) || {
 					background: "rgba(128, 128, 128, 0.1)",
 					display: "flex",
 					justifyContent: "center"
 				}
-			}), ie(te(d, x));
-			let e = ne(d);
-			ae(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) || ""
 			})));
 		}
-	}, [d, k]);
-	let _e = {}, ve = (e) => {
+	}, [u, E]);
+	let $ = {}, xe = (e) => {
 		e == null || e.forEach((e) => {
 			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;
-				_e[e == null ? void 0 : e.dataIndex] = A(t);
+				$[e == null ? void 0 : e.dataIndex] = k(t);
 			}
-			e != null && e.children && ve(e == null ? void 0 : e.children);
+			e != null && e.children && xe(e == null ? void 0 : e.children);
 		});
 	};
 	n(() => {
-		ve(d), ue(_e);
-	}, [d]), n(() => {
-		let e = U == null ? void 0 : U.map((e) => e == null ? void 0 : e.columnId), t = G == null ? void 0 : G.map((t, n) => {
-			let r = Y[t[P]], i = r && Object.keys(r).length > 0 ? Math.max(S, ...Object.values(r).map(Number)) : S;
+		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 = ve[t[O]], i = r && Object.keys(r).length > 0 ? Math.max(b, ...Object.values(r).map(Number)) : b;
 			return {
-				rowId: t[P],
+				rowId: t[O],
 				height: i,
 				cells: e == null ? void 0 : e.map((e, r) => {
 					var i;
-					let a = {}, o = U[r], s = t[e], c = (i = o == null ? void 0 : o.type) == null ? "text" : i;
-					if (h) {
-						for (let n in h) if (n == e) {
-							let e = h[n];
+					let a = {}, o = V[r], s = t[e], c = (i = o == null ? void 0 : o.type) == null ? "text" : i;
+					if (p) {
+						for (let n in p) if (n == e) {
+							let e = p[n];
 							a = {
 								text: (e == null ? void 0 : e.setCellData) && (e == null ? void 0 : e.setCellData(t)),
 								value: (e == null ? void 0 : e.setCellData) && (e == null ? void 0 : e.setCellData(t)),
@@ -516,7 +668,7 @@ function F(e, c) {
 					return {
 						...o,
 						record: t,
-						rowId: t[P] || (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 || ""),
@@ -526,153 +678,153 @@ function F(e, c) {
 							display: "flex",
 							justifyContent: "center"
 						} : {},
-						...R && R(t, n, r) || {},
+						...L && L(t, n, r) || {},
 						...(o == null ? void 0 : o.onCell) && (o == null ? void 0 : o.onCell(t, n, r)) || {},
 						...(o == null ? void 0 : o.cellProps) || {},
-						setNewDataSource: K,
-						setExpandKeys: ce,
-						rowKey: P,
-						expandKeys: se,
-						Slots: D,
-						onRowHeightChange: me,
+						setNewDataSource: W,
+						setExpandKeys: ue,
+						rowKey: O,
+						expandKeys: G,
+						Slots: T,
+						onRowHeightChange: ge,
 						...a
 					};
 				})
 			};
-		}), n = [...z, ...t];
-		V(n);
+		}), n = [...R, ...t];
+		Q.current = n, X(), B(n), Z();
 	}, [
-		G,
 		U,
-		z
-	]), n(() => {
-		if (I) {
-			var e;
-			let t = B == null ? void 0 : B.find((e) => {
-				var t;
-				return (e == null ? void 0 : e.rowId) == ((t = Q.current) == null ? void 0 : t.rowId);
-			});
-			t == null || (e = t.cells) == null || e.find((e) => {
-				var t;
-				return (e == null ? void 0 : e.columnId) == ((t = Q.current) == null ? void 0 : t.columnId);
-			}), { ...Q.current }, H.current = B;
-		}
-	}, [I, B]);
-	let ye = async (e) => {
-		let t = [];
+		V,
+		R
+	]);
+	let Se = async (e) => {
 		if (!Array.isArray(e) || e.length === 0) return;
-		let n = !1;
-		if ((e == null ? void 0 : e.length) > 1 && (n = !0), V((r) => (e.forEach(async (e) => {
-			let i = r.findIndex((t) => t.rowId == e.rowId), a = U.findIndex((t) => t.columnId == e.columnId);
-			if (r[i].cells[a] = { ...e.newCell }, Q.current = { ...e.newCell }, t.push(ge(r[i])), h) for (let e in h) {
-				let t = h[e], n = U.findIndex((t) => t.columnId == e), a = {
-					...r[i].cells[n],
-					text: (t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(r[i])),
-					value: (t == null ? void 0 : t.setCellData) && (t == null ? void 0 : t.setCellData(r[i])),
-					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[i])) || r[i]))
-				};
-				r[i].cells[n] = a;
-			}
-			if (b && !n) try {
-				await b(t);
-			} catch (e) {
-				L && L();
+		let t = [], n = d, r = (Q.current || []).map((e) => ({
+			...e,
+			cells: [...e.cells]
+		})), i = [];
+		if (e.forEach((e) => {
+			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 = {
+						...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]))
+					};
+					r[n].cells[i] = a;
+				}
+				h && h(r[n]);
 			}
-			g && g(r[i]);
-		}), [...r])), n) try {
-			b && await b(t);
+		}), Q.current = r, X(_e), B(r), Z(), I && t.length > 0 && I((e) => ie(e, t, O)), _) try {
+			await _(t);
 		} catch (e) {
-			L && L();
+			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();
 		}
-	}, be = 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]), xe = (e) => {
-		let t = B == null ? void 0 : B.find((t) => {
+	}, [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: [
-				(D == null ? void 0 : D.tableActionsSlot) && /* @__PURE__ */ w(D.tableActionsSlot, {
+				(T == null ? void 0 : T.tableActionsSlot) && /* @__PURE__ */ C(T.tableActionsSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				}),
-				(D == null ? void 0 : D.actionPrefixSlot) && /* @__PURE__ */ w(D.actionPrefixSlot, {
+				(T == null ? void 0 : T.actionPrefixSlot) && /* @__PURE__ */ C(T.actionPrefixSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				}),
-				(D == null ? void 0 : D.actionCenterSlot) && /* @__PURE__ */ w(D.actionCenterSlot, {
+				(T == null ? void 0 : T.actionCenterSlot) && /* @__PURE__ */ C(T.actionCenterSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				}),
-				(D == null ? void 0 : D.actionSuffixSlot) && /* @__PURE__ */ w(D.actionSuffixSlot, {
+				(T == null ? void 0 : T.actionSuffixSlot) && /* @__PURE__ */ C(T.actionSuffixSlot, {
 					...e == null ? void 0 : e.cell,
 					rowData: t
 				})
 			]
 		});
 	};
-	function Se(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 Ce = (e) => {
+	let Ee = (e) => {
 		var t, n, r, i, a, o;
-		let { record: c, rowId: l } = e == null ? void 0 : e.cell, u = (t = Se(p)) == 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 !(k != null && (t = k.getCheckboxProps) != null && (t = t.call(k, e)) != null && t.disabled);
-		}), d = typeof (k == null ? void 0 : k.getCheckboxProps) == "function" ? k == null || (n = k.getCheckboxProps) == null ? void 0 : n.call(k, 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: (k == null || (r = k.selectedRowKeys) == null ? void 0 : r.includes(c && c[P] || "")) || !l && (k == null || (i = k.selectedRowKeys) == null ? void 0 : i.length) == (u == null ? void 0 : u.length) && (u == null ? void 0 : u.length) > 0,
-			indeterminate: !l && (k == null || (a = k.selectedRowKeys) == null ? void 0 : a.length) > 0 && (k == null || (o = k.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 = [...k == null ? void 0 : k.selectedRowKeys, c[P]], t = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[P]));
-					k == null || k.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 = k == null || (t = k.selectedRowKeys) == null ? void 0 : t.filter((e) => e != c[P]), r = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[P]));
-					k == null || k.onChange(k == null || (n = k.selectedRowKeys) == null ? void 0 : n.filter((e) => e != c[P]), 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[P]), t = u == null ? void 0 : u.filter((t) => e == null ? void 0 : e.includes(t[P]));
-					k == null || k.onChange(u == null ? void 0 : u.map((e) => e[P]), t);
-				} else !e.target.checked && !l && (k == null || k.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([], []));
 			},
-			...d
+			...f
 		});
 	};
 	n(() => {
-		if (k) {
+		if (E) {
 			var e;
-			let t = (e = Se(p)) == null ? void 0 : e.filter((e) => {
+			let t = (e = Te(d)) == null ? void 0 : e.filter((e) => {
 				var t;
-				return !(k != null && (t = k.getCheckboxProps) != null && (t = t.call(k, e)) != null && t.disabled);
-			}), n = t == null ? void 0 : t.filter((e) => W == null ? void 0 : W.includes(e[P]));
-			k == null || k.onChange(W, 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);
 		}
-	}, [W, p]), n(() => {
-		oe([]);
-	}, [F == null ? void 0 : F.pageNum]);
-	let we = i(() => {
+	}, [H, d]), n(() => {
+		le([]);
+	}, [P == null ? void 0 : P.pageNum]);
+	let De = i(() => {
 		let e = {};
-		for (let t in _ == null ? void 0 : _.customCellTemplates) e[t] = A(_ == null ? void 0 : _.customCellTemplates[t]);
+		for (let t in g == null ? void 0 : g.customCellTemplates) e[t] = k(g == null ? void 0 : g.customCellTemplates[t]);
 		return e;
-	}, [_ == null ? void 0 : _.customCellTemplates]), Te = (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,
@@ -680,50 +832,51 @@ function F(e, c) {
 			className: "custom-highlights-row",
 			borderColor: "transparent"
 		}));
-		J.current = e == null ? void 0 : e.rowId, q(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", {
-			className: `grid-container ${E}`,
-			style: C,
-			children: [/* @__PURE__ */ w(m, {
-				ref: pe,
-				rows: I ? H.current : B,
-				columns: U,
-				onCellsChanged: ye,
+	return /* @__PURE__ */ C(f, {
+		spinning: F,
+		children: /* @__PURE__ */ w("div", {
+			ref: J,
+			className: `grid-container ${S}`,
+			style: x,
+			children: [/* @__PURE__ */ C(m, {
+				ref: me,
+				rows: z,
+				columns: V,
+				onCellsChanged: Se,
 				enableFillHandle: !0,
 				enableRangeSelection: !0,
 				horizontalStickyBreakpoint: 120,
-				..._,
-				highlights: (u = _ == null ? void 0 : _.highlights) == null ? de : u,
+				...g,
+				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 || (_ != null && _.isRowHighlights && e != null && e.columnId && Te(e, B), (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 : _ != null && _.onFocusLocationChanging ? _ == null ? void 0 : _.onFocusLocationChanging(e, B) : e;
+					]) != 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(ee),
-					...be,
-					...we,
-					...le,
-					_$actions: A(xe),
-					rowSelection: A(Ce),
-					Number: A(M, e)
+					ExpandListTemplate: k(M),
+					...Ce,
+					...De,
+					...de,
+					_$actions: k(we),
+					rowSelection: k(Ee),
+					Number: k(j, e)
 				}
-			}, (p == null ? void 0 : p.length) == 0 ? 0 : 1), (p == null ? void 0 : p.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 I = e(F);
+var ae = e(F);
 //#endregion
-export { I as default };
+export { ae as default };
 
 //# sourceMappingURL=index.js.map