A platform for community discussion. Free, open, simple.
UX: reactions mobile menu scroll fix (#39372)
David Battersby40117ab1f5ed
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scssindex 3c08f9e16af..1089eaabba9 100644--- a/app/assets/stylesheets/common/base/topic-post.scss+++ b/app/assets/stylesheets/common/base/topic-post.scss@@ -2318,23 +2318,43 @@ html.discourse-no-touch .fullscreen-table-wrapper:hover {}}- &__loading {+ .loading-container {display: flex;justify-content: center;padding: 0.75em;}}-.mobile-view .post-users-popup {- width: 100%;- height: 400px;- display: flex;- flex-direction: column;+.mobile-view {+ .post-liked-users-menu-content,+ .discourse-reactions-users-menu-content {+ .d-modal__container {+ height: min(80dvh, 560px);+ }- .post-users-popup__body {- flex: 1;- height: auto;- min-height: 0;+ .d-modal__body {+ flex: 1;+ min-height: 0;+ padding: 0;+ }++ .post-users-popup {+ width: 100%;+ }++ .post-users-popup__sticky-header {+ position: sticky;+ top: 0;+ z-index: 1;+ padding-top: 0.75em;+ background: var(--secondary);+ }++ .post-users-popup__body {+ height: auto;+ overflow: visible;+ overscroll-behavior: auto;+ }}}diff --git a/frontend/discourse/app/components/post/menu/post-users-menu.gjs b/frontend/discourse/app/components/post/menu/post-users-menu.gjsindex 316b89ee217..27499f21d05 100644--- a/frontend/discourse/app/components/post/menu/post-users-menu.gjs+++ b/frontend/discourse/app/components/post/menu/post-users-menu.gjs@@ -1,9 +1,10 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";-import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";+import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";+import LoadMore from "discourse/components/load-more";import UserAvatar from "discourse/components/user-avatar";import UserLink from "discourse/components/user-link";import icon from "discourse/helpers/d-icon";@@ -24,7 +25,6 @@ export default class PostUsersMenu extends Component {}return user.username;};-resetAndReload = () => {this.users = [];this.#page = 0;@@ -39,11 +39,8 @@ export default class PostUsersMenu extends Component {}@action- onScroll(event) {- const el = event.target;- if (el.scrollTop + el.clientHeight >= el.scrollHeight - 50) {- this.#loadMore();- }+ loadMore() {+ return this.#loadMore();}async #loadMore() {@@ -68,53 +65,57 @@ export default class PostUsersMenu extends Component {<template><div class="post-users-popup">- {{#if this.site.mobileView}}- <div class="post-users-popup__title">{{@titleText}}</div>- {{/if}}+ <div class="post-users-popup__sticky-header">+ {{#if this.site.mobileView}}+ <div class="post-users-popup__title">{{@titleText}}</div>+ {{/if}}- {{yield this.resetAndReload to="header"}}+ {{yield this.resetAndReload to="header"}}+ </div>- <div- class="post-users-popup__body"- {{on "scroll" this.onScroll}}- {{didInsert this.loadInitial}}- >- {{#each this.users as |user|}}- <div class="post-users-popup__item">- <UserLink- @username={{user.username}}- class="post-users-popup__avatar-link"- >- <UserAvatar @user={{user}} @size="small" />- </UserLink>- <div class="post-users-popup__user-info">+ <div class="post-users-popup__body" {{didInsert this.loadInitial}}>+ <LoadMore+ @action={{this.loadMore}}+ @enabled={{this.canLoadMore}}+ @isLoading={{this.loading}}+ @rootMargin="100px"+ >+ {{#each this.users as |user|}}+ <div class="post-users-popup__item"><UserLink@username={{user.username}}- class="post-users-popup__name"+ class="post-users-popup__avatar-link">- {{this.displayName user}}+ <UserAvatar @user={{user}} @size="small" /></UserLink>- {{#unless this.siteSettings.prioritize_username_in_ux}}+ <div class="post-users-popup__user-info"><UserLink@username={{user.username}}- class="post-users-popup__username"+ class="post-users-popup__name">- @{{user.username}}+ {{this.displayName user}}</UserLink>- {{/unless}}+ {{#unless this.siteSettings.prioritize_username_in_ux}}+ <UserLink+ @username={{user.username}}+ class="post-users-popup__username"+ >+ @{{user.username}}+ </UserLink>+ {{/unless}}+ </div>+ {{#if (has-block "reaction")}}+ {{yield user to="reaction"}}+ {{else}}+ {{icon "d-liked" class="post-users-popup__reaction"}}+ {{/if}}</div>- {{#if (has-block "reaction")}}- {{yield user to="reaction"}}- {{else}}- {{icon "d-liked" class="post-users-popup__reaction"}}- {{/if}}- </div>- {{/each}}- {{#if this.loading}}- <div class="post-users-popup__loading">- <div class="spinner small"></div>- </div>- {{/if}}+ {{/each}}+ <ConditionalLoadingSpinner+ @condition={{this.loading}}+ @size="small"+ />+ </LoadMore></div></div></template>