Skip to content

Commit edcc318

Browse files
authored
Merge branch 'master' into master
2 parents 89b6241 + 4fc69a9 commit edcc318

File tree

63 files changed

+1866
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1866
-289
lines changed

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
All notable changes for each version of this project will be documented in this file.
44

55
## 18.2.0
6+
### General
7+
- `IFilteringExpressionsTree`, `FilteringExpressionsTree`
8+
- **Deprecation** The `find` and `findIndex` methods have been deprecated and will be removed in a future version. A `ExpressionsTreeUtil` class has been added which provides the same functionality.
69
### New Features
710
- `IgxSimpleCombo`
811
- Introduced ability for Simple Combo to automatically select and retain valid input on "Tab" press enhancing user experience by streamlining data entry and reducing the need for manual selection improving form navigation.
@@ -12,6 +15,29 @@ All notable changes for each version of this project will be documented in this
1215
- `IgxCarousel`
1316
- Added support for vertical alignment. Can be configured via the `vertical` property. Defaults to `false`.
1417
- Added support for showing/hiding the indicator controls (dots). Can be configured via the `indicators` property. Defaults to `true`.
18+
- `ColumnType`, `IgxColumn`
19+
- The built-in editors for columns of type `date`, `dateTime` and `time` now use a default input format as per the `IgxGrid`'s `locale`. This is valid both for cell editors and the ones in the filtering UI for all modes - `quickFilter`, `excelStyle` and the Advanced filtering.
20+
- In case the `pipeArgs.displayFormat` property of a date-time column is set and contains only numeric date-time parts or such that can be handled by the editors, the built-in editors input format is inferred from it.
21+
- To configure the built-in editors, a new `editorOptions` property is added that allows to pass optional parameters. Accepts an `IColumnEditorOptions` object with the `dateTimeFormat` property, that is used as input format for the editors of
22+
`date`, `dateTime` and `time` column data types:
23+
```ts
24+
const editorOptions: IColumnEditorOptions = { Field?
25+
dateTimeFormat: 'MM/dd/YYYY',
26+
}
27+
```
28+
```html
29+
<igx-column field="sampleDate" dataType="date" [editorOptions]="editorOptions"></igx-column>
30+
```
31+
- `FieldType` (`IgxQueryBuilder`)
32+
- Similar to the above, the fields now accept an `editorOptions` object of type `IFieldEditorOptions`. Its `dateTimeFormat` property is used as input format for the query editors of date-time fields.
33+
- `IgxDateTimeEditor`, `IgxDatePicker`, `IgxTimePicker`, `IgxDateRangePicker`
34+
- In case the `inputFormat` property is not set, the input format is inferred from
35+
`displayFormat` if set and if it contains only numeric date-time parts.
36+
- `IgxTimePicker`
37+
- The input and display formats are now adjusted based on the locale. For instance, day period time part (AM/PM or a/p) would not be displayed for locales that do not require it.
38+
- `IgxDateTimeEditor`
39+
- Added a new `defaultFormatType` property (`date` | `time` | `dateTime`) which configures the date-time parts
40+
according to the target type that the editor mask includes. Defaults to `date`.
1541

1642
### Themes
1743
- `Palettes`

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
), $variant);
138138

139139
$label-margin: map.get((
140-
'material': rem(12px),
140+
'material': rem(2px),
141141
'fluent': rem(8px),
142142
'bootstrap': rem(8px),
143143
'indigo': rem(8px),
@@ -191,6 +191,10 @@
191191
width: $size;
192192
height: $size;
193193

194+
@if $variant == 'material' {
195+
padding: rem(20px);
196+
}
197+
194198
//ripple color
195199
--color: #{var-get($theme, 'empty-color')};
196200
}
@@ -298,7 +302,6 @@
298302
fill: none;
299303
opacity: 0;
300304
z-index: 1;
301-
transition: opacity .1s $ease-out-quad;
302305

303306
@if $variant == 'material' {
304307
inset-inline-start: -.5px;

projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,8 @@
349349

350350
%igx-chip__item {
351351
display: grid;
352-
grid-template-columns: minmax(0, auto) 1fr minmax(0, auto);
352+
grid-auto-flow: column;
353+
grid-auto-columns: auto;
353354
align-items: center;
354355
justify-content: center;
355356
text-align: center;
@@ -710,7 +711,6 @@
710711
%igx-chip__content {
711712
@include ellipsis();
712713

713-
grid-column: 2 / 3;
714714
max-width: $chip-max-width;
715715

716716
&:empty {
@@ -853,6 +853,12 @@
853853
}
854854
}
855855
}
856+
857+
%igx-chip__end {
858+
&:has(%igx-chip__remove:only-child) {
859+
display: none;
860+
}
861+
}
856862
}
857863
}
858864

