Simplifying FileSize

README.md

@@ -1,32 +1,5 @@
 # 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'll get an error on first build because of [a stupid bug we haven't fixed
-yet](https://github.com/GoogleChromeLabs/squoosh/issues/251).
-
-You can run the development server with:
-
-```sh
-npm start
-```

_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

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);

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);
-  }
-};

global.d.ts

@@ -1,5 +1,4 @@
 declare const __webpack_public_path__: string;
-declare const PRERENDER: boolean;
 
 declare interface NodeModule {
   hot: any;
@@ -12,9 +11,6 @@ declare interface Window {
 declare namespace JSX {
   interface Element { }
   interface IntrinsicElements { }
-  interface HTMLAttributes {
-    decoding?: string;
-  }
 }
 
 declare module 'classnames' {

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.0.2",
+  "version": "0.0.0",
   "license": "apache-2.0",
   "scripts": {
     "start": "webpack serve --host 0.0.0.0 --hot",
@@ -15,11 +15,10 @@
     }
   },
   "devDependencies": {
-    "@types/node": "^9.6.35",
+    "@types/node": "^9.6.23",
     "@types/pretty-bytes": "^5.1.0",
     "@types/webassembly-js-api": "0.0.1",
-    "@webcomponents/custom-elements": "^1.2.1",
-    "assets-webpack-plugin": "^3.9.7",
+    "@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",
@@ -28,33 +27,21 @@
     "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.19",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.14",
     "babel-preset-env": "^1.7.0",
     "babel-register": "^6.26.0",
-    "classnames": "^2.2.6",
     "clean-webpack-plugin": "^0.1.19",
-    "comlink": "^3.0.3",
-    "copy-webpack-plugin": "^4.5.3",
-    "critters-webpack-plugin": "^2.0.1",
+    "copy-webpack-plugin": "^4.5.2",
     "css-loader": "^0.28.11",
-    "ejs": "^2.6.1",
     "exports-loader": "^0.7.0",
-    "file-drop-element": "^0.0.9",
     "file-loader": "^1.1.11",
     "html-webpack-plugin": "^3.2.0",
-    "husky": "^1.1.2",
-    "idb-keyval": "^3.1.0",
+    "husky": "^1.0.0-rc.13",
     "if-env": "^1.0.4",
-    "linkstate": "^1.1.1",
     "loader-utils": "^1.1.0",
-    "pointer-tracker": "^2.0.3",
-    "minimatch": "^3.0.4",
-    "mini-css-extract-plugin": "^0.4.4",
-    "node-sass": "^4.9.4",
+    "mini-css-extract-plugin": "^0.3.0",
+    "node-sass": "^4.9.3",
     "optimize-css-assets-webpack-plugin": "^4.0.3",
-    "preact": "^8.3.1",
-    "prerender-loader": "^1.2.0",
-    "pretty-bytes": "^5.1.0",
     "progress-bar-webpack-plugin": "^1.11.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^7.1.0",
@@ -68,11 +55,16 @@
     "tslint-react": "^3.6.0",
     "typescript": "^2.9.2",
     "typings-for-css-modules-loader": "^1.7.0",
-    "url-loader": "^1.1.2",
     "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"
   }
 }

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/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

@@ -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),
@@ -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/processor-worker.ts

@@ -7,46 +7,31 @@ import { EncodeOptions as WebPEncoderOptions } from './webp/encoder-meta';
 async function mozjpegEncode(
   data: ImageData, options: MozJPEGEncoderOptions,
 ): Promise<ArrayBuffer> {
-  const { encode } = await import(
-    /* webpackChunkName: "process-mozjpeg-enc" */
-    './mozjpeg/encoder',
-  );
+  const { encode } = await import('./mozjpeg/encoder');
   return encode(data, options);
 }
 
 async function quantize(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
-  const { process } = await import(
-    /* webpackChunkName: "process-imagequant" */
-    './imagequant/processor',
-  );
+  const { process } = await import('./imagequant/processor');
   return process(data, opts);
 }
 
 async function optiPngEncode(
   data: BufferSource, options: OptiPNGEncoderOptions,
 ): Promise<ArrayBuffer> {
-  const { compress } = await import(
-    /* webpackChunkName: "process-optipng" */
-    './optipng/encoder',
-  );
+  const { compress } = await import('./optipng/encoder');
   return compress(data, options);
 }
 
 async function webpEncode(
   data: ImageData, options: WebPEncoderOptions,
 ): Promise<ArrayBuffer> {
-  const { encode } = await import(
-    /* webpackChunkName: "process-webp-enc" */
-    './webp/encoder',
-  );
+  const { encode } = await import('./webp/encoder');
   return encode(data, options);
 }
 
 async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
-  const { decode } = await import(
-    /* webpackChunkName: "process-webp-dec" */
-    './webp/decoder',
-  );
+  const { decode } = await import('./webp/decoder');
   return decode(data);
 }
 

src/codecs/processor.ts

@@ -61,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.ts',
-            { 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;
         }

src/codecs/webp/options.tsx

@@ -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:

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,9 +2,9 @@ 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';
@@ -12,15 +12,6 @@ import '../custom-els/LoadingSpinner';
 // 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',
-);
-
 export interface SourceImage {
   file: File | Fileish;
   data: ImageData;
@@ -45,14 +36,12 @@ 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);
@@ -77,14 +66,9 @@ export default class App extends Component<Props, State> {
   }
 
   @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);
