@true-engineering/true-react-common-ui-kit 4.0.0-alpha2 → 4.0.0-alpha4

package/src/components/WithPopup/WithPopup.tsx

@@ -1,184 +1,210 @@
-import { FC, useState } from 'react';
-import clsx from 'clsx';
-import {
-  addDataTestId,
-  applyAction,
-  stopPropagation,
-  addDataAttributes,
-} from '@true-engineering/true-react-platform-helpers';
-import {
-  autoUpdate,
-  useFloating,
-  useClick,
-  useDismiss,
-  useHover,
-  useInteractions,
-  Placement,
-  Middleware,
-  FloatingPortal,
-  offset,
-  flip,
-  useTransitionStatus,
-  OffsetOptions,
-  UseHoverProps,
-  safePolygon,
-  useFocus,
-} from '@floating-ui/react';
-import { ICommonProps, IRenderNode } from '../../types';
-import { DEFAULT_OFFSET } from './constants';
-import {
-  IPopupEventType,
-  IReferenceProps,
-  IWithPopupChildrenProps,
-  IWithPopupToggleEvent,
-  IWithPopupTriggerProps,
-} from './types';
-import { useStyles, IWithPopupStyles } from './WithPopup.styles';
-
-export interface IWithPopupProps extends ICommonProps<IWithPopupStyles> {
-  trigger: IRenderNode<IWithPopupTriggerProps>;
-  children: IRenderNode<IWithPopupChildrenProps>;
-  middlewares?: Middleware[];
-  /** @default eventType === 'click' ? 'bottom-end' : 'top' */
-  placement?: Placement;
-  /** @default 'click' */
-  eventType?: IPopupEventType;
-  /** @default 0 */
-  hoverDelay?: UseHoverProps['delay'];
-  /** @default 6 */
-  popupOffset?: OffsetOptions;
-  /** @default true */
-  shouldStopPropagation?: boolean;
-  /** @default false */
-  shouldHideOnScroll?: boolean;
-  /** @default true */
-  shouldRenderInBody?: boolean;
-  /** Должен ли WithPopup рендерить свой div-wrapper в качестве триггера
-   * @default true, if eventType === hover */
-  isTriggerWrapped?: boolean;
-  /** @default true */
-  canBeFlipped?: boolean;
-  /** @default false */
-  isDisabled?: boolean;
-  onToggle?: (isActive: boolean, event?: IWithPopupToggleEvent) => void;
-}
-
-export const WithPopup: FC<IWithPopupProps> = ({
-  trigger,
-  children,
-  middlewares = [],
-  eventType = 'click',
-  placement = eventType === 'click' ? 'bottom-end' : 'top',
-  hoverDelay = 0,
-  popupOffset = DEFAULT_OFFSET,
-  shouldStopPropagation = true,
-  shouldHideOnScroll = false,
-  shouldRenderInBody = true,
-  canBeFlipped = true,
-  isTriggerWrapped = eventType === 'hover',
-  isDisabled = false,
-  tweakStyles,
-  data,
-  testId,
-  onToggle,
-}) => {
-  const classes = useStyles({ theme: tweakStyles });
-
-  const [isOpen, setIsOpen] = useState(false);
-
-  const handleToggle = (isActive: boolean, event?: IWithPopupToggleEvent) => {
-    event?.stopPropagation();
-    if (!isDisabled) {
-      onToggle?.(isActive, event);
-      setIsOpen(isActive);
-    }
-  };
-
-  const handleClose = (event?: IWithPopupToggleEvent) => {
-    handleToggle(false, event);
-  };
-
-  const { refs, floatingStyles, context } = useFloating({
-    open: isOpen,
-    middleware: [
-      offset(popupOffset),
-      canBeFlipped && flip({ fallbackAxisSideDirection: 'start' }),
-      ...middlewares,
-    ],
-    whileElementsMounted: autoUpdate,
-    placement,
-    onOpenChange: handleToggle,
-  });
-
-  const hover = useHover(context, {
-    enabled: eventType === 'hover',
-    delay: typeof hoverDelay === 'number' ? { open: hoverDelay, close: 0 } : hoverDelay,
-    handleClose: safePolygon(),
-  });
-
-  const focus = useFocus(context, { enabled: eventType === 'hover' });
-
-  const click = useClick(context, { enabled: eventType === 'click' });
-
-  const dismiss = useDismiss(context, {
-    enabled: eventType === 'click',
-    ancestorScroll: shouldHideOnScroll,
-  });
-
-  const { getFloatingProps, getReferenceProps } = useInteractions([hover, click, focus, dismiss]);
-
-  const { isMounted, status } = useTransitionStatus(context, { duration: { close: 500 } });
-
-  const referenceProps: IReferenceProps = getReferenceProps({
-    ref: refs.setReference,
-    ...(shouldStopPropagation && {
-      onClick: stopPropagation,
-    }),
-  });
-
-  const triggerElement = applyAction(trigger, {
-    referenceProps: !isTriggerWrapped ? referenceProps : undefined,
-    triggerProps: {
-      isActive: isOpen,
-      isDisabled,
-      ...(!isTriggerWrapped && { data, testId, ...referenceProps }),
-    },
-  });
-
-  return (
-    <>
-      {isTriggerWrapped ? (
-        <div
-          className={clsx(classes.trigger, {
-            [classes.clickable]: eventType === 'click',
-            [classes.disabled]: isDisabled,
-            [classes.active]: isOpen,
-          })}
-          {...referenceProps}
-          {...addDataTestId(testId)}
-          {...addDataAttributes(data)}
-        >
-          {triggerElement}
-        </div>
-      ) : (
-        triggerElement
-      )}
-      {isMounted && (
-        <FloatingPortal
-          root={!shouldRenderInBody ? (refs.reference.current as HTMLDivElement) : undefined}
-        >
-          <div
-            style={floatingStyles}
-            className={classes.popup}
-            ref={refs.setFloating}
-            {...getFloatingProps()}
-          >
-            <div className={classes[`dropdown-${status}`]}>
-              {applyAction(children, { onClose: handleClose })}
-            </div>
-          </div>
-        </FloatingPortal>
-      )}
-    </>
-  );
-};
+import { FC, useRef, useState } from 'react';
+import clsx from 'clsx';
+import {
+  applyAction,
+  stopPropagation,
+  addDataAttributes,
+} from '@true-engineering/true-react-platform-helpers';
+import {
+  autoUpdate,
+  useFloating,
+  useClick,
+  useDismiss,
+  useHover,
+  useInteractions,
+  Placement,
+  Middleware,
+  FloatingPortal,
+  offset,
+  flip,
+  useTransitionStatus,
+  OffsetOptions,
+  UseHoverProps,
+  safePolygon,
+  useFocus,
+  FloatingArrow,
+  arrow,
+} from '@floating-ui/react';
+import { ICommonProps, IDataAttributes, IRenderNode } from '../../types';
+import { DEFAULT_OFFSET } from './constants';
+import { minWidthRelativeToTrigger } from './helpers';
+import {
+  IPopupArrowProps,
+  IPopupEventType,
+  IReferenceProps,
+  IWithPopupChildrenProps,
+  IWithPopupToggleEvent,
+  IWithPopupTriggerProps,
+} from './types';
+import { useStyles, IWithPopupStyles } from './WithPopup.styles';
+
+export interface IWithPopupProps extends ICommonProps<IWithPopupStyles> {
+  trigger: IRenderNode<IWithPopupTriggerProps>;
+  children: IRenderNode<IWithPopupChildrenProps>;
+  middlewares?: Middleware[];
+  /** @default eventType === 'click' ? 'bottom-end' : 'top' */
+  placement?: Placement;
+  /** @default 'click' */
+  eventType?: IPopupEventType;
+  /** @default 0 */
+  hoverDelay?: UseHoverProps['delay'];
+  /** @default 6 */
+  popupOffset?: OffsetOptions;
+  arrowProps?: IPopupArrowProps;
+  popupData?: IDataAttributes;
+  /** @default true, if eventType === click */
+  shouldStopPropagation?: boolean;
+  /** @default false */
+  shouldHideOnScroll?: boolean;
+  /** @default true */
+  shouldRenderInBody?: boolean;
+  /** Должен ли WithPopup рендерить свой div-wrapper в качестве триггера
+   * @default true, if eventType === hover */
+  isTriggerWrapped?: boolean;
+  /** @default true */
+  canBeFlipped?: boolean;
+  /** @default false */
+  isDisabled?: boolean;
+  /** @default false */
+  shouldShowArrow?: boolean;
+  /** Должна ли минимальная ширина попапа быть равна ширине триггера
+   * @default false */
+  isMinWidthSameAsTrigger?: boolean;
+  onToggle?: (isActive: boolean, event?: IWithPopupToggleEvent) => void;
+}
+
+export const WithPopup: FC<IWithPopupProps> = ({
+  trigger,
+  children,
+  middlewares = [],
+  eventType = 'click',
+  placement = eventType === 'click' ? 'bottom-end' : 'top',
+  hoverDelay = 0,
+  popupOffset = DEFAULT_OFFSET,
+  arrowProps,
+  popupData,
+  shouldStopPropagation = eventType === 'click',
+  shouldHideOnScroll = false,
+  shouldRenderInBody = true,
+  canBeFlipped = true,
+  isTriggerWrapped = eventType === 'hover',
+  isDisabled = false,
+  shouldShowArrow = false,
+  isMinWidthSameAsTrigger = false,
+  tweakStyles,
+  data,
+  testId,
+  onToggle,
+}) => {
+  const classes = useStyles({ theme: tweakStyles });
+
+  const [isOpen, setIsOpen] = useState(false);
+
+  const arrowRef = useRef<SVGSVGElement>(null);
+
+  const handleToggle = (isActive: boolean, event?: IWithPopupToggleEvent) => {
+    event?.stopPropagation();
+    if (!isDisabled) {
+      onToggle?.(isActive, event);
+      setIsOpen(isActive);
+    }
+  };
+
+  const handleClose = (event?: IWithPopupToggleEvent) => {
+    handleToggle(false, event);
+  };
+
+  const { refs, floatingStyles, context } = useFloating({
+    open: isOpen,
+    middleware: [
+      offset(popupOffset),
+      canBeFlipped && flip({ fallbackAxisSideDirection: 'start' }),
+      isMinWidthSameAsTrigger && minWidthRelativeToTrigger,
+      ...middlewares,
+      shouldShowArrow && arrow({ element: arrowRef }),
+    ],
+    whileElementsMounted: autoUpdate,
+    placement,
+    onOpenChange: handleToggle,
+  });
+
+  const hover = useHover(context, {
+    enabled: eventType === 'hover',
+    delay: typeof hoverDelay === 'number' ? { open: hoverDelay, close: 0 } : hoverDelay,
+    handleClose: safePolygon(),
+  });
+
+  const focus = useFocus(context, { enabled: eventType === 'hover' });
+
+  const click = useClick(context, { enabled: eventType === 'click' });
+
+  const dismiss = useDismiss(context, {
+    enabled: eventType === 'click',
+    ancestorScroll: shouldHideOnScroll,
+  });
+
+  const { getFloatingProps, getReferenceProps } = useInteractions([hover, click, focus, dismiss]);
+
+  const { isMounted, status } = useTransitionStatus(context, { duration: { close: 500 } });
+
+  const referenceProps: IReferenceProps = getReferenceProps({
+    ref: refs.setReference,
+    ...(shouldStopPropagation && {
+      onClick: stopPropagation,
+    }),
+  });
+
+  const triggerElement = applyAction(trigger, {
+    referenceProps: !isTriggerWrapped ? referenceProps : undefined,
+    triggerProps: {
+      isActive: isOpen,
+      isDisabled,
+      ...(!isTriggerWrapped && { data, testId, ...referenceProps }),
+    },
+  });
+
+  return (
+    <>
+      {isTriggerWrapped ? (
+        <div
+          className={clsx(classes.trigger, {
+            [classes.clickable]: eventType === 'click',
+            [classes.disabled]: isDisabled,
+            [classes.active]: isOpen,
+          })}
+          {...referenceProps}
+          {...addDataAttributes(data, testId)}
+        >
+          {triggerElement}
+        </div>
+      ) : (
+        triggerElement
+      )}
+      {isMounted && (
+        <FloatingPortal
+          root={shouldRenderInBody ? document.body : (refs.reference.current as HTMLElement)}
+        >
+          <div
+            ref={refs.setFloating}
+            style={floatingStyles}
+            className={classes.popup}
+            {...getFloatingProps()}
+            {...addDataAttributes(popupData)}
+          >
+            <div className={classes[`dropdown-${status}`]}>
+              {shouldShowArrow && (
+                <FloatingArrow
+                  {...arrowProps}
+                  ref={arrowRef}
+                  context={context}
+                  className={classes.arrow}
+                />
+              )}
+              {applyAction(children, { floatingContext: context, onClose: handleClose })}
+            </div>
+          </div>
+        </FloatingPortal>
+      )}
+    </>
+  );
+};

