Skip to content

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

UX: improve chat drawer placement with composer (#39153)

David Battersby25ad87944396
diff --git a/frontend/discourse/app/components/composer-body.js b/frontend/discourse/app/components/composer-body.js
index e87ad93c972..5b1ad2b1263 100644
--- a/frontend/discourse/app/components/composer-body.js
+++ b/frontend/discourse/app/components/composer-body.js
@@ -93,6 +93,8 @@ export default class ComposerBody extends Component {
this.element.addEventListener("transitionend", (event) => {
if (event.propertyName === "height") {
triggerOpen();
+ } else if (event.propertyName === "max-width") {
+ this.composerResized();
}
});
}
diff --git a/frontend/discourse/tests/acceptance/composer-test.js b/frontend/discourse/tests/acceptance/composer-test.js
index 5f9f3146a40..997a5f4795b 100644
--- a/frontend/discourse/tests/acceptance/composer-test.js
+++ b/frontend/discourse/tests/acceptance/composer-test.js
@@ -150,6 +150,21 @@ acceptance(`Composer`, function (needs) {
);
});
+ test("fires resize event after width transition", async function (assert) {
+ await visit("/");
+ await click("#create-topic");
+
+ const appEvents = this.container.lookup("service:app-events");
+ let resizedTriggered = false;
+ appEvents.on("composer:resized", () => (resizedTriggered = true));
+
+ await triggerEvent("#reply-control", "transitionend", {
+ propertyName: "max-width",
+ });
+
+ assert.true(resizedTriggered, "composer:resized is triggered");
+ });
+
test("composer controls", async function (assert) {
await visit("/");
assert.dom("#create-topic").exists("the create button is visible");
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjs
index 960503de6bf..a61d4ad93c1 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjs
@@ -45,7 +45,7 @@ export default class ChatDrawer extends Component {
this.appEvents.on("composer:opened", this, "_checkSize");
this.appEvents.on("composer:resized", this, "_checkSize");
this.appEvents.on("composer:div-resizing", this, "_dynamicCheckSize");
- window.addEventListener("resize", this._checkSize);
+ window.addEventListener("resize", this._dynamicCheckSize);
this.appEvents.on(
"composer:resize-started",
this,
@@ -63,7 +63,7 @@ export default class ChatDrawer extends Component {
return;
}
- window.removeEventListener("resize", this._checkSize);
+ window.removeEventListener("resize", this._dynamicCheckSize);
if (this.appEvents) {
this.appEvents.off("chat:open-url", this, "openURL");
@@ -170,12 +170,32 @@ export default class ChatDrawer extends Component {
const composerIsClosed = composer.classList.contains("closed");
const minRightMargin = 15;
+ const isPeekMode = document.body.classList.contains("peek-mode-active");
+
+ if (composerIsClosed || isPeekMode) {
+ drawerContainer.style.setProperty(
+ "--composer-right",
+ minRightMargin + "px"
+ );
+ drawerContainer.classList.remove("above-composer");
+ return;
+ }
+
+ const isRTL = document.documentElement.classList.contains("rtl");
+ const spaceToEnd = isRTL
+ ? composer.offsetLeft
+ : document.documentElement.clientWidth -
+ composer.offsetLeft -
+ composer.offsetWidth;
+ const drawerWidth = this.chatDrawerSize.size.width || 400;
+ const aboveComposer = spaceToEnd < drawerWidth;
+
drawerContainer.style.setProperty(
"--composer-right",
- (composerIsClosed
- ? minRightMargin
- : Math.max(minRightMargin, composer.offsetLeft)) + "px"
+ (aboveComposer ? Math.max(minRightMargin, spaceToEnd) : minRightMargin) +
+ "px"
);
+ drawerContainer.classList.toggle("above-composer", aboveComposer);
}
@action
@@ -227,6 +247,7 @@ export default class ChatDrawer extends Component {
@action
didResize(element, { width, height }) {
this.chatDrawerSize.size = { width, height };
+ this._checkSize();
}
<template>
diff --git a/plugins/chat/assets/stylesheets/common/chat-drawer.scss b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
index 41c2b5aa9d1..ba017463f33 100644
--- a/plugins/chat/assets/stylesheets/common/chat-drawer.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-drawer.scss
@@ -1,5 +1,6 @@
-body.composer-open .chat-drawer-outlet-container {
- bottom: 11px; // prevent height of grippie from obscuring ...is typing indicator
+// Only push the drawer above the composer when JS has confirmed it should be
+.chat-drawer-outlet-container.above-composer {
+ padding-bottom: var(--composer-height, 0);
}
.chat-drawer-resizer {
@@ -42,14 +43,8 @@ html.rtl {
pointer-events: none !important;
bottom: 0;
box-sizing: border-box;
- padding-bottom: var(--composer-height, 0);
transition: all 100ms ease-in;
transition-property: bottom, padding-bottom;
-
- .rtl & {
- left: var(--composer-right, 20px);
- right: 0;
- }
}
.chat-drawer {
diff --git a/themes/horizon/scss/chat.scss b/themes/horizon/scss/chat.scss
index 33202370354..ef1b63abb5a 100644
--- a/themes/horizon/scss/chat.scss
+++ b/themes/horizon/scss/chat.scss
@@ -52,6 +52,10 @@ body.has-full-page-chat {
&:has(.is-expanded) {
z-index: calc(z("composer", "dropdown") + 1);
}
+
+ &.above-composer {
+ padding-bottom: 0;
+ }
}
// the below are elements whose z-index needs to be adjusted due to the above change