fix Diff ui types

This commit is contained in:
Sebastian Sdorra
2019-07-30 10:01:00 +02:00
parent 0b76cb7ea5
commit bbdc5a1989
4 changed files with 16 additions and 9 deletions

View File

@@ -1,10 +1,10 @@
//@flow //@flow
import React from "react"; import React from "react";
import DiffFile from "./DiffFile"; import DiffFile from "./DiffFile";
import type { DiffObjectProps } from "./DiffTypes"; import type { DiffObjectProps, File } from "./DiffTypes";
type Props = DiffObjectProps & { type Props = DiffObjectProps & {
diff: any diff: File[]
}; };
class Diff extends React.Component<Props> { class Diff extends React.Component<Props> {

View File

@@ -27,12 +27,17 @@ export type Hunk = {
content: string content: string
}; };
export type ChangeType = "insert" | "delete" | "normal";
export type Change = { export type Change = {
content: string, content: string,
isNormal: boolean, isNormal?: boolean,
newLineNumber: number, isInsert?: boolean,
oldLineNumber: number, isDelete?: boolean,
type: string lineNumber?: number,
newLineNumber?: number,
oldLineNumber?: number,
type: ChangeType
}; };
export type BaseContext = { export type BaseContext = {

View File

@@ -6,14 +6,14 @@ import parser from "gitdiff-parser";
import Loading from "../Loading"; import Loading from "../Loading";
import Diff from "./Diff"; import Diff from "./Diff";
import type {DiffObjectProps} from "./DiffTypes"; import type {DiffObjectProps, File} from "./DiffTypes";
type Props = DiffObjectProps & { type Props = DiffObjectProps & {
url: string url: string
}; };
type State = { type State = {
diff?: any, diff?: File[],
loading: boolean, loading: boolean,
error?: Error error?: Error
}; };
@@ -47,7 +47,8 @@ class LoadingDiff extends React.Component<Props, State> {
.get(url) .get(url)
.then(response => response.text()) .then(response => response.text())
.then(parser.parse) .then(parser.parse)
.then(diff => { // $FlowFixMe
.then((diff: File[]) => {
this.setState({ this.setState({
loading: false, loading: false,
diff: diff diff: diff

View File

@@ -12,6 +12,7 @@ export type {
FileChangeType, FileChangeType,
Hunk, Hunk,
Change, Change,
ChangeType,
BaseContext, BaseContext,
AnnotationFactory, AnnotationFactory,
AnnotationFactoryContext, AnnotationFactoryContext,