Skip to content

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

FIX: Chat message highlighting flakiness (#40640)

Jarek Radosz0a66bc71888e
diff --git a/plugins/chat/assets/javascripts/discourse/lib/scroll-helpers.js b/plugins/chat/assets/javascripts/discourse/lib/scroll-helpers.js
index 0ce49eceb3c..223ca58b182 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/scroll-helpers.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/scroll-helpers.js
@@ -82,24 +82,21 @@ export function scrollListToMessage(
message.expanded = true;
}
- next(() => {
- schedule("afterRender", () => {
- const messageEl = list.querySelector(
- `.chat-message-container[data-id='${message.id}']`
- );
-
- if (!messageEl) {
- return;
- }
-
- if (opts.highlight) {
- message.highlight();
- }
-
- messageEl.scrollIntoView({
- behavior: "auto",
- block: opts.position || "center",
- });
+ if (opts.highlight) {
+ message.highlight();
+ }
+
+ const scroll = () => {
+ const element = list.querySelector(
+ `.chat-message-container[data-id='${message.id}']`
+ );
+ element?.scrollIntoView({
+ behavior: "auto",
+ block: opts.position || "center",
});
- });
+ return !!element;
+ };
+
+ // The message element may not be present yet - retry once.
+ next(() => scroll() || next(scroll));
}