From a9c385159d2e53e4af6487c9431845dfca5b218a Mon Sep 17 00:00:00 2001
From: David Disu <daviddisu8@gmail.com>
Date: Thu, 9 Jun 2022 12:09:18 +0100
Subject: [PATCH] display icon to the right

---
 .../src/lib/components/tooltipInput.tsx       |  23 ++--
 .../workspace/src/lib/remix-ui-workspace.tsx  | 116 +++++++++---------
 2 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/libs/remix-ui/workspace/src/lib/components/tooltipInput.tsx b/libs/remix-ui/workspace/src/lib/components/tooltipInput.tsx
index 8c1afe28c7..b67ca5318c 100644
--- a/libs/remix-ui/workspace/src/lib/components/tooltipInput.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/tooltipInput.tsx
@@ -19,12 +19,12 @@ const CustomToggle = React.forwardRef(({ children, onClick }: { children?: React
 export const CloneWorkspace = () => {
 
   return (
-    <Dropdown className="inline">
+    <Dropdown>
       <Dropdown.Toggle as={CustomToggle} id="dropdown-custom-components">
-        <i className="fas fa-cloud-download remixui_menuicon"></i>
+        <i className="fas fa-cloud-download remixui_menuicon" data-toggle="dropdown"></i>
       </Dropdown.Toggle>
 
-      <Dropdown.Menu>
+      <Dropdown.Menu renderOnMount={true}>
         {/* <Dropdown.Item eventKey="1">
           <FormControl
               autoFocus
@@ -34,13 +34,16 @@ export const CloneWorkspace = () => {
               value={value}
             />
         </Dropdown.Item> */}
-          <FormControl
-            autoFocus
-            className="mx-3 my-2 w-auto"
-            placeholder="Type to filter..."
-            onChange={() => {}}
-            value=''
-          />
+      <div role="tabpanel">
+        <FormControl
+          autoFocus
+          className="mx-3 my-2 w-auto"
+          placeholder="Type to filter..."
+          onChange={() => {}}
+          value=''
+        />
+      </div>
+
       </Dropdown.Menu>
     </Dropdown>
   )
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index be299b9b96..19dcf694ea 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -159,64 +159,68 @@ export function Workspace () {
               <label className="form-check-label" htmlFor="workspacesSelect">
                 Workspaces
               </label>
-              <span className="remixui_menu">
-                <span
-                  hidden={currentWorkspace === LOCALHOST}
-                  id='workspaceCreate'
-                  data-id='workspaceCreate'
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    createWorkspace()
-                  }}
-                  className='far fa-plus-square remixui_menuicon'
-                  title='Create'>
+              <div className="d-flex justify-content-between">
+                <span className="remixui_menu">
+                  <span
+                    hidden={currentWorkspace === LOCALHOST}
+                    id='workspaceCreate'
+                    data-id='workspaceCreate'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      createWorkspace()
+                    }}
+                    className='far fa-plus-square remixui_menuicon'
+                    title='Create'>
+                  </span>
+                  <span
+                    hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
+                    id='workspaceRename'
+                    data-id='workspaceRename'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      renameCurrentWorkspace()
+                    }}
+                    className='far fa-edit remixui_menuicon'
+                    title='Rename'>
+                  </span>
+                  <span
+                    hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
+                    id='workspaceDelete'
+                    data-id='workspaceDelete'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      deleteCurrentWorkspace()
+                    }}
+                    className='fas fa-trash remixui_menuicon'
+                    title='Delete'>
+                  </span>
+                  <span
+                    hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
+                    id='workspacesDownload'
+                    data-id='workspacesDownload'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      downloadWorkspaces()
+                    }}
+                    className='far fa-download remixui_menuicon'
+                    title='Download Workspaces'>
+                  </span>
+                  <span
+                    hidden={currentWorkspace === LOCALHOST}
+                    id='workspacesRestore'
+                    data-id='workspacesRestore'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      restoreBackup()
+                    }}
+                    className='far fa-upload remixui_menuicon'
+                    title='Restore Workspaces Backup'>
+                  </span>
                 </span>
-                <span
-                  hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
-                  id='workspaceRename'
-                  data-id='workspaceRename'
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    renameCurrentWorkspace()
-                  }}
-                  className='far fa-edit remixui_menuicon'
-                  title='Rename'>
+                <span className="remixui_menu">
+                  <CloneWorkspace />
                 </span>
-                <span
-                  hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
-                  id='workspaceDelete'
-                  data-id='workspaceDelete'
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    deleteCurrentWorkspace()
-                  }}
-                  className='fas fa-trash remixui_menuicon'
-                  title='Delete'>
-                </span>
-                <span
-                  hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
-                  id='workspacesDownload'
-                  data-id='workspacesDownload'
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    downloadWorkspaces()
-                  }}
-                  className='far fa-download remixui_menuicon'
-                  title='Download Workspaces'>
-                </span>
-                <span
-                  hidden={currentWorkspace === LOCALHOST}
-                  id='workspacesRestore'
-                  data-id='workspacesRestore'
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    restoreBackup()
-                  }}
-                  className='far fa-upload remixui_menuicon'
-                  title='Restore Workspaces Backup'>
-                </span>
-                <CloneWorkspace />
-              </span>
+              </div>
               <select id="workspacesSelect" value={currentWorkspace} data-id="workspacesSelect" onChange={(e) => switchWorkspace(e.target.value)} className="form-control custom-select">
                 {
                   global.fs.browser.workspaces