package/src/components/WithPopup/constants.ts

@@ -1,3 +1,3 @@
-export const DEFAULT_OFFSET = 6;
-
-export const POPUP_EVENT_TYPES = ['hover', 'click'] as const;
+export const DEFAULT_OFFSET = 6;
+
+export const POPUP_EVENT_TYPES = ['hover', 'click'] as const;

package/src/components/WithPopup/helpers.ts

@@ -0,0 +1,9 @@
+import { Middleware, size } from '@floating-ui/react';
+
+export const minWidthRelativeToTrigger: Middleware = size({
+  apply({ rects, elements }) {
+    Object.assign(elements.floating.style, {
+      minWidth: `${rects.reference.width}px`,
+    });
+  },
+});

package/src/components/WithPopup/index.ts

@@ -1,2 +1,2 @@
-export * from './WithPopup';
-export type { IWithPopupStyles } from './WithPopup.styles';
+export * from './WithPopup';
+export type { IWithPopupStyles } from './WithPopup.styles';

package/src/components/WithPopup/types.ts

@@ -1,25 +1,32 @@
-import type { MouseEvent, KeyboardEvent } from 'react';
-import type { IDataAttributesProps, IDomElementInteractions } from '../../types';
-import type { POPUP_EVENT_TYPES } from './constants';
-
-export type IPopupEventType = (typeof POPUP_EVENT_TYPES)[number];
-
-export type IWithPopupToggleEvent = MouseEvent | KeyboardEvent | Event;
-
-export interface IReferenceProps extends IDomElementInteractions<HTMLElement> {
-  ref?: (node: Element | null) => void;
-}
-
-export interface IWithPopupTriggerComponentProps extends IReferenceProps, IDataAttributesProps {
-  isActive: boolean;
-  isDisabled?: boolean;
-}
-
-export interface IWithPopupTriggerProps {
-  triggerProps: IWithPopupTriggerComponentProps;
-  referenceProps?: IReferenceProps;
-}
-
-export interface IWithPopupChildrenProps {
-  onClose: (event?: IWithPopupToggleEvent) => void;
-}
+import type { MouseEvent, KeyboardEvent } from 'react';
+import type { FloatingArrowProps, UseFloatingReturn } from '@floating-ui/react';
+import type { IDataAttributesProps, IDomElementInteractions } from '../../types';
+import type { POPUP_EVENT_TYPES } from './constants';
+
+export type IPopupEventType = (typeof POPUP_EVENT_TYPES)[number];
+
+export type IWithPopupToggleEvent = MouseEvent | KeyboardEvent | Event;
+
+export interface IReferenceProps extends IDomElementInteractions<HTMLElement> {
+  ref?: (node: Element | null) => void;
+}
+
+export interface IWithPopupTriggerComponentProps extends IReferenceProps, IDataAttributesProps {
+  isActive: boolean;
+  isDisabled?: boolean;
+}
+
+export interface IWithPopupTriggerProps {
+  triggerProps: IWithPopupTriggerComponentProps;
+  referenceProps?: IReferenceProps;
+}
+
+export interface IWithPopupChildrenProps {
+  floatingContext: UseFloatingReturn['context'];
+  onClose: (event?: IWithPopupToggleEvent) => void;
+}
+
+export type IPopupArrowProps = Pick<
+  FloatingArrowProps,
+  'width' | 'height' | 'tipRadius' | 'staticOffset' | 'd' | 'stroke' | 'strokeWidth'
+>;

