Skip to content

Commit bcdf443

Browse files
didimmovadidimmova
authored
Merge branch 'vnext' into didimmova/add-tailwind-styling-samples
2 parents dfdc4b8 + 3a9c6b7 commit bcdf443

11 files changed

Lines changed: 61 additions & 56 deletions

File tree

‎package-lock.json‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"igniteui-angular-extras": "^20.0.0",
7979
"igniteui-angular-i18n": "^20.1.0",
8080
"igniteui-dockmanager": "^1.17.0",
81-
"igniteui-live-editing": "^3.1.0",
81+
"igniteui-live-editing": "^3.1.1",
8282
"igniteui-webcomponents": "^6.2.0",
8383
"minireset.css": "0.0.6",
8484
"postcss": "^8.5.5",

‎src/app/app.config.server.ts‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
import { provideServerRendering, withRoutes } from '@angular/ssr';
2-
import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
3-
import { AppConfig } from './app.config';
4-
import { serverRoutes } from './app.routes.server';
1+
import { provideServerRendering, withRoutes } from "@angular/ssr";
2+
import { mergeApplicationConfig, ApplicationConfig } from "@angular/core";
3+
import { AppConfig } from "./app.config";
4+
import { serverRoutes } from "./app.routes.server";
5+
import { provideClientHydration } from "@angular/platform-browser";
6+
import { provideHttpClient, withFetch } from "@angular/common/http";
57

68
const serverConfig: ApplicationConfig = {
7-
providers: [provideServerRendering(withRoutes(serverRoutes))]
9+
providers: [
10+
provideServerRendering(withRoutes(serverRoutes)),
11+
provideClientHydration(),
12+
provideHttpClient(withFetch())
13+
]
814
};
915

1016
export const config = mergeApplicationConfig(AppConfig, serverConfig);

