diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs index a2ca6d48619..4c504f60ae1 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs @@ -747,6 +747,7 @@ export default class ChatChannel extends Component { @channel={{@channel}} @uploadDropZone={{this.uploadDropZone}} @onSendMessage={{this.onSendMessage}} + @scroller={{this.scroller}} /> {{/if}} {{/if}} diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js index 8c206856528..0b1f54e4dac 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js +++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js @@ -145,7 +145,7 @@ export default class ChatComposer extends Component { @action setup() { - this.composer.scrollable = this.args.scrollable; + this.composer.scroller = this.args.scroller; this.appEvents.on("chat:modify-selection", this, "modifySelection"); this.appEvents.on( "chat:open-insert-link-modal", diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs index b9127aba779..b54feb57eb1 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs @@ -578,6 +578,7 @@ export default class ChatThread extends Component { @thread={{@thread}} @onSendMessage={{this.onSendMessage}} @uploadDropZone={{this.uploadDropZone}} + @scroller={{this.scroller}} /> {{/if}} diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js index 2f23ec2756a..620f7cb4319 100644 --- a/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js +++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js @@ -16,7 +16,7 @@ export default class ChatChannelComposer extends Service { @service site; @tracked textarea; - @tracked scrollable; + @tracked scroller; init() { super.init(...arguments); @@ -34,7 +34,7 @@ export default class ChatChannelComposer extends Service { schedule("afterRender", () => { if (this.capabilities.isIOS && !this.capabilities.isIpadOS) { - disableBodyScroll(this.scrollable, { reverse: true }); + disableBodyScroll(this.scroller, { reverse: true }); } }); } diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js b/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js index c58b3ac4f17..a86fa719235 100644 --- a/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js +++ b/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js @@ -11,7 +11,7 @@ export default class ChatThreadComposer extends Service { @service site; @tracked textarea; - @tracked scrollable; + @tracked scroller; init() { super.init(...arguments); @@ -29,7 +29,7 @@ export default class ChatThreadComposer extends Service { schedule("afterRender", () => { if (this.capabilities.isIOS && !this.capabilities.isIpadOS) { - disableBodyScroll(this.scrollable, { reverse: true }); + disableBodyScroll(this.scroller, { reverse: true }); } }); }