From c021a7e4b2daccc59541bab25c1447339dd68c09 Mon Sep 17 00:00:00 2001 From: Csaba Tuncsik Date: Wed, 26 Feb 2025 11:53:37 +0100 Subject: [PATCH] fix(editor): Show scrollbar in Element UI popup (#13259) --- cypress/e2e/10-undo-redo.cy.ts | 6 +++++- cypress/e2e/12-canvas.cy.ts | 6 +++++- cypress/pages/workflow.ts | 4 ++-- packages/design-system/src/css/scrollbar.scss | 8 -------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts index 2931897f03ae8..bad159b1cb2c0 100644 --- a/cypress/e2e/10-undo-redo.cy.ts +++ b/cypress/e2e/10-undo-redo.cy.ts @@ -22,7 +22,11 @@ describe('Undo/Redo', () => { it('should undo/redo deleting node using context menu', () => { WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME); WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME); - WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME); + WorkflowPage.actions.zoomToFit(); + WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME, { + method: 'right-click', + anchor: 'topLeft', + }); WorkflowPage.getters.canvasNodes().should('have.have.length', 1); WorkflowPage.getters.nodeConnections().should('have.length', 0); WorkflowPage.actions.hitUndo(); diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts index be423344fbeef..add58cfd5ae5d 100644 --- a/cypress/e2e/12-canvas.cy.ts +++ b/cypress/e2e/12-canvas.cy.ts @@ -235,7 +235,11 @@ describe('Canvas Node Manipulation and Navigation', () => { it('should delete node using context menu', () => { WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME); WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME); - WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME); + WorkflowPage.actions.zoomToFit(); + WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME, { + method: 'right-click', + anchor: 'topLeft', + }); WorkflowPage.getters.canvasNodes().should('have.length', 1); WorkflowPage.getters.nodeConnections().should('have.length', 0); }); diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts index 24fda156f6625..d34109f1b2ad1 100644 --- a/cypress/pages/workflow.ts +++ b/cypress/pages/workflow.ts @@ -306,8 +306,8 @@ export class WorkflowPage extends BasePage { this.actions.openContextMenu(nodeTypeName); clickContextMenuAction('duplicate'); }, - deleteNodeFromContextMenu: (nodeTypeName: string) => { - this.actions.openContextMenu(nodeTypeName); + deleteNodeFromContextMenu: (nodeTypeName: string, options?: OpenContextMenuOptions) => { + this.actions.openContextMenu(nodeTypeName, options); clickContextMenuAction('delete'); }, executeNode: (nodeTypeName: string, options?: OpenContextMenuOptions) => { diff --git a/packages/design-system/src/css/scrollbar.scss b/packages/design-system/src/css/scrollbar.scss index 72c3c2243d0a5..9a78b201d6c25 100644 --- a/packages/design-system/src/css/scrollbar.scss +++ b/packages/design-system/src/css/scrollbar.scss @@ -17,14 +17,6 @@ @include mixins.e(wrap) { overflow: scroll; height: 100%; - - @include mixins.m(hidden-default) { - scrollbar-width: none; - &::-webkit-scrollbar { - width: 0; - height: 0; - } - } } @include mixins.e(thumb) {