ticket #82 attempt 1

devplacepy/static/js/MessagesLayout.js

@@ -16,7 +16,7 @@ export class MessagesLayout {
         }
         this.thread = document.querySelector(".messages-thread");
         this.form = document.querySelector(".messages-input-area");
-        this.input = this.form ? this.form.querySelector('input[name="content"]') : null;
+        this.input = this.form ? this.form.querySelector('textarea[name="content"]') : null;
         this.upload = this.form ? this.form.querySelector("dp-upload") : null;
         this.sendBtn = this.form ? this.form.querySelector(".messages-send-btn") : null;
         this._uploading = false;

devplacepy/static/js/ModalManager.js

@@ -29,7 +29,6 @@ export class ModalManager {
                 const modal = document.getElementById(modalId);
                 if (modal) {
                     modal.classList.add("visible");
-                    window.history.pushState({__overlay: true}, "");
                 }
             });
         });
@@ -38,13 +37,11 @@ export class ModalManager {
             modal.addEventListener("click", (e) => {
                 if (e.target === modal) {
                     modal.classList.remove("visible");
-                    window.history.back();
                 }
             });
             modal.querySelectorAll(".modal-close").forEach((closeBtn) => {
                 closeBtn.addEventListener("click", () => {
                     modal.classList.remove("visible");
-                    window.history.back();
                 });
             });
             this.enhanceModal(modal);
@@ -53,14 +50,6 @@ export class ModalManager {
         document.addEventListener("keydown", (e) => {
             if (e.key !== "Escape") return;
             const open = [...document.querySelectorAll(".modal-overlay.visible")].pop();
-            if (open) {
-                open.classList.remove("visible");
-                window.history.back();
-            }
-        });
-
-        window.addEventListener("popstate", () => {
-            const open = document.querySelector(".modal-overlay.visible");
             if (open) open.classList.remove("visible");
         });
     }

devplacepy/static/js/components/AppContextMenu.js

@@ -51,11 +51,6 @@ export class AppContextMenu extends Component {
         document.addEventListener("keydown", (e) => {
             if (e.key === "Escape") this.close();
         });
-        window.addEventListener("popstate", () => {
-            if (this.menu.classList.contains("visible")) {
-                this.menu.classList.remove("visible");
-            }
-        });
     }
 
     render(items) {
@@ -98,7 +93,6 @@ export class AppContextMenu extends Component {
         if (!items || !items.length) return;
         this.render(items);
         this.menu.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         const rect = this.menu.getBoundingClientRect();
         const vv = window.visualViewport;
         const safeW = vv ? vv.width : window.innerWidth;
@@ -117,7 +111,6 @@ export class AppContextMenu extends Component {
 
     close() {
         this.menu.classList.remove("visible");
-        window.history.back();
     }
 
     suppressNextClick() {

devplacepy/static/js/components/AppDialog.js

@@ -64,11 +64,6 @@ export class AppDialog extends Component {
                 this.dismiss();
             }
         });
-        window.addEventListener("popstate", () => {
-            if (this.overlay.classList.contains("visible")) {
-                this.overlay.classList.remove("visible");
-            }
-        });
         overlay.addEventListener("keydown", (e) => {
             if (e.key !== "Tab") return;
             const items = [
@@ -112,7 +107,6 @@ export class AppDialog extends Component {
 
         this.lastFocus = document.activeElement;
         this.overlay.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         const focusTarget = mode === "prompt" ? this.input : this.confirmBtn;
         setTimeout(() => {
             focusTarget.focus();
@@ -133,7 +127,6 @@ export class AppDialog extends Component {
 
     close(value) {
         this.overlay.classList.remove("visible");
-        window.history.back();
         if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
         const resolve = this.resolver;
         this.resolver = null;

devplacepy/static/js/components/AppLightbox.js

@@ -54,7 +54,6 @@ export class AppLightbox extends Component {
                 this.close();
             }
         });
-        window.addEventListener("popstate", () => this._onPopstate());
         this.overlay.addEventListener("keydown", (e) => {
             if (e.key === "Tab" && this.overlay.classList.contains("visible")) {
                 e.preventDefault();
@@ -78,23 +77,15 @@ export class AppLightbox extends Component {
         this.bodyOverflow = document.body.style.overflow;
         document.body.style.overflow = "hidden";
         this.overlay.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         setTimeout(() => this.closeBtn.focus(), 20);
     }
 
     close() {
         this.overlay.classList.remove("visible");
-        window.history.back();
         this.image.src = "";
         document.body.style.overflow = this.bodyOverflow;
         if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
     }
-
-    _onPopstate() {
-        if (this.overlay.classList.contains("visible")) {
-            this.overlay.classList.remove("visible");
-        }
-    }
 }
 
 customElements.define("dp-lightbox", AppLightbox);

tests/e2e/messages.py

@@ -176,7 +176,7 @@ def test_send_message_appears_in_thread(alice):
         f"{BASE_URL}/messages?with_uid={bob['uid']}", wait_until="domcontentloaded"
     )
     msg = f"Hello bob {int(time.time() * 1000)}"
-    page.fill("input[name='content']", msg)
+    page.fill("textarea[name='content']", msg)
     page.locator(".messages-send-btn").click()
     page.wait_for_url("**/messages**", wait_until="domcontentloaded")
     page.locator(f".message-bubble:has-text('{msg}')").first.wait_for(state="visible")

tests/e2e/notifications/index.py

@@ -440,7 +440,7 @@ def test_message_notification(app_server, browser, seeded_db):
     pb.goto(f"{BASE_URL}/messages?search=alice_test", wait_until="domcontentloaded")
     pb.wait_for_timeout(2000)
 
-    msg_input = pb.locator("input[name='content']").first
+    msg_input = pb.locator("textarea[name='content']").first
     msg_input.wait_for(state="visible", timeout=10000)
     msg_input.fill("Hello from bob_test!")
     pb.locator("button[type='submit']").last.click()
@@ -753,7 +753,7 @@ def test_message_notification_click_opens_conversation(app_server, browser, seed
 
     pb.goto(f"{BASE_URL}/messages?search=alice_test", wait_until="domcontentloaded")
     pb.wait_for_timeout(2000)
-    msg_input = pb.locator("input[name='content']").first
+    msg_input = pb.locator("textarea[name='content']").first
     msg_input.wait_for(state="visible", timeout=10000)
     msg_input.fill("Click-through message from bob")
     pb.locator("button[type='submit']").last.click()