From d99b8f3f8bea25a406c448d0fd3cd38e7c3f136f Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Fri, 5 Mar 2021 17:43:16 -0800
Subject: remove extra langs

---
 frontend/src/components/renderers/Code.js | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'frontend/src/components/renderers/Code.js')

diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index a312c51..9238061 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -12,28 +12,9 @@ export const THEMES = Object.freeze({
 })
 
 export const LANGS = Object.freeze({
-    'bash': 'bash',
-    'c': 'c',
-    'c++': 'cpp',
-    'c#': 'cs',
-    'css': 'css',
-    'docker': 'dockerfile',
-    'go': 'go',
-    'haskell': 'haskell',
-    'html': 'html',
-    'java': 'java',
-    'js': 'javascript',
-    'jsx': 'jsx',
     'latex': 'latex',
-    'lisp': 'lisp',
-    'makefile': 'makefile',
     'markdown': 'markdown',
-    'php': 'php',
-    'python': 'python',
-    'raw': 'text',
-    'ruby': 'ruby',
-    'scala': 'scala',
-    'yaml': 'yaml'
+    'auto': 'text',
 })
 
 const StyledPre = styled.pre`
-- 
cgit v1.2.3


From a866d5a9fad78074fdf5c124d7900ab436e01958 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 10:17:28 -0800
Subject: base editor comp

---
 frontend/src/components/renderers/Code.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'frontend/src/components/renderers/Code.js')

diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index 9238061..d9630fc 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -34,23 +34,26 @@ const StyledPre = styled.pre`
   }
 `
 
-const CodeRenderer = React.forwardRef((props, ref) => {
+export const Highlighter = ({language, theme, preTag, children}) => <SyntaxHighlighter
+  language={LANGS[language]}
+  style={THEMES[theme]}
+  showLineNumbers
+  PreTag={preTag}>
+    {children}
+</SyntaxHighlighter>
 
-    const Pre = (props) => {
-        return (
-            <StyledPre {...props} ref={ref} />
-        );
-    }
+const CodeRenderer = React.forwardRef((props, ref) => {
+    const Pre = (props) => <StyledPre {...props} ref={ref} />
 
     return (
         <div className="lt-shadow">
-            <SyntaxHighlighter
-                language={LANGS[props.lang]}
-                style={THEMES[props.theme]}
-                showLineNumbers
-                PreTag={Pre}>
+            <Highlighter
+                language={props.lang}
+                theme={props.theme}
+                preTag={Pre}
+            >
                 {props.content}
-            </SyntaxHighlighter>
+            </Highlighter>
         </div>
     );
 });
-- 
cgit v1.2.3


From 57584eeb0f8ba7212c613e0c79c20ec3dd67efc5 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 13:54:03 -0800
Subject: code input style finalizations

---
 frontend/src/components/renderers/Code.js | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'frontend/src/components/renderers/Code.js')

diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index d9630fc..9243532 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -2,6 +2,7 @@ import React from 'react';
 import SyntaxHighlighter from 'react-syntax-highlighter';
 import { atomOneLight, ascetic, atomOneDark, dracula, ocean } from 'react-syntax-highlighter/dist/esm/styles/hljs';
 import styled from 'styled-components'
+import {Rounded} from "../Form/mixins";
 
 export const THEMES = Object.freeze({
     'atom': atomOneLight,
@@ -14,43 +15,49 @@ export const THEMES = Object.freeze({
 export const LANGS = Object.freeze({
     'latex': 'latex',
     'markdown': 'markdown',
-    'auto': 'text',
+    'detect': 'text',
 })
 
-const StyledPre = styled.pre`
+export const StyledPre = styled.pre`
   width: 100%;
-  font-size: 0.8em;
-  min-height: 1.2em;
-  border-radius: 3px !important;
-  border: 1px solid #565656 !important;
+  font-size: 14px;
+  line-height: 1.2em;
   padding: calc(0.8em - 1px) !important;
-  outline: none;
   margin: 1.7em 0;
+  background: none !important;
+  position: relative;
+  ${Rounded}
+  outline: none;
+  border: 1px solid #565656 !important;
+  
+  & code {
+    font-family: JetBrains Mono !important;
+  }
 
-  & code:first-child {
+  & code:first-child:not(:only-of-type) {
     margin-right: 10px !important;
     border-radius: 0 !important;
     border-right: 1px solid #11111155 !important;
   }
 `
 
-export const Highlighter = ({language, theme, preTag, children}) => <SyntaxHighlighter
+export const Highlighter = ({language, lineNumbers, theme, pre = StyledPre, children}) => <SyntaxHighlighter
   language={LANGS[language]}
   style={THEMES[theme]}
