Skip to content

Commit c25ae83

Browse files
author
Derek Hammond
committed
fix(601): Fix unified view without line numbers expand cell bug
1 parent fb96ee9 commit c25ae83

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/index.tsx

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ class DiffViewer extends React.Component<ReactDiffViewerProps, ReactDiffViewerSt
411411
leftBlockLineNumber: number,
412412
rightBlockLineNumber: number,
413413
): JSX.Element => {
414-
const { splitView } = this.props;
414+
const { hideLineNumbers, splitView } = this.props;
415415
const message = this.props.codeFoldMessageRenderer
416416
? this.props
417417
.codeFoldMessageRenderer(num, leftBlockLineNumber, rightBlockLineNumber)
@@ -425,12 +425,24 @@ class DiffViewer extends React.Component<ReactDiffViewerProps, ReactDiffViewerSt
425425
);
426426
return (
427427
<tr key={`${leftBlockLineNumber}-${rightBlockLineNumber}`} className={this.styles.codeFold}>
428-
{!this.props.hideLineNumbers && (
428+
{!hideLineNumbers && (
429429
<td className={this.styles.codeFoldGutter} />
430430
)}
431431
<td className={cn({ [this.styles.codeFoldGutter]: !splitView })} />
432-
{splitView ? content : <td />}
433-
{!splitView ? content : <td />}
432+
433+
{/* Swap columns only for unified view without line numbers */}
434+
{(!splitView && !hideLineNumbers) ? (
435+
<React.Fragment>
436+
<td />
437+
{content}
438+
</React.Fragment>
439+
) : (
440+
<React.Fragment>
441+
{content}
442+
<td />
443+
</React.Fragment>
444+
)}
445+
434446
<td />
435447
<td />
436448
</tr>

0 commit comments

Comments
 (0)