From bcba3e28cd6683c62aacbc661adda2e127c78e65 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 7 Feb 2020 15:10:54 +0100 Subject: [PATCH] Move redundant prop to type --- scm-ui/ui-components/src/repos/Diff.tsx | 2 -- scm-ui/ui-components/src/repos/DiffFile.tsx | 2 -- scm-ui/ui-components/src/repos/DiffTypes.ts | 2 ++ scm-ui/ui-components/src/repos/LoadingDiff.tsx | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/scm-ui/ui-components/src/repos/Diff.tsx b/scm-ui/ui-components/src/repos/Diff.tsx index 66ec29358e..adcf9b2282 100644 --- a/scm-ui/ui-components/src/repos/Diff.tsx +++ b/scm-ui/ui-components/src/repos/Diff.tsx @@ -3,12 +3,10 @@ import DiffFile from "./DiffFile"; import { DiffObjectProps, File } from "./DiffTypes"; import Notification from "../Notification"; import { WithTranslation, withTranslation } from "react-i18next"; -import { DefaultCollapsed } from "./defaultCollapsed"; type Props = WithTranslation & DiffObjectProps & { diff: File[]; - defaultCollapse?: DefaultCollapsed; }; class Diff extends React.Component { diff --git a/scm-ui/ui-components/src/repos/DiffFile.tsx b/scm-ui/ui-components/src/repos/DiffFile.tsx index 5dcf8d4b8c..2a2dc60e26 100644 --- a/scm-ui/ui-components/src/repos/DiffFile.tsx +++ b/scm-ui/ui-components/src/repos/DiffFile.tsx @@ -9,14 +9,12 @@ import Tag from "../Tag"; import Icon from "../Icon"; import { Change, ChangeEvent, DiffObjectProps, File, Hunk as HunkType } from "./DiffTypes"; import TokenizedDiffView from "./TokenizedDiffView"; -import { DefaultCollapsed } from "./defaultCollapsed"; const EMPTY_ANNOTATION_FACTORY = {}; type Props = DiffObjectProps & WithTranslation & { file: File; - defaultCollapse?: DefaultCollapsed; }; type Collapsible = { diff --git a/scm-ui/ui-components/src/repos/DiffTypes.ts b/scm-ui/ui-components/src/repos/DiffTypes.ts index 813322529e..7867103777 100644 --- a/scm-ui/ui-components/src/repos/DiffTypes.ts +++ b/scm-ui/ui-components/src/repos/DiffTypes.ts @@ -1,4 +1,5 @@ import { ReactNode } from "react"; +import { DefaultCollapsed } from "./defaultCollapsed"; // We place the types here and not in @scm-manager/ui-types, // because they represent not a real scm-manager related type. @@ -77,4 +78,5 @@ export type DiffObjectProps = { fileAnnotationFactory?: FileAnnotationFactory; annotationFactory?: AnnotationFactory; markConflicts?: boolean; + defaultCollapse?: DefaultCollapsed; }; diff --git a/scm-ui/ui-components/src/repos/LoadingDiff.tsx b/scm-ui/ui-components/src/repos/LoadingDiff.tsx index 7d8cb00f21..b223644d21 100644 --- a/scm-ui/ui-components/src/repos/LoadingDiff.tsx +++ b/scm-ui/ui-components/src/repos/LoadingDiff.tsx @@ -10,12 +10,10 @@ import { DiffObjectProps, File } from "./DiffTypes"; import { NotFoundError } from "../errors"; import { Notification } from "../index"; import { withTranslation, WithTranslation } from "react-i18next"; -import { DefaultCollapsed } from "./defaultCollapsed"; type Props = WithTranslation & DiffObjectProps & { url: string; - defaultCollapse?: DefaultCollapsed; }; type State = {