fixes as per @Aniket-Engg comments

pull/3023/head
Joseph Izang 2 years ago committed by Aniket
parent 90d11f0b79
commit b1d7855d77
  1. 13
      libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css
  2. 80
      libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@ -51,7 +51,7 @@
word-break: break-word; word-break: break-word;
} }
.remixui_menuicon { .remixui_menuicon {
padding-right : 30px; padding-right : 0px;
} }
.remixui_menuicon:hover { .remixui_menuicon:hover {
transform: scale(1.3); transform: scale(1.3);
@ -110,6 +110,17 @@
width: 8rem; width: 8rem;
} }
.remixui_menuhr {
}
.remixui_menuhr:focus,
.remixui_menuhr:hover {
color: var(--custom-select) !important;
text-decoration: none;
background-color: var(--custom-select) !important;
}
#workspacesMenuDropdown > div.custom-dropdown-items { #workspacesMenuDropdown > div.custom-dropdown-items {
min-width: 8rem; min-width: 8rem;
} }

@ -318,6 +318,7 @@ export function Workspace () {
e.stopPropagation() e.stopPropagation()
createWorkspace() createWorkspace()
_paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceCreate']) _paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceCreate'])
hideIconsMenu(!showIconsMenu)
}} }}
className='far fa-plus pl-2' className='far fa-plus pl-2'
> >
@ -358,6 +359,37 @@ export function Workspace () {
<span className="pl-3">{'Delete'}</span> <span className="pl-3">{'Delete'}</span>
</div> </div>
</OverlayTrigger>, </OverlayTrigger>,
<OverlayTrigger
placement='right-start'
overlay={
<Tooltip id="workspaceRenametooltip">
<span>Rename Workspace</span>
</Tooltip>
}
>
<div onClick={(e) => {
e.stopPropagation()
renameCurrentWorkspace()
_paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceRename'])
hideIconsMenu(!showIconsMenu)
}}
data-id='workspaceRename'
>
<span
hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
id='workspaceRename'
data-id='workspaceRename'
onClick={(e) => {
e.stopPropagation()
renameCurrentWorkspace()
_paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceRename'])
hideIconsMenu(!showIconsMenu)
}}
className='far fa-edit pl-2'>
</span>
<span className="pl-3">{'Rename'}</span>
</div>
</OverlayTrigger>,
<OverlayTrigger <OverlayTrigger
placement="right-start" placement="right-start"
overlay={ overlay={
@ -391,37 +423,7 @@ export function Workspace () {
<span className="pl-3">{'Clone'}</span> <span className="pl-3">{'Clone'}</span>
</div> </div>
</OverlayTrigger>, </OverlayTrigger>,
<OverlayTrigger <hr className="border mt-0 mb-0 remixui_menuhr" style={{ pointerEvents: 'none' }}/>,
placement='right-start'
overlay={
<Tooltip id="workspaceRenametooltip">
<span>Rename Workspace</span>
</Tooltip>
}
>
<div onClick={(e) => {
e.stopPropagation()
renameCurrentWorkspace()
_paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceRename'])
hideIconsMenu(!showIconsMenu)
}}
data-id='workspaceRename'
>
<span
hidden={currentWorkspace === LOCALHOST || currentWorkspace === NO_WORKSPACE}
id='workspaceRename'
data-id='workspaceRename'
onClick={(e) => {
e.stopPropagation()
renameCurrentWorkspace()
_paq.push(['trackEvent', 'fileExplorer', 'workspaceMenu', 'workspaceRename'])
hideIconsMenu(!showIconsMenu)
}}
className='far fa-edit pl-2'>
</span>
<span className="pl-3">{'Rename'}</span>
</div>
</OverlayTrigger>,
<OverlayTrigger <OverlayTrigger
placement="right-start" placement="right-start"
overlay={ overlay={
@ -504,14 +506,13 @@ export function Workspace () {
</span> </span>
<span className="remixui_menu remixui_topmenu d-flex justify-content-between align-items-end w-75"> <span className="remixui_menu remixui_topmenu d-flex justify-content-between align-items-end w-75">
<OverlayTrigger <OverlayTrigger
placement="top-start" placement="top-end"
overlay={ overlay={
<Tooltip id="createWorkspaceTooltip" className="text-nowrap"> <Tooltip id="createWorkspaceTooltip" className="text-nowrap">
<span>Create</span> <span>Create</span>
</Tooltip> </Tooltip>
} }
> >
<div>
<span <span
hidden={currentWorkspace === LOCALHOST} hidden={currentWorkspace === LOCALHOST}
id='workspaceCreate' id='workspaceCreate'
@ -524,7 +525,6 @@ export function Workspace () {
className='far fa-plus remixui_menuicon d-flex align-self-end' className='far fa-plus remixui_menuicon d-flex align-self-end'
> >
</span> </span>
</div>
</OverlayTrigger> </OverlayTrigger>
<Dropdown id="workspacesMenuDropdown" data-id="workspacesMenuDropdown" onToggle={() => hideIconsMenu(!showIconsMenu)} show={showIconsMenu}> <Dropdown id="workspacesMenuDropdown" data-id="workspacesMenuDropdown" onToggle={() => hideIconsMenu(!showIconsMenu)} show={showIconsMenu}>
<Dropdown.Toggle <Dropdown.Toggle
@ -536,11 +536,13 @@ export function Workspace () {
></Dropdown.Toggle> ></Dropdown.Toggle>
<Dropdown.Menu as={CustomMenu} data-id="wsdropdownMenu" className='custom-dropdown-items remixui_menuwidth' align={'right'}> <Dropdown.Menu as={CustomMenu} data-id="wsdropdownMenu" className='custom-dropdown-items remixui_menuwidth' align={'right'}>
{ {
workspaceMenuIcons.map(m => ( workspaceMenuIcons.map(m => {
<Dropdown.Item> return (
{m} <Dropdown.Item>
</Dropdown.Item> {m}
)) </Dropdown.Item>
)
})
} }
</Dropdown.Menu> </Dropdown.Menu>
</Dropdown> </Dropdown>

Loading…
Cancel
Save