Skip to content

Commit 0250924

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/wc-chat-wrapper
2 parents 7c66dbf + e3b7f4b commit 0250924

File tree

24 files changed

+246
-131
lines changed

24 files changed

+246
-131
lines changed

ROADMAP.md

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

33
# Current Milestone
44

5-
## Milestone 40, version 20.1 (Due by Nov, 2025)
5+
## Milestone 40, version 21 (Due by Nov, 2025)
66
1. Support for Angular 21
77
2. AI Chat UI component [#16094](https://github.com/IgniteUI/igniteui-angular/issues/16094)
8+
3. PDF Export feature on Angular Data Grid, Tree Grid, Hierarchical Grid and Pivot Grid [#5696](https://github.com/IgniteUI/igniteui-angular/issues/5696)
9+
4. Multiple entry points library refactoring for code splitting support [#16325](https://github.com/IgniteUI/igniteui-angular/issues/16325)
10+
5. Grids filtering performance improvements
811

912
## Going down the road
1013

11-
1. Grids performance
14+
1. Transition the library to signals
15+
2. Zoneless support
1216

1317
# Previous Milestone
1418

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"gulp-uglify": "^3.0.1",
123123
"hammer-simulator": "0.0.1",
124124
"hammerjs": "^2.0.8",
125-
"ig-typedoc-theme": "^6.0.0",
125+
"ig-typedoc-theme": "^7.0.0",
126126
"igniteui-dockmanager": "^1.17.0",
127127
"igniteui-sassdoc-theme": "^2.1.0",
128128
"igniteui-webcomponents": "^6.3.1",
@@ -150,8 +150,8 @@
150150
"stylelint-prettier": "^5.0.2",
151151
"stylelint-scss": "^6.9.0",
152152
"ts-node": "^10.8.1",
153-
"typedoc": "^0.27.0",
154-
"typedoc-plugin-localization": "^3.0.6",
153+
"typedoc": "^0.28.14",
154+
"typedoc-plugin-localization": "^3.1.0",
155155
"typescript": "5.8.3"
156156
}
157157
}

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,24 @@
210210
color: var-get($theme, 'clear-button-foreground-focus');
211211
background: var-get($theme, 'clear-button-background-focus');
212212
}
213+
214+
&%form-group-bundle--border {
215+
%igx-combo__toggle-button {
216+
background: var-get($theme, 'toggle-button-background-focus--border');
217+
}
218+
}
213219
}
214220

215221
@if $variant == 'indigo' {
216222
%form-group-bundle:not(%form-group-bundle--disabled):hover {
217223
%igx-combo__toggle-button {
218224
color: var-get($theme, 'toggle-button-foreground-focus');
225+
background: var-get($theme, 'toggle-button-background-focus');
226+
}
227+
228+
%igx-combo__clear-button {
229+
color: var-get($theme, 'clear-button-foreground-focus');
230+
background: var-get($theme, 'clear-button-background-focus');
219231
}
220232
}
221233
}
@@ -224,6 +236,14 @@
224236
%igx-combo__toggle-button {
225237
color: var-get($theme, 'toggle-button-foreground-filled');
226238
}
239+
240+
@if $variant == 'material' {
241+
&.igx-input-group--focused {
242+
%igx-combo__toggle-button {
243+
color: var-get($theme, 'toggle-button-foreground-filled');
244+
}
245+
}
246+
}
227247
}
228248

229249
.igx-input-group--focused {
@@ -254,14 +274,6 @@
254274
}
255275
}
256276

257-
//.igx-input-group:not(.igx-input-group--box) {
258-
// %igx-combo__toggle-button:focus {
259-
// @if $variant == 'material' {
260-
// background: var-get($theme, 'toggle-button-background-focus--border');
261-
// }
262-
// }
263-
//}
264-
265277
.igx-input-group--disabled {
266278
%igx-combo__toggle-button {
267279
background: var-get($theme, 'toggle-button-background-disabled') !important;
@@ -274,12 +286,4 @@
274286
}
275287
}
276288
}
277-
278-
%form-group-bundle {
279-
&:hover {
280-
%igx-combo__clear-button {
281-
color: inherit;
282-
}
283-
}
284-
}
285289
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@
229229
display: none;
230230
}
231231

232-
> * {
232+
> *,
233+
[class^='igx'] {
233234
--component-size: #{if($variant == 'indigo', 2, var(--list-size))};
234235
}
235236

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@
3838
igx-input-group {
3939
--ig-size: 1;
4040
}
41+
42+
.igx-icon-button,
43+
igc-icon-button {
44+
--ig-size: 2;
45+
}
4146
}
4247

4348
@if $variant == 'bootstrap' {
@@ -114,30 +119,27 @@
114119

115120
igx-icon,
116121
igc-icon {
117-
--component-size: 3;
122+
--component-size: #{if($variant == 'indigo', 2, 3)};
118123

119124
cursor: pointer;
120125
user-select: none;
121126
transition: color .15s $out-quad;
127+
128+
@if $variant == 'indigo' {
129+
width: auto;
130+
height: auto;
131+
padding: rem(6px);
132+
}
122133
}
123134

124-
>igx-icon,
125-
>igc-icon {
135+
> igx-icon,
136+
> igc-icon {
126137
color: var-get($theme, 'idle-icon-color');
127138

128139
&:hover {
129140
color: var-get($theme, 'hover-icon-color');
130141
}
131142
}
132-
133-
@if $variant == 'indigo' {
134-
igx-icon,
135-
igc-icon {
136-
--component-size: 2;
137-
138-
margin-inline: rem(6px);
139-
}
140-
}
141143
}
142144

143145
igx-navbar-action,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555

5656
.igx-input-group.igx-input-group--disabled.igx-input-group--filled,
5757
.igx-input-group.igx-input-group--disabled {
58-
%igx-select__toggle-button {
58+
%form-group-bundle %igx-select__toggle-button {
5959
background: var-get($theme, 'toggle-button-background-disabled');
6060
color: var-get($theme, 'toggle-button-foreground-disabled');
6161
}

projects/igniteui-angular/src/lib/core/styles/components/snackbar/_snackbar-theme.scss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333

3434
[igxButton] {
3535
@include animation(fade-in .35s ease-out);
36-
--ig-size: 1;
36+
37+
--ig-size: 2;
3738
background: transparent;
3839
color: var-get($theme, 'button-color');
3940
-webkit-tap-highlight-color: transparent;
@@ -43,10 +44,6 @@
4344
@if $variant == 'indigo' {
4445
padding: pad-block(rem(4px)) pad-inline(rem(16px));
4546
min-height: rem(36px);
46-
47-
[igxButton] {
48-
--ig-size: 2;
49-
}
5047
}
5148
}
5249

projects/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-theme.scss

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@
2323
'indigo': rem(16px),
2424
), $variant);
2525

26-
.igx-input-group {
27-
display: flex;
28-
flex-direction: column;
29-
30-
@if $variant == 'indigo' or $variant == 'bootstrap' {
31-
[igxLabel] {
32-
margin-block-end: rem(4px);
33-
}
34-
} @else if $variant == 'fluent' {
35-
[igxLabel] {
36-
margin-block-end: rem(5px);
37-
}
38-
}
39-
}
40-
4126
%time-picker-display {
4227
@include sizable();
4328

0 commit comments

Comments
 (0)