@true-engineering/true-react-common-ui-kit 3.8.0 → 3.8.1

package/src/components/Toaster/Toaster.tsx

@@ -1,108 +1,108 @@
-import { FC, ReactNode, useEffect } from 'react';
-import clsx from 'clsx';
-import {
-  addDataTestId,
-  isNotEmpty,
-  isReactNodeNotEmpty,
-  isStringNotEmpty,
-} from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
-import { useTweakStyles } from '../../hooks';
-import { ICommonProps } from '../../types';
-import { CloseButton } from '../CloseButton';
-import { Icon } from '../Icon';
-import { DEFAULT_TIMEOUT } from './constants';
-import { IToasterType } from './types';
-import { useStyles, IToasterStyles } from './Toaster.styles';
-
-export interface IToasterProps extends ICommonProps<IToasterStyles> {
-  /** @default 'error' */
-  type?: IToasterType;
-  title?: string;
-  text?: string;
-  children?: ReactNode;
-  /**
-   * Время автоматического закрытия тостера в миллисекундах
-   * @default 7000
-   */
-  timeout?: number;
-  /** @default false */
-  hasCloseButton?: boolean;
-  /** @default false */
-  shouldCloseOnClick?: boolean;
-  onClose?: () => void;
-  onTimeEnd?: () => void;
-}
-
-export const Toaster: FC<IToasterProps> = ({
-  title,
-  type = 'error',
-  text,
-  timeout = DEFAULT_TIMEOUT,
-  data,
-  testId,
-  tweakStyles,
-  hasCloseButton = false,
-  shouldCloseOnClick = false,
-  children,
-  onClose,
-  onTimeEnd,
-}) => {
-  const classes = useStyles({ theme: tweakStyles });
-
-  const tweakCloseButtonStyles = useTweakStyles({
-    tweakStyles,
-    className: 'tweakCloseButton',
-    currentComponentName: 'Toaster',
-  });
-
-  let timeoutFunction: ReturnType<typeof setTimeout>;
-
-  useEffect(() => {
-    if (onTimeEnd === undefined) {
-      return;
-    }
-
-    const disappear = async () => {
-      await new Promise((resolve) => {
-        timeoutFunction = setTimeout(() => {
-          resolve(undefined);
-        }, timeout);
-      });
-
-      onTimeEnd();
-      clearTimeout(timeoutFunction);
-    };
-
-    disappear();
-
-    return () => clearTimeout(timeoutFunction);
-  }, []);
-
-  return (
-    <div
-      className={classes.root}
-      onClick={shouldCloseOnClick ? onClose : undefined}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
-    >
-      <div className={clsx(classes.iconContainer, classes[type])}>
-        <Icon type={`status-${type}`} />
-      </div>
-      <div>
-        {isStringNotEmpty(title) && <div className={classes.title}>{title}</div>}
-        {isStringNotEmpty(text) && <div className={classes.text}>{text}</div>}
-        {isReactNodeNotEmpty(children) && <div className={classes.content}>{children}</div>}
-      </div>
-      {hasCloseButton && isNotEmpty(onClose) && (
-        <div className={classes.close}>
-          <CloseButton
-            onClose={onClose}
-            iconType="close-window"
-            tweakStyles={tweakCloseButtonStyles}
-          />
-        </div>
-      )}
-    </div>
-  );
-};
+import { FC, ReactNode, useEffect } from 'react';
+import clsx from 'clsx';
+import {
+  addDataTestId,
+  isNotEmpty,
+  isReactNodeNotEmpty,
+  isStringNotEmpty,
+} from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { useTweakStyles } from '../../hooks';
+import { ICommonProps } from '../../types';
+import { CloseButton } from '../CloseButton';
+import { Icon } from '../Icon';
+import { DEFAULT_TIMEOUT } from './constants';
+import { IToasterType } from './types';
+import { useStyles, IToasterStyles } from './Toaster.styles';
+
+export interface IToasterProps extends ICommonProps<IToasterStyles> {
+  /** @default 'error' */
+  type?: IToasterType;
+  title?: string;
+  text?: string;
+  children?: ReactNode;
+  /**
+   * Время автоматического закрытия тостера в миллисекундах
+   * @default 7000
+   */
+  timeout?: number;
+  /** @default false */
+  hasCloseButton?: boolean;
+  /** @default false */
+  shouldCloseOnClick?: boolean;
+  onClose?: () => void;
+  onTimeEnd?: () => void;
+}
+
+export const Toaster: FC<IToasterProps> = ({
+  title,
+  type = 'error',
+  text,
+  timeout = DEFAULT_TIMEOUT,
+  data,
+  testId,
+  tweakStyles,
+  hasCloseButton = false,
+  shouldCloseOnClick = false,
+  children,
+  onClose,
+  onTimeEnd,
+}) => {
+  const classes = useStyles({ theme: tweakStyles });
+
+  const tweakCloseButtonStyles = useTweakStyles({
+    tweakStyles,
+    className: 'tweakCloseButton',
+    currentComponentName: 'Toaster',
+  });
+
+  let timeoutFunction: ReturnType<typeof setTimeout>;
+
+  useEffect(() => {
+    if (onTimeEnd === undefined) {
+      return;
+    }
+
+    const disappear = async () => {
+      await new Promise((resolve) => {
+        timeoutFunction = setTimeout(() => {
+          resolve(undefined);
+        }, timeout);
+      });
+
+      onTimeEnd();
+      clearTimeout(timeoutFunction);
+    };
+
+    disappear();
+
+    return () => clearTimeout(timeoutFunction);
+  }, []);
+
+  return (
+    <div
+      className={classes.root}
+      onClick={shouldCloseOnClick ? onClose : undefined}
+      {...addDataTestId(testId)}
+      {...addDataAttributes(data)}
+    >
+      <div className={clsx(classes.iconContainer, classes[type])}>
+        <Icon type={`status-${type}`} />
+      </div>
+      <div>
+        {isStringNotEmpty(title) && <div className={classes.title}>{title}</div>}
+        {isStringNotEmpty(text) && <div className={classes.text}>{text}</div>}
+        {isReactNodeNotEmpty(children) && <div className={classes.content}>{children}</div>}
+      </div>
+      {hasCloseButton && isNotEmpty(onClose) && (
+        <div className={classes.close}>
+          <CloseButton
+            onClose={onClose}
+            iconType="close-window"
+            tweakStyles={tweakCloseButtonStyles}
+          />
+        </div>
+      )}
+    </div>
+  );
+};

