@pictogrammers/components 0.5.15 → 0.5.18

package/pg/inputPill/inputPill.ts

@@ -0,0 +1,41 @@
+import { Component, Prop, Part } from '@pictogrammers/element';
+
+import template from './inputPill.html';
+import style from './inputPill.css';
+
+@Component({
+  selector: 'pg-input-pill',
+  style,
+  template,
+})
+export default class PgInputPill extends HTMLElement {
+  @Prop() label: string = '';
+  @Prop() value: string = '';
+
+  @Part() $label: HTMLSpanElement;
+  @Part() $remove: HTMLButtonElement;
+
+  #initialized: boolean = false;
+
+  connectedCallback() {
+    // Reconnects re-invoke connectedCallback; guard against duplicate listeners.
+    if (this.#initialized) return;
+    this.#initialized = true;
+    this.$remove.addEventListener('click', () => {
+      this.dispatchEvent(
+        new CustomEvent('remove', {
+          detail: {
+            value: this.value,
+            label: this.label,
+          }
+        })
+      );
+    });
+  }
+
+  render(changes) {
+    if (changes.label) {
+      this.$label.textContent = this.label;
+    }
+  }
+}

package/pg/inputPills/__examples__/basic/basic.html

@@ -0,0 +1,9 @@
+<div class="example">
+  <pg-input-pills part="input"></pg-input-pills>
+  <div>
+    <button part="add" type="button">Add Pill</button>
+  </div>
+  <div>
+    <code>onchange: <span part="value"></span></code>
+  </div>
+</div>

package/pg/inputPills/__examples__/basic/basic.html.tmp.26852.4771e4cad5b7

@@ -0,0 +1,9 @@
+<div class="example">
+  <pg-input-pills part="input"></pg-input-pills>
+  <div>
+    <button part="add" type="button">Add Pill</button>
+  </div>
+  <div>
+    <code>onchange: <span part="value"></span></code>
+  </div>
+</div>

package/pg/inputPixelEditor/README.md

@@ -16,20 +16,23 @@ import PgInputPixelEditor, {
 
 ## Attributes
 
-| Attributes  | Tested   | Description |
-| ----------- | -------- | ----------- |
-| `name`      |          | Unique name in `pg-form` |
-| `width`     |          | Pixel width. Default `10` |
-| `height`    |          | Pixel height. Default `10` |
-| `size`      |          | Pixel size, minimum value `4`. Default `10` |
-| `gridSize`  |          | Grid spacing between cells. Default `1` |
+| Attributes    | Tested   | Description |
+| ------------- | -------- | ----------- |
+| `width`       |          | Pixel width. Default `10` |
+| `height`      |          | Pixel height. Default `10` |
+| `size`        |          | Pixel size, minimum value `4`. Default `10` |
+| `gridSize`    |          | Grid spacing between cells. Default `1` (changing after init does not currently re-render) |
+| `transparent` |          | Show checkerboard background. Default `false` |
+| `placeholder` |          | Placeholder text (not yet implemented) |
 
 ## Events
 
-| Events      | Tested   | Description |
-| ----------- | -------- | ----------- |
-| `change`    |          | `{ detail: { value }` |
-| `reference` |          | `{ detail: { id, callback } }` |
+| Events        | Tested   | Description |
+| ------------- | -------- | ----------- |
+| `change`      |          | `{ detail: { export } }` — debounced, fires 1 second after the last edit |
+| `selectlayer` |          | `{ detail: { color, index } }` — fired in cursor input mode |
+| `debug`       |          | `{ detail: { x, y, width, height, canvas, context, baseLayer, editLayer, noEditLayer, previewLayer } }` — internal layers for debugging previews |
+| `reference`   |          | `{ detail: { id, callback } }` (not yet implemented) |
 
 ```typescript
 this.$input.addEventListener('reference', (e: any) => {
@@ -46,59 +49,71 @@ See usage for each method below.
 | Method     | Tested   | Description |
 | ---------- | -------- | ----------- |
 | `getJson(options)` | -        | Get JSON file. |
-| `getData()` | -           | Get layer data. |
-| `setData()` | -           | Set layer data. |
 | `setJson(json)` | -        | Set JSON file. |
+| `getData()` | -           | Get layer data as paths by color. |
+| `setData(data)` | -           | Set layer data from paths. |
 | `reset()` | -  | Reset canvas and data. |
+| `clear()` | -  | Clear all pixel data (deprecated, will be removed). |
+| `applyTemplate(grid)` | -  | Replace all data with a single-layer 2d color-index grid. |
 | `getExport()` | -  | 2d array of pixel color indexes. Already calculated. |
-| `getExport(id)` | -  | 2d array of pixel color indexes by export size. Minimal perf. |
-| `getExportCanvas()` | -  | Get new prepopulated HTML canvas, ideal for advanced export screens. |
+| `getExportPath()` | -  | SVG path string(s) for the export grid. |
+| `getExportLayerIndexes()` | -  | Indexes of layers flagged for export. |
+| `getExportCanvas(options)` | -  | Get new prepopulated HTML canvas, ideal for advanced export screens. |
 | `await getExportPng(options, meta)` | -  | Get png image with optional metadata. |
-| `undo()` | -           | Undo. |
-| `hasUndo()` | -     | Has undo |
-| `hasRedo()` | -     | Has redo |
-| `redo()` | -           | Redo. |
+| `await getSelectionPng(options, meta)` | -  | Get png of the current selection bounding box. Requires an active selection. |
+| `await copyPngToClipboard(blob, data)` | -  | Copy a png blob and JSON data to the clipboard. |
+| `undo()` | -           | Undo (partial — history is not yet recorded). |
+| `hasUndo()` | -     | Has undo. |
+| `hasRedo()` | -     | Has redo. |
+| `redo()` | -           | Redo (not yet implemented). |
 | `getHistory()` | -  | History list. |
-| `inputModeSelectRectangle()` | -  | Input Mode Select Rectangle |
-| `inputModeSelectEllipse()` | -  | Input Mode Select Ellipse |
-| `inputModeSelectLasso()` | -  | Input Mode Lasso |
-| `inputModeSelectMagicWand()` | -  | Input Mode Magic Wand |
-| `inputModePixel()` | -  | Input Mode Pixel |
-| `inputModeStamp(stamp)` | -  | Input Mode Stamp |
-| `inputModeLine()` | -  | Input Mode Line |
-| `inputModeRectangle()` | -  | Input Mode Rectangle |
-| `inputModeRectangleOutline()` | -  | Input Mode Rectangle Outline |
-| `inputModeEllipse()` | -  | Input Mode Ellipse |
-| `inputModeEllipseOutline()` | -  | Input Mode Ellipse Outline |
-| `selectLayer(index)` | -    | Select layer. |
-| `getLayers()` | -    | Get layer array. |
+| `clearHistory()` | -  | Clear undo/redo history. |
+| `inputModeCursor()` | -  | Input Mode Cursor — click to select layer. |
+| `inputModeSelectRectangle()` | -  | Input Mode Select Rectangle. |
+| `inputModeSelectEllipse()` | -  | Input Mode Select Ellipse. |
+| `inputModeSelectLasso()` | -  | Input Mode Lasso. |
+| `inputModeSelectMagicWand()` | -  | Input Mode Magic Wand. |
+| `inputModePixel()` | -  | Input Mode Pixel. |
+| `inputModePixelSize(size)` | -  | Set pixel brush size (not yet implemented). |
+| `inputModeStamp(stamp)` | -  | Input Mode Stamp. Accepts a `[x, y][]` offset array; a hover preview is shown. |
+| `inputModeLine()` | -  | Input Mode Line. |
+| `inputModeRectangle()` | -  | Input Mode Rectangle. |
+| `inputModeRectangleOutline()` | -  | Input Mode Rectangle Outline. |
+| `inputModeEllipse()` | -  | Input Mode Ellipse. |
+| `inputModeEllipseOutline()` | -  | Input Mode Ellipse Outline. |
+| `selectLayers(indexes)` | -    | Select one or more layers by index array. |
+| `getLayers()` | -    | Get layer index array. |
 | `addLayer(option)` | -        | Add layer. `name`, `type` required. |
-| `removeLayer(index)` | -      | Remove layer. |
-| `flattenLayers(layerIndexes)` | -      | Flatten layers. |
-| `getColor()` | -     | Get selected color |
-| `getColors()` | -    | Get colors. |
-| `getLayerColorIndexes()` | -  | Get selected layer colors. |
-| `selectColor(index)` | -    | Select color. |
-| `setColor(index, r, g, b, a)` | -  | Set Color. |
-| `addColor(r, g, b, a)` | -    | Add color. |
-| `removeColor(index)` | -    | Remove color. |
-| `moveColor(startIndex, endIndex)` | -    | Move index. |
-| `rotateClockwise()` | -    | Rotate. |
-| `rotateCounterclockwise()` | -    | Rotate. |
-| `move(x, y[, layer])` | -  | Move. |
-| `getSelection()` | -  | Get selection pixels. |
-| `clearSelection()` | -  | Clear selection. |
-| `moveSelection(x, y)` | -    | Move selection. |
-| `flipHorizontal()` | -  | Flip horizontal selection. |
-| `flipVertical()` | -  | Flip vertical selection. |
-| `invert()` | -  | Invert layer. |
-| `outline()` | -  | Outline layer with selected color. |
-| `glow()` | -  | Glow layer with selected color. |
-| `drawPixels([[x, y, color], ...])` | -  | Draw pixels. Color optional. |
-| `drawRectangle(x, y, width, height, isOutline)` | -  | Draw rectangle |
-| `drawEllipse(x, y, width, height, isOutline)` | -  | Draw ellipse. |
-| `drawLine()` | -  | Draw line. |
-| `flush()` | -  | Flush changes to history. |
+| `removeLayer(index)` | -      | Remove layer by index. |
+| `flattenLayers(layerIndexes)` | -      | Flatten layers (not yet implemented). |
+| `getColor(index)` | -     | Get color by index. |
+| `getColors()` | -    | Get all colors. |
+| `getColorAt(x, y)` | -    | Get the export color index at a coordinate. |
+| `getLayerAt(x, y)` | -    | Get the top-most layer index with a color at a coordinate, or `null`. |
+| `getLayerColorIndexes(layerIndex?)` | -  | Get unique color indexes on selected (or given) layer. |
+| `getLayerPaths()` | -  | Get SVG path strings per color per layer. |
+| `selectColor(index)` | -    | Set the active draw color. |
+| `setColor(index, r, g, b, a)` | -  | Update a color by index. |
+| `addColor(r, g, b, a)` | -    | Append a color. |
+| `removeColor(index)` | -    | Remove a color by index. |
+| `moveColor(startIndex, endIndex)` | -    | Move a color (not yet implemented). |
+| `mergeColor(fromIndex, toIndex)` | -    | Merge one color into another (not yet implemented). |
+| `rotateClockwise()` | -    | Rotate active layer 90° clockwise. |
+| `rotateCounterclockwise()` | -    | Rotate active layer 90° counter-clockwise. |
+| `move(x, y)` | -  | Translate active layer by x/y pixels. |
+| `flipHorizontal()` | -  | Flip active layer horizontally. |
+| `flipVertical()` | -  | Flip active layer vertically. |
+| `invert()` | -  | Invert active layer (2-color only). |
+| `outline(include?)` | -  | Draw outline around active layer with selected color. |
+| `glow(include?)` | -  | Draw glow (outer outline) with selected color. |
+| `applyGuides()` | -  | Draw guide lines onto the base layer. |
+| `clearGuides()` | -  | Clear guide lines (not yet implemented). |
+| `drawGrid(grid, layer?)` | -  | Draw a full 2d color-index grid onto a layer. |
+| `drawPixel(x, y, color, layer?)` | -  | Draw a single pixel. |
+| `hasSelection()` | -  | Returns true when pixels are selected. |
+| `getSelection()` | -  | Get selection pixels (not yet implemented). |
+| `clearSelection()` | -  | Deselect all pixels. |
+| `moveSelection(x, y)` | -    | Translate selection and its pixels by x/y. |
 
 ### `getJson(options)` Method
 
@@ -107,8 +122,8 @@ The `getJson` method allows getting the JSON representation of the current edito
 ```typescript
 @Part() $editor: PgInputPixelEditor;
 
-handleSave() {
-  const json = await this.$editor.save({
+async handleSave() {
+  const json = await this.$editor.getJson({
     // Include history
     history: true,
   });
@@ -118,16 +133,13 @@ handleSave() {
 
 ### `setJson(json)` Method
 
-The open method allows loading json for previously created images.
+The `setJson` method loads a previously saved JSON file into the editor.
 
 ```typescript
 @Part() $editor: PgInputPixelEditor;
 
-handleOpen() {
-  const error = await this.$editor.open(json);
-  if (error) {
-    throw new Error(error.message);
-  }
+async handleOpen(json) {
+  await this.$editor.setJson(json);
 }
 ```
 
@@ -135,6 +147,14 @@ handleOpen() {
 
 ### `change`
 
+Debounced — fires 1 second after the last edit. The detail contains the cached export grid.
+
+```typescript
+this.$input.addEventListener('change', (e: any) => {
+  const { export: grid } = e.detail;
+});
+```
+
 ### `selectLayer`
 
 Using `InputMode.Cursor` individual pixels can be clicked on to select the layer. Note, selecting a layer does not automatically select it. The event must be handled.
@@ -142,10 +162,25 @@ Using `InputMode.Cursor` individual pixels can be clicked on to select the layer
 ```typescript
 this.$input.addEventListener('selectlayer', (e: any) => {
   const { color, index } = e.detail;
-  this.selectLayers([index]);
+  this.$input.selectLayers([index]);
 })
 ```
 
+## Keyboard Shortcuts
+
+The wrapper is focusable (`tabindex="0"`); shortcuts apply while the editor has focus.
+
+| Keys | Description |
+| ---- | ----------- |
+| `Escape` | Clear the current selection. |
+| `Delete` | Delete the pixels in the current selection. |
+| `Arrow Keys` | Move the current selection by 1 pixel. |
+| `Shift + Arrow Keys` | Move the current selection by 10 pixels. |
+| `Ctrl + C` | Copy the selection (or the full export when nothing is selected) to the clipboard as a PNG. |
+| `Ctrl + V` | Paste clipboard PNG / easel JSON (work in progress — currently logs metadata only). |
+| `Ctrl + Z` | Undo. |
+| `Ctrl + Shift + Z` / `Ctrl + Y` | Redo. |
+
 ## JSON Format
 
 - `width` - Image width.
@@ -360,7 +395,7 @@ To create a repeating 10 pixel grid with an offset `5` and limit `10`. The use c
 
 Exports by default include the entire canvas, but can be resized to a specific pixel size or grid. The `x`, `y`, `width`, and `height` are optional.
 
-Use `getExport(id)` with a `id` value to get the data grid. This is ideal for export previews.
+Use `getExport()` to get the cached 2d color-index grid. Use `getExportCanvas(options)` with `x`, `y`, `width`, `height` to crop to a region — ideal for export previews.
 
 ```json
 {
@@ -388,7 +423,7 @@ Use `getExport(id)` with a `id` value to get the data grid. This is ideal for ex
 
 The history list contains every change made to the canvas. All feature insert an entry into history. Pens and pattern tools will group as to cut down history entries.
 
-Note: Calling the `draw*()` commands programatically will group into a single history item. To create multiple entries call `flush()`.
+Note: Calling the `draw*()` commands programmatically will group into a single history item.
 
 - Undo a change
 - Redo an undo

package/pg/inputPixelEditor/__examples__/basic/basic.ts

@@ -253,7 +253,7 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
           }
         })
       );
-      this.$input.addLayer();
+      this.$input.addLayer({ name: 'layer 1', type: 'pixel' });
     });
     this.$addLayerReference.addEventListener('click', () => {
       this.$layers.data.push(
@@ -268,7 +268,7 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
           }
         })
       );
-      this.$input.addLayer();
+      this.$input.addLayer({ name: 'layer 1', type: 'pixel' });
     });
     // Colors
     this.$colors.columns = [{
@@ -346,9 +346,9 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
     });
     this.$addColor.addEventListener('click', () => {
       this.$colors.data.push(createTableItem({
-        r: 5,
-        g: 5,
-        b: 5,
+        r: 0,
+        g: 0,
+        b: 0,
         a: 1,
         selected: false,
         select: {
@@ -361,6 +361,7 @@ export default class XPgInputPixelEditorBasic extends HTMLElement {
           icon: IconTrash
         }
       }));
+      this.$input.addColor(0, 0, 0, 1);
     });
   }
 

package/pg/inputPixelEditor/inputPixelEditor.ts

@@ -9,6 +9,7 @@ import getEllipseOutlinePixels from './utils/getEllipseOutlinePixels';
 import { WHITE, Pixel } from './utils/constants';
 import getLinePixels from './utils/getLinePixels';
 import getRectanglePixels from './utils/getRectanglePixels';
+import getLassoPixels from './utils/getLassoPixels';
 import getRectangleOutlinePixels from './utils/getRectangleOutlinePixels';
 import fillGrid from './utils/fillGrid';
 import iterateGrid from './utils/interateGrid';
@@ -96,6 +97,16 @@ interface Export {
   height?: number
 }
 
+interface AddLayerOptions {
+  name: string
+  type: Layer['type']
+  exclude?: boolean
+  locked?: boolean
+  hidden?: boolean
+  opacity?: number
+  data?: any[]
+}
+
 interface GridItem {
   value: number
   color: number
@@ -137,6 +148,11 @@ export default class PgInputPixelEditor extends HTMLElement {
   #startColor: number = -1;
   #startX: number = -1;
   #startY: number = -1;
+  #startClientX: number = -1;
+  #startClientY: number = -1;
+  #lassoPath: [number, number][] = [];
+  #lassoOutlinePixels: Set<string> = new Set();
+  #lassoOutlineList: { x: number; y: number }[] = [];
   #x: number = -1;
   #y: number = -1;
   #layer: number[] = [0];
@@ -338,19 +354,22 @@ export default class PgInputPixelEditor extends HTMLElement {
   #setSelectionPreview(pixels: Pixel[]) {
     // Undo previous selection
     this.#previousPreview.forEach(({x, y}) => {
+      if (x < 0 || x >= this.width || y < 0 || y >= this.height) { return; }
       this.#selectionPreview[y][x] = 0;
     });
+    this.#previousPreview = pixels;
     pixels.forEach(({ x, y }) => {
-      this.#previousPreview = pixels;
+      if (x < 0 || x >= this.width || y < 0 || y >= this.height) { return; }
       this.#selectionPreview[y][x] = 1;
     });
     this.$selectionPathPreview.classList.toggle('hide', false);
-    this.$selectionPathPreview.setAttribute('d', bitmaskToPath(this.#selectionPreview, { scale: this.size }));
+    this.$selectionPathPreview.setAttribute('d', bitmaskToPath(this.#selectionPreview, { scale: this.size })[0]);
   }
 
   #clearSelectionPreview() {
     this.$selectionPathPreview.classList.toggle('hide', true);
     this.#previousPreview.forEach(({x, y}) => {
+      if (x < 0 || x >= this.width || y < 0 || y >= this.height) { return; }
       this.#selectionPreview[y][x] = 0;
     });
   }
@@ -375,6 +394,7 @@ export default class PgInputPixelEditor extends HTMLElement {
   }
 
   #setSelectionPixel(x: number, y: number) {
+    if (x < 0 || x >= this.width || y < 0 || y >= this.height) { return; }
     this.#selectionPixels.set(`${x},${y}`, [x, y]);
     this.#selection[y][x] = 1;
   }
@@ -650,7 +670,6 @@ export default class PgInputPixelEditor extends HTMLElement {
   }
 
   async handleKeyDown(event: KeyboardEvent) {
-    console.log(event.shiftKey, event.ctrlKey, event.altKey, event.key);
     this.#isShift = true;
     switch (event.key) {
       case ' ':
@@ -757,6 +776,8 @@ export default class PgInputPixelEditor extends HTMLElement {
     this.#startColor = this.#data[this.#layer[0]][newY][newX];
     this.#startX = newX;
     this.#startY = newY;
+    this.#startClientX = event.clientX;
+    this.#startClientY = event.clientY;
     this.#x = newX;
     this.#y = newY;
     const color = event.buttons === 32 ? 0 : this.#color;
@@ -771,6 +792,11 @@ export default class PgInputPixelEditor extends HTMLElement {
           }
         }));
         break;
+      case InputMode.SelectLasso:
+        this.#lassoPath = [[newX, newY]];
+        this.#lassoOutlinePixels = new Set();
+        this.#lassoOutlineList = [];
+        break;
       case InputMode.Pixel:
         this.#setPixel(newX, newY, color);
         break;
@@ -800,33 +826,44 @@ export default class PgInputPixelEditor extends HTMLElement {
     const totalSize = this.size + this.gridSize;
     let newX = Math.floor((event.clientX - rect.left) / totalSize);
     let newY = Math.floor((event.clientY - rect.top) / totalSize);
-    //if (newX >= this.width) { newX = this.width - 1; }
-    //if (newY >= this.height) { newY = this.height - 1; }
+    if (newX >= this.width) { newX = this.width - 1; }
+    if (newY >= this.height) { newY = this.height - 1; }
+    if (newX < 0) { newX = 0; }
+    if (newY < 0) { newY = 0; }
     //if (this.#startX === -1 && this.#startY === -1) {
     //  return;
     //}
-    // Single Tap
-    if (newX === this.#startX && newY === this.#startY) {
+    const isDragSelect = this.#inputMode === InputMode.SelectRectangle
+      || this.#inputMode === InputMode.SelectEllipse
+      || this.#inputMode === InputMode.SelectLasso;
+    // Select tools moving less than 3px act as a click to deselect,
+    // shift keeps the current selection
+    if (isDragSelect
+      && Math.abs(event.clientX - this.#startClientX) < 3
+      && Math.abs(event.clientY - this.#startClientY) < 3) {
+      this.#clearSelectionPreview();
+      if (!event.shiftKey) {
+        this.clearSelection();
+      }
+    } else if (newX === this.#startX && newY === this.#startY) {
       switch (this.#inputMode) {
         case InputMode.SelectMagicWand:
           if (!event.shiftKey) {
             this.clearSelection();
           }
           const color = this.#data[this.#layer[0]][newY][newX];
-          console.log(color);
           const pixels = getFloodFill(this.#data[this.#layer[0]], newX, newY, [color]);
           pixels.forEach(([x, y]) => {
             this.#setSelectionPixel(x, y);
           });
           this.$selectionPathPreview.classList.toggle('hide', true);
           this.$selectionPath.classList.toggle('hide', false);
-          this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size }));
+          this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size })[0]);
           break;
         case InputMode.Pixel:
           // Same as current color
           if (this.#startColor === this.#color) {
             this.#setPixel(newX, newY, 0);
-            this.#data[this.#layer[0]][newY][newX] = 0;
           }
           break;
         case InputMode.Stamp:
@@ -850,7 +887,7 @@ export default class PgInputPixelEditor extends HTMLElement {
           });
           this.$selectionPathPreview.classList.toggle('hide', true);
           this.$selectionPath.classList.toggle('hide', false);
-          this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size }));
+          this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size })[0]);
           break;
         case InputMode.SelectEllipse:
           this.#clearSelectionPreview();
@@ -862,10 +899,19 @@ export default class PgInputPixelEditor extends HTMLElement {
           });
           this.$selectionPathPreview.classList.toggle('hide', true);
           this.$selectionPath.classList.toggle('hide', false);
-          this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size }));
+          this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size })[0]);
           break;
         case InputMode.SelectLasso:
-
+          this.#clearSelectionPreview();
+          if (!event.shiftKey) {
+            this.clearSelection();
+          }
+          getLassoPixels(this.#lassoPath).forEach(({ x, y }) => {
+            this.#setSelectionPixel(x, y);
+          });
+          this.$selectionPathPreview.classList.toggle('hide', true);
+          this.$selectionPath.classList.toggle('hide', false);
+          this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size })[0]);
           break;
         case InputMode.Line:
           getLinePixels(this.#startX, this.#startY, newX, newY).forEach(({ x, y }) => {
@@ -953,6 +999,28 @@ export default class PgInputPixelEditor extends HTMLElement {
         case InputMode.SelectRectangle:
           this.#setSelectionPreview(getRectanglePixels(startX, startY, lastX, lastY));
           break;
+        case InputMode.SelectEllipse:
+          this.#setSelectionPreview(getEllipsePixels(startX, startY, lastX, lastY));
+          break;
+        case InputMode.SelectLasso: {
+          const [sx, sy] = this.#lassoPath[0];
+          for (const [px, py] of points) {
+            const [prevX, prevY] = this.#lassoPath.at(-1)!;
+            for (const { x: lx, y: ly } of getLinePixels(prevX, prevY, px, py)) {
+              const key = `${lx},${ly}`;
+              if (!this.#lassoOutlinePixels.has(key)) {
+                this.#lassoOutlinePixels.add(key);
+                this.#lassoOutlineList.push({ x: lx, y: ly });
+              }
+            }
+            this.#lassoPath.push([px, py]);
+          }
+          const [cx, cy] = this.#lassoPath.at(-1)!;
+          const closing = getLinePixels(cx, cy, sx, sy)
+            .filter(({ x: lx, y: ly }) => !this.#lassoOutlinePixels.has(`${lx},${ly}`));
+          this.#setSelectionPreview([...this.#lassoOutlineList, ...closing]);
+          break;
+        }
         case InputMode.Pixel:
           for (var point of points) {
             this.#setPixel(point[0], point[1], color);
@@ -1100,7 +1168,7 @@ export default class PgInputPixelEditor extends HTMLElement {
     const cloned = cloneGrid(this.#data[this.#layer[0]]);
     const h = cloned.length - 1;
     iterateGrid(this.#data[this.#layer[0]], (x, y) => {
-      cloned[this.#layer[0]][y][x] = this.#data[h - y][x];
+      cloned[y][x] = this.#data[this.#layer[0]][h - y][x];
     });
     this.#data[this.#layer[0]] = cloned;
   }
@@ -1332,7 +1400,7 @@ export default class PgInputPixelEditor extends HTMLElement {
     return this.#colors;
   }
 
-  addColor(r, g, b, a) {
+  addColor(r: number, g: number, b: number, a: number) {
     this.#colors.push([r, g, b, a]);
   }
 
@@ -1379,7 +1447,7 @@ export default class PgInputPixelEditor extends HTMLElement {
     this.#layer = indexes;
   }
 
-  addLayer({ name, type, ...optional }) {
+  addLayer({ name, type, ...optional }: AddLayerOptions) {
     this.#data.push(fillGrid(this.width, this.height));
     this.#layers.push({
       name,
@@ -1466,8 +1534,12 @@ export default class PgInputPixelEditor extends HTMLElement {
   #getLayerPaths() {
     return this.#data.map((layer, layerIndex) => {
       const colors = this.getLayerColorIndexes(layerIndex);
-      return colors.map((color) => {
-        return [color, bitmaskToPath(layer, { scale: 1, include: [color] })];
+      const paths = bitmaskToPath(layer, {
+        scale: 1,
+        include: colors.map((color) => ([color])),
+      });
+      return colors.map((color, i) => {
+        return [color, paths[i]];
       });
     });
   }
@@ -1489,8 +1561,8 @@ export default class PgInputPixelEditor extends HTMLElement {
               color,
               path: bitmaskToPath(this.#data[layerIndex], {
                 scale: 1,
-                include: [color]
-              }),
+                include: [[color]]
+              })[0],
             };
           });
         case 'reference':
@@ -1603,8 +1675,8 @@ export default class PgInputPixelEditor extends HTMLElement {
       ...options,
       x: minX,
       y: minY,
-      width: maxX - minX,
-      height: maxY - minY,
+      width: maxX - minX + 1,
+      height: maxY - minY + 1,
     }, meta);
   }
 
@@ -1619,6 +1691,7 @@ export default class PgInputPixelEditor extends HTMLElement {
     this.#selectionPixels.forEach(([currentX, currentY]) => {
       const newX = currentX + x;
       const newY = currentY + y;
+      if (newX < 0 || newX >= this.width || newY < 0 || newY >= this.height) { return; }
       this.#layer.forEach((layer) => {
         const color = this.#data[layer][currentY][currentX];
         const newColor = this.#data[layer][newY][newX];
@@ -1632,7 +1705,6 @@ export default class PgInputPixelEditor extends HTMLElement {
     });
     const clearSelection = diffLeftMapPixels(this.#selectionPixels, newSelection);
     // Move pixels
-    console.log(changes);
     changes.forEach(([layer, newX, newY, color]) => {
       this.#data[layer][newY][newX] = color;
       this.#setPixel(newX, newY, color, [layer]);
@@ -1657,7 +1729,7 @@ export default class PgInputPixelEditor extends HTMLElement {
     });
 
     // Update render
-    this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size }));
+    this.$selectionPath.setAttribute('d', bitmaskToPath(this.#selection, { scale: this.size })[0]);
   }
 }