‎src/app/app.routes.server.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ export const serverRoutes: ServerRoute[] = [
5959
},
6060
{
6161
path: 'scheduling/**',
62-
renderMode: RenderMode.Prerender
62+
renderMode: RenderMode.Client // TODO: Calendar components have SSR hydration issues
6363
},
6464
{
6565
path: 'samples/scheduling/**',
66-
renderMode: RenderMode.Prerender
66+
renderMode: RenderMode.Client // TODO: Calendar components have SSR hydration issues
6767
},
6868
{
6969
path: 'menus/**',

‎src/app/grid/grid-cell-merge-custom-sample/grid-cell-merge-custom-sample.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" [width]="'100%'" [height]="'570px'" [mergeStrategy]="perProjectMergeStrategy" [cellMergeMode]="cellMergeMode" >
33
<igx-column field="ActionID" header="Order ID" [hidden]="true">
44
</igx-column>
5-
<igx-column field="ProjectName" header="Project Name" [merge]="true">
5+
<igx-column field="ProjectName" header="Project Name" [merge]="true" [editable]="true">
66
</igx-column>
7-
<igx-column field="Type" header="Type" [merge]="true">
7+
<igx-column field="Type" header="Type" [merge]="true" [editable]="true">
88
</igx-column>
9-
<igx-column field="Priority" header="Priority" [merge]="true">
9+
<igx-column field="Priority" header="Priority" [merge]="true" [editable]="true">
1010
</igx-column>
11-
<igx-column field="Status" header="Status" [merge]="true">
11+
<igx-column field="Status" header="Status" [merge]="true" [editable]="true">
1212
</igx-column>
1313
<igx-column field="ActionName" header="Action">
1414
</igx-column>

‎src/app/grid/grid-cell-merge-sample/grid-cell-merge-sample.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" [width]="'100%'" [height]="'570px'" [rowSelection]="selectionMode" [cellMergeMode]="cellMergeMode">
33
<igx-column field="OrderID" header="Order ID" [hidden]="true" >
44
</igx-column>
5-
<igx-column field="ShipperName" header="Shipper Name" width="250px" [merge]="true" sortable="true">
5+
<igx-column field="ShipperName" header="Shipper Name" width="250px" [merge]="true" [editable]="true" sortable="true">
66
</igx-column>
7-
<igx-column field="Salesperson" header="Salesperson" width="250px" [merge]="true" sortable="true">
7+
<igx-column field="Salesperson" header="Salesperson" width="250px" [merge]="true" [editable]="true" sortable="true">
88
</igx-column>
9-
<igx-column field="Discontinued" header="Discontinued" width="200px" [merge]="true" sortable="true">
9+
<igx-column field="Discontinued" header="Discontinued" width="200px" [merge]="true" [editable]="true" sortable="true">
1010
<ng-template igxCell let-cell="cell" let-val>
1111
@if (val) {
1212
<img src="assets/images/grid/active.png" title="Continued" alt="Continued" />
@@ -18,11 +18,11 @@
1818
</igx-column>
1919
<igx-column field="UnitPrice" header="Unit Price" width="150px" [formatter]="formatCurrency" dataType="number">
2020
</igx-column>
21-
<igx-column field="Quantity" header="Quantity" width="150px" dataType="number">
21+
<igx-column field="Quantity" header="Quantity" width="150px" dataType="number" [editable]="true">
2222
</igx-column>
23-
<igx-column field="ShipCountry" header="Ship Country" width="200px" [merge]="true">
23+
<igx-column field="ShipCountry" header="Ship Country" width="200px" [merge]="true" [editable]="true">
2424
</igx-column>
25-
<igx-column field="ShipCity" header="Ship City" width="250px" [merge]="true">
25+
<igx-column field="ShipCity" header="Ship City" width="250px" [merge]="true" [editable]="true">
2626
</igx-column>
2727
<igx-column field="ShipName" header="Ship Name" width="250px">
2828
</igx-column>

‎src/app/hierarchical-grid/hierarchical-grid-cell-merge-custom/hierarchical-grid-cell-merge-custom.component.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<div class="grid__wrapper">
22
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" #hGrid [data]="localData" [moving]="true" [sortingExpressions]="sortExpr"
33
[cellMergeMode]="cellMergeMode" [mergeStrategy]="perCountryMergeStrategy" [height]="'740px'" [width]="'100%'" [allowFiltering]="true" >
4-
<igx-column field="CompanyName" [sortable]="true" [resizable]="true"></igx-column>
5-
<igx-column field="ContactName" [sortable]="true" [resizable]="true"></igx-column>
6-
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
7-
<igx-column field="Address" [sortable]="true" [resizable]="true"></igx-column>
8-
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
4+
<igx-column field="CompanyName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
5+
<igx-column field="ContactName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
6+
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
7+
<igx-column field="Address" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
8+
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
99
<igx-column field="PostalCode" [sortable]="true" [resizable]="true"></igx-column>
10-
<igx-column field="Country" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
10+
<igx-column field="Country" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
1111
<igx-column field="Phone" [sortable]="true" [resizable]="true"></igx-column>
1212
<igx-column field="Fax" [sortable]="true" [resizable]="true"></igx-column>
1313
<igx-row-island [height]="null" [key]="'ChildCompanies'" [moving]="true" [autoGenerate]="false"
1414
[sortingExpressions]="sortExpr" [cellMergeMode]="cellMergeMode" [mergeStrategy]="perCountryMergeStrategy">
15-
<igx-column field="CompanyName" [sortable]="true" [resizable]="true"></igx-column>
16-
<igx-column field="ContactName" [sortable]="true" [resizable]="true"></igx-column>
17-
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
15+
<igx-column field="CompanyName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
16+
<igx-column field="ContactName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
17+
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
1818
<igx-column field="Address" [sortable]="true" [resizable]="true"></igx-column>
19-
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
19+
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
2020
<igx-column field="PostalCode" [sortable]="true" [resizable]="true"></igx-column>
2121
<igx-column field="Country" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
2222
<igx-column field="Phone" [sortable]="true" [resizable]="true"></igx-column>

‎src/app/hierarchical-grid/hierarchical-grid-cell-merge/hierarchical-grid-cell-merge.component.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
}
2020
</igx-select>
2121
</igx-grid-toolbar>
22-
<igx-column field="CompanyName" [sortable]="true" [resizable]="true"></igx-column>
23-
<igx-column field="ContactName" [sortable]="true" [resizable]="true"></igx-column>
24-
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
25-
<igx-column field="Address" [sortable]="true" [resizable]="true"></igx-column>
26-
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
22+
<igx-column field="CompanyName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
23+
<igx-column field="ContactName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
24+
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
25+
<igx-column field="Address" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
26+
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
2727
<igx-column field="PostalCode" [sortable]="true" [resizable]="true"></igx-column>
28-
<igx-column field="Country" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
28+
<igx-column field="Country" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
2929
<igx-column field="Phone" [sortable]="true" [resizable]="true"></igx-column>
3030
<igx-column field="Fax" [sortable]="true" [resizable]="true"></igx-column>
3131
<igx-row-island [height]="null" [key]="'ChildCompanies'" [moving]="true" [autoGenerate]="false"
3232
[sortingExpressions]="sortExpr" [cellMergeMode]="cellMergeModeRowIsland">
33-
<igx-column field="CompanyName" [sortable]="true" [resizable]="true"></igx-column>
34-
<igx-column field="ContactName" [sortable]="true" [resizable]="true"></igx-column>
35-
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
33+
<igx-column field="CompanyName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
34+
<igx-column field="ContactName" [sortable]="true" [resizable]="true" [editable]="true"></igx-column>
35+
<igx-column field="ContactTitle" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
3636
<igx-column field="Address" [sortable]="true" [resizable]="true"></igx-column>
37-
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
37+
<igx-column field="City" [sortable]="true" [resizable]="true" [merge]="true" [editable]="true"></igx-column>
3838
<igx-column field="PostalCode" [sortable]="true" [resizable]="true"></igx-column>
3939
<igx-column field="Country" [sortable]="true" [resizable]="true" [merge]="true"></igx-column>
4040
<igx-column field="Phone" [sortable]="true" [resizable]="true"></igx-column>

‎src/app/index/index.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export class IndexComponent implements OnInit, AfterViewInit {
169169
const loadedRouteItem = this.appRoutes.filter(
170170
(route: any) => route.path === this.router.url)[0];
171171

172-
if (loadedRouteItem && isPlatformBrowser(this.platformId)) {
172+
if (loadedRouteItem && isPlatformBrowser((this.platformId))) {
173173
// Get parent (INavItem)
174174
const loadedParentItem = this.currentNavItems.filter(
175175
(navItem) => navItem.name === loadedRouteItem.parentName)[0];

‎src/app/tree-grid/tree-grid-cell-merge-custom-sample/tree-grid-cell-merge-custom-sample.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<igx-tree-grid #treeGrid [igxPreventDocumentScroll]="true" [data]="data" width="100%" height="800px"
33
[sortingExpressions]="sortExpr" [autoGenerate]="false" primaryKey="ID" foreignKey="ParentID"
44
[cellMergeMode]="cellMergeMode" [mergeStrategy]="mergeStrategy">
5-
<igx-column [field]="'Name'" dataType="string" width="250px"></igx-column>
6-
<igx-column [field]="'Title'" dataType="string" width="250px" [merge]="true" [sortable]="true"></igx-column>
5+
<igx-column [field]="'Name'" dataType="string" width="250px" [editable]="true"></igx-column>
6+
<igx-column [field]="'Title'" dataType="string" width="250px" [merge]="true" [editable]="true" [sortable]="true"></igx-column>
77
<igx-column [field]="'HireDate'" dataType="date" width="200px"></igx-column>
8-
<igx-column [field]="'Country'" dataType="string" width="200px" [merge]="true" [sortable]="true"></igx-column>
9-
<igx-column [field]="'City'" dataType="string" width="200px" [merge]="true" [sortable]="true"></igx-column>
10-
<igx-column [field]="'Age'" dataType="number" width="200px"></igx-column>
11-
<igx-column [field]="'Address'" dataType="string" width="200px"></igx-column>
8+
<igx-column [field]="'Country'" dataType="string" width="200px" [merge]="true" [editable]="true" [sortable]="true"></igx-column>
9+
<igx-column [field]="'City'" dataType="string" width="200px" [merge]="true" [editable]="true" [sortable]="true"></igx-column>
10+
<igx-column [field]="'Age'" dataType="number" width="200px" [editable]="true"></igx-column>
11+
<igx-column [field]="'Address'" dataType="string" width="200px" [editable]="true"></igx-column>
1212
<igx-column [field]="'Fax'" dataType="string" width="200px"></igx-column>
1313
<igx-column [field]="'PostalCode'" dataType="string" width="200px"></igx-column>
1414
<igx-column [field]="'Phone'" dataType="string" width="200px"></igx-column>

0 commit comments

Comments
 (0)