@true-engineering/true-react-common-ui-kit 2.0.1 → 2.1.1

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

@@ -1,165 +1,152 @@
-import { ReactNode, useMemo, MouseEvent } from 'react';
-import clsx from 'clsx';
-import { ScrollIntoViewIfNeeded } from '../../ScrollIntoViewIfNeeded';
-import { useTheme } from '../../../hooks';
-import { ICommonProps } from '../../../types';
-import { isNotEmpty } from '../../../helpers';
-import { SelectListStyles, styles } from './SelectList.styles';
-import { IMultipleSelectValue } from '../types';
-import { SelectListItem } from '../SelectListItem/SelectListItem';
-import { ALL_OPTION_INDEX, DEFAULT_OPTION_INDEX } from '../constants';
-
-export interface ISelectListProps<Value> extends ICommonProps {
-  tweakStyles?: SelectListStyles;
-  options: Value[];
-  focusedIndex?: number;
-  activeValue?: Value | Value[];
-  noMatchesLabel?: string;
-  isLoading?: boolean;
-  loadingLabel?: ReactNode;
-  defaultOptionLabel?: string;
-  testId?: string;
-  allOptionsLabel?: string;
-  areAllOptionsSelected?: boolean;
-  shouldScrollToList?: boolean;
-  customListHeader?: ReactNode;
-  onOptionSelect(index: number, event: MouseEvent<HTMLElement>): void;
-  onToggleCheckbox?(index: number, isSelected: boolean): void;
-  isOptionDisabled(value: Value): boolean;
-  convertValueToString(value: Value): string | undefined;
-  convertValueToReactNode?(value: Value, isDisabled: boolean): ReactNode;
-  convertValueToId(value: Value): string | undefined;
-}
-
-export function SelectList<Value>({
-  options,
-  focusedIndex,
-  activeValue,
-  defaultOptionLabel,
-  noMatchesLabel = 'Совпадений не найдено',
-  isLoading,
-  loadingLabel = 'Загрузка...',
-  tweakStyles,
-  testId,
-  shouldScrollToList = true,
-  areAllOptionsSelected,
-  customListHeader,
-  isOptionDisabled,
-  allOptionsLabel,
-  onOptionSelect,
-  onToggleCheckbox,
-  convertValueToString,
-  convertValueToReactNode = convertValueToString,
-  convertValueToId,
-}: ISelectListProps<Value>): JSX.Element {
-  const { classes } = useTheme('SelectList', styles, tweakStyles);
-  const isMultiSelect = isNotEmpty(onToggleCheckbox);
-  const multiSelectValue = activeValue as
-    | IMultipleSelectValue<Value>
-    | undefined;
-  const selectedOptionsCount = multiSelectValue?.length ?? 0;
-
-  // MultiSelect
-  const activeOptionsIdMap = useMemo(
-    () => (isMultiSelect ? multiSelectValue?.map(convertValueToId) ?? [] : []),
-    [isMultiSelect, multiSelectValue, convertValueToId],
-  );
-
-  const optionsDisableMap = useMemo(
-    () => options.map((o) => isOptionDisabled(o)),
-    [options, isOptionDisabled],
-  );
-
-  const listOptions = useMemo(
-    () =>
-      options.map((opt, i) =>
-        convertValueToReactNode(opt, optionsDisableMap[i]),
-      ),
-    [options, convertValueToReactNode, optionsDisableMap],
-  );
-
-  const isActiveOption = (item: Value): boolean =>
-    isMultiSelect
-      ? activeOptionsIdMap.includes(convertValueToId(item))
-      : isNotEmpty(activeValue) &&
-        convertValueToId(activeValue as Value) === convertValueToId(item);
-
-  return (
-    <ScrollIntoViewIfNeeded
-      active={shouldScrollToList && !isMultiSelect}
-      className={clsx(classes.root, {
-        [classes.withListHeader]: isNotEmpty(customListHeader),
-      })}
-    >
-      {isNotEmpty(customListHeader) && (
-        <div className={classes.listHeader}>{customListHeader}</div>
-      )}
-      <div className={classes.list} data-testid={testId}>
-        {isLoading ? (
-          <div className={clsx(classes.cell, classes.loading)}>
-            {loadingLabel}
-          </div>
-        ) : (
-          <>
-            {isNotEmpty(defaultOptionLabel) && (
-              <ScrollIntoViewIfNeeded
-                active={focusedIndex === DEFAULT_OPTION_INDEX}
-                options={{ block: 'nearest' }}
-                className={clsx(
-                  classes.cell,
-                  classes.defaultCell,
-                  focusedIndex === DEFAULT_OPTION_INDEX && classes.focused,
-                )}
-                onClick={(event) => onOptionSelect(DEFAULT_OPTION_INDEX, event)}
-              >
-                {defaultOptionLabel}
-              </ScrollIntoViewIfNeeded>
-            )}
-            {isNotEmpty(allOptionsLabel) && (
-              <SelectListItem
-                classes={classes}
-                index={ALL_OPTION_INDEX}
-                isSemiChecked={
-                  selectedOptionsCount > 0 && !areAllOptionsSelected
-                }
-                isActive={areAllOptionsSelected}
-                isFocused={focusedIndex === ALL_OPTION_INDEX}
-                onOptionSelect={onOptionSelect}
-                onToggleCheckbox={onToggleCheckbox}
-              >
-                {allOptionsLabel}
-              </SelectListItem>
-            )}
-            {listOptions.map((opt, i) => {
-              const optionValue = options[i];
-              const isFocused = focusedIndex === i;
-              const isActive = isActiveOption(optionValue);
-              // проверяем, что опция задизейблена
-              const isDisabled = optionsDisableMap[i];
-
-              return (
-                <SelectListItem
-                  key={i}
-                  classes={classes}
-                  index={i}
-                  isDisabled={isDisabled}
-                  isActive={isActive}
-                  isFocused={isFocused}
-                  onOptionSelect={onOptionSelect}
-                  onToggleCheckbox={onToggleCheckbox}
-                >
-                  {opt}
-                </SelectListItem>
-              );
-            })}
-            {listOptions.length === 0 && (
-              <div className={clsx(classes.cell, classes.noMatchesLabel)}>
-                {noMatchesLabel}
-              </div>
-            )}
-          </>
-        )}
-      </div>
-    </ScrollIntoViewIfNeeded>
-  );
-}
+import { ReactNode, useMemo, MouseEvent } from 'react';
+import clsx from 'clsx';
+import { isNotEmpty } from '../../../helpers';
+import { useTheme } from '../../../hooks';
+import { ICommonProps } from '../../../types';
+import { ScrollIntoViewIfNeeded } from '../../ScrollIntoViewIfNeeded';
+import { SelectListItem } from '../SelectListItem/SelectListItem';
+import { ALL_OPTION_INDEX, DEFAULT_OPTION_INDEX } from '../constants';
+import { IMultipleSelectValue } from '../types';
+import { SelectListStyles, styles } from './SelectList.styles';
+
+export interface ISelectListProps<Value> extends ICommonProps {
+  tweakStyles?: SelectListStyles;
+  options: Value[];
+  focusedIndex?: number;
+  activeValue?: Value | Value[];
+  noMatchesLabel?: string;
+  isLoading?: boolean;
+  loadingLabel?: ReactNode;
+  defaultOptionLabel?: string;
+  testId?: string;
+  allOptionsLabel?: string;
+  areAllOptionsSelected?: boolean;
+  shouldScrollToList?: boolean;
+  customListHeader?: ReactNode;
+  onOptionSelect(index: number, event: MouseEvent<HTMLElement>): void;
+  onToggleCheckbox?(index: number, isSelected: boolean): void;
+  isOptionDisabled(value: Value): boolean;
+  convertValueToString(value: Value): string | undefined;
+  convertValueToReactNode?(value: Value, isDisabled: boolean): ReactNode;
+  convertValueToId(value: Value): string | undefined;
+}
+
+export function SelectList<Value>({
+  options,
+  focusedIndex,
+  activeValue,
+  defaultOptionLabel,
+  noMatchesLabel = 'Совпадений не найдено',
+  isLoading,
+  loadingLabel = 'Загрузка...',
+  tweakStyles,
+  testId,
+  shouldScrollToList = true,
+  areAllOptionsSelected,
+  customListHeader,
+  isOptionDisabled,
+  allOptionsLabel,
+  onOptionSelect,
+  onToggleCheckbox,
+  convertValueToString,
+  convertValueToReactNode = convertValueToString,
+  convertValueToId,
+}: ISelectListProps<Value>): JSX.Element {
+  const { classes } = useTheme('SelectList', styles, tweakStyles);
+  const isMultiSelect = isNotEmpty(onToggleCheckbox);
+  const multiSelectValue = activeValue as IMultipleSelectValue<Value> | undefined;
+  const selectedOptionsCount = multiSelectValue?.length ?? 0;
+
+  // MultiSelect
+  const activeOptionsIdMap = useMemo(
+    () => (isMultiSelect ? multiSelectValue?.map(convertValueToId) ?? [] : []),
+    [isMultiSelect, multiSelectValue, convertValueToId],
+  );
+
+  const optionsDisableMap = useMemo(
+    () => options.map((o) => isOptionDisabled(o)),
+    [options, isOptionDisabled],
+  );
+
+  const listOptions = useMemo(
+    () => options.map((opt, i) => convertValueToReactNode(opt, optionsDisableMap[i])),
+    [options, convertValueToReactNode, optionsDisableMap],
+  );
+
+  const isActiveOption = (item: Value): boolean =>
+    isMultiSelect
+      ? activeOptionsIdMap.includes(convertValueToId(item))
+      : isNotEmpty(activeValue) &&
+        convertValueToId(activeValue as Value) === convertValueToId(item);
+
+  return (
+    <ScrollIntoViewIfNeeded
+      active={shouldScrollToList && !isMultiSelect}
+      className={clsx(classes.root, {
+        [classes.withListHeader]: isNotEmpty(customListHeader),
+      })}
+    >
+      {isNotEmpty(customListHeader) && <div className={classes.listHeader}>{customListHeader}</div>}
+      <div className={classes.list} data-testid={testId}>
+        {isLoading ? (
+          <div className={clsx(classes.cell, classes.loading)}>{loadingLabel}</div>
+        ) : (
+          <>
+            {isNotEmpty(defaultOptionLabel) && (
+              <ScrollIntoViewIfNeeded
+                active={focusedIndex === DEFAULT_OPTION_INDEX}
+                options={{ block: 'nearest' }}
+                className={clsx(
+                  classes.cell,
+                  classes.defaultCell,
+                  focusedIndex === DEFAULT_OPTION_INDEX && classes.focused,
+                )}
+                onClick={(event) => onOptionSelect(DEFAULT_OPTION_INDEX, event)}
+              >
+                {defaultOptionLabel}
+              </ScrollIntoViewIfNeeded>
+            )}
+            {isNotEmpty(allOptionsLabel) && (
+              <SelectListItem
+                classes={classes}
+                index={ALL_OPTION_INDEX}
+                isSemiChecked={selectedOptionsCount > 0 && !areAllOptionsSelected}
+                isActive={areAllOptionsSelected}
+                isFocused={focusedIndex === ALL_OPTION_INDEX}
+                onOptionSelect={onOptionSelect}
+                onToggleCheckbox={onToggleCheckbox}
+              >
+                {allOptionsLabel}
+              </SelectListItem>
+            )}
+            {listOptions.map((opt, i) => {
+              const optionValue = options[i];
+              const isFocused = focusedIndex === i;
+              const isActive = isActiveOption(optionValue);
+              // проверяем, что опция задизейблена
+              const isDisabled = optionsDisableMap[i];
+
+              return (
+                <SelectListItem
+                  key={i}
+                  classes={classes}
+                  index={i}
+                  isDisabled={isDisabled}
+                  isActive={isActive}
+                  isFocused={isFocused}
+                  onOptionSelect={onOptionSelect}
+                  onToggleCheckbox={onToggleCheckbox}
+                >
+                  {opt}
+                </SelectListItem>
+              );
+            })}
+            {listOptions.length === 0 && (
+              <div className={clsx(classes.cell, classes.noMatchesLabel)}>{noMatchesLabel}</div>
+            )}
+          </>
+        )}
+      </div>
+    </ScrollIntoViewIfNeeded>
+  );
+}

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