-  }
-
-  @bind
-  private onBack() {
-    this.setState({ file: undefined });
+    this.snackbar.showSnackbar({ message: error });
   }
 
   render({}: Props, { file, Compress }: State) {
@@ -92,9 +76,9 @@ export default class App extends Component<Props, State> {
       <div id="app" class={style.app}>
         <file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
           {(!file)
-            ? <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
+            ? <Intro onFile={this.onIntroPickFile} onError={this.showError} />
             : (Compress)
-              ? <Compress file={file} showSnack={this.showSnack} onBack={this.onBack} />
+              ? <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,10 +35,13 @@ import {
 import { QuantizeOptions } from '../../codecs/imagequant/processor-meta';
 import { ResizeOptions } from '../../codecs/resize/processor-meta';
 import { PreprocessorState } from '../../codecs/preprocessors';
+import FileSize from './FileSize';
+import { DownloadIcon } from '../../lib/icons';
 import { SourceImage } from '../App';
 import Checkbox from '../checkbox';
 import Expander from '../expander';
 import Select from '../select';
+import '../custom-els/LoadingSpinner';
 
 const encoderOptionsComponentMap = {
   [identity.type]: undefined,
@@ -57,29 +60,55 @@ 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
   onEncoderTypeChange(event: Event) {
     const el = event.currentTarget as HTMLSelectElement;
@@ -114,20 +143,30 @@ export default class Options extends Component<Props, State> {
     );
   }
 
+  @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>
@@ -172,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;
@@ -54,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,17 +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 { ToggleIcon, AddIcon, RemoveIcon, BackIcon } from '../../lib/icons';
+import { ToggleIcon, AddIcon, RemoveIcon } from '../../lib/icons';
 import { twoUpHandle } from './custom-els/TwoUp/styles.css';
 
 interface Props {
   originalImage?: ImageData;
-  mobileView: boolean;
+  orientation: 'horizontal' | 'vertical';
   leftCompressed?: ImageData;
   rightCompressed?: ImageData;
   leftImgContain: boolean;
   rightImgContain: boolean;
-  onBack: () => void;
 }
 
 interface State {
@@ -48,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);
     }
@@ -187,21 +177,13 @@ 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, originalImage, onBack }: Props,
+    {
+      orientation, leftCompressed, rightCompressed, leftImgContain, rightImgContain,
+      originalImage,
+    }: Props,
     { scale, editingScale, altBackground }: State,
   ) {
     const leftDraw = this.leftDrawable();
@@ -212,7 +194,7 @@ export default class Output extends Component<Props, State> {
         <two-up
           legacy-clip-compat
           class={style.twoUp}
-          orientation={mobileView ? 'vertical' : 'horizontal'}
+          orientation={orientation}
           // Event redirecting. See onRetargetableEvent.
           onTouchStartCapture={this.onRetargetableEvent}
           onTouchEndCapture={this.onRetargetableEvent}
@@ -253,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}>

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';
 
@@ -38,19 +42,12 @@
   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;
@@ -79,19 +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;
-
-  @media (min-width: 600px) {
-    height: 48px;
-    padding: 0 16px;
-  }
 
   &:focus {
     box-shadow: 0 0 0 2px var(--button-fg);
@@ -135,15 +127,4 @@
 
 .output-canvas {
   flex-shrink: 0;
-  // 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;
-}
-
-.back {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 9px;
 }

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,18 +24,18 @@ import {
     EncoderOptions,
     encoderMap,
 } from '../../codecs/encoders';
+
 import {
   PreprocessorState,
   defaultPreprocessorState,
 } from '../../codecs/preprocessors';
+
 import { decodeImage } from '../../codecs/decoders';
 import { cleanMerge, cleanSet } from '../../lib/clean-modify';
 import Processor from '../../codecs/processor';
 import { VectorResizeOptions, BitmapResizeOptions } from '../../codecs/resize/processor-meta';
-import './custom-els/MultiPanel';
-import Results from '../results';
-import { ExpandIcon, CopyAcrossIconProps } from '../../lib/icons';
-import SnackBarElement from 'src/lib/SnackBar';
+
+type Orientation = 'horizontal' | 'vertical';
 
 export interface SourceImage {
   file: File | Fileish;
@@ -59,8 +59,7 @@ interface EncodedImage {
 
 interface Props {
   file: File | Fileish;
-  showSnack: SnackBarElement['showSnackbar'];
-  onBack: () => void;
+  onError: (msg: string) => void;
 }
 
 interface State {
@@ -70,7 +69,7 @@ interface State {
   loading: boolean;
   loadingCounter: number;
   error?: string;
-  mobileView: boolean;
+  orientation: Orientation;
 }
 
 interface UpdateImageOptions {
@@ -138,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);
@@ -156,14 +155,8 @@ 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')[];
-
 export default class Compress extends Component<Props, State> {
-  widthQuery = window.matchMedia('(max-width: 599px)');
+  widthQuery = window.matchMedia('(min-width: 500px)');
 
   state: State = {
     source: undefined,
@@ -185,7 +178,7 @@ export default class Compress extends Component<Props, State> {
         loading: false,
       },
     ],
-    mobileView: this.widthQuery.matches,
+    orientation: this.widthQuery.matches ? 'horizontal' : 'vertical',
   };
 
   private readonly encodeCache = new ResultCache();
@@ -196,13 +189,11 @@ export default class Compress extends Component<Props, State> {
     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 {
@@ -254,24 +245,12 @@ export default class Compress extends Component<Props, State> {
     }
   }
 
-  private async onCopyToOtherClick(index: 0 | 1) {
+  private onCopyToOtherClick(index: 0 | 1) {
     const otherIndex = (index + 1) % 2;
-    const oldSettings = this.state.images[otherIndex];
 
     this.setState({
       images: cleanSet(this.state.images, otherIndex, this.state.images[index]),
     });
-
-    const result = await this.props.showSnack('Settings copied across', {
-      timeout: 5000,
-      actions: ['undo', 'dismiss'],
-    });
-
-    if (result !== 'undo') return;
-
-    this.setState({
-      images: cleanSet(this.state.images, otherIndex, oldSettings),
-    });
   }
 
   @bind
@@ -334,7 +313,7 @@ export default class Compress extends Component<Props, State> {
       console.error(err);
       // 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 });
     }
   }
@@ -393,7 +372,7 @@ export default class Compress extends Component<Props, State> {
         }
       } catch (err) {
         if (err.name === 'AbortError') return;
-        this.props.showSnack(`Processing error (type=${image.encoderState.type}): ${err}`);
+        this.props.onError(`Processing error (type=${image.encoderState.type}): ${err}`);
         throw err;
       }
     }
@@ -416,74 +395,36 @@ export default class Compress extends Component<Props, State> {
     this.setState({ images });
   }
 
-  render({ onBack }: Props, { loading, images, source, mobileView }: State) {
+  render({ }: Props, { loading, images, source, orientation }: State) {
     const [leftImage, rightImage] = images;
     const [leftImageData, rightImageData] = images.map(i => i.data);
 
-    const options = images.map((image, index) => (
-      <Options
-        source={source}
-        mobileView={mobileView}
-        preprocessorState={image.preprocessorState}
-        encoderState={image.encoderState}
-        onEncoderTypeChange={this.onEncoderTypeChange.bind(this, index)}
-        onEncoderOptionsChange={this.onEncoderOptionsChange.bind(this, index)}
-        onPreprocessorOptionsChange={this.onPreprocessorOptionsChange.bind(this, index)}
-      />
-    ));
-
-    const copyDirections =
-      (mobileView ? ['down', 'up'] : ['right', 'left']) as CopyAcrossIconProps['copyDirection'][];
-
-    const results = images.map((image, index) => (
-      <Results
-        downloadUrl={image.downloadUrl}
-        imageFile={image.file}
-        source={source}
-        loading={loading || image.loading}
-        copyDirection={copyDirections[index]}
-        onCopyToOtherClick={this.onCopyToOtherClick.bind(this, index)}
-        buttonPosition={mobileView ? 'stack-right' : buttonPositions[index]}
-      >
-        {!mobileView ? null : [
-          <ExpandIcon class={style.expandIcon} key="expand-icon"/>,
-          `${resultTitles[index]} (${encoderMap[image.encoderState.type].label})`,
-        ]}
-      </Results>
-    ));
-
     return (
-      <div class={style.compress}>
+      <div class={`${style.compress} ${style[orientation]}`}>
         <Output
           originalImage={source && source.data}
-          mobileView={mobileView}
+          orientation={orientation}
           leftCompressed={leftImageData}
           rightCompressed={rightImageData}
           leftImgContain={leftImage.preprocessorState.resize.fitMethod === 'cover'}
           rightImgContain={rightImage.preprocessorState.resize.fitMethod === 'cover'}
-          onBack={onBack}
         />
-        {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/style.scss

@@ -3,72 +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;
-
-  // 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,7 +38,7 @@
 
 .logo-sizer {
   width: 90%;
-  max-width: 52vh;
+  max-width: 480px;
   margin: 0 auto;
 }
 
@@ -51,7 +47,7 @@
 }
 
 .open-image-guide {
-  font: 300 11vw intro-text, sans-serif;
+  font: 300 11vw intro-text;
   margin-bottom: 0;
 
   @media (min-width: 460px) {

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,18 +31,12 @@ export default class MultiPanel extends HTMLElement {
     this._childrenChange();
   }
 
-  attributeChangedCallback(name: string, oldValue: string | null, newValue: string | null) {
-    if (name === openOneOnlyAttr && newValue === null) {
-      this._closeAll({ exceptFirst: true });
-    }
-  }
-
   // Click event handler
   private _onClick(event: MouseEvent) {
-    const el = event.target as HTMLElement;
+    const el = event.target as Element;
     const heading = getClosestHeading(el);
     if (!heading) return;
-    this._toggle(heading);
+    this._expand(heading);
   }
 
   // KeyDown event handler
@@ -115,8 +53,7 @@ export default class MultiPanel extends HTMLElement {
     // don’t handle modifier shortcuts used by assistive technology.
     if (event.altKey) return;
 
-    let newHeading: HTMLElement | undefined;
-
+    let newHeading:HTMLElement | undefined;
     switch (event.key) {
       case 'ArrowLeft':
       case 'ArrowUp':
@@ -140,7 +77,7 @@ export default class MultiPanel extends HTMLElement {
       case 'Enter':
       case ' ':
       case 'Spacebar':
-        this._toggle(heading);
+        this._expand(heading);
         break;
 
       // Any other key press is ignored and passed back to the browser.
@@ -156,32 +93,26 @@ export default class MultiPanel extends HTMLElement {
     }
   }
 
-  private _toggle(heading: HTMLElement) {
+  private _expand(heading: Element) {
     if (!heading) return;
+    const content = heading.nextElementSibling;
+
+    // if there is no content, nothing to expand
+    if (!content) return;
 
     // toggle expanded and aria-expanded attributes
-    if (heading.hasAttribute('content-expanded')) {
-      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.
@@ -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/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,25 +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);
-}
+})();

src/init-app.tsx

@@ -4,13 +4,13 @@ import './style';
 import App from './components/App';
 
 // Find the outermost Element in our server-rendered HTML structure.
-let root = document.getElementById('app_root') as Element;
+let root = document.querySelector('#app') || undefined;
 
 // "attach" the client-side rendering to it, updating the DOM in-place instead of replacing:
 root = render(<App />, document.body, root);
-root.setAttribute('id', 'app_root');
 
-if (process.env.NODE_ENV !== 'production') {
+// In production, this entire condition is removed.
+if (process.env.NODE_ENV === 'development') {
   // Enable support for React DevTools and some helpful console warnings:
   require('preact/debug');
 

src/lib/PointerTracker/index.ts

@@ -0,0 +1,255 @@
+import { bind } from '../../lib/initial-util';
+const enum Button { Left }
+
+export class Pointer {
+  /** x offset from the top of the document */
+  pageX: number;
+  /** y offset from the top of the document */
+  pageY: number;
+  /** x offset from the top of the viewport */
+  clientX: number;
+  /** y offset from the top of the viewport */
+  clientY: number;
+  /** ID for this pointer */
+  id: number = -1;
+  /** The platform object used to create this Pointer */
+  nativePointer: Touch | PointerEvent | MouseEvent;
+
+  constructor (nativePointer: Touch | PointerEvent | MouseEvent) {
+    this.nativePointer = nativePointer;
+    this.pageX = nativePointer.pageX;
+    this.pageY = nativePointer.pageY;
+    this.clientX = nativePointer.clientX;
+    this.clientY = nativePointer.clientY;
+
+    if (self.Touch && nativePointer instanceof Touch) {
+      this.id = nativePointer.identifier;
+    } else if (isPointerEvent(nativePointer)) { // is PointerEvent
+      this.id = nativePointer.pointerId;
+    }
+  }
+
+  /**
+   * Returns an expanded set of Pointers for high-resolution inputs.
+   */
+  getCoalesced(): Pointer[] {
+    if ('getCoalescedEvents' in this.nativePointer) {
+      return this.nativePointer.getCoalescedEvents().map(p => new Pointer(p));
+    }
+    return [this];
+  }
+}
+
+const isPointerEvent = (event: any): event is PointerEvent =>
+  self.PointerEvent && event instanceof PointerEvent;
+
+const noop = () => {};
+
+export type InputEvent = TouchEvent | PointerEvent | MouseEvent;
+type StartCallback = (pointer: Pointer, event: InputEvent) => boolean;
+type MoveCallback = (
+  previousPointers: Pointer[],
+  changedPointers: Pointer[],
+  event: InputEvent,
+) => void;
+type EndCallback = (pointer: Pointer, event: InputEvent) => void;
+
+interface PointerTrackerCallbacks {
+  /**
+   * Called when a pointer is pressed/touched within the element.
+   *
+   * @param pointer The new pointer.
+   * This pointer isn't included in this.currentPointers or this.startPointers yet.
+   * @param event The event related to this pointer.
+   *
+   * @returns Whether you want to track this pointer as it moves.
+   */
+  start?: StartCallback;
+  /**
+   * Called when pointers have moved.
+   *
+   * @param previousPointers The state of the pointers before this event.
+   * This contains the same number of pointers, in the same order, as
+   * this.currentPointers and this.startPointers.
+   * @param changedPointers The pointers that have changed since the last move callback.
+   * @param event The event related to the pointer changes.
+   */
+  move?: MoveCallback;
+  /**
+   * Called when a pointer is released.
+   *
+   * @param pointer The final state of the pointer that ended. This
+   * pointer is now absent from this.currentPointers and
+   * this.startPointers.
+   * @param event The event related to this pointer.
+   */
+  end?: EndCallback;
+}
+
+/**
+ * Track pointers across a particular element
+ */
+export class PointerTracker {
+  /**
+   * State of the tracked pointers when they were pressed/touched.
+   */
+  readonly startPointers: Pointer[] = [];
+  /**
+   * Latest state of the tracked pointers. Contains the same number
+   * of pointers, and in the same order as this.startPointers.
+   */
+  readonly currentPointers: Pointer[] = [];
+
+  private _startCallback: StartCallback;
+  private _moveCallback: MoveCallback;
+  private _endCallback: EndCallback;
+
+  /**
+   * Track pointers across a particular element
+   *
+   * @param element Element to monitor.
+   * @param callbacks
+   */
+  constructor (private _element: HTMLElement, callbacks: PointerTrackerCallbacks) {
+    const {
+      start = () => true,
+      move = noop,
+      end = noop,
+    } = callbacks;
+
+    this._startCallback = start;
+    this._moveCallback = move;
+    this._endCallback = end;
+
+    // Add listeners
+    if (self.PointerEvent) {
+      this._element.addEventListener('pointerdown', this._pointerStart);
+    } else {
+      this._element.addEventListener('mousedown', this._pointerStart);
+      this._element.addEventListener('touchstart', this._touchStart);
+      this._element.addEventListener('touchmove', this._move);
+      this._element.addEventListener('touchend', this._touchEnd);
+    }
+  }
+
+  /**
+   * Call the start callback for this pointer, and track it if the user wants.
+   *
+   * @param pointer Pointer
+   * @param event Related event
+   * @returns Whether the pointer is being tracked.
+   */
+  private _triggerPointerStart (pointer: Pointer, event: InputEvent): boolean {
+    if (!this._startCallback(pointer, event)) return false;
+    this.currentPointers.push(pointer);
+    this.startPointers.push(pointer);
+    return true;
+  }
+
+  /**
+   * Listener for mouse/pointer starts. Bound to the class in the constructor.
+   *
+   * @param event This will only be a MouseEvent if the browser doesn't support
+   * pointer events.
+   */
+  @bind
+  private _pointerStart (event: PointerEvent | MouseEvent) {
+    if (event.button !== Button.Left) return;
+    if (!this._triggerPointerStart(new Pointer(event), event)) return;
+
+    // Add listeners for additional events.
+    // The listeners may already exist, but no harm in adding them again.
+    if (isPointerEvent(event)) {
+      this._element.setPointerCapture(event.pointerId);
+      this._element.addEventListener('pointermove', this._move);
+      this._element.addEventListener('pointerup', this._pointerEnd);
+    } else { // MouseEvent
+      window.addEventListener('mousemove', this._move);
+      window.addEventListener('mouseup', this._pointerEnd);
+    }
+  }
+
+  /**
+   * Listener for touchstart. Bound to the class in the constructor.
+   * Only used if the browser doesn't support pointer events.
+   */
+  @bind
+  private _touchStart (event: TouchEvent) {
+    for (const touch of Array.from(event.changedTouches)) {
+      this._triggerPointerStart(new Pointer(touch), event);
+    }
+  }
+
+  /**
+   * Listener for pointer/mouse/touch move events.
+   * Bound to the class in the constructor.
+   */
+  @bind
+  private _move (event: PointerEvent | MouseEvent | TouchEvent) {
+    const previousPointers = this.currentPointers.slice();
+    const changedPointers = ('changedTouches' in event) ? // Shortcut for 'is touch event'.
+      Array.from(event.changedTouches).map(t => new Pointer(t)) :
+      [new Pointer(event)];
+    const trackedChangedPointers = [];
+
+    for (const pointer of changedPointers) {
+      const index = this.currentPointers.findIndex(p => p.id === pointer.id);
+      if (index === -1) continue; // Not a pointer we're tracking
+      trackedChangedPointers.push(pointer);
+      this.currentPointers[index] = pointer;
+    }
+
+    if (trackedChangedPointers.length === 0) return;
+
+    this._moveCallback(previousPointers, trackedChangedPointers, event);
+  }
+
+  /**
+   * Call the end callback for this pointer.
+   *
+   * @param pointer Pointer
+   * @param event Related event
+   */
+  @bind
+  private _triggerPointerEnd (pointer: Pointer, event: InputEvent): boolean {
+    const index = this.currentPointers.findIndex(p => p.id === pointer.id);
+    // Not a pointer we're interested in?
+    if (index === -1) return false;
+
+    this.currentPointers.splice(index, 1);
+    this.startPointers.splice(index, 1);
+
+    this._endCallback(pointer, event);
+    return true;
+  }
+
+  /**
+   * Listener for mouse/pointer ends. Bound to the class in the constructor.
+   * @param event This will only be a MouseEvent if the browser doesn't support
+   * pointer events.
+   */
+  @bind
+  private _pointerEnd (event: PointerEvent | MouseEvent) {
+    if (!this._triggerPointerEnd(new Pointer(event), event)) return;
+
+    if (isPointerEvent(event)) {
+      if (this.currentPointers.length) return;
+      this._element.removeEventListener('pointermove', this._move);
+      this._element.removeEventListener('pointerup', this._pointerEnd);
+    } else { // MouseEvent
+      window.removeEventListener('mousemove', this._move);
+      window.removeEventListener('mouseup', this._pointerEnd);
+    }
+  }
+
+  /**
+   * Listener for touchend. Bound to the class in the constructor.
+   * Only used if the browser doesn't support pointer events.
+   */
+  @bind
+  private _touchEnd (event: TouchEvent) {
+    for (const touch of Array.from(event.changedTouches)) {
+      this._triggerPointerEnd(new Pointer(touch), event);
+    }
+  }
+}

src/lib/PointerTracker/missing-types.d.ts

@@ -0,0 +1,10 @@
+// TypeScript, you make me sad.
+// https://github.com/Microsoft/TypeScript/issues/18756
+interface Window {
+  PointerEvent: typeof PointerEvent;
+  Touch: typeof Touch;
+}
+
+interface PointerEvent {
+  getCoalescedEvents(): PointerEvent[];
+}

src/lib/SnackBar/index.ts

@@ -1,93 +1,114 @@
-import * as style from './styles.css';
+import './styles.css';
+
+const DEFAULT_TIMEOUT = 2750;
 
 export interface SnackOptions {
+  message: string;
   timeout?: number;
-  actions?: string[];
+  actionText?: string;
+  actionHandler?: () => boolean | null;
 }
 
-function createSnack(message: string, options: SnackOptions): [Element, Promise<string>] {
-  const {
-    timeout = 0,
-    actions = ['dismiss'],
-  } = options;
+export interface SnackShowResult {
+  action: boolean;
+}
 
-  const el = document.createElement('div');
-  el.className = style.snackbar;
-  el.setAttribute('aria-live', 'assertive');
-  el.setAttribute('aria-atomic', 'true');
-  el.setAttribute('aria-hidden', 'false');
+class Snack {
+  private _onremove: ((result: SnackShowResult) => void)[] = [];
+  private _options: SnackOptions;
+  private _element: Element = document.createElement('div');
+  private _text: Element = document.createElement('div');
+  private _button: Element = document.createElement('button');
+  private _showing = false;
+  private _closeTimer?: number;
+  private _result: SnackShowResult = {
+    action: false,
+  };
 
-  const text = document.createElement('div');
-  text.className = style.text;
-  text.textContent = message;
-  el.appendChild(text);
+  constructor (options: SnackOptions, callback?: (result: SnackShowResult) => void) {
+    this._options = options;
 
-  const result = new Promise<string>((resolve) => {
-    let timeoutId: number;
+    this._element.className = 'snackbar';
+    this._element.setAttribute('aria-live', 'assertive');
+    this._element.setAttribute('aria-atomic', 'true');
+    this._element.setAttribute('aria-hidden', 'true');
 
-    // Add action buttons
-    for (const action of actions) {
-      const button = document.createElement('button');
-      button.className = style.button;
-      button.textContent = action;
-      button.addEventListener('click', () => {
-        clearTimeout(timeoutId);
-        resolve(action);
+    this._text.className = 'snackbar--text';
+    this._text.textContent = options.message;
+    this._element.appendChild(this._text);
+
+    if (options.actionText) {
+      this._button.className = 'snackbar--button';
+      this._button.textContent = options.actionText;
+      this._button.addEventListener('click', () => {
+        if (this._showing) {
+          if (options.actionHandler && options.actionHandler() === false) return;
+          this._result.action = true;
+        }
+        this.hide();
       });
-      el.appendChild(button);
+      this._element.appendChild(this._button);
     }
 
-    // Add timeout
-    if (timeout) {
-      timeoutId = self.setTimeout(
-        () => resolve(''),
-        timeout,
-      );
+    if (callback) {
+      this._onremove.push(callback);
     }
-  });
+  }
 
-  return [el, result];
-}
+  cancelTimer () {
+    if (this._closeTimer != null) clearTimeout(this._closeTimer);
+  }
 
-export default class SnackBarElement extends HTMLElement {
-  private _snackbars: [string, SnackOptions, (action: Promise<string>) => void][] = [];
-  private _processingQueue = false;
-
-  /**
-   * Show a snackbar. Returns a promise for the name of the action clicked, or an empty string if no
-   * action is clicked.
-   */
-  showSnackbar(message: string, options: SnackOptions = {}): Promise<string> {
-    return new Promise<string>((resolve) => {
-      this._snackbars.push([message, options, resolve]);
-      if (!this._processingQueue) this._processQueue();
+  show (parent: Element): Promise<SnackShowResult> {
+    if (this._showing) return Promise.resolve(this._result);
+    this._showing = true;
+    this.cancelTimer();
+    if (parent !== this._element.parentNode) {
+      parent.appendChild(this._element);
+    }
+    this._element.removeAttribute('aria-hidden');
+    this._closeTimer = setTimeout(this.hide.bind(this), this._options.timeout || DEFAULT_TIMEOUT);
+    return new Promise((resolve) => {
+      this._onremove.push(resolve);
     });
   }
 
-  private async _processQueue() {
-    this._processingQueue = true;
+  hide () {
+    if (!this._showing) return;
+    this._showing = false;
+    this.cancelTimer();
+    this._element.addEventListener('animationend', this.remove.bind(this));
+    this._element.setAttribute('aria-hidden', 'true');
+  }
 
-    while (this._snackbars[0]) {
-      const [message, options, resolver] = this._snackbars[0];
-      const [el, result] = createSnack(message, options);
-      // Pass the result back to the original showSnackbar call.
-      resolver(result);
-      this.appendChild(el);
+  remove () {
+    this.cancelTimer();
+    const parent = this._element.parentNode;
+    if (parent) parent.removeChild(this._element);
+    this._onremove.forEach(f => f(this._result));
+    this._onremove = [];
+  }
+}
 
-      // Wait for the user to click an action, or for the snack to timeout.
-      await result;
+export default class SnackBarElement extends HTMLElement {
+  private _snackbars: Snack[] = [];
+  private _processingStack = false;
 
-      // Transition the snack away.
-      el.setAttribute('aria-hidden', 'true');
-      await new Promise((resolve) => {
-        el.addEventListener('animationend', () => resolve());
-      });
-      el.remove();
+  showSnackbar (options: SnackOptions): Promise<SnackShowResult> {
+    return new Promise((resolve) => {
+      const snack = new Snack(options, resolve);
+      this._snackbars.push(snack);
+      this._processStack();
+    });
+  }
 
-      this._snackbars.shift();
-    }
-
-    this._processingQueue = false;
+  private async _processStack () {
+    if (this._processingStack === true || this._snackbars.length === 0) return;
+    this._processingStack = true;
+    await this._snackbars[0].show(this);
+    this._snackbars.shift();
+    this._processingStack = false;
+    this._processStack();
   }
 }
 

src/lib/SnackBar/styles.css

@@ -22,6 +22,7 @@ snack-bar {
   transform-origin: center;
   color: #eee;
   z-index: 100;
+  pointer-events: none;
   cursor: default;
   will-change: transform;
   animation: snackbar-show 300ms ease forwards 1;
@@ -52,13 +53,13 @@ snack-bar {
   }
 }
 
-.text {
+.snackbar--text {
   flex: 1 1 auto;
   padding: 16px;
   font-size: 100%;
 }
 
-.button {
+.snackbar--button {
   position: relative;
   flex: 0 1 auto;
   padding: 8px;
@@ -74,15 +75,16 @@ snack-bar {
   font-size: 100%;
   text-transform: uppercase;
   text-align: center;
+  pointer-events: all;
   cursor: pointer;
   overflow: hidden;
   transition: background-color 200ms ease;
   outline: none;
 }
-.button:hover {
+.snackbar--button:hover {
   background-color: rgba(0,0,0,0.15);
 }
-.button:focus:before {
+.snackbar--button:focus:before {
   content: '';
   position: absolute;
   left: 50%;

src/lib/icons.tsx

@@ -41,40 +41,3 @@ export const CheckedIcon = (props: JSX.HTMLAttributes) => (
     <path d="M21.3 0H2.7A2.7 2.7 0 0 0 0 2.7v18.6A2.7 2.7 0 0 0 2.7 24h18.6a2.7 2.7 0 0 0 2.7-2.7V2.7A2.7 2.7 0 0 0 21.3 0zm-12 18.7L2.7 12l1.8-1.9L9.3 15 19.5 4.8l1.8 1.9z"/>
   </Icon>
 );
-
-export const ExpandIcon = (props: JSX.HTMLAttributes) => (
-  <Icon {...props}>
-    <path d="M16.6 8.6L12 13.2 7.4 8.6 6 10l6 6 6-6z"/>
-  </Icon>
-);
-
-export const BackIcon = (props: JSX.HTMLAttributes) => (
-  <Icon {...props}>
-    <path d="M20 11H7.8l5.6-5.6L12 4l-8 8 8 8 1.4-1.4L7.8 13H20v-2z"/>
-  </Icon>
-);
-
-const copyAcrossRotations = {
-  up: 90, right: 180, down: -90, left: 0,
-};
-
-export interface CopyAcrossIconProps extends JSX.HTMLAttributes {
-  copyDirection: keyof typeof copyAcrossRotations;
-}
-
-export const CopyAcrossIcon = (props: CopyAcrossIconProps) => {
-  const { copyDirection, ...otherProps } = props;
-  const id = 'point-' + copyDirection;
-  const rotation = copyAcrossRotations[copyDirection];
-
-  return (
-    <Icon {...otherProps}>
-      <defs>
-        <clipPath id={id}>
-          <path d="M-12-12v24h24v-24zM4.5 2h-4v3l-5-5 5-5v3h4z" transform={`translate(12 13) rotate(${rotation})`}/>
-        </clipPath>
-      </defs>
-      <path clip-path={`url(#${id})`} d="M19 3h-4.2c-.4-1.2-1.5-2-2.8-2s-2.4.8-2.8 2H5a2 2 0 0 0-2 2v14c0 1.1.9 2 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zm-7 0a1 1 0 0 1 0 2c-.6 0-1-.4-1-1s.4-1 1-1z"/>
-    </Icon>
-  );
-};

src/lib/offliner.ts

@@ -1,94 +0,0 @@
-import { get, set } from 'idb-keyval';
-
-// Just for TypeScript
-import SnackBarElement from './SnackBar';
-
-/** Tell the service worker to skip waiting */
-async function skipWaiting() {
-  const reg = await navigator.serviceWorker.getRegistration();
-  if (!reg || !reg.waiting) return;
-  reg.waiting.postMessage('skip-waiting');
-}
-
-/** Find the service worker that's 'active' or closest to 'active' */
-async function getMostActiveServiceWorker() {
-  const reg = await navigator.serviceWorker.getRegistration();
-  if (!reg) return null;
-  return reg.active || reg.waiting || reg.installing;
-}
-
-/** Wait for an installing worker */
-async function installingWorker(reg: ServiceWorkerRegistration): Promise<ServiceWorker> {
-  if (reg.installing) return reg.installing;
-  return new Promise<ServiceWorker>((resolve) => {
-    reg.addEventListener(
-      'updatefound',
-      () => resolve(reg.installing!),
-      { once: true },
-    );
-  });
-}
-
-/** Wait a service worker to become waiting */
-async function updateReady(reg: ServiceWorkerRegistration): Promise<void> {
-  if (reg.waiting) return;
-  const installing = await installingWorker(reg);
-  return new Promise<void>((resolve) => {
-    installing.addEventListener('statechange', () => {
-      if (installing.state === 'installed') resolve();
-    });
-  });
-}
-
-/** Set up the service worker and monitor changes */
-export async function offliner(showSnack: SnackBarElement['showSnackbar']) {
-  // This needs to be a typeof because Webpack.
-  if (typeof PRERENDER === 'boolean') return;
-
-  if (process.env.NODE_ENV === 'production') {
-    navigator.serviceWorker.register('../sw');
-  }
-
-  const hasController = !!navigator.serviceWorker.controller;
-
-  // Look for changes in the controller
-  navigator.serviceWorker.addEventListener('controllerchange', async () => {
-    // Is it the first install?
-    if (!hasController) {
-      showSnack('Ready to work offline', { timeout: 5000 });
-      return;
-    }
-
-    // Otherwise reload (the user will have agreed to this).
-    location.reload();
-  });
-
-  const reg = await navigator.serviceWorker.getRegistration();
-  // Service worker not registered yet.
-  if (!reg) return;
-  // Look for updates
-  await updateReady(reg);
-
-  // Ask the user if they want to update.
-  const result = await showSnack('Update available', {
-    actions: ['reload', 'dismiss'],
-  });
-
-  // Tell the waiting worker to activate, this will change the controller and cause a reload (see
-  // 'controllerchange')
-  if (result === 'reload') skipWaiting();
-}
-
-/**
- * Tell the service worker the main app has loaded. If it's the first time the service worker has
- * heard about this, cache the heavier assets like codecs.
- */
-export async function mainAppLoaded() {
-  // If the user has already interacted, no need to tell the service worker anything.
-  const userInteracted = await get<boolean | undefined>('user-interacted');
-  if (userInteracted) return;
-  set('user-interacted', true);
-  const serviceWorker = await getMostActiveServiceWorker();
-  if (!serviceWorker) return; // Service worker not installing yet.
-  serviceWorker.postMessage('cache-all');
-}

src/lib/util.ts

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

src/manifest.json

@@ -5,12 +5,12 @@
   "display": "standalone",
   "orientation": "portrait",
   "background_color": "#fff",
-  "theme_color": "#f78f21",
+  "theme_color": "#673ab8",
   "icons": [
     {
-      "src": "/assets/icon-large.png",
+      "src": "/assets/icon.png",
       "type": "image/png",
-      "sizes": "1024x1024"
+      "sizes": "512x512"
     }
   ]
-}
+}

src/missing-types.d.ts

@@ -27,19 +27,3 @@ declare module '*.wasm' {
   const content: string;
   export default content;
 }
-
-declare module 'url-loader!*' {
-  const value: string;
-  export default value;
-}
-
-declare var VERSION: string;
-
-declare var ga: {
-  (...args: any[]): void;
-  q: any[];
-};
-
-interface Window {
-  ga: typeof ga;
-}

src/style/index.scss

@@ -2,6 +2,7 @@
 
 html, body {
   height: 100%;
+  width: 100%;
   padding: 0;
   margin: 0;
   font: 12px/1.3 system-ui, -apple-system, BlinkMacSystemFont, Roboto, Helvetica, sans-serif;

src/sw/index.ts

@@ -1,69 +0,0 @@
-import {
-  cacheOrNetworkAndCache, cleanupCache, cacheOrNetwork, cacheBasics, cacheAdditionalProcessors,
-} from './util';
-import { get } from 'idb-keyval';
-
-// Give TypeScript the correct global.
-declare var self: ServiceWorkerGlobalScope;
-// This is populated by webpack.
-declare var BUILD_ASSETS: string[];
-
-const versionedCache = 'static-' + VERSION;
-const dynamicCache = 'dynamic';
-const expectedCaches = [versionedCache, dynamicCache];
-
-self.addEventListener('install', (event) => {
-  event.waitUntil(async function () {
-    const promises = [];
-    promises.push(cacheBasics(versionedCache, BUILD_ASSETS));
-
-    // If the user has already interacted with the app, update the codecs too.
-    if (await get('user-interacted')) {
-      promises.push(cacheAdditionalProcessors(versionedCache, BUILD_ASSETS));
-    }
-
-    await Promise.all(promises);
-  }());
-});
-
-self.addEventListener('activate', (event) => {
-  self.clients.claim();
-
-  event.waitUntil(async function () {
-    // Remove old caches.
-    const promises = (await caches.keys()).map((cacheName) => {
-      if (!expectedCaches.includes(cacheName)) return caches.delete(cacheName);
-    });
-
-    await Promise.all<any>(promises);
-  }());
-});
-
-self.addEventListener('fetch', (event) => {
-  // We only care about GET.
-  if (event.request.method !== 'GET') return;
-
-  const url = new URL(event.request.url);
-
-  // Don't care about other-origin URLs
-  if (url.origin !== location.origin) return;
-
-  if (url.pathname.startsWith('/demo-') || url.pathname.startsWith('/wc-polyfill')) {
-    cacheOrNetworkAndCache(event, dynamicCache);
-    cleanupCache(event, dynamicCache, BUILD_ASSETS);
-    return;
-  }
-
-  cacheOrNetwork(event);
-});
-
-self.addEventListener('message', (event) => {
-  switch (event.data) {
-    case 'cache-all':
-      event.waitUntil(cacheAdditionalProcessors(versionedCache, BUILD_ASSETS));
-      break;
-    case 'skip-waiting':
-      self.skipWaiting();
-      break;
-  }
-});

src/sw/missing-types.d.ts

@@ -1 +0,0 @@
-import '../missing-types';

src/sw/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/sw/util.ts

@@ -1,106 +0,0 @@
-import webpDataUrl from 'url-loader!../codecs/tiny.webp';
-
-export function cacheOrNetwork(event: FetchEvent): void {
-  event.respondWith(async function () {
-    const cachedResponse = await caches.match(event.request);
-    return cachedResponse || fetch(event.request);
-  }());
-}
-
-export function cacheOrNetworkAndCache(event: FetchEvent, cacheName: string): void {
-  event.respondWith(async function () {
-    const { request } = event;
-    // Return from cache if possible.
-    const cachedResponse = await caches.match(request);
-    if (cachedResponse) return cachedResponse;
-
-    // Else go to the network.
-    const response = await fetch(request);
-    const responseToCache = response.clone();
-
-    event.waitUntil(async function () {
-      // Cache what we fetched.
-      const cache = await caches.open(cacheName);
-      await cache.put(request, responseToCache);
-    }());
-
-    // Return the network response.
-    return response;
-  }());
-}
-
-export function cleanupCache(event: FetchEvent, cacheName: string, keepAssets: string[]) {
-  event.waitUntil(async function () {
-    const cache = await caches.open(cacheName);
-
-    // Clean old entries from the dynamic cache.
-    const requests = await cache.keys();
-    const promises = requests.map((cachedRequest) => {
-      // Get pathname without leading /
-      const assetPath = new URL(cachedRequest.url).pathname.slice(1);
-      // If it isn't one of our keepAssets, we don't need it anymore.
-      if (!keepAssets.includes(assetPath)) return cache.delete(cachedRequest);
-    });
-
-    await Promise.all<any>(promises);
-  }());
-}
-
-function getAssetsWithPrefix(assets: string[], prefixes: string[]) {
-  return assets.filter(
-    asset => prefixes.some(prefix => asset.startsWith(prefix)),
-  );
-}
-
-export async function cacheBasics(cacheName: string, buildAssets: string[]) {
-  const toCache = ['/', '/assets/favicon.ico'];
-
-  const prefixesToCache = [
-    // Main app JS & CSS:
-    'main-app.',
-    // Service worker handler:
-    'offliner.',
-    // Little icons for the demo images on the homescreen:
-    'icon-demo-',
-    // Site logo:
-    'logo.',
-  ];
-
-  const prefixMatches = getAssetsWithPrefix(buildAssets, prefixesToCache);
-
-  toCache.push(...prefixMatches);
-
-  const cache = await caches.open(cacheName);
-  await cache.addAll(toCache);
-}
-
-export async function cacheAdditionalProcessors(cacheName: string, buildAssets: string[]) {
-  let toCache = [];
-
-  const prefixesToCache = [
-    // Worker which handles image processing:
-    'processor-worker.',
-    // processor-worker imports:
-    'process-',
-  ];
-
-  const prefixMatches = getAssetsWithPrefix(buildAssets, prefixesToCache);
-  const wasm = buildAssets.filter(asset => asset.endsWith('.wasm'));
-
-  toCache.push(...prefixMatches, ...wasm);
-
-  const supportsWebP = await (async () => {
-    if (!self.createImageBitmap) return false;
-    const response = await fetch(webpDataUrl);
-    const blob = await response.blob();
-    return createImageBitmap(blob).then(() => true, () => false);
-  })();
-
-  // No point caching the WebP decoder if it's supported natively:
-  if (supportsWebP) {
-    toCache = toCache.filter(asset => !/webp[\-_]dec/.test(asset));
-  }
-
-  const cache = await caches.open(cacheName);
-  await cache.addAll(toCache);
-}

tsconfig.json

@@ -12,6 +12,5 @@
     "jsxFactory": "h",
     "allowJs": false,
     "baseUrl": "."
-  },
-  "exclude": ["src/sw/**/*"]
-}
+  }
+}

webpack.config.js

@@ -8,20 +8,16 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const HtmlPlugin = require('html-webpack-plugin');
 const ScriptExtHtmlPlugin = require('script-ext-html-webpack-plugin');
+const ReplacePlugin = require('webpack-plugin-replace');
 const CopyPlugin = require('copy-webpack-plugin');
 const WatchTimestampsPlugin = require('./config/watch-timestamps-plugin');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const WorkerPlugin = require('worker-plugin');
-const AutoSWPlugin = require('./config/auto-sw-plugin');
-const CrittersPlugin = require('critters-webpack-plugin');
-const AssetTemplatePlugin = require('./config/asset-template-plugin');
 
 function readJson (filename) {
   return JSON.parse(fs.readFileSync(filename));
 }
 
-const VERSION = readJson('./package.json').version;
-
 module.exports = function (_, env) {
   const isProd = env.mode === 'production';
   const nodeModules = path.join(__dirname, 'node_modules');
@@ -29,19 +25,16 @@ module.exports = function (_, env) {
     path.join(__dirname, 'src/components'),
     path.join(__dirname, 'src/codecs'),
     path.join(__dirname, 'src/custom-els'),
-    path.join(__dirname, 'src/lib'),
   ];
 
   return {
     mode: isProd ? 'production' : 'development',
-    entry: {
-      'first-interaction': './src/index'
-    },
+    entry: './src/index',
     devtool: isProd ? 'source-map' : 'inline-source-map',
     stats: 'minimal',
     output: {
       filename: isProd ? '[name].[chunkhash:5].js' : '[name].js',
-      chunkFilename: '[name].[chunkhash:5].js',
+      chunkFilename: '[name].chunk.[chunkhash:5].js',
       path: path.join(__dirname, 'build'),
       publicPath: '/',
       globalObject: 'self'
@@ -114,7 +107,7 @@ module.exports = function (_, env) {
               loader: 'typings-for-css-modules-loader',
               options: {
                 modules: true,
-                localIdentName: isProd ? '[hash:base64:5]' : '[local]__[hash:base64:5]',
+                localIdentName: '[local]__[hash:base64:5]',
                 namedExport: true,
                 camelCase: true,
                 importLoaders: 1,
@@ -144,6 +137,12 @@ module.exports = function (_, env) {
           exclude: nodeModules,
           loader: 'ts-loader'
         },
+        {
+          test: /\.jsx?$/,
+          loader: 'babel-loader',
+          // Don't respect any Babel RC files found on the filesystem:
+          options: Object.assign(readJson('.babelrc'), { babelrc: false })
+        },
         {
           // All the codec files define a global with the same name as their file name. `exports-loader` attaches those to `module.exports`.
           test: /\/codecs\/.*\.js$/,
@@ -154,17 +153,11 @@ module.exports = function (_, env) {
           // This is needed to make webpack NOT process wasm files.
           // See https://github.com/webpack/webpack/issues/6725
           type: 'javascript/auto',
-          loader: 'file-loader',
-          options: {
-            name: '[name].[hash:5].[ext]',
-          },
+          loader: 'file-loader'
         },
         {
           test: /\.(png|svg|jpg|gif)$/,
-          loader: 'file-loader',
-          options: {
-            name: '[name].[hash:5].[ext]',
-          },
+          loader: 'file-loader'
         }
       ]
     },
@@ -201,16 +194,13 @@ module.exports = function (_, env) {
       // See also: https://twitter.com/wsokra/status/970253245733113856
       isProd && new MiniCssExtractPlugin({
         filename: '[name].[contenthash:5].css',
-        chunkFilename: '[name].[contenthash:5].css'
+        chunkFilename: '[name].chunk.[contenthash:5].css'
       }),
 
       new OptimizeCssAssetsPlugin({
         cssProcessorOptions: {
-          postcssReduceIdents: {
-            counterStyle: false,
-            gridTemplate: false,
-            keyframes: false
-          }
+          zindex: false,
+          discardComments: { removeAll: true }
         }
       }),
 
@@ -226,7 +216,7 @@ module.exports = function (_, env) {
       // For now we're not doing SSR.
       new HtmlPlugin({
         filename: path.join(__dirname, 'build/index.html'),
-        template: isProd ? '!!prerender-loader?string!src/index.html' : 'src/index.html',
+        template: 'src/index.html',
         minify: isProd && {
           collapseWhitespace: true,
           removeScriptTypeAttributes: true,
@@ -235,29 +225,32 @@ module.exports = function (_, env) {
           removeComments: true
         },
         manifest: readJson('./src/manifest.json'),
-        inject: 'body',
+        inject: true,
         compile: true
       }),
 
-      new AutoSWPlugin({ version: VERSION }),
-
-      isProd && new AssetTemplatePlugin({
-        template: path.join(__dirname, '_headers.ejs'),
-        filename: '_headers',
-      }),
-
       new ScriptExtHtmlPlugin({
-        inline: ['first']
+        defaultAttribute: 'async'
       }),
 
       // Inline constants during build, so they can be folded by UglifyJS.
       new webpack.DefinePlugin({
-        VERSION: JSON.stringify(VERSION),
         // We set node.process=false later in this config.
         // Here we make sure if (process && process.foo) still works:
         process: '{}'
       }),
 
+      // Babel embeds helpful error messages into transpiled classes that we don't need in production.
+      // Here we replace the constructor and message with a static throw, leaving the message to be DCE'd.
+      // This is useful since it shows the message in SourceMapped code when debugging.
+      isProd && new ReplacePlugin({
+        include: /babel-helper$/,
+        patterns: [{
+          regex: /throw\s+(?:new\s+)?((?:Type|Reference)?Error)\s*\(/g,
+          value: (s, type) => `throw 'babel error'; (`
+        }]
+      }),
+
       // Copying files via Webpack allows them to be served dynamically by `webpack serve`
       new CopyPlugin([
         { from: 'src/manifest.json', to: 'manifest.json' },
@@ -269,22 +262,6 @@ module.exports = function (_, env) {
         analyzerMode: 'static',
         defaultSizes: 'gzip',
         openAnalyzer: false
-      }),
-
-      // Inline Critical CSS (for the intro screen, essentially)
-      isProd && new CrittersPlugin({
-        // use <link rel="stylesheet" media="not x" onload="this.media='all'"> hack to load async css:
-        preload: 'media',
-        // inline all styles from any stylesheet below this size:
-        inlineThreshold: 2000,
-        // don't bother lazy-loading non-critical stylesheets below this size, just inline the non-critical styles too:
-        minimumExternalSize: 4000,
-        // don't emit <noscript> external stylesheet links since the app fundamentally requires JS anyway:
-        noscriptFallback: false,
-        // inline the tiny data URL fonts we have for the intro screen:
-        inlineFonts: true,
-        // (and don't lazy load them):
-        preloadFonts: false
       })
     ].filter(Boolean), // Filter out any falsey plugin array entries.