A platform for community discussion. Free, open, simple.
UX: enhancements for embed mode (#38848)
Keegan George2eac80093df3
diff --git a/frontend/discourse/app/instance-initializers/embed-mode-composer.js b/frontend/discourse/app/instance-initializers/embed-mode-composer.jsnew file mode 100644index 00000000000..1608bd16ea4--- /dev/null+++ b/frontend/discourse/app/instance-initializers/embed-mode-composer.js@@ -0,0 +1,29 @@+import { USER_OPTION_COMPOSITION_MODES } from "discourse/lib/constants";+import EmbedMode from "discourse/lib/embed-mode";+import { withPluginApi } from "discourse/lib/plugin-api";+import Composer from "discourse/models/composer";++export default {+ after: "inject-objects",++ initialize(owner) {+ if (!EmbedMode.enabled) {+ return;+ }++ const appEvents = owner.lookup("service:app-events");++ appEvents.on("composer:open", () => {+ const composerService = owner.lookup("service:composer");+ if (composerService.model?.composeState !== Composer.FULLSCREEN) {+ composerService.model.set("composeState", Composer.FULLSCREEN);+ }+ });++ withPluginApi((api) => {+ api.registerValueTransformer("composer-force-editor-mode", () => {+ return USER_OPTION_COMPOSITION_MODES.rich;+ });+ });+ },+};diff --git a/frontend/discourse/app/routes/topic/from-params.js b/frontend/discourse/app/routes/topic/from-params.jsindex 353268b02ce..aedb1045b3a 100644--- a/frontend/discourse/app/routes/topic/from-params.js+++ b/frontend/discourse/app/routes/topic/from-params.js@@ -2,8 +2,10 @@ import { action } from "@ember/object";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";+import EmbedMode from "discourse/lib/embed-mode";import { isTesting } from "discourse/lib/environment";import DiscourseURL from "discourse/lib/url";+import Composer from "discourse/models/composer";import Draft from "discourse/models/draft";import DiscourseRoute from "discourse/routes/discourse";@@ -117,6 +119,20 @@ export default class TopicFromParams extends DiscourseRoute {ignoreIfChanged: true,topic,});+ } else if (+ EmbedMode.enabled &&+ this.currentUser &&+ topic.posts_count === 1 &&+ topic.get("details.can_create_post")+ ) {+ schedule("afterRender", () => {+ this.composer.open({+ action: Composer.REPLY,+ draftKey: topic.draft_key,+ draftSequence: topic.draft_sequence,+ topic,+ });+ });}}diff --git a/spec/system/embed_mode_spec.rb b/spec/system/embed_mode_spec.rbindex 0b6bf6e8bdf..ae42aa3ac31 100644--- a/spec/system/embed_mode_spec.rb+++ b/spec/system/embed_mode_spec.rb@@ -35,4 +35,69 @@ describe "Embed mode" doexpect(topic_page).to have_topic_title(topic.title)expect(page).to have_css("#post_1")end++ context "when logged in" do+ fab!(:user)+ let(:composer) { PageObjects::Components::Composer.new }++ before do+ SiteSetting.rich_editor = true+ sign_in(user)+ end++ context "with a topic that has no replies" do+ fab!(:no_reply_topic, :topic)+ fab!(:no_reply_post) { Fabricate(:post, topic: no_reply_topic) }++ it "auto-opens the composer in fullscreen" do+ visit("/t/#{no_reply_topic.slug}/#{no_reply_topic.id}?embed_mode=true")++ expect(page).to have_css("#reply-control.fullscreen")+ end++ it "uses the rich text editor" do+ visit("/t/#{no_reply_topic.slug}/#{no_reply_topic.id}?embed_mode=true")++ expect(page).to have_css("#reply-control.fullscreen")+ expect(composer).to have_rich_editor+ end++ it "does not auto-open the composer outside embed mode" do+ visit("/t/#{no_reply_topic.slug}/#{no_reply_topic.id}")++ expect(page).to have_no_css("#reply-control.open")+ expect(page).to have_no_css("#reply-control.fullscreen")+ end+ end++ context "with a topic that has replies" do+ fab!(:reply) { Fabricate(:post, topic: topic) }++ it "does not auto-open the composer" do+ visit("/t/#{topic.slug}/#{topic.id}?embed_mode=true")++ expect(page).to have_no_css("#reply-control.open")+ expect(page).to have_no_css("#reply-control.fullscreen")+ end++ it "opens the composer in fullscreen when clicking reply" do+ visit("/t/#{topic.slug}/#{topic.id}?embed_mode=true")+ find("#topic-footer-buttons .btn-primary.create").click++ expect(page).to have_css("#reply-control.fullscreen")+ end+ end+ end++ context "when not logged in" do+ fab!(:no_reply_topic, :topic)+ fab!(:no_reply_post) { Fabricate(:post, topic: no_reply_topic) }++ it "does not auto-open the composer" do+ visit("/t/#{no_reply_topic.slug}/#{no_reply_topic.id}?embed_mode=true")++ expect(page).to have_no_css("#reply-control.open")+ expect(page).to have_no_css("#reply-control.fullscreen")+ end+ endend