Merge pull request #21 from ReceiptManager/dev

Fix supermarked overlay on large lists
ReceiptManager · Aug 6, 2021 · e38452a · e38452a
2 parents 98816b2 + b016845
commit e38452a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 30 deletions.
diff --git a/Frontend/functions.js b/Frontend/functions.js
@@ -602,35 +602,40 @@ function updateResponseJson (itemId, mode, t)
   responseChanged(t)
 }
 
-function closeDrawer(t)
-{
-    var drawer = t.shadowRoot.getElementById("drawer")
-    var mainContent = t.shadowRoot.getElementById("mainElement")
-
-    if (!drawer.opened)
+function closeDrawer(t) {
+  var drawer = t.shadowRoot.getElementById("drawer");
+  var mainContent = t.shadowRoot.getElementById("mainElement");
+
+  if (!drawer.opened) {
+    mainContent.style.visibility = null;
+    t.shadowRoot.getElementById("appHeader").style.zIndex = 1
+    var appMenu = t.shadowRoot.getElementById("appMenu")
+    if (appMenu)
     {
-      mainContent.style.visibility = null
+      appMenu.style.visibility = "unset";
     }
-}
-
-function openDrawer(t)
-{
-  if (menuIcon != "arrow-back")
-  {
-    t.shadowRoot.getElementById("drawer").open()
-    t.shadowRoot.getElementById("mainElement").style.visibility = "hidden"
   }
-  else
-  {
-    historyPage.shadowRoot.getElementById("mainContainerHistory").style.display = null
-    historyPage.shadowRoot.getElementById("mainContainerDetails").style.display = "none"
-    historyPage.responseJson = null
-
-    window.scrollTo(0,0)
+}
 
-    setMenuIcon("menu")
-    mainPage.inputMode = false
-    mainPage.requestUpdate()
+function openDrawer(t) {
+  if (menuIcon != "arrow-back") {
+    t.shadowRoot.getElementById("drawer").open();
+    t.shadowRoot.getElementById("mainElement").style.visibility = "hidden";
+    var appMenu = t.shadowRoot.getElementById("appMenu")
+    if (appMenu)
+    {
+      appMenu.style.visibility = "hidden";
+    }
+
+    t.shadowRoot.getElementById("appHeader").style.zIndex = -5
+  } else {
+    historyPage.shadowRoot.getElementById("mainContainerHistory").style.display = null;
+    historyPage.shadowRoot.getElementById("mainContainerDetails").style.display = "none";
+    historyPage.responseJson = null;
+    window.scrollTo(0, 0);
+    setMenuIcon("menu");
+    mainPage.inputMode = false;
+    mainPage.requestUpdate();
   }
 }
 

diff --git a/Frontend/history.js b/Frontend/history.js
@@ -416,7 +416,6 @@ class MainElement extends LitElement {
       padding-bottom: 60px;
       margin-top: 70px;
       position: absolute;
-      z-index: -1;
       padding-right: 10px;
       width: calc(100% - 25px);
     }

diff --git a/Frontend/index.js b/Frontend/index.js
@@ -86,7 +86,7 @@ class MainElement extends LitElement {
       
           <paper-spinner id="loadingSpinner" class="loadingSpinner"></paper-spinner>
           <div class="bodyContainer" id="bodyContainer" style="opacity: 100%">
-            <app-header reveals>
+          <app-header reveals id="appHeader">
             <app-toolbar class="appToolbar">
               <paper-icon-button icon="${menuIcon}" id="menuButton" @click="${() => openDrawer(this)}"></paper-icon-button>
               <div main-title>${translated.title}</div>
@@ -181,7 +181,7 @@ class MainElement extends LitElement {
           bottom: 28px;
           top: unset;
           height: 20px;
-          z-index: -1;
+          z-index: 3;
         }
 
         .loadingSpinner {
@@ -209,14 +209,15 @@ class MainElement extends LitElement {
           left: 0;
           width: 100%;
           height: 100px;
+          z-index: 1;
         }
 
         .bodyContainer {
           inset: 0px;
           width: 100%;
           position: absolute;
           background-color: rgba(255,255,255,200);
-          z-index: 2;
+          z-index: 5;
           opacity: 20%;
         }
 

diff --git a/Frontend/scann.js b/Frontend/scann.js
@@ -432,7 +432,6 @@ checkValidAndSave(e)
           padding-bottom: 60px;
           margin-top: 70px;
           position: absolute;
-          z-index: -1;
         }
 
         .itemsListContainer