A platform for community discussion. Free, open, simple.
FIX: reset post reactions panel scroll position (#40253)
David Battersby8f22f65795f0
diff --git a/frontend/discourse/app/components/post/menu/post-users-menu.gjs b/frontend/discourse/app/components/post/menu/post-users-menu.gjsindex 5d4650ebb9f..bee5dbe2b02 100644--- a/frontend/discourse/app/components/post/menu/post-users-menu.gjs+++ b/frontend/discourse/app/components/post/menu/post-users-menu.gjs@@ -48,9 +48,11 @@ export default class PostUsersMenu extends Component {this.users = [];this.#page = 0;this.canLoadMore = true;+ this.#bodyElement.scrollTop = 0;return this.#loadMore();};#page = 0;+ #bodyElement = null;get bodyStyle() {if (this.bodyMinHeight) {@@ -73,6 +75,7 @@ export default class PostUsersMenu extends Component {@actionasync loadInitial(element) {+ this.#bodyElement = element;await this.#loadMore();if (this.site.mobileView) {return;diff --git a/frontend/discourse/tests/integration/components/post/menu/post-users-menu-test.gjs b/frontend/discourse/tests/integration/components/post/menu/post-users-menu-test.gjsindex 23139ac59ff..632c0bb29b4 100644--- a/frontend/discourse/tests/integration/components/post/menu/post-users-menu-test.gjs+++ b/frontend/discourse/tests/integration/components/post/menu/post-users-menu-test.gjs@@ -27,6 +27,20 @@ function deferredFetch(response) {};}+function renderMenu({ fetchUsers, totalUsers, onReset = () => {} }) {+ return render(+ <template>+ <PostUsersMenu+ @fetchUsers={{fetchUsers}}+ @titleText="Likes"+ @totalUsers={{totalUsers}}+ >+ <:header as |reset|>{{onReset reset}}</:header>+ </PostUsersMenu>+ </template>+ );+}+module("Integration | Component | post/menu/post-users-menu", function (hooks) {setupRenderingTest(hooks);@@ -45,15 +59,7 @@ module("Integration | Component | post/menu/post-users-menu", function (hooks) {canLoadMore: false,});- const renderPromise = render(- <template>- <PostUsersMenu- @fetchUsers={{fetchUsers}}- @titleText="Likes"- @totalUsers={{5}}- />- </template>- );+ const renderPromise = renderMenu({ fetchUsers, totalUsers: 5 });await waitFor(".post-users-popup__skeleton-item");@@ -82,15 +88,7 @@ module("Integration | Component | post/menu/post-users-menu", function (hooks) {canLoadMore: true,});- const renderPromise = render(- <template>- <PostUsersMenu- @fetchUsers={{fetchUsers}}- @titleText="Likes"- @totalUsers={{200}}- />- </template>- );+ const renderPromise = renderMenu({ fetchUsers, totalUsers: 200 });await waitFor(".post-users-popup__skeleton-item");@@ -122,15 +120,7 @@ module("Integration | Component | post/menu/post-users-menu", function (hooks) {return secondFetchPromise;};- await render(- <template>- <PostUsersMenu- @fetchUsers={{fetchUsers}}- @titleText="Likes"- @totalUsers={{30}}- />- </template>- );+ await renderMenu({ fetchUsers, totalUsers: 30 });assert.dom(".post-users-popup__item:not(.post-users-popup__skeleton-item)")@@ -151,17 +141,32 @@ module("Integration | Component | post/menu/post-users-menu", function (hooks) {await settled();});+ test("resets scroll position when the user list is reloaded", async function (assert) {+ const fetchUsers = () =>+ Promise.resolve({ users: makeUsers(3), canLoadMore: false });++ let resetAndReload;+ await renderMenu({+ fetchUsers,+ onReset: (fn) => (resetAndReload = fn),+ });++ const body = document.querySelector(".post-users-popup__body");+ body.style.cssText = "max-height: 20px; overflow-y: auto";+ body.scrollTop = 50;++ await resetAndReload();++ assert.strictEqual(body.scrollTop, 0, "scrollTop is reset after reload");+ });+test("falls back to a small skeleton count when totalUsers is missing", async function (assert) {const { fetchUsers, resolve } = deferredFetch({users: makeUsers(2),canLoadMore: false,});- const renderPromise = render(- <template>- <PostUsersMenu @fetchUsers={{fetchUsers}} @titleText="Likes" />- </template>- );+ const renderPromise = renderMenu({ fetchUsers });await waitFor(".post-users-popup__skeleton-item");