fix: remove extra divs

open-rpc · Dec 5, 2019 · 49d29be · 49d29be
1 parent 49074ab
commit 49d29be
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 47 deletions.
diff --git a/src/containers/Inspector.tsx b/src/containers/Inspector.tsx
@@ -119,7 +119,7 @@ const Inspector: React.FC<IProps> = (props) => {
   };
 
   return (
-    <div style={{ height: "100%" }}>
+    <>
       <AppBar position="static" elevation={0} color="default">
         <Toolbar>
           <img
@@ -150,53 +150,50 @@ const Inspector: React.FC<IProps> = (props) => {
           }
         </Toolbar>
       </AppBar>
-      <div style={{ display: "flex", marginBottom: "-80px" }}>
-        <SplitPane
-          split="vertical"
-          minSize={100}
-          maxSize={-100}
-          defaultSize={"50%"}
-          style={{ flexGrow: 1 }}
-          onChange={() => {
-            if (editorRef && editorRef.current) {
-              (editorRef.current as any).layout();
-            }
-          }}>
-          <div style={{ width: "99%", padding: "10px" }}>
-            <JSONRPCRequest
-              onChange={(val) => setJson(JSON.parse(val))}
-              openrpcMethodObject={props.openrpcMethodObject}
-              value={JSON.stringify(json, null, 4)}
-            />
-          </div>
-          <div style={{ height: "100%", padding: "10px", overflowY: "auto", paddingBottom: "80px" }}>
-            {(results || error) &&
-              <Button
-                style={{ position: "absolute", top: "15px", right: "15px", zIndex: 1 }}
-                onClick={handleClearButton}>
-                Clear
+      <SplitPane
+        split="vertical"
+        minSize={100}
+        maxSize={-100}
+        defaultSize={"50%"}
+        style={{ flexGrow: 1 }}
+        onChange={() => {
+          if (editorRef && editorRef.current) {
+            (editorRef.current as any).layout();
+          }
+        }}>
+        <JSONRPCRequest
+          onChange={(val) => setJson(JSON.parse(val))}
+          openrpcMethodObject={props.openrpcMethodObject}
+          value={JSON.stringify(json, null, 4)}
+        />
+        <>
+          {(results || error) &&
+            <Button
+              style={{ position: "absolute", top: "15px", right: "15px", zIndex: 1 }}
+              onClick={handleClearButton}>
+              Clear
                 </Button>
-            }
-            <Editor
-              options={{
-                minimap: {
-                  enabled: false,
-                },
-                wordWrap: "on",
-                lineNumbers: "off",
-                wrappingIndent: "deepIndent",
-                readOnly: true,
-                showFoldingControls: "always",
-              }}
-              editorDidMount={handleResponseEditorDidMount}
-              theme={darkMode.value ? "dark" : "light"}
-              language="json"
-              value={JSON.stringify(error || results, null, 4) || ""}
-            />
-          </div>
-        </SplitPane >
-      </div>
-    </div>
+          }
+          <Editor
+            options={{
+              minimap: {
+                enabled: false,
+              },
+              wordWrap: "on",
+              lineNumbers: "off",
+              wrappingIndent: "deepIndent",
+              readOnly: true,
+              showFoldingControls: "always",
+            }}
+            height="100vh"
+            editorDidMount={handleResponseEditorDidMount}
+            theme={darkMode.value ? "dark" : "light"}
+            language="json"
+            value={JSON.stringify(error || results, null, 4) || ""}
+          />
+        </>
+      </SplitPane>
+    </>
   );
 };
 

diff --git a/src/containers/JSONRPCRequest.tsx b/src/containers/JSONRPCRequest.tsx
@@ -95,6 +95,7 @@ const JSONRPCRequest: React.FC<IProps> = (props) => {
   return (
     <>
       <ControlledEditor
+        height="100vh"
         theme={darkMode.value ? "dark" : "light"}
         value={props.value}
         editorDidMount={handleEditorDidMount}