Skip to content

Commit 5b9d8e9

Browse files
kacheshmarovakacheshmarova
authored
Merge branch '21.0.x' into rivanova/fix-16649-21.0.x
2 parents 1cdad96 + 870ceb1 commit 5b9d8e9

47 files changed

Lines changed: 4539 additions & 5156 deletions

File tree

Some content is hidden

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

‎package-lock.json‎

Lines changed: 4029 additions & 5016 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@
7676
"dompurify": "^3.3.0",
7777
"express": "^5.1.0",
7878
"fflate": "^0.8.1",
79-
"igniteui-theming": "^24.0.0",
79+
"igniteui-theming": "^24.1.1",
8080
"igniteui-trial-watermark": "^3.1.0",
81-
"jspdf": "^3.0.4",
81+
"jspdf": "^4.0.0",
8282
"lodash-es": "^4.17.21",
83-
"marked": "^16.4.0",
83+
"marked": "^17.0.1",
8484
"marked-shiki": "^1.2.1",
8585
"rxjs": "^7.8.2",
8686
"shiki": "^3.13.0",
@@ -154,5 +154,12 @@
154154
"typedoc": "^0.28.14",
155155
"typedoc-plugin-localization": "^3.1.0",
156156
"typescript": "5.9.3"
157+
},
158+
"overrides": {
159+
"igniteui-sassdoc-theme": {
160+
"astro": {
161+
"zod": "~3.25.0"
162+
}
163+
}
157164
}
158165
}

‎projects/igniteui-angular-elements/src/analyzer/elements.config.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -874,8 +874,6 @@ export var registerConfig = [
874874
{ name: "nativeElement" },
875875
{ name: "defaultRowHeight" },
876876
{ name: "columns" },
877-
{ name: "pinnedStartColumns" },
878-
{ name: "pinnedEndColumns" },
879877
{ name: "pinnedRows" },
880878
],
881879
methods: [

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ <h3 class="ig-typography__h6">Flat Grid (MRL column layout)</h3>
8888
<igc-grid-toolbar-actions>
8989
<igc-grid-toolbar-hiding></igc-grid-toolbar-hiding>
9090
<igc-grid-toolbar-pinning></igc-grid-toolbar-pinning>
91-
<igc-grid-toolbar-exporter></igc-grid-toolbar-exporter>
9291
</igc-grid-toolbar-actions>
9392
</igc-grid-toolbar>
9493

‎projects/igniteui-angular-elements/src/lib/state.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export interface IGridStateInfo {
4444
standalone: true
4545
})
4646
export class IgxGridStateComponent extends IgxGridStateBaseDirective {
47+
/* blazorSuppress */
4748
public override grid = inject<GridType>(IGX_GRID_BASE);
4849
/**
4950
* Restores grid features' state based on the IGridStateInfo object passed as an argument.

‎projects/igniteui-angular/action-strip/src/action-strip/action-strip.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ export class IgxActionStripComponent implements IgxActionStripToken, AfterViewIn
8686
private _viewContainer = inject(ViewContainerRef);
8787
private renderer = inject(Renderer2);
8888
protected el = inject(ElementRef);
89+
/* blazorSuppress */
8990
public cdr = inject(ChangeDetectorRef);
9091

9192

‎projects/igniteui-angular/calendar/src/calendar/calendar.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ describe("IgxCalendar - ", () => {
621621
const firstRowItem = row.nativeElement.children[0];
622622
if (idx === 5) {
623623
expect(firstRowItem.firstChild.innerText).toEqual(
624-
"12",
624+
"13",
625625
);
626626
}
627627
});
@@ -638,7 +638,7 @@ describe("IgxCalendar - ", () => {
638638
const firstRowItem = row.nativeElement.children[0];
639639
if (idx === 5) {
640640
expect(firstRowItem.firstChild.innerText).toEqual(
641-
"43",
641+
"44",
642642
);
643643
}
644644
});

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

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@
274274
} @else {
275275
color: contrast-color($color: 'success', $variant: if($variant == 'indigo', 900, 500));
276276
}
277-
background: color($color: 'success', $variant: 500);
278-
border-color: color($color: 'success', $variant: 500);
277+
background: color($color: 'success', $variant: if($variant == 'indigo', 800, 500));
278+
border-color: color($color: 'success', $variant: if($variant == 'indigo', 800, 500));
279279
}
280280

