smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update toast api to account for duration and closable (#5427)

Browse source 
* feat: update toast api to account for duration and closable

* fix

* update snaps

* update docs

* male toast nullable

* fix snaps

* remove clearToast from App.tsx and replace clearToast prop in Toast comp with onClose
This commit is contained in:
Aakansha Doshi 2022-07-11 18:11:13 +05:30 • committed by GitHub
parent e885057a71
commit a7153d9d1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 162 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/components/App.tsx
View file

@ -380,7 +380,7 @@ class App extends React.Component<AppProps, AppState> {
getAppState: () => this.state,
getFiles: () => this.files,
refresh: this.refresh,
setToastMessage: this.setToastMessage,
setToast: this.setToast,
id: this.id,
setActiveTool: this.setActiveTool,
setCursor: this.setCursor,
@ -549,16 +549,12 @@ class App extends React.Component<AppProps, AppState> {
onLinkOpen={this.props.onLinkOpen}
/>
)}
{this.state.toastMessage !== null && (
{this.state.toast !== null && (
<Toast
message={this.state.toastMessage}
clearToast={this.clearToast}
duration={
this.state.toastMessage === t("alerts.browserZoom")
? Infinity
: undefined
}
closable={this.state.toastMessage === t("alerts.browserZoom")}
message={this.state.toast.message}
onClose={() => this.setToast(null)}
duration={this.state.toast.duration}
closable={this.state.toast.closable}
/>
)}
<main>{this.renderCanvas()}</main>
@ -772,7 +768,7 @@ class App extends React.Component<AppProps, AppState> {
? { ...scene.appState.activeTool, type: "selection" }
: scene.appState.activeTool,
isLoading: false,
toastMessage: this.state.toastMessage || null,
toast: this.state.toast,
};
if (initialData?.scrollToContent) {
scene.appState = {
@ -931,9 +927,13 @@ class App extends React.Component<AppProps, AppState> {
(window.outerWidth - scrollBarWidth) / window.innerWidth;
const isBrowserZoomed = widthRatio < 0.75 || widthRatio > 1.1;
if (isBrowserZoomed) {
this.setToastMessage(t("alerts.browserZoom"));
this.setToast({
message: t("alerts.browserZoom"),
closable: true,
duration: Infinity,
});
} else {
this.clearToast();
this.setToast(null);
}
}
};
@ -1643,12 +1643,14 @@ class App extends React.Component<AppProps, AppState> {
});
};
clearToast = () => {
this.setState({ toastMessage: null });
};
setToastMessage = (toastMessage: string) => {
this.setState({ toastMessage });
setToast = (
toast: {
message: string;
closable?: boolean;
duration?: number;
} | null,
) => {
this.setState({ toast });
};
restoreFileFromShare = async () => {