From cf2ea03674670de49555f205c42d6de4815162c4 Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 31 Jan 2023 14:17:18 +0100
Subject: [PATCH] add fixes from @LianaHus & @Aniket-Engg

---
 apps/remix-ide/src/app/panels/tab-proxy.js          |  2 +-
 apps/remix-ide/src/app/plugins/solidity-umlgen.tsx  | 13 ++-----------
 .../solidity-uml-gen/src/lib/solidity-uml-gen.tsx   | 10 ++--------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/apps/remix-ide/src/app/panels/tab-proxy.js b/apps/remix-ide/src/app/panels/tab-proxy.js
index 3821788e18..d9b62256b4 100644
--- a/apps/remix-ide/src/app/panels/tab-proxy.js
+++ b/apps/remix-ide/src/app/panels/tab-proxy.js
@@ -33,7 +33,7 @@ export class TabProxy extends Plugin {
 
     this.on('fileManager', 'filesAllClosed', () => {
       this.call('manager', 'activatePlugin', 'home')
-      this.tabsApi.activateTab('home')
+      this.focus('home')
     })
 
     this.on('fileManager', 'fileRemoved', (name) => {
diff --git a/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx b/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx
index 6937bc81fd..8b48e638b2 100644
--- a/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx
+++ b/apps/remix-ide/src/app/plugins/solidity-umlgen.tsx
@@ -18,7 +18,7 @@ const profile = {
     displayName: 'Solidity UML Generator',
     description: 'Generate UML diagram in svg format from last compiled contract',
     location: 'mainPanel',
-    methods: ['showUmlDiagram', 'generateUml', 'generateCustomAction', 'flattenAContract'],
+    methods: ['showUmlDiagram', 'generateUml', 'generateCustomAction'],
     events: [],
 }
 
@@ -56,7 +56,6 @@ export class SolidityUmlGen extends ViewPlugin implements ISolidityUmlGen {
         const umlClasses = convertAST2UmlClasses(ast, this.currentFile)
         const umlDot = convertUmlClasses2Dot(umlClasses)
         const payload = vizRenderStringSync(umlDot)
-        console.log({ umlClasses, umlDot, payload })
         this.updatedSvg = payload
         this.renderComponent()
       } catch (error) {
@@ -98,15 +97,6 @@ export class SolidityUmlGen extends ViewPlugin implements ISolidityUmlGen {
     this.renderComponent()
   }
 
-  async flattenAContract(action: customAction) {
-    const fileName = action.path[0]
-    this.call('solidity', 'compile', fileName)
-    this.on('solidity', 'compilationFinished', async (file, source, languageVersion, data, input, version) => {
-      await this.flattenContract(source, fileName, data)
-    })
-    this.off('solidity', 'compilationFinished')
-  }
-
   /**
    * Takes currently compiled contract that has a bunch of imports at the top
    * and flattens them ready for UML creation. Takes the flattened result
@@ -114,6 +104,7 @@ export class SolidityUmlGen extends ViewPlugin implements ISolidityUmlGen {
    * @returns {Promise<string>}
    */
   async flattenContract (source: any, filePath: string, data: any) {
+    const hold = { data, source, filePath }
     const ast = data.sources
     const dependencyGraph = getDependencyGraph(ast, filePath)
     const sorted = dependencyGraph.isEmpty()
diff --git a/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx b/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx
index 42f61c5d8a..983626c23f 100644
--- a/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx
+++ b/libs/remix-ui/solidity-uml-gen/src/lib/solidity-uml-gen.tsx
@@ -83,7 +83,7 @@ export function RemixUiSolidityUmlGen ({ plugin, updatedSvg, loading, themeSelec
     const invert = themeSelected === 'dark' ? 'invert(1)' : 'invert(0)'
     return (
     <div className="d-flex flex-column justify-content-center align-items-center">
-      <div id="umlImageHolder">
+      <div id="umlImageHolder" className="w-100 px-2 py-2">
         { validSvg && showViewer ? (
           <TransformWrapper
             initialScale={1}
@@ -91,16 +91,10 @@ export function RemixUiSolidityUmlGen ({ plugin, updatedSvg, loading, themeSelec
             {
               ({ zoomIn, zoomOut, resetTransform }) => (
                 <Fragment>
-                  {/* <div className="position-relative">
-                    <button className="btn position-absolute top-0 end-100 translate-middle btn-sm mr-1 rounded-circle btn-success" onClick={() => zoomIn()}>+</button>
-                    <button className="btn position-absolute top-0 end-100 translate-middle btn-sm mr-1 rounded-circle btn-warning" onClick={() => zoomOut()}>-</button>
-                    <button className="btn position-absolute top-0 end-100 translate-middle btn-sm mr-1 rounded-circle btn-danger" onClick={() => resetTransform()}>X</button>
-                    <ActionButtons buttons={buttons}/>
-                  </div> */}
                   <TransformComponent>
                     <img 
                       src={`data:image/svg+xml;base64,${btoa(plugin.updatedSvg ?? svgPayload)}`}
-                      width={950}
+                      width={'100%'}
                       height={'auto'}
                       style={{ filter: invert }}
                     />