forked from external-repos/squoosh
Compare commits
5 Commits
extract-pi
...
snackbar-t
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
44b1960e65 | ||
|
|
fa584e3647 | ||
|
|
fa731dc7d5 | ||
|
|
dac0b9d2cd | ||
|
|
1cf75b5b63 |
@@ -4,7 +4,7 @@ import { bind, linkRef, Fileish } from '../../lib/initial-util';
|
|||||||
import * as style from './style.scss';
|
import * as style from './style.scss';
|
||||||
import { FileDropEvent } from './custom-els/FileDrop';
|
import { FileDropEvent } from './custom-els/FileDrop';
|
||||||
import './custom-els/FileDrop';
|
import './custom-els/FileDrop';
|
||||||
import SnackBarElement from '../../lib/SnackBar';
|
import SnackBarElement, { SnackOptions } from '../../lib/SnackBar';
|
||||||
import '../../lib/SnackBar';
|
import '../../lib/SnackBar';
|
||||||
import Intro from '../intro';
|
import Intro from '../intro';
|
||||||
import '../custom-els/LoadingSpinner';
|
import '../custom-els/LoadingSpinner';
|
||||||
@@ -39,7 +39,7 @@ export default class App extends Component<Props, State> {
|
|||||||
import('../compress').then((module) => {
|
import('../compress').then((module) => {
|
||||||
this.setState({ Compress: module.default });
|
this.setState({ Compress: module.default });
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.showError('Failed to load app');
|
this.showSnack('Failed to load app');
|
||||||
});
|
});
|
||||||
|
|
||||||
// In development, persist application state across hot reloads:
|
// In development, persist application state across hot reloads:
|
||||||
@@ -66,9 +66,9 @@ export default class App extends Component<Props, State> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@bind
|
@bind
|
||||||
private showError(error: string) {
|
private showSnack(message: string, options: SnackOptions = {}): Promise<string> {
|
||||||
if (!this.snackbar) throw Error('Snackbar missing');
|
if (!this.snackbar) throw Error('Snackbar missing');
|
||||||
this.snackbar.showSnackbar({ message: error });
|
return this.snackbar.showSnackbar(message, options);
|
||||||
}
|
}
|
||||||
|
|
||||||
render({}: Props, { file, Compress }: State) {
|
render({}: Props, { file, Compress }: State) {
|
||||||
@@ -76,9 +76,9 @@ export default class App extends Component<Props, State> {
|
|||||||
<div id="app" class={style.app}>
|
<div id="app" class={style.app}>
|
||||||
<file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
|
<file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
|
||||||
{(!file)
|
{(!file)
|
||||||
? <Intro onFile={this.onIntroPickFile} onError={this.showError} />
|
? <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
|
||||||
: (Compress)
|
: (Compress)
|
||||||
? <Compress file={file} onError={this.showError} />
|
? <Compress file={file} showSnack={this.showSnack} />
|
||||||
: <loading-spinner class={style.appLoader}/>
|
: <loading-spinner class={style.appLoader}/>
|
||||||
}
|
}
|
||||||
<snack-bar ref={linkRef(this, 'snackbar')} />
|
<snack-bar ref={linkRef(this, 'snackbar')} />
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ import { VectorResizeOptions, BitmapResizeOptions } from '../../codecs/resize/pr
|
|||||||
import './custom-els/MultiPanel';
|
import './custom-els/MultiPanel';
|
||||||
import Results from '../results';
|
import Results from '../results';
|
||||||
import { ExpandIcon, CopyAcrossIconProps } from '../../lib/icons';
|
import { ExpandIcon, CopyAcrossIconProps } from '../../lib/icons';
|
||||||
|
import SnackBarElement from 'src/lib/SnackBar';
|
||||||
|
|
||||||
export interface SourceImage {
|
export interface SourceImage {
|
||||||
file: File | Fileish;
|
file: File | Fileish;
|
||||||
@@ -58,7 +59,7 @@ interface EncodedImage {
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
file: File | Fileish;
|
file: File | Fileish;
|
||||||
onError: (msg: string) => void;
|
showSnack: SnackBarElement['showSnackbar'];
|
||||||
}
|
}
|
||||||
|
|
||||||
interface State {
|
interface State {
|
||||||
@@ -250,12 +251,24 @@ export default class Compress extends Component<Props, State> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private onCopyToOtherClick(index: 0 | 1) {
|
private async onCopyToOtherClick(index: 0 | 1) {
|
||||||
const otherIndex = (index + 1) % 2;
|
const otherIndex = (index + 1) % 2;
|
||||||
|
const oldSettings = this.state.images[otherIndex];
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
images: cleanSet(this.state.images, otherIndex, this.state.images[index]),
|
images: cleanSet(this.state.images, otherIndex, this.state.images[index]),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const result = await this.props.showSnack('Settings copied across', {
|
||||||
|
timeout: 5000,
|
||||||
|
actions: ['undo', 'dismiss'],
|
||||||
|
});
|
||||||
|
|
||||||
|
if (result !== 'undo') return;
|
||||||
|
|
||||||
|
this.setState({
|
||||||
|
images: cleanSet(this.state.images, otherIndex, oldSettings),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@bind
|
@bind
|
||||||
@@ -318,7 +331,7 @@ export default class Compress extends Component<Props, State> {
|
|||||||
console.error(err);
|
console.error(err);
|
||||||
// Another file has been opened before this one processed.
|
// Another file has been opened before this one processed.
|
||||||
if (this.state.loadingCounter !== loadingCounter) return;
|
if (this.state.loadingCounter !== loadingCounter) return;
|
||||||
this.props.onError('Invalid image');
|
this.props.showSnack('Invalid image');
|
||||||
this.setState({ loading: false });
|
this.setState({ loading: false });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -377,7 +390,7 @@ export default class Compress extends Component<Props, State> {
|
|||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (err.name === 'AbortError') return;
|
if (err.name === 'AbortError') return;
|
||||||
this.props.onError(`Processing error (type=${image.encoderState.type}): ${err}`);
|
this.props.showSnack(`Processing error (type=${image.encoderState.type}): ${err}`);
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import artworkIcon from './imgs/demos/artwork-icon.jpg';
|
|||||||
import deviceScreenIcon from './imgs/demos/device-screen-icon.jpg';
|
import deviceScreenIcon from './imgs/demos/device-screen-icon.jpg';
|
||||||
import logoIcon from './imgs/demos/logo-icon.png';
|
import logoIcon from './imgs/demos/logo-icon.png';
|
||||||
import * as style from './style.scss';
|
import * as style from './style.scss';
|
||||||
|
import SnackBarElement from '../../lib/SnackBar';
|
||||||
|
|
||||||
const demos = [
|
const demos = [
|
||||||
{
|
{
|
||||||
@@ -42,7 +43,7 @@ const demos = [
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
onFile: (file: File | Fileish) => void;
|
onFile: (file: File | Fileish) => void;
|
||||||
onError: (error: string) => void;
|
showSnack: SnackBarElement['showSnackbar'];
|
||||||
}
|
}
|
||||||
interface State {
|
interface State {
|
||||||
fetchingDemoIndex?: number;
|
fetchingDemoIndex?: number;
|
||||||
@@ -79,7 +80,7 @@ export default class Intro extends Component<Props, State> {
|
|||||||
this.props.onFile(file);
|
this.props.onFile(file);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
this.setState({ fetchingDemoIndex: undefined });
|
this.setState({ fetchingDemoIndex: undefined });
|
||||||
this.props.onError("Couldn't fetch demo image");
|
this.props.showSnack("Couldn't fetch demo image");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,114 +1,96 @@
|
|||||||
import './styles.css';
|
import * as style from './styles.css';
|
||||||
|
|
||||||
const DEFAULT_TIMEOUT = 2750;
|
|
||||||
|
|
||||||
export interface SnackOptions {
|
export interface SnackOptions {
|
||||||
message: string;
|
|
||||||
timeout?: number;
|
timeout?: number;
|
||||||
actionText?: string;
|
actions?: string[];
|
||||||
actionHandler?: () => boolean | null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SnackShowResult {
|
function createSnack(message: string, options: SnackOptions): [Element, Promise<string>] {
|
||||||
action: boolean;
|
const {
|
||||||
}
|
timeout = 0,
|
||||||
|
actions = [],
|
||||||
|
} = options;
|
||||||
|
|
||||||
class Snack {
|
// Provide a default 'dismiss' action
|
||||||
private _onremove: ((result: SnackShowResult) => void)[] = [];
|
if (!timeout && actions.length === 0) actions.push('dismiss');
|
||||||
private _options: SnackOptions;
|
|
||||||
private _element: Element = document.createElement('div');
|
|
||||||
private _text: Element = document.createElement('div');
|
|
||||||
private _button: Element = document.createElement('button');
|
|
||||||
private _showing = false;
|
|
||||||
private _closeTimer?: number;
|
|
||||||
private _result: SnackShowResult = {
|
|
||||||
action: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
constructor (options: SnackOptions, callback?: (result: SnackShowResult) => void) {
|
const el = document.createElement('div');
|
||||||
this._options = options;
|
el.className = style.snackbar;
|
||||||
|
el.setAttribute('aria-live', 'assertive');
|
||||||
|
el.setAttribute('aria-atomic', 'true');
|
||||||
|
el.setAttribute('aria-hidden', 'false');
|
||||||
|
|
||||||
this._element.className = 'snackbar';
|
const text = document.createElement('div');
|
||||||
this._element.setAttribute('aria-live', 'assertive');
|
text.className = style.text;
|
||||||
this._element.setAttribute('aria-atomic', 'true');
|
text.textContent = message;
|
||||||
this._element.setAttribute('aria-hidden', 'true');
|
el.appendChild(text);
|
||||||
|
|
||||||
this._text.className = 'snackbar--text';
|
const result = new Promise<string>((resolve) => {
|
||||||
this._text.textContent = options.message;
|
let timeoutId: number;
|
||||||
this._element.appendChild(this._text);
|
|
||||||
|
|
||||||
if (options.actionText) {
|
// Add action buttons
|
||||||
this._button.className = 'snackbar--button';
|
for (const action of actions) {
|
||||||
this._button.textContent = options.actionText;
|
const button = document.createElement('button');
|
||||||
this._button.addEventListener('click', () => {
|
button.className = style.button;
|
||||||
if (this._showing) {
|
button.textContent = action;
|
||||||
if (options.actionHandler && options.actionHandler() === false) return;
|
button.addEventListener('click', () => {
|
||||||
this._result.action = true;
|
clearTimeout(timeoutId);
|
||||||
}
|
resolve(action);
|
||||||
this.hide();
|
|
||||||
});
|
});
|
||||||
this._element.appendChild(this._button);
|
el.appendChild(button);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (callback) {
|
// Add timeout
|
||||||
this._onremove.push(callback);
|
if (timeout) {
|
||||||
|
timeoutId = self.setTimeout(
|
||||||
|
() => resolve(''),
|
||||||
|
timeout,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
cancelTimer () {
|
return [el, result];
|
||||||
if (this._closeTimer != null) clearTimeout(this._closeTimer);
|
|
||||||
}
|
|
||||||
|
|
||||||
show (parent: Element): Promise<SnackShowResult> {
|
|
||||||
if (this._showing) return Promise.resolve(this._result);
|
|
||||||
this._showing = true;
|
|
||||||
this.cancelTimer();
|
|
||||||
if (parent !== this._element.parentNode) {
|
|
||||||
parent.appendChild(this._element);
|
|
||||||
}
|
|
||||||
this._element.removeAttribute('aria-hidden');
|
|
||||||
this._closeTimer = setTimeout(this.hide.bind(this), this._options.timeout || DEFAULT_TIMEOUT);
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
this._onremove.push(resolve);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
hide () {
|
|
||||||
if (!this._showing) return;
|
|
||||||
this._showing = false;
|
|
||||||
this.cancelTimer();
|
|
||||||
this._element.addEventListener('animationend', this.remove.bind(this));
|
|
||||||
this._element.setAttribute('aria-hidden', 'true');
|
|
||||||
}
|
|
||||||
|
|
||||||
remove () {
|
|
||||||
this.cancelTimer();
|
|
||||||
const parent = this._element.parentNode;
|
|
||||||
if (parent) parent.removeChild(this._element);
|
|
||||||
this._onremove.forEach(f => f(this._result));
|
|
||||||
this._onremove = [];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default class SnackBarElement extends HTMLElement {
|
export default class SnackBarElement extends HTMLElement {
|
||||||
private _snackbars: Snack[] = [];
|
private _snackbars: [string, SnackOptions, (action: Promise<string>) => void][] = [];
|
||||||
private _processingStack = false;
|
private _processingQueue = false;
|
||||||
|
|
||||||
showSnackbar (options: SnackOptions): Promise<SnackShowResult> {
|
/**
|
||||||
return new Promise((resolve) => {
|
* Show a snackbar. Returns a promise for the name of the action clicked, or an empty string if no
|
||||||
const snack = new Snack(options, resolve);
|
* action is clicked.
|
||||||
this._snackbars.push(snack);
|
*/
|
||||||
this._processStack();
|
showSnackbar(message: string, options: SnackOptions = {}): Promise<string> {
|
||||||
|
return new Promise<string>((resolve) => {
|
||||||
|
this._snackbars.push([message, options, resolve]);
|
||||||
|
if (!this._processingQueue) this._processQueue();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _processStack () {
|
private async _processQueue() {
|
||||||
if (this._processingStack === true || this._snackbars.length === 0) return;
|
this._processingQueue = true;
|
||||||
this._processingStack = true;
|
|
||||||
await this._snackbars[0].show(this);
|
while (this._snackbars[0]) {
|
||||||
this._snackbars.shift();
|
const [message, options, resolver] = this._snackbars[0];
|
||||||
this._processingStack = false;
|
const [el, result] = createSnack(message, options);
|
||||||
this._processStack();
|
// Pass the result back to the original showSnackbar call.
|
||||||
|
resolver(result);
|
||||||
|
this.appendChild(el);
|
||||||
|
|
||||||
|
// Wait for the user to click an action, or for the snack to timeout.
|
||||||
|
await result;
|
||||||
|
|
||||||
|
// Transition the snack away.
|
||||||
|
el.setAttribute('aria-hidden', 'true');
|
||||||
|
await new Promise((resolve) => {
|
||||||
|
el.addEventListener('animationend', () => resolve());
|
||||||
|
});
|
||||||
|
el.remove();
|
||||||
|
|
||||||
|
this._snackbars.shift();
|
||||||
|
}
|
||||||
|
|
||||||
|
this._processingQueue = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ snack-bar {
|
|||||||
transform-origin: center;
|
transform-origin: center;
|
||||||
color: #eee;
|
color: #eee;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
pointer-events: none;
|
|
||||||
cursor: default;
|
cursor: default;
|
||||||
will-change: transform;
|
will-change: transform;
|
||||||
animation: snackbar-show 300ms ease forwards 1;
|
animation: snackbar-show 300ms ease forwards 1;
|
||||||
@@ -53,13 +52,13 @@ snack-bar {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.snackbar--text {
|
.text {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
font-size: 100%;
|
font-size: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.snackbar--button {
|
.button {
|
||||||
position: relative;
|
position: relative;
|
||||||
flex: 0 1 auto;
|
flex: 0 1 auto;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
@@ -75,16 +74,15 @@ snack-bar {
|
|||||||
font-size: 100%;
|
font-size: 100%;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
pointer-events: all;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
transition: background-color 200ms ease;
|
transition: background-color 200ms ease;
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
.snackbar--button:hover {
|
.button:hover {
|
||||||
background-color: rgba(0,0,0,0.15);
|
background-color: rgba(0,0,0,0.15);
|
||||||
}
|
}
|
||||||
.snackbar--button:focus:before {
|
.button:focus:before {
|
||||||
content: '';
|
content: '';
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ module.exports = function (_, env) {
|
|||||||
path.join(__dirname, 'src/components'),
|
path.join(__dirname, 'src/components'),
|
||||||
path.join(__dirname, 'src/codecs'),
|
path.join(__dirname, 'src/codecs'),
|
||||||
path.join(__dirname, 'src/custom-els'),
|
path.join(__dirname, 'src/custom-els'),
|
||||||
|
path.join(__dirname, 'src/lib'),
|
||||||
];
|
];
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -107,7 +108,7 @@ module.exports = function (_, env) {
|
|||||||
loader: 'typings-for-css-modules-loader',
|
loader: 'typings-for-css-modules-loader',
|
||||||
options: {
|
options: {
|
||||||
modules: true,
|
modules: true,
|
||||||
localIdentName: '[local]__[hash:base64:5]',
|
localIdentName: isProd ? '[hash:base64:5]' : '[local]__[hash:base64:5]',
|
||||||
namedExport: true,
|
namedExport: true,
|
||||||
camelCase: true,
|
camelCase: true,
|
||||||
importLoaders: 1,
|
importLoaders: 1,
|
||||||
@@ -199,8 +200,11 @@ module.exports = function (_, env) {
|
|||||||
|
|
||||||
new OptimizeCssAssetsPlugin({
|
new OptimizeCssAssetsPlugin({
|
||||||
cssProcessorOptions: {
|
cssProcessorOptions: {
|
||||||
zindex: false,
|
postcssReduceIdents: {
|
||||||
discardComments: { removeAll: true }
|
counterStyle: false,
|
||||||
|
gridTemplate: false,
|
||||||
|
keyframes: false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user