Skip to content

fix(view): Detail, Cluster Graph Tooltip 커밋 메시지 표시 오류 수정 #1009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 28, 2025
Merged

fix(view): Detail, Cluster Graph Tooltip 커밋 메시지 표시 오류 수정 #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35b3965
fix(view): fix escape sequences in cluster-nodes.json test data
nxnaxx Oct 13, 2025
253c5e5
fix(view): render commit message body correctly
nxnaxx Oct 14, 2025
1ffa1f0
fix(view): fix overlapping issue of commit body in virtualized list
nxnaxx Oct 20, 2025
c27db54
fix(view): fix incorrect line breaks in cluster graph tooltip message
nxnaxx Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions packages/view/src/components/Detail/Detail.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@
margin-left: 0.125rem;
min-width: 0;
padding-top: 0.3rem;
padding-right: 3.125rem;
padding-right: 0.25rem;

.commit-message {
position: relative;
width: 100%;

.commit-message__header {
display: flex;
Expand Down Expand Up @@ -150,28 +151,26 @@
}
}

.commit-message__body {
max-height: 0;
overflow: hidden;
opacity: 0;
%commit-message__body-base {
background: rgba(0, 0, 0, 0.02);
border: 1px solid var(--color-border);
border-radius: 0.375rem;
padding: 0;
color: var(--color-text-secondary);
font-size: 0.8125rem;
line-height: 1.5;
color: var(--color-text-secondary);
transition: all 0.3s ease-in-out;
white-space: pre-wrap;
word-break: break-word;
margin-top: 0;
}

&:hover .commit-message__body {
max-height: 200px;
.commit-message__body {
@extend %commit-message__body-base;
opacity: 0;
transform: translateY(-4px);
}

.commit-message__body--visible {
@extend %commit-message__body-base;
opacity: 1;
padding: 0.75rem;
margin-top: 0.5rem;
transform: translateY(0);
}
}
}
Expand Down Expand Up @@ -214,7 +213,11 @@
}