@@ -1 +1 @@
-export * from './SelectList';
+export * from './SelectList';

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

@@ -1,14 +1,14 @@
-import { CheckboxStyles } from '../../Checkbox';
-import { CELL_PADDING } from '../SelectList/SelectList.styles';
-
-export const checkboxStyles: CheckboxStyles = {
-  root: {
-    padding: CELL_PADDING,
-    width: '100%',
-  },
-
-  input: {
-    // иначе будет фокуситься и энтер будет вызывать изменение нескольких опций
-    display: 'none',
-  },
-};
+import { CheckboxStyles } from '../../Checkbox';
+import { CELL_PADDING } from '../SelectList/SelectList.styles';
+
+export const checkboxStyles: CheckboxStyles = {
+  root: {
+    padding: CELL_PADDING,
+    width: '100%',
+  },
+
+  input: {
+    // иначе будет фокуситься и энтер будет вызывать изменение нескольких опций
+    display: 'none',
+  },
+};

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

@@ -1,73 +1,67 @@
-import { ReactNode, MouseEvent, FC } from 'react';
-import clsx from 'clsx';
-import { ScrollIntoViewIfNeeded } from '../../ScrollIntoViewIfNeeded';
-import { addDataAttributes, isNotEmpty } from '../../../helpers';
-import { checkboxStyles } from './SelectListItem.styles';
-import { Checkbox } from '../../Checkbox';
-import { Classes } from 'jss';
-
-export interface ISelectListItemProps {
-  index: number;
-  isSemiChecked?: boolean;
-  isDisabled?: boolean;
-  isActive?: boolean;
-  isFocused?: boolean;
-  children: ReactNode;
-  classes: Classes<
-    'cellWithCheckbox' | 'cell' | 'focused' | 'active' | 'disabled'
-  >;
-  onOptionSelect(index: number, event: MouseEvent<HTMLElement>): void;
-  onToggleCheckbox?(index: number, isSelected: boolean): void;
-}
-
-export const SelectListItem: FC<ISelectListItemProps> = ({
-  classes,
-  index,
-  isSemiChecked,
-  isDisabled,
-  isActive,
-  children,
-  isFocused,
-  onOptionSelect,
-  onToggleCheckbox,
-}) => {
-  const isMultiSelect = isNotEmpty(onToggleCheckbox);
-
-  return (
-    <ScrollIntoViewIfNeeded
-      active={isFocused}
-      options={{ block: 'nearest' }}
-      className={clsx(classes.cell, {
-        [classes.cellWithCheckbox]: isMultiSelect,
-        [classes.focused]: isFocused,
-        [classes.active]: isActive && !isMultiSelect,
-        [classes.disabled]: isDisabled,
-      })}
-      {...addDataAttributes({
-        disabled: isDisabled,
-        active: isActive,
-        focused: isFocused,
-      })}
-      onClick={
-        !isDisabled && !isMultiSelect
-          ? (event) => onOptionSelect(index, event)
-          : undefined
-      }
-    >
-      {isMultiSelect ? (
-        <Checkbox
-          value={index}
-          isChecked={isActive || isSemiChecked}
-          isSemiChecked={isSemiChecked}
-          isDisabled={isDisabled}
-          tweakStyles={checkboxStyles}
-          onSelect={(v) => onToggleCheckbox(index, v.isSelected)}
-        >
-          {children}
-        </Checkbox>
-      ) : (
-        children
-      )}
-    </ScrollIntoViewIfNeeded>
-  );
-};
+import { ReactNode, MouseEvent, FC } from 'react';
+import clsx from 'clsx';
+import { Classes } from 'jss';
+import { addDataAttributes, isNotEmpty } from '../../../helpers';
+import { Checkbox } from '../../Checkbox';
+import { ScrollIntoViewIfNeeded } from '../../ScrollIntoViewIfNeeded';
+import { checkboxStyles } from './SelectListItem.styles';
+
+export interface ISelectListItemProps {
+  index: number;
+  isSemiChecked?: boolean;
+  isDisabled?: boolean;
+  isActive?: boolean;
+  isFocused?: boolean;
+  children: ReactNode;
+  classes: Classes<'cellWithCheckbox' | 'cell' | 'focused' | 'active' | 'disabled'>;
+  onOptionSelect(index: number, event: MouseEvent<HTMLElement>): void;
+  onToggleCheckbox?(index: number, isSelected: boolean): void;
+}
+
+export const SelectListItem: FC<ISelectListItemProps> = ({
+  classes,
+  index,
+  isSemiChecked,
+  isDisabled,
+  isActive,
+  children,
+  isFocused,
+  onOptionSelect,
+  onToggleCheckbox,
+}) => {
+  const isMultiSelect = isNotEmpty(onToggleCheckbox);
+
+  return (
+    <ScrollIntoViewIfNeeded
+      active={isFocused}
+      options={{ block: 'nearest' }}
+      className={clsx(classes.cell, {
+        [classes.cellWithCheckbox]: isMultiSelect,
+        [classes.focused]: isFocused,
+        [classes.active]: isActive && !isMultiSelect,
+        [classes.disabled]: isDisabled,
+      })}
+      {...addDataAttributes({
+        disabled: isDisabled,
+        active: isActive,
+        focused: isFocused,
+      })}
+      onClick={!isDisabled && !isMultiSelect ? (event) => onOptionSelect(index, event) : undefined}
+    >
+      {isMultiSelect ? (
+        <Checkbox
+          value={index}
+          isChecked={isActive || isSemiChecked}
+          isSemiChecked={isSemiChecked}
+          isDisabled={isDisabled}
+          tweakStyles={checkboxStyles}
+          onSelect={(v) => onToggleCheckbox(index, v.isSelected)}
+        >
+          {children}
+        </Checkbox>
+      ) : (
+        children
+      )}
+    </ScrollIntoViewIfNeeded>
+  );
+};

