@rogieking/figui3 6.4.2 → 6.4.4

package/fig-editor.css

@@ -1,3 +1,8 @@
+:root,
+:host {
+  --icon-24-eyedropper: url("data:image/svg+xml,%3Csvg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15.1592 5.65801C16.0376 4.78045 17.4621 4.78055 18.3408 5.65899L18.4951 5.82989C19.1671 6.65442 19.168 7.84476 18.4951 8.66973L18.3408 8.84063L16.6455 10.533C17.1104 11.083 17.1181 11.889 16.6641 12.4461L16.5605 12.5604C16.0111 13.1097 15.1425 13.1428 14.5537 12.6629L14.5342 12.6453L10.0908 17.0916C9.6188 17.5633 8.98876 17.7764 8.375 17.742L7.56055 18.5574C6.97441 19.1432 6.02451 19.1422 5.43945 18.5584V18.5574C4.8538 17.9718 4.85405 17.0221 5.43945 16.4363L6.25586 15.618C6.22412 15.0058 6.44026 14.3794 6.90918 13.91L11.3516 9.46367C10.856 8.87434 10.885 7.99381 11.4395 7.43926L11.5537 7.33574C12.1094 6.88283 12.9136 6.88854 13.4639 7.35137L15.1592 5.65801ZM7.61621 14.617C7.33755 14.8961 7.21782 15.2747 7.25781 15.6385C7.27925 15.8351 7.24419 16.0445 7.10449 16.1844L6.14648 17.1434C5.9516 17.3387 5.95135 17.6553 6.14648 17.8504C6.34167 18.0449 6.65842 18.0451 6.85352 17.8504L7.80859 16.8943C7.94931 16.7536 8.16065 16.7184 8.3584 16.741C8.72329 16.7828 9.10374 16.6643 9.38379 16.3846L13.8223 11.9432L12.0547 10.1756L7.61621 14.617ZM17.6338 6.36602C17.1458 5.87828 16.3544 5.8783 15.8662 6.36602L14.084 8.14629L14.0186 8.20586C13.6767 8.48476 13.1722 8.46484 12.8535 8.14629C12.6583 7.95131 12.3417 7.95119 12.1465 8.14629C11.9514 8.34148 11.9515 8.65808 12.1465 8.85332L15.1465 11.8533C15.3175 12.024 15.5814 12.0451 15.7754 11.9168L15.8535 11.8533C16.0486 11.6582 16.0484 11.3416 15.8535 11.1463V11.1453C15.8524 11.1443 15.8507 11.1434 15.8496 11.1424C15.5128 10.8013 15.514 10.2513 15.8535 9.91192L17.6338 8.1336C18.1216 7.6457 18.1213 6.85425 17.6338 6.36602Z' fill='black' fill-opacity='0.9'/%3E%3C/svg%3E");
+}
+
 /* Fill Picker */
 fig-fill-picker {
   display: contents;

package/fig-lab.css

@@ -185,6 +185,17 @@ fig-field-slider {
 }
 
 /* Canvas Control */
+body {
+  --fig-lab-cursor: url('data:image/svg+xml,<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(%23clip0_20065_231516)"><g filter="url(%23filter0_d_20065_231516)"><path fill-rule="evenodd" clip-rule="evenodd" d="M2.93938 2.93938C3.35531 2.52345 3.97597 2.38901 4.52673 2.59555L15.5267 6.72055C16.1416 6.95111 16.535 7.55477 16.4976 8.21034C16.4603 8.86592 16.0009 9.421 15.3638 9.58026L10.737 10.737L9.58026 15.3638C9.421 16.0009 8.86592 16.4603 8.21034 16.4976C7.55477 16.535 6.95111 16.1416 6.72055 15.5267L2.59555 4.52673C2.38901 3.97597 2.52345 3.35531 2.93938 2.93938Z" fill="white"/></g><path fill-rule="evenodd" clip-rule="evenodd" d="M4.17558 3.53185C3.99199 3.463 3.7851 3.50782 3.64646 3.64646C3.50782 3.7851 3.463 3.99199 3.53185 4.17558L7.65685 15.1756C7.7337 15.3805 7.93492 15.5117 8.15345 15.4992C8.37197 15.4868 8.557 15.3336 8.61009 15.1213L9.91232 9.91232L15.1213 8.61009C15.3336 8.557 15.4868 8.37197 15.4992 8.15345C15.5117 7.93492 15.3805 7.7337 15.1756 7.65685L4.17558 3.53185Z" fill="black"/></g><defs><filter id="filter0_d_20065_231516" x="-0.5" y="0.5" width="20" height="20" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/><feOffset dy="1"/><feGaussianBlur stdDeviation="1.5"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.35 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_20065_231516"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_20065_231516" result="shape"/></filter><clipPath id="clip0_20065_231516"><rect width="32" height="32" fill="white"/></clipPath></defs></svg>') 3 3, default;
+  --fig-lab-cursor-eyedropper: url('data:image/svg+xml,<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"><g filter="url(%23filter0_d_20065_164959)"><path fill-rule="evenodd" clip-rule="evenodd" d="M17.0262 19.5947L11.287 25.3339C10.9185 25.7023 10.4442 25.9465 9.93021 26.0321L8.62726 26.2493C6.93521 26.5313 5.46827 25.0644 5.75028 23.3723L5.96744 22.0694C6.0531 21.5554 6.29721 21.081 6.66565 20.7126L12.4049 14.9733C11.7004 13.974 11.7951 12.5833 12.6891 11.6893C13.5832 10.7952 14.974 10.7005 15.9733 11.4051L18.1891 9.18929C19.4653 7.91315 21.5343 7.91314 22.8105 9.18928C24.0866 10.4654 24.0866 12.5345 22.8105 13.8106L20.5946 16.0265C21.2993 17.0258 21.2045 18.4165 20.3104 19.3106C19.4163 20.2047 18.0255 20.2994 17.0262 19.5947Z" fill="white"/></g><path fill-rule="evenodd" clip-rule="evenodd" d="M13.3963 14.6035L13.7926 14.9999L7.37288 21.4197C7.15181 21.6408 7.00534 21.9254 6.95395 22.2338L6.73679 23.5367C6.56758 24.5519 7.44775 25.4321 8.46298 25.2629L9.76592 25.0457C10.0743 24.9943 10.3589 24.8479 10.58 24.6268L16.9997 18.2071L17.3962 18.6035C18.0057 19.213 18.9939 19.213 19.6034 18.6035C20.2129 17.994 20.213 17.0059 19.6035 16.3963L19.2071 15.9999L22.1035 13.1035C22.9891 12.2179 22.9891 10.782 22.1035 9.89639C21.2179 9.01077 19.782 9.01077 18.8964 9.8964L16 12.7928L15.6035 12.3963C14.994 11.7869 14.0058 11.7869 13.3964 12.3964C12.7869 13.0059 12.7869 13.994 13.3963 14.6035ZM14.4997 15.7071L16.2926 17.5L9.87288 23.9197C9.79919 23.9934 9.70432 24.0422 9.60152 24.0593L8.29858 24.2765C7.96017 24.3329 7.66678 24.0395 7.72318 23.7011L7.94034 22.3982C7.95747 22.2954 8.00629 22.2005 8.07998 22.1268L14.4997 15.7071Z" fill="black"/><defs><filter id="filter0_d_20065_164959" x="2.71533" y="6.23218" width="24.0522" height="24.052" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/><feOffset dy="1"/><feGaussianBlur stdDeviation="1.5"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.35 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_20065_164959"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_20065_164959" result="shape"/></filter></defs></svg>') 8 24, crosshair;
+  --fig-lab-cursor-move: url('data:image/svg+xml,<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(%23clip0_20065_165164)"><g filter="url(%23filter0_d_20065_165164)"><path fill-rule="evenodd" clip-rule="evenodd" d="M2.93938 2.93938C3.35531 2.52345 3.97597 2.38901 4.52673 2.59555L15.5267 6.72055C16.1416 6.95111 16.535 7.55477 16.4976 8.21034C16.4603 8.86592 16.0009 9.421 15.3638 9.58026L10.737 10.737L9.58026 15.3638C9.421 16.0009 8.86592 16.4603 8.21034 16.4976C7.55477 16.535 6.95111 16.1416 6.72055 15.5267L2.59555 4.52673C2.38901 3.97597 2.52345 3.35531 2.93938 2.93938Z" fill="white"/><path fill-rule="evenodd" clip-rule="evenodd" d="M18.4394 12.9394C19.0252 12.3536 19.9749 12.3536 20.5607 12.9394L26.0607 18.4394C26.6465 19.0252 26.6465 19.9749 26.0607 20.5607L20.5607 26.0607C19.9749 26.6465 19.0252 26.6465 18.4394 26.0607L12.9394 20.5607C12.3536 19.9749 12.3536 19.0252 12.9394 18.4394L18.4394 12.9394Z" fill="white"/></g><path fill-rule="evenodd" clip-rule="evenodd" d="M4.17558 3.53185C3.99199 3.463 3.7851 3.50782 3.64646 3.64646C3.50782 3.7851 3.463 3.99199 3.53185 4.17558L7.65685 15.1756C7.7337 15.3805 7.93492 15.5117 8.15345 15.4992C8.37197 15.4868 8.557 15.3336 8.61009 15.1213L9.91232 9.91232L15.1213 8.61009C15.3336 8.557 15.4868 8.37197 15.4992 8.15345C15.5117 7.93492 15.3805 7.7337 15.1756 7.65685L4.17558 3.53185Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M19.1464 13.6464C19.3417 13.4512 19.6583 13.4512 19.8536 13.6464L21.8536 15.6464C22.0488 15.8417 22.0488 16.1583 21.8536 16.3536C21.6583 16.5488 21.3417 16.5488 21.1464 16.3536L20 15.2071V19H23.7929L22.6464 17.8536C22.4512 17.6583 22.4512 17.3417 22.6464 17.1464C22.8417 16.9512 23.1583 16.9512 23.3536 17.1464L25.3536 19.1464C25.5488 19.3417 25.5488 19.6583 25.3536 19.8536L23.3536 21.8536C23.1583 22.0488 22.8417 22.0488 22.6464 21.8536C22.4512 21.6583 22.4512 21.3417 22.6464 21.1464L23.7929 20H20V23.7929L21.1464 22.6464C21.3417 22.4512 21.6583 22.4512 21.8536 22.6464C22.0488 22.8417 22.0488 23.1583 21.8536 23.3536L19.8536 25.3536C19.6583 25.5488 19.3417 25.5488 19.1464 25.3536L17.1464 23.3536C16.9512 23.1583 16.9512 22.8417 17.1464 22.6464C17.3417 22.4512 17.6583 22.4512 17.8536 22.6464L19 23.7929V20H15.2071L16.3536 21.1464C16.5488 21.3417 16.5488 21.6583 16.3536 21.8536C16.1583 22.0488 15.8417 22.0488 15.6464 21.8536L13.6464 19.8536C13.4512 19.6583 13.4512 19.3417 13.6464 19.1464L15.6464 17.1464C15.8417 16.9512 16.1583 16.9512 16.3536 17.1464C16.5488 17.3417 16.5488 17.6583 16.3536 17.8536L15.2071 19H19V15.2071L17.8536 16.3536C17.6583 16.5488 17.3417 16.5488 17.1464 16.3536C16.9512 16.1583 16.9512 15.8417 17.1464 15.6464L19.1464 13.6464Z" fill="black"/></g><defs><filter id="filter0_d_20065_165164" x="-0.5" y="0.5" width="30" height="30" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/><feOffset dy="1"/><feGaussianBlur stdDeviation="1.5"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.35 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_20065_165164"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_20065_165164" result="shape"/></filter><clipPath id="clip0_20065_165164"><rect width="32" height="32" fill="white"/></clipPath></defs></svg>') 3 3, move;
+}
+
+body.fig-lab-move-active,
+body.fig-lab-move-active * {
+  cursor: var(--fig-lab-cursor-move) !important;
+}
+
 fig-canvas-control {
   display: contents;
   --fig-canvas-control-line-stroke: light-dark(
@@ -195,14 +206,37 @@ fig-canvas-control {
   --fig-canvas-control-radius-stroke-halo: #FFFFFF;
   --fig-canvas-control-line-stroke-hover: #0D99FF;
   --fig-canvas-control-line-stroke-active: #0D99FF;
-  --fig-canvas-control-line-stroke-width: 1.5px;
-  --fig-canvas-control-line-stroke-width-hover: 2.25px;
+  --fig-canvas-control-line-stroke-width: 1px;
+  --fig-canvas-control-line-stroke-width-hover: 2px;
+
+  &:has(.fig-canvas-control-radius-hit:hover) {
+     --fig-canvas-control-line-stroke-width: var(--fig-canvas-control-line-stroke-width-hover);
+  }
 
   & > fig-handle,
   & > fig-tooltip:has(fig-handle:not([size="small"])) {
     z-index: 1;
   }
 
+  fig-handle:hover,
+  fig-handle:hover .fig-handle-hit-area {
+    cursor: var(--fig-lab-cursor) !important;
+  }
+
+  &[type="color"] fig-handle[type="color"]:hover:not(:active, .active, .dragging),
+  &[type="color"] fig-handle[type="color"]:hover:not(:active, .active, .dragging) .fig-handle-hit-area {
+    cursor: var(--fig-lab-cursor-eyedropper) !important;
+  }
+
+  fig-handle:is(:active, .active, .dragging),
+  fig-handle:is(:active, .active, .dragging) .fig-handle-hit-area {
+    cursor: var(--fig-lab-cursor-move) !important;
+  }
+
+  .fig-canvas-control-angle-line-hit {
+    cursor: var(--fig-lab-cursor-move);
+  }
+
   .fig-canvas-control-radius {
     position: absolute;
     pointer-events: none;
@@ -217,7 +251,7 @@ fig-canvas-control {
 
     .fig-canvas-control-radius-halo {
       stroke: var(--fig-canvas-control-radius-stroke-halo);
-      stroke-width: calc(var(--fig-canvas-control-line-stroke-width) * 2);
+      stroke-width: calc(var(--fig-canvas-control-line-stroke-width) + 2px);
       filter: none;
     }
 
@@ -226,18 +260,12 @@ fig-canvas-control {
       stroke-width: 12px;
       pointer-events: stroke;
       filter: none;
-
-      &:hover ~ circle:not(.fig-canvas-control-radius-halo) {
-        stroke-width: var(--fig-canvas-control-line-stroke-width-hover);
-      }
+ 
     }
   }
 
-  &.fig-canvas-control-ring-active
-    .fig-canvas-control-radius
-    circle:not(.fig-canvas-control-radius-hit):not(.fig-canvas-control-radius-halo) {
-    stroke: var(--fig-canvas-control-line-stroke-active);
-    stroke-width: var(--fig-canvas-control-line-stroke-width-hover);
+  &.fig-canvas-control-ring-active{
+    --fig-canvas-control-line-stroke-width: var(--fig-canvas-control-line-stroke-width-hover);
   }
 
   .fig-canvas-control-angle-svg {
@@ -254,7 +282,7 @@ fig-canvas-control {
 
   .fig-canvas-control-angle-line-halo {
     stroke: var(--fig-canvas-control-radius-stroke-halo);
-    stroke-width: calc(var(--fig-canvas-control-line-stroke-width) * 2);
+    stroke-width: calc(var(--fig-canvas-control-line-stroke-width) + 2px);
     stroke-linecap: butt;
     filter: none;
   }

package/fig-lab.js

@@ -303,7 +303,10 @@ class FigCanvasControl extends HTMLElement {
   #isSecondDragging = false;
   #isRadiusDragging = false;
   #isAngleDragging = false;
-  #prevBodyCursor = "";
+  #moveCursorPointerId = null;
+  #moveCursorPrevBodyCursor = "";
+  #moveCursorPrevBodyCursorPriority = "";
+  #boundMoveCursorEnd = null;
 
   get #type() {
     return this.getAttribute("type") || "point";
@@ -403,6 +406,8 @@ class FigCanvasControl extends HTMLElement {
 
   disconnectedCallback() {
     this.#teardownRadiusDrag();
+    this.#deactivateMoveCursor();
+    document.body.classList.remove("fig-lab-move-active");
   }
 
   attributeChangedCallback(name, oldVal, newVal) {
@@ -564,15 +569,101 @@ class FigCanvasControl extends HTMLElement {
       this.#createSecondHandle(disabled, tooltips, handleSurface);
     }
 
+    this.#setupHandleMoveCursor(this.#pointHandle);
+    this.#setupHandleMoveCursor(this.#angleHandle);
+    this.#setupHandleMoveCursor(this.#secondHandle);
     this.#setupEventListeners();
     this.#wireHoverTooltips();
     requestAnimationFrame(() => this.#syncPositions());
   }
 
+  #setupHandleMoveCursor(handle) {
+    if (!handle) return;
+    handle.addEventListener(
+      "pointerdown",
+      (e) => this.#activateMoveCursor(e),
+      { capture: true },
+    );
+  }
+
+  #activateMoveCursor(e) {
+    if (this.hasAttribute("disabled")) return;
+    if (e?.button !== undefined && e.button !== 0) return;
+    if (e?.isPrimary === false) return;
+
+    if (this.#moveCursorPointerId === null) {
+      this.#moveCursorPrevBodyCursor =
+        document.body.style.getPropertyValue("cursor");
+      this.#moveCursorPrevBodyCursorPriority =
+        document.body.style.getPropertyPriority("cursor");
+    }
+
+    this.#moveCursorPointerId = e?.pointerId ?? -1;
+    document.body.classList.add("fig-lab-move-active");
+    document.body.style.setProperty(
+      "cursor",
+      "var(--fig-lab-cursor-move)",
+      "important",
+    );
+
+    if (!this.#boundMoveCursorEnd) {
+      this.#boundMoveCursorEnd = (event) => {
+        if (
+          event?.pointerId !== undefined &&
+          this.#moveCursorPointerId !== null &&
+          event.pointerId !== this.#moveCursorPointerId
+        ) {
+          return;
+        }
+        if (event?.type === "blur") {
+          this.#deactivateMoveCursor();
+        } else {
+          requestAnimationFrame(() => this.#deactivateMoveCursor());
+        }
+      };
+    }
+
+    window.addEventListener("pointerup", this.#boundMoveCursorEnd);
+    window.addEventListener("pointercancel", this.#boundMoveCursorEnd);
+    window.addEventListener("blur", this.#boundMoveCursorEnd);
+  }
+
+  #deactivateMoveCursor() {
+    if (this.#moveCursorPointerId === null) return;
+    document.body.classList.remove("fig-lab-move-active");
+    if (this.#moveCursorPrevBodyCursor) {
+      document.body.style.setProperty(
+        "cursor",
+        this.#moveCursorPrevBodyCursor,
+        this.#moveCursorPrevBodyCursorPriority,
+      );
+    } else {
+      document.body.style.removeProperty("cursor");
+    }
+    this.#moveCursorPointerId = null;
+    this.#moveCursorPrevBodyCursor = "";
+    this.#moveCursorPrevBodyCursorPriority = "";
+    if (this.#boundMoveCursorEnd) {
+      window.removeEventListener("pointerup", this.#boundMoveCursorEnd);
+      window.removeEventListener("pointercancel", this.#boundMoveCursorEnd);
+      window.removeEventListener("blur", this.#boundMoveCursorEnd);
+    }
+  }
+
   #wireHoverTooltip(target, getTooltip, getText, isDraggingRef) {
     if (!target) return;
+    const shouldSuppress = () => !!isDraggingRef?.();
+    const hideTooltip = () => {
+      const tip = getTooltip();
+      if (!tip) return;
+      tip.removeAttribute("show");
+      tip.hidePopup?.();
+    };
     const show = () => {
-      if (isDraggingRef && isDraggingRef()) return;
+      if (shouldSuppress()) {
+        hideTooltip();
+        return;
+      }
       const tip = getTooltip();
       if (!tip) return;
       if (getText) tip.setAttribute("text", getText());
@@ -580,15 +671,21 @@ class FigCanvasControl extends HTMLElement {
       tip.showPopup?.();
     };
     const hide = () => {
-      if (isDraggingRef && isDraggingRef()) return;
-      const tip = getTooltip();
-      if (!tip) return;
-      tip.removeAttribute("show");
+      hideTooltip();
     };
     target.addEventListener("pointerenter", show);
     target.addEventListener("pointerleave", hide);
   }
 
+  #hasActiveInteraction() {
+    return (
+      this.#isDragging ||
+      this.#isSecondDragging ||
+      this.#isRadiusDragging ||
+      this.#isAngleDragging
+    );
+  }
+
   #wireHoverTooltips() {
     if (this.#pointHandle) {
       this.#wireHoverTooltip(
@@ -596,7 +693,7 @@ class FigCanvasControl extends HTMLElement {
         () => this.#pointTooltip,
         () => this.#pointTipText,
         () =>
-          this.#isDragging ||
+          this.#hasActiveInteraction() ||
           !!this.#pointHandle?.querySelector("fig-color-tip"),
       );
     }
@@ -605,7 +702,7 @@ class FigCanvasControl extends HTMLElement {
         this.#angleHandle,
         () => this.#angleTooltip,
         () => `Angle ${Math.round(this.#angle)}°`,
-        () => this.#isAngleDragging || this.#isRadiusDragging,
+        () => this.#hasActiveInteraction(),
       );
     }
     if (this.#secondHandle) {
@@ -613,7 +710,7 @@ class FigCanvasControl extends HTMLElement {
         this.#secondHandle,
         () => this.#secondTooltip,
         () => this.#secondTipText,
-        () => this.#isSecondDragging,
+        () => this.#hasActiveInteraction(),
       );
     }
     if (this.#radiusSvg) {
@@ -720,7 +817,6 @@ class FigCanvasControl extends HTMLElement {
       hitLine.setAttribute("stroke-width", "12");
       hitLine.setAttribute("stroke-linecap", "round");
       hitLine.style.pointerEvents = "stroke";
-      hitLine.style.cursor = "move";
       svg.appendChild(hitLine);
       this.#setupLineDrag(hitLine);
     }
@@ -750,8 +846,7 @@ class FigCanvasControl extends HTMLElement {
       const y20 = this.#y2;
       this.#isDragging = true;
       this.#isSecondDragging = true;
-      const prevBodyCursor = document.body.style.cursor;
-      document.body.style.cursor = "move";
+      document.body.classList.add("fig-lab-move-active");
       hitLine.style.pointerEvents = "none";
 
       const onMove = (ev) => {
@@ -775,7 +870,7 @@ class FigCanvasControl extends HTMLElement {
       };
 
       const onUp = () => {
-        document.body.style.cursor = prevBodyCursor;
+        document.body.classList.remove("fig-lab-move-active");
         hitLine.style.pointerEvents = "stroke";
         this.#syncValueAttribute();
         this.#emitChange();
@@ -988,9 +1083,6 @@ class FigCanvasControl extends HTMLElement {
         this.#emitInput();
         return;
       }
-      if (!this.#isDragging && this.#hasSecondPoint) {
-        this.#prevBodyCursor = document.body.style.cursor;
-      }
       this.#isDragging = true;
       const px = e.detail?.px ?? this.#x / 100;
       const py = e.detail?.py ?? this.#y / 100;
@@ -1001,11 +1093,6 @@ class FigCanvasControl extends HTMLElement {
         this.#pointTooltip.hidePopup?.();
       }
       this.#syncPositions();
-      if (this.#hasSecondPoint) {
-        document.body.style.cursor = this.#resizeCursorSvg(
-          this.#pointPointLineDeg(),
-        );
-      }
       this.#emitInput();
     });
 
@@ -1021,9 +1108,6 @@ class FigCanvasControl extends HTMLElement {
       this.#x = Math.round(Math.max(0, Math.min(100, px * 100)));
       this.#y = Math.round(Math.max(0, Math.min(100, py * 100)));
       if (this.#pointTooltip) this.#pointTooltip.removeAttribute("show");
-      if (this.#hasSecondPoint) {
-        document.body.style.cursor = this.#prevBodyCursor ?? "";
-      }
       this.#syncPositions();
       this.#syncValueAttribute();
       this.#emitChange();
@@ -1035,10 +1119,10 @@ class FigCanvasControl extends HTMLElement {
     if (this.#angleHandle) {
       this.#angleHandle.addEventListener("input", (e) => {
         e.stopPropagation();
-        this.#isAngleDragging = true;
-        this.classList.add("fig-canvas-control-ring-active");
         const container = this.#container;
         if (!container) return;
+        this.#isAngleDragging = true;
+        this.classList.add("fig-canvas-control-ring-active");
         const rect = container.getBoundingClientRect();
         const cx = (this.#x / 100) * rect.width;
         const cy = (this.#y / 100) * rect.height;
@@ -1100,20 +1184,17 @@ class FigCanvasControl extends HTMLElement {
         const origEvent = e.detail?.originalEvent;
         if (!origEvent) return;
         origEvent.preventDefault();
-        this.#isAngleDragging = true;
-        this.classList.add("fig-canvas-control-ring-active");
         const container = this.#container;
         if (!container) return;
+        this.#isAngleDragging = true;
+        this.classList.add("fig-canvas-control-ring-active");
+        this.#angleHandle.setAttribute("selected", "");
 
         if (this.#angleTooltip) {
           this.#angleTooltip.setAttribute("show", "true");
           this.#angleTooltip.showPopup?.();
         }
 
-        const prevBodyCursor = document.body.style.cursor;
-        let lastCursorDeg = Math.round(this.#angle);
-        document.body.style.cursor = this.#rotateCursorSvg(lastCursorDeg);
-
         const onMove = (ev) => {
           const rect = container.getBoundingClientRect();
           const cx = (this.#x / 100) * rect.width;
@@ -1131,18 +1212,13 @@ class FigCanvasControl extends HTMLElement {
               `Angle ${Math.round(angle)}°`,
             );
           this.#syncPositions();
-          const curDeg = Math.round(angle);
-          if (curDeg !== lastCursorDeg) {
-            lastCursorDeg = curDeg;
-            document.body.style.cursor = this.#rotateCursorSvg(curDeg);
-          }
           this.#emitInput();
         };
 
         const onUp = () => {
           this.#isAngleDragging = false;
           this.classList.remove("fig-canvas-control-ring-active");
-          document.body.style.cursor = prevBodyCursor;
+          this.#angleHandle.removeAttribute("selected");
           if (this.#angleTooltip) this.#angleTooltip.removeAttribute("show");
           this.#syncValueAttribute();
           this.#emitChange();
@@ -1158,9 +1234,6 @@ class FigCanvasControl extends HTMLElement {
     if (this.#secondHandle) {
       this.#secondHandle.addEventListener("input", (e) => {
         e.stopPropagation();
-        if (!this.#isSecondDragging) {
-          this.#prevBodyCursor = document.body.style.cursor;
-        }
         this.#isSecondDragging = true;
         const px = e.detail?.px ?? this.#x2 / 100;
         const py = e.detail?.py ?? this.#y2 / 100;
@@ -1171,15 +1244,11 @@ class FigCanvasControl extends HTMLElement {
           this.#secondTooltip.hidePopup?.();
         }
         this.#syncPositions();
-        document.body.style.cursor = this.#resizeCursorSvg(
-          this.#pointPointLineDeg(),
-        );
         this.#emitInput();
       });
 
       this.#secondHandle.addEventListener("change", (e) => {
         e.stopPropagation();
-        document.body.style.cursor = this.#prevBodyCursor ?? "";
         if (this.#secondTooltip) this.#secondTooltip.removeAttribute("show");
         this.#syncPositions();
         this.#syncValueAttribute();
@@ -1201,9 +1270,9 @@ class FigCanvasControl extends HTMLElement {
       const origEvent = e.detail?.originalEvent;
       if (!origEvent) return;
       origEvent.preventDefault();
-      this.#isDragging = true;
       const container = this.#container;
       if (!container) return;
+      this.#isDragging = true;
       const rect = container.getBoundingClientRect();
 
       const pivotX = isFirst ? this.#x2 : this.#x;
@@ -1222,11 +1291,6 @@ class FigCanvasControl extends HTMLElement {
         tooltip.hidePopup?.();
       }
 
-      const prevBodyCursor = document.body.style.cursor;
-      const initDeg = this.#pointPointLineDeg();
-      let lastCursorDeg = Math.round(isFirst ? initDeg + 180 : initDeg);
-      document.body.style.cursor = this.#rotateCursorSvg(lastCursorDeg);
-
       const onMove = (ev) => {
         const r = container.getBoundingClientRect();
         const px = (pivotX / 100) * r.width;
@@ -1250,19 +1314,11 @@ class FigCanvasControl extends HTMLElement {
           this.#y2 = newPctY;
         }
         this.#syncPositions();
-        const curDeg = Math.round(
-          isFirst ? this.#pointPointLineDeg() + 180 : this.#pointPointLineDeg(),
-        );
-        if (curDeg !== lastCursorDeg) {
-          lastCursorDeg = curDeg;
-          document.body.style.cursor = this.#rotateCursorSvg(curDeg);
-        }
         this.#emitInput();
       };
 
       const onUp = () => {
         this.#isDragging = false;
-        document.body.style.cursor = prevBodyCursor;
         if (tooltip) tooltip.removeAttribute("show");
         this.#syncValueAttribute();
         this.#emitChange();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rogieking/figui3",
-  "version": "6.4.2",
+  "version": "6.4.4",
   "description": "A lightweight web components library for building Figma plugin and widget UIs with native look and feel",
   "author": "Rogie King",
   "license": "MIT",