Merge pull request #3381 from HeinousTugboat/htugboat/toast-enum

Adds SnackbarVariant enum
This commit is contained in:
hydroflame
2022-04-13 00:34:09 -04:00
committed by GitHub
11 changed files with 46 additions and 31 deletions
+3 -3
View File
@@ -27,7 +27,7 @@ import PaletteIcon from "@mui/icons-material/Palette";
import { FileDiagnosticModal } from "../../Diagnostic/FileDiagnosticModal";
import { ConfirmationModal } from "./ConfirmationModal";
import { SnackbarEvents } from "./Snackbar";
import { SnackbarEvents, SnackbarVariant } from "./Snackbar";
import { Settings } from "../../Settings/Settings";
import { DeleteGameButton } from "./DeleteGameButton";
@@ -129,7 +129,7 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
setImportData(data);
setImportSaveOpen(true);
} catch (ex: any) {
SnackbarEvents.emit(ex.toString(), "error", 5000);
SnackbarEvents.emit(ex.toString(), SnackbarVariant.ERROR, 5000);
}
}
@@ -139,7 +139,7 @@ export function GameOptionsRoot(props: IProps): React.ReactElement {
try {
await saveObject.importGame(importData.base64);
} catch (ex: any) {
SnackbarEvents.emit(ex.toString(), "error", 5000);
SnackbarEvents.emit(ex.toString(), SnackbarVariant.ERROR, 5000);
}
setImportSaveOpen(false);
+8 -3
View File
@@ -10,6 +10,13 @@ interface IProps {
children: React.ReactNode | React.ReactNode[];
}
export enum SnackbarVariant {
SUCCESS = "success",
WARNING = "warning",
ERROR = "error",
INFO = "info",
}
const useStyles = makeStyles(() => ({
snackbar: {
// Log popup z-index increments, so let's add a padding to be well above them.
@@ -36,9 +43,7 @@ export function SnackbarProvider(props: IProps): React.ReactElement {
);
}
export const SnackbarEvents = new EventEmitter<
[string | React.ReactNode, "success" | "warning" | "error" | "info", number]
>();
export const SnackbarEvents = new EventEmitter<[string | React.ReactNode, SnackbarVariant, number]>();
export function Snackbar(): React.ReactElement {
const { enqueueSnackbar, closeSnackbar } = useSnackbar();