Skip to content

Commit 27c2c33

Browse files
authored
Merge branch '20.1.x' into mkirova/fix-16850-20.1.x
2 parents 3a13979 + b0173b1 commit 27c2c33

33 files changed

Lines changed: 891 additions & 474 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 }}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Trigger Licensed Release
2+
3+
permissions:
4+
contents: read
5+
6+
on:
7+
release:
8+
types: [created]
9+
workflow_dispatch:
10+
inputs:
11+
release_tag:
12+
description: 'Release tag to dispatch (e.g. 21.1.1)'
13+
required: true
14+
type: string
15+
16+
jobs:
17+
dispatch-to-private-repo:
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Get app token
22+
id: app-token
23+
uses: actions/create-github-app-token@v2
24+
with:
25+
app-id: ${{ secrets.IGNITEUI_GITHUB_APP_ID }}
26+
private-key: ${{ secrets.IGNITEUI_GITHUB_APP_PRIVATE_KEY }}
27+
owner: IgniteUI
28+
29+
- name: Send repository dispatch to private repo
30+
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # v3
31+
with:
32+
token: ${{ steps.app-token.outputs.token }}
33+
repository: IgniteUI/igniteui-actions
34+
event-type: igniteui-angular-public-release-created
35+
client-payload: |
36+
{
37+
"release_tag": "${{ github.event_name == 'workflow_dispatch' && inputs.release_tag || github.event.release.tag_name }}",
38+
"public_repo": "${{ github.repository }}"
39+
}

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@
184184
}
185185

186186
%igx-combo__clear-button {
187+
cursor: pointer;
188+
187189
@if $variant == 'bootstrap' {
188190
border-inline-end: rem(1px) solid var(--border-color);
189191
}

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/stepper/_stepper-theme.scss

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,16 +366,10 @@
366366
}
367367

368368
@if $variant == 'indigo' {
369-
[aria-selected='true'] {
370-
%igx-stepper__step-content-wrapper {
371-
padding-block: rem(16px);
372-
padding-inline-end: rem(16px);
373-
}
374-
}
375-
376369
[aria-selected='false'] {
377370
%igx-stepper__step-content-wrapper {
378371
padding-block: 0;
372+
transition: padding-block 0.3s 0.2s ease;
379373
}
380374
}
381375
}

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 {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,10 +1965,11 @@ describe('IgxDateRangePicker', () => {
19651965
fixture.detectChanges();
19661966

19671967
const overlayContent = document.getElementsByClassName(CSS_CLASS_OVERLAY_CONTENT)[0] as HTMLElement;
1968+
const expectedTarget = dateRange.element.nativeElement.querySelector('.igx-input-group__bundle');
19681969
expect(AutoPositionStrategy.prototype.position).toHaveBeenCalledTimes(1);
19691970
expect(AutoPositionStrategy.prototype.position)
19701971
.toHaveBeenCalledWith(overlayContent, jasmine.anything(), document,
1971-
jasmine.anything(), dateRange.element.nativeElement);
1972+
jasmine.anything(), expectedTarget);
19721973
}));
19731974
it('Should the weekStart property takes precedence over locale.', fakeAsync(() => {
19741975
fixture = TestBed.createComponent(DateRangeCustomComponent);

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,10 +1223,15 @@ export class IgxDateRangePickerComponent extends PickerBaseDirective
12231223
private configPositionStrategy(): void {
12241224
this._positionSettings = {
12251225
openAnimation: fadeIn,
1226-
closeAnimation: fadeOut
1226+
closeAnimation: fadeOut,
1227+
offset: 1
12271228
};
12281229
this._dropDownOverlaySettings.positionStrategy = new AutoPositionStrategy(this._positionSettings);
1229-
this._dropDownOverlaySettings.target = this.element.nativeElement;
1230+
1231+
const bundle = this.hasProjectedInputs
1232+
? this.projectedInputs.first?.nativeElement.querySelector('.igx-input-group__bundle')
1233+
: this.element.nativeElement.querySelector('.igx-input-group__bundle');
1234+
this._dropDownOverlaySettings.target = bundle || this.element.nativeElement;
12301235
}
12311236

12321237
private configOverlaySettings(): void {

0 commit comments

Comments
 (0)