Skip to content

Commit 92880ac

Browse files
Hristo313Hristo313
authored
Merge branch 'master' into hhristov/fix-simple-combo-tab-focus
2 parents 5eec83b + 32a5e77 commit 92880ac

21 files changed

+1533
-1546
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@
5858
},
5959
"private": true,
6060
"dependencies": {
61-
"@angular/animations": "^19.0.0",
62-
"@angular/common": "^19.0.0",
63-
"@angular/compiler": "^19.0.0",
64-
"@angular/core": "^19.0.0",
65-
"@angular/elements": "^19.0.0",
66-
"@angular/forms": "^19.0.0",
67-
"@angular/platform-browser": "^19.0.0",
68-
"@angular/platform-browser-dynamic": "^19.0.0",
69-
"@angular/platform-server": "^19.0.0",
70-
"@angular/router": "^19.0.0",
71-
"@angular/ssr": "^19.0.0",
61+
"@angular/animations": "^19.1.2",
62+
"@angular/common": "^19.1.2",
63+
"@angular/compiler": "^19.1.2",
64+
"@angular/core": "^19.1.2",
65+
"@angular/elements": "^19.1.2",
66+
"@angular/forms": "^19.1.2",
67+
"@angular/platform-browser": "^19.1.2",
68+
"@angular/platform-browser-dynamic": "^19.1.2",
69+
"@angular/platform-server": "^19.1.2",
70+
"@angular/router": "^19.1.2",
71+
"@angular/ssr": "^19.1.3",
7272
"@igniteui/material-icons-extended": "^3.1.0",
7373
"@lit-labs/ssr-dom-shim": "^1.2.1",
7474
"@types/source-map": "0.5.2",
@@ -79,20 +79,19 @@
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.0",
8181
"tslib": "^2.3.0",
82-
"uuid": "^9.0.0",
8382
"zone.js": "~0.15.0"
8483
},
8584
"devDependencies": {
86-
"@angular-devkit/build-angular": "^19.0.0",
87-
"@angular-devkit/schematics": "^19.0.0",
88-
"@angular-eslint/builder": "^19.0.0",
89-
"@angular-eslint/eslint-plugin": "^19.0.0",
90-
"@angular-eslint/eslint-plugin-template": "^19.0.0",
91-
"@angular-eslint/schematics": "^19.0.0",
92-
"@angular-eslint/template-parser": "^19.0.0",
93-
"@angular/cli": "^19.0.0",
94-
"@angular/compiler-cli": "^19.0.0",
95-
"@angular/language-service": "^19.0.0",
85+
"@angular-devkit/build-angular": "^19.1.3",
86+
"@angular-devkit/schematics": "^19.1.3",
87+
"@angular-eslint/builder": "^19.0.2",
88+
"@angular-eslint/eslint-plugin": "^19.0.2",
89+
"@angular-eslint/eslint-plugin-template": "^19.0.2",
90+
"@angular-eslint/schematics": "^19.0.2",
91+
"@angular-eslint/template-parser": "^19.0.2",
92+
"@angular/cli": "^19.1.3",
93+
"@angular/compiler-cli": "^19.1.2",
94+
"@angular/language-service": "^19.1.2",
9695
"@angularclass/hmr": "^3.0.0",
9796
"@microsoft/signalr": "^7.0.12",
9897
"@types/estree": "^1.0.0",
@@ -108,7 +107,7 @@
108107
"autoprefixer": "^10.4.16",
109108
"del": "^6.0.0",
110109
"eslint": "^9.15.0",
111-
"fs-extra": "^11.1.1",
110+
"fs-extra": "^11.3.0",
112111
"globby": "^13.2.2",
113112
"gulp": "^5.0.0",
114113
"gulp-cached": "^1.1.1",
@@ -122,8 +121,8 @@
122121
"igniteui-dockmanager": "^1.15.2",
123122
"igniteui-sassdoc-theme": "^1.2.3",
124123
"igniteui-webcomponents": "5.2.0",
125-
"jasmine": "^5.4.0",
126-
"jasmine-core": "~5.4.0",
124+
"jasmine": "^5.5.0",
125+
"jasmine-core": "~5.5.0",
127126
"karma": "^6.4.4",
128127
"karma-chrome-launcher": "~3.2.0",
129128
"karma-coverage": "^2.0.3",
@@ -132,12 +131,12 @@
132131
"karma-parallel": "^0.3.1",
133132
"karma-spec-reporter": "^0.0.36",
134133
"lit-html": "^3.2.1",
135-
"ng-packagr": "^19.0.0",
136-
"postcss": "^8.4.31",
134+
"ng-packagr": "^19.1.0",
135+
"postcss": "^8.5.1",
137136
"postcss-scss": "^4.0.6",
138137
"prettier": "^3.3.3",
139-
"puppeteer": "^23.8.0",
140-
"sass-embedded": "^1.77.5",
138+
"puppeteer": "^23.11.1",
139+
"sass-embedded": "^1.83.4",
141140
"sass-true": "^8.1.0",
142141
"sassdoc": "^2.7.4",
143142
"sassdoc-plugin-localization": "^1.4.3",

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import { IgxIconComponent } from '../icon/icon.component';
2424
import { IgxDropDownItemNavigationDirective } from '../drop-down/drop-down-navigation.directive';
2525
import { IgxToggleActionDirective } from '../directives/toggle/toggle.directive';
2626
import { IgxRippleDirective } from '../directives/ripple/ripple.directive';
27-
import { IgxButtonDirective } from '../directives/button/button.directive';
2827
import { NgIf, NgFor, NgTemplateOutlet } from '@angular/common';
2928
import { getCurrentResourceStrings } from '../core/i18n/resources';
3029
import { IgxIconButtonDirective } from '../directives/button/icon-button.directive';
@@ -77,7 +76,6 @@ export class IgxActionStripMenuItemDirective {
7776
NgIf,
7877
NgFor,
7978
NgTemplateOutlet,
80-
IgxButtonDirective,
8179
IgxIconButtonDirective,
8280
IgxRippleDirective,
8381
IgxToggleActionDirective,

‎projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-action-button.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Component, Input, TemplateRef, ViewChild, Output, EventEmitter, ElementRef, booleanAttribute } from '@angular/core';
22
import { IgxIconComponent } from '../../icon/icon.component';
33
import { IgxRippleDirective } from '../../directives/ripple/ripple.directive';
4-
import { IgxButtonDirective } from '../../directives/button/button.directive';
54
import { NgIf } from '@angular/common';
65
import { IgxIconButtonDirective } from '../../directives/button/icon-button.directive';
76

@@ -11,7 +10,7 @@ import { IgxIconButtonDirective } from '../../directives/button/icon-button.dire
1110
@Component({
1211
selector: 'igx-grid-action-button',
1312
templateUrl: 'grid-action-button.component.html',
14-
imports: [NgIf, IgxButtonDirective, IgxRippleDirective, IgxIconComponent, IgxIconButtonDirective]
13+
imports: [NgIf, IgxRippleDirective, IgxIconComponent, IgxIconButtonDirective]
1514
})
1615
export class IgxGridActionButtonComponent {
1716

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
booleanAttribute,
1414
HostListener,
1515
} from '@angular/core';
16-
import { NgIf, NgTemplateOutlet, NgStyle, NgFor, DatePipe } from '@angular/common';
16+
import { NgIf, NgTemplateOutlet, NgFor, DatePipe } from '@angular/common';
1717
import { NG_VALUE_ACCESSOR } from '@angular/forms';
1818

1919
import {
@@ -71,7 +71,7 @@ let NEXT_ID = 0;
7171
],
7272
selector: 'igx-calendar',
7373
templateUrl: 'calendar.component.html',
74-
imports: [NgIf, NgTemplateOutlet, IgxCalendarScrollPageDirective, NgStyle, IgxIconComponent, NgFor, IgxDaysViewComponent, IgxMonthsViewComponent, IgxYearsViewComponent, DatePipe, IgxMonthViewSlotsCalendar, IgxGetViewDateCalendar]
74+
imports: [NgIf, NgTemplateOutlet, IgxCalendarScrollPageDirective, IgxIconComponent, NgFor, IgxDaysViewComponent, IgxMonthsViewComponent, IgxYearsViewComponent, DatePipe, IgxMonthViewSlotsCalendar, IgxGetViewDateCalendar]
7575
})
7676
export class IgxCalendarComponent extends IgxCalendarBaseDirective implements AfterViewInit, OnDestroy {
7777
/**

‎projects/igniteui-angular/src/lib/calendar/month-picker/month-picker.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
OnDestroy,
1010
OnInit,
1111
} from "@angular/core";
12-
import { NgIf, NgStyle, NgTemplateOutlet, DatePipe } from "@angular/common";
12+
import { NgIf, NgTemplateOutlet, DatePipe } from "@angular/common";
1313
import { NG_VALUE_ACCESSOR } from "@angular/forms";
1414

1515
import { IgxMonthsViewComponent } from "../months-view/months-view.component";
@@ -39,7 +39,6 @@ let NEXT_ID = 0;
3939
templateUrl: "month-picker.component.html",
4040
imports: [
4141
NgIf,
42-
NgStyle,
4342
NgTemplateOutlet,
4443
DatePipe,
4544
IgxIconComponent,

‎projects/igniteui-angular/src/lib/calendar/months-view/months-view.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
Inject,
88
} from "@angular/core";
99
import { IgxCalendarMonthDirective } from "../calendar.directives";
10-
import { NgFor, TitleCasePipe, DatePipe } from "@angular/common";
10+
import { NgFor, TitleCasePipe } from "@angular/common";
1111
import {
1212
IgxCalendarViewDirective,
1313
DAY_INTERVAL_TOKEN,
@@ -33,7 +33,7 @@ let NEXT_ID = 0;
3333
],
3434
selector: "igx-months-view",
3535
templateUrl: "months-view.component.html",
36-
imports: [NgFor, IgxCalendarMonthDirective, TitleCasePipe, DatePipe]
36+
imports: [NgFor, IgxCalendarMonthDirective, TitleCasePipe]
3737
})
3838
export class IgxMonthsViewComponent extends IgxCalendarViewDirective implements ControlValueAccessor {
3939
#standalone = true;

‎projects/igniteui-angular/src/lib/grids/columns/column.component.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
14371437
}
14381438
const unpinnedColumns = this.grid.unpinnedColumns.filter(c => !c.columnGroup);
14391439
const pinnedColumns = this.grid.pinnedColumns.filter(c => !c.columnGroup);
1440-
1440+
14411441
let col = this;
14421442
let vIndex = -1;
14431443

@@ -2326,10 +2326,10 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
23262326
columns = columns.filter(c => c.level >= this.level && c !== this && c.parent !== this &&
23272327
c.topLevelParent === this.topLevelParent);
23282328
}
2329-
2329+
23302330
// If isPreceding, find a target such that when the current column is placed after it, current colummn will receive a visibleIndex === index. This takes into account visible children of the columns.
23312331
// If !isPreceding, finds a column of the same level and visible index that equals the passed index agument (c.visibleIndex === index). No need to consider the children here.
2332-
2332+
23332333
if (isPreceding) {
23342334
columns = columns.filter(c => c.visibleIndex > this.visibleIndex);
23352335
target = columns.find(c => c.level === this.level && c.visibleIndex + (c as any).calcChildren() - this.calcChildren() === index);
@@ -2558,7 +2558,9 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
25582558
const colWidth = this.width;
25592559
const isPercentageWidth = colWidth && typeof colWidth === 'string' && colWidth.indexOf('%') !== -1;
25602560
const isAutoWidth = colWidth && typeof colWidth === 'string' && colWidth === 'fit-content';
2561-
if (isPercentageWidth) {
2561+
if (isPercentageWidth && this.grid.isColumnWidthSum) {
2562+
this._calcWidth = this.grid.minColumnWidth;
2563+
} else if (isPercentageWidth) {
25622564
this._calcWidth = parseFloat(colWidth) / 100 * this.grid.calcWidth;
25632565
} else if (!colWidth || isAutoWidth && !this.autoSize) {
25642566
// no width

‎projects/igniteui-angular/src/lib/grids/common/grid.interface.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,10 @@ export interface GridType extends IGridDataBindable {
719719
isLoading: boolean;
720720
/** @hidden @internal */
721721
gridSize: Size;
722-
722+
/** @hidden @internal */
723+
isColumnWidthSum: boolean;
724+
/** @hidden @internal */
725+
minColumnWidth: number;
723726
/** Strategy, used for cloning the provided data. The type has one method, that takes any type of data */
724727
dataCloneStrategy: IDataCloneStrategy;
725728

‎projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-header.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Component, Input, booleanAttribute } from '@angular/core';
22
import { BaseFilteringComponent } from './base-filtering.component';
33
import { IgxIconComponent } from '../../../icon/icon.component';
4-
import { IgxButtonDirective } from '../../../directives/button/button.directive';
54
import { NgIf, NgClass } from '@angular/common';
65
import { IgxIconButtonDirective } from '../../../directives/button/icon-button.directive';
76

@@ -11,7 +10,7 @@ import { IgxIconButtonDirective } from '../../../directives/button/icon-button.d
1110
@Component({
1211
selector: 'igx-excel-style-header',
1312
templateUrl: './excel-style-header.component.html',
14-
imports: [NgIf, IgxButtonDirective, NgClass, IgxIconComponent, IgxIconButtonDirective]
13+
imports: [NgIf, NgClass, IgxIconComponent, IgxIconButtonDirective]
1514
})
1615
export class IgxExcelStyleHeaderComponent {
1716
/**

0 commit comments

Comments
 (0)