@true-engineering/true-react-common-ui-kit 2.7.0 → 3.0.0-alpha.1

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

@@ -1,72 +1,71 @@
-import { colors, dimensions, helpers } from '../../../../theme';
-import { ComponentStyles } from '../../../../types';
-
-export const ROW_HEIGHT = 40;
-export const CONTAINER_PADDING = 10;
-export const CELL_PADDING = [10, 20];
-
-export const styles = {
-  root: {
-    borderRadius: dimensions.BORDER_RADIUS_SMALL,
-    boxShadow: '0 13px 74px -27px rgba(0, 0, 0, 0.11)',
-    boxSizing: 'border-box',
-    padding: [CONTAINER_PADDING, 0],
-    fontSize: 16,
-    overflow: 'hidden',
-  },
-
-  withListHeader: {
-    paddingTop: 0,
-  },
-
-  listHeader: {
-    '& + $list': {
-      borderTop: [1, 'solid', colors.BORDER_LIGHT],
-    },
-  },
-
-  list: {
-    height: '100%',
-    maxHeight: ROW_HEIGHT * 6,
-    cursor: 'pointer',
-    backgroundColor: colors.CLASSIC_WHITE,
-
-    ...helpers.withScrollBar,
-  },
-
-  cell: {
-    display: 'flex',
-    cursor: 'pointer',
-    minHeight: ROW_HEIGHT,
-    width: 'auto',
-    padding: CELL_PADDING,
-    alignItems: 'center',
-    boxSizing: 'border-box',
-    fontSize: 14,
-  },
-
-  cellWithCheckbox: {
-    padding: 0,
-  },
-
-  noMatchesLabel: {
-    pointerEvents: 'none',
-  },
-
-  focused: {},
-
-  active: {},
-
-  disabled: {
-    cursor: 'default',
-  },
-
-  loading: {
-    cursor: 'default',
-    pointerEvents: 'none',
-  },
-
-  defaultCell: {},
-};
-
-export type SelectListStyles = ComponentStyles<typeof styles>;
+import { colors, createThemedStyles, dimensions, helpers, ITweakStyles } from '../../../../theme';
+
+export const ROW_HEIGHT = 40;
+export const CONTAINER_PADDING = 10;
+export const CELL_PADDING = [10, 20];
+
+export const useStyles = createThemedStyles('SelectList', {
+  root: {
+    borderRadius: dimensions.BORDER_RADIUS_SMALL,
+    boxShadow: '0 13px 74px -27px rgba(0, 0, 0, 0.11)',
+    boxSizing: 'border-box',
+    padding: [CONTAINER_PADDING, 0],
+    fontSize: 16,
+    overflow: 'hidden',
+  },
+
+  withListHeader: {
+    paddingTop: 0,
+  },
+
+  listHeader: {
+    '& + $list': {
+      borderTop: [1, 'solid', colors.BORDER_LIGHT],
+    },
+  },
+
+  list: {
+    height: '100%',
+    maxHeight: ROW_HEIGHT * 6,
+    cursor: 'pointer',
+    backgroundColor: colors.CLASSIC_WHITE,
+
+    ...helpers.withScrollBar,
+  },
+
+  cell: {
+    display: 'flex',
+    cursor: 'pointer',
+    minHeight: ROW_HEIGHT,
+    width: 'auto',
+    padding: CELL_PADDING,
+    alignItems: 'center',
+    boxSizing: 'border-box',
+    fontSize: 14,
+  },
+
+  cellWithCheckbox: {
+    padding: 0,
+  },
+
+  noMatchesLabel: {
+    pointerEvents: 'none',
+  },
+
+  focused: {},
+
+  active: {},
+
+  disabled: {
+    cursor: 'default',
+  },
+
+  loading: {
+    cursor: 'default',
+    pointerEvents: 'none',
+  },
+
+  defaultCell: {},
+});
+
+export type ISelectListStyles = ITweakStyles<typeof useStyles>;

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

