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

package/src/components/FiltersPane/FilterSelect/index.ts

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

package/src/components/FiltersPane/FilterSelect/locales.ts

@@ -1,37 +1,37 @@
-import merge from 'lodash-es/merge';
-
-export interface ISelectLocale {
-  clear: string;
-  all: string;
-  chosen: string;
-  searchPlaceholder: string;
-  nothingFound: string;
-}
-
-export const SelectLocales: Record<string, ISelectLocale> = {
-  ru: {
-    clear: 'Очистить',
-    all: 'Все',
-    chosen: 'Выбранные',
-    nothingFound: 'Ничего не найдено',
-    searchPlaceholder: 'Поиск',
-  },
-
-  en: {
-    clear: 'Clear',
-    all: 'All',
-    chosen: 'Chosen',
-    nothingFound: 'Nothing found',
-    searchPlaceholder: 'Search',
-  },
-};
-
-export type ISelectLocaleKey = keyof typeof SelectLocales;
-
-export const DEFAULT_LOCALE: ISelectLocaleKey = 'en';
-
-export const getLocale = (
-  key: ISelectLocaleKey = DEFAULT_LOCALE,
-  custom?: Partial<ISelectLocale>,
-  custom2?: Partial<ISelectLocale>,
-): ISelectLocale => merge({}, SelectLocales[key], custom, custom2);
+import merge from 'lodash-es/merge';
+
+export interface ISelectLocale {
+  clear: string;
+  all: string;
+  chosen: string;
+  searchPlaceholder: string;
+  nothingFound: string;
+}
+
+export const SelectLocales: Record<string, ISelectLocale> = {
+  ru: {
+    clear: 'Очистить',
+    all: 'Все',
+    chosen: 'Выбранные',
+    nothingFound: 'Ничего не найдено',
+    searchPlaceholder: 'Поиск',
+  },
+
+  en: {
+    clear: 'Clear',
+    all: 'All',
+    chosen: 'Chosen',
+    nothingFound: 'Nothing found',
+    searchPlaceholder: 'Search',
+  },
+};
+
+export type ISelectLocaleKey = keyof typeof SelectLocales;
+
+export const DEFAULT_LOCALE: ISelectLocaleKey = 'en';
+
+export const getLocale = (
+  key: ISelectLocaleKey = DEFAULT_LOCALE,
+  custom?: Partial<ISelectLocale>,
+  custom2?: Partial<ISelectLocale>,
+): ISelectLocale => merge({}, SelectLocales[key], custom, custom2);

package/src/components/FiltersPane/FilterValueView/FilterValueView.styles.tsx

@@ -1,15 +1,15 @@
-import { ComponentStyles } from '../../../types';
-
-export const styles = {
-  text: {
-    overflow: 'hidden',
-    textOverflow: 'ellipsis',
-    whiteSpace: 'nowrap',
-  },
-
-  count: {
-    whiteSpace: 'pre',
-  },
-};
-
-export type FilterValueViewStyles = ComponentStyles<typeof styles>;
+import { ComponentStyles } from '../../../types';
+
+export const styles = {
+  text: {
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+  },
+
+  count: {
+    whiteSpace: 'pre',
+  },
+};
+
+export type FilterValueViewStyles = ComponentStyles<typeof styles>;

package/src/components/FiltersPane/FilterValueView/FilterValueView.tsx

