Merge pull request #2881 from ethereum/scrf

scroll bug fixing
pull/5370/head
Liana Husikyan 2 years ago committed by GitHub
commit d2f9d292c9
  1. 2
      libs/remix-ui/app/src/lib/remix-app/style/remix-app.css
  2. 5
      libs/remix-ui/vertical-icons-panel/src/lib/components/IconList.tsx
  3. 11
      libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@ -8,7 +8,7 @@ pre {
overflow-x: auto;
}
.remixIDE {
width : 100vw;
width : 100%;
height : 100vh;
overflow : hidden;
flex-direction : row;

@ -12,7 +12,7 @@ interface OtherIconsProps {
function IconList ({ verticalIconsPlugin, itemContextAction, icons, theme }: OtherIconsProps) {
return (
<div id="otherIcons">
<div id="otherIcons" className="position-relative">
{
icons
.map(p => (
@ -25,7 +25,8 @@ function IconList ({ verticalIconsPlugin, itemContextAction, icons, theme }: Oth
p.profile.name
}
/>
))}
))
}
</div>
)
}

@ -309,8 +309,7 @@ export function Workspace () {
<div className='h-100 remixui_fileExplorerTree' onFocus={() => { toggleDropdown(false) }}>
<div className='h-100'>
{ (global.fs.browser.isRequestingWorkspace || global.fs.browser.isRequestingCloning) && <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div>}
{ !(global.fs.browser.isRequestingWorkspace ||
global.fs.browser.isRequestingCloning) &&
{ !(global.fs.browser.isRequestingWorkspace || global.fs.browser.isRequestingCloning) &&
(global.fs.mode === 'browser') && (currentWorkspace !== NO_WORKSPACE) &&
<div className='h-100 remixui_treeview' data-id='filePanelFileExplorerTree'>
<FileExplorer
@ -347,10 +346,9 @@ export function Workspace () {
/>
</div>
}
{
global.fs.localhost.isRequestingLocalhost ? <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div>
: <div className='h-100 filesystemexplorer remixui_treeview'>
{ global.fs.mode === 'localhost' && global.fs.localhost.isSuccessfulLocalhost &&
{ global.fs.localhost.isRequestingLocalhost && <div className="text-center py-5"><i className="fas fa-spinner fa-pulse fa-2x"></i></div> }
{ (global.fs.mode === 'localhost' && global.fs.localhost.isSuccessfulLocalhost) &&
<div className='h-100 filesystemexplorer remixui_treeview'>
<FileExplorer
name='localhost'
menuItems={['createNewFile', 'createNewFolder']}
@ -383,7 +381,6 @@ export function Workspace () {
dispatchMoveFile={global.dispatchMoveFile}
dispatchMoveFolder={global.dispatchMoveFolder}
/>
}
</div>
}
</div>

Loading…
Cancel
Save