Merge pull request #16285 from schlawg/ui-has-dialog-touch-scroll

disable body scroll on touch devices with css
lichess-org · Oct 29, 2024 · b1d72fc · b1d72fc
2 parents 953f1b6 + 07eaa70
commit b1d72fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ui/common/css/component/_dialog.scss b/ui/common/css/component/_dialog.scss
@@ -1,3 +1,7 @@
+body:has(dialog.touch-scroll) {
+  overflow: hidden !important;
+}
+
 dialog {
   @extend %box-radius, %popup-shadow;
   position: fixed;

diff --git a/ui/common/src/dialog.ts b/ui/common/src/dialog.ts
@@ -69,7 +69,7 @@ export async function alert(msg: string): Promise<void> {
   await domDialog({
     htmlText: escapeHtml(msg),
     class: 'alert',
-    show: 'modal',
+    show: true,
   });
 }
 
@@ -226,7 +226,6 @@ export function snabDialog(o: SnabDialogOpts): VNode {
 }
 
 class DialogWrapper implements Dialog {
-  private restore?: { focus?: HTMLElement; overflow: string };
   private resolve?: (dialog: Dialog) => void;
   private actionEvents = eventJanitor();
   private dialogEvents = eventJanitor();
@@ -339,9 +338,6 @@ class DialogWrapper implements Dialog {
   private onRemove = () => {
     this.observer.disconnect();
     if (!this.dialog.returnValue) this.dialog.returnValue = 'cancel';
-    this.restore?.focus?.focus(); // one modal at a time please
-    if (this.restore?.overflow !== undefined) document.body.style.overflow = this.restore.overflow;
-    this.restore = undefined;
     this.resolve?.(this);
     this.o.onClose?.(this);
     this.dialog.remove();