@true-engineering/true-react-common-ui-kit 3.0.0-alpha.4 → 3.0.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@true-engineering/true-react-common-ui-kit",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.6",
   "description": "True Engineering React UI Kit with theming support",
   "author": "True Engineering (https://trueengineering.ru)",
   "keywords": [

package/src/components/DateInput/DateInput.tsx

@@ -1,6 +1,5 @@
 import { FormEvent, MouseEvent, forwardRef, ChangeEvent } from 'react';
 import clsx from 'clsx';
-import { addDataTestId, getTestId } from '@true-engineering/true-react-platform-helpers';
 import { addDataAttributes } from '../../helpers';
 import { useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
@@ -33,7 +32,6 @@ export const DateInput = forwardRef<HTMLInputElement, IDateInputProps>(
       data,
       isRange,
       tweakStyles,
-      testId,
       onClick,
       onChange,
       ...inputProps
@@ -70,12 +68,7 @@ export const DateInput = forwardRef<HTMLInputElement, IDateInputProps>(
     };
 
     return (
-      <div
-        className={clsx(classes.root, className)}
-        onClick={onClick}
-        {...addDataTestId(testId)}
-        {...addDataAttributes(data)}
-      >
+      <div className={clsx(classes.root, className)} onClick={onClick} {...addDataAttributes(data)}>
         <Input
           {...inputProps}
           ref={ref}
@@ -84,7 +77,6 @@ export const DateInput = forwardRef<HTMLInputElement, IDateInputProps>(
           placeholder={
             placeholder ?? (isRange ? EMPTY_DATE_RANGE_INPUT_VALUE : EMPTY_DATE_INPUT_VALUE)
           }
-          testId={getTestId(testId, 'input')}
           tweakStyles={tweakInputStyles}
           onChange={handleChange}
           beforeMaskedStateChange={beforeMaskedStateChange}

package/src/components/DatePicker/DatePicker.stories.tsx

@@ -47,6 +47,7 @@ const Template: ComponentStory<typeof DatePicker> = (args) => {
         <DatePicker
           {...args}
           locale={ru}
+          testId="datepicker"
           months={months}
           selectedDate={date}
           startDate={startDate}

package/src/components/DatePicker/DatePicker.tsx

@@ -4,8 +4,6 @@ import 'react-datepicker/dist/react-datepicker.css';
 import clsx from 'clsx';
 import { isAfter, isBefore, isValid } from 'date-fns';
 import {
-  addDataTestId,
-  getTestId,
   isEmpty,
   isNotEmpty,
   isStringNotEmpty,
@@ -41,7 +39,6 @@ export const DatePicker = forwardRef<ReactDatePicker, IDatePickerProps>(
   (
     {
       data,
-      testId,
       selectedDate = null,
       minDate,
       maxDate,
@@ -126,7 +123,6 @@ export const DatePicker = forwardRef<ReactDatePicker, IDatePickerProps>(
       iconType: isClearable && hasDateInputValue ? undefined : 'calendar',
       tweakStyles: tweakDateInputStyles,
       ...(isRange ? { startDate: startDateValue, endDate: endDateValue } : { date: dateValue }),
-      testId: getTestId(testId, 'input'),
     };
 
     const handleChangeDate = (value: Date | null, event?: SyntheticEvent) => {
@@ -236,7 +232,7 @@ export const DatePicker = forwardRef<ReactDatePicker, IDatePickerProps>(
     }, [selectedDate, startDate, endDate]);
 
     return (
-      <div className={classes.root} {...addDataTestId(testId)} {...addDataAttributes(data)}>
+      <div className={classes.root} {...addDataAttributes(data)}>
         <DatePickerComponent
           ref={ref}
           minDate={minDate}

package/src/components/FlexibleTable/FlexibleTable.tsx

@@ -1,6 +1,6 @@
 import { ReactNode, RefObject, useCallback, useEffect, useRef, useState } from 'react';
 import clsx from 'clsx';
-import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
+import { addDataTestId, isNotEmpty } from '@true-engineering/true-react-platform-helpers';
 import { addDataAttributes } from '../../helpers';
 import { useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
@@ -20,6 +20,9 @@ export interface IFlexibleTableProps<Values extends Record<string, any>>
   isHorizontallyScrollable?: boolean;
   isFirstColumnSticky?: boolean;
   infinityScrollConfig?: IInfinityScrollConfig;
+  /**
+   * @default Индекс строки
+   */
   uniqueField?: keyof Values;
   onHeadClick?: (column: keyof Values) => void;
   // TODO: Заменить string на Generic Values[uniqueField]
@@ -42,7 +45,7 @@ export function FlexibleTable<Values extends Record<string, any>>({
   isHorizontallyScrollable,
   isFirstColumnSticky,
   infinityScrollConfig,
-  uniqueField = 'id',
+  uniqueField,
   onHeadClick,
   onRowHover,
   onRowClick,
@@ -171,7 +174,7 @@ export function FlexibleTable<Values extends Record<string, any>>({
               onRowHover={onRowHover}
               enabledColumns={enabledColumns}
               config={config}
-              key={item[uniqueField] ?? i}
+              key={isNotEmpty(uniqueField) ? item[uniqueField] : i}
               rowAttributes={rowAttributes}
               tweakStyles={tweakTableRowStyles}
               expandableRowComponent={expandableRowComponent}