Caught a bit of repetition in our utils

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.75 };
+export const defaultOptions: EncodeOptions = { quality: 0.5 };

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.01 });
+export default qualityOption({ min: 0, max: 1, step: 0 });

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.75 };
+export const defaultOptions: EncodeOptions = { quality: 0.5 };
 export const featureTest = () => canvasEncodeTest(mimeType);

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.01 });
+export default qualityOption({ min: 0, max: 1, step: 0 });

src/codecs/generic/quality-option.tsx

@@ -1,7 +1,6 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import * as style from '../../components/Options/style.scss';
+import '../../custom-els/RangeInput';
-import Range from '../../components/range';
 
 interface EncodeOptions {
   quality: number;
@@ -34,19 +33,18 @@ export default function qualityOption(opts: QualityOptionArg = {}) {
 
     render({ options }: Props) {
       return (
-        <div class={style.optionsSection}>
+        <div>
-          <div class={style.optionOneCell}>
+          <label>
-            <Range
+            Quality:
+            <range-input
               name="quality"
               min={min}
               max={max}
               step={step || 'any'}
-              value={options.quality}
+              value={'' + options.quality}
-              onInput={this.onChange}
+              onChange={this.onChange}
-            >
+            />
-              Quality:
+          </label>
-            </Range>
-          </div>
         </div>
       );
     }

src/codecs/imagequant/options.tsx

@@ -2,10 +2,6 @@ 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();
 
@@ -30,61 +26,50 @@ 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 newOptions: QuantizeOptions = {
+    const options: QuantizeOptions = {
-      zx: inputFieldValueAsNumber(form.zx, options.zx),
+      zx: inputFieldValueAsNumber(form.zx),
-      maxNumColors: inputFieldValueAsNumber(form.maxNumColors, options.maxNumColors),
+      maxNumColors: inputFieldValueAsNumber(form.maxNumColors),
       dither: inputFieldValueAsNumber(form.dither),
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
   render({ options }: Props, { extendedSettings }: State) {
     return (
-      <form class={style.optionsSection}>
+      <form>
-        <Expander>
+        <label style={{ display: extendedSettings ? '' : 'none' }}>
-          {extendedSettings ?
+          Type:
-            <label class={style.optionTextFirst}>
+          <select
-              Type:
+            name="zx"
-              <Select
+            value={'' + options.zx}
-                name="zx"
+            onChange={this.onChange}
-                value={'' + options.zx}
+          >
-                onChange={this.onChange}
+            <option value="0">Standard</option>
-              >
+            <option value="1">ZX</option>
-                <option value="0">Standard</option>
+          </select>
-                <option value="1">ZX</option>
+        </label>
-              </Select>
+        <label style={{ display: options.zx ? 'none' : '' }}>
-            </label>
+          Palette Colors:
-          : null}
+          <range-input
-        </Expander>
+            name="maxNumColors"
-        <Expander>
+            min="2"
-          {options.zx ? null :
+            max="256"
-            <div class={style.optionOneCell}>
+            value={'' + options.maxNumColors}
-              <Range
+            onChange={this.onChange}
-                name="maxNumColors"
+          />
-                min="2"
+        </label>
-                max="256"
+        <label>
-                value={options.maxNumColors}
+          Dithering:
-                onInput={this.onChange}
+          <range-input
-              >
-                Colors:
-              </Range>
-            </div>
-          }
-        </Expander>
-        <div class={style.optionOneCell}>
-          <Range
             name="dither"
             min="0"
             max="1"
             step="0.01"
-            value={options.dither}
+            value={'' + options.dither}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Dithering:
+        </label>
-          </Range>
-        </div>
       </form>
     );
   }

src/codecs/mozjpeg/options.tsx

@@ -2,197 +2,158 @@ import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
 import { inputFieldChecked, inputFieldValueAsNumber } from '../../lib/util';
 import { EncodeOptions, MozJpegColorSpace } from './encoder-meta';
-import * as style from '../../components/Options/style.scss';
+import '../../custom-els/RangeInput';
-import Checkbox from '../../components/checkbox';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
-import Range from '../../components/range';
-import linkState from 'linkstate';
 
-interface Props {
+type Props = {
-  options: EncodeOptions;
+  options: EncodeOptions,
-  onChange(newOptions: EncodeOptions): void;
+  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 newOptions: EncodeOptions = {
+    const options: 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, options.baseline),
+      baseline: inputFieldChecked(form.baseline),
-      progressive: inputFieldChecked(form.progressive, options.progressive),
+      progressive: inputFieldChecked(form.progressive),
-      optimize_coding: inputFieldChecked(form.optimize_coding, options.optimize_coding),
+      optimize_coding: inputFieldChecked(form.optimize_coding),
-      trellis_multipass: inputFieldChecked(form.trellis_multipass, options.trellis_multipass),
+      trellis_multipass: inputFieldChecked(form.trellis_multipass),
-      trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero, options.trellis_opt_zero),
+      trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero),
-      trellis_opt_table: inputFieldChecked(form.trellis_opt_table, options.trellis_opt_table),
+      trellis_opt_table: inputFieldChecked(form.trellis_opt_table),
       // .value
-      quality: inputFieldValueAsNumber(form.quality, options.quality),
+      quality: inputFieldValueAsNumber(form.quality),
-      smoothing: inputFieldValueAsNumber(form.smoothing, options.smoothing),
+      smoothing: inputFieldValueAsNumber(form.smoothing),
-      color_space: inputFieldValueAsNumber(form.color_space, options.color_space),
+      color_space: inputFieldValueAsNumber(form.color_space),
-      quant_table: inputFieldValueAsNumber(form.quant_table, options.quant_table),
+      quant_table: inputFieldValueAsNumber(form.quant_table),
-      trellis_loops: inputFieldValueAsNumber(form.trellis_loops, options.trellis_loops),
+      trellis_loops: inputFieldValueAsNumber(form.trellis_loops),
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
-  render({ options }: Props, { showAdvanced }: State) {
+  render({ options }: Props) {
     // I'm rendering both lossy and lossless forms, as it becomes much easier when
     // gathering the data.
     return (
-      <form class={style.optionsSection}>
+      <form>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Quality:
+          <range-input
             name="quality"
             min="0"
             max="100"
-            value={options.quality}
+            value={'' + options.quality}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Quality:
+        </label>
-          </Range>
+        <label>
-        </div>
+          <input
-        <label class={style.optionInputFirst}>
+            name="baseline"
-          <Checkbox
+            type="checkbox"
-            checked={showAdvanced}
+            checked={options.baseline}
-            onChange={linkState(this, 'showAdvanced')}
+            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}
+          >
+            <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}
           />
-          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>
     );
   }

src/codecs/optipng/options.tsx

@@ -2,8 +2,6 @@ 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;
@@ -23,19 +21,19 @@ export default class OptiPNGEncoderOptions extends Component<Props, {}> {
 
   render({ options }: Props) {
     return (
-      <form class={style.optionsSection}>
+      <form>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Effort:
+          <input
             name="level"
+            type="range"
             min="0"
             max="7"
             step="1"
-            value={options.level}
+            value={'' + options.level}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Effort:
+        </label>
-          </Range>
-        </div>
       </form>
     );
   }

src/codecs/processor.ts

@@ -92,6 +92,7 @@ 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;
@@ -103,14 +104,14 @@ export default class Processor {
   /** Abort the current job, if any */
   abortCurrent() {
     if (!this._busy) return;
-    if (!this._abortRejector) throw Error("There must be a rejector if it's busy");
+    if (!this._worker || !this._abortRejector) {
+      throw Error("There must be a worker/rejector if it's busy");
+    }
     this._abortRejector(new DOMException('Aborted', 'AbortError'));
-    this._abortRejector = undefined;
-    this._busy = false;
-
-    if (!this._worker) return;
     this._worker.terminate();
     this._worker = undefined;
+    this._abortRejector = undefined;
+    this._busy = false;
   }
 
   // Off main thread jobs:

src/codecs/resize/options.tsx

@@ -1,12 +1,8 @@
 import { h, Component } from 'preact';
 import linkState from 'linkstate';
-import { bind, linkRef } from '../../lib/initial-util';
+import { bind } from '../../lib/initial-util';
-import { inputFieldValueAsNumber, inputFieldValue } from '../../lib/util';
+import { inputFieldValueAsNumber } 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;
@@ -26,26 +22,23 @@ export default class ResizerOptions extends Component<Props, State> {
 
   form?: HTMLFormElement;
 
-  private reportOptions() {
+  reportOptions() {
-    const form = this.form!;
+    const width = this.form!.width as HTMLInputElement;
-    const width = form.width as HTMLInputElement;
+    const height = this.form!.height as HTMLInputElement;
-    const height = form.height as HTMLInputElement;
-    const { options } = this.props;
 
     if (!width.checkValidity() || !height.checkValidity()) return;
 
-    const newOptions: ResizeOptions = {
+    const options: ResizeOptions = {
       width: inputFieldValueAsNumber(width),
       height: inputFieldValueAsNumber(height),
-      method: form.resizeMethod.value,
+      method: this.form!.resizeMethod.value,
-      // Casting, as the formfield only returns the correct values.
+      fitMethod: this.form!.fitMethod.value,
-      fitMethod: inputFieldValue(form.fitMethod, options.fitMethod) as ResizeOptions['fitMethod'],
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
   @bind
-  private onChange() {
+  onChange(event: Event) {
     this.reportOptions();
   }
 
@@ -57,31 +50,27 @@ export default class ResizerOptions extends Component<Props, State> {
   }
 
   @bind
-  private onWidthInput() {
+  onWidthInput(event: Event) {
-    if (this.state.maintainAspect) {
+    if (!this.state.maintainAspect) return;
-      const width = inputFieldValueAsNumber(this.form!.width);
-      this.form!.height.value = Math.round(width / this.props.aspect);
-    }
 
-    this.reportOptions();
+    const width = inputFieldValueAsNumber(this.form!.width);
+    this.form!.height.value = Math.round(width / this.props.aspect);
   }
 
   @bind
-  private onHeightInput() {
+  onHeightInput(event: Event) {
-    if (this.state.maintainAspect) {
+    if (!this.state.maintainAspect) return;
-      const height = inputFieldValueAsNumber(this.form!.height);
-      this.form!.width.value = Math.round(height * this.props.aspect);
-    }
 
-    this.reportOptions();
+    const height = inputFieldValueAsNumber(this.form!.height);
+    this.form!.width.value = Math.round(height * this.props.aspect);
   }
 
-  render({ options, isVector }: Props, { maintainAspect }: State) {
+  render({ options, aspect, isVector }: Props, { maintainAspect }: State) {
     return (
-      <form ref={linkRef(this, 'form')} class={style.optionsSection}>
+      <form ref={el => this.form = el}>
-        <label class={style.optionTextFirst}>
+        <label>
           Method:
-          <Select
+          <select
             name="resizeMethod"
             value={options.method}
             onChange={this.onChange}
@@ -91,55 +80,51 @@ 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 class={style.optionTextFirst}>
+        <label>
           Width:
           <input
             required
-            class={style.textField}
             name="width"
             type="number"
             min="1"
             value={'' + options.width}
+            onChange={this.onChange}
             onInput={this.onWidthInput}
           />
         </label>
-        <label class={style.optionTextFirst}>
+        <label>
           Height:
           <input
             required
-            class={style.textField}
             name="height"
             type="number"
             min="1"
             value={'' + options.height}
-            onInput={this.onHeightInput}
+            onChange={this.onChange}
           />
         </label>
-        <label class={style.optionInputFirst}>
+        <label>
-          <Checkbox
+          <input
             name="maintainAspect"
+            type="checkbox"
             checked={maintainAspect}
             onChange={linkState(this, 'maintainAspect')}
           />
           Maintain aspect ratio
         </label>
-        <Expander>
+        <label style={{ display: maintainAspect ? 'none' : '' }}>
-          {maintainAspect ? null :
+          Fit method:
-            <label class={style.optionTextFirst}>
+          <select
-              Fit method:
+            name="fitMethod"
-              <Select
+            value={options.fitMethod}
-                name="fitMethod"
+            onChange={this.onChange}
-                value={options.fitMethod}
+          >
-                onChange={this.onChange}
+            <option value="stretch">Stretch</option>
-              >
+            <option value="cover">Cover</option>
-                <option value="stretch">Stretch</option>
+          </select>
-                <option value="cover">Cover</option>
+        </label>
-              </Select>
-            </label>
-          }
-        </Expander>
       </form>
     );
   }

src/codecs/webp/options.tsx

@@ -2,21 +2,13 @@ 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 style from '../../components/Options/style.scss';
+import * as styles from './styles.scss';
-import Checkbox from '../../components/checkbox';
+import '../../custom-els/RangeInput';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
-import Range from '../../components/range';
-import linkState from 'linkstate';
 
-interface Props {
+type Props = {
-  options: EncodeOptions;
+  options: EncodeOptions,
-  onChange(newOptions: EncodeOptions): void;
+  onChange(newOptions: EncodeOptions): void,
-}
+};
-
-interface State {
-  showAdvanced: boolean;
-}
 
 // From kLosslessPresets in config_enc.c
 // The format is [method, quality].
@@ -34,281 +26,249 @@ function determineLosslessQuality(quality: number): number {
   return losslessPresetDefault;
 }
 
-export default class WebPEncoderOptions extends Component<Props, State> {
+export default class WebPEncoderOptions extends Component<Props, {}> {
-  state: State = {
-    showAdvanced: false,
-  };
-
   @bind
   onChange(event: Event) {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
     const lossless = inputFieldCheckedAsNumber(form.lossless);
-    const { options } = this.props;
+    const losslessPresetInput = (form.lossless_preset as HTMLInputElement);
-    const losslessPresetValue = inputFieldValueAsNumber(
-      form.lossless_preset, determineLosslessQuality(options.quality),
-    );
 
-    const newOptions: EncodeOptions = {
+    const options: EncodeOptions = {
       // Copy over options the form doesn't care about, eg emulate_jpeg_size
-      ...options,
+      ...this.props.options,
       // And now stuff from the form:
       lossless,
       // Special-cased inputs:
       // In lossless mode, the quality is derived from the preset.
       quality: lossless ?
-        losslessPresets[losslessPresetValue][1] :
+        losslessPresets[Number(losslessPresetInput.value)][1] :
-        inputFieldValueAsNumber(form.quality, options.quality),
+        inputFieldValueAsNumber(form.quality),
       // In lossless mode, the method is derived from the preset.
       method: lossless ?
-        losslessPresets[losslessPresetValue][0] :
+        losslessPresets[Number(losslessPresetInput.value)][0] :
-        inputFieldValueAsNumber(form.method_input, options.method),
+        inputFieldValueAsNumber(form.method_input),
-      image_hint: inputFieldCheckedAsNumber(form.image_hint, options.image_hint) ?
+      image_hint: (form.image_hint as HTMLInputElement).checked ?
         WebPImageHint.WEBP_HINT_GRAPH :
         WebPImageHint.WEBP_HINT_DEFAULT,
       // .checked
-      exact: inputFieldCheckedAsNumber(form.exact, options.exact),
+      exact: inputFieldCheckedAsNumber(form.exact),
-      alpha_compression: inputFieldCheckedAsNumber(
+      alpha_compression: inputFieldCheckedAsNumber(form.alpha_compression),
-        form.alpha_compression, options.alpha_compression,
+      autofilter: inputFieldCheckedAsNumber(form.autofilter),
-      ),
+      filter_type: inputFieldCheckedAsNumber(form.filter_type),
-      autofilter: inputFieldCheckedAsNumber(form.autofilter, options.autofilter),
+      use_sharp_yuv: inputFieldCheckedAsNumber(form.use_sharp_yuv),
-      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, 100 - options.near_lossless),
+      near_lossless: 100 - inputFieldValueAsNumber(form.near_lossless),
-      alpha_quality: inputFieldValueAsNumber(form.alpha_quality, options.alpha_quality),
+      alpha_quality: inputFieldValueAsNumber(form.alpha_quality),
-      alpha_filtering: inputFieldValueAsNumber(form.alpha_filtering, options.alpha_filtering),
+      alpha_filtering: inputFieldValueAsNumber(form.alpha_filtering),
-      sns_strength: inputFieldValueAsNumber(form.sns_strength, options.sns_strength),
+      sns_strength: inputFieldValueAsNumber(form.sns_strength),
-      filter_strength: inputFieldValueAsNumber(form.filter_strength, options.filter_strength),
+      filter_strength: inputFieldValueAsNumber(form.filter_strength),
-      filter_sharpness:
+      filter_sharpness: 7 - inputFieldValueAsNumber(form.filter_sharpness),
-        7 - inputFieldValueAsNumber(form.filter_sharpness, 7 - options.filter_sharpness),
+      pass: inputFieldValueAsNumber(form.pass),
-      pass: inputFieldValueAsNumber(form.pass, options.pass),
+      preprocessing: inputFieldValueAsNumber(form.preprocessing),
-      preprocessing: inputFieldValueAsNumber(form.preprocessing, options.preprocessing),
+      segments: inputFieldValueAsNumber(form.segments),
-      segments: inputFieldValueAsNumber(form.segments, options.segments),
+      partitions: inputFieldValueAsNumber(form.partitions),
-      partitions: inputFieldValueAsNumber(form.partitions, options.partitions),
     };
-    this.props.onChange(newOptions);
+    this.props.onChange(options);
   }
 
   private _losslessSpecificOptions(options: EncodeOptions) {
     return (
-      <div key="lossless">
+      <div>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Effort:
+          <range-input
             name="lossless_preset"
             min="0"
             max="9"
-            value={determineLosslessQuality(options.quality)}
+            value={'' + determineLosslessQuality(options.quality)}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Effort:
+        </label>
-          </Range>
+        <label>
-        </div>
+          Slight loss:
-        <div class={style.optionOneCell}>
+          <range-input
-          <Range
             name="near_lossless"
             min="0"
             max="100"
             value={'' + (100 - options.near_lossless)}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Slight loss:
+        </label>
-          </Range>
+        <label>
-        </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.
           */}
-          <Checkbox
+          <input
             name="image_hint"
+            type="checkbox"
             checked={options.image_hint === WebPImageHint.WEBP_HINT_GRAPH}
+            value={'' + WebPImageHint.WEBP_HINT_GRAPH}
             onChange={this.onChange}
           />
-          Discrete tone image
+          <span>Discrete tone image (graph, map-tile etc)</span>
         </label>
       </div>
     );
   }
 
   private _lossySpecificOptions(options: EncodeOptions) {
-    const { showAdvanced } = this.state;
-
     return (
-      <div key="lossy">
+      <div>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Effort:
+          <range-input
             name="method_input"
             min="0"
             max="6"
-            value={options.method}
+            value={'' + options.method}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Effort:
+        </label>
-          </Range>
+        <label>
-        </div>
+          Quality:
-        <div class={style.optionOneCell}>
+          <range-input
-          <Range
             name="quality"
             min="0"
             max="100"
-            step="0.1"
+            step="0.01"
-            value={options.quality}
+            value={'' + options.quality}
-            onInput={this.onChange}
+            onChange={this.onChange}
-          >
+          />
-            Quality:
+        </label>
-          </Range>
+        <hr />
-        </div>
+        <label>
-        <label class={style.optionInputFirst}>
+          <input
-          <Checkbox
+            name="alpha_compression"
-            checked={showAdvanced}
+            type="checkbox"
-            onChange={linkState(this, 'showAdvanced')}
+            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}
+          >
+            <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}
           />
-          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>
     );
   }
@@ -317,26 +277,32 @@ export default class WebPEncoderOptions extends Component<Props, State> {
     // I'm rendering both lossy and lossless forms, as it becomes much easier when
     // gathering the data.
     return (
-      <form class={style.optionsSection}>
+      <form>
-        <label class={style.optionInputFirst}>
+        <label>
-          <Checkbox
+          <input
             name="lossless"
+            type="checkbox"
             checked={!!options.lossless}
             onChange={this.onChange}
           />
           Lossless
         </label>
-        {options.lossless
+        <div class={options.lossless ? '' : styles.hide}>
-          ? this._losslessSpecificOptions(options)
+          {this._losslessSpecificOptions(options)}
-          : this._lossySpecificOptions(options)
+        </div>
-        }
+        <div class={options.lossless ? styles.hide : ''}>
-        <label class={style.optionInputFirst}>
+          {this._lossySpecificOptions(options)}
-          <Checkbox
+        </div>
+        <label>
+          <input
             name="exact"
+            type="checkbox"
             checked={!!options.exact}
             onChange={this.onChange}
           />
-          Preserve transparent data
+          <span>
+            Preserve transparent data. Otherwise, pixels with zero alpha will have RGB also zeroed.
+          </span>
         </label>
       </form>
     );

src/codecs/webp/styles.scss

@@ -0,0 +1,3 @@
+.hide {
+  display: none;
+}

src/components/App/index.tsx

@@ -74,7 +74,7 @@ export default class App extends Component<Props, State> {
   render({}: Props, { file, Compress }: State) {
     return (
       <div id="app" class={style.app}>
-        <file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
+        <file-drop accept="image/*" onfiledrop={this.onFileDrop}>
           {(!file)
             ? <Intro onFile={this.onIntroPickFile} onError={this.showError} />
             : (Compress)

src/components/App/style.scss

@@ -1,3 +1,7 @@
+/*
+Note: These styles are temporary. They will be replaced before going live.
+*/
+
 .app {
   position: absolute;
   left: 0;
@@ -8,14 +12,14 @@
   contain: strict;
 }
 
-.drop {
+:global {
-  overflow: hidden;
+  file-drop {
-  touch-action: none;
+    overflow: hidden;
-  height: 100%;
+    touch-action: none;
-  width: 100%;
+    height:100%;
+    width:100%;
 
-  &:global {
+    &:after {
-    &::after {
       content: '';
       position: absolute;
       display: block;
@@ -24,20 +28,28 @@
       right: 10px;
       bottom: 10px;
       border: 2px dashed #fff;
-      background-color:rgba(88, 116, 88, 0.2);
-      border-color: rgba(65, 129, 65, 0.5);
       border-radius: 10px;
       opacity: 0;
       transform: scale(0.95);
-      transition: all 200ms ease-in;
+      transition: opacity 300ms ease, transform 300ms cubic-bezier(.6,2,.6,1), background-color 300ms step-end, border-color 300ms step-end;
-      transition-property: transform, opacity;
       pointer-events: none;
     }
 
-    &.drop-valid::after {
+    &.drop-valid:after,
+    &.drop-invalid:after {
       opacity: 1;
       transform: scale(1);
-      transition-timing-function: ease-out;
+      transition: opacity 300ms ease, transform 300ms cubic-bezier(.6,2,.6,1);
+    }
+
+    &.drop-valid:after {
+      background-color:rgba(88, 116, 88, 0.2);
+      border-color: rgba(65, 129, 65, 0.5);
+    }
+
+    &.drop-invalid:after {
+      background-color:rgba(119, 85, 85, 0.2);
+      border-color:rgba(129, 63, 63, 0.5);
     }
   }
 }

src/components/FileSize.tsx

@@ -0,0 +1,87 @@
+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>
+    );
+  }
+}

src/components/Options/index.tsx

@@ -1,7 +1,7 @@
 import { h, Component } from 'preact';
 
 import * as style from './style.scss';
-import { bind } from '../../lib/initial-util';
+import { bind, Fileish } from '../../lib/initial-util';
 import { cleanSet, cleanMerge } from '../../lib/clean-modify';
 import OptiPNGEncoderOptions from '../../codecs/optipng/options';
 import MozJpegEncoderOptions from '../../codecs/mozjpeg/options';
@@ -31,14 +31,14 @@ 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 { DownloadIcon } from '../../lib/icons';
 import { SourceImage } from '../App';
-import Checkbox from '../checkbox';
-import Expander from '../expander';
-import Select from '../select';
 
 const encoderOptionsComponentMap = {
   [identity.type]: undefined,
@@ -56,10 +56,17 @@ const encoderOptionsComponentMap = {
   [browserPDF.type]: undefined,
 };
 
+const titles = {
+  horizontal: ['Left Image', 'Right Image'],
+  vertical: ['Top Image', 'Bottom Image'],
+};
+
 interface Props {
-  mobileView: boolean;
+  orientation: 'horizontal' | 'vertical';
   source?: SourceImage;
   imageIndex: number;
+  imageFile?: Fileish;
+  downloadUrl?: string;
   encoderState: EncoderState;
   preprocessorState: PreprocessorState;
   onEncoderTypeChange(newType: EncoderType): void;
@@ -73,9 +80,7 @@ interface State {
 }
 
 export default class Options extends Component<Props, State> {
-  state: State = {
+  typeSelect?: HTMLSelectElement;
-    encoderSupportMap: undefined,
-  };
 
   constructor() {
     super();
@@ -126,6 +131,9 @@ export default class Options extends Component<Props, State> {
     {
       source,
       imageIndex,
+      imageFile,
+      downloadUrl,
+      orientation,
       encoderState,
       preprocessorState,
       onEncoderOptionsChange,
@@ -136,65 +144,64 @@ export default class Options extends Component<Props, State> {
     const EncoderOptionComponent = encoderOptionsComponentMap[encoderState.type];
 
     return (
-      <div class={style.optionsScroller}>
+      <div class={`${style.options} ${style[orientation]}`}>
-        <Expander>
+        <h2 class={style.title}>
-          {encoderState.type === identity.type ? null :
+          {titles[orientation][imageIndex]}
-            <div>
+          {', '}
-              <h3 class={style.optionsTitle}>Edit</h3>
+          {encoderMap[encoderState.type].label}
-              <label class={style.sectionEnabler}>
+        </h2>
-                <Checkbox
+
+        <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
                   name="resize.enable"
+                  type="checkbox"
                   checked={!!preprocessorState.resize.enabled}
                   onChange={this.onPreprocessorEnabledChange}
                 />
                 Resize
               </label>
-              <Expander>
+              {preprocessorState.resize.enabled &&
-                {preprocessorState.resize.enabled ?
+                <ResizeOptionsComponent
-                  <ResizeOptionsComponent
+                  isVector={Boolean(source && source.vectorImage)}
-                    isVector={Boolean(source && source.vectorImage)}
+                  aspect={source ? (source.data.width / source.data.height) : 1}
-                    aspect={source ? (source.data.width / source.data.height) : 1}
+                  options={preprocessorState.resize}
-                    options={preprocessorState.resize}
+                  onChange={this.onResizeOptionsChange}
-                    onChange={this.onResizeOptionsChange}
+                />
-                  />
+              }
-                : null}
+              <label class={style.toggle}>
-              </Expander>
+                <input
-              <label class={style.sectionEnabler}>
-                <Checkbox
                   name="quantizer.enable"
+                  type="checkbox"
                   checked={!!preprocessorState.quantizer.enabled}
                   onChange={this.onPreprocessorEnabledChange}
                 />
-                Reduce palette
+                Quantize
               </label>
-              <Expander>
+              {preprocessorState.quantizer.enabled &&
-                {preprocessorState.quantizer.enabled ?
+                <QuantizerOptionsComponent
-                  <QuantizerOptionsComponent
+                  options={preprocessorState.quantizer}
-                    options={preprocessorState.quantizer}
+                  onChange={this.onQuantizerOptionsChange}
-                    onChange={this.onQuantizerOptionsChange}
+                />
-                  />
+              }
-                : null}
-              </Expander>
             </div>
-          }
+          )}
-        </Expander>
 
-        <h3 class={style.optionsTitle}>Compress</h3>
+          {EncoderOptionComponent &&
-
-        <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
@@ -203,15 +210,32 @@ export default class Options extends Component<Props, State> {
               }
               onChange={onEncoderOptionsChange}
             />
-          : null}
+          }
-        </Expander>
+        </div>
 
-        <div class={style.optionsCopy}>
+        <div class={style.row}>
-          <button onClick={this.onCopyToOtherClick} class={style.copyButton}>
+          <button onClick={this.onCopyToOtherClick}>Copy settings to other side</button>
-            {imageIndex === 1 && '← '}
+        </div>
-            Copy settings across
+
-            {imageIndex === 0 && ' →'}
+        <div class={style.sizeDetails}>
-          </button>
+          <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>
       </div>
     );

src/components/Options/style.scss

@@ -1,72 +1,225 @@
-$horizontalPadding: 15px;
+/*
+Note: These styles are temporary. They will be replaced before going live.
+*/
 
-.options-title {
+.row {
-  background: rgba(0, 0, 0, 0.9);
-  margin: 0;
-  padding: 10px $horizontalPadding;
-  font-weight: normal;
-  font-size: 1.4rem;
-  border-bottom: 1px solid #000;
-}
-
-.option-text-first {
-  display: grid;
-  align-items: center;
-  grid-template-columns: 87px 1fr;
-  grid-gap: 0.7em;
-  padding: 10px $horizontalPadding;
-}
-
-.option-one-cell {
-  display: grid;
-  grid-template-columns: 1fr;
-  padding: 10px $horizontalPadding;
-}
-
-.option-input-first,
-.section-enabler {
-  cursor: pointer;
-  display: grid;
-  align-items: center;
-  grid-template-columns: auto 1fr;
-  grid-gap: 0.7em;
-  padding: 10px $horizontalPadding;
-}
-
-.section-enabler {
-  background: rgba(0, 0, 0, 0.8);
-}
-
-.options-section {
-  background: rgba(0, 0, 0, 0.7);
-}
-
-.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);
-}
-
-.options-scroller {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.options-copy {
-  display: grid;
-  background: rgba(0, 0, 0, 0.9);
   padding: 5px;
+  margin: 0 10px;
 }
 
-.copy-button {
+.options {
-  composes: unbutton from '../../lib/util.scss';
+  box-sizing: border-box;
-  background: #484848;
+  padding: 0;
-  border-radius: 4px;
+  background: rgba(40,40,40,0.8);
-  color: #fff;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.5);
-  text-align: left;
+  color: #eee;
-  padding: 5px 10px;
+  overflow: auto;
+  z-index: 1;
+  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;
+  }
+
+  &:hover, &:focus, &:focus-within {
+    opacity: 1;
+  }
+
+  @keyframes options-open {
+    from {
+      transform: translateY(100px) scale(.8);
+    }
+  }
+
+  .content {
+    max-height: calc(75vh - 100px);
+    overflow: auto;
+    touch-action: pan-y;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  .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);
+      }
+    }
+  }
+
+  .title {
+    display: flex;
+    align-items: center;
+    padding: 10px 15px;
+    margin: 0 0 12px;
+    background: rgba(0,0,0,0.9);
+    font: inherit;
+  }
+
+  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;
+    }
+  }
+
+  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);
+  }
+}
+
+.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;
+  }
+
+  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);
+  }
+}
+
+.size-details {
+  display: flex;
+  align-items: center;
+  padding: 5px 15px;
+  background: rgba(0,0,0,0.5);
+}
+
+.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;
+  }
+
+  &:hover {
+    background-color: rgba(255,255,255,0.3);
+  }
+}
+
+.size-details {
+  padding: 5px 15px;
+  background: rgba(0,0,0,0.5);
+}
+
+.size {
+  font-weight: normal;
+}
+
+.increase,
+.decrease {
+  font-style: italic;
+  filter: #{"grayscale(calc(50% - var(--size-delta, 50) * 0.5%))"};
+
+  &:before {
+    content: ' (';
+  }
+  &:after {
+    content: ')';
+  }
+}
+
+.increase {
+  color: var(--negative);
+}
+.decrease {
+  color: var(--positive);
+}
+
+.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);
+}
+
+.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);
 }

src/components/Output/custom-els/PinchZoom/index.ts

@@ -145,7 +145,7 @@ export default class PinchZoom extends HTMLElement {
     const relativeToEl = (relativeTo === 'content' ? this._positioningEl : this);
 
     // No content element? Fall back to just setting scale
-    if (!relativeToEl || !this._positioningEl) {
+    if (!relativeToEl) {
       this.setTransform({ scale, allowChangeEvent });
       return;
     }
@@ -157,10 +157,6 @@ export default class PinchZoom extends HTMLElement {
     if (relativeTo === 'content') {
       originX += this.x;
       originY += this.y;
-    } else {
-      const currentRect = this._positioningEl.getBoundingClientRect();
-      originX -= currentRect.left;
-      originY -= currentRect.top;
     }
 
     this._applyChange({

src/components/Output/custom-els/TwoUp/index.ts

@@ -68,14 +68,12 @@ export default class TwoUp extends HTMLElement {
   }
 
   connectedCallback() {
-    this._childrenChange();
+    this._handle.innerHTML = `<div class="${styles.scrubber}">${
+      '<svg viewBox="0 0 20 10" fill="currentColor"><path d="M8 0v10L0 5zM12 0v10l8-5z"/></svg>'
+    }</div>`;
 
+    this._childrenChange();
     if (!this._everConnected) {
-      this._handle.innerHTML = `<div class="${styles.scrubber}">${
-        `<svg viewBox="0 0 27 20" fill="currentColor">${
-          '<path d="M17 19.2l9.5-9.6L16.9 0zM9.6 0L0 9.6l9.6 9.6z"/>'
-        }</svg>`
-      }</div>`;
       this._resetPosition();
       this._everConnected = true;
     }

src/components/Output/custom-els/TwoUp/styles.css

@@ -6,41 +6,29 @@ two-up {
   --track-color: var(--accent-color);
   --thumb-background: #fff;
   --thumb-color: var(--accent-color);
-  --thumb-size: 62px;
-  --bar-size: 6px;
-  --bar-touch-size: 30px;
 }
 
 two-up > * {
-  /* Overlay all children on top of each other, and let two-up's layout contain all of them. */
+  /* Overlay all children on top of each other, and let
+  two-up's layout contain all of them. */
   grid-area: 1/1;
 }
 
-two-up[legacy-clip-compat] > :not(.two-up-handle) {
+two-up[legacy-clip-compat] > :not(.twoUpHandle) {
-  /* Legacy mode uses clip rather than clip-path (Edge doesn't support clip-path), but clip requires
-  elements to be positioned absolutely */
   position: absolute;
 }
 
-.two-up-handle {
+.twoUpHandle {
   touch-action: none;
   position: relative;
-  width: var(--bar-touch-size);
+  width: 10px;
+  background: var(--track-color);
   transform: translateX(var(--split-point)) translateX(-50%);
+  box-shadow: inset 4px 0 0 rgba(0,0,0,0.1), 0 1px 4px rgba(0,0,0,0.4);
   will-change: transform;
   cursor: ew-resize;
 }
 
-.two-up-handle::before {
-  content: '';
-  display: block;
-  height: 100%;
-  width: var(--bar-size);
-  margin: 0 auto;
-  box-shadow: inset calc(var(--bar-size) / 2) 0 0 rgba(0,0,0,0.1), 0 1px 4px rgba(0,0,0,0.4);
-  background: var(--track-color);
-}
-
 .scrubber {
   display: flex;
   position: absolute;
@@ -48,56 +36,51 @@ two-up[legacy-clip-compat] > :not(.two-up-handle) {
   left: 50%;
   transform-origin: 50% 50%;
   transform: translate(-50%, -50%);
-  width: var(--thumb-size);
+  width: 62px;
-  height: calc(var(--thumb-size) * 0.9);
+  height: 56px;
   background: var(--thumb-background);
   border: 1px solid rgba(0,0,0,0.2);
-  border-radius: var(--thumb-size);
+  border-radius: 5px;
   box-shadow: 0 1px 4px rgba(0,0,0,0.1);
   color: var(--thumb-color);
-  box-sizing: border-box;
-  padding: 0 calc(var(--thumb-size) * 0.24);
 }
-
 .scrubber svg {
   flex: 1;
+  margin: 0 10px;
 }
 
-two-up[orientation='vertical'] .two-up-handle {
+two-up[orientation='vertical'] .twoUpHandle {
   width: auto;
-  height: var(--bar-touch-size);
+  height: 7px;
   transform: translateY(var(--split-point)) translateY(-50%);
+  box-shadow: inset 0 3px 0 rgba(0,0,0,0.1), 0 1px 4px rgba(0,0,0,0.4);
   cursor: ns-resize;
 }
 
-two-up[orientation='vertical'] .two-up-handle::before {
-  width: auto;
-  height: var(--bar-size);
-  box-shadow: inset 0 calc(var(--bar-size) / 2) 0 rgba(0,0,0,0.1), 0 1px 4px rgba(0,0,0,0.4);
-  margin: calc((var(--bar-touch-size) - var(--bar-size)) / 2) 0 0 0;
-}
-
 two-up[orientation='vertical'] .scrubber {
+  width: 46px;
+  height: 40px;
+  font-size: 18px;
   box-shadow: 1px 0 4px rgba(0,0,0,0.1);
   transform: translate(-50%, -50%) rotate(-90deg);
 }
 
-two-up > :nth-child(1):not(.two-up-handle) {
+two-up > :nth-child(1):not(.twoUpHandle) {
   -webkit-clip-path: inset(0 calc(100% - var(--split-point)) 0 0);
   clip-path: inset(0 calc(100% - var(--split-point)) 0 0);
 }
 
-two-up > :nth-child(2):not(.two-up-handle) {
+two-up > :nth-child(2):not(.twoUpHandle) {
   -webkit-clip-path: inset(0 0 0 var(--split-point));
   clip-path: inset(0 0 0 var(--split-point));
 }
 
-two-up[orientation='vertical'] > :nth-child(1):not(.two-up-handle) {
+two-up[orientation='vertical'] > :nth-child(1):not(.twoUpHandle) {
   -webkit-clip-path: inset(0 0 calc(100% - var(--split-point)) 0);
   clip-path: inset(0 0 calc(100% - var(--split-point)) 0);
 }
 
-two-up[orientation='vertical'] > :nth-child(2):not(.two-up-handle) {
+two-up[orientation='vertical'] > :nth-child(2):not(.twoUpHandle) {
   -webkit-clip-path: inset(var(--split-point) 0 0 0);
   clip-path: inset(var(--split-point) 0 0 0);
 }
@@ -107,19 +90,19 @@ two-up[orientation='vertical'] > :nth-child(2):not(.two-up-handle) {
   It performs way better in Safari.
  */
 @supports not ((clip-path: inset(0 0 0 0)) or (-webkit-clip-path: inset(0 0 0 0))) {
-  two-up[legacy-clip-compat] > :nth-child(1):not(.two-up-handle) {
+  two-up[legacy-clip-compat] > :nth-child(1):not(.twoUpHandle) {
     clip: rect(auto var(--split-point) auto auto);
   }
 
-  two-up[legacy-clip-compat] > :nth-child(2):not(.two-up-handle) {
+  two-up[legacy-clip-compat] > :nth-child(2):not(.twoUpHandle) {
     clip: rect(auto auto auto var(--split-point));
   }
 
-  two-up[orientation='vertical'][legacy-clip-compat] > :nth-child(1):not(.two-up-handle) {
+  two-up[orientation='vertical'][legacy-clip-compat] > :nth-child(1):not(.twoUpHandle) {
     clip: rect(auto auto var(--split-point) auto);
   }
 
-  two-up[orientation='vertical'][legacy-clip-compat] > :nth-child(2):not(.two-up-handle) {
+  two-up[orientation='vertical'][legacy-clip-compat] > :nth-child(2):not(.twoUpHandle) {
     clip: rect(var(--split-point) auto auto auto);
   }
 }

src/components/Output/index.tsx

@@ -10,7 +10,7 @@ import { twoUpHandle } from './custom-els/TwoUp/styles.css';
 
 interface Props {
   originalImage?: ImageData;
-  mobileView: boolean;
+  orientation: 'horizontal' | 'vertical';
   leftCompressed?: ImageData;
   rightCompressed?: ImageData;
   leftImgContain: boolean;
@@ -113,19 +113,14 @@ export default class Output extends Component<Props, State> {
   }
 
   @bind
-  private onScaleValueFocus() {
+  private editScale() {
     this.setState({ editingScale: true }, () => {
-      if (this.scaleInput) {
+      if (this.scaleInput) this.scaleInput.focus();
-        // Firefox unfocuses the input straight away unless I force a style calculation here. I have
-        // no idea why, but it's late and I'm quite tired.
-        getComputedStyle(this.scaleInput).transform;
-        this.scaleInput.focus();
-      }
     });
   }
 
   @bind
-  private onScaleInputBlur() {
+  private cancelEditScale() {
     this.setState({ editingScale: false });
   }
 
@@ -180,7 +175,10 @@ export default class Output extends Component<Props, State> {
   }
 
   render(
-    { mobileView, leftImgContain, rightImgContain, originalImage }: Props,
+    {
+      orientation, leftCompressed, rightCompressed, leftImgContain, rightImgContain,
+      originalImage,
+    }: Props,
     { scale, editingScale, altBackground }: State,
   ) {
     const leftDraw = this.leftDrawable();
@@ -190,8 +188,7 @@ export default class Output extends Component<Props, State> {
       <div class={`${style.output} ${altBackground ? style.altBackground : ''}`}>
         <two-up
           legacy-clip-compat
-          class={style.twoUp}
+          orientation={orientation}
-          orientation={mobileView ? 'vertical' : 'horizontal'}
           // Event redirecting. See onRetargetableEvent.
           onTouchStartCapture={this.onRetargetableEvent}
           onTouchEndCapture={this.onRetargetableEvent}
@@ -201,7 +198,6 @@ export default class Output extends Component<Props, State> {
           onWheelCapture={this.onRetargetableEvent}
         >
           <pinch-zoom
-            class={style.pinchZoom}
             onChange={this.onPinchZoomLeftChange}
             ref={linkRef(this, 'pinchZoomLeft')}
           >
@@ -217,7 +213,7 @@ export default class Output extends Component<Props, State> {
               }}
             />
           </pinch-zoom>
-          <pinch-zoom class={style.pinchZoom} ref={linkRef(this, 'pinchZoomRight')}>
+          <pinch-zoom ref={linkRef(this, 'pinchZoomRight')}>
             <canvas
               class={style.outputCanvas}
               ref={linkRef(this, 'canvasRight')}
@@ -233,7 +229,7 @@ export default class Output extends Component<Props, State> {
         </two-up>
 
         <div class={style.controls}>
-          <div class={style.zoomControls}>
+          <div class={style.group}>
             <button class={style.button} onClick={this.zoomOut}>
               <RemoveIcon />
             </button>
@@ -247,11 +243,11 @@ export default class Output extends Component<Props, State> {
                 class={style.zoom}
                 value={Math.round(scale * 100)}
                 onInput={this.onScaleInputChanged}
-                onBlur={this.onScaleInputBlur}
+                onBlur={this.cancelEditScale}
               />
             ) : (
-              <span class={style.zoom} tabIndex={0} onFocus={this.onScaleValueFocus}>
+              <span class={style.zoom} tabIndex={0} onFocus={this.editScale}>
-                <span class={style.zoomValue}>{Math.round(scale * 100)}</span>
+                <strong>{Math.round(scale * 100)}</strong>
                 %
               </span>
             )}

src/components/Output/style.scss

@@ -1,71 +1,135 @@
-.output {
+/*
-  composes: abs-fill from '../../lib/util.scss';
+Note: These styles are temporary. They will be replaced before going live.
+*/
 
-  &::before {
+%fill {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  contain: strict;
+}
+
+.output {
+  @extend %fill;
+
+  &:before {
     content: '';
-    position: absolute;
+    @extend %fill;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
     background: #000;
     opacity: 0;
     transition: opacity 500ms ease;
   }
-
+  &.altBackground:before {
-  &.alt-background::before {
+    opacity: .6;
-    opacity: 0.6;
   }
-}
 
-.two-up {
+  > two-up {
-  composes: abs-fill from '../../lib/util.scss';
+    @extend %fill;
-  --accent-color: var(--button-fg);
+    --accent-color: var(--button-fg);
-}
 
-.pinch-zoom {
+    > pinch-zoom {
-  composes: abs-fill from '../../lib/util.scss';
+      @extend %fill;
-  outline: none;
+      outline: none;
-  display: flex;
+      display: flex;
-  justify-content: center;
+      justify-content: center;
-  align-items: center;
+      align-items: center;
+    }
+  }
 }
 
 .controls {
   position: absolute;
   display: flex;
   justify-content: center;
-  top: 0;
+  left: 220px;
-  left: 0;
+  right: 220px;
-  right: 0;
+  bottom: 0;
   padding: 9px;
   overflow: hidden;
   flex-wrap: wrap;
   contain: content;
 
-  // Allow clicks to fall through to the pinch zoom area
+  @media (max-width: 680px) {
-  pointer-events: none;
+    top: 0;
-  & > * {
+    bottom: auto;
-    pointer-events: auto;
+    left: 0;
+    right: 0;
   }
 
-  @media (min-width: 860px) {
+  > * {
-    top: auto;
+    z-index: 2;
-    left: 320px;
-    right: 320px;
-    bottom: 0;
   }
-}
 
-.zoom-controls {
+  .group {
-  display: flex;
+    display: flex;
+  }
 
-  & :not(:first-child) {
+  .button,
+  .zoom {
+    display: flex;
+    align-items: center;
+    flex: 0;
+    box-sizing: border-box;
+    height: 48px;
+    padding: 0 16px;
+    margin: 4px;
+    background-color: #fff;
+    border: 1px solid rgba(0,0,0,0.2);
+    border-radius: 5px;
+    line-height: 1;
+    font-size: 110%;
+    white-space: nowrap;
+
+    &:focus {
+      box-shadow: 0 0 0 2px var(--button-fg);
+      outline: none;
+      z-index: 1;
+    }
+  }
+
+  .button {
+    text-transform: uppercase;
+    color: var(--button-fg);
+    cursor: pointer;
+    text-indent: 6px;
+  }
+
+  .button:hover {
+    background-color: #eee;
+  }
+
+  .zoom {
+    flex: 0 0 6em;
+    color: #625E80;
+    font: inherit;
+    cursor: text;
+    width: 6em;
+    text-align: center;
+    justify-content: center;
+
+    &:focus {
+      box-shadow: inset 0 1px 4px rgba(0,0,0,0.2), 0 0 0 2px var(--button-fg);
+    }
+
+    strong {
+      position: relative;
+      top: 1px;
+      margin: 0 3px 0 0;
+      color: #888;
+      font-weight: normal;
+      border-bottom: 1px dashed #999;
+    }
+  }
+
+  .group > :not(:first-child) {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
     margin-left: 0;
   }
-  & :not(:last-child) {
+  .group > :not(:last-child) {
     margin-right: 0;
     border-right-width: 0;
     border-top-right-radius: 0;
@@ -73,60 +137,6 @@
   }
 }
 
-.button,
-.zoom {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  height: 48px;
-  padding: 0 16px;
-  margin: 4px;
-  background-color: #fff;
-  border: 1px solid rgba(0,0,0,0.2);
-  border-radius: 5px;
-  line-height: 1;
-  white-space: nowrap;
-
-  &:focus {
-    box-shadow: 0 0 0 2px var(--button-fg);
-    outline: none;
-    z-index: 1;
-  }
-}
-
-.button {
-  text-transform: uppercase;
-  color: var(--button-fg);
-  cursor: pointer;
-  text-indent: 6px;
-  font-size: 110%;
-
-  &:hover {
-    background-color: #eee;
-  }
-}
-
-.zoom {
-  color: #625E80;
-  cursor: text;
-  width: 6em;
-  font: inherit;
-  text-align: center;
-  justify-content: center;
-
-  &:focus {
-    box-shadow: inset 0 1px 4px rgba(0,0,0,0.2), 0 0 0 2px var(--button-fg);
-  }
-}
-
-.zoom-value {
-  position: relative;
-  top: 1px;
-  margin: 0 3px 0 0;
-  color: #888;
-  border-bottom: 1px dashed #999;
-}
-
 .output-canvas {
   flex-shrink: 0;
 }

src/components/checkbox/index.tsx

@@ -1,20 +0,0 @@
-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>
-    );
-  }
-}

src/components/checkbox/style.scss

@@ -1,22 +0,0 @@
-.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;
-}

src/components/compress/custom-els/MultiPanel/missing-types.d.ts

@@ -1,9 +0,0 @@
-interface MultiPanelAttributes extends JSX.HTMLAttributes {
-  'open-one-only'?: boolean;
-}
-
-declare namespace JSX {
-  interface IntrinsicElements {
-    'multi-panel': MultiPanelAttributes;
-  }
-}

src/components/compress/custom-els/MultiPanel/styles.css

@@ -1,10 +0,0 @@
-.panel-heading {
-  background: gray;
-}
-.panel-content {
-  height: 0px;
-  overflow: auto;
-}
-.panel-content[aria-expanded=true] {
-  height: auto;
-}

src/components/compress/index.tsx

@@ -24,17 +24,18 @@ import {
     EncoderOptions,
     encoderMap,
 } from '../../codecs/encoders';
+
 import {
   PreprocessorState,
   defaultPreprocessorState,
 } from '../../codecs/preprocessors';
+
 import { decodeImage } from '../../codecs/decoders';
 import { cleanMerge, cleanSet } from '../../lib/clean-modify';
 import Processor from '../../codecs/processor';
 import { VectorResizeOptions, BitmapResizeOptions } from '../../codecs/resize/processor-meta';
-import './custom-els/MultiPanel';
+
-import Results from '../results';
+type Orientation = 'horizontal' | 'vertical';
-import { ExpandIcon } from '../../lib/icons';
 
 export interface SourceImage {
   file: File | Fileish;
@@ -64,11 +65,9 @@ interface Props {
 interface State {
   source?: SourceImage;
   images: [EncodedImage, EncodedImage];
-  /** Source image load */
   loading: boolean;
-  loadingCounter: number;
   error?: string;
-  mobileView: boolean;
+  orientation: Orientation;
 }
 
 interface UpdateImageOptions {
@@ -154,16 +153,12 @@ async function processSvg(blob: Blob): Promise<HTMLImageElement> {
   return blobToImg(new Blob([newSource], { type: 'image/svg+xml' }));
 }
 
-// These are only used in the mobile view
-const resultTitles = ['Top', 'Bottom'];
-
 export default class Compress extends Component<Props, State> {
-  widthQuery = window.matchMedia('(max-width: 599px)');
+  widthQuery = window.matchMedia('(min-width: 500px)');
 
   state: State = {
     source: undefined,
     loading: false,
-    loadingCounter: 0,
     images: [
       {
         preprocessorState: defaultPreprocessorState,
@@ -180,7 +175,7 @@ export default class Compress extends Component<Props, State> {
         loading: false,
       },
     ],
-    mobileView: this.widthQuery.matches,
+    orientation: this.widthQuery.matches ? 'horizontal' : 'vertical',
   };
 
   private readonly encodeCache = new ResultCache();
@@ -195,7 +190,7 @@ export default class Compress extends Component<Props, State> {
 
   @bind
   private onMobileWidthChange() {
-    this.setState({ mobileView: this.widthQuery.matches });
+    this.setState({ orientation: this.widthQuery.matches ? 'horizontal' : 'vertical' });
   }
 
   private onEncoderTypeChange(index: 0 | 1, newType: EncoderType): void {
@@ -257,9 +252,7 @@ export default class Compress extends Component<Props, State> {
 
   @bind
   private async updateFile(file: File | Fileish) {
-    const loadingCounter = this.state.loadingCounter + 1;
+    this.setState({ loading: true });
-
-    this.setState({ loadingCounter, loading: true });
 
     // Abort any current encode jobs, as they're redundant now.
     this.leftProcessor.abortCurrent();
@@ -280,9 +273,6 @@ 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 },
@@ -313,8 +303,6 @@ 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 });
     }
@@ -397,69 +385,39 @@ export default class Compress extends Component<Props, State> {
     this.setState({ images });
   }
 
-  render({ }: Props, { loading, images, source, mobileView }: 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);
-    const options = images.map((image, index) => (
-      <Options
-        source={source}
-        mobileView={mobileView}
-        imageIndex={index}
-        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)}
-      />
-    ));
-
-    const results = images.map((image, i) => (
-      <Results
-        downloadUrl={image.downloadUrl}
-        imageFile={image.file}
-        source={source}
-        loading={loading || image.loading}
-      >
-        {!mobileView ? null : [
-          <ExpandIcon class={style.expandIcon} key="expand-icon"/>,
-          `${resultTitles[i]} (${encoderMap[image.encoderState.type].label})`,
-        ]}
-      </Results>
-    ));
 
     return (
       <div class={style.compress}>
         <Output
           originalImage={source && source.data}
-          mobileView={mobileView}
+          orientation={orientation}
           leftCompressed={leftImageData}
           rightCompressed={rightImageData}
           leftImgContain={leftImage.preprocessorState.resize.fitMethod === 'cover'}
           rightImgContain={rightImage.preprocessorState.resize.fitMethod === 'cover'}
         />
-        {mobileView
+        <div class={`${style.optionPair} ${style[orientation]}`}>
-          ? (
+          {images.map((image, index) => (
-            <div class={style.options}>
+            <Options
-              <multi-panel class={style.multiPanel} open-one-only>
+              source={source}
-                {results[0]}
+              orientation={orientation}
-                {options[0]}
+              imageIndex={index}
-                {results[1]}
+              imageFile={image.file}
-                {options[1]}
+              downloadUrl={image.downloadUrl}
-              </multi-panel>
+              preprocessorState={image.preprocessorState}
-            </div>
+              encoderState={image.encoderState}
-          ) : ([
+              onEncoderTypeChange={this.onEncoderTypeChange.bind(this, index)}
-            <div class={style.options} key="options0">
+              onEncoderOptionsChange={this.onEncoderOptionsChange.bind(this, index)}
-              {options[0]}
+              onPreprocessorOptionsChange={this.onPreprocessorOptionsChange.bind(this, index)}
-              {results[0]}
+              onCopyToOtherClick={this.onCopyToOtherClick.bind(this, index)}
-            </div>,
+            />
-            <div class={style.options} key="options1">
+          ))}
-              {options[1]}
+        </div>
-              {results[1]}
+        {anyLoading && <span style={{ position: 'fixed', top: 0, left: 0 }}>Loading...</span>}
-            </div>,
-          ])
-        }
       </div>
     );
   }

src/components/compress/style.scss

@@ -1,74 +1,19 @@
 .compress {
+  height: 100%;
+}
+
+.option-pair {
+  display: flex;
+  justify-content: flex-end;
   width: 100%;
   height: 100%;
-  contain: strict;
-  display: grid;
-  align-items: end;
-  align-content: end;
-  grid-template-rows: 1fr auto;
 
-  @media (min-width: 600px) {
+  &.horizontal {
-    grid-template-columns: 1fr auto;
+    justify-content: space-between;
-    grid-template-rows: 100%;
+    align-items: flex-end;
+  }
+
+  &.vertical {
+    flex-direction: column;
   }
 }
-
-.options {
-  color: #fff;
-  opacity: 0.9;
-  font-size: 1.2rem;
-  display: flex;
-  flex-flow: column;
-  max-width: 400px;
-  margin: 0 auto;
-  width: calc(100% - 60px);
-  max-height: calc(100% - 143px);
-  overflow: hidden;
-
-  @media (min-width: 600px) {
-    max-height: calc(100% - 75px);
-    width: 300px;
-    margin: 0;
-  }
-
-  @media (min-width: 860px) {
-    max-height: 100%;
-  }
-}
-
-.multi-panel {
-  position: relative;
-  display: flex;
-  flex-flow: column;
-
-  // Reorder so headings appear after content:
-  & > :nth-child(1) {
-    order: 2;
-    margin-bottom: 10px;
-  }
-
-  & > :nth-child(2) {
-    order: 1;
-  }
-
-  & > :nth-child(3) {
-    order: 4;
-  }
-
-  & > :nth-child(4) {
-    order: 3;
-  }
-}
-
-.expand-icon {
-  transform: rotate(180deg);
-  margin-left: -12px;
-}
-
-[content-expanded] .expand-icon {
-  transform: none;
-}
-
-:focus .expand-icon {
-  fill: #34B9EB;
-}

src/components/expander/index.tsx

@@ -1,71 +0,0 @@
-import { h, Component, ComponentChild, ComponentChildren } from 'preact';
-import * as style from './style.scss';
-import { transitionHeight } from '../../lib/util';
-
-interface Props {
-  children: ComponentChildren;
-}
-interface State {
-  outgoingChildren: ComponentChild[];
-}
-
-export default class Expander extends Component<Props, State> {
-  state: State = {
-    outgoingChildren: [],
-  };
-  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.base!.getBoundingClientRect().height;
-  }
-
-  async 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.base!.style.height = '';
-    this.base!.style.overflow = 'hidden';
-    const newHeight = children[0] ? this.base!.getBoundingClientRect().height : 0;
-
-    await transitionHeight(this.base!, {
-      duration: 300,
-      from: this.lastElHeight,
-      to: newHeight,
-    });
-
-    // Unset the height & overflow, so element changes do the right thing.
-    this.base!.style.height = '';
-    this.base!.style.overflow = '';
-    if (this.state.outgoingChildren[0]) this.setState({ outgoingChildren: [] });
-  }
-
-  render(props: Props, { outgoingChildren }: State) {
-    const children = props.children as ComponentChild[];
-    const childrenExiting = !children[0] && outgoingChildren[0];
-
-    return (
-      <div class={childrenExiting ? style.childrenExiting : ''}>
-        {children[0] ? children : outgoingChildren}
-      </div>
-    );
-  }
-}

src/components/expander/style.scss

@@ -1,5 +0,0 @@
-.children-exiting {
-  & > * {
-    pointer-events: none;
-  }
-}

src/components/output/custom-els/MultiPanel/index.ts

@@ -1,75 +1,19 @@
-import * as style from './styles.css';
+import './styles.css';
-import { transitionHeight } from '../../../../lib/util';
 
-interface CloseAllOptions {
+function getClosestHeading(el: Element) {
-  exceptFirst?: boolean;
+  const closestEl = el.closest('multi-panel > *');
-}
+  if (closestEl && closestEl.classList.contains('panel-heading')) {
-
+    return closestEl;
-const openOneOnlyAttr = 'open-one-only';
-
-function getClosestHeading(el: Element): HTMLElement | undefined {
-  // Look for the child of multi-panel, but stop at interactive elements like links & buttons
-  const closestEl = el.closest('multi-panel > *, a, button');
-  if (closestEl && closestEl.classList.contains(style.panelHeading)) {
-    return closestEl as HTMLElement;
   }
   return undefined;
 }
 
-async function close(heading: HTMLElement) {
-  const content = heading.nextElementSibling as HTMLElement;
-
-  // if there is no content, nothing to expand
-  if (!content) return;
-
-  const from = content.getBoundingClientRect().height;
-
-  heading.removeAttribute('content-expanded');
-  content.setAttribute('aria-expanded', 'false');
-
-  // Wait a microtask so other calls to open/close can get the final sizes.
-  await null;
-
-  await transitionHeight(content, {
-    from,
-    to: 0,
-    duration: 300,
-  });
-
-  content.style.height = '';
-}
-
-async function open(heading: HTMLElement) {
-  const content = heading.nextElementSibling as HTMLElement;
-
-  // if there is no content, nothing to expand
-  if (!content) return;
-
-  const from = content.getBoundingClientRect().height;
-
-  heading.setAttribute('content-expanded', '');
-  content.setAttribute('aria-expanded', 'true');
-
-  const to = content.getBoundingClientRect().height;
-
-  // Wait a microtask so other calls to open/close can get the final sizes.
-  await null;
-
-  await transitionHeight(content, {
-    from, to,
-    duration: 300,
-  });
-
-  content.style.height = '';
-}
-
 /**
  * A multi-panel view that the user can add any number of 'panels'.
  * 'a panel' consists of two elements. Even index element becomes heading,
  * and odd index element becomes the expandable content.
  */
 export default class MultiPanel extends HTMLElement {
-  static get observedAttributes() { return [openOneOnlyAttr]; }
 
   constructor() {
     super();
@@ -87,18 +31,12 @@ export default class MultiPanel extends HTMLElement {
     this._childrenChange();
   }
 
-  attributeChangedCallback(name: string, oldValue: string | null, newValue: string | null) {
-    if (name === openOneOnlyAttr && newValue === null) {
-      this._closeAll({ exceptFirst: true });
-    }
-  }
-
   // Click event handler
   private _onClick(event: MouseEvent) {
-    const el = event.target as HTMLElement;
+    const el = event.target as Element;
     const heading = getClosestHeading(el);
     if (!heading) return;
-    this._toggle(heading);
+    this._expand(heading);
   }
 
   // KeyDown event handler
@@ -115,8 +53,7 @@ export default class MultiPanel extends HTMLElement {
     // don’t handle modifier shortcuts used by assistive technology.
     if (event.altKey) return;
 
-    let newHeading: HTMLElement | undefined;
+    let newHeading:HTMLElement | undefined;
-
     switch (event.key) {
       case 'ArrowLeft':
       case 'ArrowUp':
@@ -140,7 +77,7 @@ export default class MultiPanel extends HTMLElement {
       case 'Enter':
       case ' ':
       case 'Spacebar':
-        this._toggle(heading);
+        this._expand(heading);
         break;
 
       // Any other key press is ignored and passed back to the browser.
@@ -156,32 +93,26 @@ export default class MultiPanel extends HTMLElement {
     }
   }
 
-  private _toggle(heading: HTMLElement) {
+  private _expand(heading: Element) {
     if (!heading) return;
+    const content = heading.nextElementSibling;
+
+    // if there is no content, nothing to expand
+    if (!content) return;
 
     // toggle expanded and aria-expanded attributes
-    if (heading.hasAttribute('content-expanded')) {
+    if (content.hasAttribute('expanded')) {
-      close(heading);
+      content.removeAttribute('expanded');
+      content.setAttribute('aria-expanded', 'false');
     } else {
-      if (this.openOneOnly) this._closeAll();
+      content.setAttribute('expanded', '');
-      open(heading);
+      content.setAttribute('aria-expanded', 'true');
     }
   }
 
-  private _closeAll(options: CloseAllOptions = {}): void {
-    const { exceptFirst = false } = options;
-    let els = [...this.children].filter(el => el.matches('[content-expanded]')) as HTMLElement[];
-
-    if (exceptFirst) {
-      els = els.slice(1);
-    }
-
-    for (const el of els) close(el);
-  }
-
   // children of multi-panel should always be even number (heading/content pair)
   private _childrenChange() {
-    let preserveTabIndex = false;
+    let preserveTabIndex : boolean = false;
     let heading = this.firstElementChild;
 
     while (heading) {
@@ -192,23 +123,31 @@ export default class MultiPanel extends HTMLElement {
       // it means it has odd number of elements. log error and set heading to end the loop.
       if (!content) {
         console.error('<multi-panel> requires an even number of element children.');
-        break;
+        heading = null;
+        continue;
       }
 
       // When odd number of elements were inserted in the middle,
       // what was heading before may become content after the insertion.
       // Remove classes and attributes to prepare for this change.
-      heading.classList.remove(style.panelContent);
+      heading.classList.remove('panel-content');
-      content.classList.remove(style.panelHeading);
+
-      heading.removeAttribute('aria-expanded');
+      if (content.classList.contains('panel-heading')) {
-      heading.removeAttribute('content-expanded');
+        content.classList.remove('panel-heading');
+      }
+      if (heading.hasAttribute('expanded') && heading.hasAttribute('aria-expanded')) {
+        heading.removeAttribute('expanded');
+        heading.removeAttribute('aria-expanded');
+      }
 
       // If appreciable, remove tabindex from content which used to be header.
-      content.removeAttribute('tabindex');
+      if (content.hasAttribute('tabindex')) {
+        content.removeAttribute('tabindex');
+      }
 
       // Assign heading and content classes
-      heading.classList.add(style.panelHeading);
+      heading.classList.add('panel-heading');
-      content.classList.add(style.panelContent);
+      content.classList.add('panel-content');
 
       // Assign ids and aria-X for heading/content pair.
       heading.id = `panel-heading-${randomId}`;
@@ -224,13 +163,6 @@ export default class MultiPanel extends HTMLElement {
         heading.setAttribute('tabindex', '-1');
       }
 
-      // It's possible that the heading & content expanded attributes are now out of sync. Resync
-      // them using the heading as the source of truth.
-      content.setAttribute(
-        'aria-expanded',
-        heading.hasAttribute('content-expanded') ? 'true' : 'false',
-      );
-
       // next sibling of content = next heading
       heading = content.nextElementSibling;
     }
@@ -239,9 +171,6 @@ export default class MultiPanel extends HTMLElement {
     if (!preserveTabIndex && this.firstElementChild) {
       this.firstElementChild.setAttribute('tabindex', '0');
     }
-
-    // In case we're openOneOnly, and an additional open item has been added:
-    if (this.openOneOnly) this._closeAll({ exceptFirst: true });
   }
 
   // returns heading that is before currently selected one.
@@ -279,7 +208,7 @@ export default class MultiPanel extends HTMLElement {
   private _lastHeading() {
     // if the last element is heading, return last element
     const lastEl = this.lastElementChild as HTMLElement;
-    if (lastEl && lastEl.classList.contains(style.panelHeading)) {
+    if (lastEl && lastEl.classList.contains('panel-heading')) {
       return lastEl;
     }
     // otherwise return 2nd from the last
@@ -288,21 +217,6 @@ export default class MultiPanel extends HTMLElement {
       return lastContent.previousElementSibling as HTMLElement;
     }
   }
-
-  /**
-   * If true, only one panel can be open at once. When one opens, others close.
-   */
-  get openOneOnly() {
-    return this.hasAttribute(openOneOnlyAttr);
-  }
-
-  set openOneOnly(val: boolean) {
-    if (val) {
-      this.setAttribute(openOneOnlyAttr, '');
-    } else {
-      this.removeAttribute(openOneOnlyAttr);
-    }
-  }
 }
 
 customElements.define('multi-panel', MultiPanel);

src/components/output/custom-els/MultiPanel/styles.css

@@ -0,0 +1,11 @@
+multi-panel > .panel-heading {
+  background:gray;
+}
+multi-panel > .panel-content {
+  height:0px;
+  overflow:scroll;
+  transition: height 1s;
+}
+multi-panel > .panel-content[expanded] {
+  height:auto;
+}

src/components/range/index.tsx

@@ -1,55 +0,0 @@
-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>
-    );
-  }
-}

src/components/range/style.scss

@@ -1,55 +0,0 @@
-.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;
-  }
-}

src/components/results/FileSize.tsx

@@ -1,41 +0,0 @@
-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>;
-  }
-}

src/components/results/index.tsx

@@ -1,78 +0,0 @@
-import { h, Component, ComponentChildren, ComponentChild } from 'preact';
-
-import * as style from './style.scss';
-import FileSize from './FileSize';
-import { DownloadIcon } from '../../lib/icons';
-import '../custom-els/LoadingSpinner';
-import { SourceImage } from '../compress';
-import { Fileish } from '../../lib/initial-util';
-
-interface Props {
-  loading: boolean;
-  source?: SourceImage;
-  imageFile?: Fileish;
-  downloadUrl?: string;
-  children: ComponentChildren;
-}
-
-interface State {
-  showLoadingState: boolean;
-}
-
-const loadingReactionDelay = 500;
-
-export default class Results extends Component<Props, State> {
-  state: State = {
-    showLoadingState: false,
-  };
-
-  /** The timeout ID between entering the loading state, and changing UI */
-  private loadingTimeoutId: number = 0;
-
-  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,
-      );
-    }
-  }
-
-  render({ source, imageFile, downloadUrl, children }: Props, { showLoadingState }: State) {
-    return (
-      <div class={style.results}>
-        <div class={style.resultData}>
-          {(children as ComponentChild[])[0]
-            ? <div class={style.resultTitle}>{children}</div>
-            : null
-          }
-          {!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>
-    );
-  }
-}

src/components/results/style.scss

@@ -1,95 +0,0 @@
-@keyframes action-enter {
-  from {
-    transform: rotate(-90deg);
-    opacity: 0;
-    animation-timing-function: ease-out;
-  }
-}
-
-@keyframes action-leave {
-  from {
-    transform: rotate(0deg);
-    opacity: 1;
-    animation-timing-function: ease-out;
-  }
-}
-
-.results {
-  display: grid;
-  grid-template-columns: 1fr auto;
-  background: rgba(0, 0, 0, 0.9);
-  font-size: 1.4rem;
-
-  &:focus {
-    outline: none;
-  }
-}
-
-.result-data {
-  display: flex;
-  align-items: center;
-  padding: 0 15px;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.result-title {
-  display: flex;
-  align-items: center;
-  margin-right: 0.4em;
-}
-
-.size-delta {
-  font-size: 1.1rem;
-  font-style: italic;
-  position: relative;
-  top: -1px;
-  margin-left: 0.3em;
-}
-
-.size-increase {
-  color: #e35050;
-}
-
-.size-decrease {
-  color: #50e3c2;
-}
-
-.download {
-  background: #34B9EB;
-  --size: 38px;
-  width: var(--size);
-  height: var(--size);
-  display: grid;
-  align-items: center;
-  justify-items: center;
-}
-
-.download-link {
-  animation: action-enter 0.2s;
-  grid-area: 1/1;
-}
-
-.download-link-disable {
-  pointer-events: none;
-  opacity: 0;
-  transform: rotate(90deg);
-  animation: action-leave 0.2s;
-}
-
-.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;
-}

src/components/select/index.tsx

@@ -1,20 +0,0 @@
-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>
-    );
-  }
-}

src/components/select/style.scss

@@ -1,33 +0,0 @@
-.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;
-  }
-}

src/custom-els/RangeInput/index.ts

@@ -1,20 +1,15 @@
 import { bind } from '../../lib/initial-util';
-import * as style from './styles.css';
+import './styles.css';
-import { PointerTracker } from '../../lib/PointerTracker';
 
 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: HTMLInputElement;
+  private _input = document.createElement('input');
-  private _valueDisplay?: HTMLDivElement;
+  private _valueDisplayWrapper = document.createElement('div');
+  private _valueDisplay = document.createElement('span');
   private _ignoreChange = false;
 
   static get observedAttributes() {
@@ -23,20 +18,7 @@ class RangeInputElement extends HTMLElement {
 
   constructor() {
     super();
-    this._input = document.createElement('input');
     this._input.type = 'range';
-    this._input.className = style.input;
-
-    const tracker = new PointerTracker(this._input, {
-      start: (): boolean => {
-        if (tracker.currentPointers.length !== 0) return false;
-        this._input.classList.add(style.touchActive);
-        return true;
-      },
-      end: () => {
-        this._input.classList.remove(style.touchActive);
-      },
-    });
 
     for (const event of RETARGETED_EVENTS) {
       this._input.addEventListener(event, this._retargetEvent, true);
@@ -47,18 +29,6 @@ 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') || '';
   }
@@ -67,6 +37,14 @@ 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) {
@@ -87,15 +65,15 @@ class RangeInputElement extends HTMLElement {
 
   @bind
   private _update() {
-    const value = Number(this.value) || 0;
+    const value = parseFloat(this.value || '0');
-    const min = Number(this.min) || 0;
+    const min = parseFloat(this.min || '0');
-    const max = Number(this.max) || 100;
+    const max = parseFloat(this.max || '100');
-    const labelPrecision = Number(this.labelPrecision) || getPrescision(this.step) || 0;
+    const labelPrecision = parseFloat(this.labelPrecision || '0');
     const percent = 100 * (value - min) / (max - min);
-    const displayValue = labelPrecision ? value.toFixed(labelPrecision) :
+    const displayValue = labelPrecision ? value.toPrecision(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);
   }

src/custom-els/RangeInput/missing-types.d.ts

@@ -1,5 +1,9 @@
 declare namespace JSX {
+  interface RangeInputAttributes extends HTMLAttributes {
+    reversed?: boolean;
+  }
+
   interface IntrinsicElements {
-    'range-input': HTMLAttributes;
+    'range-input': RangeInputAttributes;
   }
 }

src/custom-els/RangeInput/styles.css

@@ -14,6 +14,41 @@ 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;
@@ -22,33 +57,32 @@ 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;
 }
 
-.input {
+range-input input::-webkit-slider-thumb {
-  position: relative;
+  appearance: none;
-  width: 100%;
+  -webkit-appearance: none;
-  padding: 0;
+  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;
-  margin: 0;
+  box-sizing: content-box;
-  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;
 }
 
-.thumb-wrapper {
+range-input input:focus::-webkit-slider-thumb {
+  box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+}
+
+range-input > div {
   position: absolute;
   left: 6px;
   right: 6px;
@@ -57,8 +91,8 @@ range-input::before {
   overflow: visible;
 }
 
-.value-display {
+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="%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;
+  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;
   position: absolute;
   box-sizing: border-box;
   left: var(--value-percent, 0%);
@@ -77,18 +111,12 @@ range-input::before {
   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: all 200ms ease;
+  transition: transform 200ms ease, opacity 200ms ease;
-  transition-property: opacity, transform;
   will-change: transform;
   pointer-events: none;
   overflow: hidden;
 }
-
+range-input input:focus + div span {
-.touch-active + .thumb-wrapper .value-display {
   opacity: 1;
   transform: scale(1);
 }
-
-.touch-active + .thumb-wrapper .thumb {
-  box-shadow: 0 1px 3px rgba(0,0,0,0.5);
-}

src/init-app.tsx

@@ -16,7 +16,6 @@ if (process.env.NODE_ENV === 'development') {
 
   // When an update to any module is received, re-import the app and trigger a full re-render:
   module.hot.accept('./components/App', () => {
-    // The linter doesn't like the capital A in App. It is wrong.
     // tslint:disable-next-line variable-name
     import('./components/App').then(({ default: App }) => {
       root = render(<App />, document.body, root);

src/lib/icons.tsx

@@ -2,48 +2,32 @@ import { h } from 'preact';
 
 // tslint:disable:max-line-length variable-name
 
-const Icon = (props: JSX.HTMLAttributes) => (
+export interface IconProps extends JSX.HTMLAttributes {}
+
+const Icon = (props: IconProps) => (
   <svg width="24" height="24" viewBox="0 0 24 24" fill="currentColor" {...props} />
 );
 
-export const DownloadIcon = (props: JSX.HTMLAttributes) => (
+export const DownloadIcon = (props: IconProps) => (
   <Icon {...props}>
-    <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"/>
+    <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" />
   </Icon>
 );
 
-export const ToggleIcon = (props: JSX.HTMLAttributes) => (
+export const ToggleIcon = (props: IconProps) => (
   <Icon {...props}>
     <path d="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm2 4v-2H3c0 1.1.89 2 2 2zM3 9h2V7H3v2zm12 12h2v-2h-2v2zm4-18H9c-1.11 0-2 .9-2 2v10c0 1.1.89 2 2 2h10c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 12H9V5h10v10zm-8 6h2v-2h-2v2zm-4 0h2v-2H7v2z" />
   </Icon>
 );
 
-export const AddIcon = (props: JSX.HTMLAttributes) => (
+export const AddIcon = (props: IconProps) => (
   <Icon {...props}>
     <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
   </Icon>
 );
 
-export const RemoveIcon = (props: JSX.HTMLAttributes) => (
+export const RemoveIcon = (props: IconProps) => (
   <Icon {...props}>
     <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>
-);
-
-export const ExpandIcon = (props: JSX.HTMLAttributes) => (
-  <Icon {...props}>
-    <path d="M16.6 8.6L12 13.2 7.4 8.6 6 10l6 6 6-6z"/>
-  </Icon>
-);

src/lib/util.scss

@@ -5,7 +5,6 @@
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  contain: strict;
 }
 
 .unbutton {

src/lib/util.ts

@@ -57,16 +57,32 @@ export async function canvasEncode(data: ImageData, type: string, quality?: numb
   return blob;
 }
 
+async function decodeImage(url: string): Promise<HTMLImageElement> {
+  const img = new Image();
+  img.decoding = 'async';
+  img.src = url;
+  const loaded = new Promise((resolve, reject) => {
+    img.onload = () => resolve();
+    img.onerror = () => reject(Error('Image loading error'));
+  });
+
+  if (img.decode) {
+    // Nice off-thread way supported in Safari/Chrome.
+    // Safari throws on decode if the source is SVG.
+    // https://bugs.webkit.org/show_bug.cgi?id=188347
+    await img.decode().catch(() => null);
+  }
+
+  // Always await loaded, as we may have bailed due to the Safari bug above.
+  await loaded;
+  return img;
+}
+
 /**
  * Attempts to load the given URL as an image.
  */
-export function canDecodeImage(data: string): Promise<boolean> {
+export function canDecodeImage(url: string): Promise<boolean> {
-  return new Promise((resolve) => {
+  return decodeImage(url).then(() => true, () => false);
-    const img = document.createElement('img');
-    img.src = data;
-    img.onload = _ => resolve(true);
-    img.onerror = _ => resolve(false);
-  });
 }
 
 export function blobToArrayBuffer(blob: Blob): Promise<ArrayBuffer> {
@@ -108,24 +124,7 @@ export async function blobToImg(blob: Blob): Promise<HTMLImageElement> {
   const url = URL.createObjectURL(blob);
 
   try {
-    const img = new Image();
+    return await decodeImage(url);
-    img.decoding = 'async';
-    img.src = url;
-    const loaded = new Promise((resolve, reject) => {
-      img.onload = () => resolve();
-      img.onerror = () => reject(Error('Image loading error'));
-    });
-
-    if (img.decode) {
-      // Nice off-thread way supported in Safari/Chrome.
-      // Safari throws on decode if the source is SVG.
-      // https://bugs.webkit.org/show_bug.cgi?id=188347
-      await img.decode().catch(() => null);
-    }
-
-    // Always await loaded, as we may have bailed due to the Safari bug above.
-    await loaded;
-    return img;
   } finally {
     URL.revokeObjectURL(url);
   }
@@ -203,40 +202,25 @@ 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, defaultVal: number = 0): number {
+export function inputFieldValueAsNumber(field: any): number {
-  if (!field) return defaultVal;
+  return Number((field as HTMLInputElement).value);
-  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, defaultVal: number = 0): number {
+export function inputFieldCheckedAsNumber(field: any): 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, defaultVal: boolean = false): boolean {
+export function inputFieldChecked(field: any): 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.
  */
@@ -258,43 +242,3 @@ export function konami(): Promise<void> {
     window.addEventListener('keydown', listener);
   });
 }
-
-interface TransitionOptions {
-  from?: number;
-  to?: number;
-  duration?: number;
-  easing?: string;
-}
-
-export async function transitionHeight(el: HTMLElement, opts: TransitionOptions): Promise<void> {
-  const {
-    from = el.getBoundingClientRect().height,
-    to = el.getBoundingClientRect().height,
-    duration = 1000,
-    easing = 'ease-in-out',
-  } = opts;
-
-  if (from === to || duration === 0) {
-    el.style.height = to + 'px';
-    return;
-  }
-
-  el.style.height = from + 'px';
-  // Force a style calc so the browser picks up the start value.
-  getComputedStyle(el).transform;
-  el.style.transition = `height ${duration}ms ${easing}`;
-  el.style.height = to + 'px';
-
-  return new Promise<void>((resolve) => {
-    const listener = (event: Event) => {
-      if (event.target !== el) return;
-      el.style.transition = '';
-      el.removeEventListener('transitionend', listener);
-      el.removeEventListener('transitioncancel', listener);
-      resolve();
-    };
-
-    el.addEventListener('transitionend', listener);
-    el.addEventListener('transitioncancel', listener);
-  });
-}

src/style/index.scss

@@ -1,3 +1,7 @@
+/*
+Note: These styles are temporary. They will be replaced before going live.
+*/
+
 @import './reset.scss';
 
 html, body {

src/style/reset.scss

@@ -1,3 +1,7 @@
+/*
+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);
 }

webpack.config.js

@@ -23,8 +23,7 @@ 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 {