@@ -1,186 +1,166 @@
-import { useMemo } from 'react';
-import { format } from 'date-fns';
-
-import { useTheme } from '../../../hooks';
-import { IFilterWrapperProps } from '../FilterWrapper';
-import { IMultiSelectListValues } from '../../MultiSelectList';
-import { IDateRangeConfigItem, IFilterWithDatesValue, IPeriod } from '../types';
-import { getLocale } from '../locales';
-
-import { styles } from './FilterValueView.styles';
-
-const DEFAULT_DATE_FORMAT = 'dd.MM.yyyy';
-
-const defaultGetValueView = <T,>(v: T): string => String(v);
-
-export function FilterValueView<Values, Key extends keyof Values>({
-  locale,
-  localeKey,
-  filter,
-  value,
-}: Omit<
-  IFilterWrapperProps<Values, Key>,
-  'onChange' | 'filtersPaneRef'
->): JSX.Element {
-  const { classes } = useTheme('FilterWrapper', styles);
-
-  if (value === undefined || value === null) {
-    return <></>;
-  }
-
-  const translatesLocaleKey = filter.localeKey ?? localeKey;
-  const translates = useMemo(
-    () => getLocale(translatesLocaleKey, locale, filter.locale),
-    [localeKey, locale, filter.locale],
-  );
-
-  if (filter.getSelectedValueView !== undefined) {
-    return (
-      <span className={classes.text}>{filter.getSelectedValueView(value)}</span>
-    );
-  }
-
-  const isMultiple =
-    filter.type === 'custom' && filter.valueViewType === 'multiple';
-  const isRange = filter.type === 'custom' && filter.valueViewType === 'range';
-  const isDate =
-    filter.type === 'dateRange' || filter.type === 'dateRangeWithoutPeriod';
-
-  const displayValue = (v: any): string => {
-    if (v === undefined || v === null) {
-      return '';
-    }
-
-    if (v instanceof Date) {
-      return format(
-        v,
-        (filter as IDateRangeConfigItem<IFilterWithDatesValue>).dateFormat ||
-          DEFAULT_DATE_FORMAT,
-      );
-    }
-
-    if (typeof v === 'object' && v.value !== undefined) {
-      return String(v.value);
-    }
-
-    if (
-      typeof v === 'string' ||
-      typeof v === 'number' ||
-      typeof v === 'boolean'
-    ) {
-      return String(v);
-    }
-
-    console.warn(
-      `%c Ошибка конфигурации фильтра ${filter.name}. Невозможно отобразить значение фильтра. Задайте filterValueViewComponent или filterValueViewType.`,
-      'background: orange; color: black',
-    );
-
-    return '';
-  };
-
-  if (filter.type === 'select') {
-    const getView = filter.getValueView ?? defaultGetValueView;
-    return <span className={classes.text}>{getView(value)}</span>;
-  }
-
-  if (filter.type === 'multiSelect') {
-    const multiSelectValue = value as unknown as IMultiSelectListValues<any>;
-    const getView = filter.getValueView ?? defaultGetValueView;
-    const { include } = multiSelectValue;
-
-    return (
-      <>
-        {Array.isArray(include) && include.length > 0 && (
-          <>
-            <span className={classes.text}>{getView(include[0])}</span>
-            <span className={classes.count}>
-              {include.length > 1 && ` (+${include.length - 1})`}
-            </span>
-          </>
-        )}
-      </>
-    );
-  }
-
-  if (filter.type === 'interval') {
-    const intervalValue = value as unknown as number[];
-    const intervalValueFrom = intervalValue[0];
-    const intervalValueTo = intervalValue[1];
-
-    const intervals = [];
-    if (intervalValueFrom !== undefined) {
-      intervals.push(
-        `${translates.from.toLowerCase()} ${String(intervalValueFrom)}`,
-      );
-    }
-    if (intervalValueTo !== undefined) {
-      intervals.push(
-        `${translates.to.toLowerCase()} ${String(intervalValueTo)}`,
-      );
-    }
-
-    return <span className={classes.text}>{intervals.join(' ')}</span>;
-  }
-
-  if (isMultiple) {
-    return (
-      <>
-        {Array.isArray(value) && value.length > 0 && (
-          <>
-            <span className={classes.text}>{displayValue(value[0])}</span>
-            <span className={classes.count}>
-              {value.length > 1 && ` (+${value.length - 1})`}
-            </span>
-          </>
-        )}
-      </>
-    );
-  }
-
-  if (isDate) {
-    const { from, to, periodType, label } = value as unknown as IPeriod;
-    const hasFrom = from !== undefined && from !== null;
-    const hasTo = to !== undefined && to !== null;
-
-    if (periodType !== 'CUSTOM') {
-      return <span className={classes.text}>{displayValue(label)}</span>;
-    }
-
-    const range = [];
-    if (hasFrom) {
-      if (!hasTo) {
-        range.push(translates.from.toLowerCase());
-      }
-      range.push(displayValue(from));
-    }
-    if (hasTo) {
-      if (hasFrom) {
-        range.push('—');
-      } else {
-        range.push(translates.to.toLowerCase());
-      }
-      range.push(displayValue(to));
-    }
-
-    return <span className={classes.text}>{range.join(' ')}</span>;
-  }
-
-  if (isRange && Array.isArray(value)) {
-    const rangeValue = value as unknown as number[];
-    const rangeValueFrom = rangeValue[0];
-    const rangeValueTo = rangeValue[1];
-
-    const range = [];
-    if (rangeValueFrom !== undefined) {
-      range.push(`${translates.from.toLowerCase()} ${String(rangeValueFrom)}`);
-    }
-    if (rangeValueTo !== undefined) {
-      range.push(`${translates.to.toLowerCase()} ${String(rangeValueTo)}`);
-    }
-
-    return <span className={classes.text}>{range.join(' ')}</span>;
-  }
-
-  return <span className={classes.text}>{displayValue(value)}</span>;
-}
+import { useMemo } from 'react';
+import { format } from 'date-fns';
+import { useTheme } from '../../../hooks';
+import { IMultiSelectListValues } from '../../MultiSelectList';
+import { IFilterWrapperProps } from '../FilterWrapper';
+import { getLocale } from '../locales';
+import { IDateRangeConfigItem, IFilterWithDatesValue, IPeriod } from '../types';
+import { styles } from './FilterValueView.styles';
+
+const DEFAULT_DATE_FORMAT = 'dd.MM.yyyy';
+
+const defaultGetValueView = <T,>(v: T): string => String(v);
+
+export function FilterValueView<Values, Key extends keyof Values>({
+  locale,
+  localeKey,
+  filter,
+  value,
+}: Omit<IFilterWrapperProps<Values, Key>, 'onChange' | 'filtersPaneRef'>): JSX.Element {
+  const { classes } = useTheme('FilterWrapper', styles);
+
+  if (value === undefined || value === null) {
+    return <></>;
+  }
+
+  const translatesLocaleKey = filter.localeKey ?? localeKey;
+  const translates = useMemo(
+    () => getLocale(translatesLocaleKey, locale, filter.locale),
+    [localeKey, locale, filter.locale],
+  );
+
+  if (filter.getSelectedValueView !== undefined) {
+    return <span className={classes.text}>{filter.getSelectedValueView(value)}</span>;
+  }
+
+  const isMultiple = filter.type === 'custom' && filter.valueViewType === 'multiple';
+  const isRange = filter.type === 'custom' && filter.valueViewType === 'range';
+  const isDate = filter.type === 'dateRange' || filter.type === 'dateRangeWithoutPeriod';
+
+  const displayValue = (v: any): string => {
+    if (v === undefined || v === null) {
+      return '';
+    }
+
+    if (v instanceof Date) {
+      return format(
+        v,
+        (filter as IDateRangeConfigItem<IFilterWithDatesValue>).dateFormat || DEFAULT_DATE_FORMAT,
+      );
+    }
+
+    if (typeof v === 'object' && v.value !== undefined) {
+      return String(v.value);
+    }
+
+    if (typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean') {
+      return String(v);
+    }
+
+    console.warn(
+      `%c Ошибка конфигурации фильтра ${filter.name}. Невозможно отобразить значение фильтра. Задайте filterValueViewComponent или filterValueViewType.`,
+      'background: orange; color: black',
+    );
+
+    return '';
+  };
+
+  if (filter.type === 'select') {
+    const getView = filter.getValueView ?? defaultGetValueView;
+    return <span className={classes.text}>{getView(value)}</span>;
+  }
+
+  if (filter.type === 'multiSelect') {
+    const multiSelectValue = value as unknown as IMultiSelectListValues<any>;
+    const getView = filter.getValueView ?? defaultGetValueView;
+    const { include } = multiSelectValue;
+
+    return (
+      <>
+        {Array.isArray(include) && include.length > 0 && (
+          <>
+            <span className={classes.text}>{getView(include[0])}</span>
+            <span className={classes.count}>
+              {include.length > 1 && ` (+${include.length - 1})`}
+            </span>
+          </>
+        )}
+      </>
+    );
+  }
+
+  if (filter.type === 'interval') {
+    const intervalValue = value as unknown as number[];
+    const intervalValueFrom = intervalValue[0];
+    const intervalValueTo = intervalValue[1];
+
+    const intervals = [];
+    if (intervalValueFrom !== undefined) {
+      intervals.push(`${translates.from.toLowerCase()} ${String(intervalValueFrom)}`);
+    }
+    if (intervalValueTo !== undefined) {
+      intervals.push(`${translates.to.toLowerCase()} ${String(intervalValueTo)}`);
+    }
+
+    return <span className={classes.text}>{intervals.join(' ')}</span>;
+  }
+
+  if (isMultiple) {
+    return (
+      <>
+        {Array.isArray(value) && value.length > 0 && (
+          <>
+            <span className={classes.text}>{displayValue(value[0])}</span>
+            <span className={classes.count}>{value.length > 1 && ` (+${value.length - 1})`}</span>
+          </>
+        )}
+      </>
+    );
+  }
+
+  if (isDate) {
+    const { from, to, periodType, label } = value as unknown as IPeriod;
+    const hasFrom = from !== undefined && from !== null;
+    const hasTo = to !== undefined && to !== null;
+
+    if (periodType !== 'CUSTOM') {
+      return <span className={classes.text}>{displayValue(label)}</span>;
+    }
+
+    const range = [];
+    if (hasFrom) {
+      if (!hasTo) {
+        range.push(translates.from.toLowerCase());
+      }
+      range.push(displayValue(from));
+    }
+    if (hasTo) {
+      if (hasFrom) {
+        range.push('—');
+      } else {
+        range.push(translates.to.toLowerCase());
+      }
+      range.push(displayValue(to));
+    }
+
+    return <span className={classes.text}>{range.join(' ')}</span>;
+  }
+
+  if (isRange && Array.isArray(value)) {
+    const rangeValue = value as unknown as number[];
+    const rangeValueFrom = rangeValue[0];
+    const rangeValueTo = rangeValue[1];
+
+    const range = [];
+    if (rangeValueFrom !== undefined) {
+      range.push(`${translates.from.toLowerCase()} ${String(rangeValueFrom)}`);
+    }
+    if (rangeValueTo !== undefined) {
+      range.push(`${translates.to.toLowerCase()} ${String(rangeValueTo)}`);
+    }
+
+    return <span className={classes.text}>{range.join(' ')}</span>;
+  }
+
+  return <span className={classes.text}>{displayValue(value)}</span>;
+}