package/src/components/Select/constants.ts

@@ -1,2 +1,2 @@
-export const DEFAULT_OPTION_INDEX = -2;
-export const ALL_OPTION_INDEX = -1;
+export const DEFAULT_OPTION_INDEX = -2;
+export const ALL_OPTION_INDEX = -1;

package/src/components/Select/helpers.ts

@@ -1,29 +1,26 @@
-import { isNotEmpty } from '../../helpers';
-import type { IMultipleSelectProps, ISelectProps } from './Select';
-import { IMultipleSelectValue } from './types';
-
-export const defaultIsOptionDisabled = <Value>(option: Value): boolean =>
-  typeof option === 'object' &&
-  option !== null &&
-  ((option as { isDisabled?: boolean })?.isDisabled ?? false);
-
-export const defaultConvertFunction = (v: unknown) =>
-  v === undefined ? undefined : String(v);
-
-export const defaultCompareFunction = <Value>(v1: Value, v2: Value) =>
-  v1 === v2;
-
-export const getDefaultConvertToIdFunction =
-  <Value>(
-    convertValueToString: (value: Value) => string | undefined,
-  ): ((value: Value) => string | undefined) =>
-  (value) =>
-    isNotEmpty((value as { id: unknown })?.id)
-      ? String((value as { id: unknown }).id)
-      : convertValueToString(value);
-
-export const isMultiSelectValue = <Value>(
-  props: ISelectProps<Value> | IMultipleSelectProps<Value>,
-  _value: Value | IMultipleSelectValue<Value> | undefined,
-): _value is IMultipleSelectValue<Value> | undefined =>
-  props.isMultiSelect === true;
+import { isNotEmpty } from '../../helpers';
+import type { IMultipleSelectProps, ISelectProps } from './Select';
+import { IMultipleSelectValue } from './types';
+
+export const defaultIsOptionDisabled = <Value>(option: Value): boolean =>
+  typeof option === 'object' &&
+  option !== null &&
+  ((option as { isDisabled?: boolean })?.isDisabled ?? false);
+
+export const defaultConvertFunction = (v: unknown) => (v === undefined ? undefined : String(v));
+
+export const defaultCompareFunction = <Value>(v1: Value, v2: Value) => v1 === v2;
+
+export const getDefaultConvertToIdFunction =
+  <Value>(
+    convertValueToString: (value: Value) => string | undefined,
+  ): ((value: Value) => string | undefined) =>
+  (value) =>
+    isNotEmpty((value as { id: unknown })?.id)
+      ? String((value as { id: unknown }).id)
+      : convertValueToString(value);
+
+export const isMultiSelectValue = <Value>(
+  props: ISelectProps<Value> | IMultipleSelectProps<Value>,
+  _value: Value | IMultipleSelectValue<Value> | undefined,
+): _value is IMultipleSelectValue<Value> | undefined => props.isMultiSelect === true;

package/src/components/Select/index.ts

@@ -1,4 +1,4 @@
-export * from './Select';
-export type { IMultipleSelectValue } from './types';
-export type { SelectStyles } from './Select.styles';
-export type { SelectListStyles } from './SelectList/SelectList.styles';
+export * from './Select';
+export type { IMultipleSelectValue } from './types';
+export type { SelectStyles } from './Select.styles';
+export type { SelectListStyles } from './SelectList/SelectList.styles';

package/src/components/Select/types.ts

@@ -1 +1 @@
-export type IMultipleSelectValue<Value> = Array<NonNullable<Value>>;
+export type IMultipleSelectValue<Value> = Array<NonNullable<Value>>;