Skip to content

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

FIX: Restore the resized composer height when unminimizing (#41857)

Renato Atilioa6ee35d2e81a
diff --git a/frontend/discourse/app/components/composer-container.gjs b/frontend/discourse/app/components/composer-container.gjs
index f6c40b241cb..9b27a16bbf2 100644
--- a/frontend/discourse/app/components/composer-container.gjs
+++ b/frontend/discourse/app/components/composer-container.gjs
@@ -174,14 +174,14 @@ export default class ComposerContainer extends Component {
@bind
onResizeDrag(size) {
this.appEvents.trigger("composer:div-resizing");
- this.composer.set("composerHeight", `${size}px`);
- this.keyValueStore.set({
- key: "composerHeight",
- value: this.composer.composerHeight,
- });
+
+ const height = `${size}px`;
+ // resuming from minimized restores the height from the model
+ this.composer.model?.set("composerHeight", height);
+ this.keyValueStore.set({ key: "composerHeight", value: height });
document.documentElement.style.setProperty(
"--composer-height",
- size ? `${size}px` : ""
+ size ? height : ""
);
this._triggerComposerResized();
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.js
index 0cb182eeea2..fc989964471 100644
--- a/frontend/discourse/app/services/composer.js
+++ b/frontend/discourse/app/services/composer.js
@@ -137,8 +137,6 @@ export default class ComposerService extends Service {
topic = null;
linkLookup = null;
- composerHeight = null;
-
@tracked _showPreview;
@tracked _isStaffUserOverride;
diff --git a/frontend/discourse/tests/acceptance/composer-test.js b/frontend/discourse/tests/acceptance/composer-test.js
index f224d4ccb50..2738c165bd6 100644
--- a/frontend/discourse/tests/acceptance/composer-test.js
+++ b/frontend/discourse/tests/acceptance/composer-test.js
@@ -150,6 +150,35 @@ acceptance(`Composer`, function (needs) {
);
});
+ test("restores the resized height when resuming a minimized draft", async function (assert) {
+ await visit("/");
+ await click("#create-topic");
+ await fillIn(".d-editor-input", "this draft has been resized");
+
+ // drag past the minimum so the height clamps to a known value
+ await triggerEvent(".grippie", "mousedown", { clientY: 500 });
+ await triggerEvent(".grippie", "mousemove", { clientY: 3000 });
+ await triggerEvent(".grippie", "mouseup");
+
+ const resizedHeight =
+ document.documentElement.style.getPropertyValue("--composer-height");
+ assert.strictEqual(resizedHeight, "255px", "applies the dragged height");
+
+ await click(".toggle-minimize");
+ assert.strictEqual(
+ document.documentElement.style.getPropertyValue("--composer-height"),
+ "40px",
+ "minimizes to the draft bar"
+ );
+
+ await click(".toggle-fullscreen");
+ assert.strictEqual(
+ document.documentElement.style.getPropertyValue("--composer-height"),
+ resizedHeight,
+ "restores the resized height instead of the default when resumed"
+ );
+ });
+
test("fires resize event after width transition", async function (assert) {
await visit("/");
await click("#create-topic");