feat: adding back disabled state and upping package

Author: bernhard-adobe

components/fieldlabel/index.css

@@ -15,6 +15,7 @@ governing permissions and limitations under the License.
 .spectrum--medium {
   --spectrum-field-label-top-to-asterisk-small: 8px;
 }
+
 .spectrum--large {
   --spectrum-field-label-top-to-asterisk-small: 11px;
 }
@@ -26,7 +27,7 @@ governing permissions and limitations under the License.
   --spectrum-fieldlabel-font-size: var(--spectrum-font-size-75);
 
   --spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
-  --spectrum-fieldlabel-CJK-line-height: var(--spectrum-CJK-line-height-100);
+  --spectrum-fieldlabel-cjk-line-height: var(--spectrum-CJK-line-height-100);
 
   --spectrum-fieldlabel-asterisk-gap: var(--spectrum-field-label-top-to-asterisk-small);
   --spectrum-fieldlabel-side-padding-top: var(--spectrum-component-top-to-text-75);
@@ -40,33 +41,35 @@ governing permissions and limitations under the License.
   --spectrum-fieldlabel-font-size: var(--spectrum-font-size-75);
 
   --spectrum-fieldlabel-line-height: var(--spectrum-line-height-200);
-  --spectrum-fieldlabel-CJK-line-height: var(--spectrum-CJK-line-height-200);
+  --spectrum-fieldlabel-cjk-line-height: var(--spectrum-CJK-line-height-200);
 
   --spectrum-fieldlabel-asterisk-gap: var(--spectrum-field-label-top-to-asterisk-medium);
   --spectrum-fieldlabel-side-padding-top: var(--spectrum-component-top-to-text-75);
   --spectrum-fieldlabel-side-padding-right: var(--spectrum-spacing-200);
   --spectrum-field-label-text-to-asterisk: var(--spectrum-field-label-text-to-asterisk-medium);
 }
+
 .spectrum-FieldLabel--sizeL {
   --spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-100);
   --spectrum-fieldlabel-bottom-to-text: var(--spectrum-component-bottom-to-text-100);
   --spectrum-fieldlabel-font-size: var(--spectrum-font-size-100);
 
   --spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
-  --spectrum-fieldlabel-CJK-line-height: var(--spectrum-CJK-line-height-100);
+  --spectrum-fieldlabel-cjk-line-height: var(--spectrum-CJK-line-height-100);
 
   --spectrum-fieldlabel-asterisk-gap: var(--spectrum-field-label-top-to-asterisk-large);
   --spectrum-fieldlabel-side-padding-top: var(--spectrum-component-top-to-text-100);
   --spectrum-fieldlabel-side-padding-right: var(--spectrum-spacing-200);
   --spectrum-field-label-text-to-asterisk: var(--spectrum-field-label-text-to-asterisk-large);
 }
+
 .spectrum-FieldLabel--sizeXL {
   --spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-200);
   --spectrum-fieldlabel-bottom-to-text: var(--spectrum-component-bottom-to-text-200);
   --spectrum-fieldlabel-font-size: var(--spectrum-font-size-200);
 
   --spectrum-fieldlabel-line-height: var(--spectrum-line-height-200);
-  --spectrum-fieldlabel-CJK-line-height: var(--spectrum-CJK-line-height-200);
+  --spectrum-fieldlabel-cjk-line-height: var(--spectrum-CJK-line-height-200);
 
 
   --spectrum-fieldlabel-asterisk-gap: var(--spectrum-field-label-top-to-asterisk-extra-large);
@@ -97,15 +100,17 @@ governing permissions and limitations under the License.
 
 /* international lang support */
 .spectrum-FieldLabel {
+
   &:lang(ja),
   &:lang(zh),
   &:lang(ko) {
-    line-height: var(--mod-fieldlabel-CJK-line-height, var(--spectrum-fieldlabel-CJK-line-height));
+    line-height: var(--mod-fieldlabel-CJK-line-height, var(--spectrum-fieldlabel-cjk-line-height));
   }
 }
 
 .spectrum-FieldLabel-requiredIcon {
-  margin-block: 0; /* Previously used this improperly, it doesn't reposition asterisk, just increased top margin on the whole field label var(--spectrum-fieldlabel-asterisk-margin-y) */
+  margin-block: 0;
+  /* Previously used this improperly, it doesn't reposition asterisk, just increased top margin on the whole field label var(--spectrum-fieldlabel-asterisk-margin-y) */
   margin-inline: var(--mod-fieldlabel-asterisk-gap, var(--spectrum-fieldlabel-asterisk-gap)) 0;
 }
 