@@ -1,158 +1,157 @@
-import { ReactNode, useMemo, MouseEvent } from 'react';
-import clsx from 'clsx';
-import {
-  isNotEmpty,
-  isReactNodeNotEmpty,
-  isStringNotEmpty,
-} from '@true-engineering/true-react-platform-helpers';
-import { useTheme } from '../../../../hooks';
-import { ICommonProps } from '../../../../types';
-import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
-import { ALL_OPTION_INDEX, DEFAULT_OPTION_INDEX } from '../../constants';
-import { IMultipleSelectValue } from '../../types';
-import { SelectListItem } from '../SelectListItem';
-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]: isReactNodeNotEmpty(customListHeader),
-      })}
-    >
-      {isReactNodeNotEmpty(customListHeader) && (
-        <div className={classes.listHeader}>{customListHeader}</div>
-      )}
-      <div className={classes.list} data-testid={testId}>
-        {isLoading ? (
-          <div className={clsx(classes.cell, classes.loading)}>{loadingLabel}</div>
-        ) : (
-          <>
-            {isStringNotEmpty(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>
-            )}
-            {isStringNotEmpty(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 {
+  addDataTestId,
+  isNotEmpty,
+  isReactNodeNotEmpty,
+  isStringNotEmpty,
+} from '@true-engineering/true-react-platform-helpers';
+import { ICommonProps } from '../../../../types';
+import { ScrollIntoViewIfNeeded } from '../../../ScrollIntoViewIfNeeded';
+import { ALL_OPTION_INDEX, DEFAULT_OPTION_INDEX } from '../../constants';
+import { IMultipleSelectValue } from '../../types';
+import { SelectListItem } from '../SelectListItem';
+import { useStyles, ISelectListStyles } from './SelectList.styles';
+
+export interface ISelectListProps<Value> extends ICommonProps<ISelectListStyles> {
+  options: Value[];
+  focusedIndex?: number;
+  activeValue?: Value | Value[];
+  noMatchesLabel?: string;
+  isLoading?: boolean;
+  loadingLabel?: ReactNode;
+  defaultOptionLabel?: 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 = useStyles({ theme: 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]: isReactNodeNotEmpty(customListHeader),
+      })}
+    >
+      {isReactNodeNotEmpty(customListHeader) && (
+        <div className={classes.listHeader}>{customListHeader}</div>
+      )}
+      <div className={classes.list} {...addDataTestId(testId)}>
+        {isLoading ? (
+          <div className={clsx(classes.cell, classes.loading)}>{loadingLabel}</div>
+        ) : (
+          <>
+            {isStringNotEmpty(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>
+            )}
+            {isStringNotEmpty(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/components/SelectList/index.ts

@@ -1,2 +1,2 @@
-export * from './SelectList';
-export type { SelectListStyles } from './SelectList.styles';
+export * from './SelectList';
+export type { ISelectListStyles } from './SelectList.styles';

package/src/components/Select/components/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 { ICheckboxStyles } from '../../../Checkbox';
+import { CELL_PADDING } from '../SelectList/SelectList.styles';
+
+export const checkboxStyles: ICheckboxStyles = {
+  root: {
+    padding: CELL_PADDING,
+    width: '100%',
+  },
+
+  input: {
+    // иначе будет фокуситься и энтер будет вызывать изменение нескольких опций
+    display: 'none',
+  },
+};

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

@@ -1,68 +1,68 @@
-import { ReactNode, MouseEvent, FC } from 'react';
-import clsx from 'clsx';
-import { Classes } from 'jss';
-import { isNotEmpty } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } 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>
-  );
-};
+import { ReactNode, MouseEvent, FC } from 'react';
+import clsx from 'clsx';
+import { Classes } from 'jss';
+import { isNotEmpty } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } 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'>; // TODO: !!!
+  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/components/SelectListItem/index.ts

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

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

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

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;