From 8abde4b68415d3b27a324a85436dbe1c6c5a4d79 Mon Sep 17 00:00:00 2001 From: Aleksandra Bozek Date: Fri, 7 Nov 2025 16:20:57 +0100 Subject: [PATCH 1/2] IBX-10932: Changed back to top btn hover effect & text visibility --- .../Resources/public/js/scripts/admin.back.to.top.js | 11 +++-------- src/bundle/Resources/public/scss/_back-to-top.scss | 10 ++++++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/bundle/Resources/public/js/scripts/admin.back.to.top.js b/src/bundle/Resources/public/js/scripts/admin.back.to.top.js index 763bef1484..f57bb5119b 100644 --- a/src/bundle/Resources/public/js/scripts/admin.back.to.top.js +++ b/src/bundle/Resources/public/js/scripts/admin.back.to.top.js @@ -15,10 +15,8 @@ return backToTopBtn.classList.contains('ibexa-back-to-top__btn--visible'); }; - const backToTopBtnTitle = backToTopBtn.querySelector('.ibexa-back-to-top__title'); let currentBackToTopAnchorHeight = backToTopAnchor.offsetHeight; - const setBackToTopBtnTextVisibility = (container) => { - const isTitleVisible = Math.abs(container.scrollHeight - container.scrollTop - container.clientHeight) <= 2; + const setBackToTopBtnVisibility = (container) => { const shouldBeVisible = container.scrollTop !== 0; if (backToTopBtn.classList.contains('ibexa-back-to-top__btn--visible') && !shouldBeVisible) { @@ -29,15 +27,12 @@ backToTopBtn.classList.add('ibexa-back-to-top__btn--visible'); ibexa.quickAction.recalculateButtonsLayout(); } - - backToTopBtn.classList.toggle('ibexa-btn--no-text', !isTitleVisible); - backToTopBtnTitle.classList.toggle('ibexa-back-to-top__title--visible', isTitleVisible); }; backToTopScrollContainer.addEventListener('scroll', (event) => { const container = event.target; - setBackToTopBtnTextVisibility(container); + setBackToTopBtnVisibility(container); }); backToTopBtn.addEventListener('click', () => { backToTopAnchor.scrollIntoView({ @@ -52,7 +47,7 @@ currentBackToTopAnchorHeight = entries[0].target.clientHeight; - setBackToTopBtnTextVisibility(backToTopScrollContainer); + setBackToTopBtnVisibility(backToTopScrollContainer); }); const config = { id: 'back-to-top', diff --git a/src/bundle/Resources/public/scss/_back-to-top.scss b/src/bundle/Resources/public/scss/_back-to-top.scss index c6df496db7..7726c56cfb 100644 --- a/src/bundle/Resources/public/scss/_back-to-top.scss +++ b/src/bundle/Resources/public/scss/_back-to-top.scss @@ -13,6 +13,12 @@ transition: opacity $ibexa-admin-transition-duration $ibexa-admin-transition; box-shadow: $ibexa-edit-header-box-shadow; + &:hover { + .ibexa-back-to-top__title { + display: inline-block; + } + } + &--visible { opacity: 1; visibility: visible; @@ -22,10 +28,6 @@ &__title { display: none; padding-right: calculateRem(8px); - - &--visible { - display: inline-block; - } } &__icon.ibexa-icon { From 674eb6c39ec2b8f906d3a1dea37eb2978a581492 Mon Sep 17 00:00:00 2001 From: adrianpawlak Date: Mon, 17 Nov 2025 15:18:21 +0100 Subject: [PATCH 2/2] [Behat] Adjustment backToTop selector for regression --- src/lib/Behat/Component/Pagination.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Behat/Component/Pagination.php b/src/lib/Behat/Component/Pagination.php index 0dbb3e5058..e71f2b81b6 100644 --- a/src/lib/Behat/Component/Pagination.php +++ b/src/lib/Behat/Component/Pagination.php @@ -27,7 +27,7 @@ public function clickNextButton(): void JS); $this->getHTMLPage() ->setTimeout(3) - ->findAll(new VisibleCSSLocator('backToTopWithTitle', '.ibexa-back-to-top__title--visible')); + ->findAll(new VisibleCSSLocator('backToTopBtn', '.ibexa-back-to-top__btn--visible')); $this->getHTMLPage()->find($this->getLocator('nextButton'))->click(); $this->getHTMLPage()->setTimeout(10)->waitUntil(function () use ($currentPage) { $activePge = (int) $this->getHTMLPage()->find($this->getLocator('currentPage'))->getText();