@@ -2060,11 +2060,12 @@ Object.defineProperty(Spicetify, "TippyProps", {
2060
2060
} ) ;
2061
2061
2062
2062
Spicetify . Topbar = ( ( ) => {
2063
+ let leftGeneratedClassName ;
2064
+ let rightGeneratedClassName ;
2063
2065
let leftContainer ;
2064
2066
let rightContainer ;
2065
2067
const leftButtonsStash = new Set ( ) ;
2066
2068
const rightButtonsStash = new Set ( ) ;
2067
- const generatedClassName = "Button-medium-medium-buttonTertiary-iconOnly-condensed-disabled-isUsingKeyboard-useBrowserDefaultFocusStyle" ;
2068
2069
2069
2070
class Button {
2070
2071
constructor ( label , icon , onClick , disabled = false , isRight = false ) {
@@ -2080,19 +2081,12 @@ Spicetify.Topbar = (() => {
2080
2081
this . label = label ;
2081
2082
2082
2083
this . element . appendChild ( this . button ) ;
2083
- const globalHistoryButtons = document . querySelector ( ".main-globalNav-historyButtons" ) ;
2084
2084
if ( isRight ) {
2085
- this . button . classList . add ( "encore-over-media-set" , "main-topBar-buddyFeed" ) ;
2086
- if ( globalHistoryButtons ) this . button . classList . add ( "main-globalNav-buddyFeed" ) ;
2087
-
2085
+ this . button . className = rightGeneratedClassName ;
2088
2086
rightButtonsStash . add ( this . element ) ;
2089
2087
rightContainer ?. prepend ( this . element ) ;
2090
2088
} else {
2091
- this . button . classList . add ( "main-topBar-button" ) ;
2092
- if ( globalHistoryButtons ) {
2093
- this . button . classList . add ( "main-globalNav-icon" , generatedClassName ) ;
2094
- }
2095
-
2089
+ this . button . className = leftGeneratedClassName ;
2096
2090
leftButtonsStash . add ( this . element ) ;
2097
2091
leftContainer ?. append ( this . element ) ;
2098
2092
}
@@ -2136,9 +2130,15 @@ Spicetify.Topbar = (() => {
2136
2130
2137
2131
function waitForTopbarMounted ( ) {
2138
2132
const globalHistoryButtons = document . querySelector ( ".main-globalNav-historyButtons" ) ;
2133
+ leftGeneratedClassName = document . querySelector (
2134
+ ".main-topBar-historyButtons .main-topBar-button, .main-globalNav-historyButtons .main-globalNav-icon"
2135
+ ) ?. className ;
2136
+ rightGeneratedClassName = document . querySelector (
2137
+ ".main-topBar-container .main-topBar-buddyFeed, .main-actionButtons .main-topBar-buddyFeed, .main-actionButtons .main-globalNav-buddyFeed"
2138
+ ) ?. className ;
2139
2139
leftContainer = document . querySelector ( ".main-topBar-historyButtons" ) ?? globalHistoryButtons ;
2140
2140
rightContainer = document . querySelector ( ".main-actionButtons" ) ;
2141
- if ( ! leftContainer || ! rightContainer ) {
2141
+ if ( ! leftContainer || ! rightContainer || ! leftGeneratedClassName || ! rightGeneratedClassName ) {
2142
2142
setTimeout ( waitForTopbarMounted , 100 ) ;
2143
2143
return ;
2144
2144
}
@@ -2148,19 +2148,14 @@ Spicetify.Topbar = (() => {
2148
2148
if ( button . parentNode ) button . parentNode . removeChild ( button ) ;
2149
2149
2150
2150
const buttonElement = button . querySelector ( "button" ) ;
2151
- if ( globalHistoryButtons ) {
2152
- buttonElement . classList . add ( "main-globalNav-icon" , generatedClassName ) ;
2153
- } else {
2154
- buttonElement . classList . remove ( "main-globalNav-icon" , generatedClassName ) ;
2155
- }
2151
+ buttonElement . className = leftGeneratedClassName ;
2156
2152
}
2157
2153
leftContainer . append ( ...leftButtonsStash ) ;
2158
2154
for ( const button of rightButtonsStash ) {
2159
2155
if ( button . parentNode ) button . parentNode . removeChild ( button ) ;
2160
2156
2161
2157
const buttonElement = button . querySelector ( "button" ) ;
2162
- if ( globalHistoryButtons ) buttonElement . classList . add ( "main-globalNav-buddyFeed" ) ;
2163
- else buttonElement . classList . remove ( "main-globalNav-buddyFeed" ) ;
2158
+ buttonElement . className = rightGeneratedClassName ;
2164
2159
}
2165
2160
rightContainer . prepend ( ...rightButtonsStash ) ;
2166
2161
}
0 commit comments