@pictogrammers/components 0.5.0 → 0.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@pictogrammers/components",
     "type": "module",
-    "version": "0.5.0",
+    "version": "0.5.2",
     "license": "MIT",
     "author": "Austin Andrews",
     "scripts": {

package/pg/button/__examples__/basic/basic.css

@@ -0,0 +1,4 @@
+.example-flex {
+  display: flex;
+  gap: 0.5rem;
+}

package/pg/button/__examples__/basic/basic.ts

@@ -1,10 +1,12 @@
 import { Component, Part, Prop } from '@pictogrammers/element';
 
+import style from './basic.css';
 import template from './basic.html';
 
 @Component({
   selector: 'x-pg-button-basic',
-  template
+  style,
+  template,
 })
 export default class XPgButtonBasic extends HTMLElement {
 

package/pg/button/__examples__/states/states.css

@@ -0,0 +1,3 @@
+h4 {
+  margin-block: 0.25rem;
+}

package/pg/button/__examples__/states/states.ts

@@ -1,11 +1,13 @@
 import { Component, Part, Prop } from '@pictogrammers/element';
 import PgButton from '../../button';
 
+import style from './states.css';
 import template from './states.html';
 
 @Component({
   selector: 'x-pg-button-states',
-  template
+  style,
+  template,
 })
 export default class XPgButtonStates extends HTMLElement {
   @Part() $active: PgButton;

package/pg/button/__examples__/variants/variants.css

@@ -0,0 +1,4 @@
+.example-flex {
+  display: flex;
+  gap: 0.5rem;
+}

package/pg/button/__examples__/variants/variants.html

@@ -0,0 +1,10 @@
+<div class="example">
+  <div class="example-flex">
+    <pg-button variant="brand">Example Button</pg-button>
+    <pg-button variant="brand"><pg-icon path="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"></pg-icon></pg-button>
+    <pg-button variant="brand">
+      <pg-icon path="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z"></pg-icon>
+      With Icon
+    </pg-button>
+  </div>
+</div>

package/pg/button/__examples__/variants/variants.ts

@@ -0,0 +1,13 @@
+import { Component, Part, Prop } from '@pictogrammers/element';
+
+import style from './variants.css';
+import template from './variants.html';
+
+@Component({
+  selector: 'x-pg-button-variants',
+  style,
+  template,
+})
+export default class XPgVariantsBasic extends HTMLElement {
+
+}

package/pg/button/button.css

@@ -2,7 +2,7 @@
   display: inline-flex;
 }
 
-[part="button"] {
+[part=button] {
   display: flex;
   align-items: center;
   align-content: center;
@@ -17,25 +17,26 @@
   outline: none;
   --pg-icon-color: var(--pg-button-color, #453C4F);
   cursor: var(--pg-button-cursor, var(--pg-cursor-default, default));
+  gap: var(--pg-button-gap, 0.325rem);
 }
 
-[part="button"]:hover {
+[part=button]:hover {
   --pg-button-border-color: var(--pg-button-hover-border-color, #453C4F);
   background-color: var(--pg-button-hover-background-color, #453C4F);
   color: var(--pg-button-hover-color, #FFFFFF);
   --pg-icon-color: var(--pg-button-hover-color, #FFFFFF);
 }
 
-[part="button"]:active {
+[part=button]:active {
   box-shadow: 0 1px 0.25rem rgba(0, 0, 0, 0.5) inset;
   position: relative;
 }
 
-[part="button"]:focus-visible {
+[part=button]:focus-visible {
   position: relative;
 }
 
-[part="button"]:active::before {
+[part=button]:active::before {
   content: '';
   position: absolute;
   top: -1px;
@@ -45,7 +46,7 @@
   border-radius: var(--pg-button-border-radius, 0.25rem);
   box-shadow: 0 0 0 3px var(--pg-focus-color, rgb(79, 143, 249, 0.6));
 }
-[part="button"]:focus-visible::before {
+[part=button]:focus-visible::before {
   pointer-events: none;
   content: '';
   position: absolute;
@@ -57,37 +58,46 @@
   box-shadow: 0 0 0 3px var(--pg-focus-color, rgb(79, 143, 249, 0.5));
 }
 
-[part="button"].start {
+[part=button].start {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
   margin-right: -1px;
 }
 
-[part="button"].center {
+[part=button].center {
   border-radius: 0;
   margin-right: -1px;
 }
 
-[part="button"].end {
+[part=button].end {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }
 
-[part="button"].active {
+[part=button].active {
   box-shadow: 0 1px 0.25rem rgba(0, 0, 0, 0.5) inset;
   background-color: rgba(69, 60, 79, 0.1);
   color: var(--pg-button-color, #453C4F);
 }
-[part="button"].active:hover {
+[part=button].active:hover {
   box-shadow: 0 1px 0.25rem rgba(0, 0, 0, 0.5) inset;
   background-color: var(--pg-button-color, #453C4F);
-  color: var(--pg-button-hover-color, #fff);
+  color: var(--pg-button-hover-color, #FFFFFF);
 }
 
-[part="button"].block {
+[part=button].block {
   flex: 1;
 }
 
+[part=button].brand {
+  --pg-button-background-color: #453C4F;
+  --pg-button-color: #FFFFFF;
+}
+[part=button].brand:hover {
+  --pg-button-hover-background-color: color-mix(in oklab, var(--pg-button-background-color), white 10%);
+  --pg-button-hover-border-color: color-mix(in oklab, var(--pg-button-background-color), white 10%);
+}
+
 ::slotted {
   align-self: center;
-}
+}

package/pg/button/button.ts

@@ -1,14 +1,17 @@
-import { Component, Part, Prop, normalizeBoolean } from '@pictogrammers/element';
+import { Component, Part, Prop, normalizeBoolean, normalizeString } from '@pictogrammers/element';
 
 import template from './button.html';
 import style from './button.css';
 
+const variants = ['neutral', 'brand'];
+
 @Component({
   selector: 'pg-button',
   style,
   template
 })
 export default class PgButton extends HTMLElement {
+  @Prop(normalizeString) variant: string = 'neutral';
   @Prop(normalizeBoolean) active: boolean = false;
   @Prop(normalizeBoolean) block: boolean = false;
   @Prop(normalizeBoolean) start: boolean = false;
@@ -27,6 +30,13 @@ export default class PgButton extends HTMLElement {
   }
 
   render(changes) {
+    if (changes.variant) {
+      if (!variants.includes(this.variant)) {
+        throw new Error(`invalid variant ${this.variant}`);
+      }
+      this.$button.classList.toggle('neutral', this.variant === 'neutral');
+      this.$button.classList.toggle('brand', this.variant === 'brand');
+    }
     if (changes.active) {
       this.$button.classList.toggle('active', this.active);
     }

package/pg/inputPixelEditor/README.md

@@ -47,6 +47,7 @@ See usage for each method below.
 | ---------- | -------- | ----------- |
 | `getJson(options)` | -        | Get JSON file. |
 | `getData()` | -           | Get layer data. |
+| `setData()` | -           | Set layer data. |
 | `setJson(json)` | -        | Set JSON file. |
 | `reset()` | -  | Reset canvas and data. |
 | `getExportCanvas()` | -  | Get new canvas of export. |
@@ -69,7 +70,7 @@ See usage for each method below.
 | `inputModeEllipseOutline()` | -  | Input Mode Ellipse Outline |
 | `selectLayer(index)` | -    | Select layer. |
 | `getLayers()` | -    | Get layer array. |
-| `addLayer(option)` | -        | Add layer. |
+| `addLayer(option)` | -        | Add layer. `name`, `type` required. |
 | `removeLayer(index)` | -      | Remove layer. |
 | `flattenLayers(layerIndexes)` | -      | Flatten layers. |
 | `getColor()` | -     | Get selected color |

package/pg/inputPixelEditor/inputPixelEditor.ts

@@ -23,6 +23,7 @@ import { readMetadata, textEncode, writeMetadata } from './utils/pngMetadata';
 import { canvasToPngBuffer } from './utils/canvasToPngBuffer';
 import { blobToImage } from './utils/blobToImage';
 import { diffLeftMapPixels } from './utils/diffMap';
+import { maskToBitmap } from './utils/maskToBitmap';
 
 type Color = [number, number, number, number];
 
@@ -57,7 +58,7 @@ type HistoryColorUpdateType = {
 }
 
 type HistoryItem = {
-  type: HistoryType,
+  type: HistoryType
   data: HistoryGroupType | HistoryPixelType | HistoryColorUpdateType
 }
 
@@ -1367,16 +1368,20 @@ export default class PgInputPixelEditor extends HTMLElement {
     this.#layer = indexes;
   }
 
-  addLayer() {
+  addLayer({ name, type, ...optional }) {
     this.#data.push(fillGrid(this.width, this.height));
     this.#layers.push({
-      name: 'Layer 1',
-      type: 'pixel',
-      export: true,
-      locked: false,
-      visible: true,
-      opacity: 1
+      name,
+      type,
+      export: optional.exclude ?? true,
+      locked: optional.locked ?? false,
+      visible: optional.hidden ?? true,
+      opacity: optional.opacity ?? 1,
     });
+    // short hand for initial data
+    if (optional.data) {
+      this.setData(optional.data);
+    }
   }
 
   /**
@@ -1463,6 +1468,34 @@ export default class PgInputPixelEditor extends HTMLElement {
     });
   }
 
+  /**
+   * Set data
+   */
+  setData(data: any[]) {
+    data.forEach((layerData, layerIndex) => {
+      const { type } = this.#layers[layerIndex];
+      switch(type) {
+        case 'pixel':
+          const { color, path } = layerData;
+          const temp = maskToBitmap(path, this.width, this.height);
+          temp.forEach((tempY, y) => {
+            tempY.forEach((tempX, x) => {
+              if (tempX !== 0) {
+                //this.#data[layerIndex][y][x] = color;
+                this.#setPixel(x, y, color, [layerIndex]);
+              }
+            });
+          });
+          break;
+        case 'reference':
+          console.log('reference', layerData);
+          break;
+        default:
+          throw new Error(`unknown type ${type}`);
+      }
+    });
+  }
+
   getExportPath() {
     return bitmaskToPath(this.#export, { scale: 1 });
   }

package/pg/inputPixelEditor/utils/maskToBitmap.ts

@@ -1,4 +1,4 @@
-export function maskToBitmap(pathData: string, width: number, height: number) {
+export function maskToBitmap(pathData: string, width: number, height: number, fill: number = 1) {
   const grid: number[][] = Array(height).fill(0).map(() => Array(width).fill(0));
 
   // Store only the vertical edges
@@ -57,7 +57,7 @@ export function maskToBitmap(pathData: string, width: number, height: number) {
         }
       }
       if (inside) {
-        grid[y][x] = 1;
+        grid[y][x] = fill;
       }
     }
   }

package/pg/inputText/inputText.css

@@ -11,8 +11,8 @@
   font-size: 1rem;
   outline: none;
   field-sizing: content;
-  min-width: calc(100% - 0.5rem - 2px);
-  max-width: calc(var(--pg-input-text-max-width, 100%) - 0.5rem - 2px);
+  min-width: calc(100% - 1.5rem - 2px);
+  max-width: calc(var(--pg-input-text-max-width, 100%) - 1.5rem - 2px);
   background-color: transparent;
 }
 

package/pg/modalAlert/modalAlert.html

@@ -2,10 +2,10 @@
   <div class="dialog"
     role="dialog"
     id="dialog1"
-    aria-labelledby="dialog1_label"
+    aria-labelledby="dialog_label"
     aria-modal="true">
     <header part="header">
-      <h2 id="dialog1_label"
+      <h2 id="dialog_label"
         class="dialog_label"
         part="headerText">
         Add Delivery Address
@@ -16,7 +16,7 @@
     </main>
     <footer>
       <pg-button part="no">No</pg-button>
-      <pg-button part="yes">Yes</pg-button>
+      <pg-button part="yes" variant="brand">Yes</pg-button>
     </footer>
   </div>
 </div>

package/pg/overlayContextMenu/__examples__/basic/basic.ts

@@ -84,4 +84,4 @@ export default class XPgOverlayContextMenuBasic extends HTMLElement {
     }
     this.$result.textContent = JSON.stringify(result);
   }
-}
+}