mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-08 01:16:52 +02:00
Code Issues Releases Wiki Activity

fix(core): revert extensibility improvements for replyCountItem() (#4051)

Browse Source 
This fixes a breaking change with third-party extensions calling `replyCountItem()` and not expecting it to be an array.
This commit is contained in:
Davide Iadeluca
2024-09-30 16:38:30 +02:00
committed by GitHub
parent b49b3104e4
commit 1fee96aebe
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
framework/core/js/src/forum/components/DiscussionListItem.tsx
View File

@@ -128,7 +128,7 @@ export default class DiscussionListItem<CustomAttrs extends IDiscussionListItemA
items.add('authorAvatar', this.authorAvatarView(), 100); items.add('authorAvatar', this.authorAvatarView(), 100);
items.add('badges', this.badgesView(), 90); items.add('badges', this.badgesView(), 90);
items.add('main', this.mainView(), 80); items.add('main', this.mainView(), 80);
items.add('replyCount', this.replyCountItem().toArray(), 70); items.add('replyCount', this.replyCountItem(), 70);
return items; return items;
} }
@@ -274,38 +274,30 @@ export default class DiscussionListItem<CustomAttrs extends IDiscussionListItemA
return items; return items;
} }
replyCountItem(): ItemList<Mithril.Children> { replyCountItem() {
const items = new ItemList<Mithril.Children>();
const discussion = this.attrs.discussion; const discussion = this.attrs.discussion;
const showUnread = !this.showRepliesCount() && discussion.isUnread(); const showUnread = !this.showRepliesCount() && discussion.isUnread();
if (showUnread) { if (showUnread) {
items.add( return (
'unreadCount',
<button className="Button--ua-reset DiscussionListItem-count" onclick={this.markAsRead.bind(this)}> <button className="Button--ua-reset DiscussionListItem-count" onclick={this.markAsRead.bind(this)}>
<span aria-hidden="true">{abbreviateNumber(discussion.unreadCount())}</span> <span aria-hidden="true">{abbreviateNumber(discussion.unreadCount())}</span>
<span className="visually-hidden"> <span className="visually-hidden">
{app.translator.trans('core.forum.discussion_list.unread_replies_a11y_label', { count: discussion.replyCount() })} {app.translator.trans('core.forum.discussion_list.unread_replies_a11y_label', { count: discussion.replyCount() })}
</span> </span>
</button>, </button>
100
);
} else {
items.add(
'count',
<span className="DiscussionListItem-count">
<span aria-hidden="true">{abbreviateNumber(discussion.replyCount())}</span>
<span className="visually-hidden">
{app.translator.trans('core.forum.discussion_list.total_replies_a11y_label', { count: discussion.replyCount() })}
</span>
</span>,
100
); );
} }
return items; return (
<span className="DiscussionListItem-count">
<span aria-hidden="true">{abbreviateNumber(discussion.replyCount())}</span>
<span className="visually-hidden">
{app.translator.trans('core.forum.discussion_list.total_replies_a11y_label', { count: discussion.replyCount() })}
</span>
</span>
);
} }
} }