A platform for community discussion. Free, open, simple.
FEATURE: New mobile nested view experience for expanding replies (#40306)
Mark VanLandinghama6b17e0a76a6
diff --git a/app/assets/stylesheets/common/nested-view.scss b/app/assets/stylesheets/common/nested-view.scssindex 145be0a560b..3d1ce073b28 100644--- a/app/assets/stylesheets/common/nested-view.scss+++ b/app/assets/stylesheets/common/nested-view.scss@@ -637,6 +637,10 @@color: var(--primary-low-mid);}+ &__collapsed-username {+ color: var(--primary-high-or-secondary-low);+ }+&__collapsed-reply-count {color: var(--tertiary);}@@ -909,6 +913,12 @@border-radius: 0;}+ .nested-view.-mobile-focused {+ .nested-view__header {+ margin-bottom: 0;+ }+ }+.nested-view__title {font-size: var(--font-up-3);}@@ -959,10 +969,125 @@}// Grey gap between root-level thread cards (and after OP)- .nested-view__roots {+ .nested-view__roots,+ .nested-view__mobile-focus {gap: 0.5em;}+ .nested-view__mobile-focus {+ display: flex;+ flex-direction: column;+ gap: 0;+ }++ .nested-view__mobile-ancestors {+ display: flex;+ flex-direction: column;+ background: var(--secondary);+ border-bottom: 1px solid var(--primary-low);+ }++ .nested-view__mobile-focus-back,+ .nested-view__mobile-ancestor {+ display: flex;+ align-items: center;+ gap: 0.5em;+ width: 100%;+ min-width: 0;+ min-height: calc(var(--nested-avatar-size) + 1em);+ padding: 0.5em;+ color: var(--primary-medium);+ background: var(--secondary);+ border: 0;+ text-align: left;+ cursor: pointer;++ .d-icon {+ flex: 0 0 auto;+ width: 0.75em;+ color: var(--primary-medium);+ }++ .topic-avatar {+ flex: 0 0 auto;+ border-top: 0;+ padding: 0;+ }++ &:focus-visible {+ outline: 2px solid var(--tertiary);+ outline-offset: -2px;+ }+ }++ .nested-view__mobile-ancestor {+ border-top: 1px solid var(--primary-low);+ font-size: var(--font-down-1);+ min-height: calc(var(--nested-avatar-size) + 0.75em);+ padding-block: 0.375em;+ }++ .nested-view__mobile-ancestor-meta {+ display: flex;+ align-items: baseline;+ gap: 0.5em;+ min-width: 0;+ }++ .nested-view__mobile-ancestor-username {+ flex: 0 0 auto;+ color: var(--primary-high-or-secondary-low);+ font-weight: bold;+ }++ .nested-view__mobile-ancestor-excerpt {+ min-width: 0;+ overflow: hidden;+ color: var(--primary-medium);+ text-overflow: ellipsis;+ white-space: nowrap;+ }++ .nested-view__mobile-focused-branch {+ display: flex;+ flex-direction: column;+ margin-left: -0.5em;+ margin-right: -0.5em;+ margin-top: 0.5em;+ }++ @media (prefers-reduced-motion: no-preference) {+ .nested-view__mobile-focus {+ overflow-x: clip;++ &.--forward {+ .nested-view__mobile-focused-branch {+ animation: nested-mobile-slide-forward 180ms ease-out both;+ }++ .nested-view__mobile-ancestors,+ .nested-view__mobile-focus-back {+ animation: nested-mobile-fade-in 160ms ease-out both;+ }+ }++ &.--back {+ .nested-view__mobile-focused-branch {+ animation: nested-mobile-slide-back 180ms ease-out both;+ }++ .nested-view__mobile-ancestors,+ .nested-view__mobile-focus-back {+ animation: nested-mobile-fade-in 140ms ease-out both;+ }+ }+ }++ .nested-post-children {+ animation: nested-mobile-replies-in 160ms ease-out both;+ }+ }+.nested-view__floating-actions {bottom: 1em;}@@ -980,14 +1105,18 @@// Gutter shrinks to a narrow line-only column (avatar rendered inline// in the header instead). Lines run full subtree height..nested-post {- --nested-line-gutter: 10px;+ --nested-line-gutter: 14px;+ --nested-column-gap: var(--space-2);+ --nested-mobile-content-indent: calc(+ var(--nested-avatar-size) + var(--nested-column-gap)+ );grid-template-columns: var(--nested-line-gutter) 1fr;// Explicit rows are required so grid-row: 1 / -1 on the gutter// can resolve -1 to the end of the explicit grid (line 3).// Without this, -1 falls back to line 1 and the gutter only spans row 1.grid-template-rows: auto 1fr;- column-gap: var(--space-1);+ column-gap: var(--nested-column-gap);// Tighter vertical spacing between siblings--nested-vertical-gap: 0.25em;@@ -1057,19 +1186,73 @@// Compact post headers.nested-post__header {flex-wrap: wrap;- gap: 0.25em;+ gap: var(--space-2);.topic-meta-data {margin-left: 0;}}+ .nested-post__content,+ .nested-post__menu,+ .nested-post__controls,+ .nested-post__expand-replies,+ .post-links-container {+ margin-left: var(--nested-mobile-content-indent);+ }+.nested-post__content {overflow-x: auto;}}}+@keyframes nested-mobile-slide-forward {+ from {+ opacity: 0;+ transform: translateX(18px);+ }++ to {+ opacity: 1;+ transform: translateX(0);+ }+}++@keyframes nested-mobile-slide-back {+ from {+ opacity: 0;+ transform: translateX(-18px);+ }++ to {+ opacity: 1;+ transform: translateX(0);+ }+}++@keyframes nested-mobile-replies-in {+ from {+ opacity: 0;+ transform: translateY(-6px);+ }++ to {+ opacity: 1;+ transform: translateY(0);+ }+}++@keyframes nested-mobile-fade-in {+ from {+ opacity: 0;+ }++ to {+ opacity: 1;+ }+}+html.footer-nav-visible {.nested-view__floating-actions {bottom: calc(var(--footer-nav-height) + env(safe-area-inset-bottom) + 1em);diff --git a/config/locales/client.en.yml b/config/locales/client.en.ymlindex 679c1756d01..947ebf785dc 100644--- a/config/locales/client.en.yml+++ b/config/locales/client.en.yml@@ -4005,6 +4005,9 @@ en:other: "%{count} replies"collapse: "Collapse"collapse_parent: "Collapse parent thread"+ focused_path: "Focused reply path"+ return_to_branch: "Return to %{username}'s branch"+ all_replies: "All replies"category_settings:default_nested_view: "Use nested view as default for topics in this category"no_replies: "No replies yet."diff --git a/frontend/discourse/app/components/nested.gjs b/frontend/discourse/app/components/nested.gjsindex f0472fc999e..77d5cd8986d 100644--- a/frontend/discourse/app/components/nested.gjs+++ b/frontend/discourse/app/components/nested.gjs@@ -1,18 +1,22 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";+import { helper } from "@ember/component/helper";import { fn } from "@ember/helper";+import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import MoreTopics from "discourse/components/more-topics";import PluginOutlet from "discourse/components/plugin-outlet";+import PostAvatar from "discourse/components/post/avatar";import TopicMap from "discourse/components/topic-map";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";import PostStreamViewportTracker from "discourse/modifiers/post-stream-viewport-tracker";-import { gt, includes } from "discourse/truth-helpers";+import { and, gt, includes, not } from "discourse/truth-helpers";import DButton from "discourse/ui-kit/d-button";import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import DLoadMore from "discourse/ui-kit/d-load-more";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import NestedFloatingActions from "./nested/floating-actions";import NestedHeader from "./nested/header";@@ -20,19 +24,35 @@ import NestedOp from "./nested/op";import NestedPost from "./nested/post";import NestedSortSelector from "./nested/sort-selector";+const postExcerpt = helper(([post]) => {+ const element = document.createElement("div");+ element.innerHTML = post.cooked ?? "";++ return element.textContent?.replace(/\s+/g, " ").trim();+});+export default class Nested extends Component {@service appEvents;@service currentUser;@service header;@service screenTrack;+ @service site;@tracked cloakAbove = 0;@tracked cloakBelow = 0;+ @tracked focusDirection = "forward";+ @tracked focusedPath = [];+ @tracked mobileReturnAnchor = null;viewportTracker = new PostStreamViewportTracker();constructor() {super(...arguments);this.appEvents.on("keyboard:move-selection", this, this.maybeLoadMoreRoots);+ this.appEvents.on(+ "nested-replies:scroll-restored",+ this,+ this.clearMobileReturnAnchor+ );}willDestroy() {@@ -42,6 +62,11 @@ export default class Nested extends Component {this,this.maybeLoadMoreRoots);+ this.appEvents.off(+ "nested-replies:scroll-restored",+ this,+ this.clearMobileReturnAnchor+ );this.viewportTracker.destroy();}@@ -59,15 +84,100 @@ export default class Nested extends Component {return getURL(`/t/${this.args.topic.slug}/${this.args.topic.id}?flat=1`);}+ get emptyPath() {+ return [];+ }++ get isMobileFocused() {+ return this.site.mobileView && this.focusedPath.length > 0;+ }++ get viewClass() {+ return this.isMobileFocused ? "nested-view -mobile-focused" : "nested-view";+ }++ get mobileFocusClass() {+ return `nested-view__mobile-focus --${this.focusDirection}`;+ }++ get rootScrollAnchor() {+ return this.mobileReturnAnchor || this.args.scrollAnchor;+ }++ get focusedNode() {+ return this.focusedPath.at(-1);+ }++ get focusedNodes() {+ return this.focusedNode ? [this.focusedNode] : [];+ }++ get ancestorPath() {+ return this.focusedPath.slice(0, -1);+ }+@actionsetCloakingBoundaries(above, below) {this.cloakAbove = above;this.cloakBelow = below;}+ @action+ focusPath(path) {+ if (!this.site.mobileView) {+ return;+ }++ if (!this.isMobileFocused) {+ this.mobileReturnAnchor = this.scrollAnchorForPath(path);+ }++ this.focusDirection =+ path.length >= this.focusedPath.length ? "forward" : "back";+ this.focusedPath = path;+ }++ @action+ returnToAncestor(index) {+ this.focusPath(this.focusedPath.slice(0, index + 1));+ }++ @action+ clearFocus() {+ this.focusDirection = "back";+ this.mobileReturnAnchor ??= this.scrollAnchorForPath(this.focusedPath);+ this.focusedPath = [];+ }++ @action+ clearMobileReturnAnchor() {+ this.mobileReturnAnchor = null;+ }++ scrollAnchorForPath(path) {+ const rootNode = path?.[0];+ const postNumber = rootNode?.post?.post_number;+ if (!postNumber) {+ return null;+ }++ const postElement = document.querySelector(+ `.nested-view [data-post-number="${postNumber}"]`+ );+ const element = postElement?.closest(".nested-post") || postElement;+ if (!element) {+ return { postNumber, offsetFromTop: this.header.headerOffset };+ }++ return {+ postNumber,+ offsetFromTop: element.getBoundingClientRect().top,+ };+ }+<template><div- class="nested-view"+ class={{this.viewClass}}{{this.viewportTracker.setupeyeline=falseheaderOffset=this.header.headerOffset@@ -96,121 +206,207 @@ export default class Nested extends Component {@outletArgs={{lazyHash model=@topic}}/>- <NestedOp- @post={{@opPost}}- @topic={{@topic}}- @editPost={{@editPost}}- @showHistory={{@showHistory}}- @replyToPost={{@replyToPost}}- @changeNotice={{@changeNotice}}- @changePostOwner={{@changePostOwner}}- @grantBadge={{@grantBadge}}- @lockPost={{@lockPost}}- @unlockPost={{@unlockPost}}- @permanentlyDeletePost={{@permanentlyDeletePost}}- @rebakePost={{@rebakePost}}- @showPagePublish={{@showPagePublish}}- @togglePostType={{@togglePostType}}- @toggleWiki={{@toggleWiki}}- @unhidePost={{@unhidePost}}- @showPostMenu={{true}}- @registerPost={{this.viewportTracker.registerPost}}- />-- <div class="nested-view__topic-map topic-map">- <TopicMap- @model={{@topic}}- @topicDetails={{@topic.details}}- @showPMMap={{@topic.isPrivateMessage}}- />- </div>+ {{#if this.isMobileFocused}}+ <div class={{this.mobileFocusClass}}>+ <button+ type="button"+ class="nested-view__mobile-focus-back"+ {{on "click" this.clearFocus}}+ >+ {{dIcon "chevron-left"}}+ <span>{{i18n "nested_replies.all_replies"}}</span>+ </button>- <div class="nested-view__controls">- <NestedSortSelector @current={{@sort}} @onChange={{@changeSort}} />- <div class="nested-view__controls-right">- {{#if @topic.has_activity_log}}- <DButton- class="btn-flat nested-view__activity-link"- @action={{@showActivityLog}}- @label="nested_replies.activity_log.link"- />- {{/if}}- {{#if this.currentUser.can_toggle_nested_mode}}- <DButton- class="btn-flat nested-view__flat-link"- @href={{this.flatViewUrl}}- @label="nested_replies.view_as_flat"- />+ {{#if this.ancestorPath.length}}+ <nav+ class="nested-view__mobile-ancestors"+ aria-label={{i18n "nested_replies.focused_path"}}+ >+ {{#each this.ancestorPath as |ancestorNode index|}}+ <button+ type="button"+ class="nested-view__mobile-ancestor"+ data-test-nested-mobile-ancestor={{ancestorNode.post.post_number}}+ aria-label={{i18n+ "nested_replies.return_to_branch"+ username=ancestorNode.post.username+ }}+ {{on "click" (fn this.returnToAncestor index)}}+ >+ {{dIcon "chevron-left"}}+ <PostAvatar @post={{ancestorNode.post}} @size="small" />+ <span class="nested-view__mobile-ancestor-meta">+ <span+ class="nested-view__mobile-ancestor-username"+ >{{ancestorNode.post.username}}</span>+ <span class="nested-view__mobile-ancestor-excerpt">+ {{postExcerpt ancestorNode.post}}+ </span>+ </span>+ </button>+ {{/each}}+ </nav>{{/if}}++ {{#each this.focusedNodes key="post.id" as |focusedNode|}}+ <div class="nested-view__mobile-focused-branch">+ <NestedPost+ @post={{focusedNode.post}}+ @children={{focusedNode.children}}+ @topic={{@topic}}+ @depth={{0}}+ @path={{this.ancestorPath}}+ @sort={{@sort}}+ @replyToPost={{@replyToPost}}+ @editPost={{@editPost}}+ @deletePost={{@deletePost}}+ @recoverPost={{@recoverPost}}+ @showFlags={{@showFlags}}+ @showHistory={{@showHistory}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}+ @expansionState={{@expansionState}}+ @fetchedChildrenCache={{@fetchedChildrenCache}}+ @scrollAnchor={{@scrollAnchor}}+ @registerPost={{this.viewportTracker.registerPost}}+ @getCloakingData={{this.viewportTracker.getCloakingData}}+ @cloakAbove={{this.cloakAbove}}+ @cloakBelow={{this.cloakBelow}}+ @collapseFromDepth={{if @collapseReplies 0}}+ @focusPost={{this.focusPath}}+ @forceExpanded={{true}}+ />+ </div>+ {{/each}}</div>- </div>-- {{#if (gt @newRootPostCount 0)}}- <div class="nested-view__new-replies">- <DButton- class="btn-primary nested-view__new-replies-btn"- @action={{@loadNewRoots}}- @translatedLabel={{i18n- "nested_replies.new_replies"- count=@newRootPostCount- }}+ {{else}}+ <NestedOp+ @post={{@opPost}}+ @topic={{@topic}}+ @editPost={{@editPost}}+ @showHistory={{@showHistory}}+ @replyToPost={{@replyToPost}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}+ @showPostMenu={{true}}+ @registerPost={{this.viewportTracker.registerPost}}+ />++ <div class="nested-view__topic-map topic-map">+ <TopicMap+ @model={{@topic}}+ @topicDetails={{@topic.details}}+ @showPMMap={{@topic.isPrivateMessage}}/></div>- {{/if}}- <div class="nested-view__roots">- {{#each @rootNodes key="post.id" as |node index|}}- <NestedPost- @post={{node.post}}- @children={{node.children}}- @topic={{@topic}}- @depth={{0}}- @sort={{@sort}}- @isPinned={{includes @pinnedPostIds node.post.id}}- @replyToPost={{@replyToPost}}- @editPost={{@editPost}}- @deletePost={{@deletePost}}- @recoverPost={{@recoverPost}}- @showFlags={{@showFlags}}- @showHistory={{@showHistory}}- @changeNotice={{@changeNotice}}- @changePostOwner={{@changePostOwner}}- @grantBadge={{@grantBadge}}- @lockPost={{@lockPost}}- @unlockPost={{@unlockPost}}- @permanentlyDeletePost={{@permanentlyDeletePost}}- @rebakePost={{@rebakePost}}- @showPagePublish={{@showPagePublish}}- @togglePostType={{@togglePostType}}- @toggleWiki={{@toggleWiki}}- @unhidePost={{@unhidePost}}- @expansionState={{@expansionState}}- @fetchedChildrenCache={{@fetchedChildrenCache}}- @scrollAnchor={{@scrollAnchor}}- @registerPost={{this.viewportTracker.registerPost}}- @getCloakingData={{this.viewportTracker.getCloakingData}}- @cloakAbove={{this.cloakAbove}}- @cloakBelow={{this.cloakBelow}}- @collapseFromDepth={{if @collapseReplies 0}}- />- <PluginOutlet- @name="nested-roots-between"- @outletArgs={{lazyHash topic=@topic index=index}}- />- {{else}}- <div class="nested-view__empty">- {{i18n "nested_replies.no_replies"}}+ <div class="nested-view__controls">+ <NestedSortSelector @current={{@sort}} @onChange={{@changeSort}} />+ <div class="nested-view__controls-right">+ {{#if @topic.has_activity_log}}+ <DButton+ class="btn-flat nested-view__activity-link"+ @action={{@showActivityLog}}+ @label="nested_replies.activity_log.link"+ />+ {{/if}}+ {{#if this.currentUser.can_toggle_nested_mode}}+ <DButton+ class="btn-flat nested-view__flat-link"+ @href={{this.flatViewUrl}}+ @label="nested_replies.view_as_flat"+ />+ {{/if}}+ </div>+ </div>++ {{#if (gt @newRootPostCount 0)}}+ <div class="nested-view__new-replies">+ <DButton+ class="btn-primary nested-view__new-replies-btn"+ @action={{@loadNewRoots}}+ @translatedLabel={{i18n+ "nested_replies.new_replies"+ count=@newRootPostCount+ }}+ /></div>- {{/each}}- </div>+ {{/if}}- <DConditionalLoadingSpinner @condition={{@loadingMore}} />+ <div class="nested-view__roots">+ {{#each @rootNodes key="post.id" as |node index|}}+ <NestedPost+ @post={{node.post}}+ @children={{node.children}}+ @topic={{@topic}}+ @depth={{0}}+ @path={{this.emptyPath}}+ @sort={{@sort}}+ @isPinned={{includes @pinnedPostIds node.post.id}}+ @replyToPost={{@replyToPost}}+ @editPost={{@editPost}}+ @deletePost={{@deletePost}}+ @recoverPost={{@recoverPost}}+ @showFlags={{@showFlags}}+ @showHistory={{@showHistory}}+ @changeNotice={{@changeNotice}}+ @changePostOwner={{@changePostOwner}}+ @grantBadge={{@grantBadge}}+ @lockPost={{@lockPost}}+ @unlockPost={{@unlockPost}}+ @permanentlyDeletePost={{@permanentlyDeletePost}}+ @rebakePost={{@rebakePost}}+ @showPagePublish={{@showPagePublish}}+ @togglePostType={{@togglePostType}}+ @toggleWiki={{@toggleWiki}}+ @unhidePost={{@unhidePost}}+ @expansionState={{@expansionState}}+ @fetchedChildrenCache={{@fetchedChildrenCache}}+ @scrollAnchor={{this.rootScrollAnchor}}+ @registerPost={{this.viewportTracker.registerPost}}+ @getCloakingData={{this.viewportTracker.getCloakingData}}+ @cloakAbove={{this.cloakAbove}}+ @cloakBelow={{this.cloakBelow}}+ @collapseFromDepth={{if @collapseReplies 0}}+ @focusPost={{this.focusPath}}+ />+ <PluginOutlet+ @name="nested-roots-between"+ @outletArgs={{lazyHash topic=@topic index=index}}+ />+ {{else}}+ <div class="nested-view__empty">+ {{i18n "nested_replies.no_replies"}}+ </div>+ {{/each}}+ </div>- <DLoadMore- @action={{@loadMoreRoots}}- @enabled={{@hasMoreRoots}}- @isLoading={{@loadingMore}}- />+ <DConditionalLoadingSpinner @condition={{@loadingMore}} />++ <DLoadMore+ @action={{@loadMoreRoots}}+ @enabled={{@hasMoreRoots}}+ @isLoading={{@loadingMore}}+ />+ {{/if}}<PluginOutlet@name="topic-above-footer-buttons"@@ -224,7 +420,7 @@ export default class Nested extends Component {@outletArgs={{lazyHash model=@topic}}/>- {{#unless @hasMoreRoots}}+ {{#if (and (not this.isMobileFocused) (not @hasMoreRoots))}}<PluginOutlet@name="topic-above-suggested"@connectorTagName="div"@@ -238,7 +434,7 @@ export default class Nested extends Component {@connectorTagName="div"@outletArgs={{lazyHash model=@topic}}/>- {{/unless}}+ {{/if}}<PluginOutlet@name="topic-navigation-bottom"diff --git a/frontend/discourse/app/components/nested/post-children.gjs b/frontend/discourse/app/components/nested/post-children.gjsindex 133e9812d7f..f0496148997 100644--- a/frontend/discourse/app/components/nested/post-children.gjs+++ b/frontend/discourse/app/components/nested/post-children.gjs@@ -73,11 +73,11 @@ export default class NestedPostChildren extends Component {this._reportToCache();}- _reportToCache() {- if (!this.loaded || !this.args.fetchedChildrenCache) {+ _reportToCache(parentPostNumber = this.args.parentPostNumber) {+ if (!this.loaded || !parentPostNumber || !this.args.fetchedChildrenCache) {return;}- this.args.fetchedChildrenCache.set(this.args.parentPostNumber, {+ this.args.fetchedChildrenCache.set(parentPostNumber, {childNodes: this.childNodes,page: this.page,hasMore: this.hasMore,@@ -216,6 +216,7 @@ export default class NestedPostChildren extends Component {@children={{node.children}}@topic={{@topic}}@depth={{this.childDepth}}+ @path={{@path}}@sort={{@sort}}@replyToPost={{@replyToPost}}@editPost={{@editPost}}@@ -243,6 +244,7 @@ export default class NestedPostChildren extends Component {@scrollAnchor={{@scrollAnchor}}@registerPost={{@registerPost}}@collapseFromDepth={{@collapseFromDepth}}+ @focusPost={{@focusPost}}/>{{/each}}diff --git a/frontend/discourse/app/components/nested/post.gjs b/frontend/discourse/app/components/nested/post.gjsindex 77ff7a2b505..9102c103e19 100644--- a/frontend/discourse/app/components/nested/post.gjs+++ b/frontend/discourse/app/components/nested/post.gjs@@ -198,7 +198,26 @@ export default class NestedPost extends Component {}get showExpandRepliesButton() {- return this.hasReplies && !this.expanded && !this.atMaxDepth;+ return this.hasReplies && !this.effectiveExpanded && !this.atMaxDepth;+ }++ get childPath() {+ return [+ ...(this.args.path || []),+ { post: this.args.post, children: this.args.children || [] },+ ];+ }++ get mobileFocusEnabled() {+ return this.site.mobileView && this.args.focusPost;+ }++ get effectiveExpanded() {+ return this.args.forceExpanded || this.expanded;+ }++ get effectiveCollapsed() {+ return !this.args.forceExpanded && this.collapsed;}get isOP() {@@ -233,6 +252,16 @@ export default class NestedPost extends Component {});}+ @action+ handleReplies() {+ if (this.mobileFocusEnabled) {+ this.args.focusPost(this.childPath);+ return;+ }++ this.toggleExpanded();+ }+@actiontoggleDeletedContent() {this.showDeletedContent = !this.showDeletedContent;@@ -339,7 +368,7 @@ export default class NestedPost extends Component {"nested-post"this.depthClass(if @parentLineHighlighted "--parent-line-highlighted")- (if this.collapsed "nested-post--collapsed")+ (if this.effectiveCollapsed "nested-post--collapsed")(if @isPinned "nested-post--pinned")(if @post.isWhisper "nested-post--whisper")(if (or @post.deleted @post.user_deleted) "nested-post--deleted")@@ -387,7 +416,7 @@ export default class NestedPost extends Component {<PostAvatar @post={{@post}} @size="small" />{{/if}}{{/unless}}- {{#if (and this.showDepthLine (not this.collapsed))}}+ {{#if (and this.showDepthLine (not this.effectiveCollapsed))}}<buttontype="button"class={{dConcatClass@@ -413,7 +442,7 @@ export default class NestedPost extends Component {{{/if}}</div><div class="nested-post__main">- {{#if this.collapsed}}+ {{#if this.effectiveCollapsed}}<buttontype="button"class="nested-post__collapsed-bar"@@ -570,16 +599,20 @@ export default class NestedPost extends Component {@toggleLike={{this.toggleLike}}@toggleReplies={{unlessthis.atMaxDepth- this.toggleExpanded+ this.handleReplies+ }}+ @repliesShown={{if+ this.atMaxDepth+ true+ this.effectiveExpanded}}- @repliesShown={{if this.atMaxDepth true this.expanded}}@showLogin={{this.showLogin}}/></section>{{#if this.showExpandRepliesButton}}<NestedRepliesExpandButton@replyCount={{this.replyCount}}- @onClick={{this.toggleExpanded}}+ @onClick={{this.handleReplies}}/>{{/if}}<PluginOutlet@@ -604,7 +637,13 @@ export default class NestedPost extends Component {{{/let}}{{/if}}- {{#if (and this.expanded (not this.collapsed) (not this.atMaxDepth))}}+ {{#if+ (and+ this.effectiveExpanded+ (not this.effectiveCollapsed)+ (not this.atMaxDepth)+ )+ }}<NestedPostChildren@topic={{@topic}}@parentPostNumber={{@post.post_number}}@@ -612,6 +651,7 @@ export default class NestedPost extends Component {@directReplyCount={{@post.direct_reply_count}}@totalDescendantCount={{@post.total_descendant_count}}@depth={{@depth}}+ @path={{this.childPath}}@sort={{@sort}}@replyToPost={{@replyToPost}}@editPost={{@editPost}}@@ -639,6 +679,7 @@ export default class NestedPost extends Component {@scrollAnchor={{@scrollAnchor}}@registerPost={{@registerPost}}@collapseFromDepth={{@collapseFromDepth}}+ @focusPost={{@focusPost}}/>{{/if}}</div>diff --git a/spec/system/nested_view_spec.rb b/spec/system/nested_view_spec.rbindex 3733c63804f..c8af630cd65 100644--- a/spec/system/nested_view_spec.rb+++ b/spec/system/nested_view_spec.rb@@ -208,6 +208,64 @@ RSpec.describe "Nested view" doendend+ describe "mobile focused branch navigation" do+ fab!(:root_reply) do+ Fabricate(:post, topic: topic, user: Fabricate(:user), raw: "Post with children")+ end++ fab!(:sibling_root_reply) do+ Fabricate(:post, topic: topic, user: Fabricate(:user), raw: "Sibling root reply")+ end++ fab!(:child_reply) do+ Fabricate(+ :post,+ topic: topic,+ user: Fabricate(:user),+ raw: "A child post",+ reply_to_post_number: root_reply.post_number,+ )+ end++ fab!(:grandchild_reply) do+ Fabricate(+ :post,+ topic: topic,+ user: Fabricate(:user),+ raw: "A grandchild post",+ reply_to_post_number: child_reply.post_number,+ )+ end++ it "lets the user drill into reply branches without leaving the topic", mobile: true do+ nested_view.visit_nested(topic, query: "collapse_replies=true")+ nested_path = %r{/n/#{topic.slug}/#{topic.id}\?collapse_replies=true}++ nested_view.scroll_post_near_top(root_reply)+ root_reply_top = nested_view.post_viewport_top(root_reply)++ nested_view.click_replies_toggle(root_reply)++ expect(page).to have_current_path(nested_path)+ expect(nested_view).to have_mobile_focus+ expect(nested_view).to have_post(child_reply)+ expect(nested_view).to have_no_root_post(sibling_root_reply)++ nested_view.click_replies_toggle(child_reply)++ expect(page).to have_current_path(nested_path)+ expect(nested_view).to have_mobile_ancestor(root_reply)+ expect(nested_view).to have_post(grandchild_reply)++ nested_view.click_mobile_focus_back++ expect(page).to have_current_path(nested_path)+ expect(nested_view).to have_no_mobile_focus+ expect(nested_view).to have_root_post(sibling_root_reply)+ expect(nested_view.post_viewport_top(root_reply)).to be_within(5).of(root_reply_top)+ end+ end+describe "flat view toggle" dofab!(:root_reply) { Fabricate(:post, topic: topic, user: Fabricate(:user), raw: "A reply") }fab!(:admin)diff --git a/spec/system/page_objects/pages/nested_view.rb b/spec/system/page_objects/pages/nested_view.rbindex d5fd345a6d1..c80976ebd43 100644--- a/spec/system/page_objects/pages/nested_view.rb+++ b/spec/system/page_objects/pages/nested_view.rb@@ -3,8 +3,10 @@module PageObjectsmodule Pagesclass NestedView < PageObjects::Pages::Base- def visit_nested(topic)- page.visit("/n/#{topic.slug}/#{topic.id}")+ def visit_nested(topic, query: nil)+ url = "/n/#{topic.slug}/#{topic.id}"+ url += "?#{query}" if query+ page.visit(url)selfend@@ -126,6 +128,35 @@ module PageObjectshas_no_css?("[data-post-number='#{post.post_number}'] .post-action-menu__show-replies")end+ def has_mobile_focus?+ has_css?(".nested-view__mobile-focus")+ end++ def has_no_mobile_focus?+ has_no_css?(".nested-view__mobile-focus")+ end++ def has_mobile_ancestor?(post)+ has_css?(+ "[data-test-nested-mobile-ancestor='#{post.post_number}']",+ text: post.user.username,+ )+ end++ def has_no_mobile_ancestor?(post)+ has_no_css?("[data-test-nested-mobile-ancestor='#{post.post_number}']")+ end++ def post_viewport_top(post)+ page.evaluate_script(<<~JS)+ document+ .querySelector("[data-post-number='#{post.post_number}']")+ .closest(".nested-post")+ .getBoundingClientRect()+ .top+ JS+ end+def has_depth_line_for?(post)has_css?(wrapper_selector(post, ".nested-post__gutter .nested-post__depth-line"))end@@ -272,6 +303,20 @@ module PageObjectsselfend+ def click_replies_toggle(post)+ find("[data-post-number='#{post.post_number}'] .nested-post__expand-replies").click+ self+ end++ def scroll_post_near_top(post, offset: 80)+ page.execute_script(<<~JS)+ const post = document.querySelector("[data-post-number='#{post.post_number}']");+ post.scrollIntoView();+ window.scrollBy(0, -#{offset});+ JS+ self+ end+def click_reply_on_opfind(".nested-view__op .post-action-menu__reply").clickself@@ -292,6 +337,16 @@ module PageObjectsselfend+ def click_mobile_ancestor(post)+ find("[data-test-nested-mobile-ancestor='#{post.post_number}']").click+ self+ end++ def click_mobile_focus_back+ find(".nested-view__mobile-focus-back").click+ self+ end+def click_view_full_threadfind(".nested-context-view__full-thread").clickself