kamotive_ui 1.2.22 → 1.2.23

package/dist/components/DateInput/DateInput.js

@@ -7,17 +7,20 @@ import { IconCalendar } from '../../Icons/IconCalendar/IconCalendar';
 import 'react-datepicker/dist/react-datepicker.css';
 import { registerLocale } from 'react-datepicker';
 import { ru } from 'date-fns/locale/ru';
+import { enUS } from 'date-fns/locale/en-US';
 import { ChevronRight } from '../../Icons/ChevronRight/ChevronRight';
 import { ChevronLeft } from '../../Icons/ChevronLeft/ChevronLeft';
 import { Button } from '../Button/Button';
 registerLocale('ru', ru);
-const CustomInput = forwardRef(({ value = '', onClick, onDateChange, onClose, className, disabled = false, readOnly = false }, ref) => {
+registerLocale('en', enUS);
+const CustomInput = forwardRef(({ value = '', onClick, onDateChange, onClose, className, disabled = false, readOnly = false, dateFormat = 'dd.MM.yyyy' }, ref) => {
     const inputRef = useRef(null);
     const [selectedPart, setSelectedPart] = useState(null);
     const [tempInput, setTempInput] = useState('');
     const [hasFocus, setHasFocus] = useState(false);
     const [shouldReselect, setShouldReselect] = useState(false);
     const [input, setInput] = useState(value);
+    const separator = dateFormat.includes('.') ? '.' : dateFormat.includes('-') ? '-' : '/';
     const positions = {
         day: { start: 0, end: 2 },
         month: { start: 3, end: 5 },
@@ -74,7 +77,7 @@ const CustomInput = forwardRef(({ value = '', onClick, onDateChange, onClose, cl
                 selectDatePart('month');
             }
         }
-        else if (e.key === 'ArrowRight' || e.key === '.') {
+        else if (e.key === 'ArrowRight' || e.key === separator) {
             e.preventDefault();
             if (selectedPart === 'day') {
                 selectDatePart('month');
@@ -85,12 +88,13 @@ const CustomInput = forwardRef(({ value = '', onClick, onDateChange, onClose, cl
         }
         else if (/^\d$/.test(e.key)) {
             e.preventDefault();
-            if (!/^\d{2}\.\d{2}\.\d{4}$/.test(input)) {
+            const dateRegex = new RegExp(`^\\d{2}\\${separator}\\d{2}\\${separator}\\d{4}$`);
+            if (!dateRegex.test(input)) {
                 const today = new Date();
                 handleDateUpdate(today, e.key);
                 return;
             }
-            const [day, month, year] = input.split('.').map((part) => parseInt(part, 10));
+            const [day, month, year] = input.split(separator).map((part) => parseInt(part, 10));
             const currentDate = new Date(year, month - 1, day);
             handleDateUpdate(currentDate, e.key);
         }
@@ -141,7 +145,7 @@ const CustomInput = forwardRef(({ value = '', onClick, onDateChange, onClose, cl
                 updateInputValue(key, positions.month.start);
                 return;
             }
-            updateInputValue(key, positions.day.start + 1);
+            updateInputValue(key, positions.month.start + 1);
             let newMonth = parseInt(newTempInput, 10);
             newDate.setMonth(newMonth - 1);
             onDateChange(newDate);
@@ -189,9 +193,9 @@ const CustomInput = forwardRef(({ value = '', onClick, onDateChange, onClose, cl
     useImperativeHandle(ref, () => ({
         removeSelection,
     }), [removeSelection]);
-    return (React.createElement("input", { ref: inputRef, value: input, onClick: handleClick, onKeyDown: handleKeyDown, onFocus: handleFocus, onBlur: handleBlur, readOnly: readOnly, disabled: disabled, className: className }));
+    return (React.createElement("input", { ref: inputRef, value: input, onClick: handleClick, onKeyDown: handleKeyDown, onFocus: handleFocus, onBlur: handleBlur, onChange: () => { }, readOnly: readOnly, disabled: disabled, className: className }));
 });
-export const DateInput = ({ id, label = 'Выберите дату', size = 'lg', value, style, className, disabled = false, readOnly = false, isLeftLabel = false, icon, error = false, helperText, onChange, onBlur, required = false, minDate = new Date('1975-12-31'), maxDate = new Date('2074-12-31'), inputClassName, calendarClassName, dateFormat = 'dd.MM.yyyy', }) => {
+export const DateInput = ({ id, label = 'Выберите дату', size = 'lg', value, style, className, disabled = false, readOnly = false, isLeftLabel = false, icon, error = false, helperText, onChange, onBlur, required = false, lng = 'ru', minDate = new Date('1975-12-31'), maxDate = new Date('2074-12-31'), inputClassName, calendarClassName, dateFormat = 'dd.MM.yyyy', }) => {
     const wrapperClassess = classNames(styles['wrapper--input'], className, {
         [styles['wrapper--left']]: isLeftLabel,
         [styles['wrapper--input-label']]: label && !isLeftLabel && !required,
@@ -212,20 +216,36 @@ export const DateInput = ({ id, label = 'Выберите дату', size = 'lg'
     const [isMonthPickerOpen, setIsMonthPickerOpen] = useState(false);
     const datePickerRef = useRef(null);
     const inputRef = useRef(null);
-    const months = [
-        'Январь',
-        'Февраль',
-        'Март',
-        'Апрель',
-        'Май',
-        'Июнь',
-        'Июль',
-        'Август',
-        'Сентябрь',
-        'Октябрь',
-        'Ноябрь',
-        'Декабрь',
-    ];
+    const weekDays = lng === 'ru' ? ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'] : ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'];
+    const months = lng === 'ru'
+        ? [
+            'Январь',
+            'Февраль',
+            'Март',
+            'Апрель',
+            'Май',
+            'Июнь',
+            'Июль',
+            'Август',
+            'Сентябрь',
+            'Октябрь',
+            'Ноябрь',
+            'Декабрь',
+        ]
+        : [
+            'January',
+            'February',
+            'March',
+            'April',
+            'May',
+            'June',
+            'July',
+            'August',
+            'September',
+            'October',
+            'November',
+            'December',
+        ];
     const years = Array.from({ length: maxDate.getFullYear() - minDate.getFullYear() }, (_, i) => minDate.getFullYear() + i);
     const handleDateChange = (date) => {
         if (date) {
@@ -297,12 +317,12 @@ export const DateInput = ({ id, label = 'Выберите дату', size = 'lg'
             React.createElement("div", { className: styles.buttonContainer },
                 React.createElement(Button, { condition: "info", onClick: () => {
                         setIsMonthPickerOpen(false);
-                    } }, "\u041E\u0442\u043C\u0435\u043D\u0430"),
+                    } }, lng === 'ru' ? "Отмена" : "Cancel"),
                 React.createElement(Button, { onClick: () => {
                         date.setMonth(currentMonth);
                         date.setFullYear(currentYear);
                         setIsMonthPickerOpen(false);
-                    } }, "\u041F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C"))));
+                    } }, lng === 'ru' ? "Применить" : "Apply"))));
     };
     const getMonthPickerWithDate = (date) => {
         return () => React.createElement(MonthPicker, { date: date });
@@ -326,7 +346,11 @@ export const DateInput = ({ id, label = 'Выберите дату', size = 'lg'
     return (React.createElement("div", { className: wrapperClassess, style: style },
         label && (React.createElement(Typography, { variant: "Caption", className: labelClasses }, label)),
         React.createElement("div", { className: styles.icon, onClick: () => { var _a; return (_a = datePickerRef.current) === null || _a === void 0 ? void 0 : _a.setOpen(true); } }, icon || React.createElement(IconCalendar, null)),
-        React.createElement(DatePicker, Object.assign({ id: id, ref: datePickerRef, selected: selectedDate, onChange: handleDateChange, onBlur: onBlur, dateFormat: dateFormat, locale: "ru", readOnly: readOnly, disabled: disabled, showPopperArrow: false, calendarClassName: classNames(styles.calendar, calendarClassName), popperClassName: styles.calendarPopper, onCalendarClose: () => setIsMonthPickerOpen(false), minDate: minDate, maxDate: maxDate, inline: false, calendarStartDay: 1, dayClassName: (date) => {
+        React.createElement(DatePicker, Object.assign({ id: id, ref: datePickerRef, selected: selectedDate, onChange: handleDateChange, onBlur: onBlur, dateFormat: dateFormat, locale: lng === 'ru' ? 'ru' : 'en', readOnly: readOnly, disabled: disabled, showPopperArrow: false, calendarClassName: classNames(styles.calendar, calendarClassName), popperClassName: styles.calendarPopper, onCalendarClose: () => setIsMonthPickerOpen(false), minDate: minDate, maxDate: maxDate, inline: false, calendarStartDay: 1, formatWeekDay: (dayName) => {
+                const dayIndex = ['понедельник', 'вторник', 'среда', 'четверг', 'пятница', 'суббота', 'воскресенье']
+                    .findIndex(day => day === dayName);
+                return weekDays[dayIndex];
+            }, dayClassName: (date) => {
                 return date.getMonth() === (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.getMonth()) && date.getFullYear() === (selectedDate === null || selectedDate === void 0 ? void 0 : selectedDate.getFullYear())
                     ? 'current-month-day'
                     : '';
@@ -335,6 +359,6 @@ export const DateInput = ({ id, label = 'Выберите дату', size = 'lg'
             : {
                 renderCustomHeader: renderCustomHeader,
                 renderDayContents: renderDayContents,
-            }), { customInput: React.createElement(CustomInput, { ref: inputRef, className: classNames(inputClassess, inputClassName), onDateChange: handleCustomInputChange, onClose: handleCloseDatePicker, disabled: disabled, readOnly: readOnly }) })),
+            }), { customInput: React.createElement(CustomInput, { ref: inputRef, className: classNames(inputClassess, inputClassName), onDateChange: handleCustomInputChange, onClose: handleCloseDatePicker, disabled: disabled, readOnly: readOnly, dateFormat: dateFormat }) })),
         error && helperText && (React.createElement(Typography, { variant: "Caption", className: classNames(styles.helperText, styles[size]) }, helperText))));
 };

package/dist/components/Dropdown/Dropdown.js

@@ -5,8 +5,13 @@ import { ChevronDown } from '../../Icons/ChevronDown/ChevronDown';
 import { ChevronUp } from '../../Icons/ChevronUp/ChevronUp';
 import { IconClose } from '../../Icons/IconClose/IconClose';
 import { IconCheck } from '../../Icons/IconCheck/IconCheck';
-;
 import { Typography } from '../Typography/Typography';
+import { Tooltip } from '../Tooltip/Tooltip';
+const isTextOverflowing = (element) => {
+    if (!element)
+        return false;
+    return element.scrollWidth > element.clientWidth;
+};
 function checkItem(item, getOptionLabel, disabled, isDivider) {
     if (typeof item === 'object' && item !== null) {
         const itemCopy = Object.assign({}, item);
@@ -53,7 +58,19 @@ function checkItem(item, getOptionLabel, disabled, isDivider) {
     }
 }
 export const DropdownListItem = ({ item, getOptionLabel, size = 'md', selectedItem, variant, onChange, isActive, activeIndex, index, }) => {
-    var _a;
+    var _a, _b;
+    const itemRef = useRef(null);
+    const [showTooltip, setShowTooltip] = useState(false);
+    useEffect(() => {
+        const checkOverflow = () => {
+            setShowTooltip(isTextOverflowing(itemRef.current));
+        };
+        checkOverflow();
+        window.addEventListener('resize', checkOverflow);
+        return () => {
+            window.removeEventListener('resize', checkOverflow);
+        };
+    }, [item === null || item === void 0 ? void 0 : item.value]);
     const handleItemClick = useCallback((event) => {
         event.preventDefault();
         event.stopPropagation();
@@ -67,7 +84,7 @@ export const DropdownListItem = ({ item, getOptionLabel, size = 'md', selectedIt
         [styles['item-block--active']]: isActive,
     });
     const itemBlock = classNames(styles[`item-block`], styles[`item-block-${variant}`], { [styles[`item-block-${variant}--selected`]]: (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value) === (item === null || item === void 0 ? void 0 : item.value) }, { [styles['item-block--disabled']]: item === null || item === void 0 ? void 0 : item.disabled });
-    return (React.createElement("div", { className: itemContainerClasses, onClick: handleItemClick },
+    const itemContent = (React.createElement("div", { className: itemContainerClasses, onClick: handleItemClick },
         React.createElement("div", { className: itemClassess },
             React.createElement("div", { className: itemBlock },
                 variant === 'icons' &&
@@ -75,7 +92,7 @@ export const DropdownListItem = ({ item, getOptionLabel, size = 'md', selectedIt
                     React.cloneElement(item.icon, {
                         strokeWidth: size === 'lg' ? '0.5' : size === 'md' ? '0.3' : '0.0',
                     }),
-                React.createElement("div", { className: styles.item },
+                React.createElement("div", { className: styles.item, ref: itemRef },
                     React.createElement("span", null, item === null || item === void 0 ? void 0 : item.value)),
                 (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value) === (item === null || item === void 0 ? void 0 : item.value) && (React.createElement(IconCheck, { strokeWidth: size === 'lg' ? '0.5' : size === 'md' ? '0.3' : '0.0', htmlColor: "#0D99FF" }))),
             (item === null || item === void 0 ? void 0 : item.isDivider) && React.createElement("div", { className: styles.divider })),
@@ -83,6 +100,7 @@ export const DropdownListItem = ({ item, getOptionLabel, size = 'md', selectedIt
             var _a;
             return (React.createElement(DropdownListItem, { key: (_a = child === null || child === void 0 ? void 0 : child.key) !== null && _a !== void 0 ? _a : childIndex, item: child, getOptionLabel: getOptionLabel, size: size, selectedItem: selectedItem, onChange: onChange, isActive: activeIndex === index, activeIndex: activeIndex, index: childIndex }));
         })))));
+    return showTooltip ? (React.createElement(Tooltip, { label: ((_b = item === null || item === void 0 ? void 0 : item.value) === null || _b === void 0 ? void 0 : _b.toString()) || '', position: "bottom-left" }, itemContent)) : (itemContent);
 };
 export const Dropdown = ({ options, id, label, placeholder, required = false, value, defaultValue, onChange, getOptionLabel, variant = 'text', size = 'lg', style, className, isLeftLabel = false, isDivider = false, disabled = false, readOnly = false, isOpened = false, error = false, helperText, onClick, onBlur, onFocus, onClose, clearable = true, enableAutocomplete = false, noOptionsText = 'Нет вариантов для выбора', }) => {
     const [isOpen, setIsOpen] = useState(isOpened);
@@ -244,9 +262,21 @@ export const Dropdown = ({ options, id, label, placeholder, required = false, va
             setErrorInputHelperText(helperText !== null && helperText !== void 0 ? helperText : 'Поле обязательно для заполнения');
         }
     };
+    const [showSelectedTooltip, setShowSelectedTooltip] = useState(false);
+    const selectedItemRef = useRef(null);
+    useEffect(() => {
+        const checkOverflow = () => {
+            setShowSelectedTooltip(isTextOverflowing(selectedItemRef.current));
+        };
+        checkOverflow();
+        window.addEventListener('resize', checkOverflow);
+        return () => {
+            window.removeEventListener('resize', checkOverflow);
+        };
+    }, [selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value]);
     const getTextField = () => {
-        var _a;
-        return (React.createElement("div", { className: selectedItemClassess },
+        var _a, _b;
+        const textFieldContent = (React.createElement("div", { className: selectedItemClassess, ref: selectedItemRef },
             variant === 'icons' &&
                 (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.icon) &&
                 React.cloneElement(selectedItem.icon, {
@@ -266,6 +296,8 @@ export const Dropdown = ({ options, id, label, placeholder, required = false, va
                     e.stopPropagation();
                     onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
                 }, onKeyDown: handleKeyDown, autoFocus: true })) : selectedItem ? (selectedItem.value) : (searchValue || ((_a = placeholder !== null && placeholder !== void 0 ? placeholder : label) !== null && _a !== void 0 ? _a : 'Выберите значение'))));
+        return showSelectedTooltip ? (React.createElement("div", { className: styles.textField },
+            React.createElement(Tooltip, { label: ((_b = selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.value) === null || _b === void 0 ? void 0 : _b.toString()) || '', position: "bottom-left", style: { width: '100% !important' } }, textFieldContent))) : (textFieldContent);
     };
     const getDropdownMenu = () => {
         const optionsToRender = enableAutocomplete && searchValue
@@ -340,9 +372,10 @@ export const Dropdown = ({ options, id, label, placeholder, required = false, va
         label && (React.createElement(Typography, { variant: "Caption", className: labelClasses }, label)),
         React.createElement("button", { className: buttonClassess, onClick: readOnly ? undefined : handleToggle, disabled: disabled, tabIndex: 0, onKeyDown: handleKeyDown },
             getTextField(),
-            clearable && !readOnly && !disabled && (selectedItem || enableAutocomplete && searchValue) && (React.createElement("div", { className: styles.resetButton },
-                React.createElement(IconClose, { strokeWidth: "0.2", htmlColor: "var(--text-light)", onClick: handleReset }))),
-            React.createElement("div", { className: styles.dropdownIcon }, !isOpen ? (React.createElement(ChevronDown, { strokeWidth: size === 'lg' ? '0.5' : '0.3' })) : (React.createElement(ChevronUp, { strokeWidth: size === 'lg' ? '0.5' : '0.3' }))),
+            React.createElement("div", { className: styles.actionButtons },
+                clearable && !readOnly && !disabled && (selectedItem || enableAutocomplete && searchValue) && (React.createElement("div", { className: styles.resetButton },
+                    React.createElement(IconClose, { strokeWidth: "0.2", htmlColor: "var(--text-light)", onClick: handleReset }))),
+                React.createElement("div", { className: styles.dropdownIcon }, !isOpen ? (React.createElement(ChevronDown, { strokeWidth: size === 'lg' ? '0.5' : '0.3' })) : (React.createElement(ChevronUp, { strokeWidth: size === 'lg' ? '0.5' : '0.3' })))),
             getDropdownMenu()),
         errorInput && errorInputHelperText && (React.createElement(Typography, { variant: "Caption", className: classNames(styles.helperText, styles[size]) }, helperText !== null && helperText !== void 0 ? helperText : errorInputHelperText))));
 };

package/dist/components/Dropdown/Dropdown.module.css

@@ -1,7 +1,6 @@
 .dropdown--container {
   position: relative;
   width: 100%;
-  max-width: 260px;
 }
 .dropdown--container-left {
   display: flex;
@@ -35,17 +34,15 @@
   line-height: 16.5px;
   border-radius: 10px;
   cursor: pointer;
-  padding: 10px 15px;
+  padding: 6px 12px;
   transition: all 0.3s ease;
   background-color: transparent;
   color: var(--text-dark);
   border: 1px solid var(--grey-mediumLight);
-  /* mix-blend-mode: multiply; */
   display: flex;
   align-items: center;
   gap: 20px;
   justify-content: space-between;
-  /* min-width: fit-content; */
   position: relative;
   width: 100%;
 }
@@ -100,10 +97,15 @@
 .button:focus-visible {
   outline: none;
 }
-
+.actionButtons {
+  display: flex;
+  gap: 0px;
+  align-items: center;
+  margin-right: -6px;
+}
 .resetButton,
 .dropdownIcon {
-  position: absolute;
+  /* position: absolute; */
   background: none;
   border: none;
   cursor: pointer;
@@ -143,6 +145,20 @@
   overflow-x: hidden;
 }
 
+.textField{
+  width: 100%;
+  overflow: hidden;
+}
+
+.textField > :first-child {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  min-width: 0;
+  display: block;
+}
+
 .inlineSearchInput {
   border: none;
   outline: none;
@@ -255,13 +271,13 @@
 
 .item-selected {
   color: var(--text-dark);
-  width: 80%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   min-width: 0;
   text-align: left;
   position: relative;
+  flex: 1;
 }
 
 .item-selected .inlineSearchInput {

package/dist/components/Input/Input.module.css

@@ -1,6 +1,5 @@
 .wrapper--input {
   position: relative;
-  max-width: 260px;
   width: 100%;
 }
 .wrapper--input-label {

package/dist/components/Tooltip/Tooltip.module.css

@@ -18,5 +18,5 @@
 }
 
 .wrapper {
-	width: fit-content;
+	width: 100%;
 }

package/dist/types/index.d.ts

@@ -124,6 +124,8 @@ export interface DateInputProps {
     onBlur?: React.FocusEventHandler<HTMLElement>;
     /** Обязательное поле */
     required?: boolean;
+    /** Язык */
+    lng?: string;
 }
 /** @internal */
 export interface TagProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kamotive_ui",
-  "version": "1.2.22",
+  "version": "1.2.23",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [