Update for latest spotify version and fix #7HEAD3.0main

3 files changed, 44 insertions, 31 deletions

diff --git a/CustomApps/betterLibrary/betterlibrary.js b/CustomApps/betterLibrary/betterlibrary.js
index 47c8326..a5b5d6a 100644
--- a/CustomApps/betterLibrary/betterlibrary.js
+++ b/CustomApps/betterLibrary/betterlibrary.js
@@ -11,17 +11,14 @@ var lastViewCompact; //library-row-mode 1=compact 2=normal
 // Disables betterlibrary when the pages is left
 function startBetterLibListener() {
     Spicetify.Platform.History.listen((location) => {
-        console.log("betterlib listener called")
-        if (location.pathname != '/betterlibrary' && betterLibIsEnabled)
+        // console.log("betterlib listener called")
+        if (location.pathname != '/betterlibrary')
             disableBetterLib();
     });
     window.addEventListener(
         'beforeunload',
         (event) => {
-            if (betterLibIsEnabled)
-            {
-                disableBetterLib();
-            }
+            disableBetterLib();
         }
         )
 }
@@ -61,6 +58,9 @@ function enableBetterLib() {
 
             //get betterlib icons mode and compact mode from storage
             newViewSize = parseFloat(Spicetify.Platform.LocalStorageAPI.getItem("betterlib-ylx-grid-scale"),10);
+            if (newViewSize == null) {
+                newViewSize = 1;
+            }
             newViewIcons = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("betterlib-items-view"),10);
             newViewCompact = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("betterlib-library-row-mode"),10);
 
@@ -75,36 +75,39 @@ function enableBetterLib() {
 }
 
 function disableBetterLib() {
-    //undo fix for collaped library buttons
-    if (lastSidebarMode == 1) {
-        document.documentElement.style.setProperty("--betterlib-fix-collaped-view","inherit");
-        document.documentElement.style.setProperty("--betterlib-show-placeholder-text","flex");
-    }
+    if (betterLibIsEnabled)
+    {
+        //undo fix for collaped library buttons
+        if (lastSidebarMode == 1) {
+            document.documentElement.style.setProperty("--betterlib-fix-collaped-view","inherit");
+            document.documentElement.style.setProperty("--betterlib-show-placeholder-text","flex");
+        }
 
-    //get current betterlib icons mode and compact mode
-    currentViewIcons = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("items-view"),10);
-    currentViewCompact = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("library-row-mode"),10);
-    currentViewSize = parseFloat(Spicetify.Platform.LocalStorageAPI.getItem("ylx-grid-scale"),10);
+        //get current betterlib icons mode and compact mode
+        currentViewIcons = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("items-view"),10);
+        currentViewCompact = parseInt(Spicetify.Platform.LocalStorageAPI.getItem("library-row-mode"),10);
+        currentViewSize = parseFloat(Spicetify.Platform.LocalStorageAPI.getItem("ylx-grid-scale"),10);
 
-    //save betterlib icons mode and compact mode to storage
-    Spicetify.Platform.LocalStorageAPI.setItem("betterlib-items-view", currentViewIcons);
-    Spicetify.Platform.LocalStorageAPI.setItem("betterlib-library-row-mode", currentViewCompact);
-    Spicetify.Platform.LocalStorageAPI.setItem("betterlib-ylx-grid-scale", currentViewSize);
+        //save betterlib icons mode and compact mode to storage
+        Spicetify.Platform.LocalStorageAPI.setItem("betterlib-items-view", currentViewIcons);
+        Spicetify.Platform.LocalStorageAPI.setItem("betterlib-library-row-mode", currentViewCompact);
+        Spicetify.Platform.LocalStorageAPI.setItem("betterlib-ylx-grid-scale", currentViewSize);
 
-    //revert icons and compact mode to last
-    Spicetify.Platform.LocalStorageAPI.setItem("items-view", lastViewIcons);
-    Spicetify.Platform.LocalStorageAPI.setItem("library-row-mode", lastViewCompact);
-    Spicetify.Platform.LocalStorageAPI.setItem("ylx-grid-scale", lastViewSize);
+        //revert icons and compact mode to last
+        Spicetify.Platform.LocalStorageAPI.setItem("items-view", lastViewIcons);
+        Spicetify.Platform.LocalStorageAPI.setItem("library-row-mode", lastViewCompact);
+        Spicetify.Platform.LocalStorageAPI.setItem("ylx-grid-scale", lastViewSize);
 
-    //revert swap
-    sidebar.appendChild(library);
-    center.appendChild(text);
+        //revert swap
+        sidebar.appendChild(library);
+        center.appendChild(text);
 
-    //reset mode and size to last
-    Spicetify.Platform.LocalStorageAPI.setItem("lx-expanded-state-nav-bar-width",lastSidebarSize);
-    Spicetify.Platform.LocalStorageAPI.setItem("ylx-sidebar-state",lastSidebarMode);
+        //reset mode and size to last
+        Spicetify.Platform.LocalStorageAPI.setItem("lx-expanded-state-nav-bar-width",lastSidebarSize);
+        Spicetify.Platform.LocalStorageAPI.setItem("ylx-sidebar-state",lastSidebarMode);
 
-    betterLibIsEnabled = false;
+        betterLibIsEnabled = false;
+    }
 }
 
 //source: https://stackoverflow.com/questions/5525071/how-to-wait-until-an-element-exists
diff --git a/CustomApps/betterLibrary/loadcss.js b/CustomApps/betterLibrary/loadcss.js
index 82ff0a3..f7d1793 100644
--- a/CustomApps/betterLibrary/loadcss.js
+++ b/CustomApps/betterLibrary/loadcss.js
@@ -1,7 +1,7 @@
 (function loadcss() {
     document.getElementsByTagName('head')[0].insertAdjacentHTML(
         'beforeend',`
-        <style>
+            <style>
             /* remove resize bar while in betterlibrary */
             .Root__top-container:has(.betterLibBox) .LayoutResizer__resize-bar {
                 visibility: hidden;
@@ -21,6 +21,7 @@
             }
             
             /* makes the "your library" not clickable, expands and styles the text*/
+            button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base,
             button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.NxEINIJHGytq4gF1r2N1 {
                 pointer-events: none;
                 font-size: x-large;
@@ -43,17 +44,21 @@
             }
             
             /* hides collapse button (library icon) in folder*/
+            button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base.Button-medium-medium-buttonTertiary-iconOnly-condensed-useBrowserDefaultFocusStyle,
+            button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base.Button-medium-medium-buttonTertiary-iconOnly-condensed-isUsingKeyboard-useBrowserDefaultFocusStyle,
             button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.NxEINIJHGytq4gF1r2N1.Button-medium-medium-buttonTertiary-iconOnly-condensed-useBrowserDefaultFocusStyle,
             button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.NxEINIJHGytq4gF1r2N1.Button-medium-medium-buttonTertiary-iconOnly-condensed-isUsingKeyboard-useBrowserDefaultFocusStyle {
                 display: none;
             }
             
             /* hides expand/reduce button (<- ->) and also add(+) and more(...)*/
+            button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.main-useDropTarget-base,
             button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.NxEINIJHGytq4gF1r2N1 {
                 display: none;
             }
             
             /* unhides add(+) and more(...)*/
+            span button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.main-useDropTarget-base,
             span button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.NxEINIJHGytq4gF1r2N1 {
                 display: inherit;
             }
diff --git a/style.css b/style.css
index 0590ce3..eae5bbf 100644
--- a/style.css
+++ b/style.css
@@ -17,6 +17,7 @@
 }
 
 /* makes the "your library" not clickable, expands and styles the text*/
+button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base,
 button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.NxEINIJHGytq4gF1r2N1 {
     pointer-events: none;
     font-size: x-large;
@@ -39,17 +40,21 @@ span.IconWrapper__Wrapper-sc-16usrgb-0.Wrapper-medium-leading {
 }
 
 /* hides collapse button (library icon) in folder*/
+button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base.Button-medium-medium-buttonTertiary-iconOnly-condensed-useBrowserDefaultFocusStyle,
+button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.main-useDropTarget-base.Button-medium-medium-buttonTertiary-iconOnly-condensed-isUsingKeyboard-useBrowserDefaultFocusStyle,
 button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.NxEINIJHGytq4gF1r2N1.Button-medium-medium-buttonTertiary-iconOnly-condensed-useBrowserDefaultFocusStyle,
 button.Button-sc-1dqy6lx-0.main-yourLibraryX-collapseButtonWrapper.main-yourLibraryX-button.NxEINIJHGytq4gF1r2N1.Button-medium-medium-buttonTertiary-iconOnly-condensed-isUsingKeyboard-useBrowserDefaultFocusStyle {
     display: none;
 }
 
 /* hides expand/reduce button (<- ->) and also add(+) and more(...)*/
+button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.main-useDropTarget-base,
 button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.NxEINIJHGytq4gF1r2N1 {
     display: none;
 }
 
 /* unhides add(+) and more(...)*/
+span button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.main-useDropTarget-base,
 span button.Button-sc-1dqy6lx-0.main-yourLibraryX-button.main-yourLibraryX-iconOnly.NxEINIJHGytq4gF1r2N1 {
     display: inherit;
 }