Skip to content

A platform for community discussion. Free, open, simple.

FIX: Topic title going into header on scroll for nested topic (#40340)

Mark VanLandingham16b3d636c538
diff --git a/frontend/discourse/app/components/nested/header.gjs b/frontend/discourse/app/components/nested/header.gjs
index 969ed81ac18..969899c276e 100644
--- a/frontend/discourse/app/components/nested/header.gjs
+++ b/frontend/discourse/app/components/nested/header.gjs
@@ -1,4 +1,8 @@
+import Component from "@glimmer/component";
import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
+import { service } from "@ember/service";
import { trustHTML } from "@ember/template";
import PluginOutlet from "discourse/components/plugin-outlet";
import TopicCategory from "discourse/components/topic-category";
@@ -7,51 +11,71 @@ import TopicStatus from "discourse/components/topic-status";
import TopicTitleEditor from "discourse/components/topic-title-editor";
import lazyHash from "discourse/helpers/lazy-hash";
import dIcon from "discourse/ui-kit/helpers/d-icon";
+import dObserveIntersection from "discourse/ui-kit/modifiers/d-observe-intersection";
-<template>
- <div class="nested-view__header">
- {{#if @editingTopic}}
- <div class="edit-topic-title">
- <TopicTitleEditor
- @bufferedTitle={{@buffered.title}}
- @model={{@topic}}
- @buffered={{@buffered}}
- />
+export default class NestedHeader extends Component {
+ @service header;
- <TopicMetadata
- @buffered={{@buffered}}
- @model={{@topic}}
- @showCategoryChooser={{@showCategoryChooser}}
- @canEditTags={{@canEditTags}}
- @minimumRequiredTags={{@minimumRequiredTags}}
- @onSave={{@finishedEditingTopic}}
- @onCancel={{@cancelEditingTopic}}
- @topicCategoryChanged={{@topicCategoryChanged}}
- @topicTagsChanged={{@topicTagsChanged}}
- />
- </div>
- {{else}}
- <h1 class="nested-view__title">
- <TopicStatus @topic={{@topic}} />
- <a
- href={{@topic.url}}
- {{on "click" @startEditingTopic}}
- class="fancy-title"
- >
- {{trustHTML @topic.fancyTitle~}}
- {{~#if @topic.details.can_edit~}}
- <span class="edit-topic__wrapper">
- {{dIcon "pencil" class="edit-topic"}}
- </span>
- {{~/if}}
- </a>
- </h1>
- <TopicCategory @topic={{@topic}} class="topic-category" />
- {{/if}}
- <PluginOutlet
- @name="topic-title"
- @connectorTagName="div"
- @outletArgs={{lazyHash model=@topic}}
- />
- </div>
-</template>
+ @action
+ handleIntersectionChange(event) {
+ this.header.mainTopicTitleVisible =
+ event.isIntersecting || event.boundingClientRect.top > 0;
+ }
+
+ @action
+ handleTitleDestroy() {
+ this.header.mainTopicTitleVisible = false;
+ }
+
+ <template>
+ <div
+ class="nested-view__header"
+ {{dObserveIntersection this.handleIntersectionChange}}
+ {{willDestroy this.handleTitleDestroy}}
+ >
+ {{#if @editingTopic}}
+ <div class="edit-topic-title">
+ <TopicTitleEditor
+ @bufferedTitle={{@buffered.title}}
+ @model={{@topic}}
+ @buffered={{@buffered}}
+ />
+
+ <TopicMetadata
+ @buffered={{@buffered}}
+ @model={{@topic}}
+ @showCategoryChooser={{@showCategoryChooser}}
+ @canEditTags={{@canEditTags}}
+ @minimumRequiredTags={{@minimumRequiredTags}}
+ @onSave={{@finishedEditingTopic}}
+ @onCancel={{@cancelEditingTopic}}
+ @topicCategoryChanged={{@topicCategoryChanged}}
+ @topicTagsChanged={{@topicTagsChanged}}
+ />
+ </div>
+ {{else}}
+ <h1 class="nested-view__title">
+ <TopicStatus @topic={{@topic}} />
+ <a
+ href={{@topic.url}}
+ {{on "click" @startEditingTopic}}
+ class="fancy-title"
+ >
+ {{trustHTML @topic.fancyTitle~}}
+ {{~#if @topic.details.can_edit~}}
+ <span class="edit-topic__wrapper">
+ {{dIcon "pencil" class="edit-topic"}}
+ </span>
+ {{~/if}}
+ </a>
+ </h1>
+ <TopicCategory @topic={{@topic}} class="topic-category" />
+ {{/if}}
+ <PluginOutlet
+ @name="topic-title"
+ @connectorTagName="div"
+ @outletArgs={{lazyHash model=@topic}}
+ />
+ </div>
+ </template>
+}
diff --git a/frontend/discourse/app/routes/nested.js b/frontend/discourse/app/routes/nested.js
index 35ee492425f..894a1ec5c48 100644
--- a/frontend/discourse/app/routes/nested.js
+++ b/frontend/discourse/app/routes/nested.js
@@ -11,6 +11,7 @@ import processNode from "../lib/process-node";
export default class NestedRoute extends Route {
@service composer;
+ @service header;
@service nestedViewCache;
@service screenTrack;
@service site;
@@ -99,6 +100,8 @@ export default class NestedRoute extends Route {
// topic.details.updateNotifications() can construct the correct URL.
model.topic.details.set("topic", model.topic);
+ this.header.enterTopic(model.topic, !model.contextMode);
+
// Store the OP in the postStream so core components that call
// postStream.findLoadedPost() (e.g. share modal's "reply as new topic")
// find a valid post instead of undefined.
@@ -133,6 +136,7 @@ export default class NestedRoute extends Route {
controller.unsubscribe();
this.screenTrack.stop();
+ this.header.clearTopic();
}
_saveToCache(controller) {
diff --git a/spec/system/nested_view_spec.rb b/spec/system/nested_view_spec.rb
index eed57f69b84..71572f5b81b 100644
--- a/spec/system/nested_view_spec.rb
+++ b/spec/system/nested_view_spec.rb
@@ -97,6 +97,22 @@ RSpec.describe "Nested view" do
end
end
+ describe "topic header" do
+ fab!(:scrollable_replies) do
+ Fabricate.times(8, :post, topic: topic, user: user, raw: "Scrollable nested reply\n\n" * 30)
+ end
+
+ it "shows the topic title after scrolling past it" do
+ nested_view.visit_nested(topic)
+
+ expect(nested_view).to have_no_topic_title_in_site_header(topic)
+
+ nested_view.scroll_past_topic_title
+
+ expect(nested_view).to have_topic_title_in_site_header(topic)
+ end
+ end
+
describe "post editing" do
fab!(:root_reply) { Fabricate(:post, topic: topic, user: user, raw: "My editable reply") }
diff --git a/spec/system/page_objects/pages/nested_view.rb b/spec/system/page_objects/pages/nested_view.rb
index 0b4004f3387..d810f936099 100644
--- a/spec/system/page_objects/pages/nested_view.rb
+++ b/spec/system/page_objects/pages/nested_view.rb
@@ -209,6 +209,20 @@ module PageObjects
has_no_css?(".edit-topic-title")
end
+ def has_topic_title_in_site_header?(topic)
+ has_css?(
+ "header.d-header .header-title .topic-link[data-topic-id='#{topic.id}']",
+ text: topic.title,
+ )
+ end
+
+ def has_no_topic_title_in_site_header?(topic)
+ has_no_css?(
+ "header.d-header .header-title .topic-link[data-topic-id='#{topic.id}']",
+ text: topic.title,
+ )
+ end
+
def has_topic_map?
has_css?(".nested-view__topic-map .topic-map__contents")
end
@@ -298,6 +312,13 @@ module PageObjects
self
end
+ def scroll_past_topic_title
+ page.execute_script(<<~JS)
+ window.scrollTo(0, document.body.scrollHeight);
+ JS
+ self
+ end
+
def click_reply_on_op
find(".nested-view__op .post-action-menu__reply").click
self