Fix merge conflict

elastic · Dec 16, 2024 · bb1f68c · bb1f68c
1 parent fd9b122
commit bb1f68c
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/...esentation_panel/public/panel_component/panel_header/presentation_panel_hover_actions.tsx b/...esentation_panel/public/panel_component/panel_header/presentation_panel_hover_actions.tsx
@@ -146,25 +146,14 @@ export const PresentationPanelHoverActions = ({
     const anchorWidth = anchorRef.current.offsetWidth;
     const hoverActionsWidth =
       (rightHoverActionsRef.current?.offsetWidth ?? 0) +
-<<<<<<< HEAD
       (dragHandleRef.current?.offsetWidth ?? 0) +
-      parseInt(euiThemeVars.euiSize, 10) * 2;
-    const hoverActionsHeight = rightHoverActionsRef.current?.offsetHeight ?? 0;
-
-    // Left align hover actions when they would get cut off by the right edge of the window
-    if (anchorLeft - (hoverActionsWidth - anchorWidth) <= parseInt(euiThemeVars.euiSize, 10)) {
-      dragHandleRef.current?.style.removeProperty('right');
-      dragHandleRef.current?.style.setProperty('left', '0');
-=======
-      (leftHoverActionsRef.current?.offsetWidth ?? 0) +
       parseInt(euiTheme.size.m, 10) * 2;
     const hoverActionsHeight = rightHoverActionsRef.current?.offsetHeight ?? 0;
 
     // Left align hover actions when they would get cut off by the right edge of the window
     if (anchorLeft - (hoverActionsWidth - anchorWidth) <= parseInt(euiTheme.size.m, 10)) {
-      hoverActionsRef.current.style.removeProperty('right');
-      hoverActionsRef.current.style.setProperty('left', '0');
->>>>>>> fd8eec4ebe6 (Replace euiThemeVars from embeddable/presentation_panel)
+      dragHandleRef.current?.style.removeProperty('right');
+      dragHandleRef.current?.style.setProperty('left', '0');
     } else {
       hoverActionsRef.current.style.removeProperty('left');
       hoverActionsRef.current.style.setProperty('right', '0');