Skip to content

Commit b92185b

Browse files
authored
Merge branch '20.1.x' into sstoychev/fix-paginator-201
2 parents 1a2eb92 + fceb91c commit b92185b

39 files changed

Lines changed: 963 additions & 504 deletions

.github/workflows/nodejs.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [20.x, 22.x]
19+
node-version: [22.x]
2020

2121
steps:
2222
- name: Checkout
@@ -50,7 +50,7 @@ jobs:
5050
npm run test:schematics
5151
npm run test:i18n
5252
env:
53-
NODE_OPTIONS: --max_old_space_size=4096 ${{ matrix.node-version == '22.x' && '--no-experimental-strip-types' || '' }}
53+
NODE_OPTIONS: --max_old_space_size=4096 --no-experimental-strip-types
5454
TZ: America/New_York
5555
- name: Build i18n & validate output
5656
run: |
@@ -71,7 +71,6 @@ jobs:
7171
- name: Bundle Tree-Shake & SSR Test
7272
run: npm run build:bundletest
7373
- name: Publish to coveralls.io
74-
if: github.repository == 'IgniteUI/igniteui-angular' && matrix.node-version == '20.x'
75-
uses: coverallsapp/github-action@v2.3.4
74+
uses: coverallsapp/github-action@v2
7675
with:
7776
github-token: ${{ github.token }}

projects/igniteui-angular-elements/src/index.html

Lines changed: 443 additions & 394 deletions
Large diffs are not rendered by default.

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,14 @@
178178

179179
.igx-input-group {
180180
%igx-combo__toggle-button {
181+
cursor: pointer;
181182
background: var-get($theme, 'toggle-button-background');
182183
color: var-get($theme, 'toggle-button-foreground');
183184
}
184185

185186
%igx-combo__clear-button {
187+
cursor: pointer;
188+
186189
@if $variant == 'bootstrap' {
187190
border-inline-end: rem(1px) solid var(--border-color);
188191
}
@@ -286,4 +289,12 @@
286289
}
287290
}
288291
}
292+
293+
igx-combo {
294+
%form-group-input,
295+
%form-group-prefix,
296+
%form-group-suffix {
297+
cursor: pointer;
298+
}
299+
}
289300
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@
511511
grid-template-rows: auto auto auto 1fr auto auto;
512512
grid-template-columns: 100%;
513513
overflow: hidden;
514+
contain: inline-size;
514515
box-shadow: $grid-shadow;
515516

516517
@if $variant == 'fluent' {
@@ -1267,7 +1268,7 @@
12671268
outline-style: none;
12681269

12691270
igx-icon {
1270-
--component-size: #{if($variant == 'indigo', 2, 3)};
1271+
--ig-size: #{if($variant == 'indigo', 2, 3)};
12711272
}
12721273
}
12731274

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

