fix: review fixes

gravity-ui · Dec 4, 2024 · 99e962a · 99e962a
1 parent 1203175
commit 99e962a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/src/components/Popup/Popup.tsx b/src/components/Popup/Popup.tsx
@@ -40,7 +40,6 @@ import {getOffsetValue, isAutoPlacement} from './utils';
 import './Popup.scss';
 
 export interface PopupProps extends DOMProps, LayerExtendableProps, QAProps {
-    ref?: React.Ref<HTMLDivElement>;
     children?: React.ReactNode;
     /** Manages `Popup` visibility */
     open?: boolean;
@@ -64,6 +63,8 @@ export interface PopupProps extends DOMProps, LayerExtendableProps, QAProps {
     floatingContext?: FloatingRootContext<ReferenceType>;
     /** Additional floating element props to provide interactions */
     floatingProps?: Record<string, unknown>;
+    /** React ref floating element is attached to */
+    floatingRef?: React.Ref<HTMLDivElement>;
     /** Do not use `LayerManager` on stacking popups */
     disableLayer?: boolean;
     /** @deprecated Add onClick handler to children */
@@ -113,7 +114,7 @@ export interface PopupProps extends DOMProps, LayerExtendableProps, QAProps {
 const b = block('popup');
 
 export function Popup({
-    ref,
+    floatingRef,
     keepMounted = false,
     hasArrow = false,
     open,
@@ -236,7 +237,7 @@ export function Popup({
     }
 
     const handleRef = useForkRef<HTMLDivElement>(
-        ref,
+        floatingRef,
         refs.setFloating,
         containerRef,
         useParentFocusTrap(),

diff --git a/src/components/lab/Popover/Popover.tsx b/src/components/lab/Popover/Popover.tsx
@@ -39,7 +39,7 @@ export interface PopoverProps
     onOpenChange?: (open: boolean) => void;
     disabled?: boolean;
     content?: React.ReactNode;
-    trigger?: 'hover' | 'click';
+    trigger?: 'click';
     delay?: number | {open?: number; close?: number};
     enableSafePolygon?: boolean;
 }
@@ -89,7 +89,7 @@ export function Popover({
         move: false,
         handleClose: enableSafePolygon ? safePolygon() : undefined,
     });
-    const click = useClick(context, {enabled: !disabled && trigger !== 'hover'});
+    const click = useClick(context, {enabled: !disabled});
     const dismiss = useDismiss(context, {
         escapeKey: !disableEscapeKeyDown,
         outsidePress: !disableOutsideClick,
@@ -103,9 +103,9 @@ export function Popover({
             {React.cloneElement(child, {ref: anchorRef, ...getReferenceProps(child.props)})}
             <Popup
                 {...restProps}
-                ref={setFloatingElement}
                 open={isOpen}
                 floatingContext={context}
+                floatingRef={setFloatingElement}
                 floatingProps={getFloatingProps()}
                 className={b(null, className)}
                 contentClassName={b('content', contentClassName)}

diff --git a/src/components/lab/Popover/README.md b/src/components/lab/Popover/README.md
@@ -51,4 +51,4 @@ import {Button, Popover} from '@gravity-ui/uikit';
 | qa                   | Test attribute (`data-qa`)                                                                                    |                              `string`                               |              |
 | strategy             | `Floating UI` positioning strategy                                                                            |                       `"absolute"` `"fixed"`                        | `"absolute"` |
 | style                | HTML `style` attribute for root node                                                                          |                              `string`                               |              |
-| trigger              | Which only event should open the `Popover`. By default, both `click` and `hover` do                           |                         `"click"` `"hover"`                         |              |
+| trigger              | Which event should open the `Popover`. By default, `click` and `hover` both do                                |                              `"click"`                              |              |
diff --git a/src/components/lab/Popover/__stories__/Popover.stories.tsx b/src/components/lab/Popover/__stories__/Popover.stories.tsx
@@ -47,14 +47,6 @@ export const Delay: Story = {
     },
 };
 
-export const OnlyHover: Story = {
-    ...Default,
-    args: {
-        ...Default.args,
-        trigger: 'hover',
-    },
-};
-
 export const OnlyClick: Story = {
     ...Default,
     args: {