package/src/components/Tooltip/Tooltip.stories.tsx

@@ -1,19 +1,19 @@
-import { ComponentStory, ComponentMeta } from '@storybook/react';
-import { Tooltip } from './Tooltip';
-
-export default {
-  title: 'Data Display/Tooltip',
-  component: Tooltip,
-  args: {
-    text: 'Tooltip Text',
-    view: 'tooltip',
-    type: 'info',
-  },
-  argTypes: {
-    text: { control: 'text' },
-    view: { control: 'inline-radio', options: ['tooltip', 'hint'] },
-    type: { control: 'inline-radio', options: ['info', 'error'] },
-  },
-} as ComponentMeta<typeof Tooltip>;
-
-export const Default: ComponentStory<typeof Tooltip> = (args) => <Tooltip {...args} />;
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { Tooltip } from './Tooltip';
+
+export default {
+  title: 'Data Display/Tooltip',
+  component: Tooltip,
+  args: {
+    text: 'Tooltip Text',
+    view: 'tooltip',
+    type: 'info',
+  },
+  argTypes: {
+    text: { control: 'text' },
+    view: { control: 'inline-radio', options: ['tooltip', 'hint'] },
+    type: { control: 'inline-radio', options: ['info', 'error'] },
+  },
+} as ComponentMeta<typeof Tooltip>;
+
+export const Default: ComponentStory<typeof Tooltip> = (args) => <Tooltip {...args} />;

package/src/components/Tooltip/Tooltip.tsx

@@ -1,35 +1,35 @@
-import { FC, ReactNode } from 'react';
-import clsx from 'clsx';
-import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
-import { addDataAttributes } from '../../helpers';
-import { ICommonProps } from '../../types';
-import { useStyles, ITooltipStyles } from './Tooltip.styles';
-
-export interface ITooltipProps extends ICommonProps<ITooltipStyles> {
-  text: ReactNode;
-  /** @default 'tooltip' */
-  view?: 'tooltip' | 'hint';
-  /** @default 'info' */
-  type?: 'info' | 'error';
-}
-
-export const Tooltip: FC<ITooltipProps> = ({
-  text,
-  view = 'tooltip',
-  type = 'info',
-  data,
-  testId,
-  tweakStyles,
-}) => {
-  const classes = useStyles({ theme: tweakStyles });
-
-  return (
-    <div
-      className={clsx(classes.root, classes[view], classes[type])}
-      {...addDataTestId(testId)}
-      {...addDataAttributes(data)}
-    >
-      {text}
-    </div>
-  );
-};
+import { FC, ReactNode } from 'react';
+import clsx from 'clsx';
+import { addDataTestId } from '@true-engineering/true-react-platform-helpers';
+import { addDataAttributes } from '../../helpers';
+import { ICommonProps } from '../../types';
+import { useStyles, ITooltipStyles } from './Tooltip.styles';
+
+export interface ITooltipProps extends ICommonProps<ITooltipStyles> {
+  text: ReactNode;
+  /** @default 'tooltip' */
+  view?: 'tooltip' | 'hint';
+  /** @default 'info' */
+  type?: 'info' | 'error';
+}
+
+export const Tooltip: FC<ITooltipProps> = ({
+  text,
+  view = 'tooltip',
+  type = 'info',
+  data,
+  testId,
+  tweakStyles,
+}) => {
+  const classes = useStyles({ theme: tweakStyles });
+
+  return (
+    <div
+      className={clsx(classes.root, classes[view], classes[type])}
+      {...addDataTestId(testId)}
+      {...addDataAttributes(data)}
+    >
+      {text}
+    </div>
+  );
+};

