feat: enhance snackbar exposition (#2701)

spicetify · Dec 5, 2023 · 89d49d7 · 89d49d7
1 parent 7e89c05
commit 89d49d7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/jsHelper/spicetifyWrapper.js b/jsHelper/spicetifyWrapper.js
@@ -446,6 +446,12 @@ window.Spicetify = {
 		},
 		_reservedPanelIds: modules.find(m => m?.BuddyFeed),
 		Mousetrap: cache.find(m => m?.addKeycodes),
+		// Snackbar notifications
+		// https://github.com/iamhosseindhv/notistack
+		Snackbar: {
+			SnackbarProvider: functionModules.find(m => m.toString().includes("enqueueSnackbar called with invalid argument")),
+			useSnackbar: functionModules.find(m => m.toString().match(/\{return\(0,\w+\.useContext\)\(\w+\)\}/))
+		},
 		Locale: modules.find(m => m?._dictionary)
 	});
 
@@ -521,7 +527,7 @@ window.Spicetify = {
 
 	// Combine snackbar and notification
 	(function bindShowNotification() {
-		if (!Spicetify.Snackbar && !Spicetify.showNotification) {
+		if (!Spicetify.Snackbar?.enqueueSnackbar && !Spicetify.showNotification) {
 			setTimeout(bindShowNotification, 250);
 			return;
 		}

diff --git a/src/preprocess/preprocess.go b/src/preprocess/preprocess.go
@@ -370,7 +370,6 @@ Spicetify.React.useEffect(() => {
 		`case [\w$.]+BuddyFeed:(?:return ?|[\w$]+=)[\w$?]*(?:\([\w$.,]+\)\([\w(){},.:]+)?;(?:break;)?(?:case [\w$.]+:(?:return ?|[\w$]+=)[\w$?]*(?:\([\w$.,]+\)\([\w(){},.:]+)?[\w:]*;(?:break;)?)*default:(?:return ?|[\w$]+=)`,
 		`${0} Spicetify.Panel?.render()??`)
 
-	// Snackbar https://mui.com/material-ui/react-snackbar/
 	utils.Replace(
 		&input,
 		`\b\w\s*\(\)\s*[^;,]*enqueueCustomSnackbar:\s*(\w)\s*[^;]*;`,
@@ -463,11 +462,16 @@ if (${1}.popper?.firstChild?.id === "context-menu") {
 		`([\w$]+)=((?:function|\()([\w$.,{}()= ]+(?:springConfig|overshootClamping)){2})`,
 		`${1}=Spicetify.ReactFlipToolkit.spring=${2}`)
 
-	// Snackbar https://mui.com/material-ui/react-snackbar/
+	// Snackbar https://github.com/iamhosseindhv/notistack
 	utils.Replace(
 		&input,
-		`\w+\s*=\s*\w\.call\(this,[^)]+\)\s*\|\|\s*this\)\.enqueueSnackbar`,
-		`Spicetify.Snackbar=${0}`)
+		`\(\w+\s*=\s*\w\.call\(this,[^)]+\)\s*\|\|\s*this\)\.enqueueSnackbar`,
+		` Spicetify.Snackbar.enqueueSnackbar=${0}`)
+
+	utils.Replace(
+		&input,
+		`\w+.closeSnackbar=function`,
+		`Spicetify.Snackbar.closeSnackbar=${0}`)
 
 	return input
 }