-  showLineNumbers
-  PreTag={preTag}>
+  showLineNumbers={lineNumbers}
+  PreTag={pre}>
     {children}
 </SyntaxHighlighter>
 
 const CodeRenderer = React.forwardRef((props, ref) => {
     const Pre = (props) => <StyledPre {...props} ref={ref} />
-
     return (
         <div className="lt-shadow">
             <Highlighter
+                lineNumbers={true}
                 language={props.lang}
                 theme={props.theme}
-                preTag={Pre}
+                pre={Pre}
             >
                 {props.content}
             </Highlighter>
-- 
cgit v1.2.3


From e9a7416fabbbb0155c09ee86e7843a4d87e0c118 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 14:44:15 -0800
Subject: code renderer virtualization, better visuals

---
 frontend/src/components/renderers/Code.js | 38 ++++++++++++++-----------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'frontend/src/components/renderers/Code.js')

diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index 9243532..d110f79 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import SyntaxHighlighter from 'react-syntax-highlighter';
+import virtualizedRenderer from 'react-syntax-highlighter-virtualized-renderer';
 import { atomOneLight, ascetic, atomOneDark, dracula, ocean } from 'react-syntax-highlighter/dist/esm/styles/hljs';
 import styled from 'styled-components'
-import {Rounded} from "../Form/mixins";
+import {Border, CodeLike, DropShadow, Hover, Rounded} from "../Form/mixins";
 
 export const THEMES = Object.freeze({
     'atom': atomOneLight,
@@ -19,19 +20,17 @@ export const LANGS = Object.freeze({
 })
 
 export const StyledPre = styled.pre`
-  width: 100%;
-  font-size: 14px;
-  line-height: 1.2em;
-  padding: calc(0.8em - 1px) !important;
+  ${Rounded};
+  ${Border};
+  ${DropShadow};
+  width: calc(100%);
+  padding: calc(0.6em - 1px) !important;
   margin: 1.7em 0;
-  background: none !important;
   position: relative;
-  ${Rounded}
   outline: none;
-  border: 1px solid #565656 !important;
   
   & code {
-    font-family: JetBrains Mono !important;
+    ${CodeLike}
   }
 
   & code:first-child:not(:only-of-type) {
@@ -51,18 +50,15 @@ export const Highlighter = ({language, lineNumbers, theme, pre = StyledPre, chil
 
 const CodeRenderer = React.forwardRef((props, ref) => {
     const Pre = (props) => <StyledPre {...props} ref={ref} />
-    return (
-        <div className="lt-shadow">
-            <Highlighter
-                lineNumbers={true}
-                language={props.lang}
-                theme={props.theme}
-                pre={Pre}
-            >
-                {props.content}
-            </Highlighter>
-        </div>
-    );
+    return (<Highlighter
+      lineNumbers={true}
+      language={props.lang}
+      theme={props.theme}
+      renderer={virtualizedRenderer()}
+      pre={Pre}
+    >
+      {props.content}
+    </Highlighter>)
 });
 
 export default CodeRenderer
\ No newline at end of file
-- 
cgit v1.2.3


From 75e8bdd2d4cdaefe28ed40a7735c993f98d15754 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 16:32:09 -0800
Subject: refactor form -> common

---
 frontend/src/components/renderers/Code.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/src/components/renderers/Code.js')

diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index d110f79..5c8457c 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -3,7 +3,7 @@ import SyntaxHighlighter from 'react-syntax-highlighter';
 import virtualizedRenderer from 'react-syntax-highlighter-virtualized-renderer';
 import { atomOneLight, ascetic, atomOneDark, dracula, ocean } from 'react-syntax-highlighter/dist/esm/styles/hljs';
 import styled from 'styled-components'
-import {Border, CodeLike, DropShadow, Hover, Rounded} from "../Form/mixins";
+import {Border, CodeLike, DropShadow, Rounded} from "../Common/mixins";
 
 export const THEMES = Object.freeze({
     'atom': atomOneLight,
-- 
cgit v1.2.3


From 2c5bf739b8dfd8d3c7d341ab57ca8ea08fbc5f9e Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sat, 6 Mar 2021 17:07:28 -0800
Subject: fix button dropdown height

---
 frontend/src/components/renderers/Code.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'frontend/src/components/renderers/Code.js')

diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index 5c8457c..4ab1175 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -48,17 +48,16 @@ export const Highlighter = ({language, lineNumbers, theme, pre = StyledPre, chil
     {children}
 </SyntaxHighlighter>
 
-const CodeRenderer = React.forwardRef((props, ref) => {
-    const Pre = (props) => <StyledPre {...props} ref={ref} />
+const CodeRenderer = (props) => {
     return (<Highlighter
       lineNumbers={true}
       language={props.lang}
       theme={props.theme}
       renderer={virtualizedRenderer()}
-      pre={Pre}
+      pre={StyledPre}
     >
       {props.content}
     </Highlighter>)
-});
+};
 
 export default CodeRenderer
\ No newline at end of file
-- 
cgit v1.2.3