pixel-data-js 0.34.0 → 0.36.0

package/dist/index.prod.d.ts

@@ -221,6 +221,12 @@ interface MutablePixelData32 {
 interface PixelData<T extends ImageDataLike = ImageData> extends PixelData32 {
     readonly imageData: T;
 }
+interface MutablePixelData<T extends ImageDataLike = ImageData> extends PixelData32 {
+    imageData: T;
+    data: Uint32Array;
+    w: number;
+    h: number;
+}
 
 type FloodFillResult = BinaryMaskRect & {
     startX: number;
@@ -798,14 +804,14 @@ declare class PixelAccumulator {
      * @param x pixel x coordinate
      * @param y pixel y coordinate
      */
-    storePixelBeforeState(x: number, y: number): DidChangeFn;
+    storePixelBeforeState(x: number, y: number): DidChangeFn | null;
     /**
      * @param x pixel x coordinate
      * @param y pixel y coordinate
      * @param w pixel width
      * @param h pixel height
      */
-    storeRegionBeforeState(x: number, y: number, w: number, h: number): DidChangeFn;
+    storeRegionBeforeState(x: number, y: number, w: number, h: number): DidChangeFn | null;
     storeTileBeforeState(id: number, tx: number, ty: number): DidChangeFn;
     extractState(tile: PixelTile): void;
     extractPatch(): PixelPatchTiles;
@@ -926,9 +932,11 @@ type HistoryMutator<T extends {}, D extends {}> = (writer: PixelWriter<any>, dep
 
 declare function makeFullPixelMutator(writer: PixelWriter<any>): {
     invert(opts?: PixelMutateOptions): boolean;
-    fillRect(color: Color32, rect: Rect): boolean;
     fillBinaryMask(color: Color32, mask: BinaryMask, x?: number, y?: number): boolean;
-    fill(color: Color32, x?: number, y?: number, w?: number, h?: number): boolean;
+    fill: {
+        (color: Color32, rect?: Partial<Rect>): boolean;
+        (color: Color32, x: number, y: number, w: number, h: number): boolean;
+    };
     clear(rect?: Partial<Rect>): boolean;
     blendPixelData(src: PixelData32, opts?: PixelBlendOptions): boolean;
     blendPixel(x: number, y: number, color: Color32, alpha?: number, blendFn?: BlendColor32): boolean;
@@ -1051,11 +1059,15 @@ interface PaintAlphaMask<T extends PaintMaskOutline = PaintMaskOutline> extends
 interface PaintBinaryMask<T extends PaintMaskOutline = PaintMaskOutline> extends BasePaintMask<T>, BinaryMask {
 }
 type PaintMask = PaintAlphaMask<any> | PaintBinaryMask<any>;
+type PaintBrush = PaintMask | PaintRect;
 interface PaintRect {
+    type: null;
+    readonly outlineType: PaintMaskOutline.RECT;
     w: number;
     h: number;
     centerOffsetX: number;
     centerOffsetY: number;
+    data: null;
 }
 
 /**
@@ -1223,13 +1235,10 @@ type Deps$2 = Partial<typeof defaults$2>;
  * @param deps - @hidden
  */
 declare const mutatorFill: (writer: PixelWriter<any>, deps?: Deps$2) => {
-    fill(color: Color32, x?: number, y?: number, w?: number, h?: number): boolean;
-};
-/**
- * @param deps - @hidden
- */
-declare const mutatorFillRect: (writer: PixelWriter<any>, deps?: Deps$2) => {
-    fillRect(color: Color32, rect: Rect): boolean;
+    fill: {
+        (color: Color32, rect?: Partial<Rect>): boolean;
+        (color: Color32, x: number, y: number, w: number, h: number): boolean;
+    };
 };
 
 /**
@@ -1804,14 +1813,15 @@ declare function makePaintRect(w: number, h: number): PaintRect;
 
 type PaintCursorRenderer = ReturnType<typeof makePaintCursorRenderer>;
 declare function makePaintCursorRenderer<T extends HTMLCanvasElement | OffscreenCanvas = OffscreenCanvas>(reusableCanvasFactory?: () => ReusableCanvasFactory<T>): {
-    update: (paintMask?: PaintMask, scale?: number, color?: Color32, alphaThreshold?: number) => void;
+    update: (paintMask?: PaintBrush, scale?: number, color?: Color32, alphaThreshold?: number) => void;
     getBounds: (centerX: number, centerY: number) => Rect;
     getBoundsScaled: (centerX: number, centerY: number) => Rect;
     draw: (drawCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, centerX: number, centerY: number) => void;
+    drawRaw: (drawCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, x: number, y: number) => void;
     getSettings: () => {
         color: Color32;
         scale: number;
-        currentMask: PaintMask;
+        currentBrush: PaintBrush;
     };
 };
 
@@ -1837,6 +1847,8 @@ declare function clearPixelDataFast(dst: PixelData32, rect?: Partial<BinaryMaskR
 
 declare function copyPixelData<T extends ImageDataLike = ImageData>(target: PixelData<T>): PixelData;
 
+declare function cropPixelData(src: PixelData32, x: number, y: number, w: number, h: number, out?: MutablePixelData): PixelData;
+
 /**
  * High-level extraction that returns a new PixelData instance.
  * Leverages extractPixelDataBuffer for optimized 32-bit memory moves.
@@ -1923,6 +1935,10 @@ declare function makeReusablePixelData(): (width: number, height: number) => Pix
  */
 declare function rotatePixelData(pixelData: PixelData): void;
 
+declare function getPixelDataTransparentTrimmedBounds(target: PixelData32): Rect | null;
+declare function trimTransparentPixelData(target: PixelData32): PixelData;
+declare function trimTransparentPixelDataInPlace(target: MutablePixelData): void;
+
 declare function uInt32ArrayToPixelData(data: Uint32Array, width: number, height: number): PixelData;
 
 /**
@@ -1981,4 +1997,4 @@ declare const makeBinaryMaskTile: TileFactory<BinaryMaskTile>;
 
 declare function makePixelTile(id: number, tx: number, ty: number, tileSize: number, tileArea: number): PixelTile;
 
-export { type AlphaMask, AlphaMaskPaintBuffer, type AlphaMaskPaintBufferCanvasRenderer, type AlphaMaskPaintBufferManager, type AlphaMaskRect, type AlphaMaskTile, type ApplyMaskToPixelDataOptions, BASE_FAST_BLEND_MODE_FUNCTIONS, BASE_PERFECT_BLEND_MODE_FUNCTIONS, type Base64EncodedUInt8Array, BaseBlendMode, type BaseBlendModes, type BaseMask, type BasePixelBlendOptions, type BatchedQueue, type BatchedQueueFn, type BinaryMask, BinaryMaskPaintBuffer, type BinaryMaskPaintBufferCanvasRenderer, type BinaryMaskPaintBufferManager, type BinaryMaskRect, type BinaryMaskTile, type BlendColor32, type BlendModeRegistry, CANVAS_COMPOSITE_MAP, type CanvasBlendModeIndex, type CanvasCompositeOperation, type CanvasContext, type CanvasFrameRenderer, type CanvasObjectFactory, type CanvasPixelDataRenderer, type Color32, type ColorBlendMaskOptions, type ColorBlendOptions, ColorPaintBuffer, type ColorPaintBufferCanvasRenderer, type ColorPaintBufferManager, type DidChangeFn, type DrawPixelLayer, type DrawScreenLayer, _errors as ERRORS, type FloodFillResult, type HistoryAction, type HistoryActionFactory, HistoryManager, type HistoryMutator, type ImageDataLike, type IndexedImage, type InvertMask, type Mask, type MaskOffset, type MaskRect, MaskType, type MergeAlphaMasksOptions, type MutableAlphaMask, type MutableBinaryMask, type MutableMask, type MutablePixelData32, type NullableBinaryMaskRect, type NullableMaskRect, type PaintAlphaMask, type PaintBinaryMask, type PaintCursorRenderer, type PaintMask, PaintMaskOutline, type PaintRect, PixelAccumulator, type PixelBlendMaskOptions, type PixelBlendOptions, type PixelCanvas, type PixelData, type PixelData32, PixelEngineConfig, type PixelMutateOptions, type PixelPatchTiles, type PixelRect, type PixelTile, PixelWriter, type PixelWriterOptions, type RGBA, type Rect, type RequiredBlendModes, type ReusableCanvas, type ReusableCanvasFactory, type ReusableImageData, type ReusablePixelData, type SerializedImageData, type Tile, type TileFactory, TilePool, TileType, UnsupportedFormatError, _macro_imageDataToUint32Array, applyAlphaMaskToPixelData, applyBinaryMaskToAlphaMask, applyBinaryMaskToPixelData, applyMaskToPixelData, applyPatchTiles, base64DecodeArrayBuffer, base64EncodeArrayBuffer, blendColorPixelData, blendColorPixelDataAlphaMask, blendColorPixelDataBinaryMask, blendColorPixelDataMask, blendColorPixelDataPaintAlphaMask, blendColorPixelDataPaintBinaryMask, blendColorPixelDataPaintMask, blendPixel, blendPixelData, blendPixelDataAlphaMask, blendPixelDataBinaryMask, blendPixelDataMask, blendPixelDataPaintBuffer, clearPixelDataFast, color32ToCssRGBA, color32ToHex, colorBurnFast, colorBurnPerfect, colorDistance, colorDodgeFast, colorDodgePerfect, commitColorPaintBuffer, commitMaskPaintBuffer, copyImageData, copyImageDataLike, copyMask, copyPixelData, darkenFast, darkenPerfect, darkerFast, darkerPerfect, deserializeImageData, deserializeNullableImageData, deserializeRawImageData, destinationAtopFast, destinationAtopPerfect, destinationInFast, destinationInPerfect, destinationOutFast, destinationOutPerfect, destinationOverFast, destinationOverPerfect, differenceFast, differencePerfect, divideFast, dividePerfect, eachTileInBounds, exclusionFast, exclusionPerfect, extractImageData, extractImageDataBuffer, extractMask, extractMaskBuffer, extractPixelData, extractPixelDataBuffer, fileInputChangeToImageData, fileToImageData, fillPixelData, fillPixelDataBinaryMask, fillPixelDataFast, floodFillSelection, forEachLinePoint, getImageDataFromClipboard, getIndexedImageColor, getIndexedImageColorCounts, getRectsBounds, getSupportedPixelFormats, hardLightFast, hardLightPerfect, hardMixFast, hardMixPerfect, imageDataToAlphaMaskBuffer, imageDataToDataUrl, imageDataToImgBlob, imageDataToUint32Array, imgBlobToImageData, indexedImageToAverageColor, indexedImageToImageData, invertAlphaMask, invertBinaryMask, invertImageData, invertPixelData, lerpColor32, lerpColor32Fast, lightenFast, lightenPerfect, lighterFast, lighterPerfect, linearBurnFast, linearBurnPerfect, linearDodgeFast, linearDodgePerfect, linearLightFast, linearLightPerfect, makeAlphaMask, makeAlphaMaskPaintBufferCanvasRenderer, makeAlphaMaskPaintBufferCommitter, makeAlphaMaskPaintBufferManager, makeAlphaMaskTile, makeBatchedQueue, makeBinaryMask, makeBinaryMaskFromAlphaMask, makeBinaryMaskOutline, makeBinaryMaskPaintBufferCanvasRenderer, makeBinaryMaskPaintBufferCommitter, makeBinaryMaskPaintBufferManager, makeBinaryMaskTile, makeBlendModeRegistry, makeCanvasFrameRenderer, makeCanvasPixelDataRenderer, makeCircleBinaryMaskOutline, makeCirclePaintAlphaMask, makeCirclePaintBinaryMask, makeColorPaintBufferCanvasRenderer, makeColorPaintBufferCommitter, makeColorPaintBufferManager, makeFastBlendModeRegistry, makeFullPixelMutator, makeHistoryAction, makeImageDataLike, makeIndexedImage, makeIndexedImageFromImageData, makeIndexedImageFromImageDataRaw, makePaintAlphaMask, makePaintBinaryMask, makePaintCursorRenderer, makePaintRect, makePerfectBlendModeRegistry, makePixelCanvas, makePixelData, makePixelTile, makeRectBinaryMaskOutline, makeRectFalloffPaintAlphaMask, makeRenderQueue, makeReusableCanvas, makeReusableImageData, makeReusableOffscreenCanvas, makeReusablePixelData, merge2BinaryMaskRects, mergeAlphaMasks, mergeBinaryMaskRects, mergeBinaryMasks, multiplyFast, multiplyPerfect, mutatorApplyAlphaMask, mutatorApplyBinaryMask, mutatorApplyMask, mutatorBlendAlphaMask, mutatorBlendBinaryMask, mutatorBlendColor, mutatorBlendColorPaintAlphaMask, mutatorBlendColorPaintBinaryMask, mutatorBlendColorPaintMask, mutatorBlendColorPaintRect, mutatorBlendMask, mutatorBlendPixel, mutatorBlendPixelData, mutatorClear, mutatorFill, mutatorFillBinaryMask, mutatorFillRect, mutatorInvert, overlayFast, overlayPerfect, overwriteBase, overwriteFast, overwritePerfect, packColor, packRGBA, pinLightFast, pinLightPerfect, pixelDataToAlphaMask, reflectPixelDataHorizontal, reflectPixelDataVertical, resampleImageData, resampleIndexedImage, resamplePixelData, resamplePixelDataInPlace, resampleUint32Array, resizeImageData, resizePixelData, rotatePixelData, screenFast, screenPerfect, serializeImageData, serializeNullableImageData, setMaskData, setPixelData, softLightFast, softLightPerfect, sourceAtopFast, sourceAtopPerfect, sourceInFast, sourceInPerfect, sourceOutFast, sourceOutPerfect, sourceOverFast, sourceOverPerfect, subtractBinaryMaskRects, subtractFast, subtractPerfect, toBlendModeIndexAndName, trimMaskRectBounds, trimRectBounds, uInt32ArrayToImageData, uInt32ArrayToImageDataLike, uInt32ArrayToPixelData, unpackAlpha, unpackBlue, unpackColor, unpackColorTo, unpackGreen, unpackRed, vividLightFast, vividLightPerfect, writeImageData, writeImageDataBuffer, writeImageDataToClipboard, writeImgBlobToClipboard, writePaintBufferToPixelData, writePixelData, writePixelDataBuffer, xorFast, xorPerfect };
+export { type AlphaMask, AlphaMaskPaintBuffer, type AlphaMaskPaintBufferCanvasRenderer, type AlphaMaskPaintBufferManager, type AlphaMaskRect, type AlphaMaskTile, type ApplyMaskToPixelDataOptions, BASE_FAST_BLEND_MODE_FUNCTIONS, BASE_PERFECT_BLEND_MODE_FUNCTIONS, type Base64EncodedUInt8Array, BaseBlendMode, type BaseBlendModes, type BaseMask, type BasePixelBlendOptions, type BatchedQueue, type BatchedQueueFn, type BinaryMask, BinaryMaskPaintBuffer, type BinaryMaskPaintBufferCanvasRenderer, type BinaryMaskPaintBufferManager, type BinaryMaskRect, type BinaryMaskTile, type BlendColor32, type BlendModeRegistry, CANVAS_COMPOSITE_MAP, type CanvasBlendModeIndex, type CanvasCompositeOperation, type CanvasContext, type CanvasFrameRenderer, type CanvasObjectFactory, type CanvasPixelDataRenderer, type Color32, type ColorBlendMaskOptions, type ColorBlendOptions, ColorPaintBuffer, type ColorPaintBufferCanvasRenderer, type ColorPaintBufferManager, type DidChangeFn, type DrawPixelLayer, type DrawScreenLayer, _errors as ERRORS, type FloodFillResult, type HistoryAction, type HistoryActionFactory, HistoryManager, type HistoryMutator, type ImageDataLike, type IndexedImage, type InvertMask, type Mask, type MaskOffset, type MaskRect, MaskType, type MergeAlphaMasksOptions, type MutableAlphaMask, type MutableBinaryMask, type MutableMask, type MutablePixelData, type MutablePixelData32, type NullableBinaryMaskRect, type NullableMaskRect, type PaintAlphaMask, type PaintBinaryMask, type PaintBrush, type PaintCursorRenderer, type PaintMask, PaintMaskOutline, type PaintRect, PixelAccumulator, type PixelBlendMaskOptions, type PixelBlendOptions, type PixelCanvas, type PixelData, type PixelData32, PixelEngineConfig, type PixelMutateOptions, type PixelPatchTiles, type PixelRect, type PixelTile, PixelWriter, type PixelWriterOptions, type RGBA, type Rect, type RequiredBlendModes, type ReusableCanvas, type ReusableCanvasFactory, type ReusableImageData, type ReusablePixelData, type SerializedImageData, type Tile, type TileFactory, TilePool, TileType, UnsupportedFormatError, _macro_imageDataToUint32Array, applyAlphaMaskToPixelData, applyBinaryMaskToAlphaMask, applyBinaryMaskToPixelData, applyMaskToPixelData, applyPatchTiles, base64DecodeArrayBuffer, base64EncodeArrayBuffer, blendColorPixelData, blendColorPixelDataAlphaMask, blendColorPixelDataBinaryMask, blendColorPixelDataMask, blendColorPixelDataPaintAlphaMask, blendColorPixelDataPaintBinaryMask, blendColorPixelDataPaintMask, blendPixel, blendPixelData, blendPixelDataAlphaMask, blendPixelDataBinaryMask, blendPixelDataMask, blendPixelDataPaintBuffer, clearPixelDataFast, color32ToCssRGBA, color32ToHex, colorBurnFast, colorBurnPerfect, colorDistance, colorDodgeFast, colorDodgePerfect, commitColorPaintBuffer, commitMaskPaintBuffer, copyImageData, copyImageDataLike, copyMask, copyPixelData, cropPixelData, darkenFast, darkenPerfect, darkerFast, darkerPerfect, deserializeImageData, deserializeNullableImageData, deserializeRawImageData, destinationAtopFast, destinationAtopPerfect, destinationInFast, destinationInPerfect, destinationOutFast, destinationOutPerfect, destinationOverFast, destinationOverPerfect, differenceFast, differencePerfect, divideFast, dividePerfect, eachTileInBounds, exclusionFast, exclusionPerfect, extractImageData, extractImageDataBuffer, extractMask, extractMaskBuffer, extractPixelData, extractPixelDataBuffer, fileInputChangeToImageData, fileToImageData, fillPixelData, fillPixelDataBinaryMask, fillPixelDataFast, floodFillSelection, forEachLinePoint, getImageDataFromClipboard, getIndexedImageColor, getIndexedImageColorCounts, getPixelDataTransparentTrimmedBounds, getRectsBounds, getSupportedPixelFormats, hardLightFast, hardLightPerfect, hardMixFast, hardMixPerfect, imageDataToAlphaMaskBuffer, imageDataToDataUrl, imageDataToImgBlob, imageDataToUint32Array, imgBlobToImageData, indexedImageToAverageColor, indexedImageToImageData, invertAlphaMask, invertBinaryMask, invertImageData, invertPixelData, lerpColor32, lerpColor32Fast, lightenFast, lightenPerfect, lighterFast, lighterPerfect, linearBurnFast, linearBurnPerfect, linearDodgeFast, linearDodgePerfect, linearLightFast, linearLightPerfect, makeAlphaMask, makeAlphaMaskPaintBufferCanvasRenderer, makeAlphaMaskPaintBufferCommitter, makeAlphaMaskPaintBufferManager, makeAlphaMaskTile, makeBatchedQueue, makeBinaryMask, makeBinaryMaskFromAlphaMask, makeBinaryMaskOutline, makeBinaryMaskPaintBufferCanvasRenderer, makeBinaryMaskPaintBufferCommitter, makeBinaryMaskPaintBufferManager, makeBinaryMaskTile, makeBlendModeRegistry, makeCanvasFrameRenderer, makeCanvasPixelDataRenderer, makeCircleBinaryMaskOutline, makeCirclePaintAlphaMask, makeCirclePaintBinaryMask, makeColorPaintBufferCanvasRenderer, makeColorPaintBufferCommitter, makeColorPaintBufferManager, makeFastBlendModeRegistry, makeFullPixelMutator, makeHistoryAction, makeImageDataLike, makeIndexedImage, makeIndexedImageFromImageData, makeIndexedImageFromImageDataRaw, makePaintAlphaMask, makePaintBinaryMask, makePaintCursorRenderer, makePaintRect, makePerfectBlendModeRegistry, makePixelCanvas, makePixelData, makePixelTile, makeRectBinaryMaskOutline, makeRectFalloffPaintAlphaMask, makeRenderQueue, makeReusableCanvas, makeReusableImageData, makeReusableOffscreenCanvas, makeReusablePixelData, merge2BinaryMaskRects, mergeAlphaMasks, mergeBinaryMaskRects, mergeBinaryMasks, multiplyFast, multiplyPerfect, mutatorApplyAlphaMask, mutatorApplyBinaryMask, mutatorApplyMask, mutatorBlendAlphaMask, mutatorBlendBinaryMask, mutatorBlendColor, mutatorBlendColorPaintAlphaMask, mutatorBlendColorPaintBinaryMask, mutatorBlendColorPaintMask, mutatorBlendColorPaintRect, mutatorBlendMask, mutatorBlendPixel, mutatorBlendPixelData, mutatorClear, mutatorFill, mutatorFillBinaryMask, mutatorInvert, overlayFast, overlayPerfect, overwriteBase, overwriteFast, overwritePerfect, packColor, packRGBA, pinLightFast, pinLightPerfect, pixelDataToAlphaMask, reflectPixelDataHorizontal, reflectPixelDataVertical, resampleImageData, resampleIndexedImage, resamplePixelData, resamplePixelDataInPlace, resampleUint32Array, resizeImageData, resizePixelData, rotatePixelData, screenFast, screenPerfect, serializeImageData, serializeNullableImageData, setMaskData, setPixelData, softLightFast, softLightPerfect, sourceAtopFast, sourceAtopPerfect, sourceInFast, sourceInPerfect, sourceOutFast, sourceOutPerfect, sourceOverFast, sourceOverPerfect, subtractBinaryMaskRects, subtractFast, subtractPerfect, toBlendModeIndexAndName, trimMaskRectBounds, trimRectBounds, trimTransparentPixelData, trimTransparentPixelDataInPlace, uInt32ArrayToImageData, uInt32ArrayToImageDataLike, uInt32ArrayToPixelData, unpackAlpha, unpackBlue, unpackColor, unpackColorTo, unpackGreen, unpackRed, vividLightFast, vividLightPerfect, writeImageData, writeImageDataBuffer, writeImageDataToClipboard, writeImgBlobToClipboard, writePaintBufferToPixelData, writePixelData, writePixelDataBuffer, xorFast, xorPerfect };

package/dist/index.prod.js

@@ -2149,6 +2149,11 @@ var PixelAccumulator = class {
   storePixelBeforeState(x, y) {
     const shift = this.config.tileShift;
     const columns = this.config.targetColumns;
+    const targetWidth = this.config.target.w;
+    const targetHeight = this.config.target.h;
+    if (x < 0 || x >= targetWidth || y < 0 || y >= targetHeight) {
+      return null;
+    }
     const tx = x >> shift;
     const ty = y >> shift;
     const id = ty * columns + tx;
@@ -2179,10 +2184,19 @@ var PixelAccumulator = class {
   storeRegionBeforeState(x, y, w, h) {
     const shift = this.config.tileShift;
     const columns = this.config.targetColumns;
-    const startX = x >> shift;
-    const startY = y >> shift;
-    const endX = x + w - 1 >> shift;
-    const endY = y + h - 1 >> shift;
+    const targetWidth = this.config.target.w;
+    const targetHeight = this.config.target.h;
+    const clipX1 = Math.max(0, x);
+    const clipY1 = Math.max(0, y);
+    const clipX2 = Math.min(targetWidth - 1, x + w - 1);
+    const clipY2 = Math.min(targetHeight - 1, y + h - 1);
+    if (clipX2 < clipX1 || clipY2 < clipY1) {
+      return null;
+    }
+    const startX = clipX1 >> shift;
+    const startY = clipY1 >> shift;
+    const endX = clipX2 >> shift;
+    const endY = clipY2 >> shift;
     const startIndex = this.beforeTiles.length;
     for (let ty = startY; ty <= endY; ty++) {
       for (let tx = startX; tx <= endX; tx++) {
@@ -2653,6 +2667,7 @@ var mutatorApplyAlphaMask = ((writer, deps = defaults) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(applyAlphaMaskToPixelData2(target, mask, opts));
     }
   };
@@ -2755,7 +2770,12 @@ var mutatorApplyBinaryMask = ((writer, deps = defaults2) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
-      return didChange(applyBinaryMaskToPixelData2(target, mask, opts));
+      if (!didChange) return false;
+      const b = applyBinaryMaskToPixelData2(target, mask, opts);
+      console.log({
+        b
+      });
+      return didChange(b);
     }
   };
 });
@@ -2778,6 +2798,7 @@ var mutatorApplyMask = ((writer, deps = defaults3) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       if (mask.type === 1 /* BINARY */) {
         return didChange(applyBinaryMaskToPixelData2(target, mask, opts));
       } else {
@@ -2922,6 +2943,7 @@ var mutatorBlendAlphaMask = ((writer, deps = defaults4) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendPixelDataAlphaMask2(writer.config.target, src, mask, opts));
     }
   };
@@ -3049,6 +3071,7 @@ var mutatorBlendBinaryMask = ((writer, deps = defaults5) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendPixelDataBinaryMask2(writer.config.target, src, mask, opts));
     }
   };
@@ -3123,6 +3146,7 @@ var mutatorBlendColor = ((writer, deps = defaults6) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendColorPixelData2(target, color, opts));
     }
   };
