@rogieking/figui3 1.3.0 → 1.3.2

package/example.html

@@ -24,6 +24,7 @@
     </fig-header>
     <fig-content>
         <fig-input-joystick text="true"
+                            value="0,0"
                             onInput="console.log(event.target.value)"></fig-input-joystick>
         <fig-header>
             <h2>Details</h2>

package/fig.css

@@ -2284,6 +2284,10 @@ fig-input-joystick {
     width: 1.5rem;
     height: 1.5rem;
     place-items: center;
+    flex-shrink: 0;
+    flex-grow: 0;
+    align-items: center;
+    justify-content: center;
   }
   .fig-input-joystick-plane {
     display: inline-grid;
@@ -2292,6 +2296,7 @@ fig-input-joystick {
     width: var(--size);
     height: var(--size);
     flex-shrink: 0;
+    &.dragging,
     &:hover {
       cursor: grab;
       --size: 3rem;
@@ -2330,6 +2335,7 @@ fig-input-joystick {
       pointer-events: none;
     }
   }
+  .fig-input-joystick-plane.dragging .fig-input-joystick-guides,
   .fig-input-joystick-plane:hover .fig-input-joystick-guides {
     background: linear-gradient(
         45deg,

package/fig.js

@@ -1729,12 +1729,11 @@ class FigInputJoystick extends HTMLElement {
       this.transform = Number(this.transform);
       this.text = this.getAttribute("text") === "true";
 
-      this.render();
+      this.#render();
 
-      this.setupListeners();
+      this.#setupListeners();
 
-      this.cursor.style.left = `${this.position.x * 100}%`;
-      this.cursor.style.top = `${this.position.y * 100}%`;
+      this.#syncHandlePosition();
       if (this.text) {
         this.xInput.value = this.position.x.toFixed(this.precision);
         this.yInput.value = this.position.y.toFixed(this.precision);
@@ -1742,8 +1741,11 @@ class FigInputJoystick extends HTMLElement {
     });
   }
 
-  render() {
-    this.innerHTML = `        
+  #render() {
+    this.innerHTML = this.#getInnerHTML();
+  }
+  #getInnerHTML() {
+    return `        
           <div class="fig-input-joystick-plane-container">
             <div class="fig-input-joystick-plane">
               <div class="fig-input-joystick-guides"></div>
@@ -1775,7 +1777,7 @@ class FigInputJoystick extends HTMLElement {
         `;
   }
 
-  setupListeners() {
+  #setupListeners() {
     this.plane = this.querySelector(".fig-input-joystick-plane");
     this.cursor = this.querySelector(".fig-input-joystick-handle");
     if (this.text) {
@@ -1783,31 +1785,33 @@ class FigInputJoystick extends HTMLElement {
       this.yInput = this.querySelector("fig-input-text[name='y']");
     }
 
-    this.plane.addEventListener("mousedown", this.handleMouseDown.bind(this));
-    window.addEventListener("keydown", this.handleKeyDown.bind(this));
-    window.addEventListener("keyup", this.handleKeyUp.bind(this));
+    this.plane.addEventListener("mousedown", this.#handleMouseDown.bind(this));
+    window.addEventListener("keydown", this.#handleKeyDown.bind(this));
+    window.addEventListener("keyup", this.#handleKeyUp.bind(this));
 
-    this.xInput.addEventListener("input", this.handleXInput.bind(this));
-    this.yInput.addEventListener("input", this.handleYInput.bind(this));
+    this.xInput.addEventListener("input", this.#handleXInput.bind(this));
+    this.yInput.addEventListener("input", this.#handleYInput.bind(this));
   }
 
-  handleXInput(e) {
+  #handleXInput(e) {
     e.stopPropagation();
-    this.position.x = e.target.value;
+    this.position.x = Number(e.target.value);
+    this.value = [this.position.x, this.position.y];
     this.#syncHandlePosition();
     this.#emitInputEvent();
     this.#emitChangeEvent();
   }
 
-  handleYInput(e) {
+  #handleYInput(e) {
     e.stopPropagation();
-    this.position.y = e.target.value;
+    this.position.y = Number(e.target.value);
+    this.value = [this.position.x, this.position.y];
     this.#syncHandlePosition();
     this.#emitInputEvent();
     this.#emitChangeEvent();
   }
 
-  snapToGuide(value) {
+  #snapToGuide(value) {
     if (!this.isShiftHeld) return value;
     if (value < 0.1) return 0;
     if (value > 0.9) return 1;
@@ -1815,7 +1819,7 @@ class FigInputJoystick extends HTMLElement {
     return value;
   }
 
-  snapToDiagonal(x, y) {
+  #snapToDiagonal(x, y) {
     if (!this.isShiftHeld) return { x, y };
     const diff = Math.abs(x - y);
     if (diff < 0.1) return { x: (x + y) / 2, y: (x + y) / 2 };
@@ -1828,13 +1832,10 @@ class FigInputJoystick extends HTMLElement {
     let x = Math.max(0, Math.min(1, (e.clientX - rect.left) / rect.width));
     let y = Math.max(0, Math.min(1, (e.clientY - rect.top) / rect.height));
 
-    // Invert Y coordinate to match typical coordinate system
-    y = 1 - y;
+    x = this.#snapToGuide(x);
+    y = this.#snapToGuide(y);
 
-    x = this.snapToGuide(x);
-    y = this.snapToGuide(y);
-
-    const snapped = this.snapToDiagonal(x, y);
+    const snapped = this.#snapToDiagonal(x, y);
     this.position = snapped;
     this.value = [snapped.x, snapped.y];
 
@@ -1866,12 +1867,15 @@ class FigInputJoystick extends HTMLElement {
   }
 
   #syncHandlePosition() {
-    this.cursor.style.left = `${this.position.x * 100}%`;
-    this.cursor.style.top = `${(1 - this.position.y) * 100}%`;
+    if (this.cursor) {
+      this.cursor.style.left = `${this.position.x * 100}%`;
+      this.cursor.style.top = `${this.position.y * 100}%`;
+    }
   }
 
-  handleMouseDown(e) {
+  #handleMouseDown(e) {
     this.isDragging = true;
+    this.plane.classList.add("dragging");
     this.#updatePosition(e);
 
     this.plane.style.cursor = "grabbing";
@@ -1882,6 +1886,7 @@ class FigInputJoystick extends HTMLElement {
 
     const handleMouseUp = () => {
       this.isDragging = false;
+      this.plane.classList.remove("dragging");
       this.plane.style.cursor = "";
       window.removeEventListener("mousemove", handleMouseMove);
       window.removeEventListener("mouseup", handleMouseUp);
@@ -1892,13 +1897,35 @@ class FigInputJoystick extends HTMLElement {
     window.addEventListener("mouseup", handleMouseUp);
   }
 
-  handleKeyDown(e) {
+  #handleKeyDown(e) {
     if (e.key === "Shift") this.isShiftHeld = true;
   }
 
-  handleKeyUp(e) {
+  #handleKeyUp(e) {
     if (e.key === "Shift") this.isShiftHeld = false;
   }
+  static get observedAttributes() {
+    return ["value", "precision", "transform", "text"];
+  }
+  attributeChangedCallback(name, oldValue, newValue) {
+    if (name === "value") {
+      this.value = newValue.split(",").map(Number);
+      this.position = { x: this.value[0], y: this.value[1] };
+      this.#syncHandlePosition();
+    }
+    if (name === "precision") {
+      this.precision = newValue;
+      this.precision = parseInt(this.precision);
+    }
+    if (name === "transform") {
+      this.transform = newValue;
+      this.transform = Number(this.transform);
+    }
+    if (name === "text") {
+      this.text = newValue.toLowerCase() === "true";
+      this.innerHTML = this.#getInnerHTML();
+    }
+  }
 }
 
 customElements.define("fig-input-joystick", FigInputJoystick);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rogieking/figui3",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "module": "index.ts",
   "type": "module",
   "devDependencies": {