Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 22:45:45 +01:00
Code Issues Packages Projects Releases Activity

upgrade react-diff-view to v2.4.1

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-01-06 15:59:16 +01:00
parent 3e1828eb12
commit cc26ffcaa8
8 changed files with 8368 additions and 3932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-ui/ui-components/src/repos/DiffFile.tsx
View File

@@ -3,11 +3,13 @@ import { withTranslation, WithTranslation } from "react-i18next";
import classNames from "classnames";
import styled from "styled-components";
// @ts-ignore
import { Change, Diff as DiffComponent, getChangeKey, Hunk } from "react-diff-view";
import { Diff as DiffComponent, getChangeKey, Hunk } from "react-diff-view";
import { Button, ButtonGroup } from "../buttons";
import Tag from "../Tag";
import Icon from "../Icon";
import { File, Hunk as HunkType, DiffObjectProps } from "./DiffTypes";
import { ChangeEvent, Change, File, Hunk as HunkType, DiffObjectProps } from "./DiffTypes";
const EMPTY_ANNOTATION_FACTORY = {};
type Props = DiffObjectProps &
WithTranslation & {
@@ -56,6 +58,10 @@ const ChangeTypeTag = styled(Tag)`
`;
const ModifiedDiffComponent = styled(DiffComponent)`
/* align line numbers */
& .diff-gutter {
text-align: right;
}
/* column sizing */
> colgroup .diff-gutter-col {
width: 3.25rem;
@@ -136,6 +142,8 @@ class DiffFile extends React.Component<Props, State> {
hunk,
file
});
} else {
return EMPTY_ANNOTATION_FACTORY;
}
};
@@ -152,14 +160,12 @@ class DiffFile extends React.Component<Props, State> {
}
};
createCustomEvents = (hunk: HunkType) => {
createGutterEvents = (hunk: HunkType) => {
const { onClick } = this.props;
if (onClick) {
return {
gutter: {
onClick: (change: Change) => {
this.handleClickEvent(change, hunk);
}
onClick: (event: ChangeEvent) => {
this.handleClickEvent(event.change, hunk);
}
};
}
@@ -172,7 +178,7 @@ class DiffFile extends React.Component<Props, State> {
hunk={hunk}
header={this.createHunkHeader(hunk, i)}
widgets={this.collectHunkAnnotations(hunk)}
customEvents={this.createCustomEvents(hunk)}
gutterEvents={this.createGutterEvents(hunk)}
/>
);
};
@@ -228,8 +234,8 @@ class DiffFile extends React.Component<Props, State> {
body = (
<div className="panel-block is-paddingless">
{fileAnnotations}
<ModifiedDiffComponent className={viewType} viewType={viewType}>
{file.hunks.map(this.renderHunk)}
<ModifiedDiffComponent className={viewType} viewType={viewType} hunks={file.hunks} diffType={file.type}>
{(hunks: HunkType[]) => hunks.map(this.renderHunk)}
</ModifiedDiffComponent>
</div>
);