fix(material-experimental/mdc-form-field): replace !important with CS…

…S var (#24964) * fix(material-experimental/mdc-form-field): replace !important with CSS var * fix(material-experimental/mdc-form-field): address feedback * fix(material-experimental/mdc-form-field): update src/material-experimental/mdc-form-field/form-field.ts Co-authored-by: Paul Gschwendtner <[email protected]> * fixup! fix(material-experimental/mdc-form-field): update src/material-experimental/mdc-form-field/form-field.ts Co-authored-by: Paul Gschwendtner <[email protected]> (cherry picked from commit 7c91dcf)
angular · Jun 14, 2022 · 7de5f54 · 7de5f54
1 parent d0082e3
commit 7de5f54
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/material-experimental/mdc-form-field/_form-field-density.scss b/src/material-experimental/mdc-form-field/_form-field-density.scss
@@ -84,16 +84,12 @@
 
   // For the outline appearance, we re-create the active floating label transform. This is
   // necessary because the transform for docked floating labels can be updated to account for
-  // the width of prefix container. We need to re-create these styles with `!important` because
-  // the horizontal adjustment for the label is applied through inline styles, and we want to
-  // make sure that the label can still float as expected. It should be okay using `!important`
-  // because it's unlikely that developers commonly overwrite the floating label transform.
+  // the width of prefix container.
   .mat-mdc-text-field-wrapper.mdc-text-field--outlined .mdc-notched-outline--upgraded
   .mdc-floating-label--float-above {
-    $outlined-label-floating-position-y: mdc-textfield.get-outlined-label-position-y($height);
-    // This transform has been extracted from the MDC text-field styles. We can't access it
-    // through a variable because MDC generates this label transform through a mixin.
-    transform: translateY(-$outlined-label-floating-position-y) scale(0.75) !important;
+    --mat-mdc-form-field-label-transform: translateY(
+            -#{mdc-textfield.get-outlined-label-position-y($height)}) scale(0.75);
+    transform: var(--mat-mdc-form-field-label-transform);
   }
 
   // Add vertical spacing to the infix to ensure that outlined form fields have their controls

diff --git a/src/material-experimental/mdc-form-field/form-field.ts b/src/material-experimental/mdc-form-field/form-field.ts
@@ -668,9 +668,13 @@ export class MatFormField
       ((iconPrefixContainer ? iconPrefixContainerWidth - WRAPPER_HORIZONTAL_PADDING : 0) +
         textPrefixContainerWidth);
 
-    // Update the transform the floating label to account for the prefix container. Note
-    // that we do not want to overwrite the default transform for docked floating labels.
-    floatingLabel.style.transform = `${FLOATING_LABEL_DEFAULT_DOCKED_TRANSFORM} translateX(${labelHorizontalOffset}px)`;
+    // Update the translateX of the floating label to account for the prefix container,
+    // but allow the CSS to override this setting via a CSS variable when the label is
+    // floating.
+    floatingLabel.style.transform = `var(
+        --mat-mdc-form-field-label-transform,
+        ${FLOATING_LABEL_DEFAULT_DOCKED_TRANSFORM} translateX(${labelHorizontalOffset}px
+    )`;
   }
 
   /** Checks whether the form field is attached to the DOM. */