fix(snackbar): always keep permanent snackbar

Alwatr · Feb 3, 2023 · 1932239 · 1932239
1 parent d256f29
commit 1932239
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ui/ui-kit/src/snackbar/controller.ts b/ui/ui-kit/src/snackbar/controller.ts
@@ -10,13 +10,15 @@ const paintDelay = 60;
 let closeLastSnackbar: ((response: SnackbarResponse) => void) | null = null;
 
 commandHandler.define<SnackbarOptions, SnackbarResponse>('show-snackbar-command', (options) => {
+  if (options.duration === -1 && !options.actionLabel) delete options.duration;
   logger.logMethodArgs('showSnackbar', options);
   return new Promise((resolve) => {
     const element = document.body.appendChild(document.createElement('alwatr-snackbar'));
 
     let closed = false;
     const _closeSnackbar = (response: SnackbarResponse): void => {
       if (closed) return;
+      if (!response.actionButton && options.duration === -1) return; // keep it!
       logger.logMethodArgs('closeSnackbar', response);
       closed = true;
       closeLastSnackbar = null;
@@ -37,7 +39,7 @@ commandHandler.define<SnackbarOptions, SnackbarResponse>('show-snackbar-command'
       element.open = true;
       closeLastSnackbar?.({});
       closeLastSnackbar = _closeSnackbar;
-      if (!(options.duration === -1 && element.actionLabel)) {
+      if (options.duration !== -1) {
         setTimeout(() => _closeSnackbar?.({}), clamp(options.duration ?? 5_000, 4_000, 10_000));
       }
     }, paintDelay);