@@ -512,10 +512,11 @@ window.Spicetify = {
512
512
ReactJSX : cache . find ( m => m ?. jsx ) ,
513
513
ReactDOM : cache . find ( m => m ?. createPortal ) ,
514
514
ReactDOMServer : cache . find ( m => m ?. renderToString ) ,
515
- // classnames for 1.2.13
516
- classnames : cache
517
- . filter ( module => typeof module === "function" )
518
- . find ( module => module . toString ( ) . includes ( '"string"' ) && module . toString ( ) . includes ( "[native code]" ) ) ,
515
+ // https://github.com/JedWatson/classnames/
516
+ classnames : chunks
517
+ . filter ( ( [ _ , v ] ) => v . toString ( ) . includes ( "[native code]" ) )
518
+ . map ( ( [ i ] ) => require ( i ) )
519
+ . find ( e => typeof e === "function" ) ,
519
520
Color : functionModules . find ( m => m . toString ( ) . includes ( "static fromHex" ) || m . toString ( ) . includes ( "this.rgb" ) ) ,
520
521
Player : {
521
522
...Spicetify . Player ,
@@ -696,16 +697,6 @@ window.Spicetify = {
696
697
}
697
698
} ) ;
698
699
699
- // classnames
700
- // https://github.com/JedWatson/classnames/
701
- const classnamesChunk = chunks . find (
702
- ( [ _ , value ] ) =>
703
- value . toString ( ) . includes ( "[native code]" ) && ! value . toString ( ) . includes ( "<anonymous>" ) && ! value . toString ( ) . includes ( "Super expression" )
704
- ) ;
705
- if ( classnamesChunk && ! Spicetify . classnames ) {
706
- Spicetify . classnames = Object . values ( require ( classnamesChunk [ 0 ] ) ) . find ( m => typeof m === "function" ) ;
707
- }
708
-
709
700
const contextMenuChunk = chunks . find ( ( [ , value ] ) => value . toString ( ) . includes ( "toggleContextMenu" ) ) ;
710
701
if ( contextMenuChunk ) {
711
702
Spicetify . ReactComponent . ContextMenu = Object . values ( require ( contextMenuChunk [ 0 ] ) ) . find ( m => typeof m === "function" ) ;
@@ -1045,7 +1036,7 @@ Spicetify._getStyledClassName = (args, component) => {
1045
1036
}
1046
1037
}
1047
1038
1048
- const excludedKeys = [ "children" , "className" , "style" , "dir" , "key" , "ref" , "as" , "$autoMirror" , "$hasFocus" , "" ] ;
1039
+ const excludedKeys = [ "children" , "className" , "style" , "dir" , "key" , "ref" , "as" , "$autoMirror" , "autoMirror" , " $hasFocus", "" ] ;
1049
1040
const excludedPrefix = [ "aria-" ] ;
1050
1041
1051
1042
const childrenProps = [ "iconLeading" , "iconTrailing" , "iconOnly" , "$iconOnly" , "$iconLeading" , "$iconTrailing" ] ;
0 commit comments