Skip to content

Commit

Permalink
feat: add a countdown on sl-alert (#1899)
Browse files Browse the repository at this point in the history
Co-authored-by: rcatoio <rcatoio@doubletrade.com>
  • Loading branch information
RoCat and rcatoio committed Sep 10, 2024
1 parent 906e7ba commit 6bac3fa
Show file tree
Hide file tree
Showing 3 changed files with 178 additions and 6 deletions.
63 changes: 63 additions & 0 deletions docs/pages/components/alert.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,69 @@ const App = () => {
};
```

### Countdown

Set the `countdown` attribute to display a loading bar that indicates the alert remaining time. This is useful for alerts with relatively long duration.

```html:preview
<div class="alert-countdown">
<sl-button variant="primary">Show Alert</sl-button>
<sl-alert variant="primary" duration="10000" countdown="rtl" closable>
<sl-icon slot="icon" name="info-circle"></sl-icon>
You're not stuck, the alert will close after a pretty long duration.
</sl-alert>
</div>
<script>
const container = document.querySelector('.alert-countdown');
const button = container.querySelector('sl-button');
const alert = container.querySelector('sl-alert');
button.addEventListener('click', () => alert.show());
</script>
<style>
.alert-countdown sl-alert {
margin-top: var(--sl-spacing-medium);
}
</style>
```

```jsx:react
import { useState } from 'react';
import SlAlert from '@shoelace-style/shoelace/dist/react/alert';
import SlButton from '@shoelace-style/shoelace/dist/react/button';
import SlIcon from '@shoelace-style/shoelace/dist/react/icon';
const css = `
.alert-countdown sl-alert {
margin-top: var(--sl-spacing-medium);
}
`;
const App = () => {
const [open, setOpen] = useState(false);
return (
<>
<div className="alert-countdown">
<SlButton variant="primary" onClick={() => setOpen(true)}>
Show Alert
</SlButton>
<SlAlert variant="primary" duration="3000" countdown="rtl" open={open} closable onSlAfterHide={() => setOpen(false)}>
<SlIcon slot="icon" name="info-circle" />
You're not stuck, the alert will close after a pretty long duration.
</SlAlert>
</div>
<style>{css}</style>
</>
);
};
```

### Toast Notifications

To display an alert as a toast notification, or "toast", create the alert and call its `toast()` method. This will move the alert out of its position in the DOM and into [the toast stack](#the-toast-stack) where it will be shown. Once dismissed, it will be removed from the DOM completely. To reuse a toast, store a reference to it and call `toast()` again later on.
Expand Down
73 changes: 67 additions & 6 deletions src/components/alert/alert.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getAnimation, setDefaultAnimation } from '../../utilities/animation-reg
import { HasSlotController } from '../../internal/slot.js';
import { html } from 'lit';
import { LocalizeController } from '../../utilities/localize.js';
import { property, query } from 'lit/decorators.js';
import { property, query, state } from 'lit/decorators.js';
import { waitForEvent } from '../../internal/event.js';
import { watch } from '../../internal/watch.js';
import componentStyles from '../../styles/component.styles.js';
Expand Down Expand Up @@ -45,11 +45,15 @@ export default class SlAlert extends ShoelaceElement {
static dependencies = { 'sl-icon-button': SlIconButton };

private autoHideTimeout: number;
private remainingTimeInterval: number;
private countdownAnimation?: Animation;
private readonly hasSlotController = new HasSlotController(this, 'icon', 'suffix');
private readonly localize = new LocalizeController(this);

@query('[part~="base"]') base: HTMLElement;

@query('.alert__countdown-elapsed') countdownElement: HTMLElement;

/**
* Indicates whether or not the alert is open. You can toggle this attribute to show and hide the alert, or you can
* use the `show()` and `hide()` methods and this attribute will reflect the alert's open state.
Expand All @@ -69,23 +73,61 @@ export default class SlAlert extends ShoelaceElement {
*/
@property({ type: Number }) duration = Infinity;

/**
* Enables a countdown that indicates the remaining time the alert will be displayed.
* Typically used to indicate the remaining time before a whole app refresh.
*/
@property({ type: String, reflect: true }) countdown?: 'rtl' | 'ltr';

@state() private remainingTime = this.duration;

firstUpdated() {
this.base.hidden = !this.open;
}

private restartAutoHide() {
this.handleCountdownChange();
clearTimeout(this.autoHideTimeout);
clearInterval(this.remainingTimeInterval);
if (this.open && this.duration < Infinity) {
this.autoHideTimeout = window.setTimeout(() => this.hide(), this.duration);
this.remainingTime = this.duration;
this.remainingTimeInterval = window.setInterval(() => {
this.remainingTime -= 100;
}, 100);
}
}

private handleCloseClick() {
this.hide();
private pauseAutoHide() {
this.countdownAnimation?.pause();
clearTimeout(this.autoHideTimeout);
clearInterval(this.remainingTimeInterval);
}

private handleMouseMove() {
this.restartAutoHide();
private resumeAutoHide() {
if (this.duration < Infinity) {
this.autoHideTimeout = window.setTimeout(() => this.hide(), this.remainingTime);
this.remainingTimeInterval = window.setInterval(() => {
this.remainingTime -= 100;
}, 100);
this.countdownAnimation?.play();
}
}

private handleCountdownChange() {
if (this.open && this.duration < Infinity && this.countdown) {
const { countdownElement } = this;
const start = '100%';
const end = '0';
this.countdownAnimation = countdownElement.animate([{ width: start }, { width: end }], {
duration: this.duration,
easing: 'linear'
});
}
}

private handleCloseClick() {
this.hide();
}

@watch('open', { waitUntilFirstUpdate: true })
Expand All @@ -109,6 +151,7 @@ export default class SlAlert extends ShoelaceElement {
this.emit('sl-hide');

clearTimeout(this.autoHideTimeout);
clearInterval(this.remainingTimeInterval);

await stopAnimations(this.base);
const { keyframes, options } = getAnimation(this, 'alert.hide', { dir: this.localize.dir() });
Expand Down Expand Up @@ -151,6 +194,7 @@ export default class SlAlert extends ShoelaceElement {
*/
async toast() {
return new Promise<void>(resolve => {
this.handleCountdownChange();
if (toastStack.parentElement === null) {
document.body.append(toastStack);
}
Expand Down Expand Up @@ -188,6 +232,7 @@ export default class SlAlert extends ShoelaceElement {
alert: true,
'alert--open': this.open,
'alert--closable': this.closable,
'alert--has-countdown': !!this.countdown,
'alert--has-icon': this.hasSlotController.test('icon'),
'alert--primary': this.variant === 'primary',
'alert--success': this.variant === 'success',
Expand All @@ -197,7 +242,8 @@ export default class SlAlert extends ShoelaceElement {
})}
role="alert"
aria-hidden=${this.open ? 'false' : 'true'}
@mousemove=${this.handleMouseMove}
@mouseenter=${this.pauseAutoHide}
@mouseleave=${this.resumeAutoHide}
>
<div part="icon" class="alert__icon">
<slot name="icon"></slot>
Expand All @@ -220,6 +266,21 @@ export default class SlAlert extends ShoelaceElement {
></sl-icon-button>
`
: ''}
<div role="timer" class="alert__timer">${this.remainingTime}</div>
${this.countdown
? html`
<div
class=${classMap({
alert__countdown: true,
'alert__countdown--ltr': this.countdown === 'ltr'
})}
>
<div class="alert__countdown-elapsed"></div>
</div>
`
: ''}
</div>
`;
}
Expand Down
48 changes: 48 additions & 0 deletions src/components/alert/alert.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default css`
line-height: 1.6;
color: var(--sl-color-neutral-700);
margin: inherit;
overflow: hidden;
}
.alert:not(.alert--has-icon) .alert__icon,
Expand All @@ -37,6 +38,10 @@ export default css`
padding-inline-start: var(--sl-spacing-large);
}
.alert--has-countdown {
border-bottom: none;
}
.alert--primary {
border-top-color: var(--sl-color-primary-600);
}
Expand Down Expand Up @@ -91,4 +96,47 @@ export default css`
font-size: var(--sl-font-size-medium);
padding-inline-end: var(--sl-spacing-medium);
}
.alert__countdown {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: calc(var(--sl-panel-border-width) * 3);
background-color: var(--sl-panel-border-color);
display: flex;
}
.alert__countdown--ltr {
justify-content: flex-end;
}
.alert__countdown .alert__countdown-elapsed {
height: 100%;
width: 0;
}
.alert--primary .alert__countdown-elapsed {
background-color: var(--sl-color-primary-600);
}
.alert--success .alert__countdown-elapsed {
background-color: var(--sl-color-success-600);
}
.alert--neutral .alert__countdown-elapsed {
background-color: var(--sl-color-neutral-600);
}
.alert--warning .alert__countdown-elapsed {
background-color: var(--sl-color-warning-600);
}
.alert--danger .alert__countdown-elapsed {
background-color: var(--sl-color-danger-600);
}
.alert__timer {
display: none;
}
`;

0 comments on commit 6bac3fa

Please sign in to comment.