ticket #44 attempt 2

devplacepy/static/css/devii.css

@@ -115,7 +115,6 @@ devii-terminal.devii-state-fullscreen .devii-window {
 }
 
 devii-terminal.devii-state-normal .devii-window {
-  resize: both;
 }
 devii-terminal.devii-state-normal .devii-titlebar {
   cursor: move;

devplacepy/static/js/DeviiTerminal.js

@@ -86,6 +86,7 @@ export class DeviiTerminal {
     }
 
     _canOpenOnGesture() {
+        if (this.element && this.element.state !== "closed") return false;
         if (document.querySelector(".modal-overlay.visible")) return false;
         if (document.querySelector(".dialog-overlay.visible")) return false;
         if (document.querySelector(".context-menu.visible")) return 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);

devplacepy/static/js/components/FloatingWindow.js

@@ -297,8 +297,8 @@ export default class FloatingWindow extends Component {
     if (!this.geometry) return;
     const g = this.geometry;
     const safeHeight = this._safeViewport.height;
-    g.width = Math.min(g.width, window.innerWidth - 16);
-    g.height = Math.min(g.height, safeHeight - 16);
+    g.width = Math.max(320, Math.min(g.width, window.innerWidth - 16));
+    g.height = Math.max(220, Math.min(g.height, safeHeight - 16));
     g.left = Math.max(8, Math.min(g.left, window.innerWidth - g.width - 8));
     g.top = Math.max(8, Math.min(g.top, safeHeight - g.height - 8));
   }
@@ -409,8 +409,8 @@ export default class FloatingWindow extends Component {
     this._ro = new ResizeObserver(() => {
       if (this.state === "normal" && this.geometry && !this._drag) {
         const rect = this.win.getBoundingClientRect();
-        this.geometry.width = Math.round(rect.width);
-        this.geometry.height = Math.round(rect.height);
+        this.geometry.width = Math.max(320, Math.round(rect.width));
+        this.geometry.height = Math.max(220, Math.round(rect.height));
         this._persistGeometry();
       }
       this._syncControls();