refactor markdownviewer // fix padding

scm-ui/ui-webapp/src/repos/sources/components/content/MarkdownViewer.tsx

@@ -1,16 +1,21 @@
 import React, { FC, useEffect, useState } from "react";
 import { getContent } from "./SourcecodeViewer";
 import { Link, File } from "@scm-manager/ui-types";
-import { Loading, ErrorNotification, MarkdownView, Button, Level } from "@scm-manager/ui-components";
+import { Loading, ErrorNotification, MarkdownView } from "@scm-manager/ui-components";
+import styled from "styled-components";
 
 type Props = {
   file: File;
 };
 
+const MarkdownContent = styled.div`
+  padding: 0.5rem;
+`;
+
 const MarkdownViewer: FC<Props> = ({ file }) => {
-  const [loading, setLoading] = useState<boolean>(true);
+  const [loading, setLoading] = useState(true);
   const [error, setError] = useState<Error | undefined>(undefined);
-  const [content, setContent] = useState<string>("");
+  const [content, setContent] = useState("");
 
   useEffect(() => {
     getContent((file._links.self as Link).href)
@@ -32,7 +37,11 @@ const MarkdownViewer: FC<Props> = ({ file }) => {
     return <ErrorNotification error={error} />;
   }
 
-  return <MarkdownView content={content} />;
+  return (
+    <MarkdownContent>
+      <MarkdownView content={content} />
+    </MarkdownContent>
+  );
 };
 
 export default MarkdownViewer;

scm-ui/ui-webapp/src/repos/sources/components/content/SwitchableMarkdownViewer.tsx

@@ -0,0 +1,51 @@
+import React, { FC, useState } from "react";
+import styled from "styled-components";
+import MarkdownViewer from "./MarkdownViewer";
+import SourcecodeViewer from "./SourcecodeViewer";
+import { File } from "@scm-manager/ui-types";
+import { Button } from "@scm-manager/ui-components";
+import { useTranslation } from "react-i18next";
+
+const ToggleButton = styled(Button)`
+  max-width: 1rem;
+  position: absolute;
+  top: 0;
+  right: 0.25rem;
+  z-index: 999;
+`;
+
+const Container = styled.div`
+  position: relative;
+`;
+
+type Props = {
+  file: File;
+};
+
+const SwitchableMarkdownViewer: FC<Props> = ({ file }) => {
+  const { t } = useTranslation("repos");
+  const [renderMarkdown, setRenderMarkdown] = useState(true);
+
+  const toggleMarkdown = () => {
+    setRenderMarkdown(!renderMarkdown);
+  };
+
+  return (
+    <Container>
+      <ToggleButton
+        color={renderMarkdown ? "link" : ""}
+        action={toggleMarkdown}
+        title={
+          renderMarkdown
+            ? t("sources.content.toggleButton.showSources")
+            : t("sources.content.toggleButton.showMarkdown")
+        }
+      >
+        <i className="fab fa-markdown" />
+      </ToggleButton>
+      {renderMarkdown ? <MarkdownViewer file={file} /> : <SourcecodeViewer file={file} language={"MARKDOWN"} />}
+    </Container>
+  );
+};
+
+export default SwitchableMarkdownViewer;

scm-ui/ui-webapp/src/repos/sources/containers/SourcesView.tsx

@@ -1,21 +1,14 @@
 import React from "react";
-import styled from "styled-components";
-import { WithTranslation, withTranslation } from "react-i18next";
 import SourcecodeViewer from "../components/content/SourcecodeViewer";
 import ImageViewer from "../components/content/ImageViewer";
-import MarkdownViewer from "../components/content/MarkdownViewer";
 import DownloadViewer from "../components/content/DownloadViewer";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
 import { getContentType } from "./contentType";
 import { File, Repository } from "@scm-manager/ui-types";
-import { Button, ErrorNotification, Level, Loading } from "@scm-manager/ui-components";
+import { ErrorNotification, Loading } from "@scm-manager/ui-components";
+import SwitchableMarkdownViewer from "../components/content/SwitchableMarkdownViewer";
 
-const ToggleButton = styled(Button)`
+type Props = {
-  max-width: 2em;
-  margin-right: 0.25em;
-`;
-
-type Props = WithTranslation & {
   repository: Repository;
   file: File;
   revision: string;
@@ -25,7 +18,6 @@ type Props = WithTranslation & {
 type State = {
   contentType: string;
   language: string;
-  renderMarkdown: boolean;
   loaded: boolean;
   error?: Error;
 };
@@ -37,8 +29,7 @@ class SourcesView extends React.Component<Props, State> {
     this.state = {
       contentType: "",
       language: "",
-      loaded: false,
+      loaded: false
-      renderMarkdown: true
     };
   }
 
@@ -62,32 +53,13 @@ class SourcesView extends React.Component<Props, State> {
       });
   }
 
-  toggleMarkdown = () => {
-    this.setState({ renderMarkdown: !this.state.renderMarkdown });
-  };
-
   showSources() {
-    const { file, revision, t } = this.props;
+    const { file, revision } = this.props;
-    const { contentType, language, renderMarkdown } = this.state;
+    const { contentType, language } = this.state;
     if (contentType.startsWith("image/")) {
       return <ImageViewer file={file} />;
     } else if (contentType.includes("markdown")) {
-      return (
+      return <SwitchableMarkdownViewer file={file} />;
-        <>
-          <Level
-            right={
-              <ToggleButton
-                color={renderMarkdown ? "" : "link"}
-                action={this.toggleMarkdown}
-                title={renderMarkdown ? t("sources.content.toggleButton.showSources") : t("sources.content.toggleButton.showMarkdown")}
-              >
-                <i className="fab fa-markdown"></i>
-              </ToggleButton>
-            }
-          />
-          {renderMarkdown ? <MarkdownViewer file={file} /> : <SourcecodeViewer file={file} language={language} />}
-        </>
-      );
     } else if (language) {
       return <SourcecodeViewer file={file} language={language} />;
     } else if (contentType.startsWith("text/")) {
@@ -125,4 +97,4 @@ class SourcesView extends React.Component<Props, State> {
   }
 }
 
-export default withTranslation("repos")(SourcesView);
+export default SourcesView;