Simplifying FileSize

.babelrc

@@ -0,0 +1,13 @@
+{
+  "plugins": [
+    "transform-class-properties",
+    "transform-react-constant-elements",
+    "transform-react-remove-prop-types",
+    [
+      "transform-react-jsx",
+      {
+        "pragma": "h"
+      }
+    ]
+  ]
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Something is not working as expected
-labels: 
-
----
-
-**Before you start**
-Please take a look at the [FAQ](https://github.com/GoogleChromeLabs/squoosh/wiki/FAQ) as well as the already opened issues! If nothing fits your problem, go ahead and fill out the following template:
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Version:**
- - OS w/ version: [e.g. iOS 12]
- - Browser w/ version [e.g. Chrome 70]
- - Node version: [e.g. 10.11.0]
- - npm version: [e.g. 6.4.1]
-
-**Is your issue related to the quality of image compression?**
-Please attach original and output images (you can drag & drop to attach). 
-- Original image 
-- Output image from Squoosh
-
-**Additional context, screenshots, screencasts**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,18 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-labels: 
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Does other service/app have this feature?**
-Add any service you know/use that has this feature (We want to know for research)
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.nvmrc

@@ -1 +0,0 @@
-10.15.2

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
+node_js:
+- node
 cache: npm
-script: npm run build
-after_success: npm run sizereport
+script: npm run build || npm run build # scss ts definitions need to be generated before an actual build

README.md

@@ -1,31 +1,5 @@
-# [Squoosh]!
+# Squoosh!
 
-[Squoosh] is an image compression web app that allows you to dive into the advanced options provided
-by various image compressors.
+Squoosh will be an image compression web app that allows you to dive into the
+advanced options provided by various image compressors.
 
-# Privacy
-
-Google Analytics is used to record the following:
-
-* [Basic visit data](https://support.google.com/analytics/answer/6004245?ref_topic=2919631).
-* Before and after image size once an image is downloaded. These values are rounded to the nearest
-  kilobyte.
-
-Image compression is handled locally; no additional data is sent to the server.
-
-# Building locally
-
-Clone the repo, and:
-
-```sh
-npm install
-npm run build
-```
-
-You can run the development server with:
-
-```sh
-npm start
-```
-
-[Squoosh]: https://squoosh.app

_headers.ejs

@@ -1,18 +0,0 @@
-# Long-term cache by default.
-/*
-  Cache-Control: max-age=31536000
-
-# And here are the exceptions:
-/
-  Cache-Control: no-cache
-
-/serviceworker.js
-  Cache-Control: no-cache
-
-/manifest.json
-  Cache-Control: must-revalidate, max-age=3600
-
-# URLs in /assets do not include a hash and are mutable.
-# But it isn't a big deal if the user gets an old version.
-/assets/*
-  Cache-Control: must-revalidate, max-age=3600

_redirects.ejs

@@ -1,2 +0,0 @@
-/index.html / 301
-/* /index.html 301

codecs/README.md

@@ -11,6 +11,6 @@ $ npm install
 $ npm run build
 ```
 
-This will build two files: `<codec name>_<enc or dec>.js` and `<codec name>_<enc or dec>.wasm`. It will most likely be necessary to set [`Module["locateFile"]`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html#affecting-execution) to successfully load the `.wasm` file. When the `.js` file is loaded, a global `<codec name>_<enc or dec>` is created with the same API as an [Emscripten `Module`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
+This will build two files: `<codec name>_<enc or dec>.js` and `<codec name>_<enc or dec>.wasm`. It will most likely be necessary to set [`Module["locateFile"]`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html#affecting-execution) to sucessfully load the `.wasm` file. When the `.js` file is loaded, a global `<codec name>_<enc or dec>` is created with the same API as an [Emscripten `Module`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
 
 Each codec will document its API in its README.

codecs/imagequant/package.json

@@ -8,6 +8,6 @@
     "libimagequant": "ImageOptim/libimagequant#2.12.1"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/mozjpeg_enc/README.md

@@ -39,9 +39,5 @@ struct MozJpegOptions {
   bool trellis_opt_zero;
   bool trellis_opt_table;
   int trellis_loops;
-  bool auto_subsample;
-  int chroma_subsample;
-  bool separate_chroma_quality;
-  int chroma_quality;
 };
 ```

codecs/mozjpeg_enc/example.html

@@ -21,7 +21,7 @@
     console.log('Version:', module.version().toString(16));
     const image = await loadImage('../example.png');
     const result = module.encode(image.data, image.width, image.height, {
-      quality: 75,
+      quality: 40,
       baseline: false,
       arithmetic: false,
       progressive: true,
@@ -29,14 +29,10 @@
       smoothing: 0,
       color_space: 3,
       quant_table: 3,
-      trellis_multipass: false,
-      trellis_opt_zero: false,
-      trellis_opt_table: false,
+      trellis_multipass: true,
+      trellis_opt_zero: true,
+      trellis_opt_table: true,
       trellis_loops: 1,
-      auto_subsample: true,
-      chroma_subsample: 2,
-      separate_chroma_quality: false,
-      chroma_quality: 75,
     });
 
     const blob = new Blob([result], {type: 'image/jpeg'});

codecs/mozjpeg_enc/mozjpeg_enc.cpp

@@ -29,10 +29,6 @@ struct MozJpegOptions {
   bool trellis_opt_zero;
   bool trellis_opt_table;
   int trellis_loops;
-  bool auto_subsample;
-  int chroma_subsample;
-  bool separate_chroma_quality;
-  int chroma_quality;
 };
 
 int version() {
@@ -123,6 +119,9 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
    */
   jpeg_set_defaults(&cinfo);
 
+  /* Now you can set any non-default parameters you wish to.
+   * Here we just illustrate the use of quality (quantization table) scaling:
+   */
   jpeg_set_colorspace(&cinfo, (J_COLOR_SPACE) opts.color_space);
 
   if (opts.quant_table != -1) {
@@ -143,23 +142,11 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
   jpeg_c_set_bool_param(&cinfo, JBOOLEAN_TRELLIS_Q_OPT, opts.trellis_opt_table);
   jpeg_c_set_int_param(&cinfo, JINT_TRELLIS_NUM_LOOPS, opts.trellis_loops);
 
-  // A little hacky to build a string for this, but it means we can use set_quality_ratings which
-  // does some useful heuristic stuff.
   std::string quality_str = std::to_string(opts.quality);
-
-  if (opts.separate_chroma_quality && opts.color_space == JCS_YCbCr) {
-    quality_str += "," + std::to_string(opts.chroma_quality);
-  }
-
   char const *pqual = quality_str.c_str();
 
   set_quality_ratings(&cinfo, (char*) pqual, opts.baseline);
 
-  if (!opts.auto_subsample && opts.color_space == JCS_YCbCr) {
-    cinfo.comp_info[0].h_samp_factor = opts.chroma_subsample;
-    cinfo.comp_info[0].v_samp_factor = opts.chroma_subsample;
-  }
-
   if (!opts.baseline && opts.progressive) {
     jpeg_simple_progression(&cinfo);
   } else {
@@ -222,10 +209,6 @@ EMSCRIPTEN_BINDINGS(my_module) {
     .field("trellis_opt_zero", &MozJpegOptions::trellis_opt_zero)
     .field("trellis_opt_table", &MozJpegOptions::trellis_opt_table)
     .field("trellis_loops", &MozJpegOptions::trellis_loops)
-    .field("chroma_subsample", &MozJpegOptions::chroma_subsample)
-    .field("auto_subsample", &MozJpegOptions::auto_subsample)
-    .field("separate_chroma_quality", &MozJpegOptions::separate_chroma_quality)
-    .field("chroma_quality", &MozJpegOptions::chroma_quality)
     ;
 
   function("version", &version);

codecs/mozjpeg_enc/package.json

@@ -8,6 +8,6 @@
     "mozjpeg": "mozilla/mozjpeg#v3.3.1"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/optipng/README.md

@@ -1,6 +1,6 @@
 # OptiPNG
 
-- Source: <http://optipng.sourceforge.net/>
+- Source: <https://sourceforge.net/project/optipng>
 - Version: v0.7.7
 
 ## Dependencies

codecs/optipng/package.json

@@ -16,7 +16,7 @@
     "zlib": "emscripten-ports/zlib"
   },
   "dependencies": {
-    "napa": "3.0.0",
+    "napa": "^3.0.0",
     "tar-dependency": "0.0.3"
   }
 }

codecs/rotate/.gitignore

@@ -1,2 +0,0 @@
-target
-Cargo.lock

codecs/rotate/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "rotate"
-version = "0.1.0"
-authors = ["Surma <surma@google.com>"]
-edition = "2018"
-
-[lib]
-name = "rotate"
-path = "rotate.rs"
-crate-type = ["cdylib", "rlib"]
-
-[profile.release]
-lto = true
-opt-level = "s"

codecs/rotate/Dockerfile

@@ -1,17 +0,0 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
-RUN mkdir -p /usr/src/wabt/build
-WORKDIR /usr/src/wabt/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
-  make && \
-  make install
-
-FROM rust
-RUN rustup install nightly && \
-  rustup target add --toolchain nightly wasm32-unknown-unknown
-
-COPY --from=0 /opt/wabt /opt/wabt
-ENV PATH="/opt/wabt/bin:${PATH}"
-WORKDIR /src

codecs/rotate/benchmark.js

@@ -1,45 +0,0 @@
-// THIS IS NOT A NODE SCRIPT
-// This is a d8 script. Please install jsvu[1] and install v8.
-// Then run `npm run --silent benchmark`.
-// [1]: https://github.com/GoogleChromeLabs/jsvu
-async function init() {
-  //  Adjustable constants.
-  const imageDimensions = 4096;
-  const iterations = new Array(100);
-
-  // Constants. Don’t change.
-  const imageByteSize = imageDimensions * imageDimensions * 4;
-  const wasmPageSize = 64 * 1024;
-
-  const buffer = readbuffer("rotate.wasm");
-  const { instance } = await WebAssembly.instantiate(buffer);
-
-  const pagesAvailable = Math.floor(
-    instance.exports.memory.buffer.byteLength / wasmPageSize
-  );
-  const pagesNeeded = Math.floor((imageByteSize * 2 + 4) / wasmPageSize) + 1;
-  const additionalPagesNeeded = pagesNeeded - pagesAvailable;
-  if (additionalPagesNeeded > 0) {
-    instance.exports.memory.grow(additionalPagesNeeded);
-  }
-
-  [0, 90, 180, 270].forEach(rotation => {
-    print(`\n${rotation} degrees`);
-    print(`==============================`);
-    for (let i = 0; i < 100; i++) {
-      const start = Date.now();
-      instance.exports.rotate(imageDimensions, imageDimensions, rotation);
-      iterations[i] = Date.now() - start;
-    }
-    const average = iterations.reduce((sum, c) => sum + c) / iterations.length;
-    const stddev = Math.sqrt(
-      iterations
-        .map(i => Math.pow(i - average, 2))
-        .reduce((sum, c) => sum + c) / iterations.length
-    );
-    print(`n = ${iterations.length}`);
-    print(`Average: ${average}`);
-    print(`StdDev: ${stddev}`);
-  });
-}
-init().catch(e => console.error(e.stack));

codecs/rotate/build.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "============================================="
-echo "Compiling wasm"
-echo "============================================="
-(
-  rustup run nightly \
-    cargo build \
-    --target wasm32-unknown-unknown \
-    --release
-  cp target/wasm32-unknown-unknown/release/rotate.wasm .
-  wasm-strip rotate.wasm
-)
-echo "============================================="
-echo "Compiling wasm  done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull ubuntu\`"
-echo "Run \`docker pull rust\`"
-echo "Run \`docker build -t squoosh-rotate .\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/rotate/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "rotate",
-  "scripts": {
-    "build:image": "docker build -t squoosh-rotate .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-rotate ./build.sh",
-    "benchmark": "echo File size after gzip && npm run benchmark:filesize && echo Optimizing && npm run -s benchmark:optimizing",
-    "benchmark:baseline": "v8 --liftoff --no-wasm-tier-up --no-opt ./benchmark.js",
-    "benchmark:optimizing": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js",
-    "benchmark:filesize": "cat rotate.wasm | gzip -c9n | wc -c"
-  }
-}

codecs/rotate/rotate.rs

@@ -1,113 +0,0 @@
-use std::slice::{from_raw_parts, from_raw_parts_mut};
-
-// This function is taken from Zachary Dremann
-// https://github.com/GoogleChromeLabs/squoosh/pull/462
-trait HardUnwrap<T> {
-    fn unwrap_hard(self) -> T;
-}
-
-impl<T> HardUnwrap<T> for Option<T> {
-    #[cfg(not(debug_assertions))]
-    #[inline]
-    fn unwrap_hard(self) -> T {
-        match self {
-            Some(t) => t,
-            None => std::process::abort(),
-        }
-    }
-
-    #[cfg(debug_assertions)]
-    fn unwrap_hard(self) -> T {
-        self.unwrap()
-    }
-}
-
-const TILE_SIZE: usize = 16;
-
-fn get_buffers<'a>(width: usize, height: usize) -> (&'a [u32], &'a mut [u32]) {
-    let num_pixels = width * height;
-    let in_b: &[u32];
-    let out_b: &mut [u32];
-    unsafe {
-        in_b = from_raw_parts::<u32>(8 as *const u32, num_pixels);
-        out_b = from_raw_parts_mut::<u32>((num_pixels * 4 + 8) as *mut u32, num_pixels);
-    }
-    return (in_b, out_b);
-}
-
-#[inline(never)]
-fn rotate_0(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    for (in_p, out_p) in in_b.iter().zip(out_b.iter_mut()) {
-        *out_p = *in_p;
-    }
-}
-
-#[inline(never)]
-fn rotate_90(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    let new_width = height;
-    let _new_height = width;
-    for y_start in (0..height).step_by(TILE_SIZE) {
-        for x_start in (0..width).step_by(TILE_SIZE) {
-            for y in y_start..(y_start + TILE_SIZE).min(height) {
-                let in_offset = y * width;
-                let in_bounds = if x_start + TILE_SIZE < width {
-                    (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
-                } else {
-                    (in_offset + x_start)..(in_offset + width)
-                };
-                let in_chunk = in_b.get(in_bounds).unwrap_hard();
-                for (x, in_p) in in_chunk.iter().enumerate() {
-                    let new_x = (new_width - 1) - y;
-                    let new_y = x + x_start;
-                    *out_b.get_mut(new_y * new_width + new_x).unwrap_hard() = *in_p;
-                }
-            }
-        }
-    }
-}
-
-#[inline(never)]
-fn rotate_180(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    for (in_p, out_p) in in_b.iter().zip(out_b.iter_mut().rev()) {
-        *out_p = *in_p;
-    }
-}
-
-#[inline(never)]
-fn rotate_270(width: usize, height: usize) {
-    let (in_b, out_b) = get_buffers(width, height);
-    let new_width = height;
-    let new_height = width;
-    for y_start in (0..height).step_by(TILE_SIZE) {
-        for x_start in (0..width).step_by(TILE_SIZE) {
-            for y in y_start..(y_start + TILE_SIZE).min(height) {
-                let in_offset = y * width;
-                let in_bounds = if x_start + TILE_SIZE < width {
-                    (in_offset + x_start)..(in_offset + x_start + TILE_SIZE)
-                } else {
-                    (in_offset + x_start)..(in_offset + width)
-                };
-                let in_chunk = in_b.get(in_bounds).unwrap_hard();
-                for (x, in_p) in in_chunk.iter().enumerate() {
-                    let new_x = y;
-                    let new_y = new_height - 1 - (x_start + x);
-                    *out_b.get_mut(new_y * new_width + new_x).unwrap_hard() = *in_p;
-                }
-            }
-        }
-    }
-}
-
-#[no_mangle]
-fn rotate(width: usize, height: usize, rotate: usize) {
-    match rotate {
-        0 => rotate_0(width, height),
-        90 => rotate_90(width, height),
-        180 => rotate_180(width, height),
-        270 => rotate_270(width, height),
-        _ => std::process::abort(),
-    }
-}

codecs/webp_dec/README.md

@@ -1,7 +1,7 @@
 # WebP decoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v1.0.2
+- Version: v0.6.1
 
 ## Example
 

codecs/webp_dec/build.sh

@@ -6,33 +6,7 @@ export OPTIMIZE="-Os"
 export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
-apt-get update
-apt-get install -qqy autoconf libtool libpng-dev pkg-config
 
-echo "============================================="
-echo "Compiling libwebp"
-echo "============================================="
-test -n "$SKIP_LIBWEBP" || (
-  cd node_modules/libwebp
-  autoreconf -fiv
-  rm -rf build || true
-  mkdir -p build && cd build
-  emconfigure ../configure \
-    --disable-libwebpdemux \
-    --disable-wic \
-    --disable-gif \
-    --disable-tiff \
-    --disable-jpeg \
-    --disable-png \
-    --disable-sdl \
-    --disable-gl \
-    --disable-threading \
-    --disable-neon-rtcd \
-    --disable-neon \
-    --disable-sse2 \
-    --disable-sse4.1
-  emmake make
-)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -46,9 +20,9 @@ echo "============================================="
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_dec.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_dec.cpp \
-    node_modules/libwebp/build/src/.libs/libwebp.a
+    webp_dec.cpp
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

codecs/webp_dec/package.json

@@ -5,9 +5,9 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.2"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/webp_enc/README.md

@@ -1,7 +1,7 @@
 # WebP encoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v1.0.2
+- Version: v0.6.1
 
 ## Dependencies
 

codecs/webp_enc/build.sh

@@ -7,33 +7,6 @@ export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
 
-apt-get update
-apt-get install -qqy autoconf libtool libpng-dev pkg-config
-
-echo "============================================="
-echo "Compiling libwebp"
-echo "============================================="
-test -n "$SKIP_LIBWEBP" || (
-  cd node_modules/libwebp
-  autoreconf -fiv
-  rm -rf build || true
-  mkdir -p build && cd build
-  emconfigure ../configure \
-    --disable-libwebpdemux \
-    --disable-wic \
-    --disable-gif \
-    --disable-tiff \
-    --disable-jpeg \
-    --disable-png \
-    --disable-sdl \
-    --disable-gl \
-    --disable-threading \
-    --disable-neon-rtcd \
-    --disable-neon \
-    --disable-sse2 \
-    --disable-sse4.1
-  emmake make
-)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -47,9 +20,9 @@ echo "============================================="
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_enc.js \
+    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_enc.cpp \
-    node_modules/libwebp/build/src/.libs/libwebp.a
+    webp_enc.cpp
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

codecs/webp_enc/package.json

@@ -5,9 +5,9 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.2"
+    "libwebp": "webmproject/libwebp#v1.0.0"
   },
   "devDependencies": {
-    "napa": "3.0.0"
+    "napa": "^3.0.0"
   }
 }

codecs/webp_enc/webp_enc.cpp

@@ -26,8 +26,7 @@ val encode(std::string img, int width, int height, WebPConfig config) {
     throw std::runtime_error("Unexpected error");
   }
 
-  // Only use use_argb if we really need it, as it's slower.
-  pic.use_argb = config.lossless || config.use_sharp_yuv || config.preprocessing > 0;
+  pic.use_argb = !!config.lossless;
   pic.width = width;
   pic.height = height;
   pic.writer = WebPMemoryWrite;

config/add-css-types.js

@@ -1,74 +0,0 @@
-const DtsCreator = require('typed-css-modules');
-const chokidar = require('chokidar');
-const util = require('util');
-const sass = require('node-sass');
-
-const sassRender = util.promisify(sass.render);
-
-async function sassToCss(path) {
-  const result = await sassRender({ file: path });
-  return result.css;
-}
-
-/**
- * @typedef {Object} Opts
- * @property {boolean} watch Watch for changes
- */
-/**
- * Create typing files for CSS & SCSS.
- *
- * @param {string[]} rootPaths Paths to search within
- * @param {Opts} [opts={}] Options.
- */
-function addCssTypes(rootPaths, opts = {}) {
-  return new Promise((resolve) => {
-    const { watch = false } = opts;
-
-    const paths = [];
-    const preReadyPromises = [];
-    let ready = false;
-
-    for (const rootPath of rootPaths) {
-      // Look for scss & css in each path.
-      paths.push(rootPath + '/**/*.scss');
-      paths.push(rootPath + '/**/*.css');
-    }
-
-    // For simplicity, the watcher is used even if we're not watching.
-    // If we're not watching, we stop the watcher after the initial files are found.
-    const watcher = chokidar.watch(paths, {
-      // Avoid processing already-processed files.
-      ignored: '*.d.*',
-      // Without this, travis and netlify builds never complete. I'm not sure why, but it might be
-      // related to https://github.com/paulmillr/chokidar/pull/758
-      persistent: watch,
-    });
-
-    function change(path) {
-      const promise = (async function() {
-        const creator = new DtsCreator({ camelCase: true });
-        const result = path.endsWith('.scss') ?
-          await creator.create(path, await sassToCss(path)) :
-          await creator.create(path);
-
-        await result.writeFile();
-      })();
-
-      if (!ready) preReadyPromises.push(promise);
-    }
-
-    watcher.on('change', change);
-    watcher.on('add', change);
-
-    // 'ready' is when events have been fired for file discovery.
-    watcher.on('ready', () => {
-      ready = true;
-      // Wait for the current set of processing to finish.
-      Promise.all(preReadyPromises).then(resolve);
-      // And if we're not watching, close the watcher.
-      if (!watch) watcher.close();
-    });
-  })
-}
-
-module.exports = addCssTypes;

config/asset-template-plugin.js

@@ -1,47 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const ejs = require('ejs');
-const AssetsPlugin = require('assets-webpack-plugin');
-
-module.exports = class AssetTemplatePlugin extends AssetsPlugin {
-  constructor(options) {
-    options = options || {};
-    if (!options.template) throw Error('AssetTemplatePlugin: template option is required.');
-    super({
-      useCompilerPath: true,
-      filename: options.filename,
-      processOutput: files => this._processOutput(files)
-    });
-    this._template = path.resolve(process.cwd(), options.template);
-    const ignore = options.ignore || /(manifest\.json|\.DS_Store)$/;
-    this._ignore = typeof ignore === 'function' ? ({ test: ignore }) : ignore;
-  }
-
-  _processOutput(files) {
-    const mapping = {
-      all: [],
-      byType: {},
-      entries: {}
-    };
-    for (const entryName in files) {
-      // non-entry-point-derived assets are collected under an empty string key
-      // since that's a bit awkward, we'll call them "assets"
-      const name = entryName === '' ? 'assets' : entryName;
-      const listing = files[entryName];
-      const entry = mapping.entries[name] = {
-        all: [],
-        byType: {}
-      };
-      for (let type in listing) {
-        const list = [].concat(listing[type]).filter(file => !this._ignore.test(file));
-        if (!list.length) continue;
-        mapping.all = mapping.all.concat(list);
-        mapping.byType[type] = (mapping.byType[type] || []).concat(list);
-        entry.all = entry.all.concat(list);
-        entry.byType[type] = (entry.byType[type] || []).concat(list);
-      }
-    }
-    mapping.files = mapping.all;
-    return ejs.render(fs.readFileSync(this._template, 'utf8'), mapping);
-  }
-};

config/auto-sw-plugin.js

@@ -1,158 +0,0 @@
-const util = require('util');
-const minimatch = require('minimatch');
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
-const WebWorkerTemplatePlugin = require('webpack/lib/webworker/WebWorkerTemplatePlugin');
-const ParserHelpers = require('webpack/lib/ParserHelpers');
-
-const NAME = 'auto-sw-plugin';
-const JS_TYPES = ['auto', 'esm', 'dynamic'];
-
-/**
- * Automatically finds and bundles Service Workers by looking for navigator.serviceWorker.register(..).
- * An Array of webpack assets is injected into the Service Worker bundle as a `BUILD_ASSETS` global.
- * Hidden and `.map` files are excluded by default, and this can be customized using the include & exclude options.
- * @example
- *  // webpack config
- *  plugins: [
- *    new AutoSWPlugin({
- *      exclude: [
- *        '**\/.*',     // don't expose hidden files (default)
- *        '**\/*.map',  // don't precache sourcemaps (default)
- *        'index.html'  // don't cache the page itself
- *      ]
- *    })
- *  ]
- * @param {Object} [options={}]
- * @param {string[]} [options.exclude]  Minimatch pattern(s) of which assets to omit from BUILD_ASSETS.
- * @param {string[]} [options.include]  Minimatch pattern(s) of assets to allow in BUILD_ASSETS.
- */
-module.exports = class AutoSWPlugin {
-  constructor(options) {
-    this.options = Object.assign({
-      exclude: [
-        '**/*.map',
-        '**/.*'
-      ]
-    }, options || {});
-  }
-
-  apply(compiler) {
-    const serviceWorkers = [];
-
-    compiler.hooks.emit.tapPromise(NAME, compilation => this.emit(compiler, compilation, serviceWorkers));
-
-    compiler.hooks.normalModuleFactory.tap(NAME, (factory) => {
-      for (const type of JS_TYPES) {
-        factory.hooks.parser.for(`javascript/${type}`).tap(NAME, parser => {
-          let counter = 0;
-
-          const processRegisterCall = expr => {
-            const dep = parser.evaluateExpression(expr.arguments[0]);
-
-            if (!dep.isString()) {
-              parser.state.module.warnings.push({
-                message: 'navigator.serviceWorker.register() will only be bundled if passed a String literal.'
-              });
-              return false;
-            }
-
-            const filename = dep.string;
-            const outputFilename = this.options.filename || 'serviceworker.js'
-            const context = parser.state.current.context;
-            serviceWorkers.push({
-              outputFilename,
-              filename,
-              context
-            });
-
-            const id = `__webpack__serviceworker__${++counter}`;
-            ParserHelpers.toConstantDependency(parser, id)(expr.arguments[0]);
-            return ParserHelpers.addParsedVariableToModule(parser, id, '__webpack_public_path__ + ' + JSON.stringify(outputFilename));
-          };
-
-          parser.hooks.call.for('navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-          parser.hooks.call.for('self.navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-          parser.hooks.call.for('window.navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-        });
-      }
-    });
-  }
-
-  createFilter(list) {
-    const filters = [].concat(list);
-    for (let i=0; i<filters.length; i++) {
-      if (typeof filters[i] === 'string') {
-        filters[i] = minimatch.filter(filters[i]);
-      }
-    }
-    return filters;
-  }
-
-  async emit(compiler, compilation, serviceWorkers) {
-    let assetMapping = Object.keys(compilation.assets);
-    if (this.options.include) {
-      const filters = this.createFilter(this.options.include);
-      assetMapping = assetMapping.filter(filename => {
-        for (const filter of filters) {
-          if (filter(filename)) return true;
-        }
-        return false;
-      });
-    }
-    if (this.options.exclude) {
-      const filters = this.createFilter(this.options.exclude);
-      assetMapping = assetMapping.filter(filename => {
-        for (const filter of filters) {
-          if (filter(filename)) return false;
-        }
-        return true;
-      });
-    }
-    await Promise.all(serviceWorkers.map(
-      (serviceWorker, index) => this.compileServiceWorker(compiler, compilation, serviceWorker, index, assetMapping)
-    ));
-  }
-
-  async compileServiceWorker(compiler, compilation, options, index, assetMapping) {
-    const entryFilename = options.filename;
-
-    const chunkFilename = compiler.options.output.chunkFilename.replace(/\.([a-z]+)$/i, '.serviceworker.$1');
-    const workerOptions = {
-      filename: options.outputFilename, // chunkFilename.replace(/\.?\[(?:chunkhash|contenthash|hash)(:\d+(?::\d+)?)?\]/g, ''),
-      chunkFilename: this.options.chunkFilename || chunkFilename,
-      globalObject: 'self'
-    };
-
-    const childCompiler = compilation.createChildCompiler(NAME, { filename: workerOptions.filename });
-    (new WebWorkerTemplatePlugin(workerOptions)).apply(childCompiler);
-
-    /* The duplication DefinePlugin ends up causing is problematic (it doesn't hoist injections), so we'll do it manually. */
-    // (new DefinePlugin({
-    //   BUILD_ASSETS: JSON.stringify(assetMapping)
-    // })).apply(childCompiler);
-    (new SingleEntryPlugin(options.context, entryFilename, workerOptions.filename)).apply(childCompiler);
-
-    const subCache = `subcache ${__dirname} ${entryFilename} ${index}`;
-    let childCompilation;
-    childCompiler.hooks.compilation.tap(NAME, c => {
-      childCompilation = c;
-      if (childCompilation.cache) {
-        if (!childCompilation.cache[subCache]) childCompilation.cache[subCache] = {};
-        childCompilation.cache = childCompilation.cache[subCache];
-      }
-    });
-
-    await (util.promisify(childCompiler.runAsChild.bind(childCompiler)))();
-
-    const versionVar = this.options.version ?
-      `var VERSION = ${JSON.stringify(this.options.version)};` : '';
-    const original = childCompilation.assets[workerOptions.filename].source();
-    const source = `${versionVar}var BUILD_ASSETS=${JSON.stringify(assetMapping)};${original}`;
-    childCompilation.assets[workerOptions.filename] = {
-      source: () => source,
-      size: () => Buffer.byteLength(source, 'utf8')
-    };
-
-    Object.assign(compilation.assets, childCompilation.assets);
-  }
-};

config/size-report.js

@@ -1,203 +0,0 @@
-const path = require('path');
-const { URL } = require('url');
-
-const gzipSize = require('gzip-size');
-const fetch = require('node-fetch');
-const prettyBytes = require('pretty-bytes');
-const escapeRE = require('escape-string-regexp');
-const readdirp = require('readdirp');
-const chalk = new require('chalk').constructor({ level: 4 });
-
-function fetchTravis(path, options = {}) {
-  const url = new URL(path, 'https://api.travis-ci.org');
-  url.search = new URLSearchParams(options);
-
-  return fetch(url, {
-    headers: { 'Travis-API-Version': '3' },
-  });
-}
-
-function fetchTravisBuildInfo(user, repo, branch) {
-  return fetchTravis(`/repo/${encodeURIComponent(`${user}/${repo}`)}/builds`, {
-    'branch.name': branch,
-    state: 'passed',
-    limit: 1,
-    event_type: 'push',
-  }).then(r => r.json());
-}
-
-function fetchTravisText(path) {
-  return fetchTravis(path).then(r => r.text());
-}
-
-/**
- * Recursively-read a directory and turn it into an array of { name, size, gzipSize }
- */
-async function dirToInfoArray(startPath) {
-  const results = await new Promise((resolve, reject) => {
-    readdirp({ root: startPath }, (err, results) => {
-      if (err) reject(err); else resolve(results);
-    });
-  });
-
-  return Promise.all(
-    results.files.map(async (entry) => ({
-      name: entry.path,
-      gzipSize: await gzipSize.file(entry.fullPath),
-      size: entry.stat.size,
-    })),
-  );
-}
-
-/**
- * Try to treat two entries with different file name hashes as the same file.
- */
-function findHashedMatch(name, buildInfo) {
-  const nameParts = /^(.+\.)[a-f0-9]+(\..+)$/.exec(name);
-  if (!nameParts) return;
-
-  const matchRe = new RegExp(`^${escapeRE(nameParts[1])}[a-f0-9]+${escapeRE(nameParts[2])}$`);
-  const matchingEntry = buildInfo.find(entry => matchRe.test(entry.name));
-  return matchingEntry;
-}
-
-const buildSizePrefix = '=== BUILD SIZES: ';
-const buildSizePrefixRe = new RegExp(`^${escapeRE(buildSizePrefix)}(.+)$`, 'm');
-
-async function getPreviousBuildInfo() {
-  const buildData = await fetchTravisBuildInfo('GoogleChromeLabs', 'squoosh', 'master');
-  const jobUrl = buildData.builds[0].jobs[0]['@href'];
-  const log = await fetchTravisText(jobUrl + '/log.txt');
-  const reResult = buildSizePrefixRe.exec(log);
-
-  if (!reResult) return;
-  return JSON.parse(reResult[1]);
-}
-
-/**
- * Generate an array that represents the difference between builds.
- * Returns an array of { beforeName, afterName, beforeSize, afterSize }.
- * Sizes are gzipped size.
- * Before/after properties are missing if resource isn't in the previous/new build.
- */
-function getChanges(previousBuildInfo, buildInfo) {
-  const buildChanges = [];
-  const alsoInPreviousBuild = new Set();
-
-  for (const oldEntry of previousBuildInfo) {
-    const newEntry = buildInfo.find(entry => entry.name === oldEntry.name) ||
-      findHashedMatch(oldEntry.name, buildInfo);
-
-    // Entry is in previous build, but not the new build.
-    if (!newEntry) {
-      buildChanges.push({
-        beforeName: oldEntry.name,
-        beforeSize: oldEntry.gzipSize,
-      });
-      continue;
-    }
-
-    // Mark this entry so we know we've dealt with it.
-    alsoInPreviousBuild.add(newEntry);
-
-    // If they're the same, just ignore.
-    // Using size rather than gzip size. I've seen different platforms produce different zipped
-    // sizes.
-    if (
-      oldEntry.size === newEntry.size &&
-      oldEntry.name === newEntry.name
-    ) continue;
-
-    // Entry is in both builds (maybe renamed).
-    buildChanges.push({
-      beforeName: oldEntry.name,
-      afterName: newEntry.name,
-      beforeSize: oldEntry.gzipSize,
-      afterSize: newEntry.gzipSize,
-    });
-  }
-
-  // Look for entries that are only in the new build.
-  for (const newEntry of buildInfo) {
-    if (alsoInPreviousBuild.has(newEntry)) continue;
-
-    buildChanges.push({
-      afterName: newEntry.name,
-      afterSize: newEntry.gzipSize,
-    });
-  }
-
-  return buildChanges;
-}
-
-async function main() {
-  // Output the current build sizes for later retrieval.
-  const buildInfo = await dirToInfoArray(__dirname + '/../build');
-  console.log(buildSizePrefix + JSON.stringify(buildInfo));
-  console.log('\nBuild change report:');
-
-  let previousBuildInfo;
-
-  try {
-    previousBuildInfo = await getPreviousBuildInfo();
-  } catch (err) {
-    console.log(`  Couldn't parse previous build info`);
-    return;
-  }
-
-  if (!previousBuildInfo) {
-    console.log(`  Couldn't find previous build info`);
-    return;
-  }
-
-  const buildChanges = getChanges(previousBuildInfo, buildInfo);
-
-  if (buildChanges.length === 0) {
-    console.log('  No changes');
-    return;
-  }
-
-  // One letter references, so it's easier to get the spacing right.
-  const y = chalk.yellow;
-  const g = chalk.green;
-  const r = chalk.red;
-
-  for (const change of buildChanges) {
-    // New file.
-    if (!change.beforeSize) {
-      console.log(`  ${g('ADDED')}   ${change.afterName} - ${prettyBytes(change.afterSize)}`);
-      continue;
-    }
-
-    // Removed file.
-    if (!change.afterSize) {
-      console.log(`  ${r('REMOVED')} ${change.beforeName} - was ${prettyBytes(change.beforeSize)}`);
-      continue;
-    }
-
-    // Changed file.
-    let size;
-
-    if (change.beforeSize === change.afterSize) {
-      // Just renamed.
-      size = `${prettyBytes(change.afterSize)} -> no change`;
-    } else {
-      const color = change.afterSize > change.beforeSize ? r : g;
-      const sizeDiff = prettyBytes(change.afterSize - change.beforeSize, { signed: true });
-      const relativeDiff = Math.round((change.afterSize / change.beforeSize) * 1000) / 1000;
-
-      size = `${prettyBytes(change.beforeSize)} -> ${prettyBytes(change.afterSize)}` +
-        ' (' +
-        color(`${sizeDiff}, ${relativeDiff}x`) +
-        ')';
-    }
-
-    console.log(`  ${y('CHANGED')} ${change.afterName} - ${size}`);
-
-    if (change.beforeName !== change.afterName) {
-      console.log(`    Renamed from: ${change.beforeName}`);
-    }
-  }
-}
-
-main();

global.d.ts

@@ -1,21 +1,16 @@
 declare const __webpack_public_path__: string;
-declare const PRERENDER: boolean;
 
 declare interface NodeModule {
   hot: any;
 }
 
 declare interface Window {
-  STATE: any;
-  ga: typeof ga;
+  STATE: any
 }
 
 declare namespace JSX {
   interface Element { }
   interface IntrinsicElements { }
-  interface HTMLAttributes {
-    decoding?: string;
-  }
 }
 
 declare module 'classnames' {

package.json

@@ -1,14 +1,13 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.3.4",
+  "version": "0.0.0",
   "license": "apache-2.0",
   "scripts": {
-    "start": "webpack-dev-server --host 0.0.0.0 --hot",
+    "start": "webpack serve --host 0.0.0.0 --hot",
     "build": "webpack -p",
-    "lint": "tslint -c tslint.json  -p tsconfig.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",
-    "lintfix": "tslint -c tslint.json -p tsconfig.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'",
-    "sizereport": "node config/size-report.js"
+    "lint": "tslint -c tslint.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",
+    "lintfix": "tslint -c tslint.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'"
   },
   "husky": {
     "hooks": {
@@ -16,60 +15,56 @@
     }
   },
   "devDependencies": {
-    "@types/node": "10.12.29",
-    "@types/pretty-bytes": "5.1.0",
-    "@types/webassembly-js-api": "0.0.2",
-    "@webcomponents/custom-elements": "1.2.1",
-    "@webpack-cli/serve": "0.1.3",
-    "assets-webpack-plugin": "3.9.10",
-    "chokidar": "2.1.2",
-    "chalk": "2.4.2",
-    "classnames": "2.2.6",
-    "clean-webpack-plugin": "1.0.1",
-    "comlink": "3.1.1",
-    "copy-webpack-plugin": "5.0.0",
-    "critters-webpack-plugin": "2.3.0",
-    "css-loader": "1.0.1",
-    "ejs": "2.6.1",
-    "escape-string-regexp": "1.0.5",
-    "exports-loader": "0.7.0",
-    "file-drop-element": "0.2.0",
-    "file-loader": "3.0.1",
-    "gzip-size": "5.0.0",
-    "html-webpack-plugin": "3.2.0",
-    "husky": "1.3.1",
-    "idb-keyval": "3.1.0",
-    "linkstate": "1.1.1",
-    "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.5.0",
-    "minimatch": "3.0.4",
-    "node-fetch": "2.3.0",
-    "node-sass": "4.11.0",
-    "optimize-css-assets-webpack-plugin": "5.0.1",
-    "pointer-tracker": "2.0.3",
-    "preact": "8.4.2",
-    "prerender-loader": "1.3.0",
-    "pretty-bytes": "5.1.0",
-    "progress-bar-webpack-plugin": "1.12.1",
-    "raw-loader": "1.0.0",
-    "readdirp": "2.2.1",
-    "sass-loader": "7.1.0",
-    "script-ext-html-webpack-plugin": "2.1.3",
-    "source-map-loader": "0.2.4",
-    "style-loader": "0.23.1",
-    "terser-webpack-plugin": "1.2.3",
-    "ts-loader": "5.3.3",
-    "tslint": "5.13.1",
-    "tslint-config-airbnb": "5.11.1",
-    "tslint-config-semistandard": "7.0.0",
-    "tslint-react": "3.6.0",
-    "typed-css-modules": "0.4.1",
-    "typescript": "3.3.3333",
-    "url-loader": "1.1.2",
-    "webpack": "4.28.0",
-    "webpack-bundle-analyzer": "3.1.0",
-    "webpack-cli": "3.2.3",
-    "webpack-dev-server": "3.2.1",
-    "worker-plugin": "3.1.0"
+    "@types/node": "^9.6.23",
+    "@types/pretty-bytes": "^5.1.0",
+    "@types/webassembly-js-api": "0.0.1",
+    "@webcomponents/custom-elements": "^1.2.0",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-jsx-pragmatic": "^1.0.2",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-decorators-legacy": "^1.3.5",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-plugin-transform-react-constant-elements": "^6.23.0",
+    "babel-plugin-transform-react-jsx": "^6.24.1",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.14",
+    "babel-preset-env": "^1.7.0",
+    "babel-register": "^6.26.0",
+    "clean-webpack-plugin": "^0.1.19",
+    "copy-webpack-plugin": "^4.5.2",
+    "css-loader": "^0.28.11",
+    "exports-loader": "^0.7.0",
+    "file-loader": "^1.1.11",
+    "html-webpack-plugin": "^3.2.0",
+    "husky": "^1.0.0-rc.13",
+    "if-env": "^1.0.4",
+    "loader-utils": "^1.1.0",
+    "mini-css-extract-plugin": "^0.3.0",
+    "node-sass": "^4.9.3",
+    "optimize-css-assets-webpack-plugin": "^4.0.3",
+    "progress-bar-webpack-plugin": "^1.11.0",
+    "raw-loader": "^0.5.1",
+    "sass-loader": "^7.1.0",
+    "script-ext-html-webpack-plugin": "^2.0.1",
+    "source-map-loader": "^0.2.3",
+    "style-loader": "^0.22.1",
+    "ts-loader": "^4.4.2",
+    "tslint": "^5.11.0",
+    "tslint-config-airbnb": "^5.9.2",
+    "tslint-config-semistandard": "^7.0.0",
+    "tslint-react": "^3.6.0",
+    "typescript": "^2.9.2",
+    "typings-for-css-modules-loader": "^1.7.0",
+    "webpack": "^4.19.1",
+    "webpack-bundle-analyzer": "^2.13.1",
+    "webpack-cli": "^2.1.5",
+    "webpack-dev-server": "^3.1.5",
+    "webpack-plugin-replace": "^1.1.1",
+    "classnames": "^2.2.6",
+    "comlink": "^3.0.3",
+    "linkstate": "^1.1.1",
+    "preact": "^8.3.1",
+    "pretty-bytes": "^5.1.0",
+    "worker-plugin": "^1.1.1"
   }
 }

renovate.json

@@ -1,5 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ]
-}

src/codecs/decoders.ts

@@ -1,8 +1,9 @@
 import { nativeDecode, sniffMimeType, canDecodeImage } from '../lib/util';
 import Processor from './processor';
-import webpDataUrl from 'url-loader!./tiny.webp';
 
-const nativeWebPSupported = canDecodeImage(webpDataUrl);
+// tslint:disable-next-line:max-line-length It’s a data URL. Whatcha gonna do?
+const webpFile = 'data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA=';
+const nativeWebPSupported = canDecodeImage(webpFile);
 
 export async function decodeImage(blob: Blob, processor: Processor): Promise<ImageData> {
   const mimeType = await sniffMimeType(blob);

src/codecs/imagequant/options.tsx

@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldValueAsNumber, konami, preventDefault } from '../../lib/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';
@@ -42,7 +42,7 @@ export default class QuantizerOptions extends Component<Props, State> {
 
   render({ options }: Props, { extendedSettings }: State) {
     return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
+      <form class={style.optionsSection}>
         <Expander>
           {extendedSettings ?
             <label class={style.optionTextFirst}>

src/codecs/input-processors.ts

@@ -1,9 +0,0 @@
-import { defaultOptions as rotateDefaultOptions } from './rotate/processor-meta';
-
-export interface InputProcessorState {
-  rotate: import('./rotate/processor-meta').RotateOptions;
-}
-
-export const defaultInputProcessorState: InputProcessorState = {
-  rotate: rotateDefaultOptions,
-};

src/codecs/mozjpeg/encoder-meta.ts

@@ -17,10 +17,6 @@ export interface EncodeOptions {
   trellis_opt_zero: boolean;
   trellis_opt_table: boolean;
   trellis_loops: number;
-  auto_subsample: boolean;
-  chroma_subsample: number;
-  separate_chroma_quality: boolean;
-  chroma_quality: number;
 }
 
 export interface EncoderState { type: typeof type; options: EncodeOptions; }
@@ -42,8 +38,4 @@ export const defaultOptions: EncodeOptions = {
   trellis_opt_zero: false,
   trellis_opt_table: false,
   trellis_loops: 1,
-  auto_subsample: true,
-  chroma_subsample: 2,
-  separate_chroma_quality: false,
-  chroma_quality: 75,
 };

src/codecs/mozjpeg/options.tsx

@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldChecked, inputFieldValueAsNumber, preventDefault } from '../../lib/util';
+import { inputFieldChecked, inputFieldValueAsNumber } from '../../lib/util';
 import { EncodeOptions, MozJpegColorSpace } from './encoder-meta';
 import * as style from '../../components/Options/style.scss';
 import Checkbox from '../../components/checkbox';
@@ -39,13 +39,8 @@ export default class MozJPEGEncoderOptions extends Component<Props, State> {
       trellis_multipass: inputFieldChecked(form.trellis_multipass, options.trellis_multipass),
       trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero, options.trellis_opt_zero),
       trellis_opt_table: inputFieldChecked(form.trellis_opt_table, options.trellis_opt_table),
-      auto_subsample: inputFieldChecked(form.auto_subsample, options.auto_subsample),
-      separate_chroma_quality:
-        inputFieldChecked(form.separate_chroma_quality, options.separate_chroma_quality),
       // .value
       quality: inputFieldValueAsNumber(form.quality, options.quality),
-      chroma_quality: inputFieldValueAsNumber(form.chroma_quality, options.chroma_quality),
-      chroma_subsample: inputFieldValueAsNumber(form.chroma_subsample, options.chroma_subsample),
       smoothing: inputFieldValueAsNumber(form.smoothing, options.smoothing),
       color_space: inputFieldValueAsNumber(form.color_space, options.color_space),
       quant_table: inputFieldValueAsNumber(form.quant_table, options.quant_table),
@@ -58,7 +53,7 @@ export default class MozJPEGEncoderOptions 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} onSubmit={preventDefault}>
+      <form class={style.optionsSection}>
         <div class={style.optionOneCell}>
           <Range
             name="quality"
@@ -80,72 +75,6 @@ export default class MozJPEGEncoderOptions extends Component<Props, State> {
         <Expander>
           {showAdvanced ?
             <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>
-              <Expander>
-                {options.color_space === MozJpegColorSpace.YCbCr ?
-                  <div>
-                    <label class={style.optionInputFirst}>
-                      <Checkbox
-                        name="auto_subsample"
-                        checked={options.auto_subsample}
-                        onChange={this.onChange}
-                      />
-                      Auto subsample chroma
-                    </label>
-                    <Expander>
-                      {options.auto_subsample ? null :
-                        <div class={style.optionOneCell}>
-                          <Range
-                            name="chroma_subsample"
-                            min="1"
-                            max="4"
-                            value={options.chroma_subsample}
-                            onInput={this.onChange}
-                          >
-                            Subsample chroma by:
-                          </Range>
-                        </div>
-                      }
-                    </Expander>
-                    <label class={style.optionInputFirst}>
-                      <Checkbox
-                        name="separate_chroma_quality"
-                        checked={options.separate_chroma_quality}
-                        onChange={this.onChange}
-                      />
-                      Separate chroma quality
-                    </label>
-                    <Expander>
-                      {options.separate_chroma_quality ?
-                        <div class={style.optionOneCell}>
-                          <Range
-                            name="chroma_quality"
-                            min="0"
-                            max="100"
-                            value={options.chroma_quality}
-                            onInput={this.onChange}
-                          >
-                            Chroma quality:
-                          </Range>
-                        </div>
-                        : null
-                      }
-                    </Expander>
-                  </div>
-                  : null
-                }
-              </Expander>
               <label class={style.optionInputFirst}>
                 <Checkbox
                   name="baseline"
@@ -190,6 +119,18 @@ export default class MozJPEGEncoderOptions extends Component<Props, State> {
                   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

src/codecs/optipng/options.tsx

@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldValueAsNumber, preventDefault } from '../../lib/util';
+import { inputFieldValueAsNumber } from '../../lib/util';
 import { EncodeOptions } from './encoder-meta';
 import Range from '../../components/range';
 import * as style from '../../components/Options/style.scss';
@@ -23,7 +23,7 @@ export default class OptiPNGEncoderOptions extends Component<Props, {}> {
 
   render({ options }: Props) {
     return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
+      <form class={style.optionsSection}>
         <div class={style.optionOneCell}>
           <Range
             name="level"

src/codecs/processor-worker.ts

@@ -0,0 +1,41 @@
+import { expose } from 'comlink';
+import { EncodeOptions as MozJPEGEncoderOptions } from './mozjpeg/encoder-meta';
+import { QuantizeOptions } from './imagequant/processor-meta';
+import { EncodeOptions as OptiPNGEncoderOptions } from './optipng/encoder-meta';
+import { EncodeOptions as WebPEncoderOptions } from './webp/encoder-meta';
+
+async function mozjpegEncode(
+  data: ImageData, options: MozJPEGEncoderOptions,
+): Promise<ArrayBuffer> {
+  const { encode } = await import('./mozjpeg/encoder');
+  return encode(data, options);
+}
+
+async function quantize(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
+  const { process } = await import('./imagequant/processor');
+  return process(data, opts);
+}
+
+async function optiPngEncode(
+  data: BufferSource, options: OptiPNGEncoderOptions,
+): Promise<ArrayBuffer> {
+  const { compress } = await import('./optipng/encoder');
+  return compress(data, options);
+}
+
+async function webpEncode(
+  data: ImageData, options: WebPEncoderOptions,
+): Promise<ArrayBuffer> {
+  const { encode } = await import('./webp/encoder');
+  return encode(data, options);
+}
+
+async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
+  const { decode } = await import('./webp/decoder');
+  return decode(data);
+}
+
+const exports = { mozjpegEncode, quantize, optiPngEncode, webpEncode, webpDecode };
+export type ProcessorWorkerApi = typeof exports;
+
+expose(exports, self);

src/codecs/processor-worker/index.ts

@@ -1,59 +0,0 @@
-import { expose } from 'comlink';
-
-async function mozjpegEncode(
-  data: ImageData, options: import('../mozjpeg/encoder-meta').EncodeOptions,
-): Promise<ArrayBuffer> {
-  const { encode } = await import(
-    /* webpackChunkName: "process-mozjpeg-enc" */
-    '../mozjpeg/encoder');
-  return encode(data, options);
-}
-
-async function quantize(
-  data: ImageData, opts: import('../imagequant/processor-meta').QuantizeOptions,
-): Promise<ImageData> {
-  const { process } = await import(
-    /* webpackChunkName: "process-imagequant" */
-    '../imagequant/processor');
-  return process(data, opts);
-}
-
-async function rotate(
-  data: ImageData, opts: import('../rotate/processor-meta').RotateOptions,
-): Promise<ImageData> {
-  const { rotate } = await import(
-    /* webpackChunkName: "process-rotate" */
-    '../rotate/processor');
-
-  return rotate(data, opts);
-}
-
-async function optiPngEncode(
-  data: BufferSource, options: import('../optipng/encoder-meta').EncodeOptions,
-): Promise<ArrayBuffer> {
-  const { compress } = await import(
-    /* webpackChunkName: "process-optipng" */
-    '../optipng/encoder');
-  return compress(data, options);
-}
-
-async function webpEncode(
-  data: ImageData, options: import('../webp/encoder-meta').EncodeOptions,
-): Promise<ArrayBuffer> {
-  const { encode } = await import(
-    /* webpackChunkName: "process-webp-enc" */
-    '../webp/encoder');
-  return encode(data, options);
-}
-
-async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
-  const { decode } = await import(
-    /* webpackChunkName: "process-webp-dec" */
-    '../webp/decoder');
-  return decode(data);
-}
-
-const exports = { mozjpegEncode, quantize, rotate, optiPngEncode, webpEncode, webpDecode };
-export type ProcessorWorkerApi = typeof exports;
-
-expose(exports, self);

src/codecs/processor-worker/tsconfig.json

@@ -1,18 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "strict": true,
-    "target": "esnext",
-    "module": "esnext",
-    "lib": [
-      "webworker",
-      "esnext"
-    ],
-    "moduleResolution": "node",
-    "experimentalDecorators": true,
-    "noUnusedLocals": true,
-    "sourceMap": true,
-    "allowJs": false,
-    "baseUrl": "."
-  }
-}

src/codecs/processor.ts

@@ -1,5 +1,6 @@
 import { proxy } from 'comlink';
 import { QuantizeOptions } from './imagequant/processor-meta';
+import { ProcessorWorkerApi } from './processor-worker';
 import { canvasEncode, blobToArrayBuffer } from '../lib/util';
 import { EncodeOptions as MozJPEGEncoderOptions } from './mozjpeg/encoder-meta';
 import { EncodeOptions as OptiPNGEncoderOptions } from './optipng/encoder-meta';
@@ -17,10 +18,8 @@ import * as browserTIFF from './browser-tiff/encoder';
 import * as browserJP2 from './browser-jp2/encoder';
 import * as browserPDF from './browser-pdf/encoder';
 
-type ProcessorWorkerApi = import('./processor-worker').ProcessorWorkerApi;
-
 /** How long the worker should be idle before terminating. */
-const workerTimeout = 10000;
+const workerTimeout = 1000;
 
 interface ProcessingJobOptions {
   needsWorker?: boolean;
@@ -62,10 +61,7 @@ export default class Processor {
           // worker-loader does magic here.
           // @ts-ignore - Typescript doesn't know about the 2nd param to new Worker, and the
           // definition can't be overwritten.
-          this._worker = new Worker(
-            './processor-worker',
-            { name: 'processor-worker', type: 'module' },
-          ) as Worker;
+          this._worker = new Worker('./processor-worker.ts', { type: 'module' }) as Worker;
           // Need to do some TypeScript trickery to make the type match.
           this._workerApi = proxy(this._worker) as any as ProcessorWorkerApi;
         }
@@ -118,18 +114,12 @@ export default class Processor {
   }
 
   // Off main thread jobs:
+
   @Processor._processingJob({ needsWorker: true })
   imageQuant(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
     return this._workerApi!.quantize(data, opts);
   }
 
-  @Processor._processingJob({ needsWorker: true })
-  rotate(
-    data: ImageData, opts: import('./rotate/processor-meta').RotateOptions,
-  ): Promise<ImageData> {
-    return this._workerApi!.rotate(data, opts);
-  }
-
   @Processor._processingJob({ needsWorker: true })
   mozjpegEncode(
     data: ImageData, opts: MozJPEGEncoderOptions,

src/codecs/resize/options.tsx

@@ -1,7 +1,7 @@
 import { h, Component } from 'preact';
 import linkState from 'linkstate';
 import { bind, linkRef } from '../../lib/initial-util';
-import { inputFieldValueAsNumber, inputFieldValue, preventDefault } from '../../lib/util';
+import { inputFieldValueAsNumber, inputFieldValue } from '../../lib/util';
 import { ResizeOptions } from './processor-meta';
 import * as style from '../../components/Options/style.scss';
 import Checkbox from '../../components/checkbox';
@@ -78,7 +78,7 @@ export default class ResizerOptions extends Component<Props, State> {
 
   render({ options, isVector }: Props, { maintainAspect }: State) {
     return (
-      <form ref={linkRef(this, 'form')} class={style.optionsSection} onSubmit={preventDefault}>
+      <form ref={linkRef(this, 'form')} class={style.optionsSection}>
         <label class={style.optionTextFirst}>
           Method:
           <Select
@@ -135,7 +135,7 @@ export default class ResizerOptions extends Component<Props, State> {
                 onChange={this.onChange}
               >
                 <option value="stretch">Stretch</option>
-                <option value="contain">Contain</option>
+                <option value="cover">Cover</option>
               </Select>
             </label>
           }

src/codecs/resize/processor-meta.ts

@@ -4,7 +4,7 @@ export interface ResizeOptions {
   width: number;
   height: number;
   method: 'vector' | BitmapResizeMethods;
-  fitMethod: 'stretch' | 'contain';
+  fitMethod: 'stretch' | 'cover';
 }
 
 export interface BitmapResizeOptions extends ResizeOptions {

src/codecs/resize/processor.ts

@@ -1,7 +1,7 @@
 import { nativeResize, NativeResizeMethod, drawableToImageData } from '../../lib/util';
 import { BitmapResizeOptions, VectorResizeOptions } from './processor-meta';
 
-function getContainOffsets(sw: number, sh: number, dw: number, dh: number) {
+function getCoverOffsets(sw: number, sh: number, dw: number, dh: number) {
   const currentAspect = sw / sh;
   const endAspect = dw / dh;
 
@@ -22,8 +22,8 @@ export function resize(data: ImageData, opts: BitmapResizeOptions): ImageData {
   let sw = data.width;
   let sh = data.height;
 
-  if (opts.fitMethod === 'contain') {
-    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
+  if (opts.fitMethod === 'cover') {
+    ({ sx, sy, sw, sh } = getCoverOffsets(sw, sh, opts.width, opts.height));
   }
 
   return nativeResize(
@@ -38,8 +38,8 @@ export function vectorResize(data: HTMLImageElement, opts: VectorResizeOptions):
   let sw = data.width;
   let sh = data.height;
 
-  if (opts.fitMethod === 'contain') {
-    ({ sx, sy, sw, sh } = getContainOffsets(sw, sh, opts.width, opts.height));
+  if (opts.fitMethod === 'cover') {
+    ({ sx, sy, sw, sh } = getCoverOffsets(sw, sh, opts.width, opts.height));
   }
 
   return drawableToImageData(data, {

src/codecs/rotate/processor-meta.ts

@@ -1,12 +0,0 @@
-export interface RotateOptions {
-  rotate: 0 | 90 | 180 | 270;
-}
-
-export const defaultOptions: RotateOptions = { rotate: 0 };
-
-export interface RotateModuleInstance {
-  exports: {
-    memory: WebAssembly.Memory;
-    rotate(width: number, height: number, rotate: 0 | 90 | 180 | 270): void;
-  };
-}

src/codecs/rotate/processor.ts

@@ -1,43 +0,0 @@
-import wasmUrl from '../../../codecs/rotate/rotate.wasm';
-import { RotateOptions, RotateModuleInstance } from './processor-meta';
-
-// We are loading a 500B module here. Loading the code to feature-detect
-// `instantiateStreaming` probably takes longer to load than the time we save by
-// using `instantiateStreaming` in the first place. So let’s just use
-// `ArrayBuffer`s here.
-const instancePromise = fetch(wasmUrl)
-  .then(r => r.arrayBuffer())
-  .then(buf => WebAssembly.instantiate(buf));
-
-export async function rotate(
-  data: ImageData,
-  opts: RotateOptions,
-): Promise<ImageData> {
-  const { instance } = (await instancePromise) as {
-    instance: RotateModuleInstance;
-  };
-
-  // Number of wasm memory pages (á 64KiB) needed to store the image twice.
-  const bytesPerImage = data.width * data.height * 4;
-  const numPagesNeeded = Math.ceil((bytesPerImage * 2 + 8) / (64 * 1024));
-  // Only count full pages, just to be safe.
-  const numPagesAvailable = Math.floor(
-    instance.exports.memory.buffer.byteLength / (64 * 1024),
-  );
-  const additionalPagesToAllocate = numPagesNeeded - numPagesAvailable;
-
-  if (additionalPagesToAllocate > 0) {
-    instance.exports.memory.grow(additionalPagesToAllocate);
-  }
-  const view = new Uint8ClampedArray(instance.exports.memory.buffer);
-  view.set(data.data, 8);
-
-  instance.exports.rotate(data.width, data.height, opts.rotate);
-
-  const flipDimensions = opts.rotate % 180 !== 0;
-  return new ImageData(
-    view.slice(bytesPerImage + 8, bytesPerImage * 2 + 8),
-    flipDimensions ? data.height : data.width,
-    flipDimensions ? data.width : data.height,
-  );
-}

src/codecs/webp/options.tsx

@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 import { bind } from '../../lib/initial-util';
-import { inputFieldCheckedAsNumber, inputFieldValueAsNumber, preventDefault } from '../../lib/util';
+import { inputFieldCheckedAsNumber, inputFieldValueAsNumber } from '../../lib/util';
 import { EncodeOptions, WebPImageHint } from './encoder-meta';
 import * as style from '../../components/Options/style.scss';
 import Checkbox from '../../components/checkbox';
@@ -26,10 +26,8 @@ const losslessPresets:[number, number][] = [
 ];
 const losslessPresetDefault = 6;
 
-function determineLosslessQuality(quality: number, method: number): number {
-  const index = losslessPresets.findIndex(
-    ([presetMethod, presetQuality]) => presetMethod === method && presetQuality === quality,
-  );
+function determineLosslessQuality(quality: number): number {
+  const index = losslessPresets.findIndex(item => item[1] === quality);
   if (index !== -1) return index;
   // Quality doesn't match one of the presets.
   // This can happen when toggling 'lossless'.
@@ -47,7 +45,7 @@ export default class WebPEncoderOptions extends Component<Props, State> {
     const lossless = inputFieldCheckedAsNumber(form.lossless);
     const { options } = this.props;
     const losslessPresetValue = inputFieldValueAsNumber(
-      form.lossless_preset, determineLosslessQuality(options.quality, options.method),
+      form.lossless_preset, determineLosslessQuality(options.quality),
     );
 
     const newOptions: EncodeOptions = {
@@ -99,7 +97,7 @@ export default class WebPEncoderOptions extends Component<Props, State> {
             name="lossless_preset"
             min="0"
             max="9"
-            value={determineLosslessQuality(options.quality, options.method)}
+            value={determineLosslessQuality(options.quality)}
             onInput={this.onChange}
           >
             Effort:
@@ -319,7 +317,7 @@ 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} onSubmit={preventDefault}>
+      <form class={style.optionsSection}>
         <label class={style.optionInputFirst}>
           <Checkbox
             name="lossless"

src/components/App/custom-els/FileDrop/index.ts

@@ -0,0 +1,153 @@
+import { bind } from '../../../../lib/initial-util';
+import './styles.css';
+
+// tslint:disable-next-line:max-line-length
+function firstMatchingItem(list: DataTransferItemList, acceptVal: string): DataTransferItem | undefined {
+  // Split accepts values by ',' then by '/'. Trim everything & lowercase.
+  const accepts = acceptVal.toLowerCase().split(',').map((accept) => {
+    return accept.trim().split('/').map(part => part.trim());
+  }).filter(acceptParts => acceptParts.length === 2); // Filter invalid values
+
+  return Array.from(list).find((item) => {
+    if (item.kind !== 'file') return false;
+
+    // 'Parse' the type.
+    const [typeMain, typeSub] = item.type.toLowerCase().split('/').map(s => s.trim());
+
+    for (const [acceptMain, acceptSub] of accepts) {
+      // Look for an exact match, or a partial match if * is accepted, eg image/*.
+      if (typeMain === acceptMain && (acceptSub === '*' || typeSub === acceptSub)) {
+        return true;
+      }
+    }
+    return false;
+  });
+}
+
+function getFileData(data: DataTransfer, accept: string): File | undefined {
+  const dragDataItem = firstMatchingItem(data.items, accept);
+  if (!dragDataItem) return;
+
+  return dragDataItem.getAsFile() || undefined;
+}
+
+interface FileDropEventInit extends EventInit {
+  action: FileDropAccept;
+  file: File;
+}
+
+type FileDropAccept = 'drop' | 'paste';
+
+// Safari and Edge don't quite support extending Event, this works around it.
+function fixExtendedEvent(instance: Event, type: Function) {
+  if (!(instance instanceof type)) {
+    Object.setPrototypeOf(instance, type.prototype);
+  }
+}
+
+export class FileDropEvent extends Event {
+  private _action: FileDropAccept;
+  private _file: File;
+  constructor(typeArg: string, eventInitDict: FileDropEventInit) {
+    super(typeArg, eventInitDict);
+    fixExtendedEvent(this, FileDropEvent);
+    this._file = eventInitDict.file;
+    this._action = eventInitDict.action;
+  }
+
+  get action() {
+    return this._action;
+  }
+
+  get file() {
+    return this._file;
+  }
+}
+
+/*
+  Example Usage.
+  <file-drop
+    accept='image/*'
+    class='drop-valid|drop-invalid'
+  >
+   [everything in here is a drop target.]
+  </file-drop>
+
+  dropElement.addEventListner('dropfile', (event) => console.log(event.detail))
+*/
+export class FileDrop extends HTMLElement {
+
+  private _dragEnterCount = 0;
+
+  constructor() {
+    super();
+    this.addEventListener('dragover', event => event.preventDefault());
+    this.addEventListener('drop', this._onDrop);
+    this.addEventListener('dragenter', this._onDragEnter);
+    this.addEventListener('dragend', () => this._reset());
+    this.addEventListener('dragleave', this._onDragLeave);
+    this.addEventListener('paste', this._onPaste);
+  }
+
+  get accept() {
+    return this.getAttribute('accept') || '';
+  }
+
+  set accept(val: string) {
+    this.setAttribute('accept', val);
+  }
+
+  @bind
+  private _onDragEnter(event: DragEvent) {
+    this._dragEnterCount += 1;
+    if (this._dragEnterCount > 1) return;
+
+    // We don't have data, attempt to get it and if it matches, set the correct state.
+    const validDrop: boolean = event.dataTransfer.items.length ?
+      !!firstMatchingItem(event.dataTransfer.items, this.accept) :
+      // Safari doesn't give file information on drag enter, so the best we can do is return valid.
+      true;
+
+    if (validDrop) {
+      this.classList.add('drop-valid');
+    } else {
+      this.classList.add('drop-invalid');
+    }
+  }
+
+  @bind
+  private _onDragLeave() {
+    this._dragEnterCount -= 1;
+    if (this._dragEnterCount === 0) {
+      this._reset();
+    }
+  }
+
+  @bind
+  private _onDrop(event: DragEvent) {
+    event.preventDefault();
+    this._reset();
+    const action = 'drop';
+    const file = getFileData(event.dataTransfer, this.accept);
+    if (file === undefined) return;
+
+    this.dispatchEvent(new FileDropEvent('filedrop', { action, file }));
+  }
+
+  @bind
+  private _onPaste(event: ClipboardEvent) {
+    const action = 'paste';
+    const file = getFileData(event.clipboardData, this.accept);
+    if (file === undefined) return;
+
+    this.dispatchEvent(new FileDropEvent('filedrop', { action, file }));
+  }
+
+  private _reset() {
+    this._dragEnterCount = 0;
+    this.classList.remove('drop-valid');
+    this.classList.remove('drop-invalid');
+  }
+}
+
+customElements.define('file-drop', FileDrop);

src/components/App/custom-els/FileDrop/missing-types.d.ts

@@ -0,0 +1,19 @@
+import { FileDropEvent, FileDrop } from '.';
+
+declare global {
+
+  interface HTMLElementEventMap {
+    'filedrop': FileDropEvent;
+  }
+
+  namespace JSX {
+    interface IntrinsicElements {
+      'file-drop': FileDropAttributes;
+    }
+
+    interface FileDropAttributes extends HTMLAttributes {
+      accept?: string;
+      onfiledrop?: ((this: FileDrop, ev: FileDropEvent) => any) | null;
+    }
+  }
+}

src/components/App/custom-els/FileDrop/styles.css

@@ -0,0 +1,3 @@
+file-drop {
+  display: block;
+}

src/components/App/index.tsx

@@ -2,37 +2,31 @@ import { h, Component } from 'preact';
 
 import { bind, linkRef, Fileish } from '../../lib/initial-util';
 import * as style from './style.scss';
-import { FileDropEvent } from 'file-drop-element';
-import 'file-drop-element';
-import SnackBarElement, { SnackOptions } from '../../lib/SnackBar';
+import { FileDropEvent } from './custom-els/FileDrop';
+import './custom-els/FileDrop';
+import SnackBarElement from '../../lib/SnackBar';
 import '../../lib/SnackBar';
 import Intro from '../intro';
 import '../custom-els/LoadingSpinner';
 
-const ROUTE_EDITOR = '/editor';
+// This is imported for TypeScript only. It isn't used.
+import Compress from '../compress';
 
-const compressPromise = import(
-  /* webpackChunkName: "main-app" */
-  '../compress');
-const offlinerPromise = import(
-  /* webpackChunkName: "offliner" */
-  '../../lib/offliner');
-
-function back() {
-  window.history.back();
+export interface SourceImage {
+  file: File | Fileish;
+  data: ImageData;
+  vectorImage?: HTMLImageElement;
 }
 
 interface Props {}
 
 interface State {
   file?: File | Fileish;
-  isEditorOpen: Boolean;
-  Compress?: typeof import('../compress').default;
+  Compress?: typeof Compress;
 }
 
 export default class App extends Component<Props, State> {
   state: State = {
-    isEditorOpen: false,
     file: undefined,
     Compress: undefined,
   };
@@ -42,75 +36,49 @@ export default class App extends Component<Props, State> {
   constructor() {
     super();
 
-    compressPromise.then((module) => {
+    import('../compress').then((module) => {
       this.setState({ Compress: module.default });
     }).catch(() => {
-      this.showSnack('Failed to load app');
+      this.showError('Failed to load app');
     });
 
-    offlinerPromise.then(({ offliner }) => offliner(this.showSnack));
-
     // In development, persist application state across hot reloads:
     if (process.env.NODE_ENV === 'development') {
       this.setState(window.STATE);
       const oldCDU = this.componentDidUpdate;
-      this.componentDidUpdate = (props, state, prev) => {
-        if (oldCDU) oldCDU.call(this, props, state, prev);
+      this.componentDidUpdate = (props, state) => {
+        if (oldCDU) oldCDU.call(this, props, state);
         window.STATE = this.state;
       };
     }
-
-    // Since iOS 10, Apple tries to prevent disabling pinch-zoom. This is great in theory, but
-    // really breaks things on Squoosh, as you can easily end up zooming the UI when you mean to
-    // zoom the image. Once you've done this, it's really difficult to undo. Anyway, this seems to
-    // prevent it.
-    document.body.addEventListener('gesturestart', (event) => {
-      event.preventDefault();
-    });
-
-    window.addEventListener('popstate', this.onPopState);
   }
 
   @bind
-  private onFileDrop({ files }: FileDropEvent) {
-    if (!files || files.length === 0) return;
-    const file = files[0];
-    this.openEditor();
+  private onFileDrop(event: FileDropEvent) {
+    const { file } = event;
+    if (!file) return;
     this.setState({ file });
   }
 
   @bind
   private onIntroPickFile(file: File | Fileish) {
-    this.openEditor();
     this.setState({ file });
   }
 
   @bind
-  private showSnack(message: string, options: SnackOptions = {}): Promise<string> {
+  private showError(error: string) {
     if (!this.snackbar) throw Error('Snackbar missing');
-    return this.snackbar.showSnackbar(message, options);
+    this.snackbar.showSnackbar({ message: error });
   }
 
-  @bind
-  private onPopState() {
-    this.setState({ isEditorOpen: location.pathname === ROUTE_EDITOR });
-  }
-
-  @bind
-  private openEditor() {
-    if (this.state.isEditorOpen) return;
-    history.pushState(null, '', ROUTE_EDITOR);
-    this.setState({ isEditorOpen: true });
-  }
-
-  render({}: Props, { file, isEditorOpen, Compress }: State) {
+  render({}: Props, { file, Compress }: State) {
     return (
       <div id="app" class={style.app}>
         <file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
-          {!isEditorOpen
-            ? <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
+          {(!file)
+            ? <Intro onFile={this.onIntroPickFile} onError={this.showError} />
             : (Compress)
-              ? <Compress file={file!} showSnack={this.showSnack} onBack={back} />
+              ? <Compress file={file} onError={this.showError} />
               : <loading-spinner class={style.appLoader}/>
           }
           <snack-bar ref={linkRef(this, 'snackbar')} />

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';
@@ -35,14 +35,15 @@ import {
 import { QuantizeOptions } from '../../codecs/imagequant/processor-meta';
 import { ResizeOptions } from '../../codecs/resize/processor-meta';
 import { PreprocessorState } from '../../codecs/preprocessors';
-import { SourceImage } from '../compress';
+import FileSize from './FileSize';
+import { DownloadIcon } from '../../lib/icons';
+import { SourceImage } from '../App';
 import Checkbox from '../checkbox';
 import Expander from '../expander';
 import Select from '../select';
+import '../custom-els/LoadingSpinner';
 
-const encoderOptionsComponentMap: {
-  [x: string]: (new (...args: any[]) => Component<any, any>) | undefined;
-} = {
+const encoderOptionsComponentMap = {
   [identity.type]: undefined,
   [optiPNG.type]: OptiPNGEncoderOptions,
   [mozJPEG.type]: MozJpegEncoderOptions,
@@ -59,31 +60,57 @@ const encoderOptionsComponentMap: {
 };
 
 interface Props {
-  mobileView: boolean;
+  orientation: 'horizontal' | 'vertical';
+  loading: boolean;
   source?: SourceImage;
+  imageIndex: number;
+  imageFile?: Fileish;
+  downloadUrl?: string;
   encoderState: EncoderState;
   preprocessorState: PreprocessorState;
   onEncoderTypeChange(newType: EncoderType): void;
   onEncoderOptionsChange(newOptions: EncoderOptions): void;
   onPreprocessorOptionsChange(newOptions: PreprocessorState): void;
+  onCopyToOtherClick(): void;
 }
 
 interface State {
   encoderSupportMap?: EncoderSupportMap;
+  showLoadingState: boolean;
 }
 
+const loadingReactionDelay = 500;
+
 export default class Options extends Component<Props, State> {
   state: State = {
     encoderSupportMap: undefined,
+    showLoadingState: false,
   };
 
+  /** The timeout ID between entering the loading state, and changing UI */
+  private loadingTimeoutId: number = 0;
+
   constructor() {
     super();
     encodersSupported.then(encoderSupportMap => this.setState({ encoderSupportMap }));
   }
 
+  componentDidUpdate(prevProps: Props, prevState: State) {
+    if (prevProps.loading && !this.props.loading) {
+      // Just stopped loading
+      clearTimeout(this.loadingTimeoutId);
+      this.setState({ showLoadingState: false });
+    } else if (!prevProps.loading && this.props.loading) {
+      // Just started loading
+      this.loadingTimeoutId = self.setTimeout(
+        () => this.setState({ showLoadingState: true }),
+        loadingReactionDelay,
+      );
+    }
+  }
+
   @bind
-  private onEncoderTypeChange(event: Event) {
+  onEncoderTypeChange(event: Event) {
     const el = event.currentTarget as HTMLSelectElement;
 
     // The select element only has values matching encoder types,
@@ -93,7 +120,7 @@ export default class Options extends Component<Props, State> {
   }
 
   @bind
-  private onPreprocessorEnabledChange(event: Event) {
+  onPreprocessorEnabledChange(event: Event) {
     const el = event.currentTarget as HTMLInputElement;
     const preprocessor = el.name.split('.')[0] as keyof PreprocessorState;
 
@@ -103,33 +130,43 @@ export default class Options extends Component<Props, State> {
   }
 
   @bind
-  private onQuantizerOptionsChange(opts: QuantizeOptions) {
+  onQuantizerOptionsChange(opts: QuantizeOptions) {
     this.props.onPreprocessorOptionsChange(
       cleanMerge(this.props.preprocessorState, 'quantizer', opts),
     );
   }
 
   @bind
-  private onResizeOptionsChange(opts: ResizeOptions) {
+  onResizeOptionsChange(opts: ResizeOptions) {
     this.props.onPreprocessorOptionsChange(
       cleanMerge(this.props.preprocessorState, 'resize', opts),
     );
   }
 
+  @bind
+  onCopyToOtherClick(event: Event) {
+    event.preventDefault();
+    this.props.onCopyToOtherClick();
+  }
+
   render(
     {
       source,
+      imageIndex,
+      imageFile,
+      downloadUrl,
+      orientation,
       encoderState,
       preprocessorState,
       onEncoderOptionsChange,
     }: Props,
-    { encoderSupportMap }: State,
+    { encoderSupportMap, showLoadingState }: State,
   ) {
     // tslint:disable variable-name
     const EncoderOptionComponent = encoderOptionsComponentMap[encoderState.type];
 
     return (
-      <div class={style.optionsScroller}>
+      <div class={style.options}>
         <Expander>
           {encoderState.type === identity.type ? null :
             <div>
@@ -146,7 +183,7 @@ export default class Options extends Component<Props, State> {
                 {preprocessorState.resize.enabled ?
                   <ResizeOptionsComponent
                     isVector={Boolean(source && source.vectorImage)}
-                    aspect={source ? source.processed.width / source.processed.height : 1}
+                    aspect={source ? (source.data.width / source.data.height) : 1}
                     options={preprocessorState.resize}
                     onChange={this.onResizeOptionsChange}
                   />
@@ -174,30 +211,67 @@ export default class Options extends Component<Props, State> {
 
         <h3 class={style.optionsTitle}>Compress</h3>
 
-        <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>
+        <div class={style.optionsScroller}>
+          <section class={`${style.optionOneCell} ${style.optionsSection}`}>
+            {encoderSupportMap ?
+              <Select value={encoderState.type} onChange={this.onEncoderTypeChange} large>
+                {encoders.filter(encoder => encoderSupportMap[encoder.type]).map(encoder => (
+                  <option value={encoder.type}>{encoder.label}</option>
+                ))}
+              </Select>
+              :
+              <Select large><option>Loading…</option></Select>
+            }
+          </section>
+
+          <Expander>
+            {EncoderOptionComponent ?
+              <EncoderOptionComponent
+                options={
+                  // Casting options, as encoderOptionsComponentMap[encodeData.type] ensures
+                  // the correct type, but typescript isn't smart enough.
+                  encoderState.options as any
+                }
+                onChange={onEncoderOptionsChange}
+              />
+            : null}
+          </Expander>
+        </div>
+
+        <div class={style.optionsCopy}>
+          <button onClick={this.onCopyToOtherClick} class={style.copyButton}>
+            {imageIndex === 1 && '← '}
+            Copy settings across
+            {imageIndex === 0 && ' →'}
+          </button>
+        </div>
+
+        <div class={style.results}>
+          <div class={style.resultData}>
+            {!imageFile || showLoadingState ? 'Working…' :
+              <FileSize
+                blob={imageFile}
+                compareTo={(source && imageFile !== source.file) ? source.file : undefined}
+              />
+            }
+          </div>
+
+          <div class={style.download}>
+            {(downloadUrl && imageFile) && (
+              <a
+                class={`${style.downloadLink} ${showLoadingState ? style.downloadLinkDisable : ''}`}
+                href={downloadUrl}
+                download={imageFile.name}
+                title="Download"
+              >
+                <DownloadIcon class={style.downloadIcon} />
+              </a>
+            )}
+            {showLoadingState && <loading-spinner class={style.spinner} />}
+          </div>
+
+        </div>
 
-        <Expander>
-          {EncoderOptionComponent ?
-            <EncoderOptionComponent
-              options={
-                // Casting options, as encoderOptionsComponentMap[encodeData.type] ensures
-                // the correct type, but typescript isn't smart enough.
-                encoderState.options as any
-              }
-              onChange={onEncoderOptionsChange}
-            />
-          : null}
-        </Expander>
       </div>
     );
   }

src/components/Options/style.scss

@@ -1,5 +1,15 @@
 $horizontalPadding: 15px;
 
+.options {
+  color: #fff;
+  width: 300px;
+  opacity: 0.9;
+  font-size: 1.2rem;
+  max-height: 100%;
+  display: flex;
+  flex-flow: column;
+}
+
 .options-title {
   background: rgba(0, 0, 0, 0.9);
   margin: 0;
@@ -43,7 +53,6 @@ $horizontalPadding: 15px;
 
 .text-field {
   background: #fff;
-  color: #000;
   font: inherit;
   border: none;
   padding: 2px 0 2px 10px;
@@ -55,5 +64,103 @@ $horizontalPadding: 15px;
 .options-scroller {
   overflow-x: hidden;
   overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
+}
+
+.results {
+  display: grid;
+  grid-template-columns: 1fr auto;
+  background: rgba(0, 0, 0, 0.9);
+  font-size: 1.4rem;
+}
+
+.result-data {
+  display: flex;
+  align-items: center;
+  padding: 0 $horizontalPadding;
+}
+
+.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;
+}
+
+.options-copy {
+  display: grid;
+  background: rgba(0, 0, 0, 0.9);
+  padding: 5px;
+}
+
+.copy-button {
+  composes: unbutton from '../../lib/util.scss';
+  background: #484848;
+  border-radius: 4px;
+  color: #fff;
+  text-align: left;
+  padding: 5px 10px;
+}
+
+@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;
+  }
+}
+
+.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/Output/custom-els/PinchZoom/index.ts

@@ -1,5 +1,5 @@
-import PointerTracker, { Pointer } from 'pointer-tracker';
 import './styles.css';
+import { PointerTracker, Pointer } from '../../../../lib/PointerTracker';
 
 interface Point {
   clientX: number;
@@ -242,7 +242,7 @@ export default class PinchZoom extends HTMLElement {
   /**
    * Update transform values without checking bounds. This is only called in setTransform.
    */
-  private _updateTransform(scale: number, x: number, y: number, allowChangeEvent: boolean) {
+  _updateTransform(scale: number, x: number, y: number, allowChangeEvent: boolean) {
     // Avoid scaling to zero
     if (scale < MIN_SCALE) return;
 

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

@@ -1,5 +1,5 @@
-import PointerTracker, { Pointer } from 'pointer-tracker';
 import * as styles from './styles.css';
+import { PointerTracker, Pointer } from '../../../../lib/PointerTracker';
 
 const legacyClipCompatAttr = 'legacy-clip-compat';
 const orientationAttr = 'orientation';
@@ -70,13 +70,12 @@ export default class TwoUp extends HTMLElement {
   connectedCallback() {
     this._childrenChange();
 
-    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>`;
-
     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

@@ -56,7 +56,7 @@ two-up[legacy-clip-compat] > :not(.two-up-handle) {
   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);
+  padding: 0 48%;
 }
 
 .scrubber svg {

src/components/Output/index.tsx

@@ -5,29 +5,16 @@ import './custom-els/TwoUp';
 import * as style from './style.scss';
 import { bind, linkRef } from '../../lib/initial-util';
 import { shallowEqual, drawDataToCanvas } from '../../lib/util';
-import {
-    ToggleBackgroundIcon,
-    AddIcon,
-    RemoveIcon,
-    BackIcon,
-    ToggleBackgroundActiveIcon,
-    RotateIcon,
-} from '../../lib/icons';
+import { ToggleIcon, AddIcon, RemoveIcon } from '../../lib/icons';
 import { twoUpHandle } from './custom-els/TwoUp/styles.css';
-import { InputProcessorState } from '../../codecs/input-processors';
-import { cleanSet } from '../../lib/clean-modify';
-import { SourceImage } from '../compress';
 
 interface Props {
-  source?: SourceImage;
-  inputProcessorState?: InputProcessorState;
-  mobileView: boolean;
+  originalImage?: ImageData;
+  orientation: 'horizontal' | 'vertical';
   leftCompressed?: ImageData;
   rightCompressed?: ImageData;
   leftImgContain: boolean;
   rightImgContain: boolean;
-  onBack: () => void;
-  onInputProcessorChange: (newState: InputProcessorState) => void;
 }
 
 interface State {
@@ -60,15 +47,6 @@ export default class Output extends Component<Props, State> {
     const leftDraw = this.leftDrawable();
     const rightDraw = this.rightDrawable();
 
-    // Reset the pinch zoom, which may have an position set from the previous view, after pressing
-    // the back button.
-    this.pinchZoomLeft!.setTransform({
-      allowChangeEvent: true,
-      x: 0,
-      y: 0,
-      scale: 1,
-    });
-
     if (this.canvasLeft && leftDraw) {
       drawDataToCanvas(this.canvasLeft, leftDraw);
     }
@@ -82,38 +60,6 @@ export default class Output extends Component<Props, State> {
     const prevRightDraw = this.rightDrawable(prevProps);
     const leftDraw = this.leftDrawable();
     const rightDraw = this.rightDrawable();
-    const sourceFileChanged =
-      // Has the value become (un)defined?
-      (!!this.props.source !== !!prevProps.source) ||
-      // Or has the file changed?
-      (this.props.source && prevProps.source && this.props.source.file !== prevProps.source.file);
-
-    const oldSourceData = prevProps.source && prevProps.source.processed;
-    const newSourceData = this.props.source && this.props.source.processed;
-    const pinchZoom = this.pinchZoomLeft!;
-
-    if (sourceFileChanged) {
-      // New image? Reset the pinch-zoom.
-      pinchZoom.setTransform({
-        allowChangeEvent: true,
-        x: 0,
-        y: 0,
-        scale: 1,
-      });
-    } else if (oldSourceData && newSourceData && oldSourceData !== newSourceData) {
-      // Since the pinch zoom transform origin is the top-left of the content, we need to flip
-      // things around a bit when the content size changes, so the new content appears as if it were
-      // central to the previous content.
-      const scaleChange = 1 - pinchZoom.scale;
-      const oldXScaleOffset = oldSourceData.width / 2 * scaleChange;
-      const oldYScaleOffset = oldSourceData.height / 2 * scaleChange;
-
-      pinchZoom.setTransform({
-        allowChangeEvent: true,
-        x: pinchZoom.x - oldXScaleOffset + oldYScaleOffset,
-        y: pinchZoom.y - oldYScaleOffset + oldXScaleOffset,
-      });
-    }
 
     if (leftDraw && leftDraw !== prevLeftDraw && this.canvasLeft) {
       drawDataToCanvas(this.canvasLeft, leftDraw);
@@ -121,6 +67,16 @@ export default class Output extends Component<Props, State> {
     if (rightDraw && rightDraw !== prevRightDraw && this.canvasRight) {
       drawDataToCanvas(this.canvasRight, rightDraw);
     }
+
+    if (this.props.originalImage !== prevProps.originalImage && this.pinchZoomLeft) {
+      // New image? Reset the pinch-zoom.
+      this.pinchZoomLeft.setTransform({
+        allowChangeEvent: true,
+        x: 0,
+        y: 0,
+        scale: 1,
+      });
+    }
   }
 
   shouldComponentUpdate(nextProps: Props, nextState: State) {
@@ -128,11 +84,11 @@ export default class Output extends Component<Props, State> {
   }
 
   private leftDrawable(props: Props = this.props): ImageData | undefined {
-    return props.leftCompressed || (props.source && props.source.processed);
+    return props.leftCompressed || props.originalImage;
   }
 
   private rightDrawable(props: Props = this.props): ImageData | undefined {
-    return props.rightCompressed || (props.source && props.source.processed);
+    return props.rightCompressed || props.originalImage;
   }
 
   @bind
@@ -156,20 +112,6 @@ export default class Output extends Component<Props, State> {
     this.pinchZoomLeft.scaleTo(this.state.scale / 1.25, scaleToOpts);
   }
 
-  @bind
-  private onRotateClick() {
-    const { inputProcessorState } = this.props;
-    if (!inputProcessorState) return;
-
-    const newState = cleanSet(
-      inputProcessorState,
-      'rotate.rotate',
-      (inputProcessorState.rotate.rotate + 90) % 360,
-    );
-
-    this.props.onInputProcessorChange(newState);
-  }
-
   @bind
   private onScaleValueFocus() {
     this.setState({ editingScale: true }, () => {
@@ -235,34 +177,24 @@ export default class Output extends Component<Props, State> {
     const clonedEvent = new (event.constructor as typeof Event)(event.type, event);
     this.retargetedEvents.add(clonedEvent);
     this.pinchZoomLeft.dispatchEvent(clonedEvent);
-
-    // Unfocus any active element on touchend. This fixes an issue on (at least) Android Chrome,
-    // where the software keyboard is hidden, but the input remains focused, then after interaction
-    // with this element the keyboard reappears for NO GOOD REASON. Thanks Android.
-    if (
-      event.type === 'touchend' &&
-      document.activeElement &&
-      document.activeElement instanceof HTMLElement
-    ) {
-      document.activeElement.blur();
-    }
   }
 
   render(
-    { mobileView, leftImgContain, rightImgContain, source, onBack }: Props,
+    {
+      orientation, leftCompressed, rightCompressed, leftImgContain, rightImgContain,
+      originalImage,
+    }: Props,
     { scale, editingScale, altBackground }: State,
   ) {
     const leftDraw = this.leftDrawable();
     const rightDraw = this.rightDrawable();
-    // To keep position stable, the output is put in a square using the longest dimension.
-    const originalImage = source && source.processed;
 
     return (
       <div class={`${style.output} ${altBackground ? style.altBackground : ''}`}>
         <two-up
           legacy-clip-compat
           class={style.twoUp}
-          orientation={mobileView ? 'vertical' : 'horizontal'}
+          orientation={orientation}
           // Event redirecting. See onRetargetableEvent.
           onTouchStartCapture={this.onRetargetableEvent}
           onTouchEndCapture={this.onRetargetableEvent}
@@ -277,7 +209,7 @@ export default class Output extends Component<Props, State> {
             ref={linkRef(this, 'pinchZoomLeft')}
           >
             <canvas
-              class={style.pinchTarget}
+              class={style.outputCanvas}
               ref={linkRef(this, 'canvasLeft')}
               width={leftDraw && leftDraw.width}
               height={leftDraw && leftDraw.height}
@@ -290,7 +222,7 @@ export default class Output extends Component<Props, State> {
           </pinch-zoom>
           <pinch-zoom class={style.pinchZoom} ref={linkRef(this, 'pinchZoomRight')}>
             <canvas
-              class={style.pinchTarget}
+              class={style.outputCanvas}
               ref={linkRef(this, 'canvasRight')}
               width={rightDraw && rightDraw.width}
               height={rightDraw && rightDraw.height}
@@ -303,12 +235,6 @@ export default class Output extends Component<Props, State> {
           </pinch-zoom>
         </two-up>
 
-        <div class={style.back}>
-          <button class={style.button} onClick={onBack}>
-            <BackIcon />
-          </button>
-        </div>
-
         <div class={style.controls}>
           <div class={style.zoomControls}>
             <button class={style.button} onClick={this.zoomOut}>
@@ -336,21 +262,10 @@ export default class Output extends Component<Props, State> {
               <AddIcon />
             </button>
           </div>
-          <div class={style.buttonsNoWrap}>
-            <button class={style.button} onClick={this.onRotateClick} title="Rotate image">
-              <RotateIcon />
-            </button>
-            <button
-              class={`${style.button} ${altBackground ? style.active : ''}`}
-              onClick={this.toggleBackground}
-              title="Change canvas color"
-            >
-              {altBackground
-                ? <ToggleBackgroundActiveIcon />
-                : <ToggleBackgroundIcon />
-              }
-            </button>
-          </div>
+          <button class={style.button} onClick={this.toggleBackground}>
+            <ToggleIcon />
+            Toggle Background
+          </button>
         </div>
       </div>
     );

src/components/Output/style.scss

@@ -1,3 +1,7 @@
+/*
+Note: These styles are temporary. They will be replaced before going live.
+*/
+
 .output {
   composes: abs-fill from '../../lib/util.scss';
 
@@ -31,15 +35,6 @@
   align-items: center;
 }
 
-.pinch-target {
-  // This fixes a severe painting bug in Chrome.
-  // We should try to remove this once the issue is fixed.
-  // https://bugs.chromium.org/p/chromium/issues/detail?id=870222#c10
-  will-change: auto;
-  // Prevent the image becoming misshapen due to default flexbox layout.
-  flex-shrink: 0;
-}
-
 .controls {
   position: absolute;
   display: flex;
@@ -47,24 +42,16 @@
   top: 0;
   left: 0;
   right: 0;
-  padding: 9px 84px;
+  padding: 9px;
   overflow: hidden;
   flex-wrap: wrap;
   contain: content;
 
-  // Allow clicks to fall through to the pinch zoom area
-  pointer-events: none;
-  & > * {
-    pointer-events: auto;
-  }
-
   @media (min-width: 860px) {
-    padding: 9px;
     top: auto;
     left: 320px;
     right: 320px;
     bottom: 0;
-    flex-wrap: wrap-reverse;
   }
 }
 
@@ -89,20 +76,14 @@
   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;
-  height: 36px;
-  padding: 0 8px;
-  cursor: pointer;
-
-  @media (min-width: 600px) {
-    height: 48px;
-    padding: 0 16px;
-  }
 
   &:focus {
     box-shadow: 0 0 0 2px var(--button-fg);
@@ -112,20 +93,15 @@
 }
 
 .button {
+  text-transform: uppercase;
   color: var(--button-fg);
+  cursor: pointer;
+  text-indent: 6px;
+  font-size: 110%;
 
   &:hover {
     background-color: #eee;
   }
-
-  &.active {
-    background: #34B9EB;
-    color: #fff;
-
-    &:hover {
-      background: #32a3ce;
-    }
-  }
 }
 
 .zoom {
@@ -149,18 +125,6 @@
   border-bottom: 1px dashed #999;
 }
 
-.back {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 9px;
-}
-
-.buttons-no-wrap {
-  display: flex;
-  pointer-events: none;
-
-  & > * {
-    pointer-events: auto;
-  }
+.output-canvas {
+  flex-shrink: 0;
 }

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,40 +24,32 @@ 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';
-import { ExpandIcon, CopyAcrossIconProps } from '../../lib/icons';
-import SnackBarElement from '../../lib/SnackBar';
-import { InputProcessorState, defaultInputProcessorState } from '../../codecs/input-processors';
+
+type Orientation = 'horizontal' | 'vertical';
 
 export interface SourceImage {
   file: File | Fileish;
-  decoded: ImageData;
-  processed: ImageData;
+  data: ImageData;
   vectorImage?: HTMLImageElement;
-  inputProcessorState: InputProcessorState;
 }
 
-interface SideSettings {
-  preprocessorState: PreprocessorState;
-  encoderState: EncoderState;
-}
-
-interface Side {
+interface EncodedImage {
   preprocessed?: ImageData;
   file?: Fileish;
   downloadUrl?: string;
   data?: ImageData;
-  latestSettings: SideSettings;
-  encodedSettings?: SideSettings;
+  preprocessorState: PreprocessorState;
+  encoderState: EncoderState;
   loading: boolean;
   /** Counter of the latest bmp currently encoding */
   loadingCounter: number;
@@ -67,45 +59,29 @@ interface Side {
 
 interface Props {
   file: File | Fileish;
-  showSnack: SnackBarElement['showSnackbar'];
-  onBack: () => void;
+  onError: (msg: string) => void;
 }
 
 interface State {
   source?: SourceImage;
-  sides: [Side, Side];
+  images: [EncodedImage, EncodedImage];
   /** Source image load */
   loading: boolean;
   loadingCounter: number;
   error?: string;
-  mobileView: boolean;
+  orientation: Orientation;
 }
 
 interface UpdateImageOptions {
   skipPreprocessing?: boolean;
 }
 
-async function processInput(
-  data: ImageData,
-  inputProcessData: InputProcessorState,
-  processor: Processor,
-) {
-  let processedData = data;
-
-  if (inputProcessData.rotate.rotate !== 0) {
-    processedData = await processor.rotate(processedData, inputProcessData.rotate);
-  }
-
-  return processedData;
-}
-
 async function preprocessImage(
   source: SourceImage,
   preprocessData: PreprocessorState,
   processor: Processor,
 ): Promise<ImageData> {
-  let result = source.processed;
-
+  let result = source.data;
   if (preprocessData.resize.enabled) {
     if (preprocessData.resize.method === 'vector' && source.vectorImage) {
       result = processor.vectorResize(
@@ -154,26 +130,6 @@ async function compressImage(
   );
 }
 
-function stateForNewSourceData(state: State, newSource: SourceImage): State {
-  let newState = { ...state };
-
-  for (const i of [0, 1]) {
-    // Ditch previous encodings
-    const downloadUrl = state.sides[i].downloadUrl;
-    if (downloadUrl) URL.revokeObjectURL(downloadUrl);
-
-    newState = cleanMerge(state, `sides.${i}`, {
-      preprocessed: undefined,
-      file: undefined,
-      downloadUrl: undefined,
-      data: undefined,
-      encodedSettings: undefined,
-    });
-  }
-
-  return newState;
-}
-
 async function processSvg(blob: Blob): Promise<HTMLImageElement> {
   // Firefox throws if you try to draw an SVG to canvas that doesn't have width/height.
   // In Chrome it loads, but drawImage behaves weirdly.
@@ -181,7 +137,7 @@ async function processSvg(blob: Blob): Promise<HTMLImageElement> {
   const parser = new DOMParser();
   const text = await blobToText(blob);
   const document = parser.parseFromString(text, 'image/svg+xml');
-  const svg = document.documentElement!;
+  const svg = document.documentElement;
 
   if (svg.hasAttribute('width') && svg.hasAttribute('height')) {
     return blobToImg(blob);
@@ -199,66 +155,50 @@ 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'];
-// These are only used in the desktop view
-const buttonPositions =
-  ['download-left', 'download-right'] as ('download-left' | 'download-right')[];
-
-const originalDocumentTitle = document.title;
-
 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,
-    sides: [
+    images: [
       {
-        latestSettings: {
-          preprocessorState: defaultPreprocessorState,
-          encoderState: { type: identity.type, options: identity.defaultOptions },
-        },
+        preprocessorState: defaultPreprocessorState,
+        encoderState: { type: identity.type, options: identity.defaultOptions },
         loadingCounter: 0,
         loadedCounter: 0,
         loading: false,
       },
       {
-        latestSettings: {
-          preprocessorState: defaultPreprocessorState,
-          encoderState: { type: mozJPEG.type, options: mozJPEG.defaultOptions },
-        },
+        preprocessorState: defaultPreprocessorState,
+        encoderState: { type: mozJPEG.type, options: mozJPEG.defaultOptions },
         loadingCounter: 0,
         loadedCounter: 0,
         loading: false,
       },
     ],
-    mobileView: this.widthQuery.matches,
+    orientation: this.widthQuery.matches ? 'horizontal' : 'vertical',
   };
 
   private readonly encodeCache = new ResultCache();
   private readonly leftProcessor = new Processor();
   private readonly rightProcessor = new Processor();
-  // For debouncing calls to updateImage for each side.
-  private readonly updateImageTimeoutIds: [number?, number?] = [undefined, undefined];
 
   constructor(props: Props) {
     super(props);
     this.widthQuery.addListener(this.onMobileWidthChange);
     this.updateFile(props.file);
-
-    import('../../lib/offliner').then(({ mainAppLoaded }) => mainAppLoaded());
   }
 
   @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 {
     this.setState({
-      sides: cleanSet(this.state.sides, `${index}.latestSettings.encoderState`, {
+      images: cleanSet(this.state.images, `${index}.encoderState`, {
         type: newType,
         options: encoderMap[newType].defaultOptions,
       }),
@@ -267,137 +207,55 @@ export default class Compress extends Component<Props, State> {
 
   private onPreprocessorOptionsChange(index: 0 | 1, options: PreprocessorState): void {
     this.setState({
-      sides: cleanSet(this.state.sides, `${index}.latestSettings.preprocessorState`, options),
+      images: cleanSet(this.state.images, `${index}.preprocessorState`, options),
     });
   }
 
   private onEncoderOptionsChange(index: 0 | 1, options: EncoderOptions): void {
     this.setState({
-      sides: cleanSet(this.state.sides, `${index}.latestSettings.encoderState.options`, options),
+      images: cleanSet(this.state.images, `${index}.encoderState.options`, options),
     });
   }
 
-  private updateDocumentTitle(filename: string = ''): void {
-    document.title = filename ? `${filename} - ${originalDocumentTitle}` : originalDocumentTitle;
-  }
-
   componentWillReceiveProps(nextProps: Props): void {
     if (nextProps.file !== this.props.file) {
       this.updateFile(nextProps.file);
     }
   }
 
-  componentWillUnmount(): void {
-    this.updateDocumentTitle();
-  }
-
   componentDidUpdate(prevProps: Props, prevState: State): void {
-    const { source, sides } = this.state;
+    const { source, images } = this.state;
 
-    const sourceDataChanged =
-      // Has the source object become set/unset?
-      !!source !== !!prevState.source ||
-      // Or has the processed data changed?
-      (source && prevState.source && source.processed !== prevState.source.processed);
-
-    for (const [i, side] of sides.entries()) {
-      const prevSettings = prevState.sides[i].latestSettings;
-      const encoderChanged = side.latestSettings.encoderState !== prevSettings.encoderState;
-      const preprocessorChanged =
-        side.latestSettings.preprocessorState !== prevSettings.preprocessorState;
+    for (const [i, image] of images.entries()) {
+      const prevImage = prevState.images[i];
+      const sourceChanged = source !== prevState.source;
+      const encoderChanged = image.encoderState !== prevImage.encoderState;
+      const preprocessorChanged = image.preprocessorState !== prevImage.preprocessorState;
 
       // The image only needs updated if the encoder/preprocessor settings have changed, or the
       // source has changed.
-      if (sourceDataChanged || encoderChanged || preprocessorChanged) {
-        this.queueUpdateImage(i, {
-          skipPreprocessing: !sourceDataChanged && !preprocessorChanged,
+      if (sourceChanged || encoderChanged || preprocessorChanged) {
+        if (prevImage.downloadUrl) URL.revokeObjectURL(prevImage.downloadUrl);
+        this.updateImage(i, {
+          skipPreprocessing: !sourceChanged && !preprocessorChanged,
+        }).catch((err) => {
+          console.error(err);
         });
       }
     }
   }
 
-  private async onCopyToOtherClick(index: 0 | 1) {
+  private onCopyToOtherClick(index: 0 | 1) {
     const otherIndex = (index + 1) % 2;
-    const oldSettings = this.state.sides[otherIndex];
-    const newSettings = { ...this.state.sides[index] };
-
-    // Create a new object URL for the new settings. This avoids both sides sharing a URL, which
-    // means it can be safely revoked without impacting the other side.
-    if (newSettings.file) newSettings.downloadUrl = URL.createObjectURL(newSettings.file);
 
     this.setState({
-      sides: cleanSet(this.state.sides, otherIndex, newSettings),
+      images: cleanSet(this.state.images, otherIndex, this.state.images[index]),
     });
-
-    const result = await this.props.showSnack('Settings copied across', {
-      timeout: 5000,
-      actions: ['undo', 'dismiss'],
-    });
-
-    if (result !== 'undo') return;
-
-    this.setState({
-      sides: cleanSet(this.state.sides, otherIndex, oldSettings),
-    });
-  }
-
-  @bind
-  private async onInputProcessorChange(options: InputProcessorState): Promise<void> {
-    const source = this.state.source;
-    if (!source) return;
-
-    const oldRotate = source.inputProcessorState.rotate.rotate;
-    const newRotate = options.rotate.rotate;
-    const orientationChanged = oldRotate % 180 !== newRotate % 180;
-    const loadingCounter = this.state.loadingCounter + 1;
-    // Either processor is good enough here.
-    const processor = this.leftProcessor;
-
-    this.setState({
-      loadingCounter, loading: true,
-      source: cleanSet(source, 'inputProcessorState', options),
-    });
-
-    // Abort any current encode jobs, as they're redundant now.
-    this.leftProcessor.abortCurrent();
-    this.rightProcessor.abortCurrent();
-
-    try {
-      const processed = await processInput(source.decoded, options, processor);
-
-      // Another file has been opened/processed before this one processed.
-      if (this.state.loadingCounter !== loadingCounter) return;
-
-      let newState = { ...this.state, loading: false };
-      newState = cleanSet(newState, 'source.processed', processed);
-      newState = stateForNewSourceData(newState, newState.source!);
-
-      if (orientationChanged) {
-        // If orientation has changed, we should flip the resize values.
-        for (const i of [0, 1]) {
-          const resizeSettings = newState.sides[i].latestSettings.preprocessorState.resize;
-          newState = cleanMerge(newState, `sides.${i}.latestSettings.preprocessorState.resize`, {
-            width: resizeSettings.height,
-            height: resizeSettings.width,
-          });
-        }
-      }
-      this.setState(newState);
-    } catch (err) {
-      if (err.name === 'AbortError') return;
-      console.error(err);
-      // Another file has been opened/processed before this one processed.
-      if (this.state.loadingCounter !== loadingCounter) return;
-      this.props.showSnack('Processing error');
-      this.setState({ loading: false });
-    }
   }
 
   @bind
   private async updateFile(file: File | Fileish) {
     const loadingCounter = this.state.loadingCounter + 1;
-    // Either processor is good enough here.
-    const processor = this.leftProcessor;
 
     this.setState({ loadingCounter, loading: true });
 
@@ -406,7 +264,7 @@ export default class Compress extends Component<Props, State> {
     this.rightProcessor.abortCurrent();
 
     try {
-      let decoded: ImageData;
+      let data: ImageData;
       let vectorImage: HTMLImageElement | undefined;
 
       // Special-case SVG. We need to avoid createImageBitmap because of
@@ -414,96 +272,73 @@ export default class Compress extends Component<Props, State> {
       // Also, we cache the HTMLImageElement so we can perform vector resizing later.
       if (file.type.startsWith('image/svg+xml')) {
         vectorImage = await processSvg(file);
-        decoded = drawableToImageData(vectorImage);
+        data = drawableToImageData(vectorImage);
       } else {
         // Either processor is good enough here.
-        decoded = await decodeImage(file, processor);
+        data = await decodeImage(file, this.leftProcessor);
       }
 
-      const processed = await processInput(decoded, defaultInputProcessorState, processor);
-
-      // Another file has been opened/processed before this one processed.
+      // Another file has been opened before this one processed.
       if (this.state.loadingCounter !== loadingCounter) return;
 
       let newState: State = {
         ...this.state,
-        source: {
-          decoded, file, vectorImage, processed,
-          inputProcessorState: defaultInputProcessorState,
-        },
+        source: { data, file, vectorImage },
         loading: false,
       };
 
-      newState = stateForNewSourceData(newState, newState.source!);
-
       for (const i of [0, 1]) {
+        // Ditch previous encodings
+        const downloadUrl = this.state.images[i].downloadUrl;
+        if (downloadUrl) URL.revokeObjectURL(downloadUrl!);
+
+        newState = cleanMerge(newState, `images.${i}`, {
+          preprocessed: undefined,
+          file: undefined,
+          downloadUrl: undefined,
+          data: undefined,
+        });
+
         // Default resize values come from the image:
-        newState = cleanMerge(newState, `sides.${i}.latestSettings.preprocessorState.resize`, {
-          width: processed.width,
-          height: processed.height,
+        newState = cleanMerge(newState, `images.${i}.preprocessorState.resize`, {
+          width: data.width,
+          height: data.height,
           method: vectorImage ? 'vector' : 'browser-high',
         });
       }
 
-      this.updateDocumentTitle(file.name);
       this.setState(newState);
     } catch (err) {
       if (err.name === 'AbortError') return;
       console.error(err);
-      // Another file has been opened/processed before this one processed.
+      // Another file has been opened before this one processed.
       if (this.state.loadingCounter !== loadingCounter) return;
-      this.props.showSnack('Invalid image');
+      this.props.onError('Invalid image');
       this.setState({ loading: false });
     }
   }
 
-  /**
-   * Debounce the heavy lifting of updateImage.
-   * Otherwise, the thrashing causes jank, and sometimes crashes iOS Safari.
-   */
-  private queueUpdateImage(index: number, options: UpdateImageOptions = {}): void {
-    // Call updateImage after this delay, unless queueUpdateImage is called again, in which case the
-    // timeout is reset.
-    const delay = 100;
-
-    clearTimeout(this.updateImageTimeoutIds[index]);
-
-    this.updateImageTimeoutIds[index] = self.setTimeout(
-      () => {
-        this.updateImage(index, options).catch((err) => {
-          console.error(err);
-        });
-      },
-      delay,
-    );
-  }
-
   private async updateImage(index: number, options: UpdateImageOptions = {}): Promise<void> {
-    const {
-      skipPreprocessing = false,
-    } = options;
+    const { skipPreprocessing = false } = options;
     const { source } = this.state;
     if (!source) return;
 
     // Each time we trigger an async encode, the counter changes.
-    const loadingCounter = this.state.sides[index].loadingCounter + 1;
+    const loadingCounter = this.state.images[index].loadingCounter + 1;
 
-    let sides = cleanMerge(this.state.sides, index, {
+    let images = cleanMerge(this.state.images, index, {
       loadingCounter,
       loading: true,
     });
 
-    this.setState({ sides });
+    this.setState({ images });
 
-    const side = sides[index];
-    const settings = side.latestSettings;
+    const image = images[index];
 
     let file: File | Fileish | undefined;
     let preprocessed: ImageData | undefined;
     let data: ImageData | undefined;
-    const cacheResult = this.encodeCache.match(
-      source.processed, settings.preprocessorState, settings.encoderState,
-    );
+    const cacheResult = this.encodeCache.match(source, image.preprocessorState, image.encoderState);
     const processor = (index === 0) ? this.leftProcessor : this.rightProcessor;
 
     // Abort anything the processor is currently doing.
@@ -516,135 +351,80 @@ export default class Compress extends Component<Props, State> {
     } else {
       try {
         // Special case for identity
-        if (settings.encoderState.type === identity.type) {
-          file = source.file;
-          data = source.processed;
+        if (image.encoderState.type === identity.type) {
+          ({ file, data } = source);
         } else {
-          preprocessed = (skipPreprocessing && side.preprocessed)
-            ? side.preprocessed
-            : await preprocessImage(source, settings.preprocessorState, processor);
+          preprocessed = (skipPreprocessing && image.preprocessed)
+            ? image.preprocessed
+            : await preprocessImage(source, image.preprocessorState, processor);
 
-          file = await compressImage(
-            preprocessed, settings.encoderState, source.file.name, processor,
-          );
+          file = await compressImage(preprocessed, image.encoderState, source.file.name, processor);
           data = await decodeImage(file, processor);
 
           this.encodeCache.add({
+            source,
             data,
             preprocessed,
             file,
-            sourceData: source.processed,
-            encoderState: settings.encoderState,
-            preprocessorState: settings.preprocessorState,
+            encoderState: image.encoderState,
+            preprocessorState: image.preprocessorState,
           });
         }
       } catch (err) {
         if (err.name === 'AbortError') return;
-        this.props.showSnack(`Processing error (type=${settings.encoderState.type}): ${err}`);
+        this.props.onError(`Processing error (type=${image.encoderState.type}): ${err}`);
         throw err;
       }
     }
 
-    const latestData = this.state.sides[index];
+    const latestImage = this.state.images[index];
     // If a later encode has landed before this one, return.
-    if (loadingCounter < latestData.loadedCounter) {
+    if (loadingCounter < latestImage.loadedCounter) {
       return;
     }
 
-    if (latestData.downloadUrl) URL.revokeObjectURL(latestData.downloadUrl);
-
-    sides = cleanMerge(this.state.sides, index, {
+    images = cleanMerge(this.state.images, index, {
       file,
       data,
       preprocessed,
       downloadUrl: URL.createObjectURL(file),
-      loading: sides[index].loadingCounter !== loadingCounter,
+      loading: images[index].loadingCounter !== loadingCounter,
       loadedCounter: loadingCounter,
-      encodedSettings: settings,
     });
 
-    this.setState({ sides });
+    this.setState({ images });
   }
 
-  render({ onBack }: Props, { loading, sides, source, mobileView }: State) {
-    const [leftSide, rightSide] = sides;
-    const [leftImageData, rightImageData] = sides.map(i => i.data);
-
-    const options = sides.map((side, index) => (
-      <Options
-        source={source}
-        mobileView={mobileView}
-        preprocessorState={side.latestSettings.preprocessorState}
-        encoderState={side.latestSettings.encoderState}
-        onEncoderTypeChange={this.onEncoderTypeChange.bind(this, index as 0|1)}
-        onEncoderOptionsChange={this.onEncoderOptionsChange.bind(this, index as 0|1)}
-        onPreprocessorOptionsChange={this.onPreprocessorOptionsChange.bind(this, index as 0|1)}
-      />
-    ));
-
-    const copyDirections =
-      (mobileView ? ['down', 'up'] : ['right', 'left']) as CopyAcrossIconProps['copyDirection'][];
-
-    const results = sides.map((side, index) => (
-      <Results
-        downloadUrl={side.downloadUrl}
-        imageFile={side.file}
-        source={source}
-        loading={loading || side.loading}
-        copyDirection={copyDirections[index]}
-        onCopyToOtherClick={this.onCopyToOtherClick.bind(this, index as 0|1)}
-        buttonPosition={mobileView ? 'stack-right' : buttonPositions[index]}
-      >
-        {!mobileView ? null : [
-          <ExpandIcon class={style.expandIcon} key="expand-icon"/>,
-          `${resultTitles[index]} (${encoderMap[side.latestSettings.encoderState.type].label})`,
-        ]}
-      </Results>
-    ));
-
-    // For rendering, we ideally want the settings that were used to create the data, not the latest
-    // settings.
-    const leftDisplaySettings = leftSide.encodedSettings || leftSide.latestSettings;
-    const rightDisplaySettings = rightSide.encodedSettings || rightSide.latestSettings;
-    const leftImgContain = leftDisplaySettings.preprocessorState.resize.enabled &&
-      leftDisplaySettings.preprocessorState.resize.fitMethod === 'contain';
-    const rightImgContain = rightDisplaySettings.preprocessorState.resize.enabled &&
-      rightDisplaySettings.preprocessorState.resize.fitMethod === 'contain';
+  render({ }: Props, { loading, images, source, orientation }: State) {
+    const [leftImage, rightImage] = images;
+    const [leftImageData, rightImageData] = images.map(i => i.data);
 
     return (
-      <div class={style.compress}>
+      <div class={`${style.compress} ${style[orientation]}`}>
         <Output
-          source={source}
-          mobileView={mobileView}
+          originalImage={source && source.data}
+          orientation={orientation}
           leftCompressed={leftImageData}
           rightCompressed={rightImageData}
-          leftImgContain={leftImgContain}
-          rightImgContain={rightImgContain}
-          onBack={onBack}
-          inputProcessorState={source && source.inputProcessorState}
-          onInputProcessorChange={this.onInputProcessorChange}
+          leftImgContain={leftImage.preprocessorState.resize.fitMethod === 'cover'}
+          rightImgContain={rightImage.preprocessorState.resize.fitMethod === 'cover'}
         />
-        {mobileView
-          ? (
-            <div class={style.options}>
-              <multi-panel class={style.multiPanel} open-one-only>
-                {results[0]}
-                {options[0]}
-                {results[1]}
-                {options[1]}
-              </multi-panel>
-            </div>
-          ) : ([
-            <div class={style.options} key="options0">
-              {options[0]}
-              {results[0]}
-            </div>,
-            <div class={style.options} key="options1">
-              {options[1]}
-              {results[1]}
-            </div>,
-          ])
-        }
+        {images.map((image, index) => (
+          <Options
+            loading={loading || image.loading}
+            source={source}
+            orientation={orientation}
+            imageIndex={index}
+            imageFile={image.file}
+            downloadUrl={image.downloadUrl}
+            preprocessorState={image.preprocessorState}
+            encoderState={image.encoderState}
+            onEncoderTypeChange={this.onEncoderTypeChange.bind(this, index)}
+            onEncoderOptionsChange={this.onEncoderOptionsChange.bind(this, index)}
+            onPreprocessorOptionsChange={this.onPreprocessorOptionsChange.bind(this, index)}
+            onCopyToOtherClick={this.onCopyToOtherClick.bind(this, index)}
+          />
+        ))}
       </div>
     );
   }

src/components/compress/result-cache.ts

@@ -1,6 +1,7 @@
 import { EncoderState } from '../../codecs/encoders';
 import { Fileish } from '../../lib/initial-util';
 import { shallowEqual } from '../../lib/util';
+import { SourceImage } from '.';
 import { PreprocessorState } from '../../codecs/preprocessors';
 
 import * as identity from '../../codecs/identity/encoder-meta';
@@ -14,7 +15,7 @@ interface CacheResult {
 interface CacheEntry extends CacheResult {
   preprocessorState: PreprocessorState;
   encoderState: EncoderState;
-  sourceData: ImageData;
+  source: SourceImage;
 }
 
 const SIZE = 5;
@@ -31,13 +32,13 @@ export default class ResultCache {
   }
 
   match(
-    sourceData: ImageData,
+    source: SourceImage,
     preprocessorState: PreprocessorState,
     encoderState: EncoderState,
   ): CacheResult | undefined {
     const matchingIndex = this._entries.findIndex((entry) => {
       // Check for quick exits:
-      if (entry.sourceData !== sourceData) return false;
+      if (entry.source !== source) return false;
       if (entry.encoderState.type !== encoderState.type) return false;
 
       // Check that each set of options in the preprocessor are the same

src/components/compress/style.scss

@@ -3,73 +3,20 @@
   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;
-    grid-template-rows: 100%;
+    grid-template-rows: calc(100% - 75px);
+
+    @media (min-width: 860px) {
+      grid-template-rows: 100%;
+    }
+    align-items: end;
+    align-content: end;
+  }
+
+  &.vertical {
+    // TODO: make the mobile view work
+    background: red;
   }
 }
-
-.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% - 104px);
-  overflow: hidden;
-
-  @media (min-width: 600px) {
-    max-height: calc(100% - 75px);
-    width: 300px;
-    margin: 0;
-  }
-
-  @media (min-width: 860px) {
-    max-height: calc(100% - 40px);
-  }
-}
-
-.multi-panel {
-  position: relative;
-  display: flex;
-  flex-flow: column;
-  overflow: hidden;
-
-  // 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,6 +1,6 @@
 import { h, Component, ComponentChild, ComponentChildren } from 'preact';
 import * as style from './style.scss';
-import { transitionHeight } from '../../lib/util';
+import { linkRef } from '../../lib/initial-util';
 
 interface Props {
   children: ComponentChildren;
@@ -13,6 +13,7 @@ export default class Expander extends Component<Props, State> {
   state: State = {
     outgoingChildren: [],
   };
+  private el?: HTMLDivElement;
   private lastElHeight: number = 0;
 
   componentWillReceiveProps(nextProps: Props) {
@@ -31,10 +32,10 @@ export default class Expander extends Component<Props, State> {
 
     // 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;
+    this.lastElHeight = this.el!.getBoundingClientRect().height;
   }
 
-  async componentDidUpdate(previousProps: Props) {
+  componentDidUpdate(previousProps: Props) {
     const children = this.props.children as ComponentChild[];
     const previousChildren = previousProps.children as ComponentChild[];
 
@@ -42,20 +43,37 @@ export default class Expander extends Component<Props, State> {
     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;
+    this.el!.style.transition = 'none';
+    this.el!.style.height = '';
+    const newHeight = children[0] ? this.el!.getBoundingClientRect().height : 0;
 
-    await transitionHeight(this.base!, {
-      duration: 300,
-      from: this.lastElHeight,
-      to: newHeight,
-    });
+    if (this.lastElHeight === newHeight) {
+      this.el!.style.transition = '';
+      return;
+    }
 
-    // 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: [] });
+    // Set the currently rendered height absolutely.
+    this.el!.style.height = this.lastElHeight + 'px';
+    this.el!.style.transition = '';
+    this.el!.style.overflow = 'hidden';
+    // Force a style calc so the browser picks up the start value.
+    getComputedStyle(this.el!).height;
+    // Animate to the new height.
+    this.el!.style.height = newHeight + 'px';
+
+    const listener = () => {
+      // Unset the height & overflow, so element changes do the right thing.
+      this.el!.style.height = '';
+      this.el!.style.overflow = '';
+      this.el!.removeEventListener('transitionend', listener);
+      this.el!.removeEventListener('transitioncancel', listener);
+      if (this.state.outgoingChildren[0]) {
+        this.setState({ outgoingChildren: [] });
+      }
+    };
+
+    this.el!.addEventListener('transitionend', listener);
+    this.el!.addEventListener('transitioncancel', listener);
   }
 
   render(props: Props, { outgoingChildren }: State) {
@@ -63,7 +81,10 @@ export default class Expander extends Component<Props, State> {
     const childrenExiting = !children[0] && outgoingChildren[0];
 
     return (
-      <div class={childrenExiting ? style.childrenExiting : ''}>
+      <div
+        ref={linkRef(this, 'el')}
+        class={`${style.expander} ${childrenExiting ? style.childrenExiting : ''}`}
+      >
         {children[0] ? children : outgoingChildren}
       </div>
     );

src/components/expander/style.scss

@@ -1,3 +1,7 @@
+.expander {
+  transition: height 200ms ease-in-out;
+}
+
 .children-exiting {
   & > * {
     pointer-events: none;

src/components/intro/index.tsx

@@ -4,15 +4,14 @@ import { bind, linkRef, Fileish } from '../../lib/initial-util';
 import '../custom-els/LoadingSpinner';
 
 import logo from './imgs/logo.svg';
-import largePhoto from './imgs/demos/demo-large-photo.jpg';
-import artwork from './imgs/demos/demo-artwork.jpg';
-import deviceScreen from './imgs/demos/demo-device-screen.png';
-import largePhotoIcon from './imgs/demos/icon-demo-large-photo.jpg';
-import artworkIcon from './imgs/demos/icon-demo-artwork.jpg';
-import deviceScreenIcon from './imgs/demos/icon-demo-device-screen.jpg';
-import logoIcon from './imgs/demos/icon-demo-logo.png';
+import largePhoto from './imgs/demos/large-photo.jpg';
+import artwork from './imgs/demos/artwork.jpg';
+import deviceScreen from './imgs/demos/device-screen.png';
+import largePhotoIcon from './imgs/demos/large-photo-icon.jpg';
+import artworkIcon from './imgs/demos/artwork-icon.jpg';
+import deviceScreenIcon from './imgs/demos/device-screen-icon.jpg';
+import logoIcon from './imgs/demos/logo-icon.png';
 import * as style from './style.scss';
-import SnackBarElement from '../../lib/SnackBar';
 
 const demos = [
   {
@@ -43,7 +42,7 @@ const demos = [
 
 interface Props {
   onFile: (file: File | Fileish) => void;
-  showSnack: SnackBarElement['showSnackbar'];
+  onError: (error: string) => void;
 }
 interface State {
   fetchingDemoIndex?: number;
@@ -80,7 +79,7 @@ export default class Intro extends Component<Props, State> {
       this.props.onFile(file);
     } catch (err) {
       this.setState({ fetchingDemoIndex: undefined });
-      this.props.showSnack("Couldn't fetch demo image");
+      this.props.onError("Couldn't fetch demo image");
     }
   }
 
@@ -90,7 +89,7 @@ export default class Intro extends Component<Props, State> {
         <div>
           <div class={style.logoSizer}>
             <div class={style.logoContainer}>
-              <img src={logo} class={style.logo} alt="Squoosh" decoding="async" />
+              <img src={logo} class={style.logo} alt="Squoosh" />
             </div>
           </div>
           <p class={style.openImageGuide}>
@@ -111,7 +110,7 @@ export default class Intro extends Component<Props, State> {
                   <div class={style.demo}>
                     <div class={style.demoImgContainer}>
                       <div class={style.demoImgAspect}>
-                        <img class={style.demoIcon} src={demo.iconUrl} alt="" decoding="async" />
+                        <img class={style.demoIcon} src={demo.iconUrl} alt=""/>
                         {fetchingDemoIndex === i &&
                           <div class={style.demoLoading}>
                             <loading-spinner class={style.demoLoadingSpinner}/>
@@ -129,11 +128,6 @@ export default class Intro extends Component<Props, State> {
         <ul class={style.relatedLinks}>
           <li><a href="https://github.com/GoogleChromeLabs/squoosh/">View the code</a></li>
           <li><a href="https://github.com/GoogleChromeLabs/squoosh/issues">Report a bug</a></li>
-          <li>
-            <a href="https://github.com/GoogleChromeLabs/squoosh/blob/master/README.md#privacy">
-              Privacy
-            </a>
-          </li>
         </ul>
       </div>
     );

src/components/intro/style.scss

@@ -2,7 +2,6 @@
   font-family: 'intro-text';
   font-style: normal;
   font-weight: 300;
-  font-display: block;
   // This only contains the chars for "Drag & drop or"
   src: url('data:font/woff2;base64,d09GMgABAAAAAAXcAA4AAAAACowAAAWJAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGhYbg2gcMAZgAGwRCAqIQIcnCxYAATYCJAMoBCAFgwAHIBvqCFEU84FMI2Xh/P3g+Tfn532yQ/IgYz4BrJyhtkkZwFBYAZ49sI63e5v/NnqzIfbADyE0qxOqK8ESLoNNdULHihxbW0W86/qHEk4wT/eHShPRZJYYqUGkQdLSWCeSemZBzwpKyX/LRoAhMEQhqCFBw5RHNCc4hbVn35FsxtTXVHYyo7miu5VN2AW1fwzVauRgXnIGo2IWsYdViUoLu6mms5VFAn+SeQ4eBazfj7QodrMt4oyQHaGADEPRpTbDqJaoTENNK6DpOralUszf6gI/QsAhWZSMKVOirikSJxZRLBVD0S4mB0kTBRwopjZ/mt/2/25+bcSipgiHRmwiFI1g+XhwlshyEAsbJzGiGH+U5whHNgiXooplafI1rMFbmIqjGAPhmcSkVFxeu9hw87aXsGyL+dPE05qUpK2WyaVQcZVW+aDmw3aalLJKNmQORcpZYtBIuTrncN4xXoVZY617TBSsx2T1DHgGU6u4etE04wha1GEwjVkEaDttOrl1FCOwUMxgHnuooJo62ukcWEuc1/aT+dZ8b142t5tbzc3mGnP1EJqVTEGMYTjG14YxtGEEG+0E2axhe6Oa1E8UrDHDFjhTRywYNWrU9JHTlw7RmaslkrrGcTJ+znW4EzzP0zovE4Z5d0hqVhBobftBIKkwL09SOv3hhCuv1Dp9taTeCJ2Mj3KDT8iDng5DkWzPw/UdP8idNDkMnUyOwEauwnYLQeLC7GskNe72QKe97AmuA42E5FjfyYTM+HTdQ+Xqb+q4JvptyKZN1w47qMMwL58fyKZM1U6NXgWlOFdxx7DpXHDTz4UB89WMK3HH3uY7mavFopGF+u36lGlqZsL4ugmbqvZxveycMO+a4uyN3o7GT2qdHpfr6W++kNTn1crdx7Z+FW7PfffTmfnXV/2ivsh5UX93zdlzct6QlSuHSumG3oGNNT9/m9yXnDcnKfsmDx8xUaoKi+uvGs99H2ieUJUg8bTnVwQcDd/SPKwYWDUv+QkpT6MulMrcPTXNWYnIowxvoiwnX+opTMkvzOMGgpNpqnK32CNVwCnassw0BwQwTa0rLS3m1DfIoxx5PIE8SvEmSk3pHSWZiRVKjOOQSylJSHGXkhT/u/tg/Vm9UZQcS59TGb1qjcuuT0925iaaU1vaWpZJM4ukqWWlrdWSIcVNlOImvnrzLn53UpnSLzbGT5lUlpTiKiPJFEmyqywFLtOhcaYJkWkaGe/oGBlnmiIiIiKYpqHxLmdaWg5JpxxHSXpajsuVlkPSvb1JelqOC0pubbAn2A2UsDdYmTmjvbVlgTRhVBSSxpbF1nZD+jvkUR4rcJeSFBp2d19SUsVW5DjkUkoSoITHJ7iJEpZnZaL4OiF7g92DN1mz8b1RiM9RDk9ps9pcanamlnj2ftqbJpHJ0wpkRn2+RJ6qsGflpYrPnxG6A4r9zqGY3qCcqDuhsWGQhoXpQ0663cWFM4qNR0Jxj1R0UBT36pahMneH4NYV27jElOeyAAAACACAABy4uvGyOsj21Y9h3gIA3PuxYAYAuC/7vftf7L+PXunMAQDwBQIAAAIA5vR/HwCvOQ//TzLL7cPIHUC0zMI5v7+tHiVfzWOeSrJKZbFabWGNSnJE+jmsnmTjTZm6kBi9r0aLgm8qNk6t67ATuPlEitG+g+E7in1GMYxCxmIF9YzNJK7lRoSPc6PCD+8fxhp+YjdttDNAJw3UUU83M1jFClaylkpkU08NVZqkh0oaaBLPnaCTNhqpoaok2UkPZqy/JyfpKnVLkhrq6KGZCjpZxTJWqN9uJofD5HGMzSXHLaVbOmuTSnOp6cTQgJlaB6oF7RIITul8N+1sYjnL6aJqqoZ2inaxDIY2s2zwlXUs5zj7OPJmAPao+ZhVHy0A') format('woff2');
 }
@@ -11,7 +10,6 @@
   font-family: 'intro-text';
   font-style: normal;
   font-weight: 500;
-  font-display: block;
   // Only contains the chars for "select an image"
   src: url('data:font/woff2;base64,d09GMgABAAAAAAXMAA4AAAAACwQAAAV5AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGhYbg1IcMAZgAGwRCAqJUId/CxoAATYCJAMwBCAFgnAHIBskCcjEh6dNff8Ou/9Tj9VZGnUhJeqFzWGiVVOkxkTthr9f6kWkRdsBbkIj3YuLaloFZWr7aBg22z7IOoWqBWCW5cZU3GBrh0n+dAcBYAUlzYHAzWTYchqKXEyAT0zOLIS1qqm+B8q2ur4OhEMy0PHHUH8KklaSr8T0mp/EU7kRvXlI1E09HXA1qLN8Djxa0AsSDOg3cJARb9mtQJoSK3gvEn372/gcAigg/gOnbsT/MYv491GTReW4rJC5LA+h5FFclF6QQgoZ5Kx7GbsuGeytUgFClkOomY2Gdake3m9HegkHieAx/a0hBTALsy4jvpxBcnFXUnjC+2ZS5zHnDeEaJVwi+ZWqzOm4Uvgy4k6kGv4kFDVkfjk1gkVRRkk2zlo42PBbRJmG30cClJQjak7BnfQqHza4ITKftQZ/ZMUaEiyy1+mYCh4clKhDA5rQglZ0oG9jw+qiNvT+SfxIXCeuFdeIq8VV4gpxyRaGOl0JiChiCocfc7e93DwZIPvWgPiZJLcJugxyjW7UQyl4TJk6dWqYU7Cn0WQiWnNJCdGeprqjW63fpVS3mKy4YGZ6I3ya4nbIVgM1mwkpNEBzixlNxfPmH7owvdE4973OM9quvk11dwvnzDUy/Zn5S5Ywpn/PeqXBQI2m4lna05CRtsI6+GIENjS9K4jWRHUGYA2ozdZm2Smmf0DI3aqpeNbsJfxe7YdFmcZAn5gXLCFa2/Umqiu017APFhMZ0rfQp4sJX0ZrJ+n9UtAljr5VYWb6oj1MrpvX3qe6u8WRJg0bj7aPkDOa7m+E0Oa9Y8eY/gbRbr+efH7hcO49bMd28fbDVHcUmm3XkozQGKjeBHSJ4TQnI879LIFmF2v/BJuEQlffJPfE9oKayS/PsPE44fvM4MsBESxbuEEV39d5pw6oW4vD6S1WQC3UpSbHNbK0Jikl0bphSs+0CGW8Ew4Kzw7zarmcVz873JHTFhKYay18R8vY0ozPiHPAGyROAqlW5fLj5+HbWBn9TpgekKsOy8N+4dlFfL9i/Nk3+gY1bwzZUAvLVNiFpvqHRenetSoVrgn2obGtPsltEVxEeHJAQFhyBIcHT9rDvTJm06e0TLgase2gd2RffGJNg0o1zrdRyi9s1bYE5bi85cK+o/nUwvBR5+jweEBaSMoCub29fEFISmib9Dn5yl5kVFpoGrPQSmZhafQ7WimttNCH7Cktohb6kFpoEfIsdDF7SgvZTbaY3mKFyLXQh+wpzWE3mUNQQkWnR+lgiW9Afkunej49Nz3sYlI8XFTRdkNhUR5d6h4oOpJc8OjcItMXVqoHW2fSW6ycWuiM8NDYoICouLAZ9BYrwwmhycvKlt4Q8hUlCV5nZ7vOm2ut2rizcFpuWpSrT3K1Z3xinbuHnXBTyGAljV/XzHZaNGu6y7vLDziMpIyUdOBBRXXlxznUQiOoheZsZk9njG8er1mNmz2eOCQ3x9BbLP+Zxt+VrbEz9aWxmimRvyl4/sumyoM/nw+LNzV4/uP0/9T/P5f08cvhl38USAS/xTYs2fL/VNFF0vd+SVsRB/khPwW4SCi5SHhx8fDgVPAiAqIJRQL/EuK5bsRzNnAiezD1i7u2VyHHAKRU+E2YUaA5DUsE2ZfbApAmsJcxjBwmQ2Xk4Y2BqZJ+oxSzsNEogz1O3/xkBMKEBHSiC8PoQStaoEIflPCHL/wQBCUKoUITlMhHP+olt5ojykUPOrEQTWgY+f449KMPKnSiB72jGrLQhEZO24925LtbkG5DndTkD2/4um+NQBEyUIJsRBxX24tcDGmbWtGJjq05jhzTaMgCcR+6EA4f+KAXDay5u6RsL7xJsm3w3mzvFvggB8nI/AYBdVnxNvx/2wA=') format('woff2');
 }
@@ -21,6 +19,7 @@
 }
 
 .intro {
+  composes: abs-fill from '../../lib/util.scss';
   display: grid;
   grid-template-rows: 1fr min-content;
   align-items: center;
@@ -30,9 +29,6 @@
   -webkit-overflow-scrolling: touch;
   overflow: auto;
   padding: 20px 0 0;
-  height: 100%;
-  box-sizing: border-box;
-  overscroll-behavior: contain;
 }
 
 .logo-container {
@@ -42,17 +38,16 @@
 
 .logo-sizer {
   width: 90%;
-  max-width: 52vh;
+  max-width: 480px;
   margin: 0 auto;
 }
 
 .logo {
   composes: abs-fill from '../../lib/util.scss';
-  pointer-events: none;
 }
 
 .open-image-guide {
-  font: 300 11vw intro-text, sans-serif;
+  font: 300 11vw intro-text;
   margin-bottom: 0;
 
   @media (min-width: 460px) {
@@ -145,7 +140,6 @@
 
 .demo-icon {
   composes: abs-fill from '../../lib/util.scss';
-  pointer-events: none;
 }
 
 .demo-description {

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

@@ -1,75 +1,19 @@
-import * as style from './styles.css';
-import { transitionHeight } from '../../../../lib/util';
+import './styles.css';
 
-interface CloseAllOptions {
-  exceptFirst?: boolean;
-}
-
-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;
+function getClosestHeading(el: Element) {
+  const closestEl = el.closest('multi-panel > *');
+  if (closestEl && closestEl.classList.contains('panel-heading')) {
+    return closestEl;
   }
   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,23 +31,17 @@ 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
   private _onKeyDown(event: KeyboardEvent) {
-    const selectedEl = document.activeElement!;
+    const selectedEl = document.activeElement;
     const heading = getClosestHeading(selectedEl);
 
     // if keydown event is not on heading element, ignore
@@ -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')) {
-      close(heading);
+    if (content.hasAttribute('expanded')) {
+      content.removeAttribute('expanded');
+      content.setAttribute('aria-expanded', 'false');
     } else {
-      if (this.openOneOnly) this._closeAll();
-      open(heading);
+      content.setAttribute('expanded', '');
+      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);
-      content.classList.remove(style.panelHeading);
-      heading.removeAttribute('aria-expanded');
-      heading.removeAttribute('content-expanded');
+      heading.classList.remove('panel-content');
+
+      if (content.classList.contains('panel-heading')) {
+        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);
-      content.classList.add(style.panelContent);
+      heading.classList.add('panel-heading');
+      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.
@@ -252,8 +181,8 @@ export default class MultiPanel extends HTMLElement {
       return this.firstElementChild as HTMLElement;
     }
     // previous Element of active Element is previous Content,
-    // previous Element of previous Content is previousHeading
-    const previousContent = document.activeElement!.previousElementSibling;
+    // previous Element of previous Content  is previousHeading
+    const previousContent = document.activeElement.previousElementSibling;
     if (previousContent) {
       return previousContent.previousElementSibling as HTMLElement;
     }
@@ -263,7 +192,7 @@ export default class MultiPanel extends HTMLElement {
   private _nextHeading() {
     // activeElement would be the currently selected heading
     // 2 elemements after that would be the next heading.
-    const nextContent = document.activeElement!.nextElementSibling;
+    const nextContent = document.activeElement.nextElementSibling;
     if (nextContent) {
       return nextContent.nextElementSibling as HTMLElement;
     }
@@ -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

@@ -13,8 +13,6 @@ export default class Range extends Component<Props, State> {
   @bind
   private onTextInput(event: Event) {
     const input = event.target as HTMLInputElement;
-    const value = input.value.trim();
-    if (!value) return;
     this.rangeWc!.value = input.value;
     const { onInput } = this.props;
     if (onInput) onInput(event);

src/components/results/index.tsx

@@ -1,121 +0,0 @@
-import { h, Component, ComponentChildren, ComponentChild } from 'preact';
-
-import * as style from './style.scss';
-import FileSize from './FileSize';
-import { DownloadIcon, CopyAcrossIcon, CopyAcrossIconProps } from '../../lib/icons';
-import '../custom-els/LoadingSpinner';
-import { SourceImage } from '../compress';
-import { Fileish, bind } from '../../lib/initial-util';
-
-interface Props {
-  loading: boolean;
-  source?: SourceImage;
-  imageFile?: Fileish;
-  downloadUrl?: string;
-  children: ComponentChildren;
-  copyDirection: CopyAcrossIconProps['copyDirection'];
-  buttonPosition: keyof typeof buttonPositionClass;
-  onCopyToOtherClick(): void;
-}
-
-interface State {
-  showLoadingState: boolean;
-}
-
-const buttonPositionClass = {
-  'stack-right': style.stackRight,
-  'download-right': style.downloadRight,
-  'download-left': style.downloadLeft,
-};
-
-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,
-      );
-    }
-  }
-
-  @bind
-  private onCopyToOtherClick(event: Event) {
-    event.preventDefault();
-    this.props.onCopyToOtherClick();
-  }
-
-  @bind
-  onDownload() {
-    // GA can’t do floats. So we round to ints. We're deliberately rounding to nearest kilobyte to
-    // avoid cases where exact image sizes leak something interesting about the user.
-    const before = Math.round(this.props.source!.file.size / 1024);
-    const after = Math.round(this.props.imageFile!.size / 1024);
-    const change = Math.round(after / before * 1000);
-
-    ga('send', 'event', 'compression', 'download', {
-      metric1: before,
-      metric2: after,
-      metric3: change,
-    });
-  }
-
-  render(
-    { source, imageFile, downloadUrl, children, copyDirection, buttonPosition }: Props,
-    { showLoadingState }: State,
-  ) {
-
-    return (
-      <div class={`${style.results} ${buttonPositionClass[buttonPosition]}`}>
-        <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>
-
-        <button
-          class={style.copyToOther}
-          title="Copy settings to other side"
-          onClick={this.onCopyToOtherClick}
-        >
-          <CopyAcrossIcon class={style.copyIcon} copyDirection={copyDirection} />
-        </button>
-
-        <div class={style.download}>
-          {(downloadUrl && imageFile) && (
-            <a
-              class={`${style.downloadLink} ${showLoadingState ? style.downloadLinkDisable : ''}`}
-              href={downloadUrl}
-              download={imageFile.name}
-              title="Download"
-              onClick={this.onDownload}
-            >
-              <DownloadIcon class={style.downloadIcon} />
-            </a>
-          )}
-          {showLoadingState && <loading-spinner class={style.spinner} />}
-        </div>
-      </div>
-    );
-  }
-}

src/components/results/style.scss

@@ -1,131 +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: [text] 1fr [copy-button] auto [download-button] auto;
-  background: rgba(0, 0, 0, 0.9);
-  font-size: 1rem;
-
-  @media (min-width: 400px) {
-    font-size: 1.2rem;
-  }
-
-  @media (min-width: 600px) {
-    font-size: 1.4rem;
-  }
-
-  &:focus {
-    outline: none;
-  }
-}
-
-.result-data {
-  grid-row: 1;
-  grid-column: text;
-  display: flex;
-  align-items: center;
-  padding: 0 10px;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.download-right {
-  grid-template-columns: [copy-button] auto [text] 1fr [download-button] auto;
-}
-
-.download-left {
-  grid-template-columns: [download-button] auto [text] 1fr [copy-button] auto;
-}
-
-.stack-right {
-  & .result-data {
-    padding: 0 15px;
-  }
-}
-
-.result-title {
-  display: flex;
-  align-items: center;
-  margin-right: 0.4em;
-}
-
-.size-delta {
-  font-size: 0.8em;
-  font-style: italic;
-  position: relative;
-  top: -1px;
-  margin-left: 0.3em;
-}
-
-.size-increase {
-  color: #e35050;
-}
-
-.size-decrease {
-  color: #50e3c2;
-}
-
-.download {
-  grid-row: 1;
-  grid-column: download-button;
-  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,
-.copy-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;
-}
-
-.copy-to-other {
-  grid-row: 1;
-  grid-column: copy-button;
-  composes: unbutton from '../../lib/util.scss';
-  composes: download;
-
-  background: #656565;
-}

src/custom-els/RangeInput/index.ts

@@ -1,4 +1,3 @@
-import PointerTracker from 'pointer-tracker';
 import { bind } from '../../lib/initial-util';
 import * as style from './styles.css';
 
@@ -27,17 +26,6 @@ class RangeInputElement extends HTMLElement {
     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);
     }
@@ -57,8 +45,6 @@ class RangeInputElement extends HTMLElement {
 
     this.insertBefore(this._input, this.firstChild);
     this._valueDisplay = this.querySelector('.' + style.valueDisplay) as HTMLDivElement;
-    // Set inline styles (this is useful when used with frameworks which might clear inline styles)
-    this._update();
   }
 
   get labelPrecision(): string {

src/custom-els/RangeInput/styles.css

@@ -84,11 +84,11 @@ range-input::before {
   overflow: hidden;
 }
 
-.touch-active + .thumb-wrapper .value-display {
+.input:active + .thumb-wrapper .value-display {
   opacity: 1;
   transform: scale(1);
 }
 
-.touch-active + .thumb-wrapper .thumb {
+.input:active + .thumb-wrapper .thumb {
   box-shadow: 0 1px 3px rgba(0,0,0,0.5);
 }

src/index.html

@@ -4,13 +4,13 @@
     <meta charset="utf-8">
     <title>Squoosh</title>
     <meta name="description" content="Compress and compare images with different codecs, right in your browser">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link rel="shortcut icon" href="/assets/favicon.ico">
-    <meta name="theme-color" content="#f78f21">
+    <meta name="theme-color" content="#673ab8">
     <link rel="manifest" href="/manifest.json">
   </head>
   <body>
+    <div id="app"></div>
   </body>
 </html>

src/index.ts

@@ -1,24 +1,9 @@
 declare module '@webcomponents/custom-elements';
 
-function init() {
+(async function () {
+  if (!('customElements' in self)) {
+    await import('@webcomponents/custom-elements');
+  }
+
   require('./init-app.tsx');
-}
-
-if (!('customElements' in self)) {
-  import(
-    /* webpackChunkName: "wc-polyfill" */
-    '@webcomponents/custom-elements').then(init);
-} else {
-  init();
-}
-
-if (typeof PRERENDER === 'undefined') {
-  window.ga = window.ga || ((...args) => (ga.q = ga.q || []).push(args));
-  ga('create', 'UA-128752250-1', 'auto');
-  ga('set', 'transport', 'beacon');
-  ga('send', 'pageview');
-    // Load the GA script
-  const s = document.createElement('script');
-  s.src = 'https://www.google-analytics.com/analytics.js';
-  document.head!.appendChild(s);
-}
+})();