@mailstep/design-system 0.13.0-beta.2 → 0.13.1-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mailstep/design-system",
-  "version": "0.13.0-beta.2",
+  "version": "0.13.1-beta.1",
   "license": "ISC",
   "type": "module",
   "main": "./ui/index.js",

package/ui/Elements/DatePicker/DatePicker.js

@@ -3,6 +3,7 @@ import SpaceAround_default from "../SpaceAround/index.js";
 import Datetime from "./Datetime/DateTime.js";
 import { DatePickerInput } from "./components/DatePickerInput/DatePickerInput.js";
 import "./components/DatePickerInput/index.js";
+import { getInputFormat } from "./utils/getInputFormat.js";
 import { DatePickerBase } from "./styles.js";
 import React, { useCallback, useContext } from "react";
 import { jsx } from "react/jsx-runtime";
@@ -16,9 +17,11 @@ import "moment/dist/locale/sk";
 const defaultDateFormat = "DD.MM.YYYY";
 const DatePicker = ({ name, value, initialViewDate, error, label, disabled, isValidDate, onChange, dateFormat = defaultDateFormat, timeFormat = false, open, secondValue = null, input, icon = true, showInputLabel = false, showCalendarLabel = true, spaceAround = false, className, onClear, onInputChange, ...passProps }) => {
 	const locale = useContext(LanguageContext);
+	const inputFormat = getInputFormat(dateFormat, timeFormat);
 	const handleRenderInput = useCallback((inputProps, openCalendar) => /* @__PURE__ */ jsx(DatePickerInput, {
 		inputProps,
 		openCalendar,
+		format: inputFormat,
 		name,
 		label,
 		error,
@@ -35,7 +38,8 @@ const DatePicker = ({ name, value, initialViewDate, error, label, disabled, isVa
 		icon,
 		showInputLabel,
 		onClear,
-		onInputChange
+		onInputChange,
+		inputFormat
 	]);
 	const handleRenderView = useCallback((_, renderCalendar) => {
 		if (label && !showInputLabel) return /* @__PURE__ */ jsx(x.div, {

package/ui/Elements/DatePicker/Datetime/components/Timepicker/Timepicker.js

@@ -4,8 +4,10 @@ import { FooterRowLabel } from "../FooterRowLabel.js";
 import "./constants.js";
 import { TimeButton, TimeField, TimeWrapper } from "./styles.js";
 import { padTime } from "./utils/padTime.js";
+import { isTimeFieldComplete } from "./utils/isTimeFieldComplete.js";
 import { parseTimeField } from "./utils/parseTimeField.js";
 import { sanitizeTimeField } from "./utils/sanitizeTimeField.js";
+import "./utils/index.js";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { x } from "@xstyled/styled-components";
@@ -18,6 +20,7 @@ const Timepicker = ({ setTime, value, disabled }) => {
 	const [minutesValue, setMinutesValue] = useState(padTime(minutes));
 	const isHoursEdited = useRef(false);
 	const isMinutesEdited = useRef(false);
+	const minutesRef = useRef(null);
 	useEffect(() => {
 		if (isHoursEdited.current) return;
 		setHoursValue(padTime(hours));
@@ -72,6 +75,8 @@ const Timepicker = ({ setTime, value, disabled }) => {
 		const parsed = parseTimeField(nextValue, NaN);
 		if (Number.isNaN(parsed) || parsed > 23) return;
 		commitTime("hours", parsed);
+		if (!isTimeFieldComplete(nextValue, parsed, 23)) return;
+		minutesRef.current?.focus();
 	}, [commitTime]);
 	const onMinutesChange = useCallback((e) => {
 		const nextValue = sanitizeTimeField(e.target.value);
@@ -93,14 +98,18 @@ const Timepicker = ({ setTime, value, disabled }) => {
 	}, []);
 	const onHoursBlur = useCallback(() => {
 		isHoursEdited.current = false;
-		const parsed = parseTimeField(hoursValue, NaN);
-		setHoursValue(padTime(!Number.isNaN(parsed) && parsed <= 23 ? parsed : hours));
-	}, [hoursValue, hours]);
+		setHoursValue((prev) => {
+			const parsed = parseTimeField(prev, NaN);
+			return padTime(!Number.isNaN(parsed) && parsed <= 23 ? parsed : hours);
+		});
+	}, [hours]);
 	const onMinutesBlur = useCallback(() => {
 		isMinutesEdited.current = false;
-		const parsed = parseTimeField(minutesValue, NaN);
-		setMinutesValue(padTime(!Number.isNaN(parsed) && parsed <= 59 ? parsed : minutes));
-	}, [minutesValue, minutes]);
+		setMinutesValue((prev) => {
+			const parsed = parseTimeField(prev, NaN);
+			return padTime(!Number.isNaN(parsed) && parsed <= 59 ? parsed : minutes);
+		});
+	}, [minutes]);
 	return /* @__PURE__ */ jsxs(FooterRow, {
 		disabled,
 		children: [/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx(Icon, { icon: "clock" }), /* @__PURE__ */ jsx(FooterRowLabel, { children: i18n._({
@@ -147,6 +156,7 @@ const Timepicker = ({ setTime, value, disabled }) => {
 							children: ":"
 						}),
 						/* @__PURE__ */ jsx(TimeField, {
+							ref: minutesRef,
 							value: minutesValue,
 							disabled,
 							inputMode: "numeric",

package/ui/Elements/DatePicker/Datetime/components/Timepicker/constants.d.ts

@@ -3,3 +3,4 @@ export declare const MINUTES_COUNT = 60;
 export declare const MINUTES_STEP = 5;
 export declare const MAX_HOURS: number;
 export declare const MAX_MINUTES: number;
+export declare const TIME_FIELD_LENGTH = 2;

package/ui/Elements/DatePicker/Datetime/components/Timepicker/constants.js

@@ -4,5 +4,6 @@ const MINUTES_COUNT = 60;
 const MINUTES_STEP = 5;
 const MAX_HOURS = 23;
 const MAX_MINUTES = 59;
+const TIME_FIELD_LENGTH = 2;
 //#endregion
-export { HOURS_COUNT, MAX_HOURS, MAX_MINUTES, MINUTES_COUNT, MINUTES_STEP };
+export { HOURS_COUNT, MAX_HOURS, MAX_MINUTES, MINUTES_COUNT, MINUTES_STEP, TIME_FIELD_LENGTH };

package/ui/Elements/DatePicker/Datetime/components/Timepicker/utils/index.d.ts

@@ -1,3 +1,4 @@
 export { padTime } from './padTime';
+export { isTimeFieldComplete } from './isTimeFieldComplete';
 export { parseTimeField } from './parseTimeField';
 export { sanitizeTimeField } from './sanitizeTimeField';

package/ui/Elements/DatePicker/Datetime/components/Timepicker/utils/index.js

@@ -1,4 +1,5 @@
 import { padTime } from "./padTime.js";
+import { isTimeFieldComplete } from "./isTimeFieldComplete.js";
 import { parseTimeField } from "./parseTimeField.js";
 import { sanitizeTimeField } from "./sanitizeTimeField.js";
-export { padTime, parseTimeField, sanitizeTimeField };
+export { isTimeFieldComplete, padTime, parseTimeField, sanitizeTimeField };

package/ui/Elements/DatePicker/Datetime/components/Timepicker/utils/isTimeFieldComplete.d.ts

@@ -0,0 +1,3 @@
+type IsTimeFieldCompleteType = (text: string, value: number, max: number) => boolean;
+export declare const isTimeFieldComplete: IsTimeFieldCompleteType;
+export {};

package/ui/Elements/DatePicker/Datetime/components/Timepicker/utils/isTimeFieldComplete.js

@@ -0,0 +1,5 @@
+import "../constants.js";
+//#region packages/ui/Elements/DatePicker/Datetime/components/Timepicker/utils/isTimeFieldComplete.ts
+const isTimeFieldComplete = (text, value, max) => text.length >= 2 || value * 10 > max;
+//#endregion
+export { isTimeFieldComplete };

package/ui/Elements/DatePicker/Datetime/components/Timepicker/utils/sanitizeTimeField.js

@@ -1,3 +1,4 @@
+import "../constants.js";
 //#region packages/ui/Elements/DatePicker/Datetime/components/Timepicker/utils/sanitizeTimeField.ts
 const sanitizeTimeField = (text) => text.replace(/\D/g, "").slice(0, 2);
 //#endregion

package/ui/Elements/DatePicker/components/DatePickerInput/DatePickerInput.d.ts

@@ -1,7 +1,11 @@
-import { type FC, type InputHTMLAttributes } from 'react';
+import { type ChangeEvent, type FC, type InputHTMLAttributes } from 'react';
+type DatetimeInputProps = Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange'> & {
+    onChange?: (event: ChangeEvent<HTMLInputElement> | string) => void;
+};
 type DatePickerInputProps = {
-    inputProps: InputHTMLAttributes<HTMLInputElement>;
+    inputProps: DatetimeInputProps;
     openCalendar: () => void;
+    format: string;
     name?: string;
     label?: string;
     error?: string;

package/ui/Elements/DatePicker/components/DatePickerInput/DatePickerInput.js

@@ -1,14 +1,42 @@
 import Input_default from "../../../../Forms/Input/index.js";
-import { useCallback, useState } from "react";
+import { applyDateMask } from "./utils/applyDateMask.js";
+import { countDigits } from "./utils/countDigits.js";
+import { getMaskedCaretPosition } from "./utils/getMaskedCaretPosition.js";
+import { isMaskableFormat } from "./utils/isMaskableFormat.js";
+import { useCallback, useLayoutEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region packages/ui/Elements/DatePicker/components/DatePickerInput/DatePickerInput.tsx
-const DatePickerInput = ({ inputProps, openCalendar, name, label, error, disabled, icon, showInputLabel, onClear, onInputChange }) => {
+const DatePickerInput = ({ inputProps, openCalendar, format, name, label, error, disabled, icon, showInputLabel, onClear, onInputChange }) => {
 	const [typedValue, setTypedValue] = useState(null);
+	const inputRef = useRef(null);
+	const caretPosition = useRef(null);
+	const isMasked = isMaskableFormat(format);
+	useLayoutEffect(() => {
+		if (caretPosition.current === null) return;
+		const caret = caretPosition.current;
+		caretPosition.current = null;
+		inputRef.current?.setSelectionRange(caret, caret);
+	});
 	const handleChange = useCallback((e) => {
-		setTypedValue(e.target.value);
-		inputProps.onChange?.(e);
-		onInputChange?.(e.target.value);
-	}, [inputProps, onInputChange]);
+		if (!isMasked) {
+			setTypedValue(e.target.value);
+			inputProps.onChange?.(e);
+			onInputChange?.(e.target.value);
+			return;
+		}
+		const { value, selectionStart } = e.target;
+		const digitsBeforeCaret = countDigits(value.slice(0, selectionStart ?? value.length));
+		const maskedValue = applyDateMask(value, format);
+		caretPosition.current = getMaskedCaretPosition(maskedValue, digitsBeforeCaret);
+		setTypedValue(maskedValue);
+		inputProps.onChange?.(maskedValue);
+		onInputChange?.(maskedValue);
+	}, [
+		inputProps,
+		onInputChange,
+		isMasked,
+		format
+	]);
 	const handleBlur = useCallback(() => {
 		setTypedValue(null);
 	}, []);
@@ -19,6 +47,7 @@ const DatePickerInput = ({ inputProps, openCalendar, name, label, error, disable
 		error,
 		disabled,
 		isInvalid: !!error,
+		inputRef,
 		onChange: handleChange,
 		onBlur: handleBlur,
 		label: showInputLabel ? label : void 0,

package/ui/Elements/DatePicker/components/DatePickerInput/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const MASKABLE_TOKENS: string[];
+export declare const DIGIT_PATTERN: RegExp;
+export declare const FORMAT_SLOT_PATTERN: RegExp;
+export declare const NON_DIGIT_PATTERN: RegExp;
+export declare const FORMAT_TOKEN_PATTERN: RegExp;

package/ui/Elements/DatePicker/components/DatePickerInput/constants.js

@@ -0,0 +1,16 @@
+//#region packages/ui/Elements/DatePicker/components/DatePickerInput/constants.ts
+const MASKABLE_TOKENS = [
+	"DD",
+	"MM",
+	"YY",
+	"YYYY",
+	"HH",
+	"mm",
+	"ss"
+];
+const DIGIT_PATTERN = /\d/;
+const FORMAT_SLOT_PATTERN = /[A-Za-z]/;
+const NON_DIGIT_PATTERN = /\D/g;
+const FORMAT_TOKEN_PATTERN = /[A-Za-z]+/g;
+//#endregion
+export { DIGIT_PATTERN, FORMAT_SLOT_PATTERN, FORMAT_TOKEN_PATTERN, MASKABLE_TOKENS, NON_DIGIT_PATTERN };

package/ui/Elements/DatePicker/components/DatePickerInput/utils/applyDateMask.d.ts

@@ -0,0 +1,3 @@
+type ApplyDateMaskType = (value: string, format: string) => string;
+export declare const applyDateMask: ApplyDateMaskType;
+export {};

package/ui/Elements/DatePicker/components/DatePickerInput/utils/applyDateMask.js

@@ -0,0 +1,19 @@
+import { FORMAT_SLOT_PATTERN, NON_DIGIT_PATTERN } from "../constants.js";
+//#region packages/ui/Elements/DatePicker/components/DatePickerInput/utils/applyDateMask.ts
+const applyDateMask = (value, format) => {
+	const digits = value.replace(NON_DIGIT_PATTERN, "");
+	let masked = "";
+	let digitIndex = 0;
+	for (const char of format) {
+		if (digitIndex >= digits.length) break;
+		if (FORMAT_SLOT_PATTERN.test(char)) {
+			masked += digits[digitIndex];
+			digitIndex += 1;
+			continue;
+		}
+		masked += char;
+	}
+	return masked;
+};
+//#endregion
+export { applyDateMask };

package/ui/Elements/DatePicker/components/DatePickerInput/utils/countDigits.d.ts

@@ -0,0 +1,3 @@
+type CountDigitsType = (text: string) => number;
+export declare const countDigits: CountDigitsType;
+export {};

package/ui/Elements/DatePicker/components/DatePickerInput/utils/countDigits.js

@@ -0,0 +1,5 @@
+import { NON_DIGIT_PATTERN } from "../constants.js";
+//#region packages/ui/Elements/DatePicker/components/DatePickerInput/utils/countDigits.ts
+const countDigits = (text) => text.replace(NON_DIGIT_PATTERN, "").length;
+//#endregion
+export { countDigits };

package/ui/Elements/DatePicker/components/DatePickerInput/utils/getMaskedCaretPosition.d.ts

@@ -0,0 +1,3 @@
+type GetMaskedCaretPositionType = (maskedValue: string, digitsBeforeCaret: number) => number;
+export declare const getMaskedCaretPosition: GetMaskedCaretPositionType;
+export {};

package/ui/Elements/DatePicker/components/DatePickerInput/utils/getMaskedCaretPosition.js

@@ -0,0 +1,14 @@
+import { DIGIT_PATTERN } from "../constants.js";
+//#region packages/ui/Elements/DatePicker/components/DatePickerInput/utils/getMaskedCaretPosition.ts
+const getMaskedCaretPosition = (maskedValue, digitsBeforeCaret) => {
+	if (digitsBeforeCaret <= 0) return 0;
+	let digits = 0;
+	for (let index = 0; index < maskedValue.length; index += 1) {
+		if (!DIGIT_PATTERN.test(maskedValue[index])) continue;
+		digits += 1;
+		if (digits === digitsBeforeCaret) return index + 1;
+	}
+	return maskedValue.length;
+};
+//#endregion
+export { getMaskedCaretPosition };

package/ui/Elements/DatePicker/components/DatePickerInput/utils/index.d.ts

@@ -0,0 +1,4 @@
+export { applyDateMask } from './applyDateMask';
+export { countDigits } from './countDigits';
+export { getMaskedCaretPosition } from './getMaskedCaretPosition';
+export { isMaskableFormat } from './isMaskableFormat';

package/ui/Elements/DatePicker/components/DatePickerInput/utils/index.js

@@ -0,0 +1,5 @@
+import { applyDateMask } from "./applyDateMask.js";
+import { countDigits } from "./countDigits.js";
+import { getMaskedCaretPosition } from "./getMaskedCaretPosition.js";
+import { isMaskableFormat } from "./isMaskableFormat.js";
+export { applyDateMask, countDigits, getMaskedCaretPosition, isMaskableFormat };

package/ui/Elements/DatePicker/components/DatePickerInput/utils/isMaskableFormat.d.ts

@@ -0,0 +1,3 @@
+type IsMaskableFormatType = (format: string) => boolean;
+export declare const isMaskableFormat: IsMaskableFormatType;
+export {};

package/ui/Elements/DatePicker/components/DatePickerInput/utils/isMaskableFormat.js

@@ -0,0 +1,9 @@
+import { FORMAT_TOKEN_PATTERN, MASKABLE_TOKENS } from "../constants.js";
+//#region packages/ui/Elements/DatePicker/components/DatePickerInput/utils/isMaskableFormat.ts
+const isMaskableFormat = (format) => {
+	const tokens = format.match(FORMAT_TOKEN_PATTERN);
+	if (!tokens?.length) return false;
+	return tokens.every((token) => MASKABLE_TOKENS.includes(token));
+};
+//#endregion
+export { isMaskableFormat };

package/ui/Elements/DatePicker/utils/getInputFormat.d.ts

@@ -0,0 +1,3 @@
+type GetInputFormatType = (dateFormat?: boolean | string, timeFormat?: boolean | string) => string;
+export declare const getInputFormat: GetInputFormatType;
+export {};

package/ui/Elements/DatePicker/utils/getInputFormat.js

@@ -0,0 +1,10 @@
+//#region packages/ui/Elements/DatePicker/utils/getInputFormat.ts
+const getInputFormat = (dateFormat, timeFormat) => {
+	const date = typeof dateFormat === "string" ? dateFormat : "";
+	const time = typeof timeFormat === "string" ? timeFormat : "";
+	if (!date) return time;
+	if (!time) return date;
+	return `${date} ${time}`;
+};
+//#endregion
+export { getInputFormat };