@rogieking/figui3 1.0.91 → 1.0.93

package/example.html

@@ -19,13 +19,33 @@
     <h2>Heading 2</h2>
     <h3>Heading 3</h3>
     <br />
+    <fig-button disabled>Button 1</fig-button>
+    <br /><br />
+    <fig-button variant="secondary"
+                disabled>Button 1</fig-button>
+    <br /><br />
+    <fig-button-combo>
+        <fig-button disabled>Button 1</fig-button>
+        <fig-button disabled>Button 2</fig-button>
+        <fig-button disabled>Button 3</fig-button>
+    </fig-button-combo>
+    <br /><br />
+    <fig-button-combo>
+        <fig-button variant="secondary"
+                    disabled>Button 1</fig-button>
+        <fig-button variant="secondary"
+                    disabled>Button 2</fig-button>
+        <fig-button variant="secondary"
+                    disabled>Button 3</fig-button>
+    </fig-button-combo>
+    <br /><br />
     <fig-dropdown>
         <option>One</option>
         <option>Two</option>
         <option>Three</option>
         <option selected>Four</option>
     </fig-dropdown>
-    <br />
+    <br /><br />
     <fig-slider min="0"
                 max="1"
                 transform="100"
@@ -200,7 +220,8 @@
             <fig-button-combo>
                 <fig-button>Primary</fig-button>
                 <fig-button icon="true"
-                            type="select">
+                            type="select"
+                            size="compact">
                     <svg width="24"
                          height="24"
                          viewBox="0 0 24 24"

package/fig.css

@@ -584,7 +584,7 @@ textarea {
 select,
 input[type="text"][list] {
   height: var(--spacer-4);
-  padding: 0 var(--spacer-2);
+  padding: 0 calc(var(--spacer-2) - 1px);
   appearance: none;
   border-radius: var(--radius-medium);
   display: flex;
@@ -641,7 +641,6 @@ fig-dropdown,
 /* Button */
 .fig-button,
 fig-button {
-  box-shadow: inset 0 0 0 1px var(--figma-color-bordertranslucent);
   color: var(--figma-color-text-onbrand);
   display: flex;
   align-items: center;
@@ -656,25 +655,6 @@ fig-button {
   background-color: var(--figma-color-bg-brand);
   font-weight: 500;
 
-  & > button {
-    background: transparent;
-    box-shadow: none;
-    border: 0;
-    appearance: none;
-    outline: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: var(--radius-medium);
-    height: var(--spacer-4);
-    padding: 0 var(--spacer-2);
-    color: currentColor;
-  }
-
-  &:has(> button) {
-    padding: 0;
-  }
-
   &:active {
     background-color: var(--figma-color-bg-brand-pressed);
   }
@@ -696,7 +676,7 @@ fig-button {
     }
   }
 
-  &[variant="ghost"][disabled="true"] {
+  &[variant="ghost"][disabled]:not([disabled="false"]) {
     background-color: transparent;
   }
 
@@ -706,7 +686,8 @@ fig-button {
 
   /* Variant: Secondary */
   &[variant="secondary"] {
-    box-shadow: inset 0 0 0 1px var(--figma-color-border);
+    border: 1px solid var(--figma-color-border);
+    padding: 0 calc(var(--spacer-2) - 1px);
     background: none;
     color: var(--figma-color-text);
 
@@ -722,21 +703,31 @@ fig-button {
   }
 
   /* Icon only */
-  &[icon],
-  &[icon] > button {
+  &[icon]{
     width: var(--spacer-4);
     padding: 0;
     flex-grow: 0;
     flex-shrink: 0;
     flex-basis: var(--spacer-4);
+    &[size="compact"]{
+      width: var(--spacer-3);
+      flex-basis: var(--spacer-3);
+    }
   }
 
   /* Disabled */
-  &[disabled="true"],
-  &[disabled="true"] > button {
+  &[disabled]:not([disabled="false"]){
     background-color: var(--figma-color-bg-disabled);
-    color: var(--figma-color-text-disabled);
+    
     pointer-events: none;
+    &:not([variant="secondary"]){
+      color: var(--figma-color-text-ondisabled);
+      box-shadow: none;
+    }
+    &[variant="secondary"]{
+      color: var(--figma-color-text-disabled);
+      background-color: transparent;
+    }
   }
 
   /* Size */
@@ -795,18 +786,60 @@ fig-button {
 
   &:focus,
   &:focus-within {
-    outline: 0;
-    box-shadow: inset 0 0 0 1px var(--figma-color-border-selected);
+    &:not(:active) {
+      outline: 0;
+      box-shadow: inset 0 0 0 1px var(--figma-color-border-selected);
+    }
   }
 }
 
-fig-button > button {
-  width: 100%;
+/* Combo button */
+.fig-button-combo,
+fig-button-combo,
+.fig-input-combo,
+fig-input-combo {
+  display: inline-flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  gap: 0px;
+  & > * {
+    &:first-child,
+    &:first-child > * {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+
+    &:last-child,
+    &:last-child > * {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+    }
+
+    &:not(:last-child):not(:first-child),
+    &:not(:last-child):not(:first-child) > * {
+      border-radius: 0;
+    }
+  }
+}
+.fig-button-combo,
+fig-button-combo {
+  > *:not([variant="secondary"]):not(:first-child) {
+    box-shadow: inset 1px 0 0 0 var(--figma-color-bg-brand-hover);
+    &[disabled]:not([disabled="false"]) {
+       box-shadow: inset 1px 0 0 0 var(--figma-color-border-disabled);
+    }
+  }
+  > *[variant="secondary"]:not(:first-child) {
+    border-left-width: 0 !important;
+    &[disabled]:not([disabled="false"]) {
+      border-left-width: 0 !important;
+    }
+  }
 }
 
 /* Tabs */
 fig-tab,
-.tab {
+.fig-tab {
   display: inline-flex;
   flex-direction: column;
   align-items: center;
@@ -838,7 +871,7 @@ fig-tab,
   }
 
   &:has(:checked),
-  &[selected] {
+  &[selected]:not([selected="false"]) {
     background-color: var(--figma-color-bg-secondary);
     font-weight: var(--body-medium-strong-fontWeight);
     color: var(--figma-color-text);
@@ -1116,45 +1149,7 @@ fig-image {
   }
 }
 
-/* Combo button */
-.fig-button-combo,
-fig-button-combo,
-.fig-input-combo,
-fig-input-combo {
-  display: inline-flex;
-  flex-wrap: nowrap;
-  align-items: center;
-  gap: 0px;
-  & > * {
-    &:first-child,
-    &:first-child > * {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-
-    &:last-child,
-    &:last-child > * {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
 
-    &:not(:last-child):not(:first-child),
-    &:not(:last-child):not(:first-child) > * {
-      border-radius: 0;
-    }
-  }
-}
-.fig-button-combo,
-fig-button-combo {
-  > *:not(:first-child) {
-    border-left: 1px solid var(--figma-color-bg-brand-hover);
-    margin-left: -1px;
-  }
-  > *[variant="secondary"]:not(:first-child) {
-    border-left: transparent;
-    margin-left: -1px;
-  }
-}
 
 /* Combo input */
 .input-combo {

package/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@rogieking/figui3",
-  "version": "1.0.91"
+  "version": "1.0.93"
 }