diff options
Diffstat (limited to 'web_src/js/modules/toast.js')
-rw-r--r-- | web_src/js/modules/toast.js | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/web_src/js/modules/toast.js b/web_src/js/modules/toast.js index d12d203718..627e24a1ff 100644 --- a/web_src/js/modules/toast.js +++ b/web_src/js/modules/toast.js @@ -1,5 +1,6 @@ import {htmlEscape} from 'escape-goat'; import {svg} from '../svg.js'; +import {animateOnce, showElem} from '../utils/dom.js'; import Toastify from 'toastify-js'; // don't use "async import", because when network error occurs, the "async import" also fails and nothing is shown const levels = { @@ -21,13 +22,28 @@ const levels = { }; // See https://github.com/apvarun/toastify-js#api for options -function showToast(message, level, {gravity, position, duration, useHtmlBody, ...other} = {}) { +function showToast(message, level, {gravity, position, duration, useHtmlBody, preventDuplicates = true, ...other} = {}) { + const body = useHtmlBody ? String(message) : htmlEscape(message); + const key = `${level}-${body}`; + + // prevent showing duplicate toasts with same level and message, and give a visual feedback for end users + if (preventDuplicates) { + const toastEl = document.querySelector(`.toastify[data-toast-unique-key="${CSS.escape(key)}"]`); + if (toastEl) { + const toastDupNumEl = toastEl.querySelector('.toast-duplicate-number'); + showElem(toastDupNumEl); + toastDupNumEl.textContent = String(Number(toastDupNumEl.textContent) + 1); + animateOnce(toastDupNumEl, 'pulse-1p5-200'); + return; + } + } + const {icon, background, duration: levelDuration} = levels[level ?? 'info']; const toast = Toastify({ text: ` <div class='toast-icon'>${svg(icon)}</div> - <div class='toast-body'>${useHtmlBody ? message : htmlEscape(message)}</div> - <button class='toast-close'>${svg('octicon-x')}</button> + <div class='toast-body'><span class="toast-duplicate-number tw-hidden">1</span>${body}</div> + <button class='btn toast-close'>${svg('octicon-x')}</button> `, escapeMarkup: false, gravity: gravity ?? 'top', @@ -39,6 +55,7 @@ function showToast(message, level, {gravity, position, duration, useHtmlBody, .. toast.showToast(); toast.toastElement.querySelector('.toast-close').addEventListener('click', () => toast.hideToast()); + toast.toastElement.setAttribute('data-toast-unique-key', key); return toast; } |