projects/igniteui-angular/src/lib/core/styles/components/column-actions/_column-actions-theme.scss

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
}
4040

4141
$theme: digest-schema($column-actions-schema);
42+
$meta: map.get($theme, '_meta');
4243

4344
@if not($title-color) and $background-color {
4445
$title-color: text-contrast($background-color);
@@ -48,7 +49,10 @@
4849
name: $name,
4950
elevations: $elevations,
5051
title-color: $title-color,
51-
background-color: $background-color
52+
background-color: $background-color,
53+
_meta: map.merge(if($meta, $meta, ()), (
54+
variant: map.get($schema, '_meta', 'theme'),
55+
)),
5256
));
5357
}
5458

@@ -57,6 +61,7 @@
5761
/// @param {Map} $theme - The theme used to style the component.
5862
@mixin column-actions($theme) {
5963
@include css-vars($theme);
64+
$variant: map.get($theme, '_meta', 'variant');
6065

6166
%column-actions-display {
6267
display: flex;
@@ -66,6 +71,27 @@
6671
width: 100%;
6772
flex: 1 1 auto;
6873
min-width: rem(180px);
74+
75+
@if $variant == 'material' {
76+
%cbx-composite-wrapper {
77+
padding: 0;
78+
}
79+
80+
%cbx-label-pos--after {
81+
margin-inline-start: rem(12px);
82+
}
83+
84+
%cbx-label-pos--before {
85+
margin-inline-end: rem(12px);
86+
}
87+
88+
%cbx-label-pos--before,
89+
%cbx-label-pos--after {
90+
&:empty {
91+
margin: 0;
92+
}
93+
}
94+
}
6995
}
7096

7197
%column-actions-title {

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,15 @@
100100
}
101101

102102
%igx-combo__checkbox {
103-
margin-inline-end: rem(8);
103+
margin-inline-end: rem(8px);
104+
105+
@if $variant == 'material' {
106+
margin-inline-end: rem(16px);
107+
108+
div {
109+
padding: 0;
110+
}
111+
}
104112
}
105113

106114
%igx-combo__drop-down {

projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,8 @@
678678
margin: rem(16px) 0;
679679

680680
~ igx-input-group,
681-
~ igx-date-picker {
681+
~ igx-date-picker,
682+
~ igx-time-picker {
682683
margin-inline-start: rem(16px);
683684
}
684685
}

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,27 @@
10681068

10691069
%cbx-display {
10701070
min-width: $cbx-size;
1071+
1072+
@if $variant == 'material' {
1073+
%cbx-composite-wrapper {
1074+
padding: 0;
1075+
}
1076+
1077+
%cbx-label-pos--after {
1078+
margin-inline-start: rem(12px);
1079+
}
1080+
1081+
%cbx-label-pos--before {
1082+
margin-inline-end: rem(12px);
1083+
}
1084+
1085+
%cbx-label-pos--before,
1086+
%cbx-label-pos--after {
1087+
&:empty {
1088+
margin: 0;
1089+
}
1090+
}
1091+
}
10711092
}
10721093
}
10731094

projects/igniteui-angular/src/lib/core/styles/components/grid/_pivot-data-selector-theme.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@
8282
}
8383
}
8484

85+
%cbx-composite-wrapper {
86+
@if $variant == 'material' {
87+
padding: 0;
88+
}
89+
}
90+
8591
%form-group-input--box {
8692
transform: none;
8793
}

projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,27 @@
336336
igx-avatar {
337337
--ig-size: #{if($variant == 'indigo', 2, 1)};
338338
}
339+
340+
@if $variant == 'material' {
341+
%cbx-composite-wrapper {
342+
padding: 0;
343+
}
344+
345+
%cbx-label-pos--after {
346+
margin-inline-start: rem(12px);
347+
}
348+
349+
%cbx-label-pos--before {
350+
margin-inline-end: rem(12px);
351+
}
352+
353+
%cbx-label-pos--before,
354+
%cbx-label-pos--after {
355+
&:empty {
356+
margin: 0;
357+
}
358+
}
359+
}
339360
}
340361

341362
%igx-list--empty {

projects/igniteui-angular/src/lib/core/styles/components/navbar/_navbar-theme.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,7 @@
215215
igc-icon {
216216
--component-size: 2;
217217

218-
padding: rem(6px);
219-
width: auto;
220-
height: auto;
218+
margin-inline: rem(6px);
221219
}
222220
}
223221
}

0 commit comments

Comments
 (0)