vanilla-jui 1.7.30 → 1.7.32

package/src/primitives/toast.ts

@@ -3,6 +3,7 @@ import {
   access,
   createEffect,
   createRoot,
+  createSignal,
   insert,
   jsx,
 } from 'vanilla-signal';
@@ -23,6 +24,7 @@ export interface ToastClassNames {
   toast: string;
   icon: string;
   message: string;
+  description: string;
   lite: string;
   confirm: string;
   buttons: string;
@@ -46,35 +48,55 @@ export interface ToastThemeOptions extends ToastClassNameOptions {
 }
 
 export interface ToastOptions extends ToastThemeOptions {
+  description?: string;
   duration?: number;
   once?: boolean;
+  onClose?: () => void | Promise<void>;
+}
+
+export interface LoadingToastOptions extends ToastOptions {
   loading?: MaybeAccessor<boolean>;
   text?: {
     loading?: string;
   };
-  onClose?: () => void | Promise<void>;
   onCancel?: () => void | Promise<void>;
 }
 
-export interface ToastConfirmProps extends ToastClassNameOptions {
-  once?: boolean;
+export interface ConfirmToastOptions extends ToastOptions {
   text?: {
     close?: string;
     confirm?: string;
   };
   onConfirm?: () => void | Promise<void>;
+}
+
+export type ToastConfirmProps = ConfirmToastOptions;
+
+export interface PromiseToastOptions extends ToastClassNameOptions {
+  duration?: number;
+  text?: { loading?: string; success?: string; error?: string };
+  onCancel?: () => void | Promise<void>;
   onClose?: () => void | Promise<void>;
+  onSuccess?: () => void | Promise<void>;
+  onError?: () => void | Promise<void>;
+}
+
+interface ToastStatus {
+  message: string;
+  theme: ToastTheme;
+  loading: boolean;
 }
 
 const DEFAULT_CLASS_NAMES: ToastClassNames = {
   container: 'j-toast-container',
   toast: 'j-toast',
   icon: 'el-icon',
-  message: 'el-text',
+  message: 'toast-title',
+  description: 'toast-description',
   lite: 'j-toast-lite',
   confirm: 'j-toast is-confirm',
-  buttons: 'toast-buttons',
-  button: 'j-button is-sm',
+  buttons: 'toast-btns',
+  button: 'j-btn is-sm',
   closeBtn: 'is-ghost',
   confirmBtn: 'is-reverse',
   info: 'is-info',
@@ -94,7 +116,8 @@ const timers = new Set<string>();
 const disposers = new Map<HTMLElement, () => void>();
 const animations = new Map<HTMLElement, Animation>();
 const operations = new Map<HTMLElement, number>();
-const singletonToasts = new Map<'show' | 'confirm', HTMLElement>();
+type ToastKind = 'show' | 'confirm' | 'loading';
+const singletonToasts = new Map<ToastKind, HTMLElement>();
 let classNames = DEFAULT_CLASS_NAMES;
 
 function addToastDisposer(element: HTMLElement, dispose: () => void): void {
@@ -105,7 +128,7 @@ function addToastDisposer(element: HTMLElement, dispose: () => void): void {
   });
 }
 
-function getSingletonToast(kind: 'show' | 'confirm'): HTMLElement | null {
+function getSingletonToast(kind: ToastKind): HTMLElement | null {
   const toast = singletonToasts.get(kind);
   if (!toast) return null;
   if (!toast.isConnected || toast.getAttribute('data-mount') === 'false') {
@@ -116,7 +139,7 @@ function getSingletonToast(kind: 'show' | 'confirm'): HTMLElement | null {
 }
 
 function setSingletonToast(
-  kind: 'show' | 'confirm',
+  kind: ToastKind,
   toast: HTMLElement,
   once: boolean
 ): void {
@@ -129,77 +152,20 @@ function clearSingletonToast(toast: HTMLElement): void {
   }
 }
 
-function isToastLoading(options: ToastOptions): boolean {
-  return !!access(options.loading ?? false);
-}
-
-function toastIconStyle(options: ToastOptions): Record<string, string> {
-  return isToastLoading(options)
+function toastIconStyle(loading: boolean): Record<string, string> {
+  return loading
     ? {
         position: 'relative',
         display: 'inline-flex',
         alignItems: 'center',
         justifyContent: 'center',
-        width: 'var(--toast-icon-size, 1em)',
-        height: 'var(--toast-icon-size, 1em)',
+        width: '1.25rem',
+        height: '1.25rem',
         flex: '0 0 auto',
       }
     : {};
 }
 
-function toastIconContent(
-  theme: ToastTheme,
-  options: ToastOptions
-): HTMLElement | SVGElement | null {
-  if (isToastLoading(options)) return createLoading();
-  return theme ? icon(theme) : null;
-}
-
-function toastMessage(message: string, options: ToastOptions): string {
-  return isToastLoading(options)
-    ? options.text?.loading || translate('Loading...')
-    : message;
-}
-
-async function closeByUser(
-  toast: HTMLElement,
-  options: ToastOptions
-): Promise<void> {
-  const shouldCancel = isToastLoading(options);
-  hide(toast);
-  if (shouldCancel) await options.onCancel?.();
-  await options.onClose?.();
-}
-
-function bindToastStatus(
-  element: HTMLElement,
-  iconElement: HTMLElement,
-  messageElement: HTMLElement,
-  message: string,
-  theme: ToastTheme,
-  options: ToastOptions,
-  duration = 0
-): void {
-  const id = element.dataset.toast || randomId();
-  const dispose = createRoot((dispose) => {
-    insert(
-      element,
-      () => (theme || isToastLoading(options) ? iconElement : null),
-      messageElement
-    );
-    insert(iconElement, () => toastIconContent(theme, options));
-    insert(messageElement, () => toastMessage(message, options));
-    createEffect(() => {
-      cancelToastTimers(id);
-      if (duration > 0 && !isToastLoading(options)) {
-        setToastTimer(id, 'hide', () => hide(element), duration);
-      }
-    });
-    return dispose;
-  });
-  addToastDisposer(element, dispose);
-}
-
 function getOrCreateContainer(names: ToastClassNames): HTMLElement {
   let container = q<HTMLElement>('[data-toast-container]');
   if (!container) {
@@ -357,10 +323,16 @@ function hide(toast: HTMLElement | null | undefined): void {
   });
 }
 
-function show(message = '', options: ToastOptions = {}): HTMLElement {
+function createToast(
+  message: string,
+  options: ToastOptions,
+  status: () => ToastStatus,
+  kind: ToastKind = 'show',
+  onCancel?: () => void | Promise<void>
+): HTMLElement {
   const once = options.once ?? false;
   if (once) {
-    const toast = getSingletonToast('show');
+    const toast = getSingletonToast(kind);
     if (toast) return toast;
   }
   validateParam('message', message, 'string', 'Toast.show');
@@ -374,42 +346,140 @@ function show(message = '', options: ToastOptions = {}): HTMLElement {
     classNames,
     options.className ?? {}
   ) as ToastClassNames;
-  const id = randomId();
-  const iconElement = jsx('span', {
-    className: names.icon,
-    'data-toast-icon': id,
-    style: () => toastIconStyle(options),
-  }) as HTMLElement;
-  const messageElement = jsx('span', {
-    className: names.message,
-    'data-toast-message': id,
-  }) as HTMLElement;
-  const toast = jsx('div', {
-    className: joinClasses(names.toast, theme ? names[theme] : ''),
-    'data-toast': id,
-    role: 'alert',
-    'aria-atomic': 'true',
-    children: messageElement,
-  }) as HTMLElement;
-  bindToastStatus(
-    toast,
-    iconElement,
-    messageElement,
+  return createRoot((dispose) => {
+    const id = randomId();
+    const iconElement = jsx('span', {
+      className: names.icon,
+      'data-toast-icon': id,
+      style: () => toastIconStyle(status().loading),
+      children: () =>
+        status().loading
+          ? createLoading()
+          : status().theme
+            ? icon(status().theme)
+            : null,
+    }) as HTMLElement;
+    const messageElement = jsx('span', {
+      className: names.message,
+      'data-toast-message': id,
+      children: () => status().message,
+    }) as HTMLElement;
+    const description = options.description ?? '';
+    const descriptionElement = description
+      ? jsx('span', {
+          className: names.description,
+          'data-toast-description': id,
+          children: description,
+        })
+      : null;
+    const toast = jsx('div', {
+      className: () =>
+        joinClasses(
+          names.toast,
+          status().theme ? names[status().theme as Exclude<ToastTheme, ''>] : ''
+        ),
+      'data-toast': id,
+      role: 'alert',
+      'aria-atomic': 'true',
+      'aria-live': () => (status().theme === 'error' ? 'assertive' : 'polite'),
+      children: [messageElement, descriptionElement],
+    }) as HTMLElement;
+    insert(
+      toast,
+      () => (status().theme || status().loading ? iconElement : null),
+      messageElement
+    );
+    createEffect(() => {
+      cancelToastTimers(id);
+      if (duration > 0 && !status().loading)
+        setToastTimer(id, 'hide', () => hide(toast), duration);
+    });
+    addToastDisposer(toast, dispose);
+    mountToast(
+      toast,
+      () => insert(getOrCreateContainer(names), toast),
+      status().theme === 'error' ? 'assertive' : 'polite'
+    );
+    setSingletonToast(kind, toast, once);
+    addToastDisposer(
+      toast,
+      listen(toast, 'click', () => {
+        const pending = status().loading;
+        hide(toast);
+        void (async () => {
+          if (pending) await onCancel?.();
+          await options.onClose?.();
+        })();
+      })
+    );
+    return toast;
+  });
+}
+
+function show(message = '', options: ToastOptions = {}): HTMLElement {
+  return createToast(message, options, () => ({
+    message,
+    theme: options.theme ?? '',
+    loading: false,
+  }));
+}
+
+const LOADING_MESSAGE = translate('Loading') + '...';
+
+function loading(message = '', options: LoadingToastOptions = {}): HTMLElement {
+  return createToast(
     message,
-    theme,
     options,
-    duration
-  );
-  mountToast(
-    toast,
-    () => insert(getOrCreateContainer(names), toast),
-    theme === 'error' ? 'assertive' : 'polite'
-  );
-  setSingletonToast('show', toast, once);
-  addToastDisposer(
-    toast,
-    listen(toast, 'click', () => void closeByUser(toast, options))
+    () => {
+      const pending = !!access(options.loading ?? false);
+      return {
+        message: pending ? (options.text?.loading ?? LOADING_MESSAGE) : message,
+        theme: pending ? '' : 'success',
+        loading: pending,
+      };
+    },
+    'loading',
+    options.onCancel
   );
+}
+
+function promise<T>(
+  task: Promise<T>,
+  options: PromiseToastOptions = {}
+): HTMLElement {
+  const [status, setStatus] = createSignal<ToastStatus>({
+    message: options.text?.loading ?? LOADING_MESSAGE,
+    theme: '',
+    loading: true,
+  });
+  const toast = createToast('', options, status, 'show', options.onCancel);
+  let disposed = false;
+  addToastDisposer(toast, () => {
+    disposed = true;
+  });
+  // Observe both outcomes even after dismissal so a late rejection is consumed.
+  void task
+    .then(
+      async () => {
+        if (disposed) return;
+        setStatus({
+          message: options.text?.success ?? translate('Success'),
+          theme: 'success',
+          loading: false,
+        });
+        await options.onSuccess?.();
+      },
+      async () => {
+        if (disposed) return;
+        setStatus({
+          message: options.text?.error ?? translate('Error'),
+          theme: 'error',
+          loading: false,
+        });
+        await options.onError?.();
+      }
+    )
+    .catch(console.error);
   return toast;
 }
 
@@ -443,7 +513,7 @@ function lite(
   return element;
 }
 
-function confirm(message = '', props: ToastConfirmProps = {}): HTMLElement {
+function confirm(message = '', props: ConfirmToastOptions = {}): HTMLElement {
   const once = props.once ?? true;
   if (once) {
     const toast = getSingletonToast('confirm');
@@ -453,13 +523,18 @@ function confirm(message = '', props: ToastConfirmProps = {}): HTMLElement {
   const closeText = props.text?.close || translate('Close');
   const confirmText = props.text?.confirm || translate('Confirm');
   validateParam('once', once, 'boolean', 'Toast.confirm');
+  const duration = props.duration ?? 3000;
+  const theme = props.theme ?? '';
+  validateParam('duration', duration, TOAST_DURATION_RULE, 'Toast.confirm');
+  validateParam('theme', theme, TOAST_THEME_RULE, 'Toast.confirm');
+  const description = props.description ?? '';
   const names = mergeShallowConfig(
     classNames,
     props.className ?? {}
   ) as ToastClassNames;
   const id = randomId();
   const element = jsx('div', {
-    className: names.confirm,
+    className: joinClasses(names.confirm, theme ? names[theme] : ''),
     'data-toast': id,
     'data-toast-confirm': '',
     children: [
@@ -468,6 +543,12 @@ function confirm(message = '', props: ToastConfirmProps = {}): HTMLElement {
         'data-toast-message': id,
         children: message,
       }),
+      description
+        ? jsx('div', {
+            className: names.description,
+            children: description,
+          })
+        : null,
       jsx('div', {
         className: names.buttons,
         'data-toast-buttons': id,
@@ -505,6 +586,7 @@ function confirm(message = '', props: ToastConfirmProps = {}): HTMLElement {
     }
   );
   setSingletonToast('confirm', element, once);
+  if (duration > 0) setToastTimer(id, 'hide', () => hide(element), duration);
   return element;
 }
 
@@ -532,6 +614,8 @@ export const Toast = {
     return { className: classNames };
   },
   show,
+  loading,
+  promise,
   info: (message = '', options: ToastOptions = {}) =>
     show(message, { ...options, theme: 'info' }),
   success: (message = '', options: ToastOptions = {}) =>

package/src/primitives/tooltip.ts

@@ -39,7 +39,7 @@ interface TooltipClassNames {
 
 interface TooltipThemeClassNames {
   reverse: string;
-  primary: string;
+  info: string;
   success: string;
   warning: string;
   error: string;
@@ -48,7 +48,7 @@ interface TooltipThemeClassNames {
 type TooltipTheme =
   | false
   | 'reverse'
-  | 'primary'
+  | 'info'
   | 'success'
   | 'warning'
   | 'error';
@@ -95,7 +95,7 @@ const DEFAULT_CLASS_NAMES: TooltipClassNames = {
   message: 'el-text',
   ui: {
     reverse: 'is-reverse',
-    primary: 'is-primary',
+    info: 'is-info',
     success: 'is-success',
     warning: 'is-warning',
     error: 'is-error',
@@ -131,7 +131,7 @@ const TOOLTIP_OPTIONS_SCHEMA = {
   theme: {
     default: false,
     types: ['string', 'boolean'],
-    enum: [false, 'reverse', 'primary', 'success', 'warning', 'error'],
+    enum: [false, 'reverse', 'info', 'success', 'warning', 'error'],
   },
   cache: { default: false, type: 'boolean' },
   ttl: {

package/src/utilities/browser.ts

@@ -132,7 +132,7 @@ export function checkModernBrowser(): SupportES2022 {
         window.open('https://www.google.cn/chrome/fallback/', '_blank');
       },
       className: {
-        confirmBtn: 'j-button is-sm is-danger',
+        confirmBtn: 'j-btn is-sm is-danger',
       },
     });
     return false;