@@ -14946,18 +14704,18 @@ exports[`Storyshots Diff Hunks 1`] = `
className="fas fa-angle-down has-text-inherit"
/>
src/main/java/com/cloudogu/scm/review/pullrequest/service/DefaultPullRequestService.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -15224,7 +14974,7 @@ exports[`Storyshots Diff Hunks 1`] = `
colSpan={3}
>
@@ -15415,7 +15165,7 @@ exports[`Storyshots Diff Hunks 1`] = `
colSpan={3}
>
@@ -15766,16 +15516,16 @@ exports[`Storyshots Diff Hunks 1`] = `
exports[`Storyshots Diff Line Annotation 1`] = `
Array [
@@ -15783,18 +15533,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/java/com/cloudogu/scm/review/events/EventListener.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -16356,16 +16098,16 @@ Array [
,
@@ -16373,18 +16115,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/js/ChangeNotification.tsx
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -16640,7 +16374,7 @@ Array [
colSpan={3}
>
@@ -17223,16 +16957,16 @@ Array [
,
@@ -17240,18 +16974,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/de/plugins.json
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -17674,16 +17400,16 @@ Array [
,
@@ -17691,18 +17417,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/en/plugins.json
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -18125,16 +17843,16 @@ Array [
,
@@ -18142,18 +17860,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/test/java/com/cloudogu/scm/review/events/ClientTest.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -18714,7 +18424,7 @@ Array [
colSpan={3}
>
@@ -18928,7 +18638,7 @@ Array [
colSpan={3}
>
@@ -19183,16 +18893,16 @@ Array [
,
@@ -19200,18 +18910,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
Main.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -19726,16 +19428,16 @@ Array [
exports[`Storyshots Diff OnClick 1`] = `
Array [
@@ -19743,18 +19445,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/java/com/cloudogu/scm/review/events/EventListener.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -20344,16 +20038,16 @@ Array [
,
@@ -20361,18 +20055,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/js/ChangeNotification.tsx
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -20630,7 +20316,7 @@ Array [
colSpan={3}
>
@@ -21261,16 +20947,16 @@ Array [
,
@@ -21278,18 +20964,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/de/plugins.json
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -21742,16 +21420,16 @@ Array [
,
@@ -21759,18 +21437,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/en/plugins.json
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -22223,16 +21893,16 @@ Array [
,
@@ -22240,18 +21910,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/test/java/com/cloudogu/scm/review/events/ClientTest.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -22852,7 +22514,7 @@ Array [
colSpan={3}
>
@@ -23082,7 +22744,7 @@ Array [
colSpan={3}
>
@@ -23357,16 +23019,16 @@ Array [
,
@@ -23374,18 +23036,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
Main.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -23924,16 +23578,16 @@ Array [
exports[`Storyshots Diff Side-By-Side 1`] = `
Array [
@@ -23941,18 +23595,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/java/com/cloudogu/scm/review/events/EventListener.java
modify
-
-
-
-
-
- diff.combined
-
-
-
+
+
@@ -24595,16 +24241,16 @@ Array [
,
@@ -24612,18 +24258,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/js/ChangeNotification.tsx
modify
-
-
-
-
-
- diff.combined
-
-
-
+
+
@@ -24911,7 +24549,7 @@ Array [
colSpan={4}
>
@@ -25540,16 +25178,16 @@ Array [
,
@@ -25557,18 +25195,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/de/plugins.json
modify
-
-
-
-
-
- diff.combined
-
-
-
+
+
@@ -26043,16 +25673,16 @@ Array [
,
@@ -26060,18 +25690,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/en/plugins.json
modify
-
-
-
-
-
- diff.combined
-
-
-
+
+
@@ -26546,16 +26168,16 @@ Array [
,
@@ -26563,18 +26185,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/test/java/com/cloudogu/scm/review/events/ClientTest.java
modify
-
-
-
-
-
- diff.combined
-
-
-
+
+
@@ -27246,7 +26860,7 @@ Array [
colSpan={4}
>
@@ -27488,7 +27102,7 @@ Array [
colSpan={4}
>
@@ -27773,16 +27387,16 @@ Array [
,
@@ -27790,18 +27404,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
Main.java
modify
-
-
-
-
-
- diff.combined
-
-
-
+
+
@@ -28377,16 +27983,16 @@ Array [
exports[`Storyshots Diff SyntaxHighlighting 1`] = `
Array [
@@ -28394,18 +28000,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/java/com/cloudogu/scm/review/events/EventListener.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -28955,16 +28553,16 @@ Array [
,
@@ -28972,18 +28570,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/js/ChangeNotification.tsx
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -29227,7 +28817,7 @@ Array [
colSpan={3}
>
@@ -29810,16 +29400,16 @@ Array [
,
@@ -29827,18 +29417,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/de/plugins.json
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -30261,16 +29843,16 @@ Array [
,
@@ -30278,18 +29860,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/main/resources/locales/en/plugins.json
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -30712,16 +30286,16 @@ Array [
,
@@ -30729,18 +30303,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
src/test/java/com/cloudogu/scm/review/events/ClientTest.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -31301,7 +30867,7 @@ Array [
colSpan={3}
>
@@ -31515,7 +31081,7 @@ Array [
colSpan={3}
>
@@ -31770,16 +31336,16 @@ Array [
,
@@ -31787,18 +31353,18 @@ Array [
className="fas fa-angle-down has-text-inherit"
/>
Main.java
modify
-
-
-
-
-
- diff.sideBySide
-
-
-
+
+
@@ -32300,7 +31858,7 @@ Array [
exports[`Storyshots Forms|Checkbox Default 1`] = `
@@ -34373,7 +33931,7 @@ exports[`Storyshots Table|Table Default 1`] = `
>
Last Name
@@ -34458,7 +34016,7 @@ exports[`Storyshots Table|Table TextColumn 1`] = `
>
Id
Name
Description
diff --git a/scm-ui/ui-components/src/repos/Diff.stories.tsx b/scm-ui/ui-components/src/repos/Diff.stories.tsx
index 7d51d30ea1..52cd80048e 100644
--- a/scm-ui/ui-components/src/repos/Diff.stories.tsx
+++ b/scm-ui/ui-components/src/repos/Diff.stories.tsx
@@ -6,10 +6,10 @@ import parser from "gitdiff-parser";
import simpleDiff from "../__resources__/Diff.simple";
import hunksDiff from "../__resources__/Diff.hunks";
import binaryDiff from "../__resources__/Diff.binary";
-import Button from "../buttons/Button";
import { DiffEventContext, File } from "./DiffTypes";
import Toast from "../toast/Toast";
import { getPath } from "./diffs";
+import DiffButton from "./DiffButton";
const diffFiles = parser.parse(simpleDiff);
@@ -17,7 +17,14 @@ storiesOf("Diff", module)
.add("Default", () => )
.add("Side-By-Side", () => )
.add("Collapsed", () => )
- .add("File Controls", () => Custom Control } />)
+ .add("File Controls", () => (
+ (
+ alert("Arrrgggghhhh ...")} />
+ )}
+ />
+ ))
.add("File Annotation", () => (
void;
+};
+
+const DiffButton: FC = ({ icon, title, onClick }) => {
+ const handleClick = (e: MouseEvent) => {
+ e.preventDefault();
+ onClick();
+ };
+
+ return (
+
+
+
+ );
+};
+
+export default DiffButton;
diff --git a/scm-ui/ui-components/src/repos/DiffFile.tsx b/scm-ui/ui-components/src/repos/DiffFile.tsx
index 2a2dc60e26..de784ac629 100644
--- a/scm-ui/ui-components/src/repos/DiffFile.tsx
+++ b/scm-ui/ui-components/src/repos/DiffFile.tsx
@@ -9,6 +9,7 @@ import Tag from "../Tag";
import Icon from "../Icon";
import { Change, ChangeEvent, DiffObjectProps, File, Hunk as HunkType } from "./DiffTypes";
import TokenizedDiffView from "./TokenizedDiffView";
+import DiffButton from "./DiffButton";
const EMPTY_ANNOTATION_FACTORY = {};
@@ -250,11 +251,10 @@ class DiffFile extends React.Component {
file.hunks && file.hunks.length > 0 ? (
-
{fileControls}
diff --git a/scm-ui/ui-components/src/repos/index.ts b/scm-ui/ui-components/src/repos/index.ts
index 58df2bb3af..07e270b156 100644
--- a/scm-ui/ui-components/src/repos/index.ts
+++ b/scm-ui/ui-components/src/repos/index.ts
@@ -19,6 +19,7 @@ export * from "./changesets";
export { default as Diff } from "./Diff";
export { default as DiffFile } from "./DiffFile";
+export { default as DiffButton } from "./DiffButton";
export { default as LoadingDiff } from "./LoadingDiff";
export { DefaultCollapsed, DefaultCollapsedFunction } from "./defaultCollapsed";