@oliasoft-open-source/react-ui-library 5.11.7-beta-5 → 5.11.7-beta-7

package/dist/index.js

@@ -2741,7 +2741,7 @@ const useCustomSelectLogic = ({ state: e, dispatch: t, options: n, setTriggerFoc
 		layerFocus: initialLayerFocus(e, C ?? 0),
 		triggerFocus: initialTriggerFocus,
 		isLayerOpen: !1
-	})), { getTriggerWidth: F, onKeyEvent: I, clearAllIsFocused: L, triggerProps: R, onClickTrigger: z, onChangeSearch: B, onClickDeselectOption: V, onClickClearAll: H, renderLayer: U, layerProps: W, closeLayer: G, onSelectOption: K, getLayerWidth: q, triggerBounds: zd } = useCustomSelectLogic({
+	})), { getTriggerWidth: F, onKeyEvent: I, clearAllIsFocused: L, triggerProps: R, onClickTrigger: z, onChangeSearch: B, onClickDeselectOption: V, onClickClearAll: H, renderLayer: U, layerProps: W, closeLayer: G, onSelectOption: K, getLayerWidth: q, triggerBounds: Rd } = useCustomSelectLogic({
 		...e,
 		state: N,
 		dispatch: P,
@@ -2809,7 +2809,7 @@ const useCustomSelectLogic = ({ state: e, dispatch: t, options: n, setTriggerFoc
 					closeLayer: () => {
 						b && G();
 					},
-					width: q(zd),
+					width: q(Rd),
 					small: d,
 					focusedOptionIndex: N.layerFocus.current,
 					firstSelectedOptionIndex: C ?? 0,
@@ -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,
@@ -4231,15 +4234,12 @@ var isValidLength = (e, t, n) => e >= t - n, isNonPlaceholderUnit = (e) => !!e &
 			})}`);
 		});
 	}), r;
-}, resolveEffectiveRules = (e, t) => {
-	let n = e.filter((e) => !e.optionalColumn);
-	return t === n.length ? n : (e.length, e);
 };
 const validate = (e, t, n, r, i, a, o) => {
-	let s = n.reduce((e, t) => Math.max(e, t.length), 0), c = Math.max(e.length, t.length, s), l = resolveEffectiveRules(r, c), u = validateColumnLength(e, t, n, l, i, a, o);
-	return u.length === 0 && (u = u.concat(validateHeadings(e, t, l, i, a, o), validateValues(n, l, o))), {
-		isValid: u.length === 0,
-		errors: u
+	let s = validateColumnLength(e, t, n, r, i, a, o);
+	return s.length === 0 && (s = s.concat(validateHeadings(e, t, r, i, a, o), validateValues(n, r, o))), {
+		isValid: s.length === 0,
+		errors: s
 	};
 }, hasHeaders = (e, t, n) => {
 	let r = (e) => e.replace(/,/g, "."), i = e[0]?.some((e) => isNaN(Number(r(e)))) ?? !1, a = e[1]?.some((e) => isNaN(Number(r(e)))) ?? !1, o = e[0]?.some((e) => t.includes(e)) ?? !1, s = e[0]?.some((e) => n.includes(e)) ?? !1, c = e[1]?.some((e) => n.includes(e)) ?? !1, l = e[0]?.some((e) => !isNaN(Number(r(e)))) ?? !1, u = e[1]?.some((e) => !isNaN(Number(r(e)))) ?? !1;
@@ -6739,7 +6739,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 	} : {
 		value: G,
 		unit: U
-	}), zd = k || K?.value === void 0, [J, Bd] = useState(w ? PredefinedOptionsMenuState.PREDEFINED : PredefinedOptionsMenuState.CUSTOM), Vd = !!(O || n), Y = C && C.find((e) => {
+	}), Rd = k || K?.value === void 0, [J, zd] = useState(w ? PredefinedOptionsMenuState.PREDEFINED : PredefinedOptionsMenuState.CUSTOM), Bd = !!(O || n), Y = C && C.find((e) => {
 		if (!e?.value) return;
 		if (E) return E === e.valueKey;
 		let t = isValueWithUnit(e.value) ? getUnit(e.value) : "", { value: n = l } = convertUnit({
@@ -6748,7 +6748,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 			toUnit: t
 		});
 		return withUnit(n, t) === e.value;
-	}), Hd = () => {
+	}), Vd = () => {
 		let e = l ?? "", t = K.unit;
 		if (checkConversion({
 			value: e,
@@ -6762,7 +6762,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 				return null;
 			}
 		} else return getAltUnitsListByQuantity(u)?.map((e) => ["", e?.unit]);
-	}, Ud = (t) => {
+	}, Hd = (t) => {
 		let n = getStringName(e), r = t.target, { value: i, selectionStart: a } = r, o = withUnit(i, K?.unit || ""), s = A ? withUnit(convertAndGetValue(o, B), B) : o;
 		h({ target: {
 			value: s,
@@ -6775,7 +6775,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 		}), R(() => {
 			r.selectionStart = a, r.selectionEnd = a;
 		});
-	}, Wd = (e, t) => {
+	}, Ud = (e, t) => {
 		t === K.unit || isNaN(Number(e)) || (q({
 			value: e,
 			unit: t
@@ -6806,7 +6806,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 			e !== void 0 && q({
 				value: e,
 				unit: t
-			}), Bd(C && Y && T ? PredefinedOptionsMenuState.PREDEFINED : PredefinedOptionsMenuState.CUSTOM);
+			}), zd(C && Y && T ? PredefinedOptionsMenuState.PREDEFINED : PredefinedOptionsMenuState.CUSTOM);
 		}
 	}, [
 		U,
@@ -6814,7 +6814,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 		i,
 		T
 	]);
-	let X = Hd(), Z = label(K.unit) || K.unit || "", Gd = p || !X || X && X.length === 1, Q = getStringName(e), $, Kd = (t) => {
+	let X = Vd(), Z = label(K.unit) || K.unit || "", Wd = p || !X || X && X.length === 1, Q = getStringName(e), $, Gd = (t) => {
 		let r = t?.value ? t.value : "", [i = "", a = ""] = isValueWithUnit(r) ? split(r) : [r], o = withPrettyUnitLabel(r);
 		if (checkConversion({
 			value: r,
@@ -6834,7 +6834,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 			type: MenuType.OPTION,
 			inline: !0,
 			onClick: () => {
-				validateNumber(i).valid && !n && (Bd(PredefinedOptionsMenuState.PREDEFINED), h({ target: {
+				validateNumber(i).valid && !n && (zd(PredefinedOptionsMenuState.PREDEFINED), h({ target: {
 					value: r,
 					name: typeof e == "string" ? e : e?.fieldName || "",
 					predefinedSelected: !0,
@@ -6861,10 +6861,10 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 		label: "Custom",
 		selected: J === PredefinedOptionsMenuState.CUSTOM
 	}], C?.length) {
-		let e = C.map(Kd);
+		let e = C.map(Gd);
 		$ = [...$, ...e];
 	}
-	let qd = (e) => {
+	let Kd = (e) => {
 		if (isValueWithUnit(e)) {
 			let t = getUnit(e), { value: n } = safeConvertValue({
 				value: e,
@@ -6876,7 +6876,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 			return n;
 		}
 		return e;
-	}, Jd = !C && (!F || F === GroupOrder.FIRST) ? GroupOrder.FIRST : GroupOrder.MIDDLE, Yd = !F || F === GroupOrder.LAST ? GroupOrder.LAST : GroupOrder.MIDDLE;
+	}, qd = !C && (!F || F === GroupOrder.FIRST) ? GroupOrder.FIRST : GroupOrder.MIDDLE, Jd = !F || F === GroupOrder.LAST ? GroupOrder.LAST : GroupOrder.MIDDLE;
 	return /* @__PURE__ */ jsx("div", {
 		className: J === PredefinedOptionsMenuState.PREDEFINED ? cx(unit_input_module_default.predefinedMenuActive) : "",
 		children: /* @__PURE__ */ jsxs(InputGroup, {
@@ -6908,31 +6908,31 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 						name: Q,
 						testId: x,
 						disabled: n,
-						placeholder: qd(t),
+						placeholder: Kd(t),
 						value: K.value,
-						onChange: Ud,
+						onChange: Hd,
 						onFocus: v,
 						error: i === null ? void 0 : i,
 						warning: S === null ? void 0 : S,
 						left: a,
-						allowEmpty: zd,
+						allowEmpty: Rd,
 						validationCallback: (e, t) => D(Q, t),
 						enableCosmeticRounding: j,
 						enableDisplayRounding: M,
 						roundDisplayValue: N,
-						groupOrder: Jd,
-						disableInternalErrorValidationMessages: Vd,
+						groupOrder: qd,
+						disableInternalErrorValidationMessages: Bd,
 						small: o,
 						selectOnFocus: P,
 						tooltip: I
 					}, Q)
 				}),
-				Z && (Gd || !H ? /* @__PURE__ */ jsx(InputGroupAddon, {
-					groupOrder: Yd,
+				Z && (Wd || !H ? /* @__PURE__ */ jsx(InputGroupAddon, {
+					groupOrder: Jd,
 					small: o,
 					children: Z
 				}) : /* @__PURE__ */ jsx(Menu, {
-					groupOrder: Yd,
+					groupOrder: Jd,
 					maxHeight: 380,
 					disabled: r,
 					testId: x && `${x}-menu`,
@@ -6948,7 +6948,7 @@ const UnitInput = ({ name: e, placeholder: t = "", disabled: n = !1, disabledUni
 								label: j ? safeRoundNumbers(i) : i,
 								inline: !0,
 								onClick: (n) => {
-									n.stopPropagation(), Wd(e, t);
+									n.stopPropagation(), Ud(e, t);
 								},
 								description: r,
 								selected: r === Z,

package/package.json

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