@true-engineering/true-react-common-ui-kit 3.32.0 → 3.33.1

package/src/theme/helpers.ts

@@ -1,76 +1,76 @@
-import { createUseStyles, Styles } from 'react-jss';
-import merge from 'lodash-es/merge';
-import {
-  isArrayNotEmpty,
-  isNotEmpty,
-  mergeStyles,
-} from '@true-engineering/true-react-platform-helpers';
-import { getTheme } from './Provider';
-import { IComponentName, IStyles, IUseStyles } from './types';
-
-const EMPTY_STYLES = {};
-
-const isTweakStyle = (key: string): boolean => key.startsWith('tweak');
-
-const cleanStyles = <T>(tweakStyles?: T): T =>
-  isNotEmpty(tweakStyles) && Object.keys(tweakStyles).some((key) => !isTweakStyle(key))
-    ? tweakStyles
-    : (EMPTY_STYLES as T);
-
-const checkStyles = (componentName: string, styles: Record<string, unknown>): void => {
-  const invalidClasses = Object.keys(styles).reduce((acc, key) => {
-    if (isTweakStyle(key)) {
-      acc.push(key);
-    }
-    return acc;
-  }, [] as string[]);
-
-  if (isArrayNotEmpty(invalidClasses)) {
-    console.error(
-      `${componentName}: Названия классов не должны начинаться со слова "tweak": ${invalidClasses}`,
-    );
-  }
-};
-
-export const areStylesThemed = (styles: Record<string, unknown>): boolean =>
-  // eslint-disable-next-line no-underscore-dangle
-  styles.__themed === true;
-
-/**
- * Подмешивает стили из темы. Мутирует, добавляя специально поле,
- * по которому можно определить была ли уже произведена мутация ранее,
- * тем самым сохраняя ссылку на объект и позволяя этим кэшировать JSS стили
- */
-export const themedStyles = <T>(styles: T, themeComponentStyles: T): T => {
-  merge(styles, themeComponentStyles); // mutation !!!!
-  Object.defineProperty(styles, '__themed', { value: true });
-  return styles;
-};
-
-export function createThemedStyles<C extends string, P>(styles: IStyles<C, P>): IUseStyles<C, P>;
-
-export function createThemedStyles<C extends string, P>(
-  componentName: IComponentName,
-  styles: IStyles<C, P>,
-): IUseStyles<C, P>;
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function createThemedStyles<C extends string, P>(...args: any[]): IUseStyles<C, P> {
-  const shouldUseTheme = args.length > 1;
-  const styles: IStyles<C, P> = shouldUseTheme ? args[1] : args[0];
-  const componentName: IComponentName | undefined = shouldUseTheme ? args[0] : undefined;
-
-  if (process.env.NODE_ENV !== 'production') {
-    checkStyles(componentName ?? 'LocalComponent', styles);
-  }
-  const useStyles = createUseStyles<C, P>((tweakStyles) => {
-    const theme = getTheme();
-    return mergeStyles(
-      styles as Styles<C, P>,
-      isNotEmpty(componentName) ? (theme?.components?.[componentName] as Styles<C, P>) : undefined,
-      tweakStyles,
-    );
-  });
-
-  return (data) => useStyles(isNotEmpty(data) ? { ...data, theme: cleanStyles(data.theme) } : data);
-}
+import { createUseStyles, Styles } from 'react-jss';
+import merge from 'lodash-es/merge';
+import {
+  isArrayNotEmpty,
+  isNotEmpty,
+  mergeStyles,
+} from '@true-engineering/true-react-platform-helpers';
+import { getTheme } from './Provider';
+import { IComponentName, IStyles, IUseStyles } from './types';
+
+const EMPTY_STYLES = {};
+
+const isTweakStyle = (key: string): boolean => key.startsWith('tweak');
+
+const cleanStyles = <T>(tweakStyles?: T): T =>
+  isNotEmpty(tweakStyles) && Object.keys(tweakStyles).some((key) => !isTweakStyle(key))
+    ? tweakStyles
+    : (EMPTY_STYLES as T);
+
+const checkStyles = (componentName: string, styles: Record<string, unknown>): void => {
+  const invalidClasses = Object.keys(styles).reduce((acc, key) => {
+    if (isTweakStyle(key)) {
+      acc.push(key);
+    }
+    return acc;
+  }, [] as string[]);
+
+  if (isArrayNotEmpty(invalidClasses)) {
+    console.error(
+      `${componentName}: Названия классов не должны начинаться со слова "tweak": ${invalidClasses}`,
+    );
+  }
+};
+
+export const areStylesThemed = (styles: Record<string, unknown>): boolean =>
+  // eslint-disable-next-line no-underscore-dangle
+  styles.__themed === true;
+
+/**
+ * Подмешивает стили из темы. Мутирует, добавляя специально поле,
+ * по которому можно определить была ли уже произведена мутация ранее,
+ * тем самым сохраняя ссылку на объект и позволяя этим кэшировать JSS стили
+ */
+export const themedStyles = <T>(styles: T, themeComponentStyles: T): T => {
+  merge(styles, themeComponentStyles); // mutation !!!!
+  Object.defineProperty(styles, '__themed', { value: true });
+  return styles;
+};
+
+export function createThemedStyles<C extends string, P>(styles: IStyles<C, P>): IUseStyles<C, P>;
+
+export function createThemedStyles<C extends string, P>(
+  componentName: IComponentName,
+  styles: IStyles<C, P>,
+): IUseStyles<C, P>;
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function createThemedStyles<C extends string, P>(...args: any[]): IUseStyles<C, P> {
+  const shouldUseTheme = args.length > 1;
+  const styles: IStyles<C, P> = shouldUseTheme ? args[1] : args[0];
+  const componentName: IComponentName | undefined = shouldUseTheme ? args[0] : undefined;
+
+  if (process.env.NODE_ENV !== 'production') {
+    checkStyles(componentName ?? 'LocalComponent', styles);
+  }
+  const useStyles = createUseStyles<C, P>((tweakStyles) => {
+    const theme = getTheme();
+    return mergeStyles(
+      styles as Styles<C, P>,
+      isNotEmpty(componentName) ? (theme?.components?.[componentName] as Styles<C, P>) : undefined,
+      tweakStyles,
+    );
+  });
+
+  return (data) => useStyles(isNotEmpty(data) ? { ...data, theme: cleanStyles(data.theme) } : data);
+}

package/src/types.ts

@@ -7,16 +7,24 @@ import {
 } from 'react';
 import { Modifier, Placement } from 'react-overlays/usePopper';
 
+export interface ITestIdProps {
+  testId?: string;
+}
+
 export interface IDataAttributes {
   [key: string]: unknown;
 }
 
-export interface ICommonProps<TweakStyles> {
+export interface IDataAttributesProps extends ITestIdProps {
   data?: IDataAttributes;
-  testId?: string;
+}
+
+export interface ITweakStylesProps<TweakStyles> {
   tweakStyles?: TweakStyles;
 }
 
+export type ICommonProps<TweakStyles> = IDataAttributesProps & ITweakStylesProps<TweakStyles>;
+
 export interface IDropdownWithPopperOptions {
   shouldUsePopper?: boolean;
   shouldRenderInBody?: boolean;

package/src/vite-env.d.ts

@@ -1 +1 @@
-/// <reference types="vite/client" />
+/// <reference types="vite/client" />