From 21afc912af38481d3d8ced61920b7f9b8422059a Mon Sep 17 00:00:00 2001
From: Vlad Furman <Blowlyge@gmail.com>
Date: Wed, 7 May 2025 11:56:09 +0300
Subject: [PATCH 1/3] fix: trying to fix add Reactions popup in Safari 18.3

---
 src/components/Reactions/Reaction.tsx         | 10 ++--
 src/components/Reactions/Reactions.tsx        | 25 ++++++---
 .../__stories__/Reactions.stories.tsx         | 52 +++++++++++++------
 src/components/Reactions/context.ts           |  2 +-
 src/components/Reactions/hooks.ts             | 21 ++++----
 5 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/src/components/Reactions/Reaction.tsx b/src/components/Reactions/Reaction.tsx
index 9fb5f503..ce5970dd 100644
--- a/src/components/Reactions/Reaction.tsx
+++ b/src/components/Reactions/Reaction.tsx
@@ -49,18 +49,18 @@ export function Reaction(props: ReactionInnerProps) {
 
     const onClickCallback = React.useCallback(() => onClick?.(value), [onClick, value]);
 
-    const buttonRef = React.useRef<HTMLButtonElement>(null);
-    const {onMouseEnter, onMouseLeave} = useReactionsPopup(props.reaction, buttonRef);
+    const [buttonElement, setButtonElement] = React.useState<HTMLButtonElement | null>(null);
+    const {onMouseEnter, onMouseLeave} = useReactionsPopup(props.reaction, buttonElement);
     const {openedTooltip: currentHoveredReaction} = useReactionsContext();
 
     const button = (
         <Button
             className={b('reaction-button', {size})}
-            ref={buttonRef}
+            ref={setButtonElement}
             size={size}
             selected={selected}
             view="outlined"
-            extraProps={{value}}
+            value={value}
             pin="circle-circle"
             onClick={onClickCallback}
         >
@@ -80,7 +80,7 @@ export function Reaction(props: ReactionInnerProps) {
             {currentHoveredReaction && currentHoveredReaction.reaction.value === value ? (
                 <Popup
                     className={b('popup')}
-                    anchorRef={currentHoveredReaction.ref}
+                    anchorElement={buttonElement}
                     placement={popupDefaultPlacement}
                     open={currentHoveredReaction.open}
                     hasArrow
diff --git a/src/components/Reactions/Reactions.tsx b/src/components/Reactions/Reactions.tsx
index 2ca870fd..de21b5c3 100644
--- a/src/components/Reactions/Reactions.tsx
+++ b/src/components/Reactions/Reactions.tsx
@@ -84,7 +84,10 @@ export function Reactions({
     renderTooltip,
     onToggle,
 }: ReactionsProps) {
-    const addReactionButtonRef = React.useRef<HTMLButtonElement>(null);
+    const [addReactionsElement, setAddReactionsElement] = React.useState<HTMLButtonElement | null>(
+        null,
+    );
+
     const [palettePopupOpened, setPalettePopupOpened] = React.useState(false);
 
     const onOpenPalettePopup = React.useCallback(() => setPalettePopupOpened(true), []);
@@ -94,6 +97,15 @@ export function Reactions({
         [onClosePalettePopup, onOpenPalettePopup, palettePopupOpened],
     );
 
+    const onOpenedChanged = React.useCallback(
+        (opened: boolean) => {
+            if (!opened) {
+                onClosePalettePopup();
+            }
+        },
+        [onClosePalettePopup],
+    );
+
     const [currentHoveredReaction, setCurrentHoveredReaction] = React.useState<
         ReactionsContextTooltipProps | undefined
     >(undefined);
@@ -144,9 +156,9 @@ export function Reactions({
     const addReactionButton = readOnly ? null : (
         <Button
             className={b('reaction-button')}
-            ref={addReactionButtonRef}
+            ref={setAddReactionsElement}
             size={size}
-            extraProps={{'aria-label': i18n('add-reaction')}}
+            aria-label={i18n('add-reaction')}
             onClick={onTogglePalettePopup}
             view="flat-secondary"
         >
@@ -158,13 +170,12 @@ export function Reactions({
 
     const addReactionPopup = readOnly ? null : (
         <Popup
-            anchorRef={addReactionButtonRef}
             className={b('add-reaction-popover')}
+            anchorElement={addReactionsElement}
             open={palettePopupOpened}
-            modal
             initialFocus={0}
-            onOutsideClick={onClosePalettePopup}
-            onEscapeKeyDown={onClosePalettePopup}
+            modal={true}
+            onOpenChange={onOpenedChanged}
         >
             {paletteContent}
         </Popup>
diff --git a/src/components/Reactions/__stories__/Reactions.stories.tsx b/src/components/Reactions/__stories__/Reactions.stories.tsx
index 75853af1..83130977 100644
--- a/src/components/Reactions/__stories__/Reactions.stories.tsx
+++ b/src/components/Reactions/__stories__/Reactions.stories.tsx
@@ -10,29 +10,47 @@ export default {
 } as Meta<typeof Reactions>;
 
 export const Default: StoryFn = () => {
-    return <Reactions {...useMockReactions()} />;
+    return (
+        <div>
+            <Flex
+                direction="column"
+                gap={4}
+                overflow="auto"
+                height="600px"
+                style={{border: '1px solid black'}}
+            >
+                <div>
+                    <div style={{height: '2000px'}}></div>
+                </div>
+                <Reactions {...useMockReactions()} />
+            </Flex>
+        </div>
+    );
 };
 
 export const Readonly: StoryFn = () => {
     const {reactions, reactionsState, renderTooltip, onToggle} = useMockReactions();
 
     return (
-        <Reactions
-            reactions={reactions}
-            renderTooltip={
-                renderTooltip
-                    ? (state) => (
-                          <Flex direction="column" gap={2}>
-                              <Text variant="subheader-1">You must be singed in to react</Text>
-                              {renderTooltip(state)}
-                          </Flex>
-                      )
-                    : undefined
-            }
-            reactionsState={reactionsState}
-            onToggle={onToggle}
-            readOnly={true}
-        />
+        <Flex direction="column" gap={4} overflow="auto" height="600px">
+            <div style={{height: '2000px'}}></div>
+            <Reactions
+                reactions={reactions}
+                renderTooltip={
+                    renderTooltip
+                        ? (state) => (
+                              <Flex direction="column" gap={2}>
+                                  <Text variant="subheader-1">You must be singed in to react</Text>
+                                  {renderTooltip(state)}
+                              </Flex>
+                          )
+                        : undefined
+                }
+                reactionsState={reactionsState}
+                onToggle={onToggle}
+                readOnly={true}
+            />
+        </Flex>
     );
 };
 
diff --git a/src/components/Reactions/context.ts b/src/components/Reactions/context.ts
index 6410d05d..f0c5c923 100644
--- a/src/components/Reactions/context.ts
+++ b/src/components/Reactions/context.ts
@@ -4,7 +4,7 @@ import type {ReactionState} from './Reaction';
 
 export interface ReactionsContextTooltipProps {
     reaction: ReactionState;
-    ref: React.RefObject<HTMLButtonElement>;
+    element: HTMLButtonElement;
     open: boolean;
 }
 
diff --git a/src/components/Reactions/hooks.ts b/src/components/Reactions/hooks.ts
index 2dd2a1f7..09efad3b 100644
--- a/src/components/Reactions/hooks.ts
+++ b/src/components/Reactions/hooks.ts
@@ -9,10 +9,7 @@ const DELAY = {
     closeTimeout: 200,
 } as const;
 
-export function useReactionsPopup(
-    reaction: ReactionState,
-    ref: React.RefObject<HTMLButtonElement>,
-) {
+export function useReactionsPopup(reaction: ReactionState, element: HTMLButtonElement | null) {
     const {value} = reaction;
 
     const {openedTooltip: currentHoveredReaction, setOpenedTooltip: setCurrentHoveredReaction} =
@@ -22,8 +19,10 @@ export function useReactionsPopup(
     const {delayedCall: setDelayedClose, clearTimeoutRef: clearCloseTimeout} = useTimeoutRef();
 
     const open = React.useCallback(() => {
-        setCurrentHoveredReaction({reaction, open: true, ref});
-    }, [reaction, ref, setCurrentHoveredReaction]);
+        if (!element) return;
+
+        setCurrentHoveredReaction({reaction, open: true, element});
+    }, [reaction, element, setCurrentHoveredReaction]);
 
     const close = React.useCallback(() => {
         clearOpenTimeout();
@@ -43,7 +42,9 @@ export function useReactionsPopup(
                 setDelayedOpen(open, DELAY.openTimeout);
             }
         } else {
-            setCurrentHoveredReaction({reaction, open: false, ref});
+            if (!element) return;
+
+            setCurrentHoveredReaction({reaction, open: false, element});
 
             setDelayedOpen(open, DELAY.openTimeout);
         }
@@ -52,15 +53,17 @@ export function useReactionsPopup(
         currentHoveredReaction,
         open,
         reaction,
-        ref,
+        element,
         setCurrentHoveredReaction,
         setDelayedOpen,
     ]);
 
     const delayedOpenPopup = React.useCallback(() => {
+        if (!element) return;
+
         clearCloseTimeout();
         setDelayedOpen(focus, DELAY.focusTimeout);
-    }, [clearCloseTimeout, focus, setDelayedOpen]);
+    }, [clearCloseTimeout, element, focus, setDelayedOpen]);
 
     const delayedClosePopup = React.useCallback(() => {
         clearOpenTimeout();

From 0914f68ef47d9b0e107d86ccad2ceb286c48461e Mon Sep 17 00:00:00 2001
From: Vlad Furman <Blowlyge@gmail.com>
Date: Mon, 19 May 2025 15:14:37 +0300
Subject: [PATCH 2/3] fix: added more examples

---
 src/components/Reactions/DELETE_ME_PLEASE.tsx | 83 +++++++++++++++++++
 src/components/Reactions/Reactions.tsx        |  1 +
 .../__stories__/Reactions.stories.tsx         |  4 +
 3 files changed, 88 insertions(+)
 create mode 100644 src/components/Reactions/DELETE_ME_PLEASE.tsx

diff --git a/src/components/Reactions/DELETE_ME_PLEASE.tsx b/src/components/Reactions/DELETE_ME_PLEASE.tsx
new file mode 100644
index 00000000..55d1083e
--- /dev/null
+++ b/src/components/Reactions/DELETE_ME_PLEASE.tsx
@@ -0,0 +1,83 @@
+import * as React from 'react';
+
+import {FaceSmile} from '@gravity-ui/icons';
+import {Button, Flex, Icon, Link, Palette, Popup} from '@gravity-ui/uikit';
+
+import {block} from '../utils/cn';
+
+import {i18n} from './i18n';
+
+import './Reactions.scss';
+
+const b = block('reactions');
+
+export function PopupWithPalette() {
+    return usePopup('Просто Palette', <Palette options={[{value: 'a', content: 'A'}]}></Palette>);
+}
+
+export function PopupWithButton() {
+    return usePopup('Просто кнопка', <Button>Кнопка</Button>);
+}
+
+export function PopupWithLink() {
+    return usePopup('Просто кнопка', <Link href="">ссылка</Link>);
+}
+
+function usePopup(label: string, paletteContent: React.ReactNode) {
+    const [addReactionsElement, setAddReactionsElement] = React.useState<HTMLButtonElement | null>(
+        null,
+    );
+
+    const [palettePopupOpened, setPalettePopupOpened] = React.useState(false);
+
+    const onOpenPalettePopup = React.useCallback(() => setPalettePopupOpened(true), []);
+    const onClosePalettePopup = React.useCallback(() => setPalettePopupOpened(false), []);
+    const onTogglePalettePopup = React.useCallback(
+        () => (palettePopupOpened ? onClosePalettePopup() : onOpenPalettePopup()),
+        [onClosePalettePopup, onOpenPalettePopup, palettePopupOpened],
+    );
+
+    const onOpenedChanged = React.useCallback(
+        (opened: boolean) => {
+            if (!opened) {
+                onClosePalettePopup();
+            }
+        },
+        [onClosePalettePopup],
+    );
+
+    const addReactionButton = (
+        <Button
+            className={b('reaction-button')}
+            ref={setAddReactionsElement}
+            size="m"
+            aria-label={i18n('add-reaction')}
+            onClick={onTogglePalettePopup}
+            view="flat-secondary"
+        >
+            <Button.Icon>
+                <Icon data={FaceSmile} />
+            </Button.Icon>
+        </Button>
+    );
+
+    const addReactionPopup = (
+        <Popup
+            className={b('add-reaction-popover')}
+            anchorElement={addReactionsElement}
+            open={palettePopupOpened}
+            initialFocus={0}
+            modal={true}
+            onOpenChange={onOpenedChanged}
+        >
+            {paletteContent}
+        </Popup>
+    );
+
+    return (
+        <Flex alignItems="center">
+            {addReactionButton}
+            {addReactionPopup}
+        </Flex>
+    );
+}
diff --git a/src/components/Reactions/Reactions.tsx b/src/components/Reactions/Reactions.tsx
index de21b5c3..01b4e177 100644
--- a/src/components/Reactions/Reactions.tsx
+++ b/src/components/Reactions/Reactions.tsx
@@ -52,6 +52,7 @@ export interface ReactionsProps extends Pick<PaletteProps, 'size'>, QAProps, DOM
      * @default 'end'
      */
     addButtonPlacement?: 'start' | 'end';
+
     /**
      * If present, when a user hovers over the reaction, a popover appears with renderTooltip(state) content.
      * Can be used to display users who used this reaction.
diff --git a/src/components/Reactions/__stories__/Reactions.stories.tsx b/src/components/Reactions/__stories__/Reactions.stories.tsx
index 83130977..f355557d 100644
--- a/src/components/Reactions/__stories__/Reactions.stories.tsx
+++ b/src/components/Reactions/__stories__/Reactions.stories.tsx
@@ -1,6 +1,7 @@
 import {Flex, Text} from '@gravity-ui/uikit';
 import {Meta, StoryFn} from '@storybook/react';
 
+import {PopupWithButton, PopupWithLink, PopupWithPalette} from '../DELETE_ME_PLEASE';
 import {Reactions} from '../Reactions';
 import {useMockReactions} from '../__tests__/mock/mockHooks';
 
@@ -22,6 +23,9 @@ export const Default: StoryFn = () => {
                 <div>
                     <div style={{height: '2000px'}}></div>
                 </div>
+                <PopupWithPalette />
+                <PopupWithButton />
+                <PopupWithLink />
                 <Reactions {...useMockReactions()} />
             </Flex>
         </div>

From 23b60f518860e89cfafde38c9dd9443d824fed39 Mon Sep 17 00:00:00 2001
From: Vlad Furman <Blowlyge@gmail.com>
Date: Thu, 22 May 2025 13:16:02 +0300
Subject: [PATCH 3/3] fix: only button remains

---
 .../Reactions/__stories__/Reactions.stories.tsx           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Reactions/__stories__/Reactions.stories.tsx b/src/components/Reactions/__stories__/Reactions.stories.tsx
index f355557d..f8508eaa 100644
--- a/src/components/Reactions/__stories__/Reactions.stories.tsx
+++ b/src/components/Reactions/__stories__/Reactions.stories.tsx
@@ -1,7 +1,7 @@
 import {Flex, Text} from '@gravity-ui/uikit';
 import {Meta, StoryFn} from '@storybook/react';
 
-import {PopupWithButton, PopupWithLink, PopupWithPalette} from '../DELETE_ME_PLEASE';
+import {PopupWithButton} from '../DELETE_ME_PLEASE';
 import {Reactions} from '../Reactions';
 import {useMockReactions} from '../__tests__/mock/mockHooks';
 
@@ -23,10 +23,10 @@ export const Default: StoryFn = () => {
                 <div>
                     <div style={{height: '2000px'}}></div>
                 </div>
-                <PopupWithPalette />
+                {/* <PopupWithPalette /> */}
                 <PopupWithButton />
-                <PopupWithLink />
-                <Reactions {...useMockReactions()} />
+                {/* <PopupWithLink /> */}
+                {/* <Reactions {...useMockReactions()} /> */}
             </Flex>
         </div>
     );