-
-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Add toasts to UI #25449
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.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Add toasts to UI #25449
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
c7dc1c3
Add toasts to UI
silverwind 763c067
replace all calls to window.alert
silverwind 1dab681
fix lint
silverwind 85c7ecf
better eslint fix
silverwind 35976d4
css cleanup
silverwind ad0a677
reduce success duration
silverwind dd4b811
reduce even more
silverwind b050eff
fine-tune padding
silverwind cdb1781
remove wrapper div
silverwind 28dab75
refactor duration
silverwind f153397
use more unique window exports
silverwind 1b8e9d8
add warning toast
silverwind b2e54a7
cleanup whitespace
silverwind 0ac7963
Update .eslintrc.yaml
silverwind 9d43691
Merge branch 'main' into toast
silverwind 16731bd
Update web_src/css/modules/toast.css
silverwind 89b7942
Update web_src/js/modules/toast.js
silverwind 58f3f13
Update web_src/js/modules/toast.js
silverwind c5f8dea
Update web_src/js/modules/toast.js
silverwind f5e1c72
Update web_src/js/modules/toast.js
silverwind 8c7d769
Update web_src/js/modules/toast.test.js
silverwind 6acc3da
Merge branch 'main' into toast
silverwind 2703889
Merge branch 'main' into toast
silverwind 34bc156
add 'Toast' suffix to function names
silverwind d255eac
add devtest webpack chunk
silverwind 5ffe590
fix text overflow in toast
silverwind 2c06b58
remove margin
silverwind 107cd8b
speed up animation
silverwind f46bca9
show info toast longer
silverwind 1f64d56
remove unnecessary font-size
silverwind de6c279
remove unnecessary pointer-events
silverwind f1b7e9c
Merge branch 'main' into toast
GiteaBot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
.toastify { | ||
color: var(--color-white); | ||
position: fixed; | ||
opacity: 0; | ||
transition: all .2s ease; | ||
z-index: 500; | ||
border-radius: 4px; | ||
box-shadow: 0 8px 24px var(--color-shadow); | ||
display: flex; | ||
max-width: 50vw; | ||
min-width: 300px; | ||
padding: 4px; | ||
} | ||
|
||
.toastify.on { | ||
opacity: 1; | ||
} | ||
|
||
.toast-body { | ||
flex: 1; | ||
padding: 5px 0; | ||
overflow-wrap: anywhere; | ||
} | ||
|
||
.toast-close, | ||
.toast-icon { | ||
color: currentcolor; | ||
border-radius: 3px; | ||
background: transparent; | ||
border: none; | ||
display: inline-block; | ||
display: flex; | ||
width: 30px; | ||
height: 30px; | ||
justify-content: center; | ||
align-items: center; | ||
} | ||
|
||
.toast-close:hover { | ||
background: var(--color-hover); | ||
} | ||
|
||
.toast-close:active { | ||
background: var(--color-active); | ||
} | ||
|
||
.toastify-right { | ||
right: 15px; | ||
} | ||
|
||
.toastify-left { | ||
left: 15px; | ||
} | ||
|
||
.toastify-top { | ||
top: -150px; | ||
} | ||
|
||
.toastify-bottom { | ||
bottom: -150px; | ||
} | ||
|
||
.toastify-center { | ||
margin-left: auto; | ||
margin-right: auto; | ||
left: 0; | ||
right: 0; | ||
} | ||
|
||
@media (max-width: 360px) { | ||
.toastify-right, .toastify-left { | ||
margin-left: auto; | ||
margin-right: auto; | ||
left: 0; | ||
right: 0; | ||
max-width: fit-content; | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
.button-sample-groups { | ||
margin: 0; padding: 0; | ||
} | ||
|
||
.button-sample-groups .sample-group { | ||
list-style: none; margin: 0; padding: 0; | ||
} | ||
|
||
.button-sample-groups .sample-group .ui.button { | ||
margin-bottom: 5px; | ||
} | ||
|
||
h1, h2 { | ||
margin: 0; | ||
padding: 10px 0; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
import {htmlEscape} from 'escape-goat'; | ||
import {svg} from '../svg.js'; | ||
|
||
const levels = { | ||
info: { | ||
icon: 'octicon-check', | ||
background: 'var(--color-green)', | ||
duration: 2500, | ||
}, | ||
warning: { | ||
icon: 'gitea-exclamation', | ||
background: 'var(--color-orange)', | ||
duration: -1, // requires dismissal to hide | ||
}, | ||
error: { | ||
icon: 'gitea-exclamation', | ||
background: 'var(--color-red)', | ||
duration: -1, // requires dismissal to hide | ||
}, | ||
}; | ||
|
||
// See https://github.com/apvarun/toastify-js#api for options | ||
async function showToast(message, level, {gravity, position, duration, ...other} = {}) { | ||
if (!message) return; | ||
|
||
const {default: Toastify} = await import(/* webpackChunkName: 'toastify' */'toastify-js'); | ||
const {icon, background, duration: levelDuration} = levels[level ?? 'info']; | ||
|
||
const toast = Toastify({ | ||
text: ` | ||
<div class='toast-icon'>${svg(icon)}</div> | ||
<div class='toast-body'>${htmlEscape(message)}</div> | ||
<button class='toast-close'>${svg('octicon-x')}</button> | ||
`, | ||
escapeMarkup: false, | ||
gravity: gravity ?? 'top', | ||
position: position ?? 'center', | ||
duration: duration ?? levelDuration, | ||
style: {background}, | ||
...other, | ||
}); | ||
|
||
toast.showToast(); | ||
|
||
toast.toastElement.querySelector('.toast-close').addEventListener('click', () => { | ||
toast.removeElement(toast.toastElement); | ||
}); | ||
} | ||
|
||
export async function showInfoToast(message, opts) { | ||
return await showToast(message, 'info', opts); | ||
} | ||
|
||
export async function showWarningToast(message, opts) { | ||
return await showToast(message, 'warning', opts); | ||
} | ||
|
||
export async function showErrorToast(message, opts) { | ||
return await showToast(message, 'error', opts); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import {test, expect} from 'vitest'; | ||
import {showInfoToast, showErrorToast, showWarningToast} from './toast.js'; | ||
|
||
test('showInfoToast', async () => { | ||
await showInfoToast('success 😀', {duration: -1}); | ||
expect(document.querySelector('.toastify')).toBeTruthy(); | ||
}); | ||
|
||
test('showWarningToast', async () => { | ||
await showWarningToast('warning 😐', {duration: -1}); | ||
expect(document.querySelector('.toastify')).toBeTruthy(); | ||
}); | ||
|
||
test('showErrorToast', async () => { | ||
await showErrorToast('error 🙁', {duration: -1}); | ||
expect(document.querySelector('.toastify')).toBeTruthy(); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import {showInfoToast, showWarningToast, showErrorToast} from '../modules/toast.js'; | ||
|
||
document.getElementById('info-toast').addEventListener('click', () => { | ||
showInfoToast('success 😀'); | ||
}); | ||
document.getElementById('warning-toast').addEventListener('click', () => { | ||
showWarningToast('warning 😐'); | ||
}); | ||
document.getElementById('error-toast').addEventListener('click', () => { | ||
showErrorToast('error 🙁'); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.