From 91b2d31cd4d95b65daaa7c6c773ef17470587e33 Mon Sep 17 00:00:00 2001 From: ttommybot Date: Mon, 3 Aug 2026 22:24:28 +0800 Subject: [PATCH] fix: unify organization settings modal scrolling --- .../OrganizationSettingsModal.test.mjs | 19 +++++++ .../OrganizationSettingsModal.vue | 55 ++++++++++++++++++- 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/organization/OrganizationSettingsModal.test.mjs b/frontend/src/views/organization/OrganizationSettingsModal.test.mjs index 299bd855..9c761b63 100644 --- a/frontend/src/views/organization/OrganizationSettingsModal.test.mjs +++ b/frontend/src/views/organization/OrganizationSettingsModal.test.mjs @@ -14,3 +14,22 @@ test('reviewing join requests goes through the store and refreshes modal data', const refreshCalls = source.match(/await refreshOrganizationAfterReview\(\)/g) ?? [] assert.equal(refreshCalls.length, 2) }) + +test('organization settings use one outer content scroller and reset it on navigation', () => { + assert.match(source, /ref="contentWrapperRef" class="content-wrapper"/) + assert.match(source, /class="data-table-shell members-table-shell"/) + assert.match(source, /contentWrapperRef\.value\?\.scrollTo\(\{ top: 0, behavior: 'auto' \}\)/) + assert.match(source, /watch\(\(\) => props\.visible,[\s\S]*?void scrollContentToTop\(\)/) + assert.match(source, /\}, \{ immediate: true \}\)\s*\n\s*watch\(\(\) => props\.orgId/) + assert.match(source, /watch\(\(\) => props\.orgId,[\s\S]*?void scrollContentToTop\(\)/) + assert.match(source, /watch\(currentSection,[\s\S]*?void scrollContentToTop\(\)/) + assert.match(source, /\.members-table-shell\s*\{[\s\S]*?overflow: visible;[\s\S]*?\.t-table__content/) +}) + +test('organization settings lock and restore background scrolling', () => { + assert.match(source, /document\.body\.style\.overflow = 'hidden'/) + assert.match(source, /document\.body\.style\.overflow = previousBodyOverflow/) + assert.match(source, /onBeforeUnmount\(\(\) => \{\s*unlockBackgroundScroll\(\)/) + assert.match(source, /\.settings-overlay\s*\{[\s\S]*?overscroll-behavior: none;/) + assert.match(source, /\.content-wrapper\s*\{[\s\S]*?overscroll-behavior: contain;/) +}) diff --git a/frontend/src/views/organization/OrganizationSettingsModal.vue b/frontend/src/views/organization/OrganizationSettingsModal.vue index e9ebd96c..f5b79c74 100644 --- a/frontend/src/views/organization/OrganizationSettingsModal.vue +++ b/frontend/src/views/organization/OrganizationSettingsModal.vue @@ -38,7 +38,7 @@
-
+
@@ -456,7 +456,7 @@ ? $t('organization.members.emptySearch', { q: memberSearchQuery }) : $t('organization.noMembers')" />
-
+