Skip to content

Commit 8131b47

Browse files
refactor(core): further improve improve extensibility of PostStreamScrubber
1 parent 22d5e4c commit 8131b47

File tree

1 file changed

+31
-16
lines changed

1 file changed

+31
-16
lines changed

framework/core/js/src/forum/components/PostStreamScrubber.js

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default class PostStreamScrubber extends Component {
6969
);
7070
}
7171

72-
scrubberItems(viewing, unreadCount, _unreadPercent, styleUnread) {
72+
scrubberItems(viewing, unreadCount, unreadPercent, styleUnread) {
7373
const items = new ItemList();
7474

7575
items.add(
@@ -82,21 +82,7 @@ export default class PostStreamScrubber extends Component {
8282

8383
items.add(
8484
'scrollbar',
85-
<div className="Scrubber-scrollbar">
86-
<div className="Scrubber-before" />
87-
<div className="Scrubber-handle">
88-
<div className="Scrubber-bar" />
89-
<div className="Scrubber-info">
90-
<strong>{viewing}</strong>
91-
<span className="Scrubber-description"></span>
92-
</div>
93-
</div>
94-
<div className="Scrubber-after" />
95-
96-
<div className="Scrubber-unread" oncreate={styleUnread} onupdate={styleUnread}>
97-
{app.translator.trans('core.forum.post_scrubber.unread_text', { count: unreadCount })}
98-
</div>
99-
</div>,
85+
<div className="Scrubber-scrollbar">{this.scrollbarItems(viewing, unreadCount, unreadPercent, styleUnread).toArray()}</div>,
10086
90
10187
);
10288

@@ -111,6 +97,35 @@ export default class PostStreamScrubber extends Component {
11197
return items;
11298
}
11399

100+
scrollbarItems(viewing, unreadCount, _unreadPercent, styleUnread) {
101+
const items = new ItemList();
102+
103+
items.add('before', <div className="Scrubber-before" />, 100);
104+
105+
items.add(
106+
'handle',
107+
<div className="Scrubber-handle">
108+
<div className="Scrubber-bar" />
109+
<div className="Scrubber-info">
110+
<strong>{viewing}</strong>
111+
<span className="Scrubber-description"></span>
112+
</div>
113+
</div>,
114+
90
115+
);
116+
117+
items.add('after', <div className="Scrubber-after" />, 80);
118+
119+
items.add(
120+
'unread',
121+
<div className="Scrubber-unread" oncreate={styleUnread} onupdate={styleUnread}>
122+
{app.translator.trans('core.forum.post_scrubber.unread_text', { count: unreadCount })}
123+
</div>,
124+
70
125+
);
126+
127+
return items;
128+
}
114129
onupdate(vnode) {
115130
super.onupdate(vnode);
116131

0 commit comments

Comments
 (0)