diff --git a/scm-ui/ui-components/src/repos/DiffDropDown.tsx b/scm-ui/ui-components/src/repos/DiffDropDown.tsx index d0edf9bd10..4b5437f2b4 100644 --- a/scm-ui/ui-components/src/repos/DiffDropDown.tsx +++ b/scm-ui/ui-components/src/repos/DiffDropDown.tsx @@ -17,8 +17,7 @@ import React, { FC, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { Checkbox } from "@scm-manager/ui-core"; - -export type HideWhiteSpaceMode = "ALL" | "NONE"; +import { WhitespaceMode } from "./LoadingDiff"; type DiffDropDownProps = { collapseDiffs: () => void; @@ -27,8 +26,8 @@ type DiffDropDownProps = { */ ignoreWhitespaces?: () => void; renderOnMount: boolean; - ignoreWhitespacesMode?: HideWhiteSpaceMode; - setIgnoreWhitespacesMode?: (hideWhiteSpaceMode: HideWhiteSpaceMode) => void; + ignoreWhitespacesMode?: WhitespaceMode; + setIgnoreWhitespacesMode?: (hideWhiteSpaceMode: WhitespaceMode) => void; }; const DiffDropDown: FC = ({ collapseDiffs, diff --git a/scm-ui/ui-components/src/repos/LoadingDiff.tsx b/scm-ui/ui-components/src/repos/LoadingDiff.tsx index 5e8f019e2d..2bb4267a79 100644 --- a/scm-ui/ui-components/src/repos/LoadingDiff.tsx +++ b/scm-ui/ui-components/src/repos/LoadingDiff.tsx @@ -29,7 +29,8 @@ import DiffFileTree from "./diff/DiffFileTree"; import { DiffContent, FileTreeContent } from "./diff/styledElements"; import { useHistory, useLocation } from "react-router-dom"; import { getFileNameFromHash } from "./diffs"; -import { HideWhiteSpaceMode } from "./DiffDropDown"; + +export type WhitespaceMode = "ALL" | "NONE"; type Props = DiffObjectProps & { url: string; @@ -56,7 +57,7 @@ const PartialNotification: FC = ({ fetchNextPage, isFetchingN }; const LoadingDiff: FC = ({ url, limit, refetchOnWindowFocus, ...props }) => { - const [ignoreWhitespace, setIgnoreWhitespace] = useState("NONE"); + const [ignoreWhitespace, setIgnoreWhitespace] = useState("NONE"); const [collapsed, setCollapsed] = useState(false); const [prevHash, setPrevHash] = useState(""); const location = useLocation(); @@ -107,7 +108,7 @@ const LoadingDiff: FC = ({ url, limit, refetchOnWindowFocus, ...props }) collapseDiffs={collapseDiffs} renderOnMount={true} ignoreWhitespacesMode={ignoreWhitespace} - setIgnoreWhitespacesMode={(hideWhiteSpaceMode: HideWhiteSpaceMode) => { + setIgnoreWhitespacesMode={(hideWhiteSpaceMode: WhitespaceMode) => { setIgnoreWhitespace(hideWhiteSpaceMode); }} /> diff --git a/scm-ui/ui-components/src/repos/index.ts b/scm-ui/ui-components/src/repos/index.ts index 7811e20db2..7fd8772c6a 100644 --- a/scm-ui/ui-components/src/repos/index.ts +++ b/scm-ui/ui-components/src/repos/index.ts @@ -22,7 +22,7 @@ import { AnnotationFactoryContext, DiffEventHandler, DiffEventContext, - DiffObjectProps + DiffObjectProps, } from "./DiffTypes"; import { FileDiff as File, FileChangeType, Hunk, Change, ChangeType } from "@scm-manager/ui-types"; @@ -36,7 +36,7 @@ export { default as Diff } from "./Diff"; export { default as DiffFile } from "./DiffFile"; export { default as DiffButton } from "./DiffButton"; export { FileControlFactory } from "./DiffTypes"; -export { default as LoadingDiff } from "./LoadingDiff"; +export { default as LoadingDiff, WhitespaceMode } from "./LoadingDiff"; export { DefaultCollapsed, DefaultCollapsedFunction } from "./defaultCollapsed"; export { default as RepositoryAvatar } from "./RepositoryAvatar"; export { default as RepositoryEntry } from "./RepositoryEntry"; @@ -46,7 +46,7 @@ export { default as CommitAuthor } from "./CommitAuthor"; export { default as HealthCheckFailureDetail } from "./HealthCheckFailureDetail"; export { default as RepositoryFlags } from "./RepositoryFlags"; export { default as DiffDropDown } from "./DiffDropDown"; -export { default as DiffStatistics } from "./DiffStatistics" +export { default as DiffStatistics } from "./DiffStatistics"; export { File, @@ -59,5 +59,5 @@ export { AnnotationFactoryContext, DiffEventHandler, DiffEventContext, - DiffObjectProps + DiffObjectProps, };