package/src/components/Tooltip/types.ts

@@ -1 +1 @@
-export type ITooltipType = 'info' | 'warning';
+export type ITooltipType = 'info' | 'warning';

package/src/components/WithPopup/WithPopup.stories.tsx

@@ -67,6 +67,7 @@ export const Default = Template.bind({});
 Default.args = {
   isDisabled: false,
   shouldRenderInBody: true,
+  shouldHideOnScroll: false,
 };
 
 Default.parameters = {

package/src/components/WithPopup/WithPopup.tsx

@@ -25,6 +25,8 @@ export interface IWithPopupProps extends ICommonProps<IWithPopupStyles> {
   middlewares?: Middleware[];
   /** @default eventType === 'click' ? 'bottom-end' : 'top' */
   placement?: Placement;
+  /** @default false */
+  shouldHideOnScroll?: boolean;
   /** @default true */
   shouldRenderInBody?: boolean;
   /** @default 'click' */
@@ -44,6 +46,7 @@ export const WithPopup: FC<IWithPopupProps> = ({
   middlewares,
   eventType = 'click',
   placement = eventType === 'click' ? 'bottom-end' : 'top',
+  shouldHideOnScroll = false,
   shouldRenderInBody = false,
   hoverDelay = 0,
   popupOffset = DEFAULT_OFFSET,
@@ -85,7 +88,10 @@ export const WithPopup: FC<IWithPopupProps> = ({
     delay: { open: hoverDelay },
   });
   const click = useClick(context, { enabled: eventType === 'click', toggle: false });
-  const dismiss = useDismiss(context, { enabled: eventType === 'click' });
+  const dismiss = useDismiss(context, {
+    enabled: eventType === 'click',
+    ancestorScroll: shouldHideOnScroll,
+  });
 
   const { getReferenceProps, getFloatingProps } = useInteractions([hover, click, dismiss]);
 

package/src/helpers/popper-helpers.ts

@@ -1,17 +1,17 @@
-import { Modifier } from 'react-overlays/usePopper';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const minWidthModifier: Partial<Modifier<any, any>> = {
-  name: 'minWidth',
-  enabled: true,
-  phase: 'beforeWrite',
-  requires: ['computeStyles'],
-  fn: ({ state }) => {
-    state.styles.popper.minWidth = `${state.rects.reference.width}px`;
-  },
-  effect: ({ state }) => {
-    state.elements.popper.style.minWidth = `${
-      (state.elements.reference as HTMLElement).offsetWidth
-    }px`;
-  },
-};
+import { Modifier } from 'react-overlays/usePopper';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const minWidthModifier: Partial<Modifier<any, any>> = {
+  name: 'minWidth',
+  enabled: true,
+  phase: 'beforeWrite',
+  requires: ['computeStyles'],
+  fn: ({ state }) => {
+    state.styles.popper.minWidth = `${state.rects.reference.width}px`;
+  },
+  effect: ({ state }) => {
+    state.elements.popper.style.minWidth = `${
+      (state.elements.reference as HTMLElement).offsetWidth
+    }px`;
+  },
+};

package/src/hooks/use-dropdown.ts

@@ -1,84 +1,84 @@
-import { DependencyList, useEffect } from 'react';
-import usePopper, { VirtualElement } from 'react-overlays/usePopper';
-import { getScrollParent, minWidthModifier } from '../helpers';
-import { IDropdownWithPopperOptions } from '../types';
-
-export const useDropdown = ({
-  isOpen,
-  onDropdownClose,
-  referenceElement,
-  dropdownElement,
-  options,
-  dependenciesForPositionUpdating = [],
-}: {
-  isOpen: boolean;
-  referenceElement: VirtualElement | null | undefined;
-  dropdownElement: HTMLElement | null | undefined;
-  options?: IDropdownWithPopperOptions;
-  dependenciesForPositionUpdating?: DependencyList;
-  onDropdownClose: (event: Event) => void;
-}): ReturnType<typeof usePopper> | undefined => {
-  const {
-    shouldUsePopper = false,
-    shouldRenderInBody = false,
-    shouldHideOnScroll = false,
-    scrollParent = 'document',
-    canBeFlipped = false,
-    modifiers = [],
-    placement = 'bottom-start',
-    flipOptions,
-  } = options ?? {};
-
-  useEffect(() => {
-    if (!shouldHideOnScroll || !isOpen) {
-      return;
-    }
-
-    const scrollParentEl =
-      scrollParent === 'auto'
-        ? getScrollParent(referenceElement as Element)
-        : scrollParent === 'document'
-        ? document
-        : scrollParent;
-    scrollParentEl.addEventListener('scroll', onDropdownClose);
-
-    return () => {
-      scrollParentEl.removeEventListener('scroll', onDropdownClose);
-    };
-  }, [shouldHideOnScroll, isOpen]);
-
-  let popperData: ReturnType<typeof usePopper> | undefined;
-  if (shouldUsePopper) {
-    // TODO: Вытащить хук из под условия???
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    popperData = usePopper(referenceElement, dropdownElement, {
-      enabled: isOpen,
-      placement,
-      modifiers: [
-        ...(shouldRenderInBody ? [minWidthModifier] : []),
-        {
-          name: 'offset',
-          options: {
-            offset: [0, 6],
-          },
-        },
-        {
-          name: 'flip',
-          options: {
-            fallbackPlacements: canBeFlipped ? ['bottom-start', 'top-start'] : ['bottom-start'],
-            ...flipOptions,
-          },
-        },
-        ...modifiers,
-      ],
-    });
-  }
-
-  useEffect(() => {
-    if (dependenciesForPositionUpdating.length !== 0) {
-      popperData?.update();
-    }
-  }, dependenciesForPositionUpdating);
-
-  return popperData;
-};
+import { DependencyList, useEffect } from 'react';
+import usePopper, { VirtualElement } from 'react-overlays/usePopper';
+import { getScrollParent, minWidthModifier } from '../helpers';
+import { IDropdownWithPopperOptions } from '../types';
+
+export const useDropdown = ({
+  isOpen,
+  onDropdownClose,
+  referenceElement,
+  dropdownElement,
+  options,
+  dependenciesForPositionUpdating = [],
+}: {
+  isOpen: boolean;
+  referenceElement: VirtualElement | null | undefined;
+  dropdownElement: HTMLElement | null | undefined;
+  options?: IDropdownWithPopperOptions;
+  dependenciesForPositionUpdating?: DependencyList;
+  onDropdownClose: (event: Event) => void;
+}): ReturnType<typeof usePopper> | undefined => {
+  const {
+    shouldUsePopper = false,
+    shouldRenderInBody = false,
+    shouldHideOnScroll = false,
+    scrollParent = 'document',
+    canBeFlipped = false,
+    modifiers = [],
+    placement = 'bottom-start',
+    flipOptions,
+  } = options ?? {};
+
+  useEffect(() => {
+    if (!shouldHideOnScroll || !isOpen) {
+      return;
+    }
+
+    const scrollParentEl =
+      scrollParent === 'auto'
+        ? getScrollParent(referenceElement as Element)
+        : scrollParent === 'document'
+        ? document
+        : scrollParent;
+    scrollParentEl.addEventListener('scroll', onDropdownClose);
+
+    return () => {
+      scrollParentEl.removeEventListener('scroll', onDropdownClose);
+    };
+  }, [shouldHideOnScroll, isOpen]);
+
+  let popperData: ReturnType<typeof usePopper> | undefined;
+  if (shouldUsePopper) {
+    // TODO: Вытащить хук из под условия???
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    popperData = usePopper(referenceElement, dropdownElement, {
+      enabled: isOpen,
+      placement,
+      modifiers: [
+        ...(shouldRenderInBody ? [minWidthModifier] : []),
+        {
+          name: 'offset',
+          options: {
+            offset: [0, 6],
+          },
+        },
+        {
+          name: 'flip',
+          options: {
+            fallbackPlacements: canBeFlipped ? ['bottom-start', 'top-start'] : ['bottom-start'],
+            ...flipOptions,
+          },
+        },
+        ...modifiers,
+      ],
+    });
+  }
+
+  useEffect(() => {
+    if (dependenciesForPositionUpdating.length !== 0) {
+      popperData?.update();
+    }
+  }, dependenciesForPositionUpdating);
+
+  return popperData;
+};

package/src/hooks/use-is-mounted.ts

@@ -1,15 +1,15 @@
-import { useCallback, useEffect, useRef } from 'react';
-
-export const useIsMounted = (): (() => boolean) => {
-  const isMounted = useRef(false);
-
-  useEffect(() => {
-    isMounted.current = true;
-
-    return () => {
-      isMounted.current = false;
-    };
-  }, []);
-
-  return useCallback(() => isMounted.current, []);
-};
+import { useCallback, useEffect, useRef } from 'react';
+
+export const useIsMounted = (): (() => boolean) => {
+  const isMounted = useRef(false);
+
+  useEffect(() => {
+    isMounted.current = true;
+
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
+  return useCallback(() => isMounted.current, []);
+};