Skip to content

fix(toast): loading svg #1559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Jan 22, 2025
Merged

fix(toast): loading svg #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion lib/toast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { t } from './utils/l10n.js'

import '../styles/toast.scss'

import LoaderSvg from '../styles/loader.svg?raw'

/**
* Enum of available Toast types
*/
Expand Down Expand Up @@ -204,7 +206,18 @@ export function showSuccess(text: string, options?: ToastOptions): Toast {
* @param options
*/
export function showLoading(text: string, options?: ToastOptions): Toast {
return showMessage(text, {
// Generate loader svg
const loader = document.createElement('span')
loader.innerHTML = LoaderSvg
loader.classList.add('toast-loader')

// Generate loader layout
const loaderContent = document.createElement('span')
loaderContent.classList.add('toast-loader-container')
loaderContent.innerText = text
loaderContent.appendChild(loader)

return showMessage(loaderContent, {
...options,
close: false,
timeout: TOAST_PERMANENT_TIMEOUT,
Expand Down
9 changes: 3 additions & 6 deletions styles/toast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
align-items: center;
min-height: 50px;

.toast-loader-container,
.toast-undo-container {
display: flex;
align-items: center;
width: 100%;
}

.toast-undo-button,
Expand Down Expand Up @@ -106,12 +108,7 @@
&.toast-loading {
border-left: 3px solid var(--color-primary);

&::after {
background-image: url('./loader.svg');
background-repeat: no-repeat;
background-position: center;
background-color: transparent;
content: ' ';
.toast-loader {
display: inline-block;
width: 20px;
height: 20px;
Expand Down