@@ -116,23 +121,23 @@ governing permissions and limitations under the License.
 
   & .spectrum-FieldLabel-requiredIcon {
     margin-block: var(--mod-field-label-text-to-asterisk, var(--spectrum-field-label-text-to-asterisk)) 0;
-    margin-inline: var(--mod-fieldlabel-asterisk-gap, var(--spectrum-fieldlabel-asterisk-gap)) 0; 
+    margin-inline: var(--mod-fieldlabel-asterisk-gap, var(--spectrum-fieldlabel-asterisk-gap)) 0;
   }
 }
 
 .spectrum-FieldLabel--right {
   display: inline-block;
   text-align: end;
-  padding-block: var(--mod-fieldlabel-side-padding-to, var(--spectrum-fieldlabel-side-padding-top))0; 
+  padding-block: var(--mod-fieldlabel-side-padding-to, var(--spectrum-fieldlabel-side-padding-top))0;
   padding-inline: 0 var(--mod-fieldlabel-side-padding-right), var(--spectrum-fieldlabel-side-padding-right));
 }
 
 .spectrum-Form {
   /* for /docs/form.html to set field-label inside form */
-  --spectrum-tableform-border-spacing: 0 var(--spectrum-spacing-300);
+  --spectrum-tableform-border-spacing: 0 var(--mod-spacing-300, var(--spectrum-spacing-300));
   /* matching 20px, missing global token for 20px */
-  --spectrum-tableform-margin-calc: calc(var(--mod--spacing-300, var(--spectrum-spacing-300)) + var(--mod--spacing-300, var(--spectrum-spacing-200)));
-  --spectrum-tableform-margin: calc(var(--mod-tableform-margin-calc, var(--spectrum-tableform-margin-calc)) * -1) 0;
+  --spectrum-tableform-margin-calc: calc(var(--spectrum-spacing-300) + var(--spectrum-spacing-200));
+  --spectrum-tableform-margin: calc(var(--spectrum-tableform-margin-calc) * -1) 0;
 
   display: table;
   border-collapse: separate;
@@ -145,10 +150,22 @@ governing permissions and limitations under the License.
 }
 
 .spectrum-Form-itemLabel {
-  @extend .spectrum-FieldLabel;
   display: table-cell;
 }
 
+/* disabled state */
+
+.spectrum-FieldLabel,
+.spectrum-Form-itemLabel {
+  &.is-disabled {
+    color: var(--mod-disabled-content-color, var(--spectrum-disabled-content-color));
+
+    .spectrum-FieldLabel-requiredIcon {
+      color: var(--mod-disabled-content-color, var(--spectrum-disabled-content-color));
+    }
+  }
+}
+
 .spectrum-Form-itemField {
   display: table-cell;
 }
@@ -162,7 +179,7 @@ governing permissions and limitations under the License.
     display: flex;
     flex-direction: column;
 
-    & + .spectrum-Form-item {
+    &+.spectrum-Form-item {
       margin-block-start: var(--mod-field-label-top-to-asterisk-small, var(--spectrum-field-label-top-to-asterisk-small));
     }
   }

components/fieldlabel/package.json

@@ -17,7 +17,7 @@
   },
   "peerDependencies": {
     "@spectrum-css/icon": "^3.0.21",
-    "@spectrum-css/tokens": "^1.0.1"
+    "@spectrum-css/tokens": "^1.0.4"
   },
   "devDependencies": {
     "@spectrum-css/checkbox": "^3.1.3",
@@ -28,7 +28,7 @@
     "@spectrum-css/radio": "^3.0.24",
     "@spectrum-css/stepper": "^3.0.26",
     "@spectrum-css/textfield": "^3.2.4",
-    "@spectrum-css/tokens": "^1.0.1",
+    "@spectrum-css/tokens": "^1.0.4",
     "gulp": "^4.0.0"
   },
   "publishConfig": {