281281
%igx-chip%igx-chip--success {
@@ -285,17 +285,13 @@
285285
background: color($color: 'success', $variant: 800);
286286
border-color: color($color: 'success', $variant: 800);
287287

288-
@if $variant == 'indigo' or $variant == 'bootstrap' {
289-
background: color($color: 'success', $variant: 500);
290-
border-color: color($color: 'success', $variant: 500);
291-
box-shadow: 0 0 0 rem(3px) color($color: 'success', $variant: if($theme-variant == 'light', 200, 800));
292-
}
293-
294288
@if $variant == 'indigo' {
295-
color: contrast-color($color: 'success', $variant: 900);
289+
box-shadow: 0 0 0 rem(3px) color($color: 'success', $variant: if($theme-variant == 'light', 200, 900));
296290
}
297291

298292
@if $variant == 'bootstrap' {
293+
border-color: color($color: 'success', $variant: 500);
294+
background: color($color: 'success', $variant: 500);
299295
color: contrast-color($color: 'success', $variant: 600);
300296
box-shadow: 0 0 0 rem(4px) color($color: 'success', $variant: 500, $opacity: .38);
301297
}
@@ -306,8 +302,8 @@
306302
%igx-chip__item {
307303
@if $variant == 'indigo' {
308304
color: contrast-color($color: 'success', $variant: 900);
309-
background: color($color: 'success', $variant: 400);
310-
border-color: color($color: 'success', $variant: 400);
305+
background: color($color: 'success', $variant: 700);
306+
border-color: color($color: 'success', $variant: 700);
311307
} @else {
312308
color: contrast-color($color: 'success', $variant: 600);
313309
background: color($color: 'success', $variant: 600);
@@ -318,7 +314,11 @@
318314
}
319315

320316
%igx-chip__item--warning {
321-
color: contrast-color($color: 'warn', $variant: 900);
317+
@if $variant == 'indigo' {
318+
color: color($color: 'gray', $variant: if($theme-variant == 'light', 900, 50));
319+
} @else {
320+
color: contrast-color($color: 'warn', $variant: 900);
321+
}
322322
background: color($color: 'warn', $variant: 500);
323323
border-color: color($color: 'warn', $variant: 500);
324324
}
@@ -331,12 +331,12 @@
331331
border-color: color($color: 'warn', $variant: 800);
332332

333333
@if $variant == 'indigo' or $variant == 'bootstrap' {
334-
color: contrast-color($color: 'warn', $variant: 900);
335334
background: color($color: 'warn', $variant: 500);
336335
border-color: color($color: 'warn', $variant: 500);
337336
}
338337

339338
@if $variant == 'indigo' {
339+
color: color($color: 'gray', $variant: if($theme-variant == 'light', 900, 50));
340340
box-shadow: 0 0 0 rem(3px) color($color: 'warn', $variant: if($theme-variant == 'light', 100, 900));
341341
}
342342

@@ -349,7 +349,7 @@
349349
&:hover {
350350
%igx-chip__item {
351351
@if $variant == 'indigo' {
352-
color: contrast-color($color: 'warn', $variant: 900);
352+
color: color($color: 'gray', $variant: if($theme-variant == 'light', 900, 50));
353353
background: color($color: 'warn', $variant: 400);
354354
border-color: color($color: 'warn', $variant: 400);
355355
} @else {
@@ -367,8 +367,8 @@
367367
} @else {
368368
color: contrast-color($color: 'error', $variant: if($variant == 'indigo', 900, 500));
369369
}
370-
background: color($color: 'error', $variant: 500);
371-
border-color: color($color: 'error', $variant: 500);
370+
background: color($color: 'error', $variant: if($variant == 'indigo', 600, 500));
371+
border-color: color($color: 'error', $variant: if($variant == 'indigo', 600, 500));
372372
}
373373

374374
%igx-chip%igx-chip--danger {
@@ -378,17 +378,16 @@
378378
background: color($color: 'error', $variant: 800);
379379
border-color: color($color: 'error', $variant: 800);
380380

381-
@if $variant == 'indigo' or $variant == 'bootstrap' {
382-
background: color($color: 'error', $variant: 500);
383-
border-color: color($color: 'error', $variant: 500);
384-
}
385-
386381
@if $variant == 'indigo' {
382+
border-color: color($color: 'error', $variant: 600);
383+
background: color($color: 'error', $variant: 600);
387384
color: contrast-color($color: 'error', $variant: 900);
388385
box-shadow: 0 0 0 rem(3px) color($color: 'error', $variant: if($theme-variant == 'light', 100, 900));
389386
}
390387

391388
@if $variant == 'bootstrap' {
389+
border-color: color($color: 'error', $variant: 500);
390+
background: color($color: 'error', $variant: 500);
392391
color: contrast-color($color: 'error', $variant: 600);
393392
box-shadow: 0 0 0 rem(4px) color($color: 'error', $variant: 500, $opacity: .38);
394393
}
@@ -399,8 +398,8 @@
399398
%igx-chip__item {
400399
@if $variant == 'indigo' {
401400
color: contrast-color($color: 'error', $variant: 900);
402-
background: color($color: 'error', $variant: 400);
403-
border-color: color($color: 'error', $variant: 400);
401+
background: color($color: 'error', $variant: 500);
402+
border-color: color($color: 'error', $variant: 500);
404403
} @else {
405404
color: contrast-color($color: 'error', $variant: 600);
406405
background: color($color: 'error', $variant: 600);
@@ -542,7 +541,7 @@
542541
position: absolute;
543542
box-shadow: var-get($theme, 'ghost-elevation');
544543
overflow: hidden;
545-
color: var-get($theme, 'focus-text-color');
544+
color: var-get($theme, 'ghost-text-color');
546545
background: var-get($theme, 'ghost-background');
547546
// If z-index is not set,
548547
//the chip would hide behind it's parent grid as it has a z-index of 1
@@ -603,14 +602,14 @@
603602
&%igx-chip--success {
604603
%igx-chip__item {
605604
color: contrast-color($color: 'success', $variant: 900);
606-
background: color($color: 'success', $variant: 500);
607-
border-color: color($color: 'success', $variant: 500);
605+
background: color($color: 'success', $variant: 800);
606+
border-color: color($color: 'success', $variant: 800);
608607
}
609608
}
610609

611610
&%igx-chip--warning {
612611
%igx-chip__item {
613-
color: contrast-color($color: 'warn', $variant: 900);
612+
color: color($color: 'gray', $variant: if($theme-variant == 'light', 900, 50));
614613
background: color($color: 'warn', $variant: 500);
615614
border-color: color($color: 'warn', $variant: 500);
616615
}
@@ -619,8 +618,8 @@
619618
&%igx-chip--danger {
620619
%igx-chip__item {
621620
color: contrast-color($color: 'error', $variant: 900);
622-
background: color($color: 'error', $variant: 500);
623-
border-color: color($color: 'error', $variant: 500);
621+
background: color($color: 'error', $variant: 600);
622+
border-color: color($color: 'error', $variant: 600);
624623
}
625624
}
626625

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
/// @see {mixin} css-vars
99
/// @param {Map} $theme - The grid theme used to style the component.
1010
@mixin excel-filtering($theme) {
11-
$variant: map.get($theme, '_meta', 'variant');
12-
$theme-variant: map.get($theme, '_meta', 'theme-variant');
11+
$variant: map.get($theme, '_meta', 'theme');
12+
$theme-variant: map.get($theme, '_meta', 'variant');
1313
$bootstrap-theme: $variant == 'bootstrap';
1414

1515
$tree-node-indent: (
@@ -128,7 +128,7 @@
128128
background: var-get($theme, 'filtering-row-background');
129129

130130
%igx-group-display {
131-
--shadow: none;
131+
--elevation: none;
132132
--item-background: #{var-get($theme, 'filtering-row-background')};
133133
--item-hover-background: #{color($color: 'gray', $variant: 100)};
134134
--item-selected-background: #{color($color: 'gray', $variant: 100)};
@@ -167,11 +167,14 @@
167167
@if $theme-variant == 'light' {
168168
background: contrast-color($color: 'gray', $variant: 900);
169169
} @else {
170-
background: color($color: 'surface', $variant: 500);
170+
background: color($color: 'gray', $variant: 50);
171171
}
172172

173173
%igx-group-display {
174174
--item-background: transparent;
175+
@if $theme-variant == 'dark' {
176+
--item-text-color: #{contrast-color($color: 'surface', $variant: 500)};
177+
}
175178
--border-color: transparent;
176179
--item-border-color: transparent;
177180
--item-focused-border-color: transparent;
@@ -180,7 +183,7 @@
180183
--item-selected-hover-border-color: transparent;
181184
--item-disabled-border: transparent;
182185
--disabled-selected-border-color: transparent;
183-
--shadow: none;
186+
--elevation: none;
184187
}
185188

186189
%igx-group-item {
@@ -239,10 +242,7 @@
239242
%grid-excel-menu__header-actions {
240243
display: flex;
241244
margin-inline-start: auto;
242-
243-
[igxButton] + [igxButton] {
244-
margin-inline-start: rem(4px);
245-
}
245+
gap: rem(4px);
246246

247247
%grid-excel-actions__action {
248248
padding: 0 !important;
@@ -382,7 +382,7 @@
382382
justify-content: space-between;
383383

384384
@if $variant == 'indigo' {
385-
padding-block: pad-block(rem(6px));
385+
padding-block: pad-block(rem(4px), rem(6px), rem(8px));
386386
padding-inline: pad-inline(rem(12px));
387387
margin-inline: rem(8px);
388388
margin-block-end: rem(4px);
@@ -757,7 +757,6 @@
757757
$header-comfortable: map.get($categories, 'header-comfortable');
758758
$header-compact: map.get($categories, 'header-compact');
759759

760-
761760
%grid-excel-menu {
762761
%grid-excel-menu__header > h4 {
763762
@include type-style('h6')
@@ -807,6 +806,10 @@
807806
}
808807
}
809808

809+
%igx-group-item {
810+
@include type-style('button');
811+
}
812+
810813
%grid-excel-menu__secondary--cosy {
811814
%grid-excel-menu__header > h4 {
812815
@include type-style('h6');

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,13 @@
117117
display: flex;
118118
align-items: center;
119119

120+
@if $variant == 'indigo' {
121+
igc-icon-button,
122+
[igxIconButton] {
123+
padding: rem(6px);
124+
}
125+
}
126+
120127
igx-icon,
121128
igc-icon {
122129
--component-size: #{if($variant == 'indigo', 2, 3)};
@@ -128,7 +135,6 @@
128135
@if $variant == 'indigo' {
129136
width: auto;
130137
height: auto;
131-
padding: rem(6px);
132138
}
133139
}
134140

0 commit comments

Comments
 (0)