A platform for community discussion. Free, open, simple.
UX: Move reply button on empty state in embed mode (#38935)
Derek Rushforth2596ab1d4db6
diff --git a/app/assets/stylesheets/common/base/embed-mode.scss b/app/assets/stylesheets/common/base/embed-mode.scssindex 1b6d449d988..ef4d227c5d4 100644--- a/app/assets/stylesheets/common/base/embed-mode.scss+++ b/app/assets/stylesheets/common/base/embed-mode.scss@@ -27,7 +27,10 @@ body.embed-mode {nav.post-controls .actions .show-more-actions,.software-update-prompt,.time-gap,- .topic-navigation {+ .topic-navigation,+ .post-stream .gap,+ .container.posts:not(:has(.post-stream .topic-post ~ .topic-post))+ ~ #topic-footer-buttons {display: none !important;}@@ -96,7 +99,7 @@ body.embed-mode {// Hide OP// Use visibility hidden to prevent issues with jumpy behavior- .post-stream .topic-post.topic-owner {+ .post-stream .topic-post.topic-owner:first-child {opacity: 0;height: 0;visibility: hidden;diff --git a/frontend/discourse/app/components/embed-topic-footer.gjs b/frontend/discourse/app/components/embed-topic-footer.gjsindex 3e259020545..09a80e91ccd 100644--- a/frontend/discourse/app/components/embed-topic-footer.gjs+++ b/frontend/discourse/app/components/embed-topic-footer.gjs@@ -1,11 +1,17 @@import Component from "@glimmer/component";+import { action } from "@ember/object";import { service } from "@ember/service";+import DButton from "discourse/components/d-button";import PoweredByDiscourse from "discourse/components/powered-by-discourse";import icon from "discourse/helpers/d-icon";import EmbedMode from "discourse/lib/embed-mode";+import getURL from "discourse/lib/get-url";+import Composer from "discourse/models/composer";import { i18n } from "discourse-i18n";export default class EmbedTopicFooter extends Component {+ @service composer;+ @service currentUser;@service siteSettings;get isEmbedMode() {@@ -20,6 +26,30 @@ export default class EmbedTopicFooter extends Component {return this.siteSettings.enable_powered_by_discourse;}+ get replyButtonLabel() {+ return this.currentUser ? "topic.reply.title" : "topic.login_reply";+ }++ @action+ async handleReply() {+ if (!this.currentUser) {+ window.open(getURL("/login"), "_blank");+ return;+ }++ const topic = this.args.topic;+ if (!topic?.details?.can_create_post) {+ return;+ }++ await this.composer.open({+ action: Composer.REPLY,+ topic,+ draftKey: topic.draft_key,+ draftSequence: topic.draft_sequence,+ });+ }+<template>{{#if this.isEmbedMode}}<div class="embed-topic-footer">@@ -27,6 +57,11 @@ export default class EmbedTopicFooter extends Component {<div class="embed-topic-footer__first-reply">{{icon "comment"}}<span>{{i18n "embed_mode.be_first_to_reply"}}</span>+ <DButton+ @action={{this.handleReply}}+ @label={{this.replyButtonLabel}}+ class="btn-primary"+ /></div>{{/if}}{{#if this.showPoweredBy}}diff --git a/spec/system/embed_mode_spec.rb b/spec/system/embed_mode_spec.rbindex cf93e06785d..c4337d0633f 100644--- a/spec/system/embed_mode_spec.rb+++ b/spec/system/embed_mode_spec.rb@@ -40,6 +40,7 @@ describe "Embed mode" dovisit("/t/#{topic.slug}/#{topic.id}?embed_mode=true")expect(page).to have_css(".embed-topic-footer__first-reply")+ expect(page).to have_css(".embed-topic-footer__first-reply .btn-primary")endit "shows powered by discourse badge" do@@ -138,5 +139,11 @@ describe "Embed mode" doexpect(page).to have_no_css("#reply-control.open")expect(page).to have_no_css("#reply-control.fullscreen")end++ it "shows login label on the embed first-reply footer" do+ visit("/t/#{no_reply_topic.slug}/#{no_reply_topic.id}?embed_mode=true")++ expect(page).to have_button(I18n.t("js.topic.login_reply"))+ endendend