Skip to content

Commit b968c2c

Browse files
committed
fix: Fixed tooltips
1 parent 6b9ef8f commit b968c2c

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

src/components/issues/Issue.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ const Issue = ({ issue, priorityType, timerData, assignedToMe, pinned, remembere
144144
e.preventDefault();
145145
}
146146
}}
147-
data-tooltip-id="tooltip-toggle-timer"
147+
data-tooltip-id={`tooltip-toggle-timer-${issue.id}`}
148148
>
149149
<h1
150150
className={clsx("mb-1 truncate", {
@@ -186,20 +186,20 @@ const Issue = ({ issue, priorityType, timerData, assignedToMe, pinned, remembere
186186
<div className="absolute top-2 right-2 flex justify-end items-start gap-x-1">
187187
{pinned && (
188188
<>
189-
<Tooltip id="tooltip-pinned" place="left" delayShow={700} content={formatMessage({ id: "issues.issue.pinned" })} className="italic" />
190-
<FontAwesomeIcon icon={faStar} className="text-gray-300 dark:text-gray-600 focus:outline-none" data-tooltip-id="tooltip-pinned" tabIndex={-1} />
189+
<Tooltip id={`tooltip-pinned-${issue.id}`} place="left" delayShow={700} content={formatMessage({ id: "issues.issue.pinned" })} className="italic" />
190+
<FontAwesomeIcon icon={faStar} className="text-gray-300 dark:text-gray-600 focus:outline-none" data-tooltip-id={`tooltip-pinned-${issue.id}`} tabIndex={-1} />
191191
</>
192192
)}
193193
{!assignedToMe && (
194194
<>
195-
<Tooltip id="tooltip-not-assigned-to-me" place="left" delayShow={700} content={formatMessage({ id: "issues.issue.not-assigned-to-me" })} className="italic" />
196-
<FontAwesomeIcon icon={faCircleUser} className="text-gray-300 dark:text-gray-600 focus:outline-none" data-tooltip-id="tooltip-not-assigned-to-me" tabIndex={-1} />
195+
<Tooltip id={`tooltip-not-assigned-to-me-${issue.id}`} place="left" delayShow={700} content={formatMessage({ id: "issues.issue.not-assigned-to-me" })} className="italic" />
196+
<FontAwesomeIcon icon={faCircleUser} className="text-gray-300 dark:text-gray-600 focus:outline-none" data-tooltip-id={`tooltip-not-assigned-to-me-${issue.id}`} tabIndex={-1} />
197197
</>
198198
)}
199199
</div>
200200
</div>
201201
</ContextMenu>
202-
<Tooltip id="tooltip-toggle-timer" place="bottom" delayShow={4000} className="italic max-w-[275px]">
202+
<Tooltip id={`tooltip-toggle-timer-${issue.id}`} place="bottom" delayShow={4000} className="italic max-w-[275px] z-10">
203203
<FormattedMessage
204204
id="issues.action.toggle-timer.tooltip"
205205
values={{

src/components/issues/IssueTimer.tsx

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ const IssueTimer = forwardRef(({ issue, data: { active, time, start }, onStart,
8787
/>
8888
)) || (
8989
<>
90-
<Tooltip id="tooltip-edit-timer" place="top" delayShow={700} content={formatMessage({ id: "issues.timer.action.edit.tooltip" })} className="italic" />
90+
<Tooltip id={`tooltip-edit-timer-${issue.id}`} place="top" delayShow={700} content={formatMessage({ id: "issues.timer.action.edit.tooltip" })} className="italic" />
9191
<span
9292
className={clsx("text-lg", timer > 0 ? "text-yellow-500" : "text-gray-700 dark:text-gray-500", active && "font-semibold")}
9393
onDoubleClick={() => setEditMode(true)}
94-
data-tooltip-id="tooltip-edit-timer"
94+
data-tooltip-id={`tooltip-edit-timer-${issue.id}`}
9595
>
9696
{formatTime(timer)}
9797
</span>
@@ -100,18 +100,25 @@ const IssueTimer = forwardRef(({ issue, data: { active, time, start }, onStart,
100100

101101
{!active ? (
102102
<>
103-
<Tooltip id="tooltip-start-timer" place="left" delayShow={700} content={formatMessage({ id: "issues.timer.action.start.tooltip" })} className="italic" />
104-
<FontAwesomeIcon icon={faPlay} size="2x" className="text-green-500 cursor-pointer focus:outline-none" onClick={onStart} data-tooltip-id="tooltip-start-timer" tabIndex={-1} />
103+
<Tooltip id={`tooltip-start-timer-${issue.id}`} place="left" delayShow={700} content={formatMessage({ id: "issues.timer.action.start.tooltip" })} className="italic" />
104+
<FontAwesomeIcon icon={faPlay} size="2x" className="text-green-500 cursor-pointer focus:outline-none" onClick={onStart} data-tooltip-id={`tooltip-start-timer-${issue.id}`} tabIndex={-1} />
105105
</>
106106
) : (
107107
<>
108-
<Tooltip id="tooltip-pause-timer" place="left" delayShow={700} content={formatMessage({ id: "issues.timer.action.pause.tooltip" })} className="italic" />
109-
<FontAwesomeIcon icon={faPause} size="2x" className="text-red-500 cursor-pointer focus:outline-none" onClick={() => onPause(timer)} data-tooltip-id="tooltip-pause-timer" tabIndex={-1} />
108+
<Tooltip id={`tooltip-pause-timer-${issue.id}`} place="left" delayShow={700} content={formatMessage({ id: "issues.timer.action.pause.tooltip" })} className="italic" />
109+
<FontAwesomeIcon
110+
icon={faPause}
111+
size="2x"
112+
className="text-red-500 cursor-pointer focus:outline-none"
113+
onClick={() => onPause(timer)}
114+
data-tooltip-id={`tooltip-pause-timer-${issue.id}`}
115+
tabIndex={-1}
116+
/>
110117
</>
111118
)}
112119

113-
<Tooltip id="tooltip-stop-timer" place="top" delayShow={700} content={formatMessage({ id: "issues.timer.action.stop.tooltip" })} className="italic" />
114-
<FontAwesomeIcon icon={faStop} size="2x" className="text-red-500 cursor-pointer focus:outline-none" onClick={onStop} data-tooltip-id="tooltip-stop-timer" tabIndex={-1} />
120+
<Tooltip id={`tooltip-stop-timer-${issue.id}`} place="top" delayShow={700} content={formatMessage({ id: "issues.timer.action.stop.tooltip" })} className="italic" />
121+
<FontAwesomeIcon icon={faStop} size="2x" className="text-red-500 cursor-pointer focus:outline-none" onClick={onStop} data-tooltip-id={`tooltip-stop-timer-${issue.id}`} tabIndex={-1} />
115122

116123
<Tooltip id={`tooltip-done-timer-${issue.id}`} place="bottom" delayShow={700} content={formatMessage({ id: "issues.timer.action.add-spent-time.tooltip" })} className="z-10 italic" />
117124
<FontAwesomeIcon

0 commit comments

Comments
 (0)