Skip to content

Commit 4345f9f

Browse files
authored
Improve input, label and textarea mixins and classes naming (#389)
Breaking changes: - The following mixin were renamed: + form-input -> input + form-textarea -> textarea + form-input__label -> label + form-input__helper -> input__helper - The following mixin were renamed: + .form-input -> .input + .form-textarea -> .textarea + .form-input__label -> .label + .form-input__helper -> .input__helper
1 parent 5acc3ec commit 4345f9f

File tree

8 files changed

+43
-53
lines changed

8 files changed

+43
-53
lines changed

packages/unanimo/src/base/_form-controls.scss

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
%form-input__text {
1+
%input__text {
22
font-size: 14px;
33
line-height: 18px; // 128.571%
44
letter-spacing: 0.2px;
55
}
66

7-
@mixin form-input__label-base {
7+
@mixin label-base {
88
font-weight: 600;
99
font-size: 14px;
1010
line-height: 18px; // 128.571%
1111
letter-spacing: 0.2px;
1212
}
1313

14-
%form-input__label {
14+
%label {
1515
@include label-common-styles();
1616
gap: var(--spacing--m); // Used for images
17-
@include form-input__label-base();
17+
@include label-base();
1818
}
1919

20-
%form-input__helper {
20+
%input__helper {
2121
font-size: 11px;
2222
line-height: 13px; // 118.182%
2323
letter-spacing: 0.2px;
2424
}
2525

26-
%form-input {
27-
@extend %form-input__text;
26+
%input {
27+
@extend %input__text;
2828
--ch-placeholder-color: var(--body-m__font-color--gray);
2929
--ch-edit-gap: var(--spacing--s);
3030
--ch-edit__image-size: var(--spacing--xl);
@@ -48,8 +48,8 @@
4848
}
4949
}
5050

51-
%form-textarea {
52-
@extend %form-input__text;
51+
%textarea {
52+
@extend %input__text;
5353
--ch-placeholder-color: var(--body-m__font-color--gray);
5454
--ch-edit-gap: var(--spacing--s);
5555
--ch-edit__image-size: var(--spacing--xl);
@@ -64,34 +64,30 @@
6464
color: var(--body-m__font-color--positive);
6565
}
6666

67-
%form-input__placeholder {
67+
%input__placeholder {
6868
color: var(--body-m__font-color--gray);
6969
}
7070

7171
/// @group Form
72-
/// @param {String} $selector [".form-input"] -
72+
/// @param {String} $selector [".input"] -
7373
/// @param {Boolean} $add--disabled [true] -
7474
/// @param {Boolean} $add--placeholder [true] -
7575
/// @param {Boolean} $add--placeholder-var [true] -
7676
/// @param {Boolean} $add--error [true] -
77-
@mixin form-input(
78-
$selector: ".form-input",
79-
$add--disabled: true,
80-
$add--error: true
81-
) {
77+
@mixin input($selector: ".input", $add--disabled: true, $add--error: true) {
8278
// TODO: IMPROVE STYLE. Unanimo's implementation does not work well in Sidebar Menus
8379

8480
#{$selector} {
85-
@extend %form-input;
81+
@extend %input;
8682

8783
&:focus {
88-
@extend %form-input--focus;
84+
@extend %input--focus;
8985
}
9086

9187
@if $add--disabled {
9288
&:disabled,
9389
&--disabled {
94-
@extend %form-input--disabled;
90+
@extend %input--disabled;
9591
}
9692
}
9793

@@ -123,27 +119,27 @@
123119
}
124120

125121
/// @group Form
126-
/// @param {String} $selector [".form-textarea"] -
122+
/// @param {String} $selector [".textarea"] -
127123
/// @param {Boolean} $add--disabled [true] -
128124
/// @param {Boolean} $add--error [true] -
129-
@mixin form-textarea(
130-
$selector: ".form-textarea",
125+
@mixin textarea(
126+
$selector: ".textarea",
131127
$add--disabled: true,
132128
$add--error: true
133129
) {
134130
// TODO: IMPROVE STYLE. Unanimo's implementation does not work well in Sidebar Menus
135131

136132
#{$selector} {
137-
@extend %form-textarea;
133+
@extend %textarea;
138134

139135
&:focus {
140-
@extend %form-input--focus;
136+
@extend %input--focus;
141137
}
142138

143139
@if $add--disabled {
144140
&:disabled,
145141
&--disabled {
146-
@extend %form-input--disabled;
142+
@extend %input--disabled;
147143
}
148144
}
149145

@@ -175,14 +171,11 @@
175171
}
176172

177173
/// @group Form
178-
/// @param {String} $selector [".form-input__label"] -
174+
/// @param {String} $selector [".label"] -
179175
/// @param {Boolean} $add--disabled [true] -
180-
@mixin form-input__label(
181-
$selector: ".form-input__label",
182-
$add--disabled: true
183-
) {
176+
@mixin label($selector: ".label", $add--disabled: true) {
184177
#{$selector} {
185-
@extend %form-input__label;
178+
@extend %label;
186179

187180
@if $add--disabled {
188181
&--disabled {
@@ -193,14 +186,11 @@
193186
}
194187

195188
/// @group Form
196-
/// @param {String} $selector [".form-input__helper"] -
189+
/// @param {String} $selector [".input__helper"] -
197190
/// @param {Boolean} $add--disabled [true] -
198-
@mixin form-input__helper(
199-
$selector: ".form-input__helper",
200-
$add--disabled: true
201-
) {
191+
@mixin input__helper($selector: ".input__helper", $add--disabled: true) {
202192
#{$selector} {
203-
@extend %form-input__helper;
193+
@extend %input__helper;
204194

205195
@if $add--disabled {
206196
&--disabled {

packages/unanimo/src/components/_checkbox.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%checkbox {
2-
@extend %form-input__text;
2+
@extend %input__text;
33

44
--ch-checkbox__container-size: 16px;
55
--ch-checkbox__option-size: 10px;

packages/unanimo/src/components/_combo-box.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@
8484
// TODO: IMPROVE STYLE. Unanimo's implementation does not work well in Sidebar Menus
8585

8686
#{$combo-box-selector} {
87-
@extend %form-input;
87+
@extend %input;
8888
@extend %combo-box;
8989

9090
&:focus {
91-
@extend %form-input--focus;
91+
@extend %input--focus;
9292
}
9393
}
9494

9595
@if $add--disabled {
9696
#{$combo-box--disabled-selector} {
97-
@extend %form-input--disabled;
97+
@extend %input--disabled;
9898
}
9999

100100
#{$group__header--disabled-selector} {

packages/unanimo/src/components/_dropdown.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
--ch-dropdown-item__image-size: 24px;
7979
padding-block: var(--spacing--xs);
8080
gap: var(--spacing--s);
81-
@include form-input__label-base();
81+
@include label-base();
8282

8383
&--focus {
8484
@include focus-style($outline: true);

packages/unanimo/src/components/_query-viewer-pivot-table.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
.inner_filter_div {
3030
& > select {
31-
@extend %form-input;
31+
@extend %input;
3232
padding: 5px;
3333
}
3434

@@ -127,14 +127,14 @@
127127
}
128128

129129
#tablePagination_perPage > select {
130-
@extend %form-input;
130+
@extend %input;
131131
padding-inline: 4px;
132132
block-size: 24px;
133133
}
134134

135135
.div_filter_input {
136136
& > .search_input {
137-
@extend %form-input;
137+
@extend %input;
138138
background: no-repeat 4px /
139139
var(--gx-query-viewer-pivot__icon-mask-size, 20px)
140140
url("#{$icons-path}search.svg");
@@ -217,7 +217,7 @@
217217

218218
.pivot_pag_div span:nth-child(2),
219219
#tablePagination_perPage {
220-
@extend %form-input__helper;
220+
@extend %input__helper;
221221
}
222222

223223
.check_item_img i,
@@ -277,7 +277,7 @@
277277
border-end-start-radius: var(--border-radius--m);
278278
border-end-end-radius: var(--border-radius--m);
279279
& input {
280-
@extend %form-input;
280+
@extend %input;
281281
padding-inline: unset;
282282
block-size: 24px;
283283
}

packages/unanimo/src/components/_radio-group.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%radio-group {
2-
@extend %form-input__text;
2+
@extend %input__text;
33

44
--ch-radio-group__radio-container-size: 16px;
55
--ch-radio-group__radio-option-size: 8px;

packages/unanimo/src/components/_switch.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
// Label
4141
&__caption {
42-
@extend %form-input__text;
42+
@extend %input__text;
4343
margin-inline-start: var(--spacing--m);
4444

4545
&--disabled {

packages/unanimo/src/unanimo.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@
298298
}
299299

300300
@if $form-controls-classes {
301-
@include form-input__label();
302-
@include form-input__helper();
301+
@include label();
302+
@include input__helper();
303303
}
304304

305305
@if $hyperlink-classes {
@@ -377,8 +377,8 @@
377377
}
378378

379379
@if $edit {
380-
@include form-input();
381-
@include form-textarea();
380+
@include input();
381+
@include textarea();
382382
}
383383

384384
@if $flexible-layout {

0 commit comments

Comments
 (0)