fix: ensure referenceElement don't flash in the wrong position on m…

…ount
sanity-io · Dec 10, 2024 · c95c1c0 · c95c1c0
1 parent 9ecda33
commit c95c1c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/core/primitives/popover/popover.tsx b/src/core/primitives/popover/popover.tsx
@@ -327,6 +327,11 @@ export const Popover = memo(
       middleware,
       placement: placementProp,
       whileElementsMounted: autoUpdate,
+      elements: referenceElement
+        ? {
+            reference: referenceElement,
+          }
+        : undefined,
     })
 
     const referenceHidden = middlewareData.hide?.referenceHidden
@@ -383,10 +388,6 @@ export const Popover = memo(
       }
     }, [update, updateRef])
 
-    useEffect(() => {
-      if (referenceElement) refs.setReference(referenceElement)
-    }, [referenceElement, refs])
-
     if (disabled) {
       return childProp || <></>
     }

diff --git a/src/core/primitives/tooltip/tooltip.tsx b/src/core/primitives/tooltip/tooltip.tsx
@@ -170,6 +170,7 @@ export const Tooltip = forwardRef(function Tooltip(
     middleware,
     placement: placementProp,
     whileElementsMounted: autoUpdate,
+    elements: {reference: referenceElement},
   })
 
   const arrowX = middlewareData.arrow?.x
@@ -273,9 +274,6 @@ export const Tooltip = forwardRef(function Tooltip(
     if (!content && showTooltip) handleIsOpenChange(false)
   }, [content, handleIsOpenChange, showTooltip])
 
-  // Update reference
-  useEffect(() => refs.setReference(referenceElement), [referenceElement, refs])
-
   useEffect(() => {
     // If the user clicks on escape key, close the tooltip.
     if (!showTooltip) return