@oliasoft-open-source/react-ui-library 5.8.8-beta-1 → 5.8.8

package/dist/index.js

@@ -3632,25 +3632,24 @@ const Cell = ({ cell: e, isHeader: t, columnHeaderAlignment: n, columnAlignment:
 			})
 		}), document.body)]
 	}) : t({});
-}, TableVirtualScrollWrapper = ({ table: e, theadRef: t, children: n }) => {
-	let r = useRef(null), i = useVirtualizer({
+}, TableVirtualScrollWrapper = ({ table: e, children: t }) => {
+	let n = useRef(null), r = useVirtualizer({
 		count: e?.rowCount ?? e.rows?.length ?? 0,
-		getScrollElement: () => r.current,
+		getScrollElement: () => n.current,
 		estimateSize: () => 31,
 		overscan: 10
 	});
 	return /* @__PURE__ */ jsx("div", {
 		id: "scrollWrapper",
 		className: cx(table_module_default.scroll, table_module_default.virtualScroll),
-		ref: r,
-		children: n({
-			virtualizer: i,
+		ref: n,
+		children: t({
+			virtualizer: r,
 			tableStyle: (() => {
-				let e = t.current?.clientHeight ?? 0, n = i.getTotalSize() + e, r = i.getVirtualItems(), a = r.length > 0 ? r[0].start : 0, o = r.length > 0 ? i.getTotalSize() - r[r.length - 1].end : 0;
+				let e = r.getVirtualItems(), t = e.length > 0 ? e[0].start : 0, n = e.length > 0 ? r.getTotalSize() - e[e.length - 1].end : 0;
 				return {
-					"--virtualPaddingTop": a + "px",
-					"--virtualPaddingBottom": o + "px",
-					height: n
+					"--virtualPaddingTop": t + "px",
+					"--virtualPaddingBottom": n + "px"
 				};
 			})()
 		})
@@ -3676,32 +3675,31 @@ var ScrollToActiveRow = ({ activeIndex: e, triggerScrollToActiveRow: t, isVirtua
 	n,
 	r
 ]), null);
-const TableScrollWrapper = ({ table: e, theadRef: t, children: n }) => {
-	let { infiniteScroll: r = !1, triggerScrollToActiveRow: i = !1, rows: a } = e, o = useMemo(() => typeof e.activeRowIndex == "number" ? e.activeRowIndex : Array.isArray(a) && a.length ? a.findIndex((e) => e && e.active) : -1, [a, e.activeRowIndex]);
-	return r ? /* @__PURE__ */ jsx(TableVirtualScrollWrapper, {
+const TableScrollWrapper = ({ table: e, children: t }) => {
+	let { infiniteScroll: n = !1, triggerScrollToActiveRow: r = !1, rows: i } = e, a = useMemo(() => typeof e.activeRowIndex == "number" ? e.activeRowIndex : Array.isArray(i) && i.length ? i.findIndex((e) => e && e.active) : -1, [i, e.activeRowIndex]);
+	return n ? /* @__PURE__ */ jsx(TableVirtualScrollWrapper, {
 		table: e,
-		theadRef: t,
-		children: ({ virtualizer: e, tableStyle: t }) => /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(ScrollToActiveRow, {
+		children: ({ virtualizer: e, tableStyle: n }) => /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(ScrollToActiveRow, {
 			isVirtualized: !0,
 			virtualizer: e,
-			activeIndex: o,
-			triggerScrollToActiveRow: i
-		}), n({
+			activeIndex: a,
+			triggerScrollToActiveRow: r
+		}), t({
 			virtualizer: e,
-			tableStyle: t
+			tableStyle: n
 		})] })
 	}) : /* @__PURE__ */ jsxs("div", {
 		id: "scrollWrapper",
 		className: table_module_default.scroll,
 		children: [/* @__PURE__ */ jsx(ScrollToActiveRow, {
 			isVirtualized: !1,
-			activeIndex: o,
-			triggerScrollToActiveRow: i
-		}), n({})]
+			activeIndex: a,
+			triggerScrollToActiveRow: r
+		}), t({})]
 	});
 }, Table = (e) => {
-	let { onListReorder: t = () => {}, canListReorder: n = () => !0, beforeRenderRow: r, table: i } = e, { columnWidths: a, footer: o, name: s, rows: c = [], actions: l, actionsRight: u, columnHeaderAlignments: d, columnAlignment: f, striped: m = !0, testId: h, draggable: _, defaultEmptyRow: v = null, onAddRow: y = null, bordered: b = !0, maxHeight: x, fixedWidth: S } = i, C = useRef(null), w = useRef(null), T = get(e, "table.headers", []), E = getColumnCount(c, T), D = hasRowActions(c, T), O = E + (D ? 1 : 0), k = o ? o?.pagination?.rowsPerPage?.value === 0 || Number(o?.pagination?.selectedPage) >= Number(o?.pagination?.rowCount) / Number(o?.pagination?.rowsPerPage?.value) : !0, A = v?.cells?.length && y && k, j = {
-		cells: A ? v.cells.map((e, t) => e?.type === "Input" ? {
+	let { onListReorder: t = () => {}, canListReorder: n = () => !0, beforeRenderRow: r, table: i } = e, { columnWidths: a, footer: o, name: s, rows: c = [], actions: l, actionsRight: u, columnHeaderAlignments: d, columnAlignment: f, striped: m = !0, testId: h, draggable: _, defaultEmptyRow: v = null, onAddRow: y = null, bordered: b = !0, maxHeight: x, fixedWidth: S } = i, C = useRef(null), w = get(e, "table.headers", []), T = getColumnCount(c, w), E = hasRowActions(c, w), D = T + (E ? 1 : 0), O = o ? o?.pagination?.rowsPerPage?.value === 0 || Number(o?.pagination?.selectedPage) >= Number(o?.pagination?.rowCount) / Number(o?.pagination?.rowsPerPage?.value) : !0, k = v?.cells?.length && y && O, A = {
+		cells: k ? v.cells.map((e, t) => e?.type === "Input" ? {
 			...e,
 			onChange: (e) => {
 				let n = e?.target?.value, r = {
@@ -3718,12 +3716,12 @@ const TableScrollWrapper = ({ table: e, theadRef: t, children: n }) => {
 			disabled: !0
 		}) : null,
 		testId: h ? `${h}-last-empty-row` : void 0
-	}, M = A ? c.concat(j) : c, N = {
+	}, j = k ? c.concat(A) : c, M = {
 		...i,
-		rows: M
-	}, P = cx(table_module_default.wrapper, b ? table_module_default.bordered : "");
+		rows: j
+	}, N = cx(table_module_default.wrapper, b ? table_module_default.bordered : "");
 	return /* @__PURE__ */ jsxs("div", {
-		className: P,
+		className: N,
 		style: {
 			maxHeight: x,
 			width: S,
@@ -3737,56 +3735,52 @@ const TableScrollWrapper = ({ table: e, theadRef: t, children: n }) => {
 				testId: h && `${h}-title`
 			}),
 			/* @__PURE__ */ jsx(TableDragWrapper, {
-				colSpan: O,
+				colSpan: D,
 				columnAlignment: f,
-				columnCount: E,
+				columnCount: T,
 				draggable: _,
 				onListReorder: t,
-				rowActions: D,
-				rows: M,
-				tbodyRef: w,
+				rowActions: E,
+				rows: j,
+				tbodyRef: C,
 				canListReorder: n,
 				children: ({ dropDisabled: e }) => /* @__PURE__ */ jsx(TableScrollWrapper, {
-					table: N,
-					theadRef: C,
+					table: M,
 					children: ({ virtualizer: t, tableStyle: n }) => /* @__PURE__ */ jsxs("table", {
 						className: cx(table_module_default.table, m ? table_module_default.striped : ""),
 						"data-testid": h,
 						style: n,
-						children: [/* @__PURE__ */ jsx("thead", {
+						children: [/* @__PURE__ */ jsx("thead", { children: w.map((e, t) => /* @__PURE__ */ jsx(Row$1, {
+							rowIndex: t,
+							isHeader: !0,
+							row: e,
+							columnCount: T,
+							columnWidths: a,
+							colSpan: D,
+							hasRowActions: E,
+							columnAlignment: f,
+							columnHeaderAlignments: d,
+							draggableTable: _
+						}, `0_${t}`)) }), /* @__PURE__ */ jsx("tbody", {
 							ref: C,
-							children: T.map((e, t) => /* @__PURE__ */ jsx(Row$1, {
-								rowIndex: t,
-								isHeader: !0,
-								row: e,
-								columnCount: E,
-								columnWidths: a,
-								colSpan: O,
-								hasRowActions: D,
-								columnAlignment: f,
-								columnHeaderAlignments: d,
-								draggableTable: _
-							}, `0_${t}`))
-						}), /* @__PURE__ */ jsx("tbody", {
-							ref: w,
 							children: t ? t.getVirtualItems().map((t) => {
-								let n = t.index, i = M[n], o = r ? r({
+								let n = t.index, i = j[n], o = r ? r({
 									row: i,
 									rowIndex: n
 								}) : i;
 								return /* @__PURE__ */ jsx(Row$1, {
 									rowIndex: n,
 									row: o,
-									columnCount: E,
+									columnCount: T,
 									columnWidths: a,
-									colSpan: O,
-									hasRowActions: D,
+									colSpan: D,
+									hasRowActions: E,
 									columnAlignment: f,
 									draggableTable: _,
 									height: t.size,
 									dropDisabled: e
 								}, `1_${n}`);
-							}) : M.map((t, n) => {
+							}) : j.map((t, n) => {
 								let i = r ? r({
 									row: t,
 									rowIndex: n
@@ -3794,10 +3788,10 @@ const TableScrollWrapper = ({ table: e, theadRef: t, children: n }) => {
 								return /* @__PURE__ */ jsx(Row$1, {
 									rowIndex: n,
 									row: i,
-									columnCount: E,
+									columnCount: T,
 									columnWidths: a,
-									colSpan: O,
-									hasRowActions: D,
+									colSpan: D,
+									hasRowActions: E,
 									columnAlignment: f,
 									draggableTable: _,
 									dropDisabled: e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/react-ui-library",
-  "version": "5.8.8-beta-1",
+  "version": "5.8.8",
   "description": "Reusable UI components for React projects",
   "homepage": "https://oliasoft-open-source.gitlab.io/react-ui-library",
   "bugs": {