@keyframes bounce {
0%, 20%, 50%, 80%, 100% {
0%,
20%,
50%,
80%,
100% {
transform: translateY(0);
}
40% {
Expand Down
101 changes: 62 additions & 39 deletions packages/view/src/components/Detail/Detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useMemo } from "react";
import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from "react";
import dayjs from "dayjs";
import {
AddCircleRounded,
Expand All @@ -14,7 +14,6 @@ import { List, AutoSizer, CellMeasurer } from "react-virtualized";

import { useGithubInfo, useDataStore } from "store";
import { Author } from "components/Common/Author";
import type { IssueLinkedMessage } from "components/Common/GithubIssueLink";
import { renderIssueLinkedNodes } from "components/Common/GithubIssueLink";

import { getCommitListDetail } from "./Detail.util";
Expand All @@ -27,6 +26,10 @@ const Detail = ({ clusterId, authSrcMap }: DetailProps) => {
const selectedData = useDataStore((state) => state.selectedData);
const { owner, repo } = useGithubInfo();

const [hoverIndex, setHoverIndex] = useState<number | null>(null);
const prevIndexRef = useRef<number | null>(null);
const listRef = useRef<List>(null);

const commitNodeListInCluster = useMemo(
() =>
selectedData?.filter((selected) => selected.commitNodeList[0].clusterId === clusterId)[0].commitNodeList ?? [],
Expand All @@ -40,14 +43,35 @@ const Detail = ({ clusterId, authSrcMap }: DetailProps) => {
const { cache, virtualizedItems, showScrollIndicator, handleRowsRendered } =
useVirtualizedList(commitNodeListInCluster);

useLayoutEffect(() => {
const [currentIndex, prevIndex] = [hoverIndex, prevIndexRef.current];
const refreshRowHeight = (index: number) => {
cache.clear(index, 0);
listRef.current?.recomputeRowHeights(index);
};

requestAnimationFrame(() => {
if (prevIndex != null) refreshRowHeight(prevIndex);
if (currentIndex != null) {
refreshRowHeight(currentIndex);
requestAnimationFrame(() => {
listRef.current?.scrollToRow?.(currentIndex);
});
}
prevIndexRef.current = currentIndex;
});
}, [hoverIndex, cache]);

const renderCommitItem = useCallback(
(props: { index: number; key: string }) => {
const { index, key } = props;
(props: { index: number; key: string; expanded: boolean }) => {
const { index, key, expanded } = props;
const item = virtualizedItems[index];
const showMessageBody = !(index === 1 && commitNodeListInCluster.length > 1);

if (item.type === "summary") {
return <DetailSummary commitNodeListInCluster={item.data} />;
}

return (
<MemoizedCommitItem
key={key}
Expand All @@ -56,7 +80,8 @@ const Detail = ({ clusterId, authSrcMap }: DetailProps) => {
repo={repo}
authSrcMap={authSrcMap}
handleCommitIdCopy={handleCommitIdCopy}
linkedMessage={issueLinkedMessage}
showMessageBody={showMessageBody}
expanded={expanded}
/>
);
},
Expand All @@ -72,25 +97,18 @@ const Detail = ({ clusterId, authSrcMap }: DetailProps) => {
columnIndex={0}
rowIndex={index}
>
<div style={style}>{renderCommitItem({ index, key })}</div>
<div
style={style}
onMouseEnter={() => setHoverIndex(index)}
onMouseLeave={() => setHoverIndex(null)}
>
{renderCommitItem({ index, key, expanded: hoverIndex === index })}
</div>
</CellMeasurer>
),
[cache, renderCommitItem]
[cache, renderCommitItem, hoverIndex]
);

const issueLinkedMessage: IssueLinkedMessage = useMemo(() => {
const message = commitNodeListInCluster?.[0]?.commit?.message;
if (!message) return { title: [], body: null };

const [title, ...rest] = message.split("\n");
const body = rest.filter((line) => line.trim()).join("\n");

return {
title: renderIssueLinkedNodes(title, owner, repo),
body: body ? renderIssueLinkedNodes(body, owner, repo) : null,
};
}, [commitNodeListInCluster, owner, repo]);

if (!selectedData || selectedData.length === 0) return null;

return (
Expand All @@ -99,6 +117,7 @@ const Detail = ({ clusterId, authSrcMap }: DetailProps) => {
{({ height, width }) => {
return (
<List
ref={listRef}
height={height}
width={width}
rowCount={virtualizedItems.length}
Expand All @@ -107,6 +126,7 @@ const Detail = ({ clusterId, authSrcMap }: DetailProps) => {
onRowsRendered={handleRowsRendered}
className="detail__virtualized-list"
estimatedRowSize={120}
deferredMeasurementCache={cache}
/>
);
}}
Expand All @@ -123,8 +143,25 @@ const Detail = ({ clusterId, authSrcMap }: DetailProps) => {

export default Detail;

function CommitItem({ commit, owner, repo, authSrcMap, handleCommitIdCopy, linkedMessage }: CommitItemProps) {
function CommitItem({
commit,
owner,
repo,
authSrcMap,
handleCommitIdCopy,
showMessageBody,
expanded,
}: CommitItemProps) {
const { id, message, author, commitDate } = commit;

const { issueLinkedTitle, body } = useMemo(() => {
const [title, ...bodyLines] = message.split("\n");
return {
issueLinkedTitle: renderIssueLinkedNodes(title, owner, repo),
body: bodyLines.filter(Boolean).join("\n"),
};
}, [message, owner, repo]);

return (
<div className="detail__commit-item">
<div className="commit-item__detail">
Expand All @@ -137,13 +174,7 @@ function CommitItem({ commit, owner, repo, authSrcMap, handleCommitIdCopy, linke
src={authSrcMap[author.names.toString()]}
/>
)}
<div className="commit-message__title">
{(() => {
const messageLines = message.split("\n");
const title = messageLines[0];
return linkedMessage.title.length > 0 ? linkedMessage.title : title;
})()}
</div>
<div className="commit-message__title">{issueLinkedTitle}</div>
<div className="commit-item__meta">
<span className="commit-item__author-name">{author.names[0]}</span>
<span className="commit-item__date">{dayjs(commitDate).format("YY. M. DD. a h:mm")}</span>
Expand All @@ -167,17 +198,9 @@ function CommitItem({ commit, owner, repo, authSrcMap, handleCommitIdCopy, linke
</div>
</div>
</div>
{(() => {
const messageLines = message.split("\n");
const body = messageLines
.slice(1)
.filter((line: string) => line.trim())
.join("\n");

return body ? (
<div className="commit-message__body">{linkedMessage.body ? linkedMessage.body : body}</div>
) : null;
})()}
{showMessageBody && body && (
<div className={`commit-message__body${expanded ? "--visible" : ""}`}>{expanded ? body : null}</div>
)}
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/view/src/components/Detail/Detail.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import type { ReactNode } from "react";
import type { ClusterNode } from "types";
import type { Commit } from "types/Commit";
import type { AuthSrcMap } from "components/VerticalClusterList/Summary/Summary.type";
import type { IssueLinkedMessage } from "components/Common/GithubIssueLink";

export type DetailProps = {
clusterId: number;
Expand All @@ -25,7 +24,8 @@ export interface CommitItemProps {
repo: string;
authSrcMap: AuthSrcMap | null;
handleCommitIdCopy: (id: string) => () => Promise<void>;
linkedMessage: IssueLinkedMessage;
showMessageBody: boolean;
expanded: boolean;
}

export type VirtualizedItem =
Expand Down
14 changes: 7 additions & 7 deletions packages/view/src/components/VerticalClusterList/ClusterGraph/Draws/drawSubGraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const tooltip = d3
.append("div")
.attr("class", "cluster-graph__tooltip")
.style("visibility", "hidden")
.style("white-space", "pre-line")
.text("Tooltip");

const calculateCirclePositions = (numOfCircles: number, startY: number, endY: number, gap: number) => {
Expand Down Expand Up @@ -60,13 +61,12 @@ export const drawSubGraph = (
.on("mouseover", (_, { clusterData, circleIndex }) => {
const { commitNodeList } = clusterData.cluster;
const { message } = commitNodeList[circleIndex].commit;
const messageLines = message.split("\n");
const title = messageLines[0];
const body = messageLines
.slice(1)
.filter((line) => line.trim())
.join("\n");
const tooltipText = body ? `${title}\n\n${body}` : title;

const [title, ...bodyLines] = message.split("\n");
const body = bodyLines.filter(Boolean).join("\n");
const showMessageBody = !(circleIndex === 0 && commitNodeList.length > 1) && !!body;
const tooltipText = showMessageBody ? `${title}\n${body}` : title;

tooltip.text(tooltipText);
return tooltip.style("visibility", "visible");
})
Expand Down
Loading
Loading