Skip to content

Commit ab73cfa

Browse files
authored
Merge branch 'master' into valadzhov/fix-16664-focus-on-combo-when-closing
2 parents 94439c2 + cc819f5 commit ab73cfa

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

CHANGELOG.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@
22

33
All notable changes for each version of this project will be documented in this file.
44

5-
## 21.2.0
6-
7-
### New Features
8-
9-
- `IgxCombo`, `IgxSimpleCombo`
10-
- Introduced the ability for Combo and Simple Combo to close the dropdown list and move the focus to the next focusable element on "Tab" press and clear the selection if the combo is collapsed on "Escape".
11-
12-
### Breaking Changes
13-
14-
- `igxForOf`, `igxGrid`, `igxTreeGrid`, `igxHierarchicalGrid`, `igxPivotGrid`
15-
- original `data` array mutations (like adding/removing/moving records in the original array) are no longer detected automatically. Components need an array ref change for the change to be detected.
16-
175
## 21.1.0
186

197
### New Features
@@ -28,7 +16,16 @@ All notable changes for each version of this project will be documented in this
2816
<span #tooltipRef="tooltip" igxTooltip>Hello there, I am a tooltip!</span>
2917
```
3018

31-
# Localization(i18n)
19+
### General
20+
- `IgxCombo`, `IgxSimpleCombo`
21+
- Combo and Simple Combo now close the dropdown list and move the focus to the next focusable element on "Tab" press and clear the selection if the combo is collapsed on "Escape".
22+
23+
### Breaking Changes
24+
25+
- `igxForOf`, `igxGrid`, `igxTreeGrid`, `igxHierarchicalGrid`, `igxPivotGrid`
26+
- original `data` array mutations (like adding/removing/moving records in the original array) are no longer detected automatically. Components need an array ref change for the change to be detected.
27+
28+
### Localization(i18n)
3229

3330
- `IgxActionStrip`, `IgxBanner`, `IgxCalendar`, `IgxCarousel`, `IgxChip`, `IgxCombo`, `IgxDatePicker`, `IgxDateRangePicker`, `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`, `IgxPivotGrid`, `IgxInputs`, `IgxList`, `IgxPaginator`, `IgxQueryBuilder`, `IgxTimePicker`, `IgxTree`
3431
- New `Intl` implementation for all currently supported components that format and render data like dates and numbers.

projects/igniteui-angular/core/src/core/styles/components/input/_input-group-theme.scss

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
$material-box-top-padding: sizable(rem(16px), rem(20px), rem(24px));
6060
$material-border-top-padding: sizable(rem(8px), rem(12px), rem(16px));
6161

62-
$textarea-top-padding: map.get((
63-
'material': rem(0px),
62+
$textarea-padding: map.get((
63+
'material': sizable(rem(8px), rem(12px), rem(16px)),
6464
'fluent': sizable(rem(6px), rem(10px), rem(14px)),
6565
'bootstrap': sizable(rem(4px), rem(8px), rem(12px)),
6666
'indigo': sizable(rem(4px), rem(6px), rem(8px)),
@@ -1289,7 +1289,7 @@
12891289

12901290
%textarea-group-label--focused {
12911291
transform: translateY(0);
1292-
top: calc(#{$material-box-top-padding} / 4);
1292+
top: calc(#{$textarea-padding} / 4);
12931293
}
12941294

12951295
%textarea-group-label--filled--border,
@@ -1465,9 +1465,10 @@
14651465
resize: vertical;
14661466
overflow: hidden;
14671467
z-index: 1;
1468+
padding-block-end: $textarea-padding;
14681469

14691470
@if $material-theme {
1470-
padding: 0;
1471+
padding-block-start: 0;
14711472
}
14721473
}
14731474

@@ -2023,14 +2024,14 @@
20232024
}
20242025

20252026
%indigo-textarea {
2026-
padding-block: $textarea-top-padding 0;
2027+
padding-block: $textarea-padding;
20272028
padding-inline: pad-inline(rem(2px), rem(4px), rem(6px));
20282029
inset-block-end: rem(2px);
20292030
}
20302031

20312032
%fluent-textarea {
20322033
padding-inline: pad-inline(rem(8px));
2033-
padding-block: $textarea-top-padding 0;
2034+
padding-block: $textarea-padding;
20342035
}
20352036

20362037
%fluent-input-disabled {
@@ -2292,7 +2293,7 @@
22922293
);
22932294

22942295
&:is(textarea) {
2295-
padding-block: $textarea-top-padding 0;
2296+
padding-block: $textarea-padding;
22962297
}
22972298
}
22982299

0 commit comments

Comments
 (0)