gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-14 03:14:24 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

chore(toast): address requested changes

Browse Source
This commit is contained in:
Elian Doran 2025-12-07 00:33:37 +02:00
parent e02440aa59
commit d3f9bb6def
No known key found for this signature in database
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/services/toast.ts
View File

@ -43,7 +43,7 @@ export function showError(message: string, timeout = 10000) {
icon: "bx bx-error-circle", icon: "bx bx-error-circle",
message, message,
timeout timeout
}) });
} }
function showErrorTitleAndMessage(title: string, message: string, timeout = 10000) { function showErrorTitleAndMessage(title: string, message: string, timeout = 10000) {
@ -73,7 +73,7 @@ function updateToast(id: string, partial: Partial<ToastOptions>) {
return { ...toast, ...partial } return { ...toast, ...partial }
} }
return toast; return toast;
}) });
} }
export function removeToastFromStore(id: string) { export function removeToastFromStore(id: string) {

2
apps/client/src/widgets/Toast.css
View File

@ -55,5 +55,5 @@
inset-inline-end: 0; inset-inline-end: 0;
background-color: var(--toast-text-color) !important; background-color: var(--toast-text-color) !important;
height: 4px; height: 4px;
transition: width 0.1s linear; transition: width 0.1s linear;
} }

7
apps/client/src/widgets/Toast.tsx
View File

@ -23,7 +23,12 @@ function Toast({ id, title, timeout, progress, message, icon }: ToastOptionsWith
return () => clearTimeout(timerId); return () => clearTimeout(timerId);
}, [ id, timeout ]); }, [ id, timeout ]);
const closeButton = <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close" />; const closeButton = (
<button
type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"
onClick={() => removeToastFromStore(id)}
/>
);
const toastIcon = <Icon icon={icon.startsWith("bx ") ? icon : `bx bx-${icon}`} />; const toastIcon = <Icon icon={icon.startsWith("bx ") ? icon : `bx bx-${icon}`} />;
return ( return (

2
apps/client/src/widgets/basic_widget.ts
View File

@ -185,7 +185,7 @@ export class TypedBasicWidget<T extends TypedComponent<any>> extends TypedCompon
}); });
} else { } else {
toastService.showPersistent({ toastService.showPersistent({
id: `custom-widget-failure-${noteId}`, id: `custom-widget-failure-unknown-${crypto.randomUUID()}`,
title: t("toast.widget-error.title"), title: t("toast.widget-error.title"),
icon: "bx bx-error-circle", icon: "bx bx-error-circle",
message: t("toast.widget-error.message-unknown", { message: t("toast.widget-error.message-unknown", {