feat(core): automatically include field-label (for input/textarea) (#293

)
onfido · Feb 10, 2021 · c9984f6 · c9984f6
1 parent 880be1b
commit c9984f6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/packages/core/src/components/index.scss b/packages/core/src/components/index.scss
@@ -18,9 +18,12 @@
 @forward './textarea/textarea';
 
 @mixin components() {
+  // conditionally includable in other components
+  @include field-label.FieldLabel();
+
+  // all the rest
   @include button.Button();
   @include checkbox.Checkbox();
-  @include field-label.FieldLabel();
   @include helper-text.HelperText();
   @include icon.Icon();
   @include input.Input();

diff --git a/packages/core/src/components/input/input.scss b/packages/core/src/components/input/input.scss
@@ -1,6 +1,13 @@
 @use '../../mixins';
+@use '../includes';
+
+@use '../field-label/field-label';
 
 @mixin Input() {
+  @if not includes.the('field-label') {
+    @include field-label.FieldLabel();
+  }
+
   .ods-input {
     @include mixins.as-text-input();
   }

diff --git a/packages/core/src/components/textarea/textarea.scss b/packages/core/src/components/textarea/textarea.scss
@@ -1,6 +1,13 @@
 @use '../../mixins';
+@use '../includes';
+
+@use '../field-label/field-label';
 
 @mixin Textarea() {
+  @if not includes.the('field-label') {
+    @include field-label.FieldLabel();
+  }
+
   .ods-textarea {
     @include mixins.as-text-input();