Skip to content

Commit d5359f1

Browse files
LipataLipata
authored
Merge branch '17.0.x' into dpetev/migrations-17
2 parents 6594096 + 26f28ab commit d5359f1

File tree

13 files changed

+500
-163
lines changed

13 files changed

+500
-163
lines changed

‎angular.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,11 @@
255255
"prefix": "app",
256256
"architect": {
257257
"build": {
258-
"builder": "@angular-devkit/build-angular:browser",
258+
"builder": "@angular-devkit/build-angular:application",
259259
"options": {
260260
"outputPath": "dist/bundle-test",
261261
"index": "projects/bundle-test/src/index.html",
262-
"main": "projects/bundle-test/src/main.ts",
262+
"browser": "projects/bundle-test/src/main.ts",
263263
"polyfills": [
264264
"zone.js"
265265
],
@@ -293,9 +293,7 @@
293293
"sourceMap": true
294294
},
295295
"development": {
296-
"buildOptimizer": false,
297296
"optimization": false,
298-
"vendorChunk": true,
299297
"extractLicenses": false,
300298
"sourceMap": true,
301299
"namedChunks": true

‎package-lock.json‎

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

‎package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@
5454
},
5555
"private": true,
5656
"dependencies": {
57-
"@angular/animations": "^17.0.3",
58-
"@angular/common": "^17.0.3",
59-
"@angular/compiler": "^17.0.3",
60-
"@angular/core": "^17.0.3",
61-
"@angular/forms": "^17.0.3",
62-
"@angular/platform-browser": "^17.0.3",
63-
"@angular/platform-browser-dynamic": "^17.0.3",
64-
"@angular/platform-server": "^17.0.3",
65-
"@angular/router": "^17.0.3",
66-
"@angular/ssr": "^17.0.1",
57+
"@angular/animations": "^17.0.5",
58+
"@angular/common": "^17.0.5",
59+
"@angular/compiler": "^17.0.5",
60+
"@angular/core": "^17.0.5",
61+
"@angular/forms": "^17.0.5",
62+
"@angular/platform-browser": "^17.0.5",
63+
"@angular/platform-browser-dynamic": "^17.0.5",
64+
"@angular/platform-server": "^17.0.5",
65+
"@angular/router": "^17.0.5",
66+
"@angular/ssr": "^17.0.5",
6767
"@igniteui/material-icons-extended": "^3.0.0",
6868
"@types/hammerjs": "^2.0.40",
6969
"@types/source-map": "0.5.2",
@@ -79,16 +79,16 @@
7979
"zone.js": "~0.14.2"
8080
},
8181
"devDependencies": {
82-
"@angular-devkit/build-angular": "^17.0.1",
83-
"@angular-devkit/schematics": "^17.0.1",
82+
"@angular-devkit/build-angular": "^17.0.5",
83+
"@angular-devkit/schematics": "^17.0.5",
8484
"@angular-eslint/builder": "^17.1.0",
8585
"@angular-eslint/eslint-plugin": "^17.1.0",
8686
"@angular-eslint/eslint-plugin-template": "^17.1.0",
8787
"@angular-eslint/schematics": "^17.1.0",
8888
"@angular-eslint/template-parser": "^17.1.0",
89-
"@angular/cli": "^17.0.1",
90-
"@angular/compiler-cli": "^17.0.3",
91-
"@angular/language-service": "^17.0.3",
89+
"@angular/cli": "^17.0.5",
90+
"@angular/compiler-cli": "^17.0.5",
91+
"@angular/language-service": "^17.0.5",
9292
"@angularclass/hmr": "^3.0.0",
9393
"@types/estree": "^1.0.0",
9494
"@types/express": "^4.17.17",
@@ -138,4 +138,4 @@
138138
"typedoc-plugin-localization": "^3.0.3",
139139
"typescript": "5.2.2"
140140
}
141-
}
141+
}

‎projects/igniteui-angular/src/lib/accordion/public_api.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { IGX_EXPANSION_PANEL_DIRECTIVES } from '../expansion-panel/public_api';
21
import { IgxAccordionComponent } from './accordion.component';
32

