From 71c8f2d10f3756a0fbf2589946aa779367050969 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Mon, 10 Feb 2025 15:34:52 +0100 Subject: [PATCH 1/4] feat(core): make it easier to add content after the first post --- .../js/src/forum/components/PostStream.js | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/framework/core/js/src/forum/components/PostStream.js b/framework/core/js/src/forum/components/PostStream.js index 570b45b89f..f9ee5fedc3 100644 --- a/framework/core/js/src/forum/components/PostStream.js +++ b/framework/core/js/src/forum/components/PostStream.js @@ -78,11 +78,22 @@ export default class PostStream extends Component { content = ; } - return ( + const postStreamElement = (
{content}
); + + if (i === 0 && this.afterFirstPostItems().toArray().length > 0) { + return m.fragment({ ...attrs }, [ + postStreamElement, +
+ {this.afterFirstPostItems().toArray()} +
, + ]); + } + + return postStreamElement; }); if (!viewingEnd && posts[this.stream.visibleEnd - this.stream.visibleStart - 1]) { @@ -117,6 +128,15 @@ export default class PostStream extends Component { ); } + /** + * @returns {ItemList} + */ + afterFirstPostItems() { + const items = new ItemList(); + + return items; + } + /** * @returns {ItemList} */ From fb16ae2e48f0dc3718ed11777617831c99c78e36 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Wed, 12 Feb 2025 11:45:47 +0100 Subject: [PATCH 2/4] fix(core): change condition when `afterFirstPostItems` is shown Needs to be back ported to 1.x as well --- framework/core/js/src/forum/components/PostStream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/core/js/src/forum/components/PostStream.js b/framework/core/js/src/forum/components/PostStream.js index f9ee5fedc3..0e3c3e481d 100644 --- a/framework/core/js/src/forum/components/PostStream.js +++ b/framework/core/js/src/forum/components/PostStream.js @@ -84,7 +84,7 @@ export default class PostStream extends Component { ); - if (i === 0 && this.afterFirstPostItems().toArray().length > 0) { + if (post && post.number() === 1 && this.afterFirstPostItems().toArray().length > 0) { return m.fragment({ ...attrs }, [ postStreamElement,
From 6ff7ec55e7af2d455a143bb74b27996296d50d04 Mon Sep 17 00:00:00 2001 From: Davide Iadeluca <146922689+DavideIadeluca@users.noreply.github.com> Date: Fri, 14 Feb 2025 09:07:39 +0100 Subject: [PATCH 3/4] fix(core): change condition when `afterFirstPostItems` is shown Co-authored-by: Sami Mazouz --- framework/core/js/src/forum/components/PostStream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/core/js/src/forum/components/PostStream.js b/framework/core/js/src/forum/components/PostStream.js index 0e3c3e481d..9d192d7d66 100644 --- a/framework/core/js/src/forum/components/PostStream.js +++ b/framework/core/js/src/forum/components/PostStream.js @@ -84,7 +84,7 @@ export default class PostStream extends Component {
); - if (post && post.number() === 1 && this.afterFirstPostItems().toArray().length > 0) { + if (post && post.id() === this.discussion.data.relationships.firstPost?.data.id && this.afterFirstPostItems().toArray().length > 0) { return m.fragment({ ...attrs }, [ postStreamElement,
From e81ac1447ca2433f1c37de765688bfc93e0231ff Mon Sep 17 00:00:00 2001 From: Davide Iadeluca Date: Fri, 14 Feb 2025 09:11:43 +0100 Subject: [PATCH 4/4] chore: dummy commit