Skip to content

Make images smaller using best-in-class codecs, right in the browser.

JavaScript

Options ui (#222)

Jake Archibaldbdd3c11f1a2b
diff --git a/src/codecs/browser-jpeg/encoder-meta.ts b/src/codecs/browser-jpeg/encoder-meta.ts
index 0d43204e..ae47407a 100644
--- a/src/codecs/browser-jpeg/encoder-meta.ts
+++ b/src/codecs/browser-jpeg/encoder-meta.ts
@@ -5,4 +5,4 @@ export const type = 'browser-jpeg';
export const label = 'Browser JPEG';
export const mimeType = 'image/jpeg';
export const extension = 'jpg';
-export const defaultOptions: EncodeOptions = { quality: 0.5 };
+export const defaultOptions: EncodeOptions = { quality: 0.75 };
diff --git a/src/codecs/browser-jpeg/options.ts b/src/codecs/browser-jpeg/options.ts
index 678e5a9e..61a7817c 100644
--- a/src/codecs/browser-jpeg/options.ts
+++ b/src/codecs/browser-jpeg/options.ts
@@ -1,3 +1,3 @@
import qualityOption from '../generic/quality-option';
-export default qualityOption({ min: 0, max: 1, step: 0 });
+export default qualityOption({ min: 0, max: 1, step: 0.01 });
diff --git a/src/codecs/browser-webp/encoder-meta.ts b/src/codecs/browser-webp/encoder-meta.ts
index d7780687..03971198 100644
--- a/src/codecs/browser-webp/encoder-meta.ts
+++ b/src/codecs/browser-webp/encoder-meta.ts
@@ -7,5 +7,5 @@ export const type = 'browser-webp';
export const label = 'Browser WebP';
export const mimeType = 'image/webp';
export const extension = 'webp';
-export const defaultOptions: EncodeOptions = { quality: 0.5 };
+export const defaultOptions: EncodeOptions = { quality: 0.75 };
export const featureTest = () => canvasEncodeTest(mimeType);
diff --git a/src/codecs/browser-webp/options.ts b/src/codecs/browser-webp/options.ts
index 678e5a9e..61a7817c 100644
--- a/src/codecs/browser-webp/options.ts
+++ b/src/codecs/browser-webp/options.ts
@@ -1,3 +1,3 @@
import qualityOption from '../generic/quality-option';
-export default qualityOption({ min: 0, max: 1, step: 0 });
+export default qualityOption({ min: 0, max: 1, step: 0.01 });
diff --git a/src/codecs/generic/quality-option.tsx b/src/codecs/generic/quality-option.tsx
index 373bc2a2..ae124947 100644
--- a/src/codecs/generic/quality-option.tsx
+++ b/src/codecs/generic/quality-option.tsx
@@ -1,6 +1,7 @@
import { h, Component } from 'preact';
import { bind } from '../../lib/initial-util';
-import '../../custom-els/RangeInput';
+import * as style from '../../components/Options/style.scss';
+import Range from '../../components/range';
interface EncodeOptions {
quality: number;
@@ -33,18 +34,19 @@ export default function qualityOption(opts: QualityOptionArg = {}) {
render({ options }: Props) {
return (
- <div>
- <label>
- Quality:
- <range-input
+ <div class={style.optionsSection}>
+ <div class={style.optionOneCell}>
+ <Range
name="quality"
min={min}
max={max}
step={step || 'any'}
- value={'' + options.quality}
- onChange={this.onChange}
- />
- </label>
+ value={options.quality}
+ onInput={this.onChange}
+ >
+ Quality:
+ </Range>
+ </div>
</div>
);
}
diff --git a/src/codecs/imagequant/options.tsx b/src/codecs/imagequant/options.tsx
index 82eb82bd..875c3e9b 100644
--- a/src/codecs/imagequant/options.tsx
+++ b/src/codecs/imagequant/options.tsx
@@ -2,6 +2,10 @@ import { h, Component } from 'preact';
import { bind } from '../../lib/initial-util';
import { inputFieldValueAsNumber, konami } from '../../lib/util';
import { QuantizeOptions } from './processor-meta';
+import * as style from '../../components/Options/style.scss';
+import Expander from '../../components/expander';
+import Select from '../../components/select';
+import Range from '../../components/range';
const konamiPromise = konami();
@@ -26,50 +30,61 @@ export default class QuantizerOptions extends Component<Props, State> {
@bind
onChange(event: Event) {
const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
+ const { options } = this.props;
- const options: QuantizeOptions = {
- zx: inputFieldValueAsNumber(form.zx),
- maxNumColors: inputFieldValueAsNumber(form.maxNumColors),
+ const newOptions: QuantizeOptions = {
+ zx: inputFieldValueAsNumber(form.zx, options.zx),
+ maxNumColors: inputFieldValueAsNumber(form.maxNumColors, options.maxNumColors),
dither: inputFieldValueAsNumber(form.dither),
};
- this.props.onChange(options);
+ this.props.onChange(newOptions);
}
render({ options }: Props, { extendedSettings }: State) {
return (
- <form>
- <label style={{ display: extendedSettings ? '' : 'none' }}>
- Type:
- <select
- name="zx"
- value={'' + options.zx}
- onChange={this.onChange}
- >
- <option value="0">Standard</option>
- <option value="1">ZX</option>
- </select>
- </label>
- <label style={{ display: options.zx ? 'none' : '' }}>
- Palette Colors:
- <range-input
- name="maxNumColors"
- min="2"
- max="256"
- value={'' + options.maxNumColors}
- onChange={this.onChange}
- />
- </label>
- <label>
- Dithering:
- <range-input
+ <form class={style.optionsSection}>
+ <Expander>
+ {extendedSettings ?
+ <label class={style.optionTextFirst}>
+ Type:
+ <Select
+ name="zx"
+ value={'' + options.zx}
+ onChange={this.onChange}
+ >
+ <option value="0">Standard</option>
+ <option value="1">ZX</option>
+ </Select>
+ </label>
+ : null}
+ </Expander>
+ <Expander>
+ {options.zx ? null :
+ <div class={style.optionOneCell}>
+ <Range
+ name="maxNumColors"
+ min="2"
+ max="256"
+ value={options.maxNumColors}
+ onInput={this.onChange}
+ >
+ Colors:
+ </Range>
+ </div>
+ }
+ </Expander>
+ <div class={style.optionOneCell}>
+ <Range
name="dither"
min="0"
max="1"
step="0.01"
- value={'' + options.dither}
- onChange={this.onChange}
- />
- </label>
+ value={options.dither}
+ onInput={this.onChange}
+ >
+ Dithering:
+ </Range>
+ </div>
</form>
);
}
diff --git a/src/codecs/mozjpeg/options.tsx b/src/codecs/mozjpeg/options.tsx
index 84b86ec5..2fcdd312 100644
--- a/src/codecs/mozjpeg/options.tsx
+++ b/src/codecs/mozjpeg/options.tsx
@@ -2,158 +2,197 @@ import { h, Component } from 'preact';
import { bind } from '../../lib/initial-util';
import { inputFieldChecked, inputFieldValueAsNumber } from '../../lib/util';
import { EncodeOptions, MozJpegColorSpace } from './encoder-meta';
-import '../../custom-els/RangeInput';
+import * as style from '../../components/Options/style.scss';
+import Checkbox from '../../components/checkbox';
+import Expander from '../../components/expander';
+import Select from '../../components/select';
+import Range from '../../components/range';
+import linkState from 'linkstate';
-type Props = {
- options: EncodeOptions,
- onChange(newOptions: EncodeOptions): void,
-};
+interface Props {
+ options: EncodeOptions;
+ onChange(newOptions: EncodeOptions): void;
+}
+
+interface State {
+ showAdvanced: boolean;
+}
+
+export default class MozJPEGEncoderOptions extends Component<Props, State> {
+ state: State = {
+ showAdvanced: false,
+ };
-export default class MozJPEGEncoderOptions extends Component<Props, {}> {
@bind
onChange(event: Event) {
const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
+ const { options } = this.props;
- const options: EncodeOptions = {
+ const newOptions: EncodeOptions = {
// Copy over options the form doesn't currently care about, eg arithmetic
...this.props.options,
// And now stuff from the form:
// .checked
- baseline: inputFieldChecked(form.baseline),
- progressive: inputFieldChecked(form.progressive),
- optimize_coding: inputFieldChecked(form.optimize_coding),
- trellis_multipass: inputFieldChecked(form.trellis_multipass),
- trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero),
- trellis_opt_table: inputFieldChecked(form.trellis_opt_table),
+ baseline: inputFieldChecked(form.baseline, options.baseline),
+ progressive: inputFieldChecked(form.progressive, options.progressive),
+ optimize_coding: inputFieldChecked(form.optimize_coding, options.optimize_coding),
+ trellis_multipass: inputFieldChecked(form.trellis_multipass, options.trellis_multipass),
+ trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero, options.trellis_opt_zero),
+ trellis_opt_table: inputFieldChecked(form.trellis_opt_table, options.trellis_opt_table),
// .value
- quality: inputFieldValueAsNumber(form.quality),
- smoothing: inputFieldValueAsNumber(form.smoothing),
- color_space: inputFieldValueAsNumber(form.color_space),
- quant_table: inputFieldValueAsNumber(form.quant_table),
- trellis_loops: inputFieldValueAsNumber(form.trellis_loops),
+ quality: inputFieldValueAsNumber(form.quality, options.quality),
+ smoothing: inputFieldValueAsNumber(form.smoothing, options.smoothing),
+ color_space: inputFieldValueAsNumber(form.color_space, options.color_space),
+ quant_table: inputFieldValueAsNumber(form.quant_table, options.quant_table),
+ trellis_loops: inputFieldValueAsNumber(form.trellis_loops, options.trellis_loops),
};
- this.props.onChange(options);
+ this.props.onChange(newOptions);
}
- render({ options }: Props) {
+ render({ options }: Props, { showAdvanced }: State) {
// I'm rendering both lossy and lossless forms, as it becomes much easier when
// gathering the data.
return (
- <form>
- <label>
- Quality:
- <range-input
+ <form class={style.optionsSection}>
+ <div class={style.optionOneCell}>
+ <Range
name="quality"
min="0"
max="100"
- value={'' + options.quality}
- onChange={this.onChange}
- />
- </label>
- <label>
- <input
- name="baseline"
- type="checkbox"
- checked={options.baseline}
- onChange={this.onChange}
- />
- <span>Baseline (worse but legacy-compatible)</span>
- </label>
- <label style={{ display: options.baseline ? 'none' : '' }}>
- <input
- name="progressive"
- type="checkbox"
- checked={options.progressive}
- onChange={this.onChange}
- />
- <span>Progressive multi-pass rendering</span>
- </label>
- <label style={{ display: options.baseline ? '' : 'none' }}>
- <input
- name="optimize_coding"
- type="checkbox"
- checked={options.optimize_coding}
- onChange={this.onChange}
- />
- <span>Optimize Huffman table</span>
- </label>
- <label>
- Smoothing:
- <range-input
- name="smoothing"
- min="0"
- max="100"
- value={'' + options.smoothing}
- onChange={this.onChange}
- />
- </label>
- <label>
- Output color space:
- <select
- name="color_space"
- value={'' + options.color_space}
- onChange={this.onChange}
+ value={options.quality}
+ onInput={this.onChange}
>
- <option value={MozJpegColorSpace.GRAYSCALE}>Grayscale</option>
- <option value={MozJpegColorSpace.RGB}>RGB (sub-optimal)</option>
- <option value={MozJpegColorSpace.YCbCr}>YCbCr (optimized for color)</option>
- </select>
- </label>
- <label>
- Quantization table:
- <select
- name="quant_table"
- value={'' + options.quant_table}
- onChange={this.onChange}
- >
- <option value="0">JPEG Annex K</option>
- <option value="1">Flat</option>
- <option value="2">MSSIM-tuned Kodak</option>
- <option value="3">ImageMagick</option>
- <option value="4">PSNR-HVS-M-tuned Kodak</option>
- <option value="5">Klein et al</option>
- <option value="6">Watson et al</option>
- <option value="7">Ahumada et al</option>
- <option value="8">Peterson et al</option>
- </select>
- </label>
- <label>
- <input
- name="trellis_multipass"
- type="checkbox"
- checked={options.trellis_multipass}
- onChange={this.onChange}
- />
- <span>Consider multiple scans during trellis quantization</span>
- </label>
- <label style={{ display: options.trellis_multipass ? '' : 'none' }}>
- <input
- name="trellis_opt_zero"
- type="checkbox"
- checked={options.trellis_opt_zero}
- onChange={this.onChange}
- />
- <span>Optimize runs of zero blocks</span>
- </label>
- <label>
- <input
- name="trellis_opt_table"
- type="checkbox"
- checked={options.trellis_opt_table}
- onChange={this.onChange}
- />
- <span>Optimize after trellis quantization</span>
- </label>
- <label>
- Trellis quantization passes:
- <range-input
- name="trellis_loops"
- min="1"
- max="50"
- value={'' + options.trellis_loops}
- onChange={this.onChange}
+ Quality:
+ </Range>
+ </div>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ checked={showAdvanced}
+ onChange={linkState(this, 'showAdvanced')}
/>
+ Show advanced settings
</label>
+ <Expander>
+ {showAdvanced ?
+ <div>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="baseline"
+ checked={options.baseline}
+ onChange={this.onChange}
+ />
+ Pointless spec compliance
+ </label>
+ <Expander>
+ {options.baseline ? null :
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="progressive"
+ checked={options.progressive}
+ onChange={this.onChange}
+ />
+ Progressive rendering
+ </label>
+ }
+ </Expander>
+ <Expander>
+ {options.baseline ?
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="optimize_coding"
+ checked={options.optimize_coding}
+ onChange={this.onChange}
+ />
+ Optimize Huffman table
+ </label>
+ : null
+ }
+ </Expander>
+ <div class={style.optionOneCell}>
+ <Range
+ name="smoothing"
+ min="0"
+ max="100"
+ value={options.smoothing}
+ onInput={this.onChange}
+ >
+ Smoothing:
+ </Range>
+ </div>
+ <label class={style.optionTextFirst}>
+ Channels:
+ <Select
+ name="color_space"
+ value={options.color_space}
+ onChange={this.onChange}
+ >
+ <option value={MozJpegColorSpace.GRAYSCALE}>Grayscale</option>
+ <option value={MozJpegColorSpace.RGB}>RGB</option>
+ <option value={MozJpegColorSpace.YCbCr}>YCbCr</option>
+ </Select>
+ </label>
+ <label class={style.optionTextFirst}>
+ Quantization:
+ <Select
+ name="quant_table"
+ value={options.quant_table}
+ onChange={this.onChange}
+ >
+ <option value="0">JPEG Annex K</option>
+ <option value="1">Flat</option>
+ <option value="2">MSSIM-tuned Kodak</option>
+ <option value="3">ImageMagick</option>
+ <option value="4">PSNR-HVS-M-tuned Kodak</option>
+ <option value="5">Klein et al</option>
+ <option value="6">Watson et al</option>
+ <option value="7">Ahumada et al</option>
+ <option value="8">Peterson et al</option>
+ </Select>
+ </label>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="trellis_multipass"
+ checked={options.trellis_multipass}
+ onChange={this.onChange}
+ />
+ Trellis multipass
+ </label>
+ <Expander>
+ {options.trellis_multipass ?
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="trellis_opt_zero"
+ checked={options.trellis_opt_zero}
+ onChange={this.onChange}
+ />
+ Optimize zero block runs
+ </label>
+ : null
+ }
+ </Expander>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="trellis_opt_table"
+ checked={options.trellis_opt_table}
+ onChange={this.onChange}
+ />
+ Optimize after trellis quantization
+ </label>
+ <div class={style.optionOneCell}>
+ <Range
+ name="trellis_loops"
+ min="1"
+ max="50"
+ value={options.trellis_loops}
+ onInput={this.onChange}
+ >
+ Trellis quantization passes:
+ </Range>
+ </div>
+ </div>
+ : null
+ }
+ </Expander>
</form>
);
}
diff --git a/src/codecs/optipng/options.tsx b/src/codecs/optipng/options.tsx
index 28dd9038..706139bb 100644
--- a/src/codecs/optipng/options.tsx
+++ b/src/codecs/optipng/options.tsx
@@ -2,6 +2,8 @@ import { h, Component } from 'preact';
import { bind } from '../../lib/initial-util';
import { inputFieldValueAsNumber } from '../../lib/util';
import { EncodeOptions } from './encoder-meta';
+import Range from '../../components/range';
+import * as style from '../../components/Options/style.scss';
type Props = {
options: EncodeOptions;
@@ -21,19 +23,19 @@ export default class OptiPNGEncoderOptions extends Component<Props, {}> {
render({ options }: Props) {
return (
- <form>
- <label>
- Effort:
- <input
+ <form class={style.optionsSection}>
+ <div class={style.optionOneCell}>
+ <Range
name="level"
- type="range"
min="0"
max="7"
step="1"
- value={'' + options.level}
- onChange={this.onChange}
- />
- </label>
+ value={options.level}
+ onInput={this.onChange}
+ >
+ Effort:
+ </Range>
+ </div>
</form>
);
}
diff --git a/src/codecs/processor.ts b/src/codecs/processor.ts
index 994d4d06..93e0e6b5 100644
--- a/src/codecs/processor.ts
+++ b/src/codecs/processor.ts
@@ -92,7 +92,6 @@ export default class Processor {
// If the worker is unused for 10 seconds, remove it to save memory.
this._workerTimeoutId = self.setTimeout(
() => {
- if (this._busy) throw Error("Worker shouldn't be busy");
if (!this._worker) return;
this._worker.terminate();
this._worker = undefined;
@@ -104,14 +103,14 @@ export default class Processor {
/** Abort the current job, if any */
abortCurrent() {
if (!this._busy) return;
- if (!this._worker || !this._abortRejector) {
- throw Error("There must be a worker/rejector if it's busy");
- }
+ if (!this._abortRejector) throw Error("There must be a rejector if it's busy");
this._abortRejector(new DOMException('Aborted', 'AbortError'));
- this._worker.terminate();
- this._worker = undefined;
this._abortRejector = undefined;
this._busy = false;
+
+ if (!this._worker) return;
+ this._worker.terminate();
+ this._worker = undefined;
}
// Off main thread jobs:
diff --git a/src/codecs/resize/options.tsx b/src/codecs/resize/options.tsx
index c6e461a7..373dde18 100644
--- a/src/codecs/resize/options.tsx
+++ b/src/codecs/resize/options.tsx
@@ -1,8 +1,12 @@
import { h, Component } from 'preact';
import linkState from 'linkstate';
-import { bind } from '../../lib/initial-util';
-import { inputFieldValueAsNumber } from '../../lib/util';
+import { bind, linkRef } from '../../lib/initial-util';
+import { inputFieldValueAsNumber, inputFieldValue } from '../../lib/util';
import { ResizeOptions } from './processor-meta';
+import * as style from '../../components/Options/style.scss';
+import Checkbox from '../../components/checkbox';
+import Expander from '../../components/expander';
+import Select from '../../components/select';
interface Props {
isVector: Boolean;
@@ -22,23 +26,26 @@ export default class ResizerOptions extends Component<Props, State> {
form?: HTMLFormElement;
- reportOptions() {
- const width = this.form!.width as HTMLInputElement;
- const height = this.form!.height as HTMLInputElement;
+ private reportOptions() {
+ const form = this.form!;
+ const width = form.width as HTMLInputElement;
+ const height = form.height as HTMLInputElement;
+ const { options } = this.props;
if (!width.checkValidity() || !height.checkValidity()) return;
- const options: ResizeOptions = {
+ const newOptions: ResizeOptions = {
width: inputFieldValueAsNumber(width),
height: inputFieldValueAsNumber(height),
- method: this.form!.resizeMethod.value,
- fitMethod: this.form!.fitMethod.value,
+ method: form.resizeMethod.value,
+ // Casting, as the formfield only returns the correct values.
+ fitMethod: inputFieldValue(form.fitMethod, options.fitMethod) as ResizeOptions['fitMethod'],
};
- this.props.onChange(options);
+ this.props.onChange(newOptions);
}
@bind
- onChange(event: Event) {
+ private onChange() {
this.reportOptions();
}
@@ -50,27 +57,31 @@ export default class ResizerOptions extends Component<Props, State> {
}
@bind
- onWidthInput(event: Event) {
- if (!this.state.maintainAspect) return;
+ private onWidthInput() {
+ if (this.state.maintainAspect) {
+ const width = inputFieldValueAsNumber(this.form!.width);
+ this.form!.height.value = Math.round(width / this.props.aspect);
+ }
- const width = inputFieldValueAsNumber(this.form!.width);
- this.form!.height.value = Math.round(width / this.props.aspect);
+ this.reportOptions();
}
@bind
- onHeightInput(event: Event) {
- if (!this.state.maintainAspect) return;
+ private onHeightInput() {
+ if (this.state.maintainAspect) {
+ const height = inputFieldValueAsNumber(this.form!.height);
+ this.form!.width.value = Math.round(height * this.props.aspect);
+ }
- const height = inputFieldValueAsNumber(this.form!.height);
- this.form!.width.value = Math.round(height * this.props.aspect);
+ this.reportOptions();
}
- render({ options, aspect, isVector }: Props, { maintainAspect }: State) {
+ render({ options, isVector }: Props, { maintainAspect }: State) {
return (
- <form ref={el => this.form = el}>
- <label>
+ <form ref={linkRef(this, 'form')} class={style.optionsSection}>
+ <label class={style.optionTextFirst}>
Method:
- <select
+ <Select
name="resizeMethod"
value={options.method}
onChange={this.onChange}
@@ -80,51 +91,55 @@ export default class ResizerOptions extends Component<Props, State> {
<option value="browser-low">Browser low quality</option>
<option value="browser-medium">Browser medium quality</option>
<option value="browser-high">Browser high quality</option>
- </select>
+ </Select>
</label>
- <label>
+ <label class={style.optionTextFirst}>
Width:
<input
required
+ class={style.textField}
name="width"
type="number"
min="1"
value={'' + options.width}
- onChange={this.onChange}
onInput={this.onWidthInput}
/>
</label>
- <label>
+ <label class={style.optionTextFirst}>
Height:
<input
required
+ class={style.textField}
name="height"
type="number"
min="1"
value={'' + options.height}
- onChange={this.onChange}
+ onInput={this.onHeightInput}
/>
</label>
- <label>
- <input
+ <label class={style.optionInputFirst}>
+ <Checkbox
name="maintainAspect"
- type="checkbox"
checked={maintainAspect}
onChange={linkState(this, 'maintainAspect')}
/>
Maintain aspect ratio
</label>
- <label style={{ display: maintainAspect ? 'none' : '' }}>
- Fit method:
- <select
- name="fitMethod"
- value={options.fitMethod}
- onChange={this.onChange}
- >
- <option value="stretch">Stretch</option>
- <option value="cover">Cover</option>
- </select>
- </label>
+ <Expander>
+ {maintainAspect ? null :
+ <label class={style.optionTextFirst}>
+ Fit method:
+ <Select
+ name="fitMethod"
+ value={options.fitMethod}
+ onChange={this.onChange}
+ >
+ <option value="stretch">Stretch</option>
+ <option value="cover">Cover</option>
+ </Select>
+ </label>
+ }
+ </Expander>
</form>
);
}
diff --git a/src/codecs/webp/options.tsx b/src/codecs/webp/options.tsx
index 0025051d..329ac26c 100644
--- a/src/codecs/webp/options.tsx
+++ b/src/codecs/webp/options.tsx
@@ -2,13 +2,21 @@ import { h, Component } from 'preact';
import { bind } from '../../lib/initial-util';
import { inputFieldCheckedAsNumber, inputFieldValueAsNumber } from '../../lib/util';
import { EncodeOptions, WebPImageHint } from './encoder-meta';
-import * as styles from './styles.scss';
-import '../../custom-els/RangeInput';
+import * as style from '../../components/Options/style.scss';
+import Checkbox from '../../components/checkbox';
+import Expander from '../../components/expander';
+import Select from '../../components/select';
+import Range from '../../components/range';
+import linkState from 'linkstate';
-type Props = {
- options: EncodeOptions,
- onChange(newOptions: EncodeOptions): void,
-};
+interface Props {
+ options: EncodeOptions;
+ onChange(newOptions: EncodeOptions): void;
+}
+
+interface State {
+ showAdvanced: boolean;
+}
// From kLosslessPresets in config_enc.c
// The format is [method, quality].
@@ -26,249 +34,281 @@ function determineLosslessQuality(quality: number): number {
return losslessPresetDefault;
}
-export default class WebPEncoderOptions extends Component<Props, {}> {
+export default class WebPEncoderOptions extends Component<Props, State> {
+ state: State = {
+ showAdvanced: false,
+ };
+
@bind
onChange(event: Event) {
const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
const lossless = inputFieldCheckedAsNumber(form.lossless);
- const losslessPresetInput = (form.lossless_preset as HTMLInputElement);
+ const { options } = this.props;
+ const losslessPresetValue = inputFieldValueAsNumber(
+ form.lossless_preset, determineLosslessQuality(options.quality),
+ );
- const options: EncodeOptions = {
+ const newOptions: EncodeOptions = {
// Copy over options the form doesn't care about, eg emulate_jpeg_size
- ...this.props.options,
+ ...options,
// And now stuff from the form:
lossless,
// Special-cased inputs:
// In lossless mode, the quality is derived from the preset.
quality: lossless ?
- losslessPresets[Number(losslessPresetInput.value)][1] :
- inputFieldValueAsNumber(form.quality),
+ losslessPresets[losslessPresetValue][1] :
+ inputFieldValueAsNumber(form.quality, options.quality),
// In lossless mode, the method is derived from the preset.
method: lossless ?
- losslessPresets[Number(losslessPresetInput.value)][0] :
- inputFieldValueAsNumber(form.method_input),
- image_hint: (form.image_hint as HTMLInputElement).checked ?
+ losslessPresets[losslessPresetValue][0] :
+ inputFieldValueAsNumber(form.method_input, options.method),
+ image_hint: inputFieldCheckedAsNumber(form.image_hint, options.image_hint) ?
WebPImageHint.WEBP_HINT_GRAPH :
WebPImageHint.WEBP_HINT_DEFAULT,
// .checked
- exact: inputFieldCheckedAsNumber(form.exact),
- alpha_compression: inputFieldCheckedAsNumber(form.alpha_compression),
- autofilter: inputFieldCheckedAsNumber(form.autofilter),
- filter_type: inputFieldCheckedAsNumber(form.filter_type),
- use_sharp_yuv: inputFieldCheckedAsNumber(form.use_sharp_yuv),
+ exact: inputFieldCheckedAsNumber(form.exact, options.exact),
+ alpha_compression: inputFieldCheckedAsNumber(
+ form.alpha_compression, options.alpha_compression,
+ ),
+ autofilter: inputFieldCheckedAsNumber(form.autofilter, options.autofilter),
+ filter_type: inputFieldCheckedAsNumber(form.filter_type, options.filter_type),
+ use_sharp_yuv: inputFieldCheckedAsNumber(form.use_sharp_yuv, options.use_sharp_yuv),
// .value
- near_lossless: 100 - inputFieldValueAsNumber(form.near_lossless),
- alpha_quality: inputFieldValueAsNumber(form.alpha_quality),
- alpha_filtering: inputFieldValueAsNumber(form.alpha_filtering),
- sns_strength: inputFieldValueAsNumber(form.sns_strength),
- filter_strength: inputFieldValueAsNumber(form.filter_strength),
- filter_sharpness: 7 - inputFieldValueAsNumber(form.filter_sharpness),
- pass: inputFieldValueAsNumber(form.pass),
- preprocessing: inputFieldValueAsNumber(form.preprocessing),
- segments: inputFieldValueAsNumber(form.segments),
- partitions: inputFieldValueAsNumber(form.partitions),
+ near_lossless: 100 - inputFieldValueAsNumber(form.near_lossless, 100 - options.near_lossless),
+ alpha_quality: inputFieldValueAsNumber(form.alpha_quality, options.alpha_quality),
+ alpha_filtering: inputFieldValueAsNumber(form.alpha_filtering, options.alpha_filtering),
+ sns_strength: inputFieldValueAsNumber(form.sns_strength, options.sns_strength),
+ filter_strength: inputFieldValueAsNumber(form.filter_strength, options.filter_strength),
+ filter_sharpness:
+ 7 - inputFieldValueAsNumber(form.filter_sharpness, 7 - options.filter_sharpness),
+ pass: inputFieldValueAsNumber(form.pass, options.pass),
+ preprocessing: inputFieldValueAsNumber(form.preprocessing, options.preprocessing),
+ segments: inputFieldValueAsNumber(form.segments, options.segments),
+ partitions: inputFieldValueAsNumber(form.partitions, options.partitions),
};
- this.props.onChange(options);
+ this.props.onChange(newOptions);
}
private _losslessSpecificOptions(options: EncodeOptions) {
return (
- <div>
- <label>
- Effort:
- <range-input
+ <div key="lossless">
+ <div class={style.optionOneCell}>
+ <Range
name="lossless_preset"
min="0"
max="9"
- value={'' + determineLosslessQuality(options.quality)}
- onChange={this.onChange}
- />
- </label>
- <label>
- Slight loss:
- <range-input
+ value={determineLosslessQuality(options.quality)}
+ onInput={this.onChange}
+ >
+ Effort:
+ </Range>
+ </div>
+ <div class={style.optionOneCell}>
+ <Range
name="near_lossless"
min="0"
max="100"
value={'' + (100 - options.near_lossless)}
- onChange={this.onChange}
- />
- </label>
- <label>
+ onInput={this.onChange}
+ >
+ Slight loss:
+ </Range>
+ </div>
+ <label class={style.optionInputFirst}>
{/*
Although there are 3 different kinds of image hint, webp only
seems to do something with the 'graph' type, and I don't really
understand what it does.
*/}
- <input
+ <Checkbox
name="image_hint"
- type="checkbox"
checked={options.image_hint === WebPImageHint.WEBP_HINT_GRAPH}
- value={'' + WebPImageHint.WEBP_HINT_GRAPH}
onChange={this.onChange}
/>
- <span>Discrete tone image (graph, map-tile etc)</span>
+ Discrete tone image
</label>
</div>
);
}
private _lossySpecificOptions(options: EncodeOptions) {
+ const { showAdvanced } = this.state;
+
return (
- <div>
- <label>
- Effort:
- <range-input
+ <div key="lossy">
+ <div class={style.optionOneCell}>
+ <Range
name="method_input"
min="0"
max="6"
- value={'' + options.method}
- onChange={this.onChange}
- />
- </label>
- <label>
- Quality:
- <range-input
+ value={options.method}
+ onInput={this.onChange}
+ >
+ Effort:
+ </Range>
+ </div>
+ <div class={style.optionOneCell}>
+ <Range
name="quality"
min="0"
max="100"
- step="0.01"
- value={'' + options.quality}
- onChange={this.onChange}
- />
- </label>
- <hr />
- <label>
- <input
- name="alpha_compression"
- type="checkbox"
- checked={!!options.alpha_compression}
- onChange={this.onChange}
- />
- Compress alpha
- </label>
- <label>
- Alpha quality:
- <range-input
- name="alpha_quality"
- min="0"
- max="100"
- value={'' + options.alpha_quality}
- onChange={this.onChange}
- />
- </label>
- <label>
- Alpha filter quality:
- <range-input
- name="alpha_filtering"
- min="0"
- max="2"
- value={'' + options.alpha_filtering}
- onChange={this.onChange}
- />
- </label>
- <hr />
- <label>
- <input
- name="autofilter"
- type="checkbox"
- checked={!!options.autofilter}
- onChange={this.onChange}
- />
- <span>Auto adjust filter strength</span>
- </label>
- <label>
- Filter strength:
- <range-input
- name="filter_strength"
- min="0"
- max="100"
- disabled={!!options.autofilter}
- value={'' + options.filter_strength}
- onChange={this.onChange}
- />
- </label>
- <label>
- <input
- name="filter_type"
- type="checkbox"
- checked={!!options.filter_type}
- onChange={this.onChange}
- />
- Strong filter
- </label>
- <label>
- Filter sharpness:
- <range-input
- name="filter_sharpness"
- min="0"
- max="7"
- value={'' + (7 - options.filter_sharpness)}
- onChange={this.onChange}
- />
- </label>
- <label>
- <input
- name="use_sharp_yuv"
- type="checkbox"
- checked={!!options.use_sharp_yuv}
- onChange={this.onChange}
- />
- Sharp RGB->YUV conversion
- </label>
- <hr />
- <label>
- Passes:
- <range-input
- name="pass"
- min="1"
- max="10"
- value={'' + options.pass}
- onChange={this.onChange}
- />
- </label>
- <label>
- Spacial noise shaping:
- <range-input
- name="sns_strength"
- min="0"
- max="100"
- value={'' + options.sns_strength}
- onChange={this.onChange}
- />
- </label>
- <label>
- Preprocessing type:
- <select
- name="preprocessing"
- value={'' + options.preprocessing}
- onChange={this.onChange}
+ step="0.1"
+ value={options.quality}
+ onInput={this.onChange}
>
- <option value="0">None</option>
- <option value="1">Segment smooth</option>
- <option value="2">Pseudo-random dithering</option>
- </select>
- </label>
- <label>
- Segments:
- <range-input
- name="segments"
- min="1"
- max="4"
- value={'' + options.segments}
- onChange={this.onChange}
- />
- </label>
- <label>
- Partitions:
- <range-input
- name="partitions"
- min="0"
- max="3"
- value={'' + options.partitions}
- onChange={this.onChange}
+ Quality:
+ </Range>
+ </div>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ checked={showAdvanced}
+ onChange={linkState(this, 'showAdvanced')}
/>
+ Show advanced settings
</label>
+ <Expander>
+ {showAdvanced ?
+ <div>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="alpha_compression"
+ checked={!!options.alpha_compression}
+ onChange={this.onChange}
+ />
+ Compress alpha
+ </label>
+ <div class={style.optionOneCell}>
+ <Range
+ name="alpha_quality"
+ min="0"
+ max="100"
+ value={options.alpha_quality}
+ onInput={this.onChange}
+ >
+ Alpha quality:
+ </Range>
+ </div>
+ <div class={style.optionOneCell}>
+ <Range
+ name="alpha_filtering"
+ min="0"
+ max="2"
+ value={options.alpha_filtering}
+ onInput={this.onChange}
+ >
+ Alpha filter quality:
+ </Range>
+ </div>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="autofilter"
+ checked={!!options.autofilter}
+ onChange={this.onChange}
+ />
+ Auto adjust filter strength
+ </label>
+ <Expander>
+ {options.autofilter ? null :
+ <div class={style.optionOneCell}>
+ <Range
+ name="filter_strength"
+ min="0"
+ max="100"
+ value={options.filter_strength}
+ onInput={this.onChange}
+ >
+ Filter strength:
+ </Range>
+ </div>
+ }
+ </Expander>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="filter_type"
+ checked={!!options.filter_type}
+ onChange={this.onChange}
+ />
+ Strong filter
+ </label>
+ <div class={style.optionOneCell}>
+ <Range
+ name="filter_sharpness"
+ min="0"
+ max="7"
+ value={7 - options.filter_sharpness}
+ onInput={this.onChange}
+ >
+ Filter sharpness:
+ </Range>
+ </div>
+ <label class={style.optionInputFirst}>
+ <Checkbox
+ name="use_sharp_yuv"
+ checked={!!options.use_sharp_yuv}
+ onChange={this.onChange}
+ />
+ Sharp RGB→YUV conversion
+ </label>
+ <div class={style.optionOneCell}>
+ <Range
+ name="pass"
+ min="1"
+ max="10"
+ value={options.pass}
+ onInput={this.onChange}
+ >
+ Passes:
+ </Range>
+ </div>
+ <div class={style.optionOneCell}>
+ <Range
+ name="sns_strength"
+ min="0"
+ max="100"
+ value={options.sns_strength}
+ onInput={this.onChange}
+ >
+ Spacial noise shaping:
+ </Range>
+ </div>
+ <label class={style.optionTextFirst}>
+ Preprocess:
+ <Select
+ name="preprocessing"
+ value={options.preprocessing}
+ onChange={this.onChange}
+ >
+ <option value="0">None</option>
+ <option value="1">Segment smooth</option>
+ <option value="2">Pseudo-random dithering</option>
+ </Select>
+ </label>
+ <div class={style.optionOneCell}>
+ <Range
+ name="segments"
+ min="1"
+ max="4"
+ value={options.segments}
+ onInput={this.onChange}
+ >
+ Segments:
+ </Range>
+ </div>
+ <div class={style.optionOneCell}>
+ <Range
+ name="partitions"
+ min="0"
+ max="3"
+ value={options.partitions}
+ onInput={this.onChange}
+ >
+ Partitions:
+ </Range>
+ </div>
+ </div>
+ : null
+ }
+ </Expander>
</div>
);
}
@@ -277,32 +317,26 @@ export default class WebPEncoderOptions extends Component<Props, {}> {
// I'm rendering both lossy and lossless forms, as it becomes much easier when
// gathering the data.
return (
- <form>
- <label>
- <input
+ <form class={style.optionsSection}>
+ <label class={style.optionInputFirst}>
+ <Checkbox
name="lossless"
- type="checkbox"
checked={!!options.lossless}
onChange={this.onChange}
/>
Lossless
</label>
- <div class={options.lossless ? '' : styles.hide}>
- {this._losslessSpecificOptions(options)}
- </div>
- <div class={options.lossless ? styles.hide : ''}>
- {this._lossySpecificOptions(options)}
- </div>
- <label>
- <input
+ {options.lossless
+ ? this._losslessSpecificOptions(options)
+ : this._lossySpecificOptions(options)
+ }
+ <label class={style.optionInputFirst}>
+ <Checkbox
name="exact"
- type="checkbox"
checked={!!options.exact}
onChange={this.onChange}
/>
- <span>
- Preserve transparent data. Otherwise, pixels with zero alpha will have RGB also zeroed.
- </span>
+ Preserve transparent data
</label>
</form>
);
diff --git a/src/codecs/webp/styles.scss b/src/codecs/webp/styles.scss
deleted file mode 100644
index aaa3d95c..00000000
--- a/src/codecs/webp/styles.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.hide {
- display: none;
-}
diff --git a/src/components/App/style.scss b/src/components/App/style.scss
index 3ddd59c8..f7c48425 100644
--- a/src/components/App/style.scss
+++ b/src/components/App/style.scss
@@ -1,7 +1,3 @@
-/*
-Note: These styles are temporary. They will be replaced before going live.
-*/
-
.app {
position: absolute;
left: 0;
diff --git a/src/components/FileSize.tsx b/src/components/FileSize.tsx
deleted file mode 100644
index 5e5935b7..00000000
--- a/src/components/FileSize.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { h, Component } from 'preact';
-import * as prettyBytes from 'pretty-bytes';
-
-type FileContents = ArrayBuffer | Blob;
-
-interface Props extends Pick<JSX.HTMLAttributes, Exclude<keyof JSX.HTMLAttributes, 'data'>> {
- file?: FileContents;
- compareTo?: FileContents;
- increaseClass?: string;
- decreaseClass?: string;
-}
-
-interface State {
- size?: number;
- sizeFormatted?: string;
- compareSize?: number;
- compareSizeFormatted?: string;
-}
-
-function calculateSize(data: FileContents): number {
- return data instanceof ArrayBuffer ? data.byteLength : data.size;
-}
-
-export default class FileSize extends Component<Props, State> {
- constructor(props: Props) {
- super(props);
- if (props.file) {
- this.computeSize('size', props.file);
- }
- if (props.compareTo) {
- this.computeSize('compareSize', props.compareTo);
- }
- }
-
- componentWillReceiveProps({ file, compareTo }: Props) {
- if (file !== this.props.file) {
- this.computeSize('size', file);
- }
- if (compareTo !== this.props.compareTo) {
- this.computeSize('compareSize', compareTo);
- }
- }
-
- componentDidMount() {
- this.applyStyles();
- }
-
- componentDidUpdate() {
- this.applyStyles();
- }
-
- applyStyles() {
- const { size, compareSize = 0 } = this.state;
- if (size != null && this.base) {
- const delta = size && compareSize ? (size - compareSize) / compareSize : 0;
- this.base.style.setProperty('--size', '' + size);
- this.base.style.setProperty('--size-delta', '' + Math.round(Math.abs(delta * 100)));
- }
- }
-
- computeSize(prop: keyof State, data?: FileContents) {
- const size = data ? calculateSize(data) : 0;
- const pretty = prettyBytes(size);
- this.setState({
- [prop]: size,
- [prop + 'Formatted']: pretty,
- });
- }
-
- render(
- { file, compareTo, increaseClass, decreaseClass, ...props }: Props,
- { size, sizeFormatted = '', compareSize }: State,
- ) {
- const delta = size && compareSize ? (size - compareSize) / compareSize : 0;
- return (
- <span {...props}>
- {sizeFormatted}
- {compareTo && (
- <span class={delta > 0 ? increaseClass : decreaseClass}>
- {delta > 0 && '+'}
- {Math.round(delta * 100)}%
- </span>
- )}
- </span>
- );
- }
-}
diff --git a/src/components/Options/FileSize.tsx b/src/components/Options/FileSize.tsx
new file mode 100644
index 00000000..9355882a
--- /dev/null
+++ b/src/components/Options/FileSize.tsx
@@ -0,0 +1,41 @@
+import { h, Component } from 'preact';
+import * as prettyBytes from 'pretty-bytes';
+import * as style from './style.scss';
+
+interface Props {
+ blob: Blob;
+ compareTo?: Blob;
+}
+
+interface State {}
+
+export default class FileSize extends Component<Props, State> {
+ render({ blob, compareTo }: Props) {
+ let comparison: JSX.Element | undefined;
+
+ if (compareTo) {
+ const delta = blob.size / compareTo.size;
+ if (delta > 1) {
+ const percent = Math.round((delta - 1) * 100) + '%';
+ comparison = (
+ <span class={`${style.sizeDelta} ${style.sizeIncrease}`}>
+ {percent === '0%' ? 'slightly' : percent} bigger
+ </span>
+ );
+ } else if (delta < 1) {
+ const percent = Math.round((1 - delta) * 100) + '%';
+ comparison = (
+ <span class={`${style.sizeDelta} ${style.sizeDecrease}`}>
+ {percent === '0%' ? 'slightly' : percent} smaller
+ </span>
+ );
+ } else {
+ comparison = (
+ <span class={style.sizeDelta}>no change</span>
+ );
+ }
+ }
+
+ return <span>{prettyBytes(blob.size)} {comparison}</span>;
+ }
+}
diff --git a/src/components/Options/index.tsx b/src/components/Options/index.tsx
index 77feeeaf..d0daba2d 100644
--- a/src/components/Options/index.tsx
+++ b/src/components/Options/index.tsx
@@ -31,14 +31,17 @@ import {
encoders,
encodersSupported,
EncoderSupportMap,
- encoderMap,
} from '../../codecs/encoders';
import { QuantizeOptions } from '../../codecs/imagequant/processor-meta';
import { ResizeOptions } from '../../codecs/resize/processor-meta';
import { PreprocessorState } from '../../codecs/preprocessors';
-import FileSize from '../FileSize';
+import FileSize from './FileSize';
import { DownloadIcon } from '../../lib/icons';
import { SourceImage } from '../App';
+import Checkbox from '../checkbox';
+import Expander from '../expander';
+import Select from '../select';
+import '../custom-els/LoadingSpinner';
const encoderOptionsComponentMap = {
[identity.type]: undefined,
@@ -56,13 +59,9 @@ const encoderOptionsComponentMap = {
[browserPDF.type]: undefined,
};
-const titles = {
- horizontal: ['Left Image', 'Right Image'],
- vertical: ['Top Image', 'Bottom Image'],
-};
-
interface Props {
orientation: 'horizontal' | 'vertical';
+ loading: boolean;
source?: SourceImage;
imageIndex: number;
imageFile?: Fileish;
@@ -77,16 +76,39 @@ interface Props {
interface State {
encoderSupportMap?: EncoderSupportMap;
+ showLoadingState: boolean;
}
+const loadingReactionDelay = 500;
+
export default class Options extends Component<Props, State> {
- typeSelect?: HTMLSelectElement;
+ state: State = {
+ encoderSupportMap: undefined,
+ showLoadingState: false,
+ };
+
+ /** The timeout ID between entering the loading state, and changing UI */
+ private loadingTimeoutId: number = 0;
constructor() {
super();
encodersSupported.then(encoderSupportMap => this.setState({ encoderSupportMap }));
}
+ componentDidUpdate(prevProps: Props, prevState: State) {
+ if (prevProps.loading && !this.props.loading) {
+ // Just stopped loading
+ clearTimeout(this.loadingTimeoutId);
+ this.setState({ showLoadingState: false });
+ } else if (!prevProps.loading && this.props.loading) {
+ // Just started loading
+ this.loadingTimeoutId = self.setTimeout(
+ () => this.setState({ showLoadingState: true }),
+ loadingReactionDelay,
+ );
+ }
+ }
+
@bind
onEncoderTypeChange(event: Event) {
const el = event.currentTarget as HTMLSelectElement;
@@ -138,105 +160,118 @@ export default class Options extends Component<Props, State> {
preprocessorState,
onEncoderOptionsChange,
}: Props,
- { encoderSupportMap }: State,
+ { encoderSupportMap, showLoadingState }: State,
) {
// tslint:disable variable-name
const EncoderOptionComponent = encoderOptionsComponentMap[encoderState.type];
return (
- <div class={`${style.options} ${style[orientation]}`}>
- <h2 class={style.title}>
- {titles[orientation][imageIndex]}
- {', '}
- {encoderMap[encoderState.type].label}
- </h2>
-
- <div class={style.content}>
- <section class={style.picker}>
- {encoderSupportMap ?
- <select value={encoderState.type} onChange={this.onEncoderTypeChange}>
- {encoders.filter(encoder => encoderSupportMap[encoder.type]).map(encoder => (
- <option value={encoder.type}>{encoder.label}</option>
- ))}
- </select>
- :
- <select><option>Loading…</option></select>
- }
- </section>
-
- {encoderState.type !== 'identity' && (
- <div key="preprocessors" class={style.preprocessors}>
- <label class={style.toggle}>
- <input
+ <div class={style.options}>
+ <Expander>
+ {encoderState.type === identity.type ? null :
+ <div>
+ <h3 class={style.optionsTitle}>Edit</h3>
+ <label class={style.sectionEnabler}>
+ <Checkbox
name="resize.enable"
- type="checkbox"
checked={!!preprocessorState.resize.enabled}
onChange={this.onPreprocessorEnabledChange}
/>
Resize
</label>
- {preprocessorState.resize.enabled &&
- <ResizeOptionsComponent
- isVector={Boolean(source && source.vectorImage)}
- aspect={source ? (source.data.width / source.data.height) : 1}
- options={preprocessorState.resize}
- onChange={this.onResizeOptionsChange}
- />
- }
- <label class={style.toggle}>
- <input
+ <Expander>
+ {preprocessorState.resize.enabled ?
+ <ResizeOptionsComponent
+ isVector={Boolean(source && source.vectorImage)}
+ aspect={source ? (source.data.width / source.data.height) : 1}
+ options={preprocessorState.resize}
+ onChange={this.onResizeOptionsChange}
+ />
+ : null}
+ </Expander>
+ <label class={style.sectionEnabler}>
+ <Checkbox
name="quantizer.enable"
- type="checkbox"
checked={!!preprocessorState.quantizer.enabled}
onChange={this.onPreprocessorEnabledChange}
/>
- Quantize
+ Reduce palette
</label>
- {preprocessorState.quantizer.enabled &&
- <QuantizerOptionsComponent
- options={preprocessorState.quantizer}
- onChange={this.onQuantizerOptionsChange}
- />
- }
+ <Expander>
+ {preprocessorState.quantizer.enabled ?
+ <QuantizerOptionsComponent
+ options={preprocessorState.quantizer}
+ onChange={this.onQuantizerOptionsChange}
+ />
+ : null}
+ </Expander>
</div>
- )}
-
- {EncoderOptionComponent &&
- <EncoderOptionComponent
- options={
- // Casting options, as encoderOptionsComponentMap[encodeData.type] ensures
- // the correct type, but typescript isn't smart enough.
- encoderState.options as any
- }
- onChange={onEncoderOptionsChange}
- />
}
+ </Expander>
+
+ <h3 class={style.optionsTitle}>Compress</h3>
+
+ <div class={style.optionsScroller}>
+ <section class={`${style.optionOneCell} ${style.optionsSection}`}>
+ {encoderSupportMap ?
+ <Select value={encoderState.type} onChange={this.onEncoderTypeChange} large>
+ {encoders.filter(encoder => encoderSupportMap[encoder.type]).map(encoder => (
+ <option value={encoder.type}>{encoder.label}</option>
+ ))}
+ </Select>
+ :
+ <Select large><option>Loading…</option></Select>
+ }
+ </section>
+
+ <Expander>
+ {EncoderOptionComponent ?
+ <EncoderOptionComponent
+ options={
+ // Casting options, as encoderOptionsComponentMap[encodeData.type] ensures
+ // the correct type, but typescript isn't smart enough.
+ encoderState.options as any
+ }
+ onChange={onEncoderOptionsChange}
+ />
+ : null}
+ </Expander>
</div>
- <div class={style.row}>
- <button onClick={this.onCopyToOtherClick}>Copy settings to other side</button>
+ <div class={style.optionsCopy}>
+ <button onClick={this.onCopyToOtherClick} class={style.copyButton}>
+ {imageIndex === 1 && '← '}
+ Copy settings across
+ {imageIndex === 0 && ' →'}
+ </button>
</div>
- <div class={style.sizeDetails}>
- <FileSize
- class={style.size}
- increaseClass={style.increase}
- decreaseClass={style.decrease}
- file={imageFile}
- compareTo={(source && imageFile !== source.file) ? source.file : undefined}
- />
-
- {(downloadUrl && imageFile) && (
- <a
- class={style.download}
- href={downloadUrl}
- download={imageFile.name}
- title="Download"
- >
- <DownloadIcon />
- </a>
- )}
+ <div class={style.results}>
+ <div class={style.resultData}>
+ {!imageFile || showLoadingState ? 'Working…' :
+ <FileSize
+ blob={imageFile}
+ compareTo={(source && imageFile !== source.file) ? source.file : undefined}
+ />
+ }
+ </div>
+
+ <div class={style.download}>
+ {(downloadUrl && imageFile) && (
+ <a
+ class={`${style.downloadLink} ${showLoadingState ? style.downloadLinkDisable : ''}`}
+ href={downloadUrl}
+ download={imageFile.name}
+ title="Download"
+ >
+ <DownloadIcon class={style.downloadIcon} />
+ </a>
+ )}
+ {showLoadingState && <loading-spinner class={style.spinner} />}
+ </div>
+
</div>
+
</div>
);
}
diff --git a/src/components/Options/style.scss b/src/components/Options/style.scss
index 4948a06d..a8c3a64f 100644
--- a/src/components/Options/style.scss
+++ b/src/components/Options/style.scss
@@ -1,225 +1,166 @@
-/*
-Note: These styles are temporary. They will be replaced before going live.
-*/
-
-.row {
- padding: 5px;
- margin: 0 10px;
-}
+$horizontalPadding: 15px;
.options {
- box-sizing: border-box;
- padding: 0;
- background: rgba(40,40,40,0.8);
- box-shadow: 0 1px 3px rgba(0,0,0,0.5);
- color: #eee;
- overflow: auto;
- z-index: 1;
+ color: #fff;
+ width: 300px;
opacity: 0.9;
- transform-origin: 50% 140%;
- transition: opacity 300ms linear;
- animation: options-open 500ms cubic-bezier(.6,1.6,.6,1) forwards 1;
-
- &.horizontal {
- border-radius: 1px 1px 5px 5px;
- width: 230px;
-
- > .inner {
- max-height: 80vh;
- overflow: auto;
- -webkit-overflow-scrolling: touch;
- -ms-touch-action: pan-y;
- touch-action: pan-y;
- }
- }
-
- &.vertical {
- opacity: 1;
- margin: 0 5px 10px;
- border-radius: 0 0 5px 5px;
- }
+ font-size: 1.2rem;
+ max-height: 100%;
+ display: flex;
+ flex-flow: column;
+}
- &:hover, &:focus, &:focus-within {
- opacity: 1;
- }
+.options-title {
+ background: rgba(0, 0, 0, 0.9);
+ margin: 0;
+ padding: 10px $horizontalPadding;
+ font-weight: normal;
+ font-size: 1.4rem;
+ border-bottom: 1px solid #000;
+}
- @keyframes options-open {
- from {
- transform: translateY(100px) scale(.8);
- }
- }
+.option-text-first {
+ display: grid;
+ align-items: center;
+ grid-template-columns: 87px 1fr;
+ grid-gap: 0.7em;
+ padding: 10px $horizontalPadding;
+}
- .content {
- max-height: calc(75vh - 100px);
- overflow: auto;
- touch-action: pan-y;
- -webkit-overflow-scrolling: touch;
- }
+.option-one-cell {
+ display: grid;
+ grid-template-columns: 1fr;
+ padding: 10px $horizontalPadding;
+}
- .picker {
- margin: 5px 15px;
-
- select {
- display: block;
- width: 100%;
- box-sizing: border-box;
- -webkit-appearance: none;
- appearance: none;
- padding: 10px 30px 10px 10px;
- background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="25" height="5"><polygon fill="#fff" points="10,0 5,5 0,0"/></svg>') right center no-repeat;
- background-color: var(--gray-dark);
- opacity: 0.9;
- border: none;
- font: inherit;
- color: white;
- transition: box-shadow 150ms ease;
-
- &:hover {
- opacity: 1;
- }
- &:focus {
- opacity: 1;
- outline: none;
- box-shadow: 0 0 0 2px var(--button-fg, #ccc);
- }
- }
- }
+.option-input-first,
+.section-enabler {
+ cursor: pointer;
+ display: grid;
+ align-items: center;
+ grid-template-columns: auto 1fr;
+ grid-gap: 0.7em;
+ padding: 10px $horizontalPadding;
+}
- .title {
- display: flex;
- align-items: center;
- padding: 10px 15px;
- margin: 0 0 12px;
- background: rgba(0,0,0,0.9);
- font: inherit;
- }
+.section-enabler {
+ background: rgba(0, 0, 0, 0.8);
+}
- label {
- display: block;
- padding: 5px;
- margin: 0 10px;
- display: flex;
- flex-wrap: wrap;
-
- // prevent labels from wrapping below checkboxes
- > span {
- flex: 1;
- }
-
- input[type=checkbox],
- input[type=radio] {
- flex: 0;
- margin: 2px 8px 0 0;
- }
-
- range-input {
- display: block;
- flex: 1 0 100%;
- margin: 2px 0;
- }
- }
+.options-section {
+ background: rgba(0, 0, 0, 0.7);
+}
- hr {
- height: 1px;
- border: none;
- margin: 5px 0;
- box-shadow: inset 0 0.5px 0 rgba(0, 0, 0, 0.4), inset 0 -0.5px 0 rgba(255, 255, 255, 0.2);
- }
+.text-field {
+ background: #fff;
+ font: inherit;
+ border: none;
+ padding: 2px 0 2px 10px;
+ width: 100%;
+ box-sizing: border-box;
+ box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.5);
}
-.picker {
- margin: 5px 15px;
-
- select {
- display: block;
- width: 100%;
- box-sizing: border-box;
- -webkit-appearance: none;
- appearance: none;
- padding: 10px 30px 10px 10px;
- background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="25" height="5"><polygon fill="#fff" points="10,0 5,5 0,0"/></svg>') right center no-repeat;
- background-color: var(--gray-dark);
- opacity: 0.9;
- border: none;
- font: inherit;
- color: white;
- }
+.options-scroller {
+ overflow-x: hidden;
+ overflow-y: auto;
+}
- hr {
- height: 1px;
- border: none;
- margin: 5px 0;
- box-shadow: inset 0 0.5px 0 rgba(0, 0, 0, 0.4), inset 0 -0.5px 0 rgba(255, 255, 255, 0.2);
- }
+.results {
+ display: grid;
+ grid-template-columns: 1fr auto;
+ background: rgba(0, 0, 0, 0.9);
+ font-size: 1.4rem;
}
-.size-details {
+.result-data {
display: flex;
align-items: center;
- padding: 5px 15px;
- background: rgba(0,0,0,0.5);
+ padding: 0 $horizontalPadding;
}
-.download {
- flex: 0;
- margin: 0 0 0 auto;
- background: rgba(255,255,255,0.1);
- border-radius: 50%;
- padding: 5px;
- width: 16px;
- height: 16px;
- text-decoration: none;
-
- > svg {
- width: 16px;
- height: 16px;
- fill: #fff;
- }
+.size-delta {
+ font-size: 1.1rem;
+ font-style: italic;
+ position: relative;
+ top: -1px;
+ margin-left: 0.3em;
+}
- &:hover {
- background-color: rgba(255,255,255,0.3);
- }
+.size-increase {
+ color: #e35050;
}
-.size-details {
- padding: 5px 15px;
- background: rgba(0,0,0,0.5);
+.size-decrease {
+ color: #50e3c2;
}
-.size {
- font-weight: normal;
+.options-copy {
+ display: grid;
+ background: rgba(0, 0, 0, 0.9);
+ padding: 5px;
}
-.increase,
-.decrease {
- font-style: italic;
- filter: #{"grayscale(calc(50% - var(--size-delta, 50) * 0.5%))"};
+.copy-button {
+ composes: unbutton from '../../lib/util.scss';
+ background: #484848;
+ border-radius: 4px;
+ color: #fff;
+ text-align: left;
+ padding: 5px 10px;
+}
- &:before {
- content: ' (';
+@keyframes action-enter {
+ from {
+ transform: rotate(-90deg);
+ opacity: 0;
+ animation-timing-function: ease-out;
}
- &:after {
- content: ')';
+}
+
+@keyframes action-leave {
+ from {
+ transform: rotate(0deg);
+ opacity: 1;
+ animation-timing-function: ease-out;
}
}
-.increase {
- color: var(--negative);
+.download {
+ background: #34B9EB;
+ --size: 38px;
+ width: var(--size);
+ height: var(--size);
+ display: grid;
+ align-items: center;
+ justify-items: center;
}
-.decrease {
- color: var(--positive);
+
+.download-link {
+ animation: action-enter 0.2s;
+ grid-area: 1/1;
}
-.preprocessors {
- padding: 5px 0;
- margin: 5px 0;
- box-shadow: inset 0 -.5px 0 rgba(0,0,0,0.4), 0 .5px 0 rgba(255,255,255,0.2);
+.download-link-disable {
+ pointer-events: none;
+ opacity: 0;
+ transform: rotate(90deg);
+ animation: action-leave 0.2s;
}
-.toggle {
- display: flex;
- position: relative;
- align-content: center;
- font-size: 14px;
- box-shadow: inset 0 -.5px 0 rgba(0,0,0,0.4), 0 .5px 0 rgba(255,255,255,0.2);
+.download-icon {
+ color: #fff;
+ display: block;
+ --size: 24px;
+ width: var(--size);
+ height: var(--size);
+ padding: 7px;
+ filter: drop-shadow(0 1px 0 rgba(0, 0, 0, 0.7));
+}
+
+.spinner {
+ --color: #fff;
+ --delay: 0;
+ --size: 22px;
+ grid-area: 1/1;
}
diff --git a/src/components/Output/custom-els/TwoUp/styles.css b/src/components/Output/custom-els/TwoUp/styles.css
index 8111754f..d40b8735 100644
--- a/src/components/Output/custom-els/TwoUp/styles.css
+++ b/src/components/Output/custom-els/TwoUp/styles.css
@@ -52,7 +52,7 @@ two-up[legacy-clip-compat] > :not(.two-up-handle) {
height: calc(var(--thumb-size) * 0.9);
background: var(--thumb-background);
border: 1px solid rgba(0,0,0,0.2);
- border-radius: calc(var(--thumb-size) * 0.08);
+ border-radius: var(--thumb-size);
box-shadow: 0 1px 4px rgba(0,0,0,0.1);
color: var(--thumb-color);
box-sizing: border-box;
diff --git a/src/components/Output/style.scss b/src/components/Output/style.scss
index dd74b11b..62bf79bf 100644
--- a/src/components/Output/style.scss
+++ b/src/components/Output/style.scss
@@ -47,10 +47,10 @@ Note: These styles are temporary. They will be replaced before going live.
flex-wrap: wrap;
contain: content;
- @media (min-width: 680px) {
+ @media (min-width: 860px) {
top: auto;
- left: 220px;
- right: 220px;
+ left: 320px;
+ right: 320px;
bottom: 0;
}
}
diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx
new file mode 100644
index 00000000..9ed202ab
--- /dev/null
+++ b/src/components/checkbox/index.tsx
@@ -0,0 +1,20 @@
+import { h, Component } from 'preact';
+import * as style from './style.scss';
+import { UncheckedIcon, CheckedIcon } from '../../lib/icons';
+
+interface Props extends JSX.HTMLAttributes {}
+interface State {}
+
+export default class Checkbox extends Component<Props, State> {
+ render(props: Props) {
+ return (
+ <div class={style.checkbox}>
+ {props.checked
+ ? <CheckedIcon class={`${style.icon} ${style.checked}`} />
+ : <UncheckedIcon class={style.icon} />
+ }
+ <input class={style.realCheckbox} type="checkbox" {...props}/>
+ </div>
+ );
+ }
+}
diff --git a/src/components/checkbox/style.scss b/src/components/checkbox/style.scss
new file mode 100644
index 00000000..67aecd6a
--- /dev/null
+++ b/src/components/checkbox/style.scss
@@ -0,0 +1,22 @@
+.checkbox {
+ display: inline-block;
+ position: relative;
+ --size: 17px;
+}
+
+.real-checkbox {
+ top: 0;
+ position: absolute;
+ opacity: 0;
+ pointer-events: none;
+}
+
+.icon {
+ display: block;
+ width: var(--size);
+ height: var(--size);
+}
+
+.checked {
+ fill: #34B9EB;
+}
diff --git a/src/components/compress/index.tsx b/src/components/compress/index.tsx
index 0568ff41..700c244e 100644
--- a/src/components/compress/index.tsx
+++ b/src/components/compress/index.tsx
@@ -65,7 +65,9 @@ interface Props {
interface State {
source?: SourceImage;
images: [EncodedImage, EncodedImage];
+ /** Source image load */
loading: boolean;
+ loadingCounter: number;
error?: string;
orientation: Orientation;
}
@@ -159,6 +161,7 @@ export default class Compress extends Component<Props, State> {
state: State = {
source: undefined,
loading: false,
+ loadingCounter: 0,
images: [
{
preprocessorState: defaultPreprocessorState,
@@ -252,7 +255,9 @@ export default class Compress extends Component<Props, State> {
@bind
private async updateFile(file: File | Fileish) {
- this.setState({ loading: true });
+ const loadingCounter = this.state.loadingCounter + 1;
+
+ this.setState({ loadingCounter, loading: true });
// Abort any current encode jobs, as they're redundant now.
this.leftProcessor.abortCurrent();
@@ -273,6 +278,9 @@ export default class Compress extends Component<Props, State> {
data = await decodeImage(file, this.leftProcessor);
}
+ // Another file has been opened before this one processed.
+ if (this.state.loadingCounter !== loadingCounter) return;
+
let newState: State = {
...this.state,
source: { data, file, vectorImage },
@@ -303,6 +311,8 @@ export default class Compress extends Component<Props, State> {
} catch (err) {
if (err.name === 'AbortError') return;
console.error(err);
+ // Another file has been opened before this one processed.
+ if (this.state.loadingCounter !== loadingCounter) return;
this.props.onError('Invalid image');
this.setState({ loading: false });
}
@@ -388,10 +398,9 @@ export default class Compress extends Component<Props, State> {
render({ }: Props, { loading, images, source, orientation }: State) {
const [leftImage, rightImage] = images;
const [leftImageData, rightImageData] = images.map(i => i.data);
- const anyLoading = loading || images.some(image => image.loading);
return (
- <div class={style.compress}>
+ <div class={`${style.compress} ${style[orientation]}`}>
<Output
originalImage={source && source.data}
orientation={orientation}
@@ -400,24 +409,22 @@ export default class Compress extends Component<Props, State> {
leftImgContain={leftImage.preprocessorState.resize.fitMethod === 'cover'}
rightImgContain={rightImage.preprocessorState.resize.fitMethod === 'cover'}
/>
- <div class={`${style.optionPair} ${style[orientation]}`}>
- {images.map((image, index) => (
- <Options
- source={source}
- orientation={orientation}
- imageIndex={index}
- imageFile={image.file}
- downloadUrl={image.downloadUrl}
- preprocessorState={image.preprocessorState}
- encoderState={image.encoderState}
- onEncoderTypeChange={this.onEncoderTypeChange.bind(this, index)}
- onEncoderOptionsChange={this.onEncoderOptionsChange.bind(this, index)}
- onPreprocessorOptionsChange={this.onPreprocessorOptionsChange.bind(this, index)}
- onCopyToOtherClick={this.onCopyToOtherClick.bind(this, index)}
- />
- ))}
- </div>
- {anyLoading && <span style={{ position: 'fixed', top: 0, left: 0 }}>Loading...</span>}
+ {images.map((image, index) => (
+ <Options
+ loading={loading || image.loading}
+ source={source}
+ orientation={orientation}
+ imageIndex={index}
+ imageFile={image.file}
+ downloadUrl={image.downloadUrl}
+ preprocessorState={image.preprocessorState}
+ encoderState={image.encoderState}
+ onEncoderTypeChange={this.onEncoderTypeChange.bind(this, index)}
+ onEncoderOptionsChange={this.onEncoderOptionsChange.bind(this, index)}
+ onPreprocessorOptionsChange={this.onPreprocessorOptionsChange.bind(this, index)}
+ onCopyToOtherClick={this.onCopyToOtherClick.bind(this, index)}
+ />
+ ))}
</div>
);
}
diff --git a/src/components/compress/style.scss b/src/components/compress/style.scss
index 29fefe9f..efb7e628 100644
--- a/src/components/compress/style.scss
+++ b/src/components/compress/style.scss
@@ -1,19 +1,22 @@
.compress {
- height: 100%;
-}
-
-.option-pair {
- display: flex;
width: 100%;
height: 100%;
+ contain: strict;
+ display: grid;
&.horizontal {
- justify-content: space-between;
- align-items: flex-end;
+ grid-template-columns: 1fr auto;
+ grid-template-rows: calc(100% - 75px);
+
+ @media (min-width: 860px) {
+ grid-template-rows: 100%;
+ }
+ align-items: end;
+ align-content: end;
}
&.vertical {
- flex-direction: column;
- justify-content: flex-end;
+ // TODO: make the mobile view work
+ background: red;
}
}
diff --git a/src/components/expander/index.tsx b/src/components/expander/index.tsx
new file mode 100644
index 00000000..49099cc2
--- /dev/null
+++ b/src/components/expander/index.tsx
@@ -0,0 +1,92 @@
+import { h, Component, ComponentChild, ComponentChildren } from 'preact';
+import * as style from './style.scss';
+import { linkRef } from '../../lib/initial-util';
+
+interface Props {
+ children: ComponentChildren;
+}
+interface State {
+ outgoingChildren: ComponentChild[];
+}
+
+export default class Expander extends Component<Props, State> {
+ state: State = {
+ outgoingChildren: [],
+ };
+ private el?: HTMLDivElement;
+ private lastElHeight: number = 0;
+
+ componentWillReceiveProps(nextProps: Props) {
+ const children = this.props.children as ComponentChild[];
+ const nextChildren = nextProps.children as ComponentChild[];
+
+ if (!nextChildren[0] && children[0]) {
+ // Cache the current children for the shrink animation.
+ this.setState({ outgoingChildren: children });
+ }
+ }
+
+ componentWillUpdate(nextProps: Props) {
+ const children = this.props.children as ComponentChild[];
+ const nextChildren = nextProps.children as ComponentChild[];
+
+ // Only interested if going from empty to not-empty, or not-empty to empty.
+ if ((children[0] && nextChildren[0]) || (!children[0] && !nextChildren[0])) return;
+ this.lastElHeight = this.el!.getBoundingClientRect().height;
+ }
+
+ componentDidUpdate(previousProps: Props) {
+ const children = this.props.children as ComponentChild[];
+ const previousChildren = previousProps.children as ComponentChild[];
+
+ // Only interested if going from empty to not-empty, or not-empty to empty.
+ if ((children[0] && previousChildren[0]) || (!children[0] && !previousChildren[0])) return;
+
+ // What height do we need to transition to?
+ this.el!.style.transition = 'none';
+ this.el!.style.height = '';
+ const newHeight = children[0] ? this.el!.getBoundingClientRect().height : 0;
+
+ if (this.lastElHeight === newHeight) {
+ this.el!.style.transition = '';
+ return;
+ }
+
+ // Set the currently rendered height absolutely.
+ this.el!.style.height = this.lastElHeight + 'px';
+ this.el!.style.transition = '';
+ this.el!.style.overflow = 'hidden';
+ // Force a style calc so the browser picks up the start value.
+ getComputedStyle(this.el!).height;
+ // Animate to the new height.
+ this.el!.style.height = newHeight + 'px';
+
+ const listener = () => {
+ // Unset the height & overflow, so element changes do the right thing.
+ this.el!.style.height = '';
+ this.el!.style.overflow = '';
+ this.el!.removeEventListener('transitionend', listener);
+ this.el!.removeEventListener('transitioncancel', listener);
+ if (this.state.outgoingChildren[0]) {
+ this.setState({ outgoingChildren: [] });
+ }
+ };
+
+ this.el!.addEventListener('transitionend', listener);
+ this.el!.addEventListener('transitioncancel', listener);
+ }
+
+ render(props: Props, { outgoingChildren }: State) {
+ const children = props.children as ComponentChild[];
+ const childrenExiting = !children[0] && outgoingChildren[0];
+
+ return (
+ <div
+ ref={linkRef(this, 'el')}
+ class={`${style.expander} ${childrenExiting ? style.childrenExiting : ''}`}
+ >
+ {children[0] ? children : outgoingChildren}
+ </div>
+ );
+ }
+}
diff --git a/src/components/expander/style.scss b/src/components/expander/style.scss
new file mode 100644
index 00000000..f72985b7
--- /dev/null
+++ b/src/components/expander/style.scss
@@ -0,0 +1,9 @@
+.expander {
+ transition: height 200ms ease-in-out;
+}
+
+.children-exiting {
+ & > * {
+ pointer-events: none;
+ }
+}
diff --git a/src/components/range/index.tsx b/src/components/range/index.tsx
new file mode 100644
index 00000000..fabc75c9
--- /dev/null
+++ b/src/components/range/index.tsx
@@ -0,0 +1,55 @@
+import { h, Component } from 'preact';
+import * as style from './style.scss';
+import RangeInputElement from '../../custom-els/RangeInput';
+import '../../custom-els/RangeInput';
+import { linkRef, bind } from '../../lib/initial-util';
+
+interface Props extends JSX.HTMLAttributes {}
+interface State {}
+
+export default class Range extends Component<Props, State> {
+ rangeWc?: RangeInputElement;
+
+ @bind
+ private onTextInput(event: Event) {
+ const input = event.target as HTMLInputElement;
+ this.rangeWc!.value = input.value;
+ const { onInput } = this.props;
+ if (onInput) onInput(event);
+ }
+
+ render(props: Props) {
+ const {
+ children,
+ ...otherProps
+ } = props;
+
+ const {
+ value, min, max, step,
+ } = props;
+
+ return (
+ <label class={style.range}>
+ <span class={style.labelText}>{children}</span>
+ {/* On interaction, Safari gives focus to the first element in the label, so the
+ <range-input> is deliberately first. */}
+ <div class={style.rangeWcContainer}>
+ <range-input
+ ref={linkRef(this, 'rangeWc')}
+ class={style.rangeWc}
+ {...otherProps}
+ />
+ </div>
+ <input
+ type="number"
+ class={style.textInput}
+ value={value}
+ min={min}
+ max={max}
+ step={step}
+ onInput={this.onTextInput}
+ />
+ </label>
+ );
+ }
+}
diff --git a/src/components/range/style.scss b/src/components/range/style.scss
new file mode 100644
index 00000000..ffe0d54e
--- /dev/null
+++ b/src/components/range/style.scss
@@ -0,0 +1,55 @@
+.range {
+ position: relative;
+ z-index: 0;
+ display: grid;
+ grid-template-columns: 1fr auto;
+}
+
+.label-text {
+ color: #fff; /* TEMP */
+}
+
+.range-wc-container {
+ position: relative;
+ z-index: 1;
+ grid-row: 2 / 3;
+ grid-column: 1 / 3;
+}
+
+.range-wc {
+ width: 100%;
+}
+
+.text-input {
+ grid-row: 1 / 2;
+ grid-column: 2 / 3;
+
+ text-align: right;
+ background: transparent;
+ color: inherit;
+ font: inherit;
+ border: none;
+ padding: 2px 5px;
+ box-sizing: border-box;
+ text-decoration: underline;
+ text-decoration-style: dotted;
+ text-underline-position: under;
+ width: 48px;
+ position: relative;
+ left: 5px;
+
+ &:focus {
+ background: #fff;
+ color: #000;
+ }
+
+ // Remove the number controls
+ -moz-appearance: textfield;
+
+ &::-webkit-outer-spin-button,
+ &::-webkit-inner-spin-button {
+ -moz-appearance: none;
+ -webkit-appearance: none;
+ margin: 0;
+ }
+}
diff --git a/src/components/select/index.tsx b/src/components/select/index.tsx
new file mode 100644
index 00000000..cbaf4541
--- /dev/null
+++ b/src/components/select/index.tsx
@@ -0,0 +1,20 @@
+import { h, Component } from 'preact';
+import * as style from './style.scss';
+
+interface Props extends JSX.HTMLAttributes {
+ large?: boolean;
+}
+interface State {}
+
+export default class Select extends Component<Props, State> {
+ render(props: Props) {
+ const { large, ...otherProps } = props;
+
+ return (
+ <div class={style.select}>
+ <select class={`${style.nativeSelect} ${large ? style.large : ''}`} {...otherProps}/>
+ <svg class={style.arrow} viewBox="0 0 10 5"><path d="M0 0l5 5 5-5z"/></svg>
+ </div>
+ );
+ }
+}
diff --git a/src/components/select/style.scss b/src/components/select/style.scss
new file mode 100644
index 00000000..b13ea914
--- /dev/null
+++ b/src/components/select/style.scss
@@ -0,0 +1,33 @@
+.select {
+ position: relative;
+}
+
+.native-select {
+ background: #2f2f2f;
+ border-radius: 4px;
+ font: inherit;
+ padding: 4px 25px 4px 10px;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ border: none;
+ color: #fff;
+ width: 100%;
+}
+
+.arrow {
+ position: absolute;
+ right: 8px;
+ top: 50%;
+ transform: translateY(-50%);
+ fill: #fff;
+ width: 10px;
+}
+
+.large {
+ padding: 10px 35px 10px 10px;
+ background: #151515;
+
+ & .arrow {
+ right: 13px;
+ }
+}
diff --git a/src/custom-els/RangeInput/index.ts b/src/custom-els/RangeInput/index.ts
index 58ed63b5..1195fa79 100644
--- a/src/custom-els/RangeInput/index.ts
+++ b/src/custom-els/RangeInput/index.ts
@@ -1,15 +1,19 @@
import { bind } from '../../lib/initial-util';
-import './styles.css';
+import * as style from './styles.css';
const RETARGETED_EVENTS = ['focus', 'blur'];
const UPDATE_EVENTS = ['input', 'change'];
const REFLECTED_PROPERTIES = ['name', 'min', 'max', 'step', 'value', 'disabled'];
const REFLECTED_ATTRIBUTES = ['name', 'min', 'max', 'step', 'value', 'disabled'];
+function getPrescision(value: string): number {
+ const afterDecimal = value.split('.')[1];
+ return afterDecimal ? afterDecimal.length : 0;
+}
+
class RangeInputElement extends HTMLElement {
- private _input = document.createElement('input');
- private _valueDisplayWrapper = document.createElement('div');
- private _valueDisplay = document.createElement('span');
+ private _input: HTMLInputElement;
+ private _valueDisplay?: HTMLDivElement;
private _ignoreChange = false;
static get observedAttributes() {
@@ -18,7 +22,9 @@ class RangeInputElement extends HTMLElement {
constructor() {
super();
+ this._input = document.createElement('input');
this._input.type = 'range';
+ this._input.className = style.input;
for (const event of RETARGETED_EVENTS) {
this._input.addEventListener(event, this._retargetEvent, true);
@@ -29,6 +35,18 @@ class RangeInputElement extends HTMLElement {
}
}
+ connectedCallback() {
+ if (this.contains(this._input)) return;
+ this.innerHTML =
+ `<div class="${style.thumbWrapper}">` +
+ `<div class="${style.thumb}"></div>` +
+ `<div class="${style.valueDisplay}"></div>` +
+ '</div>';
+
+ this.insertBefore(this._input, this.firstChild);
+ this._valueDisplay = this.querySelector('.' + style.valueDisplay) as HTMLDivElement;
+ }
+
get labelPrecision(): string {
return this.getAttribute('label-precision') || '';
}
@@ -37,14 +55,6 @@ class RangeInputElement extends HTMLElement {
this.setAttribute('label-precision', precision);
}
- connectedCallback() {
- if (this._input.parentNode !== this) {
- this.appendChild(this._input);
- this._valueDisplayWrapper.appendChild(this._valueDisplay);
- this.appendChild(this._valueDisplayWrapper);
- }
- }
-
attributeChangedCallback(name: string, oldValue: string, newValue: string | null) {
if (this._ignoreChange) return;
if (newValue === null) {
@@ -65,15 +75,15 @@ class RangeInputElement extends HTMLElement {
@bind
private _update() {
- const value = parseFloat(this.value || '0');
- const min = parseFloat(this.min || '0');
- const max = parseFloat(this.max || '100');
- const labelPrecision = parseFloat(this.labelPrecision || '0');
+ const value = Number(this.value) || 0;
+ const min = Number(this.min) || 0;
+ const max = Number(this.max) || 100;
+ const labelPrecision = Number(this.labelPrecision) || getPrescision(this.step) || 0;
const percent = 100 * (value - min) / (max - min);
- const displayValue = labelPrecision ? value.toPrecision(labelPrecision) :
+ const displayValue = labelPrecision ? value.toFixed(labelPrecision) :
Math.round(value).toString();
- this._valueDisplay.textContent = displayValue;
+ this._valueDisplay!.textContent = displayValue;
this.style.setProperty('--value-percent', percent + '%');
this.style.setProperty('--value-width', '' + displayValue.length);
}
diff --git a/src/custom-els/RangeInput/missing-types.d.ts b/src/custom-els/RangeInput/missing-types.d.ts
index 41c48e40..d566207d 100644
--- a/src/custom-els/RangeInput/missing-types.d.ts
+++ b/src/custom-els/RangeInput/missing-types.d.ts
@@ -1,9 +1,5 @@
declare namespace JSX {
- interface RangeInputAttributes extends HTMLAttributes {
- reversed?: boolean;
- }
-
interface IntrinsicElements {
- 'range-input': RangeInputAttributes;
+ 'range-input': HTMLAttributes;
}
}
diff --git a/src/custom-els/RangeInput/styles.css b/src/custom-els/RangeInput/styles.css
index c0397d80..f48483b3 100644
--- a/src/custom-els/RangeInput/styles.css
+++ b/src/custom-els/RangeInput/styles.css
@@ -14,41 +14,6 @@ range-input[disabled] {
filter: grayscale(1);
}
-/* Reversed Variant */
-range-input[reversed] input,
-range-input[reversed]::before,
-range-input[reversed] > div {
- transform: scaleX(-1);
-}
-range-input[reversed] > div > span {
- transform: scaleX(-1) scale(.2);
-}
-range-input[reversed] input:focus + div span {
- transform: scaleX(-1) scale(1);
-}
-
-
-range-input input {
- position: relative;
- flex: 1;
- vertical-align: middle;
- width: 100%;
- padding: 0 !important;
- margin: 0 !important;
- background: none;
- appearance: none;
- -webkit-appearance: none;
- outline: none;
-}
-range-input input::-webkit-slider-runnable-track,
-range-input input::-moz-range-track,
-range-input input::-ms-track {
- appearance: none;
- -ms-appearance: none;
- -moz-appearance: none;
- -webkit-appearance: none;
-}
-
range-input::before {
content: '';
display: block;
@@ -57,32 +22,33 @@ range-input::before {
left: 0;
width: 100%;
height: 2px;
- outline: none;
- border: none;
- background: #eee;
border-radius: 1px;
box-shadow: 0 -.5px 0 rgba(0,0,0,0.3), inset 0 .5px 0 rgba(255,255,255,0.2), 0 .5px 0 rgba(255,255,255,0.3);
background: linear-gradient(#34B9EB, #218ab1) 0/ var(--value-percent, 0%) 100% no-repeat #eee;
}
-range-input input::-webkit-slider-thumb {
- appearance: none;
- -webkit-appearance: none;
- background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="1" fill="#5D509E" /></svg>') center no-repeat #34B9EB;
- box-sizing: content-box;
+.input {
+ position: relative;
+ width: 100%;
+ padding: 0;
+ margin: 0;
+ opacity: 0;
+}
+
+.thumb {
+ pointer-events: none;
+ position: absolute;
+ bottom: 3px;
+ left: var(--value-percent, 0%);
+ margin-left: -6px;
+ background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="1" fill="%235D509E" /></svg>') center no-repeat #34B9EB;
border-radius: 50%;
width: 12px;
height: 12px;
- border: none;
box-shadow: 0 0.5px 2px rgba(0,0,0,0.3);
- outline: none;
-}
-
-range-input input:focus::-webkit-slider-thumb {
- box-shadow: 0 1px 3px rgba(0,0,0,0.5);
}
-range-input > div {
+.thumb-wrapper {
position: absolute;
left: 6px;
right: 6px;
@@ -91,8 +57,8 @@ range-input > div {
overflow: visible;
}
-range-input > div > span {
- background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="32" height="62" fill="none"><path fill="#34B9EB" d="M27.3 27.3C25 29.6 17 35.8 17 43v3c0 3 2.5 5 3.2 5.8a6 6 0 1 1-8.5 0C12.6 51 15 49 15 46v-3c0-7.2-8-13.4-10.3-15.7A16 16 0 0 1 16 0a16 16 0 0 1 11.3 27.3z"/><circle cx="16" cy="56" r="1" fill="#5D509E"/></svg>') top center no-repeat;
+.value-display {
+ background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="32" height="62" fill="none"><path fill="%2334B9EB" d="M27.3 27.3C25 29.6 17 35.8 17 43v3c0 3 2.5 5 3.2 5.8a6 6 0 1 1-8.5 0C12.6 51 15 49 15 46v-3c0-7.2-8-13.4-10.3-15.7A16 16 0 0 1 16 0a16 16 0 0 1 11.3 27.3z"/><circle cx="16" cy="56" r="1" fill="%235D509E"/></svg>') top center no-repeat;
position: absolute;
box-sizing: border-box;
left: var(--value-percent, 0%);
@@ -111,12 +77,18 @@ range-input > div > span {
font-size: calc(100% - var(--value-width, 3) / 5 * .2em);
text-overflow: clip;
text-shadow: 0 -.5px 0 rgba(0,0,0,0.4);
- transition: transform 200ms ease, opacity 200ms ease;
+ transition: all 200ms ease;
+ transition-property: opacity, transform;
will-change: transform;
pointer-events: none;
overflow: hidden;
}
-range-input input:focus + div span {
+
+.input:active + .thumb-wrapper .value-display {
opacity: 1;
transform: scale(1);
}
+
+.input:active + .thumb-wrapper .thumb {
+ box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+}
diff --git a/src/lib/icons.tsx b/src/lib/icons.tsx
index 0562b8d9..06cb7dac 100644
--- a/src/lib/icons.tsx
+++ b/src/lib/icons.tsx
@@ -8,7 +8,7 @@ const Icon = (props: JSX.HTMLAttributes) => (
export const DownloadIcon = (props: JSX.HTMLAttributes) => (
<Icon {...props}>
- <path d="M19.35 10.04A7.49 7.49 0 0 0 12 4C9.11 4 6.6 5.64 5.35 8.04A5.994 5.994 0 0 0 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM17 13l-5 5-5-5h3V9h4v4h3z" />
+ <path d="M19 12v7H5v-7H3v7c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2v-7h-2zm-6 .7l2.6-2.6 1.4 1.4-5 5-5-5 1.4-1.4 2.6 2.6V3h2z"/>
</Icon>
);
@@ -29,3 +29,15 @@ export const RemoveIcon = (props: JSX.HTMLAttributes) => (
<path d="M19 13H5v-2h14v2z"/>
</Icon>
);
+
+export const UncheckedIcon = (props: JSX.HTMLAttributes) => (
+ <Icon {...props}>
+ <path d="M21.3 2.7v18.6H2.7V2.7h18.6m0-2.7H2.7A2.7 2.7 0 0 0 0 2.7v18.6A2.7 2.7 0 0 0 2.7 24h18.6a2.7 2.7 0 0 0 2.7-2.7V2.7A2.7 2.7 0 0 0 21.3 0z"/>
+ </Icon>
+);
+
+export const CheckedIcon = (props: JSX.HTMLAttributes) => (
+ <Icon {...props}>
+ <path d="M21.3 0H2.7A2.7 2.7 0 0 0 0 2.7v18.6A2.7 2.7 0 0 0 2.7 24h18.6a2.7 2.7 0 0 0 2.7-2.7V2.7A2.7 2.7 0 0 0 21.3 0zm-12 18.7L2.7 12l1.8-1.9L9.3 15 19.5 4.8l1.8 1.9z"/>
+ </Icon>
+);
diff --git a/src/lib/util.ts b/src/lib/util.ts
index 4e974782..cecf38fc 100644
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -203,25 +203,40 @@ export function nativeResize(
/**
* @param field An HTMLInputElement, but the casting is done here to tidy up onChange.
+ * @param defaultVal Value to return if 'field' doesn't exist.
*/
-export function inputFieldValueAsNumber(field: any): number {
- return Number((field as HTMLInputElement).value);
+export function inputFieldValueAsNumber(field: any, defaultVal: number = 0): number {
+ if (!field) return defaultVal;
+ return Number(inputFieldValue(field));
}
/**
* @param field An HTMLInputElement, but the casting is done here to tidy up onChange.
+ * @param defaultVal Value to return if 'field' doesn't exist.
*/
-export function inputFieldCheckedAsNumber(field: any): number {
+export function inputFieldCheckedAsNumber(field: any, defaultVal: number = 0): number {
+ if (!field) return defaultVal;
return Number(inputFieldChecked(field));
}
/**
* @param field An HTMLInputElement, but the casting is done here to tidy up onChange.
+ * @param defaultVal Value to return if 'field' doesn't exist.
*/
-export function inputFieldChecked(field: any): boolean {
+export function inputFieldChecked(field: any, defaultVal: boolean = false): boolean {
+ if (!field) return defaultVal;
return (field as HTMLInputElement).checked;
}
+/**
+ * @param field An HTMLInputElement, but the casting is done here to tidy up onChange.
+ * @param defaultVal Value to return if 'field' doesn't exist.
+ */
+export function inputFieldValue(field: any, defaultVal: string = ''): string {
+ if (!field) return defaultVal;
+ return (field as HTMLInputElement).value;
+}
+
/**
* Creates a promise that resolves when the user types the konami code.
*/
diff --git a/src/style/index.scss b/src/style/index.scss
index a22b7362..27037998 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -1,7 +1,3 @@
-/*
-Note: These styles are temporary. They will be replaced before going live.
-*/
-
@import './reset.scss';
html, body {
diff --git a/src/style/reset.scss b/src/style/reset.scss
index 2d60b927..c863fb75 100644
--- a/src/style/reset.scss
+++ b/src/style/reset.scss
@@ -1,7 +1,3 @@
-/*
-Note: These styles are temporary. They will be replaced before going live.
-*/
-
button, a, img, input, select, textarea {
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
diff --git a/webpack.config.js b/webpack.config.js
index dbbf146d..ff942630 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,7 +23,8 @@ module.exports = function (_, env) {
const nodeModules = path.join(__dirname, 'node_modules');
const componentStyleDirs = [
path.join(__dirname, 'src/components'),
- path.join(__dirname, 'src/codecs')
+ path.join(__dirname, 'src/codecs'),
+ path.join(__dirname, 'src/custom-els'),
];
return {