A platform for community discussion. Free, open, simple.
DEV: bump new post reaction menu to permanent (#41808)
David Battersby07d50a987f75
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scssindex cf4eb650cc3..81fbf12c72b 100644--- a/app/assets/stylesheets/common/base/topic-post.scss+++ b/app/assets/stylesheets/common/base/topic-post.scss@@ -2159,62 +2159,6 @@ html.discourse-no-touch .fullscreen-table-wrapper:hover {}}-.liked-users-list {- display: flex;- flex-direction: column;- gap: var(--space-1);-- &__list {- margin: 0;- list-style: none;- display: flex;- justify-content: end;- gap: var(--space-1);-- // avatar width + gap * (max amount of users per row + 1)- max-width: calc((var(--liked-users-list-avatar-size) + var(--space-1)) * 9);- flex-wrap: wrap;- }-- &__item,- &__item .avatar {- width: var(--liked-users-list-avatar-size);- height: var(--liked-users-list-avatar-size);- }-- &__container {- --liked-users-list-avatar-size: 22px;- padding: var(--space-2);- display: flex;- align-items: flex-start;- gap: var(--space-2);- }-- &__count {- display: flex;- gap: var(--space-2);- color: var(--primary-medium);- font-weight: 300;- align-items: center;- }-- &__count-icon {- color: var(--love);- }-- &__more {- font-size: var(--font-down-1);- color: var(--primary-medium);- }-- &__more-button.btn-flat.btn {- padding: 0;- width: var(--liked-users-list-avatar-size);- border-radius: var(--d-button-border-radius);- height: var(--liked-users-list-avatar-size);- }-}-span.post-count {background: var(--primary);color: var(--secondary);diff --git a/config/site_settings.yml b/config/site_settings.ymlindex 2a458143c97..7cdfe92c9fb 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -4687,7 +4687,7 @@ experimental:hidden: truearea: "experimental"upcoming_change:- status: "stable"+ status: "permanent"impact: "feature,all_members"learn_more_url: "https://meta.discourse.org/t/-/389820"enable_composer_redesign:diff --git a/frontend/discourse/app/components/post/menu/liked-users-list.gjs b/frontend/discourse/app/components/post/menu/liked-users-list.gjsindex 46133e93f9a..3fbba828cc8 100644--- a/frontend/discourse/app/components/post/menu/liked-users-list.gjs+++ b/frontend/discourse/app/components/post/menu/liked-users-list.gjs@@ -1,35 +1,16 @@import Component from "@glimmer/component";-import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import PluginOutlet from "discourse/components/plugin-outlet";-import DMenu from "discourse/float-kit/components/d-menu";-import lazyHash from "discourse/helpers/lazy-hash";-import DButton from "discourse/ui-kit/d-button";-import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";-import DUserAvatar from "discourse/ui-kit/d-user-avatar";import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PostLikedUsersMenu from "./liked-users-menu";-const LIKE_ACTION = 2; // The action type ID for "like" in Discourse-const DISPLAY_MAX_USERS = 8; // will show X users, then a button to show one more row of X;const MENU_IDENTIFIER = "post-liked-users-menu";export default class LikedUsersList extends Component {@service menu;- @service siteSettings;- @service store;-- @tracked likedUsers;- @tracked loadingLikedUsers = false;- @tracked slicedUsersVisible = false;-- get useNewMenu() {- return this.siteSettings.enable_new_post_reactions_menu;- }get buttonIcon() {return this.args.post.yours ? "d-liked" : null;@@ -54,174 +35,26 @@ export default class LikedUsersList extends Component {});}- @action- async fetchLikedUsers() {- if (this.loadingLikedUsers) {- return;- }-- this.loadingLikedUsers = true;-- try {- this.likedUsers = await this.store.find("post-action-user", {- id: this.args.post.id,- post_action_type_id: LIKE_ACTION,- });- } finally {- this.loadingLikedUsers = false;- }- }-- @action- toggleSlicedUsersVisiblity() {- this.slicedUsersVisible = !this.slicedUsersVisible;- }-- get icon() {- if (!this.args.post.showLike) {- return this.args.post.yours ? "d-liked" : "d-unliked";- }-- if (this.args.post.yours) {- return "d-liked";- }- }-- get truncatedUsers() {- return this.likedUsers?.content.slice(0, DISPLAY_MAX_USERS);- }-- get slicedUsers() {- return this.likedUsers?.content.slice(- DISPLAY_MAX_USERS,- DISPLAY_MAX_USERS * 2- );- }-- get hiddenUserCount() {- return (- this.likedUsers?.length -- (this.truncatedUsers.length + this.slicedUsers.length)- );- }-- get toggleSlicedUsersVisiblityIcon() {- return this.slicedUsersVisible ? "angle-up" : "angle-down";- }-<template>- {{#if this.useNewMenu}}- <button- type="button"- aria-label={{i18n- "post.sr_post_like_count_button"- }}- class={{dConcatClass- "btn btn-flat no-text"- "post-action-menu__like-count"- "like-count"- "button-count"- "highlight-action"- (if @post.liked "has-liked")- (if @post.yours "my-likes" "regular-likes")- }}- {{on "click" this.togglePopup}}- ...attributes- >- {{#if this.buttonIcon}}- {{dIcon this.buttonIcon}}- {{/if}}- {{@post.likeCount}}- </button>- {{else}}- <DMenu- @modalForMobile={{true}}- @identifier="post-like-users_{{@post.id}}"- @onShow={{this.fetchLikedUsers}}- @triggerClass={{dConcatClass- "post-action-menu__like-count"- "like-count"- "btn-flat"- "button-count"- "highlight-action"- (if @post.yours "my-likes" "regular-likes")- }}- @icon={{if @post.yours "d-liked" ""}}- @placement="top"- label={{i18n "post.sr_post_like_count_button" [email protected]}}- id="post-like-users_{{@post.id}}"- >- <:trigger>- {{@post.likeCount}}- </:trigger>- <:content>- <DConditionalLoadingSpinner- @condition={{this.loadingLikedUsers}}- class="liked-users-list__container"- >- <span class="liked-users-list__count">- {{dIcon "d-liked" class="liked-users-list__count-icon"}}- {{@post.likeCount}}- </span>- <div class="liked-users-list">- <ul class="liked-users-list__list">- {{#each this.truncatedUsers as |user|}}- <li class="liked-users-list__item">- <PluginOutlet- @name="liked-users-list-avatar"- @outletArgs={{lazyHash user=user post=@post}}- >- <DUserAvatar- class="trigger-user-card"- @ariaHidden={{false}}- @user={{user}}- @size="small"- />- </PluginOutlet>- </li>- {{/each}}- {{#if this.slicedUsers}}- <li class="liked-users-list__item">- <DButton- class="liked-users-list__more-button btn-flat"- @icon={{this.toggleSlicedUsersVisiblityIcon}}- @action={{this.toggleSlicedUsersVisiblity}}- />- </li>- {{/if}}- </ul>- {{#if this.slicedUsersVisible}}- <ul class="liked-users-list__list">- {{#each this.slicedUsers as |user|}}- <li class="liked-users-list__item">- <PluginOutlet- @name="liked-users-list-avatar"- @outletArgs={{lazyHash user=user post=@post}}- >- <DUserAvatar- class="trigger-user-card"- @ariaHidden={{false}}- @user={{user}}- @size="small"- />- </PluginOutlet>- </li>- {{/each}}- </ul>- {{#if this.hiddenUserCount}}- <span class="liked-users-list__more">- {{i18n- "discourse_reactions.state_panel.more_users"- count=this.hiddenUserCount- }}- </span>- {{/if}}- {{/if}}- </div>- </DConditionalLoadingSpinner>- </:content>- </DMenu>- {{/if}}+ <button+ type="button"+ aria-label={{i18n "post.sr_post_like_count_button" [email protected]}}+ class={{dConcatClass+ "btn btn-flat no-text"+ "post-action-menu__like-count"+ "like-count"+ "button-count"+ "highlight-action"+ (if @post.liked "has-liked")+ (if @post.yours "my-likes" "regular-likes")+ }}+ {{on "click" this.togglePopup}}+ ...attributes+ >+ {{#if this.buttonIcon}}+ {{dIcon this.buttonIcon}}+ {{/if}}+ {{@post.likeCount}}+ </button></template>}diff --git a/frontend/discourse/tests/acceptance/post-controls-test.js b/frontend/discourse/tests/acceptance/post-controls-test.jsindex 025ad21993a..0004a132f13 100644--- a/frontend/discourse/tests/acceptance/post-controls-test.js+++ b/frontend/discourse/tests/acceptance/post-controls-test.js@@ -3,9 +3,7 @@ import { test } from "qunit";import { acceptance } from "discourse/tests/helpers/qunit-helpers";import { i18n } from "discourse-i18n";-acceptance(`Post controls`, function (needs) {- needs.settings({ enable_new_post_reactions_menu: true });-+acceptance(`Post controls`, function () {test("popup with likes is shown when clicking on like count", async function (assert) {await visit("/t/internationalization-localization/280");diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions-summary.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions-summary.gjsindex 77efbb07d24..a83f7e63f3f 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions-summary.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions-summary.gjs@@ -5,7 +5,7 @@ import DiscourseReactionsActions from "./discourse-reactions-actions";export default class ReactionsActionSummary extends Component {static extraControls = true;- static shouldRender(args, _context, owner) {+ static shouldRender(args) {if (args.post.deleted) {return false;}@@ -14,26 +14,7 @@ export default class ReactionsActionSummary extends Component {return false;}- if (reactionsHiddenForUser(args.post)) {- return false;- }-- const siteSettings = owner?.lookup("service:site-settings");- if (siteSettings?.enable_new_post_reactions_menu) {- return true;- }-- const site = owner?.lookup("service:site");- if (site?.mobileView) {- return false;- }-- const mainReaction = siteSettings?.discourse_reactions_reaction_for_like;- return !(- args.post.reactions &&- args.post.reactions.length === 1 &&- args.post.reactions[0].id === mainReaction- );+ return !reactionsHiddenForUser(args.post);}<template>diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjsindex 7ea56c58799..f736f7fe27c 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjs@@ -19,12 +19,11 @@ import lazyHash from "discourse/helpers/lazy-hash";import { deferAnonymousAction } from "discourse/lib/anonymous-action";import { isRailsTesting, isTesting } from "discourse/lib/environment";import { emojiUrlFor } from "discourse/lib/text";-import { and, eq, not } from "discourse/truth-helpers";+import { eq, not } from "discourse/truth-helpers";import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";import { i18n } from "discourse-i18n";import CustomReaction from "../models/discourse-reactions-custom-reaction";import DiscourseReactionsCounter from "./discourse-reactions-counter";-import DiscourseReactionsDoubleButton from "./discourse-reactions-double-button";import DiscourseReactionsPicker from "./discourse-reactions-picker";import DiscourseReactionsReactionButton from "./discourse-reactions-reaction-button";@@ -115,20 +114,14 @@ export default class DiscourseReactionsActions extends Component {@service dialog;@service capabilities;@service siteSettings;- @service site;@service currentUser;@service appEvents;@tracked reactionsPickerExpanded = false;- @tracked statePanelExpanded = false;@tracked clickOutsideDisabled = false;containerElement = null;- get useNewMenu() {- return this.siteSettings.enable_new_post_reactions_menu;- }-get data() {return this.args.post;}@@ -202,11 +195,7 @@ export default class DiscourseReactionsActions extends Component {@actiontoggleReactions(event) {if (!this.reactionsPickerExpanded) {- if (this.statePanelExpanded) {- this.scheduleExpand("expandReactionsPicker");- } else {- this.expandReactionsPicker(event);- }+ this.expandReactionsPicker(event);}}@@ -559,14 +548,7 @@ export default class DiscourseReactionsActions extends Component {}let selector;- if (- !this.useNewMenu &&- this.data.reactions &&- this.data.reactions.length === 1 &&- this.data.reactions[0].id === mainReactionName- ) {- selector = `.discourse-reactions-double-button .discourse-reactions-reaction-button .d-icon`;- } else if (!attrs.reaction || attrs.reaction === mainReactionName) {+ if (!attrs.reaction || attrs.reaction === mainReactionName) {selector = `.discourse-reactions-reaction-button .d-icon`;} else {selector = `.discourse-reactions-reaction-button .reaction-button .btn-toggle-reaction-emoji`;@@ -612,17 +594,6 @@ export default class DiscourseReactionsActions extends Component {this.clickOutsideDisabled = false;}- @action- cancelExpand() {- cancel(this._expandHandler);- }-- scheduleExpand(handler) {- this.cancelExpand();-- this._expandHandler = later(this, this[handler], 250);- }-@actionscheduleCollapse(handler) {this.cancelCollapse();@@ -644,7 +615,7 @@ export default class DiscourseReactionsActions extends Component {if (this.clickOutsideDisabled) {return;}- if (this.reactionsPickerExpanded || this.statePanelExpanded) {+ if (this.reactionsPickerExpanded) {this.collapseAllPanels();}}@@ -652,27 +623,10 @@ export default class DiscourseReactionsActions extends Component {expandReactionsPicker() {cancel(this._collapseHandler);activeReactionsComponent?.collapseAllPanels();- this.statePanelExpanded = false;this.reactionsPickerExpanded = true;this.updateReactionsPickerPopover();}- @action- expandStatePanel() {- cancel(this._collapseHandler);- activeReactionsComponent?.collapseAllPanels();- this.statePanelExpanded = true;- this.reactionsPickerExpanded = false;- this.updateReactionsStatePanel();- }-- @action- collapseStatePanel() {- cancel(this._collapseHandler);- this._collapseHandler = null;- this.statePanelExpanded = false;- }-collapseReactionsPicker() {cancel(this._collapseHandler);this._collapseHandler = null;@@ -687,7 +641,6 @@ export default class DiscourseReactionsActions extends Component {false);this._collapseHandler = null;- this.statePanelExpanded = false;this.reactionsPickerExpanded = false;}@@ -699,14 +652,6 @@ export default class DiscourseReactionsActions extends Component {);}- @action- updateReactionsStatePanel() {- this.showPopover(- ".discourse-reactions-counter",- ".discourse-reactions-state-panel"- );- }-showPopover(referenceSelector, floatingSelector) {schedule("afterRender", () => {const referenceElement =@@ -771,14 +716,6 @@ export default class DiscourseReactionsActions extends Component {}}- get onlyOneMainReaction() {- return (- this.data.reactions?.length === 1 &&- this.data.reactions[0].id ===- this.siteSettings.discourse_reactions_reaction_for_like- );- }-get showReactionsPicker() {if (!this.reactionsPickerExpanded) {return false;@@ -811,18 +748,7 @@ export default class DiscourseReactionsActions extends Component {(hashcounter=(curryComponentDiscourseReactionsCounter- (lazyHash- post=this.data- position=@position- reactionsPickerExpanded=this.reactionsPickerExpanded- statePanelExpanded=this.statePanelExpanded- expandStatePanel=this.expandStatePanel- collapseStatePanel=this.collapseStatePanel- cancelCollapse=this.cancelCollapse- scheduleCollapse=this.scheduleCollapse- updatePopover=this.updateReactionsStatePanel- collapseAllPanels=this.collapseAllPanels- )+ (lazyHash post=this.data position=@position))button=(curryComponentDiscourseReactionsReactionButton@@ -832,7 +758,6 @@ export default class DiscourseReactionsActions extends Component {cancelCollapse=this.cancelCollapsetoggleFromButton=this.toggleFromButtontoggleReactions=this.toggleReactions- cancelExpand=this.cancelExpandscheduleCollapse=this.scheduleCollapse))@@ -853,25 +778,6 @@ export default class DiscourseReactionsActions extends Component {{{#if (eq @position "left")}}<components.counter />- {{else if this.useNewMenu}}- {{#unless this.data.yours}}- <components.button />- {{/unless}}- {{else if this.onlyOneMainReaction}}- <DiscourseReactionsDoubleButton- @post={{this.data}}- @counterComponent={{components.counter}}- @buttonComponent={{components.button}}- />- {{else if this.site.mobileView}}- {{#if (not this.data.yours)}}- <components.counter />- <components.button />- {{else if- (and this.data.yours this.data.reactions this.data.reactions.length)- }}- <components.counter />- {{/if}}{{else if (not this.data.yours)}}<components.button />{{/if}}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjsindex 894e17fc202..463296d54ce 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs@@ -1,58 +1,23 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import { uniqueItemsFromArray } from "discourse/lib/array-tools";-import { bind } from "discourse/lib/decorators";-import { and } from "discourse/truth-helpers";-import DButton from "discourse/ui-kit/d-button";-import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";import { i18n } from "discourse-i18n";-import CustomReaction from "../models/discourse-reactions-custom-reaction";import DiscourseReactionsList from "./discourse-reactions-list";-import DiscourseReactionsStatePanel from "./discourse-reactions-state-panel";import DiscourseReactionsUsersMenu from "./discourse-reactions-users-menu";const MENU_IDENTIFIER = "discourse-reactions-users-menu";export default class DiscourseReactionsCounter extends Component {- @service capabilities;@service menu;- @service site;@service siteSettings;- reactionsUsers = trackedObject();-- get useNewMenu() {- return this.siteSettings.enable_new_post_reactions_menu;- }-get elementId() {return `discourse-reactions-counter-${this.args.post.id}-${this.args.position || "right"}`;}- reactionsChanged(data) {- uniqueItemsFromArray(data.reactions).forEach((reaction) => {- this.getUsers(reaction);- });- }-- @bind- async getUsers(reactionValue) {- const response = await CustomReaction.findReactionUsers(this.args.post.id, {- reactionValue,- });-- response.reaction_users.forEach((reactionUser) => {- this.reactionsUsers[reactionUser.id] = reactionUser.users;- });-- this.args.updatePopover?.();- }-@actionmouseDown(event) {event.stopImmediatePropagation();@@ -65,21 +30,9 @@ export default class DiscourseReactionsCounter extends Component {@actionkeyDown(event) {- if (this.useNewMenu) {- if (event.key === "Enter" || event.key === " ") {- event.preventDefault();- this.#toggleMenu(event.currentTarget);- }- return;- }-if (event.key === "Enter" || event.key === " ") {event.preventDefault();- this.click(event);- } else if (event.key === "Escape" && this.args.statePanelExpanded) {- event.stopPropagation();- this.args.collapseStatePanel();- document.getElementById(this.elementId)?.focus();+ this.#toggleMenu(event.currentTarget);}}@@ -89,65 +42,13 @@ export default class DiscourseReactionsCounter extends Component {return;}- if (this.useNewMenu) {- if (event.target.closest(".users-popup")) {- return;- }-- event.stopPropagation();- event.preventDefault();- this.#toggleMenu(event.currentTarget);+ if (event.target.closest(".users-popup")) {return;}- this.args.cancelCollapse();-- if (!this.capabilities.touch || this.site.desktopView) {- event.stopPropagation();- event.preventDefault();-- if (!this.args.statePanelExpanded) {- this.getUsers();- }-- this.toggleStatePanel(event);- }- }-- @action- clickOutside() {- if (this.args.statePanelExpanded) {- this.args.collapseAllPanels();- }- }-- @action- touchStart(event) {- if (this.useNewMenu) {- return;- }-- this.args.cancelCollapse();-- if (- event.target.classList.contains("show-users") ||- event.target.classList.contains("avatar")- ) {- return true;- }-- if (this.args.statePanelExpanded) {- event.stopPropagation();- event.preventDefault();- return;- }-- if (this.capabilities.touch) {- event.stopPropagation();- event.preventDefault();- this.getUsers();- this.toggleStatePanel(event);- }+ event.stopPropagation();+ event.preventDefault();+ this.#toggleMenu(event.currentTarget);}get classes() {@@ -172,56 +73,12 @@ export default class DiscourseReactionsCounter extends Component {return classes.join(" ");}- toggleStatePanel() {- if (!this.args.statePanelExpanded) {- this.args.expandStatePanel();- } else {- this.args.collapseStatePanel();- }- }-- @action- pointerOver(event) {- if (this.useNewMenu) {- return;- }-- if (event.pointerType !== "mouse") {- return;- }-- this.args.cancelCollapse();- }-- @action- pointerOut(event) {- if (this.useNewMenu) {- return;- }-- if (event.pointerType !== "mouse") {- return;- }-- if (!event.relatedTarget?.closest(`#${this.elementId}`)) {- this.args.scheduleCollapse("collapseStatePanel");- }- }-get counterAriaLabel() {return i18n("discourse_reactions.counter.aria_label", {count: this.args.post.reaction_users_count,});}- get onlyOneMainReaction() {- return (- this.args.post.reactions?.length === 1 &&- this.args.post.reactions[0].id ===- this.siteSettings.discourse_reactions_reaction_for_like- );- }-#toggleMenu(trigger) {const virtualElement = {getBoundingClientRect: () => trigger.getBoundingClientRect(),@@ -241,75 +98,24 @@ export default class DiscourseReactionsCounter extends Component {<template>{{! eslint-disable ember/template-no-pointer-down-event-binding }}- {{#if this.useNewMenu}}- <div- id={{this.elementId}}- class={{this.classes}}- role="button"- tabindex="0"- aria-label={{this.counterAriaLabel}}- {{on "mousedown" this.mouseDown}}- {{on "mouseup" this.mouseUp}}- {{on "click" this.click}}- {{on "keydown" this.keyDown}}- >- {{#if @post.reaction_users_count}}- <DiscourseReactionsList @post={{@post}} />-- <span class="reactions-counter" aria-hidden="true">- {{@post.reaction_users_count}}- </span>- {{/if}}- </div>- {{else}}- <div- id={{this.elementId}}- class={{this.classes}}- role="button"- tabindex="0"- aria-label={{this.counterAriaLabel}}- {{on "mousedown" this.mouseDown}}- {{on "mouseup" this.mouseUp}}- {{dCloseOnClickOutside this.clickOutside}}- {{on "touchstart" this.touchStart}}- {{on "pointerover" this.pointerOver}}- {{on "pointerout" this.pointerOut}}- {{on "click" this.click}}- {{on "keydown" this.keyDown}}- >- {{#if @post.reaction_users_count}}- <DiscourseReactionsStatePanel- @post={{@post}}- @reactionsUsers={{this.reactionsUsers}}- @statePanelExpanded={{@statePanelExpanded}}- @scheduleCollapse={{@scheduleCollapse}}- @cancelCollapse={{@cancelCollapse}}- />-- {{#unless this.onlyOneMainReaction}}- <DiscourseReactionsList- {{on "click" this.click}}- @post={{@post}}- @reactionsUsers={{this.reactionsUsers}}- @getUsers={{this.getUsers}}- />- {{/unless}}-- <span class="reactions-counter" aria-hidden="true">- {{@post.reaction_users_count}}- </span>-- {{#if (and @post.yours this.onlyOneMainReaction)}}- <div class="discourse-reactions-reaction-button my-likes">- <DButton- class="btn-toggle-reaction-like btn-flat btn-icon no-text reaction-button"- @translatedTitle={{this.counterAriaLabel}}- @icon={{this.siteSettings.discourse_reactions_like_icon}}- />- </div>- {{/if}}- {{/if}}- </div>- {{/if}}+ <div+ id={{this.elementId}}+ class={{this.classes}}+ role="button"+ tabindex="0"+ aria-label={{this.counterAriaLabel}}+ {{on "mousedown" this.mouseDown}}+ {{on "mouseup" this.mouseUp}}+ {{on "click" this.click}}+ {{on "keydown" this.keyDown}}+ >+ {{#if @post.reaction_users_count}}+ <DiscourseReactionsList @post={{@post}} />++ <span class="reactions-counter" aria-hidden="true">+ {{@post.reaction_users_count}}+ </span>+ {{/if}}+ </div></template>}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-double-button.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-double-button.gjsdeleted file mode 100644index 0800a6c41a9..00000000000--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-double-button.gjs+++ /dev/null@@ -1,13 +0,0 @@-const DiscourseReactionsDoubleButton = <template>- <div class="discourse-reactions-double-button">- {{#if @post.reaction_users_count}}- <@counterComponent />- {{/if}}-- {{#unless @post.yours}}- <@buttonComponent />- {{/unless}}- </div>-</template>;--export default DiscourseReactionsDoubleButton;diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjsindex f92d5ef06f3..d42dd72dcc2 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjs@@ -1,156 +1,26 @@import Component from "@glimmer/component";-import { tracked } from "@glimmer/tracking";-import { on } from "@ember/modifier";-import { action } from "@ember/object";-import { debounce } from "@ember/runloop";import { service } from "@ember/service";-import {- computePosition,- flip,- limitShift,- offset,- shift,-} from "@floating-ui/dom";-import { bind } from "discourse/lib/decorators";import dEmoji from "discourse/ui-kit/helpers/d-emoji";-import { i18n } from "discourse-i18n";--const DISPLAY_MAX_USERS = 19;export default class DiscourseReactionsListEmoji extends Component {@service siteSettings;- @tracked loadingReactions = false;-- get useNewMenu() {- return this.siteSettings.enable_new_post_reactions_menu;- }-get elementId() {return `discourse-reactions-list-emoji-${this.args.post.id}-${this.args.reaction.id}`;}- @action- pointerOver(event) {- if (this.useNewMenu) {- return;- }-- if (event.pointerType !== "mouse" || !this.args.reaction.count) {- return;- }-- this.showTooltip();-- if (!this.args.users?.length && !this.loadingReactions) {- debounce(this, this._loadReactionUsers, 3000, true);- }- }-- showTooltip() {- const referenceElement = document.getElementById(this.elementId);- const floatingElement = referenceElement.querySelector(".user-list");-- computePosition(referenceElement, floatingElement, {- placement: "bottom",- middleware: [- offset(-5),- shift({ limiter: limitShift() }),- flip({ padding: 5 }),- ],- }).then(({ x, y }) => {- Object.assign(floatingElement.style, {- left: `${x}px`,- top: `${y}px`,- });- });- }-- _loadReactionUsers() {- if (!this.args.getUsers) {- return;- }- this.loadingReactions = true;- this.args.getUsers(this.args.reaction.id).finally(() => {- this.loadingReactions = false;- });- }-- get truncatedUsers() {- return this.args.users?.slice(0, DISPLAY_MAX_USERS);- }-- @bind- displayNameForUser(user) {- if (- !this.siteSettings.prioritize_username_in_ux &&- this.siteSettings.prioritize_full_name_in_ux- ) {- return user.name || user.username;- } else if (this.siteSettings.prioritize_username_in_ux) {- return user.username;- } else if (!user.name) {- return user.username;- } else {- return user.name;- }- }-- get hiddenUserCount() {- return this.args.users?.length - this.truncatedUsers?.length;- }-<template>- {{#if this.useNewMenu}}- <div class="discourse-reactions-list-emoji" id={{this.elementId}}>- {{#if @reaction.count}}- {{dEmoji- @reaction.id- class=(if- this.siteSettings.discourse_reactions_desaturated_reaction_panel- "desaturated"- ""- )- }}- {{/if}}- </div>- {{else}}- <div- class="discourse-reactions-list-emoji"- id={{this.elementId}}- {{on "pointerover" this.pointerOver}}- >- {{#if @reaction.count}}- {{dEmoji- @reaction.id- skipTitle=true- class=(if- this.siteSettings.discourse_reactions_desaturated_reaction_panel- "desaturated"- ""- )- }}-- <div class="user-list">- <div class="container">- <span class="heading">{{@reaction.id}}</span>- {{#each this.truncatedUsers as |user|}}- <span class="username">{{this.displayNameForUser user}}</span>- {{else}}- <div class="center"><div class="spinner small"></div></div>- {{/each}}- {{#if this.hiddenUserCount}}- <span class="other-users">- {{i18n- "discourse_reactions.state_panel.more_users"- count=this.hiddenUserCount- }}- </span>- {{/if}}- </div>- </div>- {{/if}}- </div>- {{/if}}+ <div class="discourse-reactions-list-emoji" id={{this.elementId}}>+ {{#if @reaction.count}}+ {{dEmoji+ @reaction.id+ class=(if+ this.siteSettings.discourse_reactions_desaturated_reaction_panel+ "desaturated"+ ""+ )+ }}+ {{/if}}+ </div></template>}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list.gjsindex 2acd0b7a823..a0abed8c710 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list.gjs@@ -1,4 +1,3 @@-import { get } from "@ember/helper";import DiscourseReactionsListEmoji from "./discourse-reactions-list-emoji";const DiscourseReactionsList = <template>@@ -6,12 +5,7 @@ const DiscourseReactionsList = <template>{{#if @post.reaction_users_count}}<div class="reactions">{{#each @post.reactions as |reaction|}}- <DiscourseReactionsListEmoji- @reaction={{reaction}}- @users={{if @reactionsUsers (get @reactionsUsers reaction.id)}}- @post={{@post}}- @getUsers={{@getUsers}}- />+ <DiscourseReactionsListEmoji @reaction={{reaction}} @post={{@post}} />{{/each}}</div>{{/if}}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjsindex f9c9d0cee7e..03a8780522e 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjs@@ -71,7 +71,6 @@ export default class ReactionsReactionButton extends Component {return;}- this.args.cancelExpand();this.args.scheduleCollapse("collapseReactionsPicker");}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel-reaction.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel-reaction.gjsdeleted file mode 100644index 5e95cacf959..00000000000--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel-reaction.gjs+++ /dev/null@@ -1,122 +0,0 @@-import Component from "@glimmer/component";-import { on } from "@ember/modifier";-import { action } from "@ember/object";-import { gt } from "discourse/truth-helpers";-import DUserAvatar from "discourse/ui-kit/d-user-avatar";-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";-import dEmoji from "discourse/ui-kit/helpers/d-emoji";-import dIcon from "discourse/ui-kit/helpers/d-icon";-import { i18n } from "discourse-i18n";--const MAX_USERS_COUNT = 26;-const MIN_USERS_COUNT = 8;--export default class DiscourseReactionsStatePanelReaction extends Component {- @action- click(event) {- if (event?.target?.classList?.contains("show-users")) {- event.preventDefault();- event.stopPropagation();-- this.args.showUsers(this.args.reaction.id);- }- }-- get firstLineUsers() {- return this.args.users.slice(0, MIN_USERS_COUNT);- }-- get otherUsers() {- return this.args.users.slice(MIN_USERS_COUNT, MAX_USERS_COUNT);- }-- get columnsCount() {- return this.args.users.length > MIN_USERS_COUNT- ? this.firstLineUsers.length + 1- : this.firstLineUsers.length;- }-- get groupAriaLabel() {- return i18n("discourse_reactions.state_panel.reaction_group", {- reaction: this.args.reaction.id,- count: this.args.reaction.count,- });- }-- get moreLabel() {- if (this.args.isDisplayed && this.args.reaction.count > MAX_USERS_COUNT) {- return i18n("discourse_reactions.state_panel.more_users", {- count: this.args.reaction.count - MAX_USERS_COUNT,- });- }- }-- <template>- {{! eslint-disable ember/template-no-invalid-interactive }}- <div- class={{dConcatClass- "discourse-reactions-state-panel-reaction"- (if @isDisplayed "is-displayed")- }}- role="listitem"- aria-label={{this.groupAriaLabel}}- {{on "click" this.click}}- >- {{#if @users}}- <div class="reaction-wrapper" aria-hidden="true">- <div class="emoji-wrapper">- {{dEmoji @reaction.id}}- </div>- <div class="count">- {{@reaction.count}}- </div>- </div>-- <div class="users">- <div class="list list-columns-{{this.columnsCount}}">- {{#each this.firstLineUsers key="username" as |user|}}- <span>- <DUserAvatar- class="trigger-user-card"- @ariaHidden={{false}}- @size="tiny"- @user={{user}}- />- </span>- {{/each}}-- {{#if (gt @users.length MIN_USERS_COUNT)}}- <button- type="button"- class="show-users"- aria-label={{if- @isDisplayed- (i18n "discourse_reactions.state_panel.hide_users")- (i18n "discourse_reactions.state_panel.show_users")- }}- >- {{dIcon (if @isDisplayed "chevron-up" "chevron-down")}}- </button>- {{/if}}-- {{#if @isDisplayed}}- {{#each this.otherUsers key="username" as |user|}}- <span>- <DUserAvatar- class="trigger-user-card"- @ariaHidden={{false}}- @size="tiny"- @user={{user}}- />- </span>- {{/each}}- {{/if}}- </div>- <span class="more">- {{this.moreLabel}}- </span>- </div>- {{/if}}- </div>- </template>-}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel.gjsdeleted file mode 100644index bdff9972d12..00000000000--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel.gjs+++ /dev/null@@ -1,115 +0,0 @@-import Component from "@glimmer/component";-import { tracked } from "@glimmer/tracking";-import { on } from "@ember/modifier";-import { action, get } from "@ember/object";-import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import { schedule } from "@ember/runloop";-import { and, eq } from "discourse/truth-helpers";-import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";-import DiscourseReactionsStatePanelReaction from "./discourse-reactions-state-panel-reaction";--export default class DiscourseReactionsStatePanel extends Component {- @tracked displayedReactionId;-- get classes() {- const classes = [];-- const { post } = this.args;- if (post?.reactions) {- const maxCount = Math.max(- ...post.reactions.map((reaction) => reaction.count)- );- const charsCount = maxCount.toString().length;- classes.push(`max-length-${charsCount}`);- }-- if (this.args.statePanelExpanded) {- classes.push("is-expanded");- }-- return classes;- }-- @action- pointerOut(event) {- if (event.pointerType !== "mouse") {- return;- }-- this.args.scheduleCollapse("collapseStatePanel");- }-- @action- pointerOver(event) {- if (event.pointerType !== "mouse") {- return;- }-- this.args.cancelCollapse();- }-- @action- showUsers(reactionId) {- if (!this.displayedReactionId) {- this.displayedReactionId = reactionId;- } else if (this.displayedReactionId === reactionId) {- this.hideUsers();- } else if (this.displayedReactionId !== reactionId) {- this.displayedReactionId = reactionId;- }- }-- @action- hideUsers() {- this.displayedReactionId = null;- }-- get hasReactionData() {- return !!Object.keys(this.args.reactionsUsers).length;- }-- @action- focusContainer(element) {- schedule("afterRender", () => {- const counter = element.closest(".discourse-reactions-counter");- if (counter?.matches(":focus-visible")) {- element.focus();- }- });- }-- <template>- <div- class={{dConcatClass "discourse-reactions-state-panel" this.classes}}- {{on "pointerout" this.pointerOut}}- {{on "pointerover" this.pointerOver}}- >- {{#if (and @statePanelExpanded @post.reactions.length)}}- <div class="container">- {{#if this.hasReactionData}}- <div- class="counters"- role="list"- tabindex="-1"- {{didInsert this.focusContainer}}- >- {{#each @post.reactions key="id" as |reaction|}}- <DiscourseReactionsStatePanelReaction- @reaction={{reaction}}- @users={{get @reactionsUsers reaction.id}}- @post={{@post}}- @isDisplayed={{eq reaction.id this.displayedReactionId}}- @showUsers={{this.showUsers}}- />- {{/each}}- </div>- {{else}}- <div class="spinner-container">- <div class="spinner small"></div>- </div>- {{/if}}- </div>- {{/if}}- </div>- </template>-}diff --git a/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scss b/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scssindex dd7b60ab7b3..0604cbd850c 100644--- a/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scss+++ b/plugins/discourse-reactions/assets/stylesheets/common/discourse-reactions.scss@@ -37,69 +37,6 @@ html.discourse-reactions-no-select {}}}-- .discourse-no-touch & {- &:hover {- .user-list {- visibility: visible;- opacity: 0.9;-- .spinner {- animation-play-state: running;- }- }- }- }- }-- .user-list {- position: absolute;- visibility: hidden;- z-index: z("usercard") - 2;- transition: opacity 0.33s;- opacity: 0;- padding: 0.5em 0;- min-width: 120px;- min-height: 80px;- width: max-content;- top: 0;-- .spinner {- animation-play-state: paused;- }-- .container {- margin-top: 0.5em;- font-size: $font-down-2;- background-color: var(--primary);- color: var(--secondary-very-high);- border-radius: 3px;- padding: 1em;- display: flex;- flex-direction: column;-- .heading {- font-weight: 700;- font-size: $font-up-1;- padding-bottom: 0.5em;- text-align: left;- }-- .username {- @include ellipsis;- }-- .username,- .other-users {- white-space: nowrap;- text-align: left;- }-- .other-users {- padding-top: 0.25em;- color: var(--secondary-high);- }- }}}@@ -110,150 +47,6 @@ html.discourse-reactions-no-select {}}-.discourse-reactions-counter .discourse-reactions-state-panel {- cursor: default;- z-index: z("usercard") - 2;- position: absolute;- visibility: hidden;- padding: 15px 0;- width: max-content;- top: 0;-- &.is-expanded {- min-width: 80px;- visibility: visible;- }-- .discourse-reactions-state-panel-reaction .count {- padding-right: 0.25em;- }-- @for $i from 1 through 5 {- &.max-length-#{$i} {- .discourse-reactions-state-panel-reaction .count {- width: #{$i * 10}px;- }- }- }-- .container {- box-shadow: var(--shadow-card);- background-color: var(--secondary);- display: flex;- flex-direction: column;- z-index: 1;- padding: 0.25em;- border-radius: 8px;- }-- .counters {- display: flex;- flex-direction: column;- max-height: 200px;- overflow-y: auto;- }-}--.discourse-reactions-state-panel-reaction {- border-bottom: 1px solid var(--content-border-color);- display: flex;- justify-content: flex-start;- align-items: flex-start;-- &:first-child {- padding-top: 0;- }-- &:last-child {- border: none;- padding-bottom: 0;- }-- .list {- display: grid;- column-gap: 0.25em;- row-gap: 0.25em;- padding-top: 0.25em;- grid-template-rows: 22.5px;- }-- @for $i from 1 through 9 {- .list-columns-#{$i} {- grid-template-columns: repeat($i, 22.5px);- }- }-- .users {- display: flex;- flex-direction: column;-- .trigger-user-card {- width: 22px;- height: 22px;- display: flex;- align-items: center;- justify-content: center;-- .avatar {- // constrain to container- width: 100%;- height: 100%;- }- }- }-- .more {- color: var(--primary-medium);- font-size: $font-down-1;- padding-top: 0.5em;- text-align: left;- }-- .reaction-wrapper {- display: flex;- align-items: center;- justify-content: center;- padding-top: 0.25em;- margin-left: 0 !important; // core rule has too much specificity-- .count {- font-size: $font-down-1;- color: var(--primary-medium);- text-align: left;-- @include ellipsis;- }-- .emoji-wrapper {- width: 25px;- height: 25px;- display: flex;- align-items: center;- justify-content: center;- }- }-- .show-users {- padding: 0 !important;- margin: 0 !important;- background: none !important;- border-color: transparent !important;- color: var(--primary-medium) !important;-- .d-icon {- color: var(--primary-medium) !important;- margin: 0;- pointer-events: none;- }- }-- .count {- color: var(--primary);- font-size: $font-up-1;- margin-left: 0.5em;- }-}-@keyframes fadeIn {0% {opacity: 0;@@ -344,14 +137,6 @@ html.discourse-reactions-no-select {justify-content: flex-end;height: 100%;- .spinner-container {- align-self: center;- align-items: center;- justify-content: center;- display: flex;- margin-left: 0 !important; // core rule has too much specificity- }-&:not(.custom-reaction-used) {.discourse-reactions-counter {line-height: 1;@@ -383,12 +168,6 @@ html.discourse-reactions-no-select {}&.has-reacted {- .discourse-no-touch & {- .discourse-reactions-double-button:hover {- background: var(--primary-low);- }- }-&.has-used-main-reaction {.discourse-reactions-reaction-button .reaction-button .d-icon {color: var(--love);@@ -420,20 +199,8 @@ html.discourse-reactions-no-select {}&:not(.has-reacted) {- &.my-post {- .discourse-no-touch & {- .discourse-reactions-double-button:hover {- .d-icon {- color: var(--primary-low-mid);- }- background: var(--primary-low);- }- }- }-&:not(.my-post) {.discourse-no-touch & {- .discourse-reactions-double-button:hover,.discourse-reactions-reaction-button:hover .reaction-button {background: var(--love-low);@@ -446,13 +213,6 @@ html.discourse-reactions-no-select {}}-.discourse-reactions-double-button {- display: inline-flex;- border-radius: var(--d-post-control-border-radius);-- @include user-select(none);-}-.discourse-reactions-reaction-button {position: relative;display: flex;diff --git a/plugins/discourse-reactions/config/locales/client.en.yml b/plugins/discourse-reactions/config/locales/client.en.ymlindex 854bbbfc5c7..cfd6e80d440 100644--- a/plugins/discourse-reactions/config/locales/client.en.yml+++ b/plugins/discourse-reactions/config/locales/client.en.yml@@ -7,13 +7,6 @@ en:js:discourse_reactions:reactions_title: "Reactions"- state_panel:- more_users: "and %{count} more..."- show_users: "Show more users"- hide_users: "Show fewer users"- reaction_group:- one: "%{reaction}: %{count} user"- other: "%{reaction}: %{count} users"reaction:forbidden: "You are not allowed to react or change your reaction to this post."picker:diff --git a/plugins/discourse-reactions/spec/system/page_objects/post_reactions_list.rb b/plugins/discourse-reactions/spec/system/page_objects/post_reactions_list.rbindex 2e6cfe2cb02..bbfd1d2e1d6 100644--- a/plugins/discourse-reactions/spec/system/page_objects/post_reactions_list.rb+++ b/plugins/discourse-reactions/spec/system/page_objects/post_reactions_list.rb@@ -27,21 +27,10 @@ module PageObjectscomponent.has_css?(reaction_list_emoji_selector(reaction))end- def hover_over_reaction(reaction)- component.find(reaction_list_emoji_selector(reaction)).hover- page.has_css?(".discourse-reactions-list-emoji .user-list", visible: true)- end-def click_reaction(reaction)component.find(reaction_list_emoji_selector(reaction)).clickend- def has_users_for_reaction?(reaction, usernames)- find("#{reaction_list_emoji_selector(reaction)} .user-list .container").has_text?(- usernames.join("\n"),- )- end-def click_countercontext_component.find(".discourse-reactions-counter").clickenddiff --git a/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb b/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rbindex c8fa056871a..4eac46ea6fb 100644--- a/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb+++ b/plugins/discourse-reactions/spec/system/reactions_post_list_spec.rb@@ -13,7 +13,6 @@ describe "Reactions | Post reaction user list" dobefore doSiteSetting.discourse_reactions_enabled = true- SiteSetting.enable_new_post_reactions_menu = trueDiscourseReactions::ReactionManager.new(reaction_value: "heart",diff --git a/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-post-test.js b/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-post-test.jsindex 07abf227757..518e0305827 100644--- a/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-post-test.js+++ b/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-post-test.js@@ -11,7 +11,6 @@ acceptance("Post", function (needs) {discourse_reactions_enabled_reactions: "otter|open_mouth",discourse_reactions_reaction_for_like: "heart",discourse_reactions_like_icon: "heart",- enable_new_post_reactions_menu: true,});needs.pretender((server, helper) => {@@ -115,7 +114,6 @@ acceptance("Post - hidden reactions", function (needs) {discourse_reactions_enabled_reactions: "otter|open_mouth",discourse_reactions_reaction_for_like: "heart",discourse_reactions_like_icon: "heart",- enable_new_post_reactions_menu: true,});needs.pretender((server, helper) => {@@ -156,7 +154,6 @@ acceptance("Post - hidden reactions with hidden-post access", function (needs) {discourse_reactions_enabled_reactions: "otter|open_mouth",discourse_reactions_reaction_for_like: "heart",discourse_reactions_like_icon: "heart",- enable_new_post_reactions_menu: true,});needs.pretender((server, helper) => {diff --git a/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.js b/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.jsindex 5c57d8c5163..4f7d285aa91 100644--- a/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.js+++ b/plugins/discourse-reactions/test/javascripts/acceptance/discourse-reactions-users-menu-test.js@@ -18,7 +18,6 @@ const SETTINGS = {discourse_reactions_enabled_reactions: "laughing|open_mouth",discourse_reactions_reaction_for_like: "heart",discourse_reactions_like_icon: "heart",- enable_new_post_reactions_menu: true,};acceptance(diff --git a/spec/system/post_menu_spec.rb b/spec/system/post_menu_spec.rbindex 7dbed72dedd..3273b576c96 100644--- a/spec/system/post_menu_spec.rb+++ b/spec/system/post_menu_spec.rb@@ -513,7 +513,6 @@ describe "Post menu" doendit "shows the users who liked when clicking on the like count" do- SiteSetting.enable_new_post_reactions_menu = truePostActionCreator.like(user, post)PostActionCreator.like(admin, post)