@oliasoft-open-source/react-ui-library 5.11.7-beta-6 → 5.11.7-beta-8

package/dist/index.d.ts

@@ -2211,8 +2211,8 @@ declare type TUpdateTableImportExportState = (value: ITableImportExportState | (
 
 export declare interface TValidationRule {
     fieldName: string;
-    defaultUnit: string;
-    validUnits: string[];
+    defaultUnit?: string;
+    validUnits?: string[];
     optionalColumn?: boolean;
     validator?: (value: string) => string | boolean | undefined | null;
     fieldNameValidator?: (params: {

package/dist/index.js

@@ -3916,17 +3916,20 @@ const TableScrollWrapper = ({ table: e, children: t }) => {
 		isValid: s
 	};
 }, Table$1 = ({ validationRules: e, parsedResult: t, updateState: n, testId: r }) => {
-	let i = useMemo(() => t.fields.map((e) => ({ value: e })), [t.fields]), [a, s] = useState(20), [l, u] = useState(1), f = useRef([]), h = (l - 1) * a, g = a === 0 ? t.rows.length : h + a, [_, v] = useState([]), y = useCallback((r, a) => (!f.current.length && t.rows.length && (f.current = t.rows[0].map((e) => isNumericLike(e) ? "NumberInput" : "Input")), {
-		cells: r.map((r, o) => {
-			let { columnMessage: s = {}, validator: c = () => null } = e?.[o] ?? {}, l = i?.[o]?.value, u = `${`Row ${a + 1}`} → ${l}:`, d = c(r), p = t?.errors?.find((e) => e.startsWith(u)) ?? null, m = d || p || null;
+	let i = useMemo(() => t.fields.map((e) => ({ value: e })), [t.fields]), [a, s] = useState(20), [l, u] = useState(1), f = useRef([]), h = (l - 1) * a, g = a === 0 ? t.rows.length : h + a, [_, v] = useState([]), y = useMemo(() => {
+		let n = e.filter((e) => !e.optionalColumn);
+		return t.fields.length === n.length ? n : e;
+	}, [e, t.fields.length]), b = useCallback((e, r) => (!f.current.length && t.rows.length && (f.current = t.rows[0].map((e) => isNumericLike(e) ? "NumberInput" : "Input")), {
+		cells: e.map((e, a) => {
+			let { columnMessage: o = {}, validator: s = () => null } = y?.[a] ?? {}, c = i?.[a]?.value, l = `${`Row ${r + 1}`} → ${c}:`, u = s(e), d = t?.errors?.find((e) => e.startsWith(l)) ?? null, p = u || d || null;
 			return {
-				name: l,
-				value: r,
-				type: f.current[o] ?? "Input",
+				name: c,
+				value: e,
+				type: f.current[a] ?? "Input",
 				disableValidationOnFocus: !0,
-				error: m,
-				validationCallback: (e, r) => {
-					let i = `Row ${a + 1}`, { updatedErrors: o, isValid: s } = getUpdatedErrors(t.errors, i, e, r);
+				error: p,
+				validationCallback: (e, i) => {
+					let a = `Row ${r + 1}`, { updatedErrors: o, isValid: s } = getUpdatedErrors(t.errors, a, e, i);
 					n({ parsedResult: {
 						...t,
 						errors: o,
@@ -3934,7 +3937,7 @@ const TableScrollWrapper = ({ table: e, children: t }) => {
 					} });
 				},
 				onChange: (e) => {
-					let { value: r } = e?.target ?? {}, i = `Row ${a + 1}`, s = c(r), { updatedErrors: u, isValid: d } = getUpdatedErrors(t.errors, i, l, s), f = t.rows.map((e, t) => t === a ? e.map((e, t) => t === o ? r : e) : e);
+					let { value: i } = e?.target ?? {}, o = `Row ${r + 1}`, l = s(i), { updatedErrors: u, isValid: d } = getUpdatedErrors(t.errors, o, c, l), f = t.rows.map((e, t) => t === r ? e.map((e, t) => t === a ? i : e) : e);
 					n({ parsedResult: {
 						...t,
 						rows: f,
@@ -3942,17 +3945,17 @@ const TableScrollWrapper = ({ table: e, children: t }) => {
 						isValid: d
 					} }), v((e) => {
 						let t = [...e];
-						return t[a] = y(f[a], a), t;
+						return t[r] = b(f[r], r), t;
 					});
 				},
-				...s
+				...o
 			};
 		}),
 		actions: [{
 			label: "Delete",
 			icon: "minus",
 			onClick: () => {
-				let e = t.rows.filter((e, t) => t !== a);
+				let e = t.rows.filter((e, t) => t !== r);
 				n({ parsedResult: {
 					...t,
 					rows: e
@@ -3966,7 +3969,7 @@ const TableScrollWrapper = ({ table: e, children: t }) => {
 		n
 	]);
 	useEffect(() => {
-		v(t.rows.map((e, t) => y(e, t)));
+		v(t.rows.map((e, t) => b(e, t)));
 	}, [
 		t.rows.length,
 		i,
@@ -3974,24 +3977,24 @@ const TableScrollWrapper = ({ table: e, children: t }) => {
 		t.errors,
 		t.isValid
 	]);
-	let b = useMemo(() => t.fields.map((r, a) => {
-		let o = e?.[a], s = Array.isArray(o?.validUnits) ? o.validUnits : [], c = s?.some((e) => toLower(e) === placeholder$1);
-		if (!s.length || c) return {};
-		let l = t?.units?.[a], u = toLower(l), d = s?.some((e) => toLower(e) === u) ? l : o?.defaultUnit ?? "";
+	let x = useMemo(() => t.fields.map((e, r) => {
+		let a = y?.[r], o = Array.isArray(a?.validUnits) ? a.validUnits : [], s = o?.some((e) => toLower(e) === placeholder$1);
+		if (!o.length || s) return {};
+		let c = t?.units?.[r], l = toLower(c), u = o?.some((e) => toLower(e) === l) ? c : a?.defaultUnit ?? "";
 		return {
-			key: i?.[a]?.value,
-			value: d,
+			key: i?.[r]?.value,
+			value: u,
 			type: "Select",
-			disabled: !s.length || !d,
-			options: s.map((e) => ({
+			disabled: !o.length || !u,
+			options: o.map((e) => ({
 				label: e,
 				value: e
 			})),
 			onChange: (e) => {
-				let { value: r } = e?.target ?? {}, i = t.units.map((e, t) => t === a ? r : e);
+				let { value: i } = e?.target ?? {}, a = t.units.map((e, t) => t === r ? i : e);
 				n({ parsedResult: {
 					...t,
-					units: i
+					units: a
 				} });
 			}
 		};
@@ -4000,30 +4003,30 @@ const TableScrollWrapper = ({ table: e, children: t }) => {
 		e,
 		i,
 		n
-	]), x = useMemo(() => b.some((e) => !isEmpty(e)), [b]), S = useMemo(() => [{
+	]), S = useMemo(() => x.some((e) => !isEmpty(e)), [x]), C = useMemo(() => [{
 		cells: i,
 		actions: [{}]
-	}, ...x ? [{ cells: b }] : []], [
+	}, ...S ? [{ cells: x }] : []], [
 		i,
-		x,
-		b
-	]), C = useMemo(() => _.slice(h, g), [
+		S,
+		x
+	]), w = useMemo(() => _.slice(h, g), [
 		_,
 		h,
 		g
-	]), w = useCallback(({ rowIndex: e }) => {
+	]), T = useCallback(({ rowIndex: e }) => {
 		let n = h + e, r = t.rows[n];
-		return r ? y(r, n) : {
+		return r ? b(r, n) : {
 			cells: [],
 			actions: []
 		};
 	}, [
 		t.rows,
-		y,
+		b,
 		h
 	]);
 	return /* @__PURE__ */ jsx(Table, {
-		beforeRenderRow: w,
+		beforeRenderRow: T,
 		onListReorder: ({ from: e, to: r }) => {
 			let i = [...t.rows], [a] = i.splice(e, 1);
 			i.splice(r, 0, a), n({ parsedResult: {
@@ -4037,12 +4040,12 @@ const TableScrollWrapper = ({ table: e, children: t }) => {
 		table: {
 			testId: `${r}-paste-with-review-modal-table`,
 			draggable: !0,
-			headers: S,
-			rows: Array.from({ length: C?.length || 0 }, () => ({
+			headers: C,
+			rows: Array.from({ length: w?.length || 0 }, () => ({
 				cells: [],
 				actions: []
 			})),
-			rowCount: C?.length,
+			rowCount: w?.length,
 			infiniteScroll: !0,
 			footer: { pagination: {
 				rowCount: t.rows.length,
@@ -4202,7 +4205,7 @@ var isValidLength = (e, t, n) => e >= t - n, isNonPlaceholderUnit = (e) => !!e &
 		t.forEach((r, c) => {
 			let l = n[c];
 			if (!l || l?.optionalColumn) return;
-			let u = l.unitsValidator ?? defaultUnitsValidator, d = i?.[c];
+			let u = l.unitsValidator ?? defaultUnitsValidator, d = i?.[c] ?? [];
 			u({
 				value: r,
 				defaultAllowedValues: d,

package/package.json

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