Lines changed: 10 additions & 9 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)),
@@ -149,6 +149,7 @@
149149
[igxPrefix] {
150150
@extend %form-group-prefix;
151151
outline-style: none;
152+
cursor: default;
152153

153154
&:first-child {
154155
@if $variant == 'fluent' {
@@ -164,6 +165,7 @@
164165
[igxSuffix] {
165166
@extend %form-group-suffix;
166167
outline-style: none;
168+
cursor: default;
167169

168170
&:last-child {
169171
@if $variant == 'fluent' {
@@ -1289,7 +1291,7 @@
12891291

12901292
%textarea-group-label--focused {
12911293
transform: translateY(0);
1292-
top: calc(#{$material-box-top-padding} / 4);
1294+
top: calc(#{$textarea-padding} / 4);
12931295
}
12941296

12951297
%textarea-group-label--filled--border,
@@ -1425,7 +1427,6 @@
14251427
}
14261428

14271429
%form-group-input--hover {
1428-
cursor: pointer;
14291430
color: var-get($theme, 'filled-text-hover-color');
14301431

14311432
&::placeholder {
@@ -1434,7 +1435,6 @@
14341435
}
14351436

14361437
%form-group-input--focus {
1437-
cursor: text;
14381438
color: var-get($theme, 'focused-text-color');
14391439

14401440
&::placeholder {
@@ -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

projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
.igx-input-group {
1717
%igx-select__toggle-button {
18+
cursor: pointer;
1819
background: var-get($theme, 'toggle-button-background');
1920
color: var-get($theme, 'toggle-button-foreground');
2021
}
@@ -60,4 +61,12 @@
6061
color: var-get($theme, 'toggle-button-foreground-disabled');
6162
}
6263
}
64+
65+
igx-select {
66+
%form-group-input,
67+
%form-group-prefix,
68+
%form-group-suffix {
69+
cursor: pointer;
70+
}
71+
}
6372
}

projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-theme.scss

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
font-size: rem(12px);
204204
height: $indicator-size;
205205
width: $indicator-size;
206+
min-width: $indicator-size;
206207
white-space: nowrap;
207208
border-radius: var-get($theme, 'border-radius-indicator');
208209
color: var-get($theme, 'indicator-color');
@@ -349,6 +350,7 @@
349350

350351
%igx-stepper__step-content-wrapper {
351352
margin-inline-start: $v-line-indent;
353+
padding-inline-start: $v-line-indent;
352354
position: relative;
353355
min-height: if($variant == 'indigo', rem(24px), rem(32px));
354356

@@ -363,23 +365,11 @@
363365
}
364366
}
365367

366-
[aria-selected='true'] {
367-
%igx-stepper__step-content-wrapper {
368-
padding-inline-start: $v-line-indent;
369-
}
370-
}
371-
372368
@if $variant == 'indigo' {
373-
[aria-selected='true'] {
374-
%igx-stepper__step-content-wrapper {
375-
padding-block: rem(16px);
376-
padding-inline-end: rem(16px);
377-
}
378-
}
379-
380369
[aria-selected='false'] {
381370
%igx-stepper__step-content-wrapper {
382371
padding-block: 0;
372+
transition: padding-block 0.3s 0.2s ease;
383373
}
384374
}
385375
}
@@ -633,10 +623,6 @@
633623

634624
%igx-stepper__step--start,
635625
%igx-stepper__step--end {
636-
%igx-stepper__step-indicator {
637-
flex: 1 0 auto;
638-
}
639-
640626
%igx-stepper__step-header {
641627
@if $variant != 'fluent' {
642628
padding: calc(#{$step-header-padding} / 2);

projects/igniteui-angular/src/lib/core/styles/components/toast/_toast-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
$text: map.get($categories, 'text');
5353

5454
%igx-toast-display,
55-
%igx-toast-display > * {
55+
%igx-toast-display > *:not(igx-icon) {
5656
@include type-style($text) {
5757
margin: 0;
5858
}

projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ describe('IgxDatePicker', () => {
966966
},
967967
element: {
968968
nativeElement: jasmine.createSpyObj('mockElement',
969-
['focus', 'blur', 'click', 'addEventListener', 'removeEventListener'])
969+
['focus', 'blur', 'click', 'addEventListener', 'removeEventListener', 'querySelector'])
970970
}
971971
} as any;
972972
mockInputDirective = {
@@ -1016,6 +1016,7 @@ describe('IgxDatePicker', () => {
10161016
};
10171017
datePicker = new IgxDatePickerComponent(elementRef, 'en-US', overlay, mockInjector, renderer2, null, mockCdr);
10181018
(datePicker as any).inputGroup = mockInputGroup;
1019+
(mockInputGroup.element.nativeElement.querySelector as jasmine.Spy).and.returnValue(mockInputGroup.element.nativeElement);
10191020
(datePicker as any).inputDirective = mockInputDirective;
10201021
(datePicker as any).dateTimeEditor = mockDateEditor;
10211022
(datePicker as any).viewContainerRef = viewsContainerRef;

projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
451451
}
452452

453453
private get inputGroupElement(): HTMLElement {
454-
return this.inputGroup?.element.nativeElement;
454+
return this.inputGroup?.element.nativeElement.querySelector('.igx-input-group__bundle');
455455
}
456456

457457
private get dateValue(): Date {

0 commit comments

Comments
 (0)