Skip to content
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

Pass Additional Context to RenderContent #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass Additional Context to RenderContent #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 27 additions & 5 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ export interface ReactDiffViewerProps {
// Show only diff between the two values.
showDiffOnly?: boolean;
// Render prop to format final string before displaying them in the UI.
renderContent?: (source: string) => JSX.Element;
renderContent?: (
source: string,
lineNumber: number,
type: DiffType,
prefix: LineNumberPrefix
) => JSX.Element;
// Render prop to format code fold message.
codeFoldMessageRenderer?: (
totalFoldedLines: number,
Expand Down Expand Up @@ -172,10 +177,19 @@ class DiffViewer extends React.Component<ReactDiffViewerProps, ReactDiffViewerSt
*
* @param diffArray Word diff information derived from line information.
* @param renderer Optional renderer to format diff words. Useful for syntax highlighting.
* @param prefix LineNumberPrefix L|R
* @param lineNumber the line number displayed in the gutter.
*/
private renderWordDiff = (
diffArray: DiffInformation[],
renderer?: (chunk: string) => JSX.Element,
prefix: LineNumberPrefix,
lineNumber: number,
renderer?: (
chunk: string,
lineNumber: number,
type: DiffType,
prefix: LineNumberPrefix
) => JSX.Element,
): JSX.Element[] => {
return diffArray.map(
(wordDiff, i): JSX.Element => {
Expand All @@ -187,7 +201,12 @@ class DiffViewer extends React.Component<ReactDiffViewerProps, ReactDiffViewerSt
[this.styles.wordRemoved]: wordDiff.type === DiffType.REMOVED,
})}
>
{renderer ? renderer(wordDiff.value as string) : wordDiff.value}
{renderer ? renderer(
wordDiff.value as string,
lineNumber,
wordDiff.type,
prefix,
) : wordDiff.value}
</span>
);
},
Expand Down Expand Up @@ -222,10 +241,13 @@ class DiffViewer extends React.Component<ReactDiffViewerProps, ReactDiffViewerSt
const added = type === DiffType.ADDED;
const removed = type === DiffType.REMOVED;
let content;

const passedLineNumber = lineNumber !== null ? lineNumber : additionalLineNumber;

if (Array.isArray(value)) {
content = this.renderWordDiff(value, this.props.renderContent);
content = this.renderWordDiff(value, prefix, passedLineNumber, this.props.renderContent);
} else if (this.props.renderContent) {
content = this.props.renderContent(value);
content = this.props.renderContent(value, passedLineNumber, type, prefix);
} else {
content = value;
}
Expand Down