Merge remote-tracking branch 'origin/dev' into visdif-error

Typescriptify libsquoosh's codecs.js and emscripten-utils.js

cli/src/index.js

@@ -75,9 +75,7 @@ async function getInputFiles(paths) {
 
   for (const inputPath of paths) {
     const files = (await fsp.lstat(inputPath)).isDirectory()
-      ? (await fsp.readdir(inputPath, { withFileTypes: true }))
-          .filter((dirent) => dirent.isFile())
-          .map((dirent) => path.join(inputPath, dirent.name))
+      ? (await fsp.readdir(inputPath, {withFileTypes: true})).filter(dirent => dirent.isFile()).map(dirent => path.join(inputPath, dirent.name))
       : [inputPath];
     for (const file of files) {
       try {

codecs/avif/Makefile

@@ -10,6 +10,9 @@ export CODEC_DIR = node_modules/libavif
 export BUILD_DIR = node_modules/build
 export LIBAOM_DIR = node_modules/libaom
 
+override CFLAGS += "-Wno-unused-macros"
+export
+
 OUT_ENC_JS = enc/avif_enc.js
 OUT_NODE_ENC_JS = enc/avif_node_enc.js
 OUT_ENC_MT_JS = enc/avif_enc_mt.js

codecs/avif/enc/avif_enc_mt.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./avif_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./avif_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/cpp.Dockerfile

@@ -1,13 +1,13 @@
-FROM emscripten/emsdk:2.0.21
+FROM emscripten/emsdk:2.0.23
 RUN apt-get update && apt-get install -qqy autoconf libtool pkg-config
 ENV CFLAGS "-O3 -flto"
 ENV CXXFLAGS "${CFLAGS} -std=c++17"
 ENV LDFLAGS "${CFLAGS} \
---closure 1 \
 -s FILESYSTEM=0 \
 -s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency \
 -s ALLOW_MEMORY_GROWTH=1 \
 -s TEXTDECODER=2 \
+-s NODEJS_CATCH_EXIT=0 -s NODEJS_CATCH_REJECTION=0 \
 "
 # Build and cache standard libraries with these flags + Embind.
 RUN emcc ${CXXFLAGS} ${LDFLAGS} --bind -xc++ /dev/null -o /dev/null

codecs/jxl/enc/jxl_enc_mt.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/jxl/enc/jxl_enc_mt_simd.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./jxl_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/resize/pkg/squoosh_resize.d.ts

@@ -9,9 +9,9 @@
 * @param {number} typ_idx
 * @param {boolean} premultiply
 * @param {boolean} color_space_conversion
-* @returns {Uint8Array}
+* @returns {Uint8ClampedArray}
 */
-export function resize(input_image: Uint8Array, input_width: number, input_height: number, output_width: number, output_height: number, typ_idx: number, premultiply: boolean, color_space_conversion: boolean): Uint8Array;
+export function resize(input_image: Uint8Array, input_width: number, input_height: number, output_width: number, output_height: number, typ_idx: number, premultiply: boolean, color_space_conversion: boolean): Uint8ClampedArray;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 

codecs/resize/pkg/squoosh_resize.js

@@ -26,8 +26,16 @@ function getInt32Memory0() {
     return cachegetInt32Memory0;
 }
 
-function getArrayU8FromWasm0(ptr, len) {
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+let cachegetUint8ClampedMemory0 = null;
+function getUint8ClampedMemory0() {
+    if (cachegetUint8ClampedMemory0 === null || cachegetUint8ClampedMemory0.buffer !== wasm.memory.buffer) {
+        cachegetUint8ClampedMemory0 = new Uint8ClampedArray(wasm.memory.buffer);
+    }
+    return cachegetUint8ClampedMemory0;
+}
+
+function getClampedArrayU8FromWasm0(ptr, len) {
+    return getUint8ClampedMemory0().subarray(ptr / 1, ptr / 1 + len);
 }
 /**
 * @param {Uint8Array} input_image
@@ -38,7 +46,7 @@ function getArrayU8FromWasm0(ptr, len) {
 * @param {number} typ_idx
 * @param {boolean} premultiply
 * @param {boolean} color_space_conversion
-* @returns {Uint8Array}
+* @returns {Uint8ClampedArray}
 */
 export function resize(input_image, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion) {
     try {
@@ -48,7 +56,7 @@ export function resize(input_image, input_width, input_height, output_width, out
         wasm.resize(retptr, ptr0, len0, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
-        var v1 = getArrayU8FromWasm0(r0, r1).slice();
+        var v1 = getClampedArrayU8FromWasm0(r0, r1).slice();
         wasm.__wbindgen_free(r0, r1 * 1);
         return v1;
     } finally {

codecs/resize/pkg/squoosh_resize_bg.wasm.d.ts

@@ -0,0 +1,7 @@
+/* tslint:disable */
+/* eslint-disable */
+export const memory: WebAssembly.Memory;
+export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void;
+export function __wbindgen_add_to_stack_pointer(a: number): number;
+export function __wbindgen_malloc(a: number): number;
+export function __wbindgen_free(a: number, b: number): void;

codecs/resize/src/lib.rs

@@ -8,6 +8,7 @@ use cfg_if::cfg_if;
 use resize::Pixel;
 use resize::Type;
 use wasm_bindgen::prelude::*;
+use wasm_bindgen::Clamped;
 
 mod srgb;
 use srgb::{linear_to_srgb, Clamp};
@@ -66,7 +67,7 @@ pub fn resize(
     typ_idx: usize,
     premultiply: bool,
     color_space_conversion: bool,
-) -> Vec<u8> {
+) -> Clamped<Vec<u8>> {
     let typ = match typ_idx {
         0 => Type::Triangle,
         1 => Type::Catrom,
@@ -91,7 +92,7 @@ pub fn resize(
             typ,
         );
         resizer.resize(input_image.as_slice(), output_image.as_mut_slice());
-        return output_image;
+        return Clamped(output_image);
     }
 
     // Otherwise, we convert to f32 images to keep the
@@ -138,5 +139,5 @@ pub fn resize(
             .clamp(0.0, 255.0) as u8;
     }
 
-    return output_image;
+    return Clamped(output_image);
 }

codecs/visdif/package.json

@@ -1,5 +1,6 @@
 {
   "name": "avif",
+  "type": "module",
   "scripts": {
     "build": "../build-cpp.sh"
   }

codecs/visdif/test.mjs

@@ -0,0 +1,22 @@
+
+import {dirname} from "path";
+globalThis.__dirname = dirname(import.meta.url);
+import { createRequire } from 'module';
+
+globalThis.require = createRequire(import.meta.url);
+import visdif from './visdif.js';
+
+const {VisDiff} = await visdif({
+	locateFile() {
+		return new URL("./visdif.wasm", import.meta.url).pathname;
+	}
+});
+
+const comparator = new VisDiff(
+	new Uint8ClampedArray([0, 0, 0, 255]),
+	1,	
+	1
+);
+
+const distance = comparator.distance(new Uint8ClampedArray([1,1,1,255]));
+console.log({distance});

codecs/visdif/visdif.test.mjs

@@ -0,0 +1,21 @@
+import {dirname} from "path";
+globalThis.__dirname = dirname(import.meta.url);
+import { createRequire } from 'module';
+
+globalThis.require = createRequire(import.meta.url);
+import visdif from './visdif.js';
+
+const {VisDiff} = await visdif({
+	locateFile() {
+		return new URL("./visdif.wasm", import.meta.url).pathname;
+	}
+});
+
+const comparator = new VisDiff(
+	new Uint8ClampedArray([0, 0, 0, 255]),
+	1,	
+	1
+);
+
+const distance = comparator.distance(new Uint8ClampedArray([1,1,1,255]));
+console.log({distance});

codecs/wp2/enc/wp2_enc_mt.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/wp2/enc/wp2_enc_mt_simd.worker.js

@@ -1 +1 @@
-"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};
+"use strict";var Module={};var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./wp2_enc_mt_simd.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

lib/entry-data-plugin.js

@@ -77,9 +77,7 @@ export default function entryDataPlugin() {
             }
 
             return JSON.stringify(
-              getDependencies(chunks, chunk).map((filename) =>
-                fileNameToURL(filename),
-              ),
+              getDependencies(chunks, chunk).map((filename) => fileNameToURL(filename)),
             );
           },
         );

libsquoosh/README.md

@@ -39,9 +39,9 @@ The returned `image` object is a representation of the original image, that you
 When an image has been ingested, you can start preprocessing it and encoding it to other formats. This example will resize the image and then encode it to a `.jpg` and `.jxl` image:
 
 ```js
-await image.decoded; //Wait until the image is decoded before running preprocessors
+await image.decoded; //Wait until the image is decoded before running preprocessors. 
 
-const preprocessOptions: {
+const preprocessOptions = {
   resize: {
     enabled: true,
     width: 100,
@@ -50,7 +50,7 @@ const preprocessOptions: {
 }
 await image.preprocess(preprocessOptions);
 
-const encodeOptions: {
+const encodeOptions = {
   mozjpeg: {}, //an empty object means 'use default settings'
   jxl: {
     quality: 90,

libsquoosh/libsquoosh.test.mjs

@@ -0,0 +1,18 @@
+import { ImagePool } from './build/index.js';
+
+console.log("Starting");
+const imagePool = new ImagePool();
+// const imagePath = '/Users/surma/Downloads/happy_dog.png';
+const imagePath = './squoosh.png';
+console.log("INgesting");
+const image = imagePool.ingestImage(imagePath);
+console.log("Decoding");
+await image.decoded;
+const encodeOptions = {
+  mozjpeg: 'auto',
+};
+console.log("Encoding");
+await image.encode(encodeOptions);
+console.log("Closing");
+await imagePool.close();
+console.log("Done");

libsquoosh/src/WebAssembly.d.ts

@@ -0,0 +1,132 @@
+/**
+ * WebAssembly definitions are not available in `@types/node` yet,
+ * so these are copied from `lib.dom.d.ts`
+ */
+declare namespace WebAssembly {
+  interface CompileError {}
+
+  var CompileError: {
+    prototype: CompileError;
+    new (): CompileError;
+  };
+
+  interface Global {
+    value: any;
+    valueOf(): any;
+  }
+
+  var Global: {
+    prototype: Global;
+    new (descriptor: GlobalDescriptor, v?: any): Global;
+  };
+
+  interface Instance {
+    readonly exports: Exports;
+  }
+
+  var Instance: {
+    prototype: Instance;
+    new (module: Module, importObject?: Imports): Instance;
+  };
+
+  interface LinkError {}
+
+  var LinkError: {
+    prototype: LinkError;
+    new (): LinkError;
+  };
+
+  interface Memory {
+    readonly buffer: ArrayBuffer;
+    grow(delta: number): number;
+  }
+
+  var Memory: {
+    prototype: Memory;
+    new (descriptor: MemoryDescriptor): Memory;
+  };
+
+  interface Module {}
+
+  var Module: {
+    prototype: Module;
+    new (bytes: BufferSource): Module;
+    customSections(moduleObject: Module, sectionName: string): ArrayBuffer[];
+    exports(moduleObject: Module): ModuleExportDescriptor[];
+    imports(moduleObject: Module): ModuleImportDescriptor[];
+  };
+
+  interface RuntimeError {}
+
+  var RuntimeError: {
+    prototype: RuntimeError;
+    new (): RuntimeError;
+  };
+
+  interface Table {
+    readonly length: number;
+    get(index: number): Function | null;
+    grow(delta: number): number;
+    set(index: number, value: Function | null): void;
+  }
+
+  var Table: {
+    prototype: Table;
+    new (descriptor: TableDescriptor): Table;
+  };
+
+  interface GlobalDescriptor {
+    mutable?: boolean;
+    value: ValueType;
+  }
+
+  interface MemoryDescriptor {
+    initial: number;
+    maximum?: number;
+  }
+
+  interface ModuleExportDescriptor {
+    kind: ImportExportKind;
+    name: string;
+  }
+
+  interface ModuleImportDescriptor {
+    kind: ImportExportKind;
+    module: string;
+    name: string;
+  }
+
+  interface TableDescriptor {
+    element: TableKind;
+    initial: number;
+    maximum?: number;
+  }
+
+  interface WebAssemblyInstantiatedSource {
+    instance: Instance;
+    module: Module;
+  }
+
+  type ImportExportKind = 'function' | 'global' | 'memory' | 'table';
+  type TableKind = 'anyfunc';
+  type ValueType = 'f32' | 'f64' | 'i32' | 'i64';
+  type ExportValue = Function | Global | Memory | Table;
+  type Exports = Record<string, ExportValue>;
+  type ImportValue = ExportValue | number;
+  type ModuleImports = Record<string, ImportValue>;
+  type Imports = Record<string, ModuleImports>;
+  function compile(bytes: BufferSource): Promise<Module>;
+  // `compileStreaming` does not exist in NodeJS
+  // function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
+  function instantiate(
+    bytes: BufferSource,
+    importObject?: Imports,
+  ): Promise<WebAssemblyInstantiatedSource>;
+  function instantiate(
+    moduleObject: Module,
+    importObject?: Imports,
+  ): Promise<Instance>;
+  // `instantiateStreaming` does not exist in NodeJS
+  // function instantiateStreaming(response: Response | PromiseLike<Response>, importObject?: Imports): Promise<WebAssemblyInstantiatedSource>;
+  function validate(bytes: BufferSource): boolean;
+}

libsquoosh/src/auto-optimizer.js

@@ -11,7 +11,7 @@ import visdifWasm from 'asset-url:../../codecs/visdif/visdif.wasm';
 export async function binarySearch(
   measureGoal,
   measure,
-  { min = 0, max = 100, epsilon = 0.1, maxRounds = 8 } = {},
+  { min = 0, max = 100, epsilon = 0.1, maxRounds = 6 } = {},
 ) {
   let parameter = (max - min) / 2 + min;
   let delta = (max - min) / 4;

libsquoosh/src/codecs.ts

@@ -1,6 +1,37 @@
 import { promises as fsp } from 'fs';
 import { instantiateEmscriptenWasm, pathify } from './emscripten-utils.js';
 
+interface RotateModuleInstance {
+  exports: {
+    memory: WebAssembly.Memory;
+    rotate(width: number, height: number, rotate: number): void;
+  };
+}
+
+interface ResizeWithAspectParams {
+  input_width: number;
+  input_height: number;
+  target_width: number;
+  target_height: number;
+}
+
+interface ResizeInstantiateOptions {
+  width: number;
+  height: number;
+  method: string;
+  premultiply: boolean;
+  linearRGB: boolean;
+}
+
+declare global {
+  // Needed for being able to use ImageData as type in codec types
+  type ImageData = typeof import('./image_data.js');
+  // Needed for being able to assign to `globalThis.ImageData`
+  var ImageData: ImageData['constructor'];
+}
+
+import type { QuantizerModule } from '../../codecs/imagequant/imagequant.js';
+
 // MozJPEG
 import mozEnc from '../../codecs/mozjpeg/enc/mozjpeg_node_enc.js';
 import mozEncWasm from 'asset-url:../../codecs/mozjpeg/enc/mozjpeg_node_enc.wasm';
@@ -51,16 +82,22 @@ const resizePromise = resize.default(fsp.readFile(pathify(resizeWasm)));
 // rotate
 import rotateWasm from 'asset-url:../../codecs/rotate/rotate.wasm';
 
+// TODO(ergunsh): Type definitions of some modules do not exist
+// Figure out creating type definitions for them and remove `allowJs` rule
+// We shouldn't need to use Promise<QuantizerModule> below after getting type definitions for imageQuant
 // ImageQuant
 import imageQuant from '../../codecs/imagequant/imagequant_node.js';
 import imageQuantWasm from 'asset-url:../../codecs/imagequant/imagequant_node.wasm';
-const imageQuantPromise = instantiateEmscriptenWasm(imageQuant, imageQuantWasm);
+const imageQuantPromise: Promise<QuantizerModule> = instantiateEmscriptenWasm(
+  imageQuant,
+  imageQuantWasm,
+);
 
 // Our decoders currently rely on a `ImageData` global.
 import ImageData from './image_data.js';
 globalThis.ImageData = ImageData;
 
-function resizeNameToIndex(name) {
+function resizeNameToIndex(name: string) {
   switch (name) {
     case 'triangle':
       return 0;
@@ -80,25 +117,26 @@ function resizeWithAspect({
   input_height,
   target_width,
   target_height,
-}) {
+}: ResizeWithAspectParams): { width: number; height: number } {
   if (!target_width && !target_height) {
     throw Error('Need to specify at least width or height when resizing');
   }
+
   if (target_width && target_height) {
     return { width: target_width, height: target_height };
   }
+
   if (!target_width) {
     return {
       width: Math.round((input_width / input_height) * target_height),
       height: target_height,
     };
   }
-  if (!target_height) {
-    return {
-      width: target_width,
-      height: Math.round((input_height / input_width) * target_width),
-    };
-  }
+
+  return {
+    width: target_width,
+    height: Math.round((input_height / input_width) * target_width),
+  };
 }
 
 export const preprocessors = {
@@ -108,10 +146,16 @@ export const preprocessors = {
     instantiate: async () => {
       await resizePromise;
       return (
-        buffer,
-        input_width,
-        input_height,
-        { width, height, method, premultiply, linearRGB },
+        buffer: Uint8Array,
+        input_width: number,
+        input_height: number,
+        {
+          width,
+          height,
+          method,
+          premultiply,
+          linearRGB,
+        }: ResizeInstantiateOptions,
       ) => {
         ({ width, height } = resizeWithAspect({
           input_width,
@@ -148,7 +192,12 @@ export const preprocessors = {
     description: 'Reduce the number of colors used (aka. paletting)',
     instantiate: async () => {
       const imageQuant = await imageQuantPromise;
-      return (buffer, width, height, { numColors, dither }) =>
+      return (
+        buffer: Uint8Array,
+        width: number,
+        height: number,
+        { numColors, dither }: { numColors: number; dither: number },
+      ) =>
         new ImageData(
           imageQuant.quantize(buffer, width, height, numColors, dither),
           width,
@@ -164,13 +213,18 @@ export const preprocessors = {
     name: 'Rotate',
     description: 'Rotate image',
     instantiate: async () => {
-      return async (buffer, width, height, { numRotations }) => {
+      return async (
+        buffer: Uint8Array,
+        width: number,
+        height: number,
+        { numRotations }: { numRotations: number },
+      ) => {
         const degrees = (numRotations * 90) % 360;
         const sameDimensions = degrees == 0 || degrees == 180;
         const size = width * height * 4;
-        const { instance } = await WebAssembly.instantiate(
-          await fsp.readFile(pathify(rotateWasm)),
-        );
+        const instance = (
+          await WebAssembly.instantiate(await fsp.readFile(pathify(rotateWasm)))
+        ).instance as RotateModuleInstance;
         const { memory } = instance.exports;
         const additionalPagesNeeded = Math.ceil(
           (size * 2 - memory.buffer.byteLength + 8) / (64 * 1024),
@@ -286,8 +340,8 @@ export const codecs = {
     },
     autoOptimize: {
       option: 'cqLevel',
-      min: 0,
-      max: 62,
+      min: 62,
+      max: 0,
     },
   },
   jxl: {
@@ -346,13 +400,18 @@ export const codecs = {
       await pngEncDecPromise;
       await oxipngPromise;
       return {
-        encode: (buffer, width, height, opts) => {
+        encode: (
+          buffer: Uint8Array,
+          width: number,
+          height: number,
+          opts: { level: number },
+        ) => {
           const simplePng = pngEncDec.encode(
             new Uint8Array(buffer),
             width,
             height,
           );
-          return oxipng.optimise(simplePng, opts.level);
+          return oxipng.optimise(simplePng, opts.level, false);
         },
       };
     },

libsquoosh/src/emscripten-utils.ts

@@ -1,13 +1,16 @@
 import { fileURLToPath } from 'url';
 
-export function pathify(path) {
+export function pathify(path: string): string {
   if (path.startsWith('file://')) {
     path = fileURLToPath(path);
   }
   return path;
 }
 
-export function instantiateEmscriptenWasm(factory, path) {
+export function instantiateEmscriptenWasm<T extends EmscriptenWasm.Module>(
+  factory: EmscriptenWasm.ModuleFactory<T>,
+  path: string,
+): Promise<T> {
   return factory({
     locateFile() {
       return pathify(path);

libsquoosh/src/index.js

@@ -180,9 +180,9 @@ class Image {
         encName,
         encConfig,
         optimizerButteraugliTarget: Number(
-          encodeOptions.optimizerButteraugliTarget,
+          encodeOptions.optimizerButteraugliTarget ?? 1.4,
         ),
-        maxOptimizerRounds: Number(encodeOptions.maxOptimizerRounds),
+        maxOptimizerRounds: Number(encodeOptions.maxOptimizerRounds ?? 6),
       });
     }
     await Promise.all(Object.values(this.encodedWith));

libsquoosh/src/missing-types.d.ts

@@ -0,0 +1,38 @@
+/// <reference path="../../missing-types.d.ts" />
+
+declare module 'asset-url:*' {
+  const value: string;
+  export default value;
+}
+
+// Somehow TS picks up definitions from the module itself
+// instead of using `asset-url:*`. It is probably related to
+// specifity of the module declaration and these declarations below fix it
+declare module 'asset-url:../../codecs/png/pkg/squoosh_png_bg.wasm' {
+  const value: string;
+  export default value;
+}
+
+declare module 'asset-url:../../codecs/oxipng/pkg/squoosh_oxipng_bg.wasm' {
+  const value: string;
+  export default value;
+}
+
+declare module 'asset-url:../../codecs/resize/pkg/squoosh_resize_bg.wasm' {
+  const value: string;
+  export default value;
+}
+
+// These don't exist in NodeJS types so we're not able to use them but they are referenced in some emscripten and codec types
+// Thus, we need to explicitly assign them to be `never`
+// We're also not able to use the APIs that use these types
+// So, if we want to use those APIs we need to supply its dependencies ourselves
+// However, probably those APIs are more suited to be used in web (i.e. there can be other
+// dependencies to web APIs that might not work in Node)
+type RequestInfo = never;
+type Response = never;
+type WebGLRenderingContext = never;
+type MessageEvent = never;
+
+type BufferSource = ArrayBufferView | ArrayBuffer;
+type URL = import('url').URL;

libsquoosh/tsconfig.json

@@ -2,7 +2,8 @@
   "extends": "../generic-tsconfig.json",
   "compilerOptions": {
     "lib": ["esnext"],
-    "types": ["node"]
+    "types": ["node"],
+    "allowJs": true
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*", "../codecs/**/*"]
 }

package.json

@@ -38,7 +38,7 @@
     "postcss-nested": "^4.2.3",
     "postcss-simple-vars": "^5.0.2",
     "postcss-url": "^8.0.0",
-    "preact": "^10.5.7",
+    "preact": "^10.5.5",
     "preact-render-to-string": "^5.1.11",
     "prettier": "^2.1.2",
     "rollup": "^2.38.0",

src/client/lazy-app/Compress/CanvasImage.tsx

@@ -1,37 +0,0 @@
-import { h, Component, createRef } from 'preact';
-import { drawDataToCanvas } from '../util/canvas';
-
-export interface CanvasImageProps
-  extends h.JSX.HTMLAttributes<HTMLCanvasElement> {
-  image?: ImageData;
-}
-
-export default class CanvasImage extends Component<CanvasImageProps> {
-  canvas = createRef<HTMLCanvasElement>();
-  componentDidUpdate(prevProps: CanvasImageProps) {
-    if (this.props.image !== prevProps.image) {
-      this.draw(this.props.image);
-    }
-  }
-  componentDidMount() {
-    if (this.props.image) {
-      this.draw(this.props.image);
-    }
-  }
-  draw(image?: ImageData) {
-    const canvas = this.canvas.current;
-    if (!canvas) return;
-    if (!image) canvas.getContext('2d');
-    else drawDataToCanvas(canvas, image);
-  }
-  render({ image, ...props }: CanvasImageProps) {
-    return (
-      <canvas
-        ref={this.canvas}
-        width={image?.width}
-        height={image?.height}
-        {...props}
-      />
-    );
-  }
-}

src/client/lazy-app/Compress/ClickOutsideDetector.tsx

@@ -1,54 +0,0 @@
-import {
-  Component,
-  cloneElement,
-  createRef,
-  toChildArray,
-  ComponentChildren,
-  RefObject,
-} from 'preact';
-
-interface Props {
-  children: ComponentChildren;
-  onClick?(e: MouseEvent | KeyboardEvent): void;
-}
-
-export class ClickOutsideDetector extends Component<Props> {
-  private _roots: RefObject<Element>[] = [];
-
-  private handleClick = (e: MouseEvent) => {
-    let target = e.target as Node;
-    // check if the click came from within any of our child elements:
-    for (const { current: root } of this._roots) {
-      if (root && (root === target || root.contains(target))) return;
-    }
-    const { onClick } = this.props;
-    if (onClick) onClick(e);
-  };
-
-  private handleKey = (e: KeyboardEvent) => {
-    if (e.key === 'Escape') {
-      const { onClick } = this.props;
-      if (onClick) onClick(e);
-    }
-  };
-
-  componentDidMount() {
-    addEventListener('click', this.handleClick, { passive: true });
-    addEventListener('keydown', this.handleKey, { passive: true });
-  }
-
-  componentWillUnmount() {
-    removeEventListener('click', this.handleClick);
-    removeEventListener('keydown', this.handleKey);
-  }
-
-  render({ children }: Props) {
-    this._roots = [];
-    return toChildArray(children).map((child) => {
-      if (typeof child !== 'object') return child;
-      const ref = createRef();
-      this._roots.push(ref);
-      return cloneElement(child, { ref });
-    });
-  }
-}

src/client/lazy-app/Compress/Flyout/index.tsx

@@ -1,210 +0,0 @@
-import {
-  h,
-  cloneElement,
-  Component,
-  VNode,
-  createRef,
-  ComponentChildren,
-  ComponentProps,
-  Fragment,
-  render,
-} from 'preact';
-import * as style from './style.css';
-import 'add-css:./style.css';
-
-type Anchor = 'left' | 'right' | 'top' | 'bottom';
-type Direction = 'left' | 'right' | 'up' | 'down';
-
-const has = (haystack: string | string[] | undefined, needle: string) =>
-  Array.isArray(haystack) ? haystack.includes(needle) : haystack === needle;
-
-interface Props extends Omit<ComponentProps<'aside'>, 'ref'> {
-  showing?: boolean;
-  direction?: Direction | Direction[];
-  anchor?: Anchor;
-  toggle?: VNode;
-  children?: ComponentChildren;
-}
-
-interface State {
-  showing: boolean;
-  hasShown: boolean;
-}
-
-export default class Flyout extends Component<Props, State> {
-  state = {
-    showing: this.props.showing === true,
-    hasShown: this.props.showing === true,
-  };
-
-  private wrap = createRef<HTMLElement>();
-
-  private menu = createRef<HTMLElement>();
-
-  private resizeObserver?: ResizeObserver;
-
-  private shown?: number;
-
-  private dismiss = (event: Event) => {
-    if (this.menu.current && this.menu.current.contains(event.target as Node))
-      return;
-    // prevent toggle buttons from immediately dismissing:
-    if (this.shown && Date.now() - this.shown < 10) return;
-    this.setShowing(false);
-  };
-
-  hide = () => {
-    this.setShowing(false);
-  };
-
-  show = () => {
-    this.setShowing(true);
-  };
-
-  toggle = () => {
-    this.setShowing(!this.state.showing);
-  };
-
-  private setShowing = (showing?: boolean) => {
-    this.shown = Date.now();
-    if (showing) this.setState({ showing: true, hasShown: true });
-    else this.setState({ showing: false });
-  };
-
-  private reposition = () => {
-    const menu = this.menu.current;
-    const wrap = this.wrap.current;
-    if (!menu || !wrap || !this.state.showing) return;
-    const bbox = wrap.getBoundingClientRect();
-
-    const { direction = 'down', anchor = 'right' } = this.props;
-    const { innerWidth, innerHeight } = window;
-
-    const anchorX = has(anchor, 'left') ? bbox.left : bbox.right;
-
-    menu.style.left = menu.style.right = menu.style.top = menu.style.bottom =
-      '';
-
-    if (has(direction, 'left')) {
-      menu.style.right = innerWidth - anchorX + 'px';
-    } else {
-      menu.style.left = anchorX + 'px';
-    }
-    if (has(direction, 'up')) {
-      const anchorY = has(anchor, 'bottom') ? bbox.bottom : bbox.top;
-      menu.style.bottom = innerHeight - anchorY + 'px';
-    } else {
-      const anchorY = has(anchor, 'top') ? bbox.top : bbox.bottom;
-      menu.style.top = anchorY + 'px';
-    }
-  };
-
-  componentWillReceiveProps({ showing }: Props) {
-    if (showing !== this.props.showing) {
-      this.setShowing(showing);
-    }
-  }
-
-  componentDidMount() {
-    addEventListener('click', this.dismiss, { passive: true });
-    addEventListener('resize', this.reposition, { passive: true });
-    if (typeof ResizeObserver === 'function' && this.wrap.current) {
-      this.resizeObserver = new ResizeObserver(this.reposition);
-      this.resizeObserver.observe(this.wrap.current);
-    }
-    if (this.props.showing) this.setShowing(true);
-  }
-
-  componentWillUnmount() {
-    removeEventListener('click', this.dismiss);
-    removeEventListener('resize', this.reposition);
-    if (this.resizeObserver) this.resizeObserver.disconnect();
-  }
-
-  componentDidUpdate(prevProps: Props, prevState: State) {
-    if (this.state.showing && !prevState.showing) {
-      const menu = this.menu.current;
-      if (menu) {
-        this.reposition();
-
-        let toFocus = menu.firstElementChild;
-        for (let child of menu.children) {
-          if (child.hasAttribute('autofocus')) {
-            toFocus = child;
-            break;
-          }
-        }
-        // @ts-ignore-next
-        if (toFocus) toFocus.focus();
-      }
-    }
-  }
-
-  render(
-    { direction, anchor, toggle, children, ...props }: Props,
-    { showing }: State,
-  ) {
-    const toggleProps = {
-      flyoutOpen: showing,
-      onClick: this.toggle,
-    };
-
-    const directionText = Array.isArray(direction)
-      ? direction.join(' ')
-      : direction;
-    const anchorText = Array.isArray(anchor) ? anchor.join(' ') : anchor;
-
-    return (
-      <span
-        class={style.wrap}
-        ref={this.wrap}
-        data-flyout-open={showing ? '' : undefined}
-      >
-        {toggle && cloneElement(toggle, toggleProps)}
-
-        {showing &&
-          createPortal(
-            <aside
-              {...props}
-              class={`${style.flyout} ${props.class || props.className || ''}`}
-              ref={this.menu}
-              data-anchor={anchorText}
-              data-direction={directionText}
-            >
-              {children}
-            </aside>,
-            document.body,
-          )}
-      </span>
-    );
-  }
-}
-
-// not worth pulling in compat
-function createPortal(children: ComponentChildren, parent: Element) {
-  return <Portal parent={parent}>{children}</Portal>;
-}
-// this is probably overly careful, since it works directly rendering into parent
-function createPersistentFragment(parent: Element) {
-  const frag = {
-    nodeType: 11,
-    childNodes: [],
-    appendChild: parent.appendChild.bind(parent),
-    insertBefore: parent.insertBefore.bind(parent),
-    removeChild: parent.removeChild.bind(parent),
-  };
-  return (frag as unknown) as Element;
-}
-class Portal extends Component<{
-  children: ComponentChildren;
-  parent: Element;
-}> {
-  root = createPersistentFragment(this.props.parent);
-  componentWillUnmount() {
-    render(null, this.root);
-  }
-  render() {
-    render(<Fragment>{this.props.children}</Fragment>, this.root);
-    return null;
-  }
-}

src/client/lazy-app/Compress/Flyout/style.css

@@ -1,41 +0,0 @@
-.wrap {
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-items: center;
-}
-
-.flyout {
-  display: inline-block;
-  position: fixed;
-  z-index: 100;
-  display: flex;
-  flex-wrap: nowrap;
-  flex-direction: column;
-  align-items: flex-start;
-  overflow: visible;
-  outline: none;
-  will-change: transform, opacity;
-  animation: menuOpen 350ms ease forwards 1;
-  --flyout-offset-y: -20px;
-
-  &[hidden] {
-    display: none;
-  }
-
-  &[data-direction*='left'] {
-    align-items: flex-end;
-  }
-
-  &[data-direction*='up'] {
-    --flyout-offset-y: 20px;
-    flex-direction: column-reverse;
-  }
-}
-
-@keyframes menuOpen {
-  0% {
-    transform: translateY(var(--flyout-offset-y, 0));
-    opacity: 0;
-  }
-}

src/client/lazy-app/Compress/Options/index.tsx

@@ -1,4 +1,4 @@
-import { h, Component, createRef } from 'preact';
+import { h, Component } from 'preact';
 
 import * as style from './style.css';
 import 'add-css:./style.css';
@@ -15,10 +15,9 @@ import {
 import Expander from './Expander';
 import Toggle from './Toggle';
 import Select from './Select';
-import Flyout from '../Flyout';
 import { Options as QuantOptionsComponent } from 'features/processors/quantize/client';
 import { Options as ResizeOptionsComponent } from 'features/processors/resize/client';
-import { CLIIcon, MoreIcon, SwapIcon } from 'client/lazy-app/icons';
+import { CLIIcon, SwapIcon } from 'client/lazy-app/icons';
 
 interface Props {
   index: 0 | 1;
@@ -65,8 +64,6 @@ export default class Options extends Component<Props, State> {
     supportedEncoderMap: undefined,
   };
 
-  menu = createRef<Flyout>();
-
   constructor() {
     super();
     supportedEncoderMapP.then((supportedEncoderMap) =>
@@ -113,12 +110,10 @@ export default class Options extends Component<Props, State> {
 
   private onCopyCliClick = () => {
     this.props.onCopyCliClick(this.props.index);
-    if (this.menu.current) this.menu.current.hide();
   };
 
   private onCopyToOtherSideClick = () => {
     this.props.onCopyToOtherSideClick(this.props.index);
-    if (this.menu.current) this.menu.current.hide();
   };
 
   render(
@@ -141,33 +136,23 @@ export default class Options extends Component<Props, State> {
           {!encoderState ? null : (
             <div>
               <h3 class={style.optionsTitle}>
-                Edit
-                <Flyout
-                  ref={this.menu}
-                  class={style.menu}
-                  direction={['up', 'left']}
-                  anchor="right"
-                  toggle={
-                    <button class={style.titleButton}>
-                      <MoreIcon />
-                    </button>
-                  }
-                >
+                <div class={style.titleAndButtons}>
+                  Edit
                   <button
-                    class={style.menuButton}
+                    class={style.cliButton}
+                    title="Copy npx command"
                     onClick={this.onCopyCliClick}
                   >
                     <CLIIcon />
-                    Copy npx command
                   </button>
                   <button
-                    class={style.menuButton}
+                    class={style.copyOverButton}
+                    title="Copy settings to other side"
                     onClick={this.onCopyToOtherSideClick}
                   >
                     <SwapIcon />
-                    Copy settings to other side
                   </button>
-                </Flyout>
+                </div>
               </h3>
               <label class={style.sectionEnabler}>
                 Resize

src/client/lazy-app/Compress/Options/style.css

@@ -14,21 +14,13 @@
   background-color: var(--main-theme-color);
   color: var(--header-text-color);
   margin: 0;
-  height: 38px;
-  padding: 0 var(--horizontal-padding);
+  padding: 10px var(--horizontal-padding);
   font-weight: bold;
   font-size: 1.4rem;
   border-bottom: 1px solid var(--off-black);
   transition: all 300ms ease-in-out;
   transition-property: background-color, color;
 
-  display: grid;
-  align-items: center;
-  grid-template-columns: 1fr;
-  grid-auto-columns: max-content;
-  grid-auto-flow: column;
-  gap: 0.8rem 0;
-
   position: sticky;
   top: 0;
   z-index: 1;
@@ -90,63 +82,36 @@
   border-radius: 4px;
 }
 
-.menu {
-  transform: translateY(-10px);
+.title-and-buttons {
+  grid-template-columns: 1fr;
+  grid-auto-columns: max-content;
+  grid-auto-flow: column;
+  display: grid;
+  gap: 0.8rem;
 }
 
 .title-button {
-  position: relative;
-  left: 10px;
   composes: unbutton from global;
-  border-radius: 50%;
-  background: rgba(255, 255, 255, 0);
-
-  &:hover,
-  &:active {
-    background: rgba(255, 255, 255, 0.3);
-  }
-
   svg {
-    --size: 24px;
-    fill: var(--header-text-color);
+    --size: 20px;
     display: block;
     width: var(--size);
     height: var(--size);
-    padding: 5px;
   }
 }
 
-.menu-button {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  margin: 8px 0;
-  background-color: rgba(29, 29, 29, 0.92);
-  border: 1px solid rgba(0, 0, 0, 0.67);
-  border-radius: 2rem;
-  line-height: 1.1;
-  white-space: nowrap;
-  height: 39px;
-  padding: 0 16px;
-  font-size: 1.2rem;
-  cursor: pointer;
-  color: #fff;
+.cli-button {
+  composes: title-button;
 
-  &:hover {
-    background: rgba(50, 50, 50, 0.92);
-  }
-
-  &:focus {
-    box-shadow: 0 0 0 2px #fff;
-    outline: none;
-    z-index: 1;
-  }
-
-  & > svg {
-    position: relative;
-    width: 18px;
-    height: 18px;
-    margin-right: 12px;
-    color: var(--main-theme-color);
+  svg {
+    stroke: var(--header-text-color);
+  }
+}
+
+.copy-over-button {
+  composes: title-button;
+
+  svg {
+    fill: var(--header-text-color);
   }
 }

src/client/lazy-app/Compress/Output/custom-els/TwoUp/index.ts

@@ -34,6 +34,8 @@ export default class TwoUp extends HTMLElement {
    */
   private _everConnected = false;
 
+  private _resizeObserver?: ResizeObserver;
+
   constructor() {
     super();
     this._handle.className = styles.twoUpHandle;
@@ -45,13 +47,6 @@ export default class TwoUp extends HTMLElement {
       childList: true,
     });
 
-    // Watch for element size changes.
-    if ('ResizeObserver' in window) {
-      new ResizeObserver(() => this._resetPosition()).observe(this);
-    } else {
-      window.addEventListener('resize', () => this._resetPosition());
-    }
-
     // Watch for pointers on the handle.
     const pointerTracker: PointerTracker = new PointerTracker(this._handle, {
       start: (_, event) => {
@@ -68,8 +63,6 @@ export default class TwoUp extends HTMLElement {
         );
       },
     });
-
-    window.addEventListener('keydown', (event) => this._onKeyDown(event));
   }
 
   connectedCallback() {
@@ -84,12 +77,23 @@ export default class TwoUp extends HTMLElement {
         }</svg>
       `}</div>`;
 
+    // Watch for element size changes.
+    this._resizeObserver = new ResizeObserver(() => this._resetPosition());
+    this._resizeObserver.observe(this);
+
+    window.addEventListener('keydown', this._onKeyDown);
+
     if (!this._everConnected) {
       this._resetPosition();
       this._everConnected = true;
     }
   }
 
+  disconnectedCallback() {
+    window.removeEventListener('keydown', this._onKeyDown);
+    if (this._resizeObserver) this._resizeObserver.disconnect();
+  }
+
   attributeChangedCallback(name: string) {
     if (name === orientationAttr) {
       this._resetPosition();
@@ -97,7 +101,7 @@ export default class TwoUp extends HTMLElement {
   }
 
   // KeyDown event handler
-  private _onKeyDown(event: KeyboardEvent) {
+  private _onKeyDown = (event: KeyboardEvent) => {
     const target = event.target;
     if (target instanceof HTMLElement && target.closest('input')) return;
 
@@ -122,7 +126,7 @@ export default class TwoUp extends HTMLElement {
       this._relativePosition = this._position / bounds[dimensionAxis];
       this._setPosition();
     }
-  }
+  };
 
   private _resetPosition() {
     // Set the initial position of the handle.

src/client/lazy-app/Compress/Output/index.tsx

@@ -1,4 +1,4 @@
-import { h, createRef, Component, Fragment } from 'preact';
+import { h, Component, Fragment } from 'preact';
 import type PinchZoom from './custom-els/PinchZoom';
 import type { ScaleToOpts } from './custom-els/PinchZoom';
 import './custom-els/PinchZoom';
@@ -10,38 +10,31 @@ import {
   ToggleBackgroundIcon,
   AddIcon,
   RemoveIcon,
+  ToggleBackgroundActiveIcon,
   RotateIcon,
-  MoreIcon,
 } from '../../icons';
 import { twoUpHandle } from './custom-els/TwoUp/styles.css';
 import type { PreprocessorState } from '../../feature-meta';
 import { cleanSet } from '../../util/clean-modify';
 import type { SourceImage } from '../../Compress';
 import { linkRef } from 'shared/prerendered-app/util';
-import Flyout from '../Flyout';
 import { drawDataToCanvas } from 'client/lazy-app/util/canvas';
 
 interface Props {
   source?: SourceImage;
   preprocessorState?: PreprocessorState;
-  hidden?: boolean;
   mobileView: boolean;
   leftCompressed?: ImageData;
   rightCompressed?: ImageData;
   leftImgContain: boolean;
   rightImgContain: boolean;
-  onPreprocessorChange?: (newState: PreprocessorState) => void;
-  onShowPreprocessorTransforms?: () => void;
-  onToggleBackground?: () => void;
+  onPreprocessorChange: (newState: PreprocessorState) => void;
 }
 
 interface State {
   scale: number;
   editingScale: boolean;
   altBackground: boolean;
-  transform: boolean;
-  menuOpen: boolean;
-  smallControls: boolean;
 }
 
 const scaleToOpts: ScaleToOpts = {
@@ -56,18 +49,12 @@ export default class Output extends Component<Props, State> {
     scale: 1,
     editingScale: false,
     altBackground: false,
-    transform: false,
-    menuOpen: false,
-    smallControls:
-      typeof matchMedia === 'function' &&
-      matchMedia('(max-width: 859px)').matches,
   };
   canvasLeft?: HTMLCanvasElement;
   canvasRight?: HTMLCanvasElement;
   pinchZoomLeft?: PinchZoom;
   pinchZoomRight?: PinchZoom;
   scaleInput?: HTMLInputElement;
-  flyout = createRef<Flyout>();
   retargetedEvents = new WeakSet<Event>();
 
   componentDidMount() {
@@ -89,12 +76,6 @@ export default class Output extends Component<Props, State> {
     if (this.canvasRight && rightDraw) {
       drawDataToCanvas(this.canvasRight, rightDraw);
     }
-
-    if (typeof matchMedia === 'function') {
-      matchMedia('(max-width: 859px)').addEventListener('change', (e) =>
-        this.setState({ smallControls: e.matches }),
-      );
-    }
   }
 
   componentDidUpdate(prevProps: Props, prevState: State) {
@@ -164,6 +145,12 @@ export default class Output extends Component<Props, State> {
     return props.rightCompressed || (props.source && props.source.preprocessed);
   }
 
+  private toggleBackground = () => {
+    this.setState({
+      altBackground: !this.state.altBackground,
+    });
+  };
+
   private zoomIn = () => {
     if (!this.pinchZoomLeft) throw Error('Missing pinch-zoom element');
     this.pinchZoomLeft.scaleTo(this.state.scale * 1.25, scaleToOpts);
@@ -174,30 +161,17 @@ export default class Output extends Component<Props, State> {
     this.pinchZoomLeft.scaleTo(this.state.scale / 1.25, scaleToOpts);
   };
 
-  private fitToViewport = () => {
-    if (!this.pinchZoomLeft) throw Error('Missing pinch-zoom element');
-    const img = this.props.source?.preprocessed;
-    if (!img) return;
-    const scale = Number(
-      Math.min(
-        (window.innerWidth - 20) / img.width,
-        (window.innerHeight - 20) / img.height,
-      ).toFixed(2),
-    );
-    this.pinchZoomLeft.scaleTo(Number(scale.toFixed(2)), scaleToOpts);
-    this.recenter();
-    // this.hideMenu();
-  };
+  private onRotateClick = () => {
+    const { preprocessorState: inputProcessorState } = this.props;
+    if (!inputProcessorState) return;
 
-  private recenter = () => {
-    const img = this.props.source?.preprocessed;
-    if (!img || !this.pinchZoomLeft) return;
-    let scale = this.pinchZoomLeft.scale;
-    this.pinchZoomLeft.setTransform({
-      x: (img.width - img.width * scale) / 2,
-      y: (img.height - img.height * scale) / 2,
-      allowChangeEvent: true,
-    });
+    const newState = cleanSet(
+      inputProcessorState,
+      'rotate.rotate',
+      (inputProcessorState.rotate.rotate + 90) % 360,
+    );
+
+    this.props.onPreprocessorChange(newState);
   };
 
   private onScaleValueFocus = () => {
@@ -280,16 +254,8 @@ export default class Output extends Component<Props, State> {
   };
 
   render(
-    {
-      source,
-      mobileView,
-      hidden,
-      leftImgContain,
-      rightImgContain,
-      onShowPreprocessorTransforms,
-      onToggleBackground,
-    }: Props,
-    { scale, editingScale, smallControls }: State,
+    { mobileView, leftImgContain, rightImgContain, source }: Props,
+    { scale, editingScale, altBackground }: State,
   ) {
     const leftDraw = this.leftDrawable();
     const rightDraw = this.rightDrawable();
@@ -298,7 +264,9 @@ export default class Output extends Component<Props, State> {
 
     return (
       <Fragment>
-        <div class={style.output} hidden={hidden}>
+        <div
+          class={`${style.output} ${altBackground ? style.altBackground : ''}`}
+        >
           <two-up
             legacy-clip-compat
             class={style.twoUp}
@@ -324,7 +292,7 @@ export default class Output extends Component<Props, State> {
                 style={{
                   width: originalImage ? originalImage.width : '',
                   height: originalImage ? originalImage.height : '',
-                  objectFit: leftImgContain ? 'contain' : undefined,
+                  objectFit: leftImgContain ? 'contain' : '',
                 }}
               />
             </pinch-zoom>
@@ -340,16 +308,15 @@ export default class Output extends Component<Props, State> {
                 style={{
                   width: originalImage ? originalImage.width : '',
                   height: originalImage ? originalImage.height : '',
-                  objectFit: rightImgContain ? 'contain' : undefined,
+                  objectFit: rightImgContain ? 'contain' : '',
                 }}
               />
             </pinch-zoom>
           </two-up>
         </div>
-
-        <div class={style.controls} hidden={hidden}>
+        <div class={style.controls}>
           <div class={style.buttonGroup}>
-            <button class={style.button} onClick={this.zoomOut}>
+            <button class={style.firstButton} onClick={this.zoomOut}>
               <RemoveIcon />
             </button>
             {editingScale ? (
@@ -376,34 +343,18 @@ export default class Output extends Component<Props, State> {
             <button class={style.lastButton} onClick={this.zoomIn}>
               <AddIcon />
             </button>
-
-            <Flyout
-              class={style.menu}
-              showing={hidden ? false : undefined}
-              anchor="right"
-              direction={smallControls ? ['down', 'left'] : 'up'}
-              toggle={
-                <button class={`${style.button} ${style.moreButton}`}>
-                  <MoreIcon />
-                </button>
-              }
-            >
-              <button
-                class={style.button}
-                onClick={onShowPreprocessorTransforms}
-              >
-                <RotateIcon /> Rotate & Transform
-              </button>
-              <button class={style.button} onClick={this.fitToViewport}>
-                Fit to viewport
-              </button>
-              <button class={style.button} onClick={this.recenter}>
-                Re-center
-              </button>
-              <button class={style.button} onClick={onToggleBackground}>
-                <ToggleBackgroundIcon /> Change canvas color
-              </button>
-            </Flyout>
+          </div>
+          <div class={style.buttonGroup}>
+            <button class={style.firstButton} onClick={this.onRotateClick}>
+              <RotateIcon />
+            </button>
+            <button class={style.lastButton} onClick={this.toggleBackground}>
+              {altBackground ? (
+                <ToggleBackgroundActiveIcon />
+              ) : (
+                <ToggleBackgroundIcon />
+              )}
+            </button>
           </div>
         </div>
       </Fragment>

src/client/lazy-app/Compress/Output/style.css

@@ -1,8 +1,20 @@
 .output {
   display: contents;
 
-  &[hidden] {
-    display: none;
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: #000;
+    opacity: 0.8;
+    transition: opacity 500ms ease;
+  }
+
+  &.alt-background::before {
+    opacity: 0;
   }
 }
 
@@ -30,21 +42,16 @@
 .controls {
   display: flex;
   justify-content: center;
+  overflow: hidden;
   flex-wrap: wrap;
+  contain: content;
   grid-area: header;
   align-self: center;
   padding: 9px 66px;
   position: relative;
-  /* Had to disable containment because of the overflow menu. */
-  /*
-  contain: content;
-  overflow: hidden;
-  */
-  transition: transform 500ms ease;
 
   /* Allow clicks to fall through to the pinch zoom area */
   pointer-events: none;
-
   & > * {
     pointer-events: auto;
   }
@@ -55,34 +62,13 @@
     grid-area: viewportOpts;
     align-self: end;
   }
-
-  &[hidden] {
-    visibility: visible;
-    transform: translateY(-200%);
-
-    @media (min-width: 860px) {
-      transform: translateY(200%);
-    }
-  }
 }
 
 .button-group {
   display: flex;
   position: relative;
   z-index: 100;
-
-  & > :not(:first-child) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    margin-left: 0;
-  }
-
-  & > :not(:nth-last-child(2)) {
-    margin-right: 0;
-    border-right-width: 0;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
+  margin: 0 3px;
 }
 
 .button,
@@ -90,10 +76,9 @@
   display: flex;
   align-items: center;
   box-sizing: border-box;
-  margin: 4px;
   background-color: rgba(29, 29, 29, 0.92);
   border: 1px solid rgba(0, 0, 0, 0.67);
-  border-radius: 6px;
+  border-width: 1px 0 1px 1px;
   line-height: 1.1;
   white-space: nowrap;
   height: 39px;
@@ -176,64 +161,3 @@ input.zoom {
     pointer-events: auto;
   }
 }
-
-/** Three-dot menu */
-.moreButton {
-  padding: 0 4px;
-
-  & > svg {
-    transform-origin: center;
-    transition: transform 200ms ease;
-  }
-}
-
-.controls [data-flyout-open] {
-  .moreButton {
-    background: rgba(82, 82, 82, 0.92);
-
-    & > svg {
-      transform: rotate(180deg);
-    }
-  }
-
-  &:before {
-    content: '';
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(50, 50, 50, 0.4);
-    backdrop-filter: blur(2px) contrast(70%);
-    animation: menuShimFadeIn 350ms ease forwards 1;
-    will-change: opacity;
-    z-index: -1;
-  }
-}
-
-@keyframes menuShimFadeIn {
-  0% {
-    opacity: 0;
-  }
-}
-
-.menu {
-  button {
-    margin: 8px 0;
-    border-radius: 2rem;
-    padding: 0 16px;
-
-    & > svg {
-      position: relative;
-      left: -6px;
-    }
-  }
-
-  h5 {
-    text-transform: uppercase;
-    font-size: 0.8rem;
-    color: #fff;
-    margin: 8px 4px;
-    padding: 10px 0 0;
-  }
-}

src/client/lazy-app/Compress/Transform/Cropper/index.tsx

@@ -1,335 +0,0 @@
-import { h, Component, ComponentChildren, createRef } from 'preact';
-import * as style from './style.css';
-import 'add-css:./style.css';
-import { shallowEqual } from 'client/lazy-app/util';
-
-export interface CropBox {
-  left: number;
-  top: number;
-  right: number;
-  bottom: number;
-}
-
-// Minimum CropBox size
-const MIN_SIZE = 2;
-
-export interface Props {
-  size: { width: number; height: number };
-  scale?: number;
-  lockAspect?: boolean;
-  crop: CropBox;
-  onChange?(crop: CropBox): void;
-}
-
-type Edge = keyof CropBox;
-
-interface PointerTrack {
-  x: number;
-  y: number;
-  edges: { edge: Edge; value: number }[];
-  aspect: number | undefined;
-}
-
-interface State {
-  crop: CropBox;
-  pan: boolean;
-}
-
-export default class Cropper extends Component<Props, State> {
-  private pointers = new Map<number, PointerTrack>();
-
-  state = {
-    crop: this.normalizeCrop({ ...this.props.crop }),
-    pan: false,
-  };
-
-  private root = createRef<SVGSVGElement>();
-
-  shouldComponentUpdate(nextProps: Props, nextState: State) {
-    if (!shallowEqual(nextState, this.state)) return true;
-    const { size, scale, lockAspect, crop } = this.props;
-    return (
-      size.width !== nextProps.size.width ||
-      size.height !== nextProps.size.height ||
-      scale !== nextProps.scale ||
-      lockAspect !== nextProps.lockAspect ||
-      !shallowEqual(crop, nextProps.crop)
-    );
-  }
-
-  componentDidUpdate() {
-    requestAnimationFrame(() => {
-      if (!this.root.current) return;
-      getComputedStyle(this.root.current);
-    });
-  }
-
-  componentWillReceiveProps({ crop }: Props, nextState: State) {
-    const current = nextState.crop || this.state.crop;
-    if (crop !== this.props.crop && !shallowEqual(crop, current)) {
-      this.setCrop(crop);
-    }
-  }
-
-  private normalizeCrop(crop: CropBox) {
-    crop.left = Math.round(Math.max(0, crop.left));
-    crop.top = Math.round(Math.max(0, crop.top));
-    crop.right = Math.round(Math.max(0, crop.right));
-    crop.bottom = Math.round(Math.max(0, crop.bottom));
-    return crop;
-  }
-
-  private setCrop(cropUpdate: Partial<CropBox>) {
-    const crop = this.normalizeCrop({ ...this.state.crop, ...cropUpdate });
-    // ignore crop updates that normalize to the same values
-    const old = this.state.crop;
-    if (
-      crop.left === old.left &&
-      crop.right === old.right &&
-      crop.top === old.top &&
-      crop.bottom === old.bottom
-    ) {
-      return;
-    }
-    this.setState({ crop });
-    if (this.props.onChange) {
-      this.props.onChange(crop);
-    }
-  }
-
-  private onPointerDown = (event: PointerEvent) => {
-    if (event.button !== 0 || this.state.pan) return;
-
-    const target = event.target as SVGElement;
-    const edgeAttr = target.getAttribute('data-edge');
-    if (edgeAttr) {
-      event.stopPropagation();
-      event.preventDefault();
-
-      let aspect;
-      const edges = edgeAttr.split(/ *, */) as Edge[];
-      if (this.props.lockAspect) {
-        if (edges.length === 1) return;
-        const { size } = this.props;
-        const oldCrop = this.state.crop;
-        aspect =
-          (size.width - oldCrop.left - oldCrop.right) /
-          (size.height - oldCrop.top - oldCrop.bottom);
-      }
-
-      this.pointers.set(event.pointerId, {
-        x: event.x,
-        y: event.y,
-        edges: edges.map((edge) => ({ edge, value: this.state.crop[edge] })),
-        aspect,
-      });
-      target.setPointerCapture(event.pointerId);
-    }
-  };
-
-  private onPointerMove = (event: PointerEvent) => {
-    const target = event.target as SVGElement;
-    const down = this.pointers.get(event.pointerId);
-    if (down && target.hasPointerCapture(event.pointerId)) {
-      const { size } = this.props;
-      const oldCrop = this.state.crop;
-      const scale = this.props.scale || 1;
-      let dx = (event.x - down.x) / scale;
-      let dy = (event.y - down.y) / scale;
-
-      if (down.aspect && down.edges.length === 2) {
-        const dir = (dx + dy) / 2;
-        dx = dir * down.aspect;
-        dy = dir / down.aspect;
-      }
-      const crop: Partial<CropBox> = {};
-      for (const { edge, value } of down.edges) {
-        let edgeValue = value;
-        switch (edge) {
-          case 'left':
-            edgeValue += dx;
-            break;
-          case 'right':
-            edgeValue -= dx;
-            break;
-          case 'top':
-            edgeValue += dy;
-            break;
-          case 'bottom':
-            edgeValue -= dy;
-            break;
-        }
-        crop[edge] = edgeValue;
-      }
-
-      // Prevent MOVE from resizing the cropbox:
-      if (crop.left && crop.right) {
-        if (crop.left < 0) crop.right += crop.left;
-        if (crop.right < 0) crop.left += crop.right;
-      } else {
-        // enforce minimum 1px cropbox width
-        if (crop.left) {
-          if (down.aspect) crop.left = Math.max(0, crop.left);
-          else
-            crop.left = Math.min(
-              crop.left,
-              size.width - oldCrop.right - MIN_SIZE,
-            );
-        }
-        if (crop.right) {
-          if (down.aspect) crop.right = Math.max(0, crop.right);
-          crop.right = Math.min(
-            crop.right,
-            size.width - oldCrop.left - MIN_SIZE,
-          );
-        }
-
-        if (
-          down.aspect &&
-          (crop.left ?? oldCrop.left) + (crop.right ?? oldCrop.right) >
-            size.width
-        )
-          return;
-      }
-      if (crop.top && crop.bottom) {
-        if (crop.top < 0) crop.bottom += crop.top;
-        if (crop.bottom < 0) crop.top += crop.bottom;
-      } else {
-        // enforce minimum 1px cropbox height
-        if (crop.top) {
-          if (down.aspect) crop.top = Math.max(0, crop.top);
-          crop.top = Math.min(
-            crop.top,
-            size.height - oldCrop.bottom - MIN_SIZE,
-          );
-        }
-        if (crop.bottom) {
-          if (down.aspect) crop.bottom = Math.max(0, crop.bottom);
-          crop.bottom = Math.min(
-            crop.bottom,
-            size.height - oldCrop.top - MIN_SIZE,
-          );
-        }
-
-        if (
-          down.aspect &&
-          (crop.top ?? oldCrop.top) + (crop.bottom ?? oldCrop.bottom) >
-            size.height
-        )
-          return;
-      }
-
-      this.setCrop(crop);
-      event.stopPropagation();
-      event.preventDefault();
-    }
-  };
-
-  private onPointerUp = (event: PointerEvent) => {
-    const target = event.target as SVGElement;
-    const down = this.pointers.get(event.pointerId);
-    if (down && target.hasPointerCapture(event.pointerId)) {
-      this.onPointerMove(event);
-      target.releasePointerCapture(event.pointerId);
-      event.stopPropagation();
-      event.preventDefault();
-      this.pointers.delete(event.pointerId);
-    }
-  };
-
-  private onKeyDown = (event: KeyboardEvent) => {
-    if (event.key === ' ') {
-      if (!this.state.pan) {
-        this.setState({ pan: true });
-      }
-      event.preventDefault();
-    }
-  };
-
-  private onKeyUp = (event: KeyboardEvent) => {
-    if (event.key === ' ') this.setState({ pan: false });
-  };
-
-  componentDidMount() {
-    addEventListener('keydown', this.onKeyDown);
-    addEventListener('keyup', this.onKeyUp);
-  }
-
-  componentWillUnmount() {
-    removeEventListener('keydown', this.onKeyDown);
-    removeEventListener('keyup', this.onKeyUp);
-  }
-
-  render({ size }: Props, { crop, pan }: State) {
-    const x = crop.left;
-    const y = crop.top;
-    const width = size.width - crop.left - crop.right;
-    const height = size.height - crop.top - crop.bottom;
-
-    const s = (x: number) => x.toFixed(3);
-
-    const clip = `polygon(0 0, 0 100%, 100% 100%, 100% 0, 0 0, ${s(x)}px ${s(
-      y,
-    )}px, ${s(x + width)}px ${s(y)}px, ${s(x + width)}px ${s(
-      y + height,
-    )}px, ${s(x)}px ${s(y + height)}px, ${s(x)}px ${s(y)}px)`;
-
-    return (
-      <svg
-        ref={this.root}
-        class={`${style.cropper} ${pan ? style.pan : ''}`}
-        width={size.width + 20}
-        height={size.height + 20}
-        viewBox={`-10 -10 ${size.width + 20} ${size.height + 20}`}
-        onPointerDown={this.onPointerDown}
-        onPointerMove={this.onPointerMove}
-        onPointerUp={this.onPointerUp}
-      >
-        <rect
-          class={style.background}
-          width={size.width}
-          height={size.height}
-          clip-path={clip}
-        />
-        <svg x={x} y={y} width={width} height={height}>
-          <Freezer>
-            <rect
-              id="box"
-              class={style.cropbox}
-              data-edge="left,right,top,bottom"
-              width="100%"
-              height="100%"
-            />
-
-            <rect class={style.edge} data-edge="top" width="100%" />
-            <rect class={style.edge} data-edge="bottom" width="100%" y="100%" />
-            <rect class={style.edge} data-edge="left" height="100%" />
-            <rect class={style.edge} data-edge="right" height="100%" x="100%" />
-
-            <circle class={style.corner} data-edge="left,top" />
-            <circle class={style.corner} data-edge="right,top" cx="100%" />
-            <circle
-              class={style.corner}
-              data-edge="right,bottom"
-              cx="100%"
-              cy="100%"
-            />
-            <circle class={style.corner} data-edge="left,bottom" cy="100%" />
-          </Freezer>
-        </svg>
-      </svg>
-    );
-  }
-}
-
-interface FreezerProps {
-  children: ComponentChildren;
-}
-class Freezer extends Component<FreezerProps> {
-  shouldComponentUpdate() {
-    return false;
-  }
-  render({ children }: FreezerProps) {
-    return children;
-  }
-}

src/client/lazy-app/Compress/Transform/Cropper/style.css

@@ -1,105 +0,0 @@
-.cropper {
-  position: absolute;
-  left: -10px;
-  top: -10px;
-  right: -10px;
-  bottom: -10px;
-  shape-rendering: crispedges;
-  overflow: visible;
-  contain: layout size;
-
-  &.pan {
-    cursor: grabbing;
-    & * {
-      pointer-events: none;
-    }
-  }
-
-  & > svg {
-    overflow: visible;
-    contain: layout size;
-  }
-}
-
-.background {
-  pointer-events: none;
-  fill: rgba(0, 0, 0, 0.25);
-}
-
-.cropbox {
-  fill: none;
-  stroke: white;
-  stroke-width: calc(1.5px / var(--scale, 1));
-  stroke-dasharray: calc(5px / var(--scale, 1)), calc(5px / var(--scale, 1));
-  stroke-dashoffset: 50%;
-  /* Accept pointer input even though this is unpainted transparent */
-  pointer-events: all;
-  cursor: move;
-}
-
-.edge {
-  fill: #aaa;
-  opacity: 0;
-  transition: opacity 250ms ease;
-  z-index: 2;
-  pointer-events: all;
-  --edge-width: calc(10px / var(--scale, 1));
-
-  @media (max-width: 779px) {
-    --edge-width: calc(20px / var(--scale, 1));
-    fill: rgba(0, 0, 0, 0.01);
-  }
-
-  &[data-edge='left'],
-  &[data-edge='right'] {
-    cursor: ew-resize;
-    transform: translate(calc(var(--edge-width, 10px) / -2), 0);
-    width: var(--edge-width, 10px);
-  }
-  &[data-edge='top'],
-  &[data-edge='bottom'] {
-    cursor: ns-resize;
-    transform: translate(0, calc(var(--edge-width, 10px) / -2));
-    height: var(--edge-width, 10px);
-  }
-
-  &:hover,
-  &:active {
-    opacity: 0.1;
-    transition: none;
-  }
-}
-
-.corner {
-  r: calc(4px / var(--scale, 1));
-  stroke-width: calc(4px / var(--scale, 1));
-  stroke: rgba(225, 225, 225, 0.01);
-  fill: white;
-  shape-rendering: geometricprecision;
-  pointer-events: all;
-  transition: fill 250ms ease, stroke 250ms ease;
-
-  &:hover,
-  &:active {
-    stroke: rgba(225, 225, 225, 0.5);
-    transition: none;
-  }
-
-  @media (max-width: 779px) {
-    r: calc(10 / var(--scale, 1));
-    stroke-width: calc(2 / var(--scale, 1));
-  }
-
-  &[data-edge='left,top'] {
-    cursor: nw-resize;
-  }
-  &[data-edge='right,top'] {
-    cursor: ne-resize;
-  }
-  &[data-edge='right,bottom'] {
-    cursor: se-resize;
-  }
-  &[data-edge='left,bottom'] {
-    cursor: sw-resize;
-  }
-}

src/client/lazy-app/Compress/Transform/index.tsx

@@ -1,553 +0,0 @@
-import { h, Component, Fragment, createRef } from 'preact';
-import type {
-  default as PinchZoom,
-  ScaleToOpts,
-} from '../Output/custom-els/PinchZoom';
-import '../Output/custom-els/PinchZoom';
-import * as style from './style.css';
-import 'add-css:./style.css';
-import {
-  AddIcon,
-  CheckmarkIcon,
-  CompareIcon,
-  FlipHorizontallyIcon,
-  FlipVerticallyIcon,
-  RemoveIcon,
-  RotateClockwiseIcon,
-  RotateCounterClockwiseIcon,
-  SwapIcon,
-} from '../../icons';
-import { cleanSet } from '../../util/clean-modify';
-import type { SourceImage } from '../../Compress';
-import { PreprocessorState } from 'client/lazy-app/feature-meta';
-import Cropper, { CropBox } from './Cropper';
-import CanvasImage from '../CanvasImage';
-import Select from '../Options/Select';
-import Checkbox from '../Options/Checkbox';
-
-const ROTATE_ORIENTATIONS = [0, 90, 180, 270] as const;
-
-const cropPresets = {
-  square: {
-    name: 'Square',
-    ratio: 1,
-  },
-  '4:3': {
-    name: '4:3',
-    ratio: 4 / 3,
-  },
-  '16:9': {
-    name: '16:9',
-    ratio: 16 / 9,
-  },
-  '16:10': {
-    name: '16:10',
-    ratio: 16 / 10,
-  },
-};
-
-type CropPresetId = keyof typeof cropPresets;
-
-interface Props {
-  source: SourceImage;
-  preprocessorState: PreprocessorState;
-  mobileView: boolean;
-  onCancel?(): void;
-  onSave?(e: { preprocessorState: PreprocessorState }): void;
-}
-
-interface State {
-  scale: number;
-  editingScale: boolean;
-  rotate: typeof ROTATE_ORIENTATIONS[number];
-  crop: CropBox;
-  cropPreset: keyof typeof cropPresets | undefined;
-  lockAspect: boolean;
-  flip: PreprocessorState['flip'];
-}
-
-const scaleToOpts: ScaleToOpts = {
-  originX: '50%',
-  originY: '50%',
-  relativeTo: 'container',
-  allowChangeEvent: true,
-};
-
-export default class Transform extends Component<Props, State> {
-  state: State = {
-    scale: 1,
-    editingScale: false,
-    cropPreset: undefined,
-    lockAspect: false,
-    ...this.fromPreprocessorState(this.props.preprocessorState),
-  };
-  pinchZoom = createRef<PinchZoom>();
-  scaleInput = createRef<HTMLInputElement>();
-
-  componentWillReceiveProps(
-    { source, preprocessorState }: Props,
-    { crop, cropPreset }: State,
-  ) {
-    if (preprocessorState !== this.props.preprocessorState) {
-      this.setState(this.fromPreprocessorState(preprocessorState));
-    }
-    const { width, height } = source.decoded;
-    if (crop) {
-      const cropWidth = width - crop.left - crop.right;
-      const cropHeight = height - crop.top - crop.bottom;
-      for (const [id, preset] of Object.entries(cropPresets)) {
-        if (cropHeight * preset.ratio === cropWidth) {
-          if (cropPreset !== id) {
-            this.setState({ cropPreset: id as CropPresetId });
-          }
-          break;
-        }
-      }
-    }
-  }
-
-  private fromPreprocessorState(preprocessorState?: PreprocessorState) {
-    const state: Pick<State, 'rotate' | 'crop' | 'flip'> = {
-      rotate: preprocessorState ? preprocessorState.rotate.rotate : 0,
-      crop: Object.assign(
-        {
-          left: 0,
-          right: 0,
-          top: 0,
-          bottom: 0,
-        },
-        (preprocessorState && preprocessorState.crop) || {},
-      ),
-      flip: Object.assign(
-        {
-          horizontal: false,
-          vertical: false,
-        },
-        (preprocessorState && preprocessorState.flip) || {},
-      ),
-    };
-    return state;
-  }
-
-  private save = () => {
-    const { preprocessorState, onSave } = this.props;
-    const { rotate, crop, flip } = this.state;
-
-    let newState = cleanSet(preprocessorState, 'rotate.rotate', rotate);
-    newState = cleanSet(newState, 'crop', crop);
-    newState = cleanSet(newState, 'flip', flip);
-
-    if (onSave) onSave({ preprocessorState: newState });
-  };
-
-  private cancel = () => {
-    const { onCancel, onSave } = this.props;
-    if (onCancel) onCancel();
-    else if (onSave)
-      onSave({ preprocessorState: this.props.preprocessorState });
-  };
-
-  private zoomIn = () => {
-    if (!this.pinchZoom.current) throw Error('Missing pinch-zoom element');
-    this.pinchZoom.current.scaleTo(this.state.scale * 1.25, scaleToOpts);
-  };
-
-  private zoomOut = () => {
-    if (!this.pinchZoom.current) throw Error('Missing pinch-zoom element');
-    this.pinchZoom.current.scaleTo(this.state.scale / 1.25, scaleToOpts);
-  };
-
-  private onScaleValueFocus = () => {
-    this.setState({ editingScale: true }, () => {
-      if (this.scaleInput.current) {
-        // Firefox unfocuses the input straight away unless I force a style
-        // calculation here. I have no idea why, but it's late and I'm quite
-        // tired.
-        getComputedStyle(this.scaleInput.current).transform;
-        this.scaleInput.current.focus();
-      }
-    });
-  };
-
-  private onScaleInputBlur = () => {
-    this.setState({ editingScale: false });
-  };
-
-  private onScaleInputChanged = (event: Event) => {
-    const target = event.target as HTMLInputElement;
-    const percent = parseFloat(target.value);
-    if (isNaN(percent)) return;
-    if (!this.pinchZoom.current) throw Error('Missing pinch-zoom element');
-
-    this.pinchZoom.current.scaleTo(percent / 100, scaleToOpts);
-  };
-
-  private onPinchZoomChange = () => {
-    if (!this.pinchZoom.current) throw Error('Missing pinch-zoom element');
-    this.setState({
-      scale: this.pinchZoom.current.scale,
-    });
-  };
-
-  private onCropChange = (crop: CropBox) => {
-    this.setState({ crop });
-  };
-
-  private onCropPresetChange = (event: Event) => {
-    const { value } = event.target as HTMLSelectElement;
-    const cropPreset = value ? (value as keyof typeof cropPresets) : undefined;
-    const crop = { ...this.state.crop };
-    if (cropPreset) {
-      const preset = cropPresets[cropPreset];
-      const { width, height } = this.props.source.decoded;
-      const w = width - crop.left - crop.right;
-      const h = w / preset.ratio;
-      crop.bottom = height - crop.top - h;
-      if (crop.bottom < 0) {
-        crop.top += crop.bottom;
-        crop.bottom = 0;
-      }
-    }
-    this.setState({
-      crop,
-      cropPreset,
-      lockAspect: !!cropPreset,
-    });
-  };
-
-  private swapCropDimensions = () => {
-    const { width, height } = this.props.source.decoded;
-    let { left, right, top, bottom } = this.state.crop;
-    const cropWidth = width - left - right;
-    const cropHeight = height - top - bottom;
-    const centerX = left - right;
-    const centerY = top - bottom;
-    const crop = {
-      top: (width - cropWidth) / 2 + centerY / 2,
-      bottom: (width - cropWidth) / 2 - centerY / 2,
-      left: (height - cropHeight) / 2 + centerX / 2,
-      right: (height - cropHeight) / 2 - centerX / 2,
-    };
-    this.setCrop(crop);
-  };
-
-  private setCrop(crop: CropBox) {
-    if (crop.top < 0) {
-      crop.bottom += crop.top;
-      crop.top = 0;
-    }
-    if (crop.bottom < 0) {
-      crop.top += crop.bottom;
-      crop.bottom = 0;
-    }
-    if (crop.left < 0) {
-      crop.right += crop.left;
-      crop.left = 0;
-    }
-    if (crop.right < 0) {
-      crop.left += crop.right;
-      crop.right = 0;
-    }
-    if (crop.left < 0 || crop.right < 0) crop.left = crop.right = 0;
-    if (crop.top < 0 || crop.bottom < 0) crop.top = crop.bottom = 0;
-    this.setState({ crop });
-  }
-
-  private adjustOffsetAfterRotation = (wideToTall: boolean) => {
-    const image = this.props.source.decoded;
-    let { x, y } = this.pinchZoom.current!;
-    let { width, height } = image;
-    if (wideToTall) {
-      [width, height] = [height, width];
-    }
-    x += (width - height) / 2;
-    y += (height - width) / 2;
-    this.pinchZoom.current!.setTransform({ x, y });
-  };
-
-  private rotateClockwise = () => {
-    let { rotate, crop } = this.state;
-    this.setState(
-      {
-        rotate: ((rotate + 90) % 360) as typeof ROTATE_ORIENTATIONS[number],
-      },
-      () => {
-        this.adjustOffsetAfterRotation(rotate === 0 || rotate === 180);
-      },
-    );
-    this.setCrop({
-      top: crop.left,
-      left: crop.bottom,
-      bottom: crop.right,
-      right: crop.top,
-    });
-  };
-
-  private rotateCounterClockwise = () => {
-    let { rotate, crop } = this.state;
-    this.setState(
-      {
-        rotate: (rotate
-          ? rotate - 90
-          : 270) as typeof ROTATE_ORIENTATIONS[number],
-      },
-      () => {
-        this.adjustOffsetAfterRotation(rotate === 0 || rotate === 180);
-      },
-    );
-    this.setCrop({
-      top: crop.right,
-      right: crop.bottom,
-      bottom: crop.left,
-      left: crop.top,
-    });
-  };
-
-  private flipHorizontally = () => {
-    const { horizontal, vertical } = this.state.flip;
-    this.setState({ flip: { horizontal: !horizontal, vertical } });
-  };
-
-  private flipVertically = () => {
-    const { horizontal, vertical } = this.state.flip;
-    this.setState({ flip: { horizontal, vertical: !vertical } });
-  };
-
-  private toggleLockAspect = () => {
-    this.setState({ lockAspect: !this.state.lockAspect });
-  };
-
-  private setCropWidth = (
-    event: preact.JSX.TargetedEvent<HTMLInputElement, Event>,
-  ) => {
-    const { width, height } = this.props.source.decoded;
-    const newWidth = Math.min(width, parseInt(event.currentTarget.value, 10));
-    let { top, right, bottom, left } = this.state.crop;
-    const aspect = (width - left - right) / (height - top - bottom);
-    right = width - newWidth - left;
-    if (this.state.lockAspect) {
-      const newHeight = newWidth / aspect;
-      if (newHeight > height) return;
-      bottom = height - newHeight - top;
-    }
-    this.setCrop({ top, right, bottom, left });
-  };
-
-  private setCropHeight = (
-    event: preact.JSX.TargetedEvent<HTMLInputElement, Event>,
-  ) => {
-    const { width, height } = this.props.source.decoded;
-    const newHeight = Math.min(height, parseInt(event.currentTarget.value, 10));
-    let { top, right, bottom, left } = this.state.crop;
-    const aspect = (width - left - right) / (height - top - bottom);
-    bottom = height - newHeight - top;
-    if (this.state.lockAspect) {
-      const newWidth = newHeight * aspect;
-      if (newWidth > width) return;
-      right = width - newWidth - left;
-    }
-    this.setCrop({ top, right, bottom, left });
-  };
-
-  render(
-    { mobileView, source }: Props,
-    { scale, editingScale, rotate, flip, crop, cropPreset, lockAspect }: State,
-  ) {
-    const image = source.decoded;
-    const rotated = rotate === 90 || rotate === 270;
-
-    const displayWidth = rotated ? image.height : image.width;
-    const displayHeight = rotated ? image.width : image.height;
-
-    const width = displayWidth - crop.left - crop.right;
-    const height = displayHeight - crop.top - crop.bottom;
-
-    let transform =
-      `translate(-50%, -50%) ` +
-      `rotate(${rotate}deg) ` +
-      `scale(${flip.horizontal ? -1 : 1}, ${flip.vertical ? -1 : 1})`;
-
-    return (
-      <Fragment>
-        <CancelButton onClick={this.cancel} />
-        <SaveButton onClick={this.save} />
-
-        <div class={style.transform}>
-          <pinch-zoom
-            class={style.pinchZoom}
-            onChange={this.onPinchZoomChange}
-            ref={this.pinchZoom}
-          >
-            <div
-              class={style.wrap}
-              style={{
-                width: displayWidth,
-                height: displayHeight,
-              }}
-            >
-              <CanvasImage
-                class={style.pinchTarget}
-                image={image}
-                style={{ transform }}
-              />
-              {crop && (
-                <Cropper
-                  size={{ width: displayWidth, height: displayHeight }}
-                  scale={scale}
-                  lockAspect={lockAspect}
-                  crop={crop}
-                  onChange={this.onCropChange}
-                />
-              )}
-            </div>
-          </pinch-zoom>
-        </div>
-
-        <div class={style.controls}>
-          <div class={style.zoomControls}>
-            <button class={style.button} onClick={this.zoomOut}>
-              <RemoveIcon />
-            </button>
-            {editingScale ? (
-              <input
-                type="number"
-                step="1"
-                min="1"
-                max="1000000"
-                ref={this.scaleInput}
-                class={style.zoom}
-                value={Math.round(scale * 100)}
-                onInput={this.onScaleInputChanged}
-                onBlur={this.onScaleInputBlur}
-              />
-            ) : (
-              <span
-                class={style.zoom}
-                tabIndex={0}
-                onFocus={this.onScaleValueFocus}
-              >
-                <span class={style.zoomValue}>{Math.round(scale * 100)}</span>%
-              </span>
-            )}
-            <button class={style.button} onClick={this.zoomIn}>
-              <AddIcon />
-            </button>
-          </div>
-        </div>
-
-        <div class={style.options}>
-          <h3 class={style.optionsTitle}>Modify Source</h3>
-
-          <div class={style.optionsSection}>
-            <h4 class={style.optionsSectionTitle}>Crop</h4>
-            <div class={style.optionOneCell}>
-              <Select
-                large
-                value={cropPreset}
-                onChange={this.onCropPresetChange}
-              >
-                <option value="">Custom</option>
-                {Object.entries(cropPresets).map(([type, preset]) => (
-                  <option value={type}>{preset.name}</option>
-                ))}
-              </Select>
-            </div>
-            <label class={style.optionCheckbox}>
-              <Checkbox checked={lockAspect} onClick={this.toggleLockAspect} />
-              Lock aspect-ratio
-            </label>
-            <div class={style.optionsDimensions}>
-              <input
-                type="number"
-                name="width"
-                value={width}
-                title="Crop width"
-                onInput={this.setCropWidth}
-              />
-              <button
-                class={style.optionsButton}
-                title="swap"
-                onClick={this.swapCropDimensions}
-              >
-                <SwapIcon />
-              </button>
-              <input
-                type="number"
-                name="height"
-                value={height}
-                title="Crop height"
-                onInput={this.setCropHeight}
-              />
-            </div>
-
-            <div class={style.optionButtonRow}>
-              Flip
-              <button
-                class={style.optionsButton}
-                data-active={flip.vertical}
-                title="Flip vertically"
-                onClick={this.flipVertically}
-              >
-                <FlipVerticallyIcon />
-              </button>
-              <button
-                class={style.optionsButton}
-                data-active={flip.horizontal}
-                title="Flip horizontally"
-                onClick={this.flipHorizontally}
-              >
-                <FlipHorizontallyIcon />
-              </button>
-            </div>
-
-            <div class={style.optionButtonRow}>
-              Rotate
-              <button
-                class={style.optionsButton}
-                title="Rotate clockwise"
-                onClick={this.rotateClockwise}
-              >
-                <RotateClockwiseIcon />
-              </button>
-              <button
-                class={style.optionsButton}
-                title="Rotate counter-clockwise"
-                onClick={this.rotateCounterClockwise}
-              >
-                <RotateCounterClockwiseIcon />
-              </button>
-            </div>
-          </div>
-        </div>
-      </Fragment>
-    );
-  }
-}
-
-const CancelButton = ({ onClick }: { onClick: () => void }) => (
-  <button class={style.cancel} onClick={onClick}>
-    <svg viewBox="0 0 80 80" width="80" height="80">
-      <path d="M8.06 40.98c-.53-7.1 4.05-14.52 9.98-19.1s13.32-6.35 22.13-6.43c8.84-.12 19.12 1.51 24.4 7.97s5.6 17.74 1.68 26.97c-3.89 9.26-11.97 16.45-20.46 18-8.43 1.55-17.28-2.62-24.5-8.08S8.54 48.08 8.07 40.98z" />
-    </svg>
-    <CompareIcon class={style.icon} />
-    <span>Cancel</span>
-  </button>
-);
-
-const SaveButton = ({ onClick }: { onClick: () => void }) => (
-  <button class={style.save} onClick={onClick}>
-    <svg viewBox="0 0 89 87" width="89" height="87">
-      <path
-        fill="#0c99ff"
-        opacity=".7"
-        d="M27.3 71.9c-8-4-15.6-12.3-16.9-21-1.2-8.7 4-17.8 10.5-26s14.4-15.6 24-16 21.2 6 28.6 16.5c7.4 10.5 10.8 25 6.6 34S64.1 71.7 54 73.5c-10.2 2-18.7 2.3-26.7-1.6z"
-      />
-      <path
-        fill="#0c99ff"
-        opacity=".7"
-        d="M14.6 24.8c4.3-7.8 13-15 21.8-15.7 8.7-.8 17.5 4.8 25.4 11.8 7.8 6.9 14.8 15.2 14.8 24.9s-7.2 20.7-18 27.6c-10.9 6.8-25.6 9.5-34.3 4.8S13 61.6 11.6 51.4c-1.3-10.3-1.3-18.8 3-26.6z"
-      />
-    </svg>
-    <CheckmarkIcon class={style.icon} />
-  </button>
-);

src/client/lazy-app/Compress/Transform/style.css

@@ -1,335 +0,0 @@
-.transform {
-  display: block;
-}
-
-.wrap {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  /** can't use transform-origin here, pinch-zoom relies on 0,0 */
-  transform: translate(-50%, -50%) translate(var(--x), var(--y))
-    scale(var(--scale));
-  overflow: visible;
-  contain: layout;
-  will-change: initial !important;
-}
-
-.pinch-zoom {
-  composes: abs-fill from global;
-  outline: none;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.pinch-target {
-  /* This fixes a severe painting bug in Chrome.
-   * We should try to remove this once the issue is fixed.
-   * https://bugs.chromium.org/p/chromium/issues/detail?id=870222#c10 */
-  will-change: auto;
-  /* Prevent the image becoming misshapen due to default flexbox layout. */
-  flex-shrink: 0;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  transform-origin: 50% 50%;
-}
-
-.cancel,
-.save {
-  composes: unbutton from global;
-  position: absolute;
-  padding: 0;
-  z-index: 2;
-}
-
-.save {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  display: grid;
-  align-items: center;
-  justify-items: center;
-
-  & > * {
-    grid-area: 1/1/1/1;
-    fill: #fff;
-  }
-}
-
-/* @TODO use grid */
-.cancel {
-  fill: rgba(0, 0, 0, 0.7);
-
-  & > svg:not(.icon) {
-    display: block;
-    margin: -8px 0;
-    width: 80px;
-    height: 80px;
-  }
-
-  & > .icon {
-    position: absolute;
-    left: 28px;
-    top: 22px;
-    fill: #fff;
-  }
-
-  & > span {
-    display: inline-block;
-    padding: 4px 10px;
-    border-radius: 1rem;
-    background: rgba(0, 0, 0, 0.7);
-    font-size: 80%;
-    color: #fff;
-  }
-
-  &:hover,
-  &:focus {
-    fill: rgba(0, 0, 0, 0.9);
-
-    & > span {
-      background: rgba(0, 0, 0, 0.9);
-    }
-  }
-}
-
-.options {
-  position: fixed;
-  right: 0;
-  bottom: 78px;
-  color: #fff;
-  font-size: 1.2rem;
-  display: flex;
-  flex-flow: column;
-  max-width: 250px;
-  margin: 0;
-  width: calc(100% - 60px);
-  max-height: 100%;
-  overflow: hidden;
-  align-self: end;
-  border-radius: var(--options-radius) 0 0 var(--options-radius);
-  animation: slideInFromRight 500ms ease-out forwards 1;
-  --horizontal-padding: 15px;
-  --main-theme-color: var(--blue);
-
-  /* Hide on mobile (for now) */
-  @media (max-width: 599px) {
-    display: none;
-  }
-}
-@keyframes slideInFromRight {
-  0% {
-    transform: translateX(100%);
-  }
-}
-
-.options-title {
-  background-color: var(--main-theme-color);
-  color: var(--dark-text);
-  margin: 0;
-  padding: 10px var(--horizontal-padding);
-  font-weight: bold;
-  font-size: 1.4rem;
-  border-bottom: 1px solid var(--off-black);
-}
-
-.options-section {
-  padding: 5px 0;
-  background: var(--off-black);
-}
-
-.options-section-title {
-  font: inherit;
-  margin: 0;
-  padding: 5px var(--horizontal-padding);
-}
-
-.option-base {
-  display: grid;
-  gap: 0.7em;
-  align-items: center;
-  padding: 5px var(--horizontal-padding);
-}
-
-.options-button {
-  composes: unbutton from global;
-  width: 40px;
-  height: 40px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border-radius: 50%;
-  border: 1px solid var(--dark-gray);
-  color: var(--white);
-
-  &:hover,
-  &:focus {
-    background-color: var(--off-black);
-    border-color: var(--med-gray);
-  }
-
-  &[data-active] {
-    background-color: var(--dark-gray);
-    border-color: var(--med-gray);
-  }
-}
-
-.options-dimensions {
-  composes: option-base;
-  grid-template-columns: 1fr 0fr 1fr;
-
-  input {
-    background: var(--white);
-    color: var(--black);
-    font: inherit;
-    border: none;
-    width: 100%;
-    padding: 4px;
-    box-sizing: border-box;
-    border-radius: 4px;
-  }
-}
-
-.option-one-cell {
-  composes: option-base;
-  grid-template-columns: 1fr;
-}
-
-.option-button-row {
-  composes: option-base;
-  grid-template-columns: 1fr auto auto;
-}
-
-.option-checkbox {
-  composes: option-base;
-  grid-template-columns: auto 1fr;
-}
-
-/** Zoom controls */
-.controls {
-  position: absolute;
-  display: flex;
-  justify-content: center;
-  top: 0;
-  left: 0;
-  right: 0;
-  padding: 9px 84px;
-  flex-wrap: wrap;
-
-  /* Allow clicks to fall through to the pinch zoom area */
-  pointer-events: none;
-
-  & > * {
-    pointer-events: auto;
-  }
-
-  @media (min-width: 860px) {
-    padding: 9px;
-    top: auto;
-    left: 320px;
-    right: 320px;
-    bottom: 0;
-    flex-wrap: wrap-reverse;
-  }
-}
-
-.zoom-controls {
-  display: flex;
-  position: relative;
-  z-index: 100;
-
-  & > :not(:first-child) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    margin-left: 0;
-  }
-
-  & > :not(:last-child) {
-    margin-right: 0;
-    border-right-width: 0;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-.button,
-.zoom {
-  display: flex;
-  align-items: center;
-  box-sizing: border-box;
-  margin: 4px;
-  background-color: rgba(29, 29, 29, 0.92);
-  border: 1px solid rgba(0, 0, 0, 0.67);
-  border-radius: 6px;
-  line-height: 1.1;
-  white-space: nowrap;
-  height: 39px;
-  padding: 0 8px;
-  font-size: 1.2rem;
-  cursor: pointer;
-
-  &:focus {
-    box-shadow: 0 0 0 2px #fff;
-    outline: none;
-    z-index: 1;
-  }
-}
-
-.button {
-  color: #fff;
-
-  &:hover {
-    background: rgba(50, 50, 50, 0.92);
-  }
-
-  &.active {
-    background: rgba(72, 72, 72, 0.92);
-    color: #fff;
-  }
-}
-
-.zoom {
-  cursor: text;
-  width: 7rem;
-  font: inherit;
-  text-align: center;
-  justify-content: center;
-
-  &:focus {
-    box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 2px #fff;
-  }
-}
-span.zoom {
-  color: #939393;
-  font-size: 0.8rem;
-  line-height: 1.2;
-  font-weight: 100;
-}
-input.zoom {
-  font-size: 1.2rem;
-  letter-spacing: 0.05rem;
-  font-weight: 700;
-  text-indent: 3px;
-  color: #fff;
-}
-
-.zoom-value {
-  margin: 0 3px 0 0;
-  padding: 0 2px;
-  font-size: 1.2rem;
-  letter-spacing: 0.05rem;
-  font-weight: 700;
-  color: #fff;
-  border-bottom: 1px dashed #999;
-}
-
-.buttons-no-wrap {
-  display: flex;
-  pointer-events: none;
-
-  & > * {
-    pointer-events: auto;
-  }
-}

src/client/lazy-app/Compress/index.tsx

@@ -10,7 +10,6 @@ import {
   canDecodeImageType,
   abortable,
   assertSignal,
-  shallowEqual,
   ImageMimeTypes,
 } from '../util';
 import {
@@ -32,7 +31,6 @@ import Results from './Results';
 import WorkerBridge from '../worker-bridge';
 import { resize } from 'features/processors/resize/client';
 import type SnackBarElement from 'shared/custom-els/snack-bar';
-import Transform from './Transform';
 import { generateCliInvocation } from '../util/cli';
 import { drawableToImageData } from '../util/canvas';
 
@@ -71,11 +69,7 @@ interface State {
   sides: [Side, Side];
   /** Source image load */
   loading: boolean;
-  /** Showing preprocessor transformations modal */
-  transform: boolean;
-  error?: string;
   mobileView: boolean;
-  altBackground: boolean;
   preprocessorState: PreprocessorState;
   encodedPreprocessorState?: PreprocessorState;
 }
@@ -136,18 +130,13 @@ async function preprocessImage(
 ): Promise<ImageData> {
   assertSignal(signal);
   let processedData = data;
-  const { rotate, flip, crop } = preprocessorState;
 
-  if (flip.horizontal || flip.vertical) {
-    processedData = await workerBridge.flip(signal, processedData, flip);
-  }
-
-  if (rotate.rotate !== 0) {
-    processedData = await workerBridge.rotate(signal, processedData, rotate);
-  }
-
-  if (crop.left || crop.top || crop.right || crop.bottom) {
-    processedData = await workerBridge.crop(signal, processedData, crop);
+  if (preprocessorState.rotate.rotate !== 0) {
+    processedData = await workerBridge.rotate(
+      signal,
+      processedData,
+      preprocessorState.rotate,
+    );
   }
 
   return processedData;
@@ -292,7 +281,6 @@ export default class Compress extends Component<Props, State> {
   state: State = {
     source: undefined,
     loading: false,
-    transform: false,
     preprocessorState: defaultPreprocessorState,
     sides: [
       {
@@ -314,7 +302,6 @@ export default class Compress extends Component<Props, State> {
       },
     ],
     mobileView: this.widthQuery.matches,
-    altBackground: false,
   };
 
   private readonly encodeCache = new ResultCache();
@@ -340,12 +327,6 @@ export default class Compress extends Component<Props, State> {
     this.setState({ mobileView: this.widthQuery.matches });
   };
 
-  private toggleBackground = () => {
-    this.setState({
-      altBackground: !this.state.altBackground,
-    });
-  };
-
   private onEncoderTypeChange = (index: 0 | 1, newType: OutputType): void => {
     this.setState({
       sides: cleanSet(
@@ -387,19 +368,6 @@ export default class Compress extends Component<Props, State> {
     });
   };
 
-  private showPreprocessorTransforms = () => {
-    this.setState({ transform: true });
-  };
-
-  private onTransformCommit = ({
-    preprocessorState,
-  }: { preprocessorState?: PreprocessorState } = {}) => {
-    if (preprocessorState) {
-      this.onPreprocessorChange(preprocessorState);
-    }
-    this.setState({ transform: false });
-  };
-
   componentWillReceiveProps(nextProps: Props): void {
     if (nextProps.file !== this.props.file) {
       this.sourceFile = nextProps.file;
@@ -409,6 +377,7 @@ export default class Compress extends Component<Props, State> {
 
   componentWillUnmount(): void {
     updateDocumentTitle({ loading: false });
+    this.widthQuery.removeListener(this.onMobileWidthChange);
     this.mainAbortController.abort();
     for (const controller of this.sideAbortControllers) {
       controller.abort();
@@ -471,38 +440,25 @@ export default class Compress extends Component<Props, State> {
     const newRotate = preprocessorState.rotate.rotate;
     const orientationChanged = oldRotate % 180 !== newRotate % 180;
 
-    const { crop } = preprocessorState;
-    const cropChanged = !shallowEqual(crop, this.state.preprocessorState.crop);
-
     this.setState((state) => ({
       loading: true,
       preprocessorState,
       // Flip resize values if orientation has changed
-      sides:
-        !orientationChanged && !cropChanged
-          ? state.sides
-          : (state.sides.map((side) => {
-              const currentResizeSettings =
-                side.latestSettings.processorState.resize;
-              let resizeSettings: Partial<ProcessorState['resize']>;
-              if (cropChanged) {
-                const img = state.source?.decoded;
-                resizeSettings = {
-                  width: img ? img.width - crop.left - crop.right : undefined,
-                  height: img ? img.height - crop.top - crop.bottom : undefined,
-                };
-              } else {
-                resizeSettings = {
-                  width: currentResizeSettings.height,
-                  height: currentResizeSettings.width,
-                };
-              }
-              return cleanMerge(
-                side,
-                'latestSettings.processorState.resize',
-                resizeSettings,
-              );
-            }) as [Side, Side]),
+      sides: !orientationChanged
+        ? state.sides
+        : (state.sides.map((side) => {
+            const currentResizeSettings =
+              side.latestSettings.processorState.resize;
+            const resizeSettings: Partial<ProcessorState['resize']> = {
+              width: currentResizeSettings.height,
+              height: currentResizeSettings.width,
+            };
+            return cleanMerge(
+              side,
+              'latestSettings.processorState.resize',
+              resizeSettings,
+            );
+          }) as [Side, Side]),
     }));
   };
 
@@ -880,22 +836,12 @@ export default class Compress extends Component<Props, State> {
   }
 
   render(
-    { onBack, showSnack }: Props,
-    {
-      loading,
-      sides,
-      source,
-      mobileView,
-      altBackground,
-      transform,
-      preprocessorState,
-    }: State,
+    { onBack }: Props,
+    { loading, sides, source, mobileView, preprocessorState }: State,
   ) {
     const [leftSide, rightSide] = sides;
     const [leftImageData, rightImageData] = sides.map((i) => i.data);
 
-    transform = (source && source.decoded && transform) || false;
-
     const options = sides.map((side, index) => (
       <Options
         index={index as 0 | 1}
@@ -940,13 +886,8 @@ export default class Compress extends Component<Props, State> {
       rightDisplaySettings.processorState.resize.fitMethod === 'contain';
 
     return (
-      <div
-        class={`${style.compress} ${transform ? style.transforming : ''} ${
-          altBackground ? style.altBackground : ''
-        }`}
-      >
+      <div class={style.compress}>
         <Output
-          hidden={transform}
           source={source}
           mobileView={mobileView}
           leftCompressed={leftImageData}
@@ -955,8 +896,6 @@ export default class Compress extends Component<Props, State> {
           rightImgContain={rightImgContain}
           preprocessorState={preprocessorState}
           onPreprocessorChange={this.onPreprocessorChange}
-          onShowPreprocessorTransforms={this.showPreprocessorTransforms}
-          onToggleBackground={this.toggleBackground}
         />
         <button class={style.back} onClick={onBack}>
           <svg viewBox="0 0 61 53.3">
@@ -992,16 +931,6 @@ export default class Compress extends Component<Props, State> {
             </div>,
           ]
         )}
-
-        {transform && (
-          <Transform
-            mobileView={mobileView}
-            source={source!}
-            preprocessorState={preprocessorState!}
-            onSave={this.onTransformCommit}
-            onCancel={this.onTransformCommit}
-          />
-        )}
       </div>
     );
   }

src/client/lazy-app/Compress/style.css

@@ -17,47 +17,6 @@
       'header header header'
       'optsLeft viewportOpts optsRight';
   }
-
-  /* darker squares background */
-  &::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: #000;
-    opacity: 0.8;
-    transition: opacity 500ms ease;
-  }
-
-  &.alt-background::before {
-    opacity: 0;
-  }
-
-  /* transformation is modal and we sweep away the comparison UI */
-  &.transforming {
-    & > .options {
-      transform: translateX(-100%);
-    }
-    & > .options + .options {
-      transform: translateX(100%);
-    }
-
-    @media (max-width: 599px) {
-      & > .options {
-        display: none;
-      }
-    }
-
-    & > .back {
-      display: none;
-    }
-
-    & > :first-child {
-      display: none;
-    }
-  }
 }
 
 .options {
@@ -74,7 +33,6 @@
   grid-template-rows: 1fr max-content;
   align-content: end;
   align-self: end;
-  transition: transform 500ms ease;
 
   @media (min-width: 600px) {
     width: 300px;