fix dragbar position

pull/4774/head
Joseph Izang 5 months ago
parent f9a2fa3a34
commit e96d4884fc
  1. 5
      apps/remix-ide-e2e/src/tests/workspace_git.test.ts
  2. 2
      libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx

@ -159,11 +159,13 @@ module.exports = {
.setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ioedeveloper/test-branch-change') .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/ioedeveloper/test-branch-change')
.click('[data-id="fileSystem-modal-footer-ok-react"]') .click('[data-id="fileSystem-modal-footer-ok-react"]')
.waitForElementPresent('.fa-spinner') .waitForElementPresent('.fa-spinner')
.pause(5000) .pause(7000)
.waitForElementNotPresent('.fa-spinner') .waitForElementNotPresent('.fa-spinner')
.waitForElementContainsText('[data-id="workspacesSelect"]', 'test-branch-change') .waitForElementContainsText('[data-id="workspacesSelect"]', 'test-branch-change')
.waitForElementVisible('[data-id="workspaceGitPanel"]') .waitForElementVisible('[data-id="workspaceGitPanel"]')
.waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]')
.click('[data-id="workspaceGitBranchesDropdown"]') .click('[data-id="workspaceGitBranchesDropdown"]')
.pause()
.waitForElementVisible('[data-id="custom-dropdown-menu"]') .waitForElementVisible('[data-id="custom-dropdown-menu"]')
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/dev') .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/dev')
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/production') .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/production')
@ -312,6 +314,7 @@ module.exports = {
'When switching branches the submodules should disappear #group4': function (browser: NightwatchBrowser) { 'When switching branches the submodules should disappear #group4': function (browser: NightwatchBrowser) {
browser browser
.waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]') .waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]')
.pause()
.click('[data-id="workspaceGitBranchesDropdown"]') .click('[data-id="workspaceGitBranchesDropdown"]')
.waitForElementVisible('[data-id="custom-dropdown-menu"]') .waitForElementVisible('[data-id="custom-dropdown-menu"]')
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/empty') .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/empty')

@ -27,7 +27,7 @@ const DragBar = (props: IRemixDragBarUi) => {
const width = window.innerWidth const width = window.innerWidth
const height = window.innerHeight const height = window.innerHeight
if (height < 781 && width < 1150) { if (height <= 781 && width <= 1150) {
setDragBarPosX(props.minWidth + 50) setDragBarPosX(props.minWidth + 50)
} else { } else {
setDragBarPosX(props.minWidth) setDragBarPosX(props.minWidth)

Loading…
Cancel
Save