Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snackbar] Improve consecutive demos #20721

Merged
merged 1 commit into from
Apr 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions docs/src/pages/components/snackbars/ConsecutiveSnackbars.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,24 @@ const useStyles = makeStyles((theme) => ({
}));

export default function ConsecutiveSnackbars() {
const queueRef = React.useRef([]);
const [snackPack, setSnackPack] = React.useState([]);
const [open, setOpen] = React.useState(false);
const [messageInfo, setMessageInfo] = React.useState(undefined);

const processQueue = () => {
if (queueRef.current.length > 0) {
setMessageInfo(queueRef.current.shift());
React.useEffect(() => {
if (snackPack.length && !messageInfo) {
// Set a new snack when we don't have an active one
setMessageInfo({ ...snackPack[0] });
setSnackPack((prev) => prev.slice(1));
setOpen(true);
} else if (snackPack.length && messageInfo && open) {
// Close an active snack when a new one is added
setOpen(false);
}
};
}, [snackPack, messageInfo, open]);

const handleClick = (message) => () => {
queueRef.current.push({
message,
key: new Date().getTime(),
});

if (open) {
// immediately begin dismissing current message
// to start showing new one
setOpen(false);
} else {
processQueue();
}
setSnackPack((prev) => [...prev, { message, key: new Date().getTime() }]);
};

const handleClose = (event, reason) => {
Expand All @@ -46,7 +40,7 @@ export default function ConsecutiveSnackbars() {
};

const handleExited = () => {
processQueue();
setMessageInfo(undefined);
};

const classes = useStyles();
Expand Down
31 changes: 13 additions & 18 deletions docs/src/pages/components/snackbars/ConsecutiveSnackbars.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,29 @@ export interface SnackbarMessage {

export interface State {
open: boolean;
snackPack: SnackbarMessage[];
messageInfo?: SnackbarMessage;
}

export default function ConsecutiveSnackbars() {
const queueRef = React.useRef<SnackbarMessage[]>([]);
const [snackPack, setSnackPack] = React.useState<SnackbarMessage[]>([]);
const [open, setOpen] = React.useState(false);
const [messageInfo, setMessageInfo] = React.useState<SnackbarMessage | undefined>(undefined);

const processQueue = () => {
if (queueRef.current.length > 0) {
setMessageInfo(queueRef.current.shift());
React.useEffect(() => {
if (snackPack.length && !messageInfo) {
// Set a new snack when we don't have an active one
setMessageInfo({ ...snackPack[0] });
setSnackPack((prev) => prev.slice(1));
setOpen(true);
} else if (snackPack.length && messageInfo && open) {
// Close an active snack when a new one is added
setOpen(false);
}
};
}, [snackPack, messageInfo, open]);

const handleClick = (message: string) => () => {
queueRef.current.push({
message,
key: new Date().getTime(),
});

if (open) {
// immediately begin dismissing current message
// to start showing new one
setOpen(false);
} else {
processQueue();
}
setSnackPack((prev) => [...prev, { message, key: new Date().getTime() }]);
};

const handleClose = (event: React.SyntheticEvent | MouseEvent, reason?: string) => {
Expand All @@ -58,7 +53,7 @@ export default function ConsecutiveSnackbars() {
};

const handleExited = () => {
processQueue();
setMessageInfo(undefined);
};

const classes = useStyles();
Expand Down