@rogieking/figui3 1.0.94 → 1.0.96

package/example.html

@@ -18,7 +18,25 @@
     </fig-header>
     <h2>Heading 2</h2>
     <h3>Heading 3</h3>
+    <form onsubmit="console.log('submit'); return false;">
+        <fig-button type="submit">Submit</fig-button>
+    </form>
     <br />
+    <fig-button id="button-progressive-blur"
+                variant="ghost"
+                icon="true"
+                class=""
+                disabled="true"><svg width="16"
+             height="16"
+             viewBox="0 0 16 16"
+             fill="none"
+             xmlns="http://www.w3.org/2000/svg">
+            <path fill-rule="evenodd"
+                  clip-rule="evenodd"
+                  d="M6.5 6C7.32843 6 8 5.32843 8 4.5C8 3.67157 7.32843 3 6.5 3C5.67157 3 5 3.67157 5 4.5C5 5.32843 5.67157 6 6.5 6ZM6.5 7C7.70948 7 8.71836 6.14112 8.94999 5H14V4H8.94999C8.71836 2.85888 7.70948 2 6.5 2C5.29052 2 4.28164 2.85888 4.05001 4H2V5H4.05001C4.28164 6.14112 5.29052 7 6.5 7ZM9.5 13C8.67157 13 8 12.3284 8 11.5C8 10.6716 8.67157 10 9.5 10C10.3284 10 11 10.6716 11 11.5C11 12.3284 10.3284 13 9.5 13ZM9.5 14C8.29052 14 7.28164 13.1411 7.05001 12H2V11H7.05001C7.28164 9.85888 8.29052 9 9.5 9C10.7095 9 11.7184 9.85888 11.95 11H14V12H11.95C11.7184 13.1411 10.7095 14 9.5 14Z"
+                  fill="currentColor"></path>
+        </svg></fig-button>
+    <br /> <br />
     <fig-button disabled>Button 1</fig-button>
     <br /><br />
     <fig-button variant="secondary"

package/fig.css

@@ -722,13 +722,14 @@ fig-button {
   /* Disabled */
   &[disabled]:not([disabled="false"]){
     background-color: var(--figma-color-bg-disabled);
-    
     pointer-events: none;
+    cursor: not-allowed;
     &:not([variant="secondary"]){
       color: var(--figma-color-text-ondisabled);
       box-shadow: none;
     }
-    &[variant="secondary"]{
+    &[variant="secondary"],
+    &[variant="ghost"]{
       color: var(--figma-color-text-disabled);
       background-color: transparent;
     }
@@ -926,7 +927,7 @@ fig-avatar,
       background: var(--checkerboard);
     }
   }
-  &[borderless] {
+  &[borderless] img{
     box-shadow: none;
   }
 

package/fig.js

@@ -8,17 +8,14 @@ function supportsPopover() {
 if (window.customElements && !window.customElements.get("fig-button")) {
   /* Button */
   class FigButton extends HTMLElement {
-    #type;
+    type;
     #selected;
     constructor() {
       super();
       this.attachShadow({ mode: "open" });
     }
     connectedCallback() {
-      this.render();
-    }
-    render() {
-      this.#type = this.getAttribute("type") || "button";
+      this.type = this.getAttribute("type") || "button";
       this.shadowRoot.innerHTML = `
             <style>
                 button, button:hover, button:active {
@@ -39,7 +36,7 @@ if (window.customElements && !window.customElements.get("fig-button")) {
                     height: var(--spacer-4);
                 }
             </style>
-            <button type="${this.#type}">
+            <button type="${this.type}">
                 <slot></slot>
             </button>
             `;
@@ -47,42 +44,54 @@ if (window.customElements && !window.customElements.get("fig-button")) {
       this.#selected =
         this.hasAttribute("selected") &&
         this.getAttribute("selected") !== "false";
-      this.addEventListener("click", this.handleClick.bind(this));
 
-      this.button = this.querySelector("button");
+      requestAnimationFrame(() => {
+        this.button = this.shadowRoot.querySelector("button");
+        this.button.addEventListener("click", this.#handleClick.bind(this));
+      });
     }
+
     get type() {
-      return this.#type;
+      return this.type;
     }
     set type(value) {
-      this.#type = value;
-      this.button.type = value;
       this.setAttribute("type", value);
     }
     get selected() {
       return this.#selected;
     }
     set selected(value) {
-      this.#selected = value;
       this.setAttribute("selected", value);
     }
 
-    handleClick(event) {
-      if (this.#type === "toggle") {
-        this.selected = !this.#selected;
+    #handleClick() {
+      if (this.type === "toggle") {
+        this.toggleAttribute("selected", !this.hasAttribute("selected"));
       }
-      if (this.#type === "submit") {
-        this.button.click();
+      if (this.type === "submit") {
+        this.closest("form").dispatchEvent(new Event("submit"));
       }
     }
     static get observedAttributes() {
-      return ["disabled"];
+      return ["disabled", "selected"];
     }
     attributeChangedCallback(name, oldValue, newValue) {
       if (this.button) {
         this.button[name] = newValue;
-        if (newValue === "false") {
-          this.button.removeAttribute(name);
+        switch (name) {
+          case "disabled":
+            this.disabled = this.button.disabled =
+              newValue === "true" ||
+              (newValue === undefined && newValue !== null);
+            break;
+          case "type":
+            this.type = newValue;
+            this.button.type = this.type;
+            this.button.setAttribute("type", this.type);
+            break;
+          case "selected":
+            this.#selected = newValue === "true";
+            break;
         }
       }
     }
@@ -145,7 +154,6 @@ if (window.customElements && !window.customElements.get("fig-dropdown")) {
     }
 
     #handleSelectInput(e) {
-      console.log("FigDropdown #handleSelectInput:", e.target.value);
       this.value = e.target.value;
       this.setAttribute("value", this.value);
     }
@@ -181,7 +189,6 @@ if (window.customElements && !window.customElements.get("fig-dropdown")) {
     attributeChangedCallback(name, oldValue, newValue) {
       if (name === "value") {
         this.#syncSelectedValue(newValue);
-        console.log("val:", this.value);
       }
       if (name === "type") {
         this.type = newValue;

package/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@rogieking/figui3",
-  "version": "1.0.94"
+  "version": "1.0.96"
 }