From ac6cf33148f9648c71085c8378784b07863bfbbb Mon Sep 17 00:00:00 2001 From: Ivan Gabriele Date: Thu, 30 Nov 2023 17:33:48 +0100 Subject: [PATCH] Fix scroll in backoffice regulatory zone form --- frontend/cypress/e2e/backoffice/update_regulation.spec.ts | 6 ++---- .../features/Backoffice/edit_regulation/EditRegulation.tsx | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frontend/cypress/e2e/backoffice/update_regulation.spec.ts b/frontend/cypress/e2e/backoffice/update_regulation.spec.ts index f1b187a876..18583912ee 100644 --- a/frontend/cypress/e2e/backoffice/update_regulation.spec.ts +++ b/frontend/cypress/e2e/backoffice/update_regulation.spec.ts @@ -104,8 +104,7 @@ context('Update Regulation', () => { // complete missing values in form cy.get('[type="checkbox"]').first().check({ force: true }) cy.get('[type="checkbox"]').eq(2).check({ force: true }) - cy.get('*[data-cy^="open-regulated-species"]').click({ force: true }) - cy.scrollTo(0, 500) + cy.get('*[data-cy^="open-regulated-species"]').click({ force: true }).scrollIntoView() cy.log('Select authorized species and groups') cy.get('.rs-picker-toggle-placeholder') @@ -165,8 +164,7 @@ context('Update Regulation', () => { // complete missing values in form cy.get('[type="checkbox"]').first().check({ force: true }) cy.get('[type="checkbox"]').eq(2).check({ force: true }) - cy.get('*[data-cy^="open-regulated-species"]').click({ force: true }) - cy.scrollTo(0, 500) + cy.get('*[data-cy^="open-regulated-species"]').click({ force: true }).scrollIntoView() cy.get('*[data-cy^="regulatory-gears-section"]').click({ force: true }) cy.get('*[data-cy="authorized-gears-selector"]').scrollIntoView() diff --git a/frontend/src/features/Backoffice/edit_regulation/EditRegulation.tsx b/frontend/src/features/Backoffice/edit_regulation/EditRegulation.tsx index f57c334e44..a073e70e8b 100644 --- a/frontend/src/features/Backoffice/edit_regulation/EditRegulation.tsx +++ b/frontend/src/features/Backoffice/edit_regulation/EditRegulation.tsx @@ -384,13 +384,14 @@ const ErrorMessage = styled.div` const Wrapper = styled.div` display: flex; - flex-direction: row; + flex-direction: column; + overflow-y: auto; width: 100%; ` const Body = styled.div` - height: calc(100vh - 75px); - overflow-y: scroll; + flex-grow: 1; + padding-bottom: 50px; ` const Header = styled.div`