Actionable toasts

ts/components/Toast.tsx

@@ -1,19 +1,23 @@
 // Copyright 2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import React, { KeyboardEvent, ReactNode, useEffect } from 'react';
+import React, { KeyboardEvent, MouseEvent, ReactNode, useEffect } from 'react';
 import classNames from 'classnames';
 import { createPortal } from 'react-dom';
 import { onTimeout, removeTimeout } from '../services/timers';
+import { useRestoreFocus } from '../hooks/useRestoreFocus';
 
 export type PropsType = {
   autoDismissDisabled?: boolean;
   children: ReactNode;
   className?: string;
   disableCloseOnClick?: boolean;
-  onClick?: () => unknown;
   onClose: () => unknown;
   timeout?: number;
+  toastAction?: {
+    label: string;
+    onClick: () => unknown;
+  };
 };
 
 export const Toast = ({
@@ -21,11 +25,12 @@ export const Toast = ({
   children,
   className,
   disableCloseOnClick = false,
-  onClick,
   onClose,
   timeout = 8000,
+  toastAction,
 }: PropsType): JSX.Element | null => {
   const [root, setRoot] = React.useState<HTMLElement | null>(null);
+  const [focusRef] = useRestoreFocus();
 
   useEffect(() => {
     const div = document.createElement('div');
@@ -52,38 +57,49 @@ export const Toast = ({
     };
   }, [autoDismissDisabled, onClose, root, timeout]);
 
-  let interactivityProps = {};
-  if (onClick) {
-    interactivityProps = {
-      role: 'button',
-      onClick() {
-        onClick();
-        if (!disableCloseOnClick) {
-          onClose();
-        }
-      },
-      onKeyDown(ev: KeyboardEvent<HTMLDivElement>) {
-        if (ev.key === 'Enter' || ev.key === ' ') {
-          onClick();
-          if (!disableCloseOnClick) {
-            onClose();
-          }
-        }
-      },
-    };
-  }
-
   return root
     ? createPortal(
         <div
-          className={classNames(
-            'Toast',
-            onClick ? 'Toast--clickable' : null,
-            className
-          )}
-          {...interactivityProps}
+          aria-live="assertive"
+          className={classNames('Toast', className)}
+          onClick={() => {
+            if (!disableCloseOnClick) {
+              onClose();
+            }
+          }}
+          onKeyDown={(ev: KeyboardEvent<HTMLDivElement>) => {
+            if (ev.key === 'Enter' || ev.key === ' ') {
+              if (!disableCloseOnClick) {
+                onClose();
+              }
+            }
+          }}
+          role="button"
+          tabIndex={0}
         >
-          {children}
+          <div className="Toast__content">{children}</div>
+          {toastAction && (
+            <div
+              className="Toast__button"
+              onClick={(ev: MouseEvent<HTMLDivElement>) => {
+                ev.stopPropagation();
+                ev.preventDefault();
+                toastAction.onClick();
+              }}
+              onKeyDown={(ev: KeyboardEvent<HTMLDivElement>) => {
+                if (ev.key === 'Enter' || ev.key === ' ') {
+                  ev.stopPropagation();
+                  ev.preventDefault();
+                  toastAction.onClick();
+                }
+              }}
+              ref={focusRef}
+              role="button"
+              tabIndex={0}
+            >
+              {toastAction.label}
+            </div>
+          )}
         </div>,
         root
       )

ts/components/ToastConversationArchived.stories.tsx

@@ -14,6 +14,7 @@ const i18n = setupI18n('en', enMessages);
 const defaultProps = {
   i18n,
   onClose: action('onClose'),
+  undo: action('undo'),
 };
 
 const story = storiesOf('Components/ToastConversationArchived', module);

ts/components/ToastConversationArchived.tsx

@@ -5,14 +5,32 @@ import React from 'react';
 import { LocalizerType } from '../types/Util';
 import { Toast } from './Toast';
 
-type PropsType = {
+export type ToastPropsType = {
+  undo: () => unknown;
+};
+
+export type PropsType = {
   i18n: LocalizerType;
   onClose: () => unknown;
-};
+} & ToastPropsType;
 
 export const ToastConversationArchived = ({
   i18n,
   onClose,
+  undo,
 }: PropsType): JSX.Element => {
-  return <Toast onClose={onClose}>{i18n('conversationArchived')}</Toast>;
+  return (
+    <Toast
+      toastAction={{
+        label: i18n('conversationArchivedUndo'),
+        onClick: () => {
+          undo();
+          onClose();
+        },
+      }}
+      onClose={onClose}
+    >
+      {i18n('conversationArchived')}
+    </Toast>
+  );
 };

ts/components/ToastDecryptionError.tsx

@@ -23,8 +23,11 @@ export const ToastDecryptionError = ({
     <Toast
       autoDismissDisabled
       className="decryption-error"
-      onClick={onShowDebugLog}
       onClose={onClose}
+      toastAction={{
+        label: i18n('decryptionErrorToastAction'),
+        onClick: onShowDebugLog,
+      }}
     >
       {i18n('decryptionErrorToast')}
     </Toast>

ts/components/ToastFileSaved.tsx

@@ -20,7 +20,13 @@ export const ToastFileSaved = ({
   onOpenFile,
 }: PropsType): JSX.Element => {
   return (
-    <Toast onClick={onOpenFile} onClose={onClose}>
+    <Toast
+      onClose={onClose}
+      toastAction={{
+        label: i18n('attachmentSavedShow'),
+        onClick: onOpenFile,
+      }}
+    >
       {i18n('attachmentSaved')}
     </Toast>
   );

ts/components/ToastReactionFailed.tsx

@@ -14,9 +14,5 @@ export const ToastReactionFailed = ({
   i18n,
   onClose,
 }: PropsType): JSX.Element => {
-  return (
-    <Toast onClick={onClose} onClose={onClose}>
-      {i18n('Reactions--error')}
-    </Toast>
-  );
+  return <Toast onClose={onClose}>{i18n('Reactions--error')}</Toast>;
 };