From d072ea28111d9d69c48435ed8165b3bdd144f30a Mon Sep 17 00:00:00 2001 From: Arkadiy Stepanov Date: Fri, 22 Mar 2024 10:42:12 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Cleanup=20snackbar=20action=20co?= =?UTF-8?q?nditionally=20on=20consequent=20calls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- package.json | 2 +- src/providers/SnackbarProvider.tsx | 15 ++------------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c3afffea..1a4ddee4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@equinor/amplify-components", - "version": "7.5.1", + "version": "7.5.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@equinor/amplify-components", - "version": "7.5.1", + "version": "7.5.2", "license": "ISC", "dependencies": { "@azure/msal-browser": "3.10.0", diff --git a/package.json b/package.json index c51a1f42f..700bbe1de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@equinor/amplify-components", - "version": "7.5.1", + "version": "7.5.2", "description": "Frontend Typescript components for the Amplify team", "main": "dist/esm/index.js", "types": "dist/types/index.d.ts", diff --git a/src/providers/SnackbarProvider.tsx b/src/providers/SnackbarProvider.tsx index f7e66acb0..f1e181591 100644 --- a/src/providers/SnackbarProvider.tsx +++ b/src/providers/SnackbarProvider.tsx @@ -44,19 +44,8 @@ const SnackbarContextProvider: FC = (props) => { snackbarSettings?: ShowSnackbarSettings ) => { setSnackbarText(text); - - if (snackbarSettings?.customProps) { - setSnackbarProps(snackbarSettings?.customProps); - } else { - setSnackbarProps(props); - } - - if (snackbarSettings?.action) { - setSnackbarAction({ - ...snackbarSettings.action, - }); - } - + setSnackbarProps(snackbarSettings?.customProps ?? props); + setSnackbarAction(snackbarSettings?.action ?? undefined); setOpen(true); };