Skip to content

Commit 19d7dbc

Browse files
committed
IBX-10450: No tooltips for edit join icons on Draft conflict modal
1 parent 3a9b8d8 commit 19d7dbc

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/bundle/Resources/public/js/scripts/helpers/tooltips.helper.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,18 @@ const isTitleEllipsized = (node) => {
123123

124124
return textHeight > nodeHeight;
125125
};
126+
const getContainer = (tooltipNode) => {
127+
const { tooltipUseModalContainer, tooltipContainerSelector } = tooltipNode.dataset;
128+
const modalContainer = tooltipNode.closest('.ibexa-modal');
129+
130+
if (modalContainer && tooltipUseModalContainer) {
131+
return modalContainer;
132+
}
133+
134+
return tooltipContainerSelector
135+
? tooltipNode.closest(tooltipContainerSelector)
136+
: 'body';
137+
};
126138
const initializeTooltip = (tooltipNode, hasEllipsisStyle) => {
127139
const { delayShow, delayHide } = tooltipNode.dataset;
128140
const delay = {
@@ -134,9 +146,7 @@ const initializeTooltip = (tooltipNode, hasEllipsisStyle) => {
134146
const placement = tooltipNode.dataset.tooltipPlacement ?? 'bottom';
135147
const trigger = tooltipNode.dataset.tooltipTrigger ?? 'hover';
136148
const useHtml = tooltipNode.dataset.tooltipUseHtml !== undefined;
137-
const container = tooltipNode.dataset.tooltipContainerSelector
138-
? tooltipNode.closest(tooltipNode.dataset.tooltipContainerSelector)
139-
: 'body';
149+
const container = getContainer(tooltipNode);
140150
const iframe = document.querySelector(tooltipNode.dataset.tooltipIframeSelector);
141151

142152
new bootstrap.Tooltip(tooltipNode, {

src/lib/Menu/Action/VersionListActionMenuBuilder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ private function createEditDraftAction(
9999
bool $isDraftConflict = false
100100
): ItemInterface {
101101
$parameters['attributes']['class'] = self::IBEXA_BTN_CONTENT_DRAFT_EDIT_CLASS;
102+
$parameters['attributes']['data-tooltip-use-modal-container'] = true;
103+
102104
if ($isDraftConflict) {
103105
return $this->createDraftEditLinkAction($versionInfo, self::ITEM_EDIT_DRAFT, $parameters, $locationId);
104106
}

0 commit comments

Comments
 (0)