package/src/components/WithTooltip/WithTooltip.stories.tsx

@@ -1,56 +1,56 @@
-import { Meta, StoryObj } from '@storybook/react';
-import { WithTooltip } from './WithTooltip';
-
-const positions = [
-  'top',
-  'bottom',
-  'right',
-  'left',
-  'top-start',
-  'top-end',
-  'bottom-start',
-  'bottom-end',
-  'right-start',
-  'right-end',
-  'left-start',
-  'left-end',
-];
-
-const meta: Meta<typeof WithTooltip> = {
-  title: 'Data Display/WithTooltip',
-  component: WithTooltip,
-  argTypes: {
-    placement: { control: 'select', options: positions },
-    tooltipView: { control: 'inline-radio', options: ['tooltip', 'hint'] },
-    tooltipType: { control: 'inline-radio', options: ['info', 'error'] },
-    eventType: { control: 'inline-radio', options: ['hover', 'click'] },
-  },
-};
-export default meta;
-type IStory = StoryObj<typeof WithTooltip>;
-
-export const Default: IStory = {
-  args: {
-    children: 'Наведи на меня - появится тултип',
-    tooltipText: 'Текст тултипа',
-    placement: 'top',
-    tooltipView: 'tooltip',
-    tooltipType: 'info',
-    eventType: 'hover',
-    isDisabled: false,
-    shouldRenderInBody: true,
-  },
-  render: (args) => (
-    <div
-      style={{
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
-        width: 600,
-        height: 400,
-      }}
-    >
-      <WithTooltip {...args} />
-    </div>
-  ),
-};
+import { Meta, StoryObj } from '@storybook/react';
+import { WithTooltip } from './WithTooltip';
+
+const positions = [
+  'top',
+  'bottom',
+  'right',
+  'left',
+  'top-start',
+  'top-end',
+  'bottom-start',
+  'bottom-end',
+  'right-start',
+  'right-end',
+  'left-start',
+  'left-end',
+];
+
+const meta: Meta<typeof WithTooltip> = {
+  title: 'Data Display/WithTooltip',
+  component: WithTooltip,
+  argTypes: {
+    placement: { control: 'select', options: positions },
+    tooltipView: { control: 'inline-radio', options: ['tooltip', 'hint'] },
+    tooltipType: { control: 'inline-radio', options: ['info', 'error'] },
+    eventType: { control: 'inline-radio', options: ['hover', 'click'] },
+  },
+};
+export default meta;
+type IStory = StoryObj<typeof WithTooltip>;
+
+export const Default: IStory = {
+  args: {
+    children: 'Наведи на меня - появится тултип',
+    tooltipText: 'Текст тултипа',
+    placement: 'top',
+    tooltipView: 'tooltip',
+    tooltipType: 'info',
+    eventType: 'hover',
+    isDisabled: false,
+    shouldRenderInBody: true,
+  },
+  render: (args) => (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        width: 600,
+        height: 400,
+      }}
+    >
+      <WithTooltip {...args} />
+    </div>
+  ),
+};

package/src/components/WithTooltip/WithTooltip.styles.ts

@@ -1,7 +1,13 @@
-import { ITooltipStyles } from '../Tooltip';
-import { IWithPopupStyles } from '../WithPopup';
-
-export interface IWithTooltipStyles {
-  tweakWithPopup?: IWithPopupStyles;
-  tweakTooltip?: ITooltipStyles;
-}
+import { ITooltipStyles } from '../Tooltip';
+import { IWithPopupStyles } from '../WithPopup';
+
+export const withPopupStyles: IWithPopupStyles = {
+  popup: {
+    zIndex: 9999,
+  },
+};
+
+export interface IWithTooltipStyles {
+  tweakWithPopup?: IWithPopupStyles;
+  tweakTooltip?: ITooltipStyles;
+}