43
export * from './accordion.component';
@@ -19,5 +18,10 @@ import {
1918
/* Accordion directives collection for ease-of-use import in standalone components scenario */
2019
export const IGX_ACCORDION_DIRECTIVES = [
2120
IgxAccordionComponent,
22-
...IGX_EXPANSION_PANEL_DIRECTIVES
21+
IgxExpansionPanelComponent,
22+
IgxExpansionPanelHeaderComponent,
23+
IgxExpansionPanelBodyComponent,
24+
IgxExpansionPanelDescriptionDirective,
25+
IgxExpansionPanelTitleDirective,
26+
IgxExpansionPanelIconDirective
2327
] as const;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ export const IGX_ACTION_STRIP_DIRECTIVES = [
1818

1919
/* Action-strip in grid directives collection for ease-of-use import in standalone components scenario */
2020
export const IGX_GRID_ACTION_STRIP_DIRECTIVES = [
21-
...IGX_ACTION_STRIP_DIRECTIVES,
21+
IgxActionStripComponent,
22+
IgxActionStripMenuItemDirective,
2223
IgxGridPinningActionsComponent,
2324
IgxGridEditingActionsComponent,
2425
IgxGridActionsBaseDirective,

‎projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.spec.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,38 @@ describe('IgxForOf directive -', () => {
189189
expect(state.startIndex).toBe(1);
190190
});
191191

192+
it('should display the correct chunk items on resizing the container', () => {
193+
// initially the container's width is narrow enough to be scrollable
194+
fix.componentInstance.width = '200px';
195+
fix.componentInstance.cols = [
196+
{ field: '1', width: 100 },
197+
{ field: '2', width: 100 },
198+
{ field: '3', width: 100 },
199+
{ field: '4', width: 100 },
200+
{ field: '5', width: 100 }
201+
];
202+
fix.detectChanges();
203+
204+
expect(displayContainer).not.toBeNull();
205+
206+
// scroll the container so that at least the first col is out of view
207+
fix.componentInstance.scrollLeft(displayContainer.clientWidth);
208+
fix.detectChanges();
209+
210+
fix.componentInstance.childVirtDirs.toArray().forEach(element => {
211+
expect(element.state.startIndex).not.toBe(0);
212+
});
213+
214+
// the container's width is assigned as wide as to display all cols
215+
fix.componentInstance.width = '600px';
216+
fix.detectChanges();
217+
218+
const secondRecChildren = fix.nativeElement.querySelectorAll(DISPLAY_CONTAINER)[1].children;
219+
for (let i = 0; i < secondRecChildren.length; i++) {
220+
expect(secondRecChildren[i].textContent)
221+
.toBe(fix.componentInstance.data[1][i + 1].toString());
222+
}
223+
});
192224
});
193225

194226
describe('vertical virtual component', () => {

‎projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,6 @@ export class IgxForOfDirective<T, U extends T[] = T[]> extends IgxForOfToken<T,U
888888
public resetScrollPosition() {
889889
this.scrollPosition = 0;
890890
this.scrollComponent.scrollAmount = 0;
891-
this.state.startIndex = 0;
892891
}
893892

894893
/**

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

Lines changed: 80 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IGX_GRID_COMMON_DIRECTIVES, IGX_GRID_VALIDATION_DIRECTIVES, IgxRowAddTextDirective, IgxRowEditActionsDirective, IgxRowEditTabStopDirective, IgxRowEditTextDirective } from '../public_api';
1+
import { IgxRowAddTextDirective, IgxRowEditActionsDirective, IgxRowEditTabStopDirective, IgxRowEditTextDirective } from '../public_api';
22
import { IgxGridComponent } from './grid.component';
33
import { IgxGridDetailTemplateDirective, IgxGroupByRowTemplateDirective } from '../grid.directives';
44

@@ -77,8 +77,7 @@ import {
7777
IgxPageNavigationComponent,
7878
IgxPageSizeSelectorComponent,
7979
IgxPaginatorContentDirective,
80-
IgxPaginatorDirective,
81-
IGX_PAGINATOR_DIRECTIVES
80+
IgxPaginatorDirective
8281
} from '../../paginator/public_api';
8382

8483
export * from './grid.component';
@@ -92,7 +91,82 @@ export const IGX_GRID_DIRECTIVES = [
9291
IgxRowEditActionsDirective,
9392
IgxRowEditTextDirective,
9493
IgxRowEditTabStopDirective,
95-
...IGX_GRID_COMMON_DIRECTIVES,
96-
...IGX_GRID_VALIDATION_DIRECTIVES,
97-
...IGX_PAGINATOR_DIRECTIVES
94+
// IGX_GRID_COMMON_DIRECTIVES:
95+
IgxRowDirective,
96+
IgxGridFooterComponent,
97+
IgxAdvancedFilteringDialogComponent,
98+
IgxRowExpandedIndicatorDirective,
99+
IgxRowCollapsedIndicatorDirective,
100+
IgxHeaderExpandedIndicatorDirective,
101+
IgxHeaderCollapsedIndicatorDirective,
102+
IgxExcelStyleHeaderIconDirective,
103+
IgxSortAscendingHeaderIconDirective,
104+
IgxSortDescendingHeaderIconDirective,
105+
IgxSortHeaderIconDirective,
106+
IgxDragIndicatorIconDirective,
107+
IgxRowDragGhostDirective,
108+
IgxGridStateDirective,
109+
// IGX_GRID_HEADERS_DIRECTIVES:
110+
IgxGridHeaderComponent,
111+
IgxGridHeaderGroupComponent,
112+
IgxGridHeaderRowComponent,
113+
// IGX_GRID_COLUMN_DIRECTIVES:
114+
IgxFilterCellTemplateDirective,
115+
IgxSummaryTemplateDirective,
116+
IgxCellTemplateDirective,
117+
IgxCellValidationErrorDirective,
118+
IgxCellHeaderTemplateDirective,
119+
IgxCellFooterTemplateDirective,
120+
IgxCellEditorTemplateDirective,
121+
IgxCollapsibleIndicatorTemplateDirective,
122+
IgxColumnComponent,
123+
IgxColumnGroupComponent,
124+
IgxColumnLayoutComponent,
125+
// IGX_GRID_COLUMN_ACTIONS_DIRECTIVES:
126+
IgxColumnActionsComponent,
127+
IgxColumnHidingDirective,
128+
IgxColumnPinningDirective,
129+
// IGX_GRID_SELECTION_DIRECTIVES:
130+
IgxRowSelectorDirective,
131+
IgxGroupByRowSelectorDirective,
132+
IgxHeadSelectorDirective,
133+
// IGX_GRID_TOOLBAR_DIRECTIVES:
134+
IgxCSVTextDirective,
135+
IgxExcelTextDirective,
136+
IgxGridToolbarActionsComponent,
137+
IgxGridToolbarAdvancedFilteringComponent,
138+
IgxGridToolbarComponent,
139+
IgxGridToolbarExporterComponent,
140+
IgxGridToolbarHidingComponent,
141+
IgxGridToolbarPinningComponent,
142+
IgxGridToolbarTitleComponent,
143+
IgxGridToolbarDirective,
144+
// IGX_GRID_EXCEL_STYLE_FILTER_DIRECTIVES:
145+
IgxGridExcelStyleFilteringComponent,
146+
IgxExcelStyleHeaderComponent,
147+
IgxExcelStyleSortingComponent,
148+
IgxExcelStylePinningComponent,
149+
IgxExcelStyleHidingComponent,
150+
IgxExcelStyleSelectingComponent,
151+
IgxExcelStyleClearFiltersComponent,
152+
IgxExcelStyleConditionalFilterComponent,
153+
IgxExcelStyleMovingComponent,
154+
IgxExcelStyleSearchComponent,
155+
IgxExcelStyleColumnOperationsTemplateDirective,
156+
IgxExcelStyleFilterOperationsTemplateDirective,
157+
IgxExcelStyleLoadingValuesTemplateDirective,
158+
// IGX_GRID_VALIDATION_DIRECTIVES:
159+
IgxColumnRequiredValidatorDirective,
160+
IgxColumnMinValidatorDirective,
161+
IgxColumnMaxValidatorDirective,
162+
IgxColumnEmailValidatorDirective,
163+
IgxColumnMinLengthValidatorDirective,
164+
IgxColumnMaxLengthValidatorDirective,
165+
IgxColumPatternValidatorDirective,
166+
// IGX_PAGINATOR_DIRECTIVES:
167+
IgxPaginatorComponent,
168+
IgxPageNavigationComponent,
169+
IgxPageSizeSelectorComponent,
170+
IgxPaginatorContentDirective,
171+
IgxPaginatorDirective
98172
] as const;

‎projects/igniteui-angular/src/lib/grids/hierarchical-grid/public_api.ts‎

Lines changed: 78 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { IGX_GRID_COMMON_DIRECTIVES, IGX_GRID_VALIDATION_DIRECTIVES } from '../public_api';
21
import { IgxHierarchicalGridComponent } from './hierarchical-grid.component';
32
import { IgxRowIslandComponent } from './row-island.component';
43

@@ -97,7 +96,82 @@ export const IGX_HIERARCHICAL_GRID_DIRECTIVES = [
9796
IgxRowEditActionsDirective,
9897
IgxRowEditTextDirective,
9998
IgxRowEditTabStopDirective,
100-
...IGX_GRID_COMMON_DIRECTIVES,
101-
...IGX_GRID_VALIDATION_DIRECTIVES,
102-
...IGX_PAGINATOR_DIRECTIVES
99+
// IGX_GRID_COMMON_DIRECTIVES:
100+
IgxRowDirective,
101+
IgxGridFooterComponent,
102+
IgxAdvancedFilteringDialogComponent,
103+
IgxRowExpandedIndicatorDirective,
104+
IgxRowCollapsedIndicatorDirective,
105+
IgxHeaderExpandedIndicatorDirective,
106+
IgxHeaderCollapsedIndicatorDirective,
107+
IgxExcelStyleHeaderIconDirective,
108+
IgxSortAscendingHeaderIconDirective,
109+
IgxSortDescendingHeaderIconDirective,
110+
IgxSortHeaderIconDirective,
111+
IgxDragIndicatorIconDirective,
112+
IgxRowDragGhostDirective,
113+
IgxGridStateDirective,
114+
// IGX_GRID_HEADERS_DIRECTIVES:
115+
IgxGridHeaderComponent,
116+
IgxGridHeaderGroupComponent,
117+
IgxGridHeaderRowComponent,
118+
// IGX_GRID_COLUMN_DIRECTIVES:
119+
IgxFilterCellTemplateDirective,
120+
IgxSummaryTemplateDirective,
121+
IgxCellTemplateDirective,
122+
IgxCellValidationErrorDirective,
123+
IgxCellHeaderTemplateDirective,
124+
IgxCellFooterTemplateDirective,
125+
IgxCellEditorTemplateDirective,
126+
IgxCollapsibleIndicatorTemplateDirective,
127+
IgxColumnComponent,
128+
IgxColumnGroupComponent,
129+
IgxColumnLayoutComponent,
130+
// IGX_GRID_COLUMN_ACTIONS_DIRECTIVES:
131+
IgxColumnActionsComponent,
132+
IgxColumnHidingDirective,
133+
IgxColumnPinningDirective,
134+
// IGX_GRID_SELECTION_DIRECTIVES:
135+
IgxRowSelectorDirective,
136+
IgxGroupByRowSelectorDirective,
137+
IgxHeadSelectorDirective,
138+
// IGX_GRID_TOOLBAR_DIRECTIVES:
139+
IgxCSVTextDirective,
140+
IgxExcelTextDirective,
141+
IgxGridToolbarActionsComponent,
142+
IgxGridToolbarAdvancedFilteringComponent,
143+
IgxGridToolbarComponent,
144+
IgxGridToolbarExporterComponent,
145+
IgxGridToolbarHidingComponent,
146+
IgxGridToolbarPinningComponent,
147+
IgxGridToolbarTitleComponent,
148+
IgxGridToolbarDirective,
149+
// IGX_GRID_EXCEL_STYLE_FILTER_DIRECTIVES:
150+
IgxGridExcelStyleFilteringComponent,
151+
IgxExcelStyleHeaderComponent,
152+
IgxExcelStyleSortingComponent,
153+
IgxExcelStylePinningComponent,
154+
IgxExcelStyleHidingComponent,
155+
IgxExcelStyleSelectingComponent,
156+
IgxExcelStyleClearFiltersComponent,
157+
IgxExcelStyleConditionalFilterComponent,
158+
IgxExcelStyleMovingComponent,
159+
IgxExcelStyleSearchComponent,
160+
IgxExcelStyleColumnOperationsTemplateDirective,
161+
IgxExcelStyleFilterOperationsTemplateDirective,
162+
IgxExcelStyleLoadingValuesTemplateDirective,
163+
// IGX_GRID_VALIDATION_DIRECTIVES:
164+
IgxColumnRequiredValidatorDirective,
165+
IgxColumnMinValidatorDirective,
166+
IgxColumnMaxValidatorDirective,
167+
IgxColumnEmailValidatorDirective,
168+
IgxColumnMinLengthValidatorDirective,
169+
IgxColumnMaxLengthValidatorDirective,
170+
IgxColumPatternValidatorDirective,
171+
// IGX_PAGINATOR_DIRECTIVES:
172+
IgxPaginatorComponent,
173+
IgxPageNavigationComponent,
174+
IgxPageSizeSelectorComponent,
175+
IgxPaginatorContentDirective,
176+
IgxPaginatorDirective
103177
] as const;

0 commit comments

Comments
 (0)