From 6f7b26bf9e911f5b5f1a22fa3babb3a461f7f1ab Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 2 May 2024 16:40:51 +0200
Subject: [PATCH 1/4] Fix body margin shifting with modals

---
 web_src/css/base.css                  | 1 +
 web_src/js/modules/fomantic/dimmer.js | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index c0ced2955c34b..977444e6206d1 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -67,6 +67,7 @@ body {
   flex-direction: column;
   overflow-x: visible;
   overflow-wrap: break-word;
+  scrollbar-gutter: stable;
 }
 
 textarea {
diff --git a/web_src/js/modules/fomantic/dimmer.js b/web_src/js/modules/fomantic/dimmer.js
index f434e1ca59bdf..bfcb8eae70db3 100644
--- a/web_src/js/modules/fomantic/dimmer.js
+++ b/web_src/js/modules/fomantic/dimmer.js
@@ -3,7 +3,7 @@ import {queryElemChildren} from '../../utils/dom.js';
 
 export function initFomanticDimmer() {
   // stand-in for removed dimmer module
-  $.fn.dimmer = function (arg0, $el) {
+  $.fn.dimmer = function (arg0, arg1) {
     if (arg0 === 'add content') {
       const existingDimmer = document.querySelector('body > .ui.dimmer');
       if (existingDimmer) {
@@ -14,6 +14,7 @@ export function initFomanticDimmer() {
         this._dimmer.classList.add('ui', 'dimmer');
         document.body.append(this._dimmer);
       }
+      const $el = arg1;
       this._dimmer.append($el[0]);
     } else if (arg0 === 'get dimmer') {
       return $(this._dimmer);
@@ -23,6 +24,8 @@ export function initFomanticDimmer() {
     } else if (arg0 === 'hide') {
       this._dimmer.classList.remove('active');
       document.body.classList.remove('tw-overflow-hidden');
+      const cb = arg1;
+      cb();
     }
     return this;
   };

From 3a2aec706d8fe4eddd47db1d36ba7dabbcd908ff Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 2 May 2024 16:46:37 +0200
Subject: [PATCH 2/4] Update web_src/css/base.css

---
 web_src/css/base.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 977444e6206d1..c0ced2955c34b 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -67,7 +67,6 @@ body {
   flex-direction: column;
   overflow-x: visible;
   overflow-wrap: break-word;
-  scrollbar-gutter: stable;
 }
 
 textarea {

From c732ba1ae758080d78726dffa9e5d52d9d0fabb3 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 2 May 2024 16:47:28 +0200
Subject: [PATCH 3/4] move var decl

---
 web_src/js/modules/fomantic/dimmer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/modules/fomantic/dimmer.js b/web_src/js/modules/fomantic/dimmer.js
index bfcb8eae70db3..311b9b83da20e 100644
--- a/web_src/js/modules/fomantic/dimmer.js
+++ b/web_src/js/modules/fomantic/dimmer.js
@@ -5,6 +5,7 @@ export function initFomanticDimmer() {
   // stand-in for removed dimmer module
   $.fn.dimmer = function (arg0, arg1) {
     if (arg0 === 'add content') {
+      const $el = arg1;
       const existingDimmer = document.querySelector('body > .ui.dimmer');
       if (existingDimmer) {
         queryElemChildren(existingDimmer, '*', (el) => el.remove());
@@ -14,7 +15,6 @@ export function initFomanticDimmer() {
         this._dimmer.classList.add('ui', 'dimmer');
         document.body.append(this._dimmer);
       }
-      const $el = arg1;
       this._dimmer.append($el[0]);
     } else if (arg0 === 'get dimmer') {
       return $(this._dimmer);
@@ -22,9 +22,9 @@ export function initFomanticDimmer() {
       this._dimmer.classList.add('active');
       document.body.classList.add('tw-overflow-hidden');
     } else if (arg0 === 'hide') {
+      const cb = arg1;
       this._dimmer.classList.remove('active');
       document.body.classList.remove('tw-overflow-hidden');
-      const cb = arg1;
       cb();
     }
     return this;

From ede1781629b5c19a746167b350568a79abbbcdd1 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 2 May 2024 19:08:22 +0200
Subject: [PATCH 4/4] Update web_src/js/modules/fomantic/dimmer.js

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 web_src/js/modules/fomantic/dimmer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/modules/fomantic/dimmer.js b/web_src/js/modules/fomantic/dimmer.js
index 311b9b83da20e..e027838d4a5e9 100644
--- a/web_src/js/modules/fomantic/dimmer.js
+++ b/web_src/js/modules/fomantic/dimmer.js
@@ -8,7 +8,7 @@ export function initFomanticDimmer() {
       const $el = arg1;
       const existingDimmer = document.querySelector('body > .ui.dimmer');
       if (existingDimmer) {
-        queryElemChildren(existingDimmer, '*', (el) => el.remove());
+        queryElemChildren(existingDimmer, '*', (el) => el.classList.add('hidden'));
         this._dimmer = existingDimmer;
       } else {
         this._dimmer = document.createElement('div');