package/src/components/FiltersPane/FilterValueView/index.tsx

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

package/src/components/FiltersPane/FilterWithDates/FilterWithDates.styles.ts

@@ -1,60 +1,60 @@
-import { colors } from '../../../theme';
-import { ComponentStyles } from '../../../types';
-
-export const styles = {
-  root: {
-    background: colors.CLASSIC_WHITE,
-    position: 'relative',
-    zIndex: 20,
-  },
-
-  container: {
-    display: 'flex',
-    gap: 20,
-    padding: [8, 20],
-  },
-
-  containerItem: {
-    width: '50%',
-    height: 44,
-  },
-
-  btnRow: {
-    display: 'flex',
-    flexDirection: 'row-reverse',
-    justifyContent: 'space-between',
-    padding: 8,
-  },
-
-  datepicker: {},
-
-  tweakClearButton: {
-    text: {
-      color: colors.GREY_ACTIVE,
-
-      '&:hover, &:focus': {
-        color: colors.FONT_MEDIUM,
-      },
-
-      '&:active': {
-        color: colors.FONT_MEDIUM,
-      },
-    },
-  },
-
-  tweakBackButton: {
-    text: {
-      color: colors.GREY_ACTIVE,
-
-      '&:hover, &:focus': {
-        color: colors.FONT_MEDIUM,
-      },
-
-      '&:active': {
-        color: colors.FONT_MEDIUM,
-      },
-    },
-  },
-};
-
-export type FilterWithDatesStyles = ComponentStyles<typeof styles>;
+import { colors } from '../../../theme';
+import { ComponentStyles } from '../../../types';
+
+export const styles = {
+  root: {
+    background: colors.CLASSIC_WHITE,
+    position: 'relative',
+    zIndex: 20,
+  },
+
+  container: {
+    display: 'flex',
+    gap: 20,
+    padding: [8, 20],
+  },
+
+  containerItem: {
+    width: '50%',
+    height: 44,
+  },
+
+  btnRow: {
+    display: 'flex',
+    flexDirection: 'row-reverse',
+    justifyContent: 'space-between',
+    padding: 8,
+  },
+
+  datepicker: {},
+
+  tweakClearButton: {
+    text: {
+      color: colors.GREY_ACTIVE,
+
+      '&:hover, &:focus': {
+        color: colors.FONT_MEDIUM,
+      },
+
+      '&:active': {
+        color: colors.FONT_MEDIUM,
+      },
+    },
+  },
+
+  tweakBackButton: {
+    text: {
+      color: colors.GREY_ACTIVE,
+
+      '&:hover, &:focus': {
+        color: colors.FONT_MEDIUM,
+      },
+
+      '&:active': {
+        color: colors.FONT_MEDIUM,
+      },
+    },
+  },
+};
+
+export type FilterWithDatesStyles = ComponentStyles<typeof styles>;