@true-engineering/true-react-common-ui-kit 4.0.0-alpha7 → 4.0.0-alpha70

package/src/components/Select/Select.styles.ts

@@ -5,7 +5,7 @@ import { type ISearchInputStyles } from '../SearchInput';
 import { IWithMessagesStyles } from '../WithMessages';
 import { type ISelectListStyles } from './components';
 
-const { CONTROL, Z_INDEX } = dimensions;
+const { Z_INDEX } = dimensions;
 
 export const useStyles = createThemedStyles('Select', {
   root: {
@@ -17,7 +17,6 @@ export const useStyles = createThemedStyles('Select', {
   inputWrapper: {
     width: '100%',
     cursor: 'text',
-    position: 'relative',
   },
 
   listWrapper: {
@@ -40,20 +39,16 @@ export const useStyles = createThemedStyles('Select', {
   },
 
   arrow: {
-    position: 'absolute',
-    right: 12,
-    top: '50%',
-    width: 20,
-    height: 20,
+    width: 'var(--icon-inner-size, 20px)',
+    height: 'var(--icon-inner-size, 20px)',
     cursor: 'pointer',
-    transform: 'translateY(-50%)',
     transition: animations.defaultTransition,
     transitionProperty: 'transform',
     zIndex: Z_INDEX.CONTROL_FOCUS + 1,
   },
 
   activeArrow: {
-    transform: 'translateY(-50%) rotate(180deg)',
+    transform: 'rotate(180deg)',
   },
 
   disabled: {
@@ -62,45 +57,15 @@ export const useStyles = createThemedStyles('Select', {
     },
   },
 
-  counter: {
-    '&:not(:last-child)': {
-      paddingRight: 8,
-    },
-  },
-
-  icon: {
-    width: CONTROL.ICON_INNER_SIZE,
-    height: CONTROL.ICON_INNER_SIZE,
-  },
-
-  iconWrapper: {
-    display: 'flex',
-    alignItems: 'center',
-  },
+  counter: {},
 });
 
 const baseInputStyles: IInputStyles = {
-  inputContent: {
-    paddingRight: 32,
-  },
-
   input: {
     '&[readonly]': {
       cursor: 'pointer',
     },
   },
-
-  tweakControlWrapper: {
-    controls: {
-      paddingRight: 40,
-    },
-
-    icon: {
-      '&:last-child': {
-        paddingRight: 0,
-      },
-    },
-  },
 };
 
 const readonlyInputBaseStyles: IInputStyles = {

package/src/components/Select/Select.tsx

@@ -17,7 +17,9 @@ import { Portal } from 'react-overlays';
 import clsx from 'clsx';
 import { debounce } from 'ts-debounce';
 import {
+  applyAction,
   createFilter,
+  getArray,
   getTestId,
   isNotEmpty,
   isReactNodeNotEmpty,
@@ -38,14 +40,14 @@ import {
   defaultIsOptionDisabled,
   getDefaultConvertToIdFunction,
 } from './helpers';
-import { IChangeSelectEvent, IMultipleSelectValue } from './types';
+import { IChangeSelectEvent, IMultipleSelectValue, ISelectFooter } from './types';
 import { getInputStyles, ISelectStyles, useStyles } from './Select.styles';
 
 export interface ISelectProps<Value>
   extends Omit<IInputProps, 'value' | 'onChange' | 'onBlur' | 'type' | 'tweakStyles'>,
     ICommonProps<ISelectStyles> {
   header?: ReactNode;
-  footer?: ReactNode;
+  footer?: ISelectFooter<Value>;
   defaultOptionLabel?: ReactNode;
   allOptionsLabel?: string;
   noMatchesLabel?: string;
@@ -59,7 +61,7 @@ export interface ISelectProps<Value>
   dropdownOptions?: IDropdownWithPopperOptions;
   /** @default 'chevron-down' */
   dropdownIcon?: IIcon;
-  options: Value[] | Readonly<Value[]>;
+  options: Value[] | readonly Value[];
   value: Value | undefined;
   /** @default true */
   shouldScrollToList?: boolean;
@@ -124,6 +126,7 @@ export function Select<Value>(
     shouldScrollToList = true,
     searchInput,
     icon,
+    endIcon = icon,
     onChange,
     onFocus,
     onBlur,
@@ -137,6 +140,7 @@ export function Select<Value>(
     optionsFilter,
     infoMessage,
     errorMessage,
+    size,
     ...inputProps
   } = props;
   const classes = useStyles({ theme: tweakStyles });
@@ -193,7 +197,7 @@ export function Select<Value>(
 
   const filteredOptions = useMemo(() => {
     if (optionsMode !== 'search') {
-      return options;
+      return options as Value[];
     }
 
     const filter =
@@ -278,32 +282,6 @@ export function Select<Value>(
     handleListOpen();
   };
 
-  const handleBlur = (event: FocusEvent<HTMLInputElement>) => {
-    // Когда что-то блокирует открытие листа, но блур все равно должен сработать
-    // например minSymbolsCount
-    if (isListOpen && !isOpen) {
-      handleListClose(event);
-      return;
-    }
-
-    if (
-      !isNotEmpty(event.relatedTarget) ||
-      !isNotEmpty(list.current) ||
-      !isNotEmpty(inputWrapper.current)
-    ) {
-      return;
-    }
-
-    const isActionInsideSelect =
-      hasExactParent(event.relatedTarget, list.current) ||
-      hasExactParent(event.relatedTarget, inputWrapper.current);
-
-    // Ничего не делаем, если клик был внутри селекта
-    if (!isActionInsideSelect) {
-      handleListClose(event);
-    }
-  };
-
   const handleChange = useCallback(
     (newValue: Value | IMultipleSelectValue<Value> | undefined, event: IChangeSelectEvent) => {
       // Тут беда с типами, сорри
@@ -482,6 +460,32 @@ export function Select<Value>(
     // Последняя проверка на случай, если мы че то ищем в опциях
     (optionsMode === 'normal' || hasEnoughSymbolsToSearch);
 
+  const handleBlur = (event: FocusEvent<HTMLInputElement>) => {
+    // Когда что-то блокирует открытие листа, но блур все равно должен сработать
+    // например minSymbolsCount
+    if (isListOpen && !isOpen) {
+      handleListClose(event);
+      return;
+    }
+
+    if (
+      !isNotEmpty(event.relatedTarget) ||
+      !isNotEmpty(list.current) ||
+      !isNotEmpty(inputWrapper.current)
+    ) {
+      return;
+    }
+
+    const isActionInsideSelect =
+      hasExactParent(event.relatedTarget, list.current) ||
+      hasExactParent(event.relatedTarget, inputWrapper.current);
+
+    // Ничего не делаем, если клик был внутри селекта
+    if (!isActionInsideSelect) {
+      handleListClose(event);
+    }
+  };
+
   // Эти значения ставятся в false по дефолту также в useDropdown
   const {
     shouldUsePopper = false,
@@ -492,7 +496,7 @@ export function Select<Value>(
   const popperData = useDropdown({
     isOpen,
     onDropdownClose: handleListClose,
-    referenceElement: input.current?.parentElement ?? inputWrapper.current,
+    referenceElement: inputWrapper.current,
     dropdownElement: list.current,
     options: dropdownOptions,
     dependenciesForPositionUpdating: [inputProps.isLoading, filteredOptions.length],
@@ -517,6 +521,7 @@ export function Select<Value>(
 
   const searchInputEl = hasSearchInputInList && (
     <SearchInput
+      size={size}
       value={searchValue}
       onChange={handleInputChange}
       tweakStyles={tweakSearchInputStyles}
@@ -549,11 +554,12 @@ export function Select<Value>(
       {isOpen && (
         <SelectList
           options={filteredOptions}
+          size={size}
           defaultOptionLabel={hasDefaultOption && shouldShowDefaultOption && defaultOptionLabel}
           allOptionsLabel={shouldShowAllOption && allOptionsLabel}
           areAllOptionsSelected={areAllOptionsSelected}
           customListHeader={customHeader}
-          customListFooter={footer}
+          customListFooter={applyAction(footer, { filteredOptions })}
           noMatchesLabel={noMatchesLabel}
           focusedIndex={focusedListCellIndex}
           activeValue={value}
@@ -575,16 +581,6 @@ export function Select<Value>(
     </div>
   );
 
-  const multiSelectCounterWithIcon =
-    shouldShowMultiSelectCounter || isNotEmpty(icon) ? (
-      <div className={classes.iconWrapper}>
-        {shouldShowMultiSelectCounter && (
-          <div className={classes.counter}>(+{value.length - 1})</div>
-        )}
-        {isNotEmpty(icon) && <div className={classes.icon}>{renderIcon(icon)}</div>}
-      </div>
-    ) : undefined;
-
   return (
     <WithMessages
       errorMessage={errorMessage}
@@ -602,6 +598,7 @@ export function Select<Value>(
             value={
               searchValue !== '' && !shouldRenderSearchInputInList ? searchValue : showedStringValue
             }
+            size={size}
             onChange={handleInputChange}
             isActive={isListOpen || isActive}
             isReadonly={hasReadonlyInput}
@@ -612,18 +609,31 @@ export function Select<Value>(
             isLoading={areOptionsLoading}
             tweakStyles={tweakInputStyles}
             testId={testId}
-            icon={isMultiSelect ? multiSelectCounterWithIcon : icon}
+            icon={[
+              isMultiSelect && shouldShowMultiSelectCounter
+                ? {
+                    key: 'counter',
+                    iconComponent: (
+                      <div key="counter" className={classes.counter}>
+                        (+{value.length - 1})
+                      </div>
+                    ),
+                    shouldResetSize: true,
+                  }
+                : undefined,
+
+              ...getArray(endIcon),
+
+              <div
+                key="arrow"
+                className={clsx(classes.arrow, isOpen && classes.activeArrow)}
+                onClick={onArrowClick} // клик тут, потому что onClick в ControlWrapper добавляет tabIndex={0}
+              >
+                {renderIcon(dropdownIcon)}
+              </div>,
+            ].filter(isNotEmpty)}
             {...inputProps}
           />
-          <div
-            onMouseDown={(event: MouseEvent) => {
-              event.preventDefault();
-            }}
-            onClick={onArrowClick}
-            className={clsx(classes.arrow, isOpen && classes.activeArrow)}
-          >
-            {renderIcon(dropdownIcon)}
-          </div>
         </div>
         {shouldUsePopper ? (
           <Portal container={shouldRenderInBody ? document.body : inputWrapper.current}>

package/src/components/Select/components/SelectList/SelectList.styles.ts

@@ -1,4 +1,5 @@
 import { colors, createThemedStyles, dimensions, helpers, ITweakStyles } from '../../../../theme';
+import { IControlWrapperSizes } from '../../../ControlWrapper';
 
 export const ROW_HEIGHT = 40;
 export const CONTAINER_PADDING = 10;
@@ -70,4 +71,4 @@ export const useStyles = createThemedStyles('SelectList', {
   defaultCell: {},
 });
 
-export type ISelectListStyles = ITweakStyles<typeof useStyles>;
+export type ISelectListStyles = ITweakStyles<typeof useStyles, IControlWrapperSizes>;

package/src/components/Select/components/SelectList/SelectList.tsx

@@ -1,20 +1,23 @@
-import { useMemo, type ReactNode } from 'react';
+import { type ReactNode, useMemo } from 'react';
 import clsx from 'clsx';
 import {
   addDataTestId,
   getArray,
+  isNotEmpty,
   isReactNodeNotEmpty,
 } from '@true-engineering/true-react-platform-helpers';
 import { type ICommonProps } from '../../../../types';
 import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
+import type { ISelectProps } from '../../Select';
 import { ALL_OPTION_INDEX, DEFAULT_OPTION_INDEX } from '../../constants';
-import { SelectListItem, type ISelectListItemProps } from '../SelectListItem';
-import { useStyles, type ISelectListStyles } from './SelectList.styles';
+import { type ISelectListItemProps, SelectListItem } from '../SelectListItem';
+import { type ISelectListStyles, useStyles } from './SelectList.styles';
 
 export interface ISelectListProps<Value>
   extends ICommonProps<ISelectListStyles>,
     Pick<ISelectListItemProps, 'onToggleCheckbox' | 'onOptionSelect' | 'isMultiSelect'> {
-  options: Value[] | Readonly<Value[]>;
+  options: Value[] | readonly Value[];
+  size?: ISelectProps<Value>['size'];
   focusedIndex?: number;
   activeValue?: Value | Value[];
   noMatchesLabel?: string;
@@ -35,6 +38,7 @@ export interface ISelectListProps<Value>
 export function SelectList<Value>({
   options,
   focusedIndex,
+  size,
   activeValue,
   defaultOptionLabel,
   noMatchesLabel = 'Совпадений не найдено',
@@ -78,13 +82,13 @@ export function SelectList<Value>({
   return (
     <ScrollIntoViewIfNeeded
       active={shouldScrollToList && !isMultiSelect}
-      className={clsx(classes.root, {
+      className={clsx(classes.root, isNotEmpty(size) && classes[size], {
         [classes.withListHeader]: isHeaderNotEmpty,
         [classes.withListFooter]: isFooterNotEmpty,
       })}
     >
       {isHeaderNotEmpty && <div className={classes.listHeader}>{customListHeader}</div>}
-      <div className={classes.list} {...addDataTestId(testId)}>
+      <div className={classes.list} {...addDataTestId(testId)} tabIndex={-1}>
         {isLoading ? (
           <div className={clsx(classes.cell, classes.loading)}>{loadingLabel}</div>
         ) : (
@@ -119,8 +123,9 @@ export function SelectList<Value>({
             )}
             {listOptions.map((opt, i) => {
               const optionValue = options[i];
+              const id = convertValueToId(optionValue);
               const isFocused = focusedIndex === i;
-              const isActive = activeOptionsIds.has(convertValueToId(optionValue));
+              const isActive = activeOptionsIds.has(id);
               // проверяем, что опция задизейблена
               const isDisabled = optionsDisableMap[i];
 
@@ -135,6 +140,7 @@ export function SelectList<Value>({
                   isMultiSelect={isMultiSelect}
                   onOptionSelect={onOptionSelect}
                   onToggleCheckbox={onToggleCheckbox}
+                  data={{ id }}
                 >
                   {opt}
                 </SelectListItem>

package/src/components/Select/components/SelectListItem/SelectListItem.tsx

@@ -7,12 +7,13 @@ import {
 } from 'react';
 import clsx from 'clsx';
 import { type Classes } from 'jss';
-import { addDataAttributes } from '../../../../helpers';
+import { addDataAttributes } from '@true-engineering/true-react-platform-helpers';
+import { IDataAttributesProps } from '../../../../types';
 import { Checkbox } from '../../../Checkbox';
 import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
 import { checkboxStyles } from './SelectListItem.styles';
 
-export interface ISelectListItemProps {
+export interface ISelectListItemProps extends IDataAttributesProps {
   index: number;
   isSemiChecked?: boolean;
   isDisabled?: boolean;
@@ -38,6 +39,7 @@ export const SelectListItem: FC<ISelectListItemProps> = ({
   children,
   isFocused,
   isMultiSelect,
+  data,
   onOptionSelect,
   onToggleCheckbox,
 }) => {
@@ -67,6 +69,7 @@ export const SelectListItem: FC<ISelectListItemProps> = ({
         disabled: isDisabled,
         active: isActive,
         focused: isFocused,
+        ...data,
       })}
       onClick={!isDisabled && !isMultiSelect ? (event) => onOptionSelect(index, event) : undefined}
     >

package/src/components/Select/index.ts

@@ -1,4 +1,4 @@
 export * from './Select';
 export * from './types';
 export type { ISelectStyles } from './Select.styles';
-export type { ISelectListStyles } from './components';
+export { type ISelectListStyles, SelectList } from './components';

package/src/components/Select/types.ts

@@ -1,6 +1,9 @@
 import { ChangeEvent, KeyboardEvent } from 'react';
+import { IRenderNode } from '../../types';
 import { IChangeInputEvent } from '../Input';
 
 export type IMultipleSelectValue<Value> = Array<NonNullable<Value>>;
 
 export type IChangeSelectEvent = IChangeInputEvent | ChangeEvent<HTMLElement> | KeyboardEvent;
+
+export type ISelectFooter<T> = IRenderNode<{ filteredOptions: T[] }>;

package/src/components/Selector/Selector.stories.tsx

@@ -1,14 +1,15 @@
-import { useState } from 'react';
-import { ComponentStory } from '@storybook/react';
+import { FC, useState } from 'react';
+import { type Meta } from '@storybook/react';
+import { excludeStorybookParams } from '../../helpers';
 import { Status } from '../Status';
-import { Selector } from './Selector';
+import { ISelectorProps, Selector } from './Selector';
 import { ISelectorOption } from './types';
 
 const options: Array<ISelectorOption<string>> = [
   {
     label: 'Label 1',
     value: '1',
-    icon: 'eye',
+    icon: 'filter',
   },
   {
     label: 'My label 2',
@@ -32,31 +33,32 @@ const options: Array<ISelectorOption<string>> = [
   },
 ];
 
-export default {
-  title: 'Controls/Selector',
-  component: Selector,
-};
-
-const Template: ComponentStory<typeof Selector> = (args) => {
+const Story: FC<ISelectorProps<string>> = (args) => {
   const [value, setValue] = useState(options[0].value);
-  return <Selector {...args} value={value} options={options} onChange={setValue} />;
-};
-
-export const Default = Template.bind({});
-
-Default.args = {
-  size: 'l',
-  iconPosition: 'left',
-  hasSameOptionsWidth: true,
-  isDisabled: false,
-  isInvalid: false,
-  isRequired: false,
+  return <Selector<string> {...args} value={value} options={options} onChange={setValue} />;
 };
 
-Default.argTypes = {};
-
-Default.parameters = {
-  controls: {
-    exclude: ['options', 'value', 'testId', 'onChange'],
+const meta: Meta<typeof Story> = {
+  title: 'Controls/Selector',
+  component: Story,
+  args: {
+    size: 'l',
+    iconPosition: 'left',
+    hasSameOptionsWidth: true,
+    isDisabled: false,
+    isInvalid: false,
+    isRequired: false,
+  },
+  argTypes: {
+    size: { options: ['s', 'm', 'l'], control: 'inline-radio' },
+    iconPosition: { options: ['left', 'right'], control: 'inline-radio' },
+  },
+  parameters: {
+    controls: {
+      exclude: excludeStorybookParams(['options', 'value']),
+    },
   },
 };
+
+export default meta;
+export const Default = {};