@@ -3235,6 +3259,7 @@ var mutatorBlendColorPaintAlphaMask = ((writer, deps = defaults7) => {
       const tx = x + mask.centerOffsetX;
       const ty = y + mask.centerOffsetY;
       const didChange = writer.accumulator.storeRegionBeforeState(tx, ty, mask.w, mask.h);
+      if (!didChange) return false;
       OPTS.x = tx;
       OPTS.y = ty;
       OPTS.alpha = alpha;
@@ -3331,6 +3356,7 @@ var mutatorBlendColorPaintBinaryMask = ((writer, deps = defaults8) => {
       const tx = x + mask.centerOffsetX;
       const ty = y + mask.centerOffsetY;
       const didChange = writer.accumulator.storeRegionBeforeState(tx, ty, mask.w, mask.h);
+      if (!didChange) return false;
       OPTS.x = tx;
       OPTS.y = ty;
       OPTS.alpha = alpha;
@@ -3361,6 +3387,7 @@ var mutatorBlendColorPaintMask = ((writer, deps = defaults9) => {
       const tx = x + mask.centerOffsetX;
       const ty = y + mask.centerOffsetY;
       const didChange = writer.accumulator.storeRegionBeforeState(tx, ty, mask.w, mask.h);
+      if (!didChange) return false;
       OPTS.x = tx;
       OPTS.y = ty;
       OPTS.alpha = alpha;
@@ -3402,6 +3429,7 @@ var mutatorBlendColorPaintRect = ((writer, deps = defaults10) => {
       OPTS.blendFn = blendFn;
       OPTS.alpha = alpha;
       const didChange = writer.accumulator.storeRegionBeforeState(topLeftX, topLeftY, brushWidth, brushHeight);
+      if (!didChange) return false;
       return didChange(blendColorPixelData2(target, color, OPTS));
     }
   };
@@ -3424,6 +3452,7 @@ var mutatorBlendMask = ((writer, deps = defaults11) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       if (mask.type === 1 /* BINARY */) {
         return didChange(blendPixelDataBinaryMask2(writer.config.target, src, mask, opts));
       } else {
@@ -3470,6 +3499,7 @@ var mutatorBlendPixel = ((writer, deps = defaults12) => {
   return {
     blendPixel(x, y, color, alpha, blendFn) {
       const didChange = writer.accumulator.storePixelBeforeState(x, y);
+      if (!didChange) return false;
       return didChange(blendPixel2(writer.config.target, x, y, color, alpha, blendFn));
     }
   };
@@ -3577,6 +3607,7 @@ var mutatorBlendPixelData = ((writer, deps = defaults13) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendPixelData2(writer.config.target, src, opts));
     }
   };
@@ -3590,16 +3621,16 @@ function fillPixelData(dst, color, _x, _y, _w, _h) {
   let y;
   let w;
   let h;
-  if (typeof _x === "object") {
-    x = _x.x ?? 0;
-    y = _x.y ?? 0;
-    w = _x.w ?? dstW;
-    h = _x.h ?? dstH;
-  } else if (typeof _x === "number") {
+  if (typeof _x === "number") {
     x = _x;
     y = _y;
     w = _w;
     h = _h;
+  } else if (typeof _x === "object") {
+    x = _x.x ?? 0;
+    y = _x.y ?? 0;
+    w = _x.w ?? dstW;
+    h = _x.h ?? dstH;
   } else {
     x = 0;
     y = 0;
@@ -3664,6 +3695,7 @@ var mutatorClear = ((writer, deps = defaults14) => {
       const w = rect?.w ?? target.w;
       const h = rect?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(fillPixelData2(target, 0, x, y, w, h));
     }
   };
@@ -3677,24 +3709,37 @@ var mutatorFill = ((writer, deps = defaults15) => {
   const {
     fillPixelData: fillPixelData2 = defaults15.fillPixelData
   } = deps;
-  return {
-    fill(color, x = 0, y = 0, w = writer.config.target.w, h = writer.config.target.h) {
-      const target = writer.config.target;
-      const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
-      return didChange(fillPixelData2(target, color, x, y, w, h));
+  const config = writer.config;
+  function fill(color, _x, _y, _w, _h) {
+    const target = config.target;
+    const dstW = target.w;
+    const dstH = target.h;
+    let x;
+    let y;
+    let w;
+    let h;
+    if (typeof _x === "number") {
+      x = _x;
+      y = _y;
+      w = _w;
+      h = _h;
+    } else if (typeof _x === "object") {
+      x = _x.x ?? 0;
+      y = _x.y ?? 0;
+      w = _x.w ?? dstW;
+      h = _x.h ?? dstH;
+    } else {
+      x = 0;
+      y = 0;
+      w = dstW;
+      h = dstH;
     }
-  };
-});
-var mutatorFillRect = ((writer, deps = defaults15) => {
-  const {
-    fillPixelData: fillPixelData2 = defaults15.fillPixelData
-  } = deps;
+    const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+    if (!didChange) return false;
+    return didChange(fillPixelData2(target, color, x, y, w, h));
+  }
   return {
-    fillRect(color, rect) {
-      const target = writer.config.target;
-      const didChange = writer.accumulator.storeRegionBeforeState(rect.x, rect.y, rect.w, rect.h);
-      return didChange(fillPixelData2(target, color, rect.x, rect.y, rect.w, rect.h));
-    }
+    fill
   };
 });
 
@@ -3756,6 +3801,7 @@ var mutatorFillBinaryMask = ((writer, deps = defaults16) => {
   return {
     fillBinaryMask(color, mask, x = 0, y = 0) {
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, mask.w, mask.h);
+      if (!didChange) return false;
       return didChange(fillPixelDataBinaryMask2(writer.config.target, color, mask, x, y));
     }
   };
@@ -3840,7 +3886,8 @@ var mutatorInvert = ((writer, deps = defaults17) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
-      return didChange(invertPixelData2(target, opts));
+      if (!didChange) return false;
+      return didChange?.(invertPixelData2(target, opts));
     }
   };
 });
@@ -3865,7 +3912,6 @@ function makeFullPixelMutator(writer) {
     ...mutatorClear(writer),
     ...mutatorFill(writer),
     ...mutatorFillBinaryMask(writer),
-    ...mutatorFillRect(writer),
     ...mutatorInvert(writer)
   };
 }
@@ -5896,6 +5942,9 @@ function makeRectFalloffPaintAlphaMask(width, height, fallOff = (d) => d) {
 // src/Paint/PaintRect.ts
 function makePaintRect(w, h) {
   return {
+    type: null,
+    outlineType: 2 /* RECT */,
+    data: null,
     w,
     h,
     centerOffsetX: -(w - 1 >> 1),
@@ -5932,31 +5981,34 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
   const getPixelData = makeReusablePixelData();
   let _color = packColor(0, 255, 255, 255);
   let _scale = 1;
-  let currentMask = {
-    type: 1 /* BINARY */,
+  let currentBrush = {
+    type: null,
     outlineType: 2 /* RECT */,
     w: 1,
     h: 1,
     centerOffsetX: -(10 - 1 >> 1),
-    centerOffsetY: -(10 - 1 >> 1)
+    centerOffsetY: -(10 - 1 >> 1),
+    data: null
   };
   let outline;
   function update(paintMask, scale, color, alphaThreshold = 127) {
-    currentMask = paintMask ?? currentMask;
+    currentBrush = paintMask ?? currentBrush;
     _scale = scale ?? _scale;
     _color = color ?? _color;
-    updateBuffer(currentMask.w * _scale + 2 * _scale, currentMask.h * _scale + 2 * _scale);
-    if (currentMask.type === 1 /* BINARY */) {
-      if (currentMask.outlineType === 1 /* CIRCLE */) {
-        outline = makeCircleBinaryMaskOutline(currentMask.w, _scale);
-      } else if (currentMask.outlineType === 2 /* RECT */) {
-        outline = makeRectBinaryMaskOutline(currentMask.w, currentMask.h, _scale);
-      } else if (currentMask.outlineType === 0 /* MASKED */) {
-        outline = makeBinaryMaskOutline(currentMask, _scale);
+    updateBuffer(currentBrush.w * _scale + 2 * _scale, currentBrush.h * _scale + 2 * _scale);
+    if (currentBrush.type === 1 /* BINARY */) {
+      if (currentBrush.outlineType === 1 /* CIRCLE */) {
+        outline = makeCircleBinaryMaskOutline(currentBrush.w, _scale);
+      } else if (currentBrush.outlineType === 2 /* RECT */) {
+        outline = makeRectBinaryMaskOutline(currentBrush.w, currentBrush.h, _scale);
+      } else if (currentBrush.outlineType === 0 /* MASKED */) {
+        outline = makeBinaryMaskOutline(currentBrush, _scale);
       }
-    } else if (currentMask.type === 0 /* ALPHA */) {
-      const mask = makeBinaryMaskFromAlphaMask(currentMask, alphaThreshold);
+    } else if (currentBrush.type === 0 /* ALPHA */) {
+      const mask = makeBinaryMaskFromAlphaMask(currentBrush, alphaThreshold);
       outline = makeBinaryMaskOutline(mask, _scale);
+    } else {
+      outline = makeRectBinaryMaskOutline(currentBrush.w, currentBrush.h, _scale);
     }
     const pixelData = getPixelData(outline.w, outline.h);
     fillPixelDataBinaryMask(pixelData, _color, outline);
@@ -5969,10 +6021,10 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
     h: 0
   };
   function getBounds(centerX, centerY) {
-    boundsScratch.x = centerX + currentMask.centerOffsetX;
-    boundsScratch.y = centerY + currentMask.centerOffsetY;
-    boundsScratch.w = currentMask.w;
-    boundsScratch.h = currentMask.h;
+    boundsScratch.x = centerX + currentBrush.centerOffsetX;
+    boundsScratch.y = centerY + currentBrush.centerOffsetY;
+    boundsScratch.w = currentBrush.w;
+    boundsScratch.h = currentBrush.h;
     return boundsScratch;
   }
   const boundsScaledScratch = {
@@ -5982,22 +6034,25 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
     h: 0
   };
   function getOutlineBoundsScaled(centerX, centerY) {
-    boundsScaledScratch.x = centerX * _scale + currentMask.centerOffsetX * _scale - 1;
-    boundsScaledScratch.y = centerY * _scale + currentMask.centerOffsetY * _scale - 1;
-    boundsScaledScratch.w = currentMask.w * _scale;
-    boundsScaledScratch.h = currentMask.h * _scale;
+    boundsScaledScratch.x = centerX * _scale + currentBrush.centerOffsetX * _scale - 1;
+    boundsScaledScratch.y = centerY * _scale + currentBrush.centerOffsetY * _scale - 1;
+    boundsScaledScratch.w = currentBrush.w * _scale;
+    boundsScaledScratch.h = currentBrush.h * _scale;
     return boundsScaledScratch;
   }
   function draw(drawCtx, centerX, centerY) {
-    const dx = centerX * _scale + currentMask.centerOffsetX * _scale - 1;
-    const dy = centerY * _scale + currentMask.centerOffsetY * _scale - 1;
+    const dx = centerX * _scale + currentBrush.centerOffsetX * _scale - 1;
+    const dy = centerY * _scale + currentBrush.centerOffsetY * _scale - 1;
     drawCtx.drawImage(canvas, Math.floor(dx), Math.floor(dy));
   }
+  function drawRaw(drawCtx, x, y) {
+    drawCtx.drawImage(canvas, Math.floor(x * _scale), Math.floor(y * _scale));
+  }
   function getSettings() {
     return {
       color: _color,
       scale: _scale,
-      currentMask
+      currentBrush
     };
   }
   return {
@@ -6005,6 +6060,7 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
     getBounds,
     getBoundsScaled: getOutlineBoundsScaled,
     draw,
+    drawRaw,
     getSettings
   };
 }
@@ -6179,6 +6235,36 @@ function copyPixelData(target) {
   return makePixelData(new ImageData(buffer, target.w, target.h));
 }
 
+// src/PixelData/cropPixelData.ts
+function cropPixelData(src, x, y, w, h, out) {
+  const cx = Math.max(x, 0);
+  const cy = Math.max(y, 0);
+  const cw = Math.min(x + w, src.w) - cx;
+  const ch = Math.min(y + h, src.h) - cy;
+  if (cw <= 0 || ch <= 0) {
+    throw new Error(`Crop [${x},${y} ${w}x${h}] does not overlap PixelData [${src.w}x${src.h}]`);
+  }
+  const cropped = new ImageData(cw, ch);
+  let dst32;
+  if (out) {
+    setPixelData(out, cropped);
+    dst32 = out.data;
+  } else {
+    dst32 = new Uint32Array(cropped.data.buffer);
+  }
+  for (let row = 0; row < ch; row++) {
+    const srcOffset = (cy + row) * src.w + cx;
+    const dstOffset = row * cw;
+    dst32.set(src.data.subarray(srcOffset, srcOffset + cw), dstOffset);
+  }
+  return out ?? {
+    data: dst32,
+    imageData: cropped,
+    w: cw,
+    h: ch
+  };
+}
+
 // src/PixelData/extractPixelDataBuffer.ts
 function extractPixelDataBuffer(source, _x, _y, _w, _h) {
   let x;
@@ -6394,6 +6480,46 @@ function rotateSquareInPlace(pixelData) {
   }
 }
 
+// src/PixelData/trimPixelData.ts
+function getPixelDataTransparentTrimmedBounds(target) {
+  let minX = target.w;
+  let minY = target.h;
+  let maxX = -1;
+  let maxY = -1;
+  for (let y = 0; y < target.h; y++) {
+    for (let x = 0; x < target.w; x++) {
+      const alpha = target.data[y * target.w + x] >>> 24;
+      if (alpha !== 0) {
+        if (x < minX) minX = x;
+        if (x > maxX) maxX = x;
+        if (y < minY) minY = y;
+        if (y > maxY) maxY = y;
+      }
+    }
+  }
+  if (maxX === -1) return null;
+  return {
+    x: minX,
+    y: minY,
+    w: maxX - minX + 1,
+    h: maxY - minY + 1
+  };
+}
+function trimTransparentPixelData(target) {
+  const r = getPixelDataTransparentTrimmedBounds(target);
+  if (!r) {
+    throw new Error("PixelData is fully transparent \u2014 no crop bounds found");
+  }
+  return cropPixelData(target, r.x, r.y, r.w, r.h);
+}
+function trimTransparentPixelDataInPlace(target) {
+  const r = getPixelDataTransparentTrimmedBounds(target);
+  if (!r) {
+    throw new Error("PixelData is fully transparent \u2014 no crop bounds found");
+  }
+  cropPixelData(target, r.x, r.y, r.w, r.h, target);
+}
+
 // src/PixelData/uInt32ArrayToPixelData.ts
 function uInt32ArrayToPixelData(data, width, height) {
   const buffer = data.buffer;
@@ -6552,6 +6678,7 @@ export {
   copyImageDataLike,
   copyMask,
   copyPixelData,
+  cropPixelData,
   darkenFast,
   darkenPerfect,
   darkerFast,
@@ -6590,6 +6717,7 @@ export {
   getImageDataFromClipboard,
   getIndexedImageColor,
   getIndexedImageColorCounts,
+  getPixelDataTransparentTrimmedBounds,
   getRectsBounds,
   getSupportedPixelFormats,
   hardLightFast,
@@ -6685,7 +6813,6 @@ export {
   mutatorClear,
   mutatorFill,
   mutatorFillBinaryMask,
-  mutatorFillRect,
   mutatorInvert,
   overlayFast,
   overlayPerfect,
@@ -6729,6 +6856,8 @@ export {
   toBlendModeIndexAndName,
   trimMaskRectBounds,
   trimRectBounds,
+  trimTransparentPixelData,
+  trimTransparentPixelDataInPlace,
   uInt32ArrayToImageData,
   uInt32ArrayToImageDataLike,
   uInt32ArrayToPixelData,