Skip to content

Commit 73c607e

Browse files
ChronosSFChronosSF
authored
Merge branch 'vnext' into sstoychev/fix-lite-ds
2 parents 3692915 + 9492035 commit 73c607e

File tree

14 files changed

+80
-65
lines changed

14 files changed

+80
-65
lines changed

‎projects/app-lob/src/app/grid-finjs/main.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Router } from '@angular/router';
33
import { IgxDialogActionsDirective, IgxDialogComponent, IgxDialogTitleDirective } from 'igniteui-angular/dialog';
44
import { IgxOverlayOutletDirective, OverlaySettings } from 'igniteui-angular/core';
55
import { IgxButtonDirective, IgxFocusDirective } from 'igniteui-angular/directives';
6-
import { IgxCategoryChartComponent, IgxCategoryChartCoreModule } from 'igniteui-angular-charts';
6+
import { IgxCategoryChartComponent, IgxCategoryChartModule } from 'igniteui-angular-charts';
77
import { Stock } from '../data/financialData';
88
import { ControllerComponent } from './controllers.component';
99
import { GridFinJSComponent } from './grid-finjs.component';
@@ -12,7 +12,7 @@ import { GridFinJSComponent } from './grid-finjs.component';
1212
selector: 'app-finjs-main',
1313
styleUrls: ['./main.component.scss'],
1414
templateUrl: './main.component.html',
15-
imports: [ControllerComponent, GridFinJSComponent, IgxOverlayOutletDirective, IgxDialogComponent, IgxDialogTitleDirective, IgxCategoryChartCoreModule, IgxDialogActionsDirective, IgxButtonDirective, IgxFocusDirective]
15+
imports: [ControllerComponent, GridFinJSComponent, IgxOverlayOutletDirective, IgxDialogComponent, IgxDialogTitleDirective, IgxCategoryChartModule, IgxDialogActionsDirective, IgxButtonDirective, IgxFocusDirective]
1616
})
1717
export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
1818
@ViewChild('finGrid', { static: true }) public finGrid: GridFinJSComponent;

‎projects/app-lob/src/app/grid/grid-master-detail/grid-master-detail.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { IgxGridComponent } from 'igniteui-angular/grids/grid';
55
import { IgxTabContentComponent, IgxTabHeaderComponent, IgxTabHeaderLabelDirective, IgxTabItemComponent, IgxTabsComponent } from 'igniteui-angular/tabs';
66
import { IgxAvatarComponent } from 'igniteui-angular/avatar';
77
import { IgxDividerDirective } from 'igniteui-angular/directives';
8-
import { IgxLegendComponent, IgxPieChartCoreModule, IgxLegendModule, IgxCategoryChartCoreModule } from 'igniteui-angular-charts';
8+
import { IgxLegendComponent, IgxPieChartCoreModule, IgxLegendModule, IgxCategoryChartModule } from 'igniteui-angular-charts';
99
import { employeesData } from '../../data/employeesData';
1010
import { IgxPreventDocumentScrollDirective } from '../../../../../../src/app/directives/prevent-scroll.directive';
1111

1212
@Component({
1313
selector: 'app-grid-master-detail',
1414
styleUrls: ['./grid-master-detail.component.scss'],
1515
templateUrl: 'grid-master-detail.component.html',
16-
imports: [IgxGridComponent, IgxPreventDocumentScrollDirective, IgxColumnComponent, IgxGridDetailTemplateDirective, IgxTabsComponent, IgxTabItemComponent, IgxTabHeaderComponent, IgxTabHeaderLabelDirective, IgxTabContentComponent, IgxAvatarComponent, IgxDividerDirective, IgxPieChartCoreModule, IgxLegendModule, IgxCategoryChartCoreModule]
16+
imports: [IgxGridComponent, IgxPreventDocumentScrollDirective, IgxColumnComponent, IgxGridDetailTemplateDirective, IgxTabsComponent, IgxTabItemComponent, IgxTabHeaderComponent, IgxTabHeaderLabelDirective, IgxTabContentComponent, IgxAvatarComponent, IgxDividerDirective, IgxPieChartCoreModule, IgxLegendModule, IgxCategoryChartModule]
1717
})
1818

1919
export class GridMasterDetailSampleComponent {

‎src/app/data/customers.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const DATA = [
77
ContactTitle: "Sales Representative",
88
Address: "Obere Str. 57",
99
City: "Berlin",
10-
Region: null,
10+
Region: "East",
1111
PostalCode: "12209",
1212
Country: "Germany",
1313
Phone: "030-0074321",
@@ -19,7 +19,7 @@ export const DATA = [
1919
ContactTitle: "Owner",
2020
Address: "Avda. de la Constitución 2222",
2121
City: "México D.F.",
22-
Region: null,
22+
Region: "South",
2323
PostalCode: "05021",
2424
Country: "Mexico",
2525
Phone: "(5) 555-4729",
@@ -31,7 +31,7 @@ export const DATA = [
3131
ContactTitle: "Owner",
3232
Address: "Mataderos 2312",
3333
City: "México D.F.",
34-
Region: null,
34+
Region: "South",
3535
PostalCode: "05023",
3636
Country: "Mexico",
3737
Phone: "(5) 555-3932",
@@ -43,7 +43,7 @@ export const DATA = [
4343
ContactTitle: "Sales Representative",
4444
Address: "120 Hanover Sq.",
4545
City: "London",
46-
Region: null,
46+
Region: "East",
4747
PostalCode: "WA1 1DP",
4848
Country: "UK",
4949
Phone: "(171) 555-7788",
@@ -55,7 +55,7 @@ export const DATA = [
5555
ContactTitle: "Order Administrator",
5656
Address: "Berguvsvägen 8",
5757
City: "Luleå",
58-
Region: null,
58+
Region: "South",
5959
PostalCode: "S-958 22",
6060
Country: "Sweden",
6161
Phone: "0921-12 34 65",
@@ -67,7 +67,7 @@ export const DATA = [
6767
ContactTitle: "Sales Representative",
6868
Address: "Forsterstr. 57",
6969
City: "Mannheim",
70-
Region: null,
70+
Region: "East",
7171
PostalCode: "68306",
7272
Country: "Germany",
7373
Phone: "0621-08460",
@@ -79,7 +79,7 @@ export const DATA = [
7979
ContactTitle: "Marketing Manager",
8080
Address: "24, place Kléber",
8181
City: "Strasbourg",
82-
Region: null,
82+
Region: "East",
8383
PostalCode: "67000",
8484
Country: "France",
8585
Phone: "88.60.15.31",
@@ -91,7 +91,7 @@ export const DATA = [
9191
ContactTitle: "Owner",
9292
Address: "C/ Araquil, 67",
9393
City: "Madrid",
94-
Region: null,
94+
Region: "East",
9595
PostalCode: "28023",
9696
Country: "Spain",
9797
Phone: "(91) 555 22 82",
@@ -103,7 +103,7 @@ export const DATA = [
103103
ContactTitle: "Owner",
104104
Address: "12, rue des Bouchers",
105105
City: "Marseille",
106-
Region: null,
106+
Region: "West",
107107
PostalCode: "13008",
108108
Country: "France",
109109
Phone: "91.24.45.40",
@@ -127,7 +127,7 @@ export const DATA = [
127127
ContactTitle: "Sales Representative",
128128
Address: "Fauntleroy Circus",
129129
City: "London",
130-
Region: null,
130+
Region: "South",
131131
PostalCode: "EC2 5NT",
132132
Country: "UK",
133133
Phone: "(171) 555-1212",
@@ -139,7 +139,7 @@ export const DATA = [
139139
ContactTitle: "Sales Agent",
140140
Address: "Cerrito 333",
141141
City: "Buenos Aires",
142-
Region: null,
142+
Region: "East",
143143
PostalCode: "1010",
144144
Country: "Argentina",
145145
Phone: "(1) 135-5555",
@@ -151,7 +151,7 @@ export const DATA = [
151151
ContactTitle: "Marketing Manager",
152152
Address: "Sierras de Granada 9993",
153153
City: "México D.F.",
154-
Region: null,
154+
Region: "South",
155155
PostalCode: "05022",
156156
Country: "Mexico",
157157
Phone: "(5) 555-3392",
@@ -163,7 +163,7 @@ export const DATA = [
163163
ContactTitle: "Owner",
164164
Address: "Hauptstr. 29",
165165
City: "Bern",
166-
Region: null,
166+
Region: "East",
167167
PostalCode: "3012",
168168
Country: "Switzerland",
169169
Phone: "0452-076545",
@@ -187,7 +187,7 @@ export const DATA = [
187187
ContactTitle: "Sales Representative",
188188
Address: "Berkeley Gardens 12 Brewery",
189189
City: "London",
190-
Region: null,
190+
Region: "South",
191191
PostalCode: "WX1 6LT",
192192
Country: "UK",
193193
Phone: "(171) 555-2282",
@@ -199,7 +199,7 @@ export const DATA = [
199199
ContactTitle: "Order Administrator",
200200
Address: "Walserweg 21",
201201
City: "Aachen",
202-
Region: null,
202+
Region: "South",
203203
PostalCode: "52066",
204204
Country: "Germany",
205205
Phone: "0241-039123",
@@ -211,7 +211,7 @@ export const DATA = [
211211
ContactTitle: "Owner",
212212
Address: "67, rue des Cinquante Otages",
213213
City: "Nantes",
214-
Region: null,
214+
Region: "East",
215215
PostalCode: "44000",
216216
Country: "France",
217217
Phone: "40.67.88.88",
@@ -223,7 +223,7 @@ export const DATA = [
223223
ContactTitle: "Sales Agent",
224224
Address: "35 King George",
225225
City: "London",
226-
Region: null,
226+
Region: "East",
227227
PostalCode: "WX3 6FW",
228228
Country: "UK",
229229
Phone: "(171) 555-0297",
@@ -235,7 +235,7 @@ export const DATA = [
235235
ContactTitle: "Sales Manager",
236236
Address: "Kirchgasse 6",
237237
City: "Graz",
238-
Region: null,
238+
Region: "South",
239239
PostalCode: "8010",
240240
Country: "Austria",
241241
Phone: "7675-3425",
@@ -259,7 +259,7 @@ export const DATA = [
259259
ContactTitle: "Accounting Manager",
260260
Address: "C/ Moralzarzal, 86",
261261
City: "Madrid",
262-
Region: null,
262+
Region: "East",
263263
PostalCode: "28034",
264264
Country: "Spain",
265265
Phone: "(91) 555 94 44",
@@ -271,7 +271,7 @@ export const DATA = [
271271
ContactTitle: "Assistant Sales Agent",
272272
Address: "184, chaussée de Tournai",
273273
City: "Lille",
274-
Region: null,
274+
Region: "South",
275275
PostalCode: "59000",
276276
Country: "France",
277277
Phone: "20.16.10.16",
@@ -283,7 +283,7 @@ export const DATA = [
283283
ContactTitle: "Owner",
284284
Address: "Åkergatan 24",
285285
City: "Bräcke",
286-
Region: null,
286+
Region: "East",
287287
PostalCode: "S-844 67",
288288
Country: "Sweden",
289289
Phone: "0695-34 67 21",
@@ -295,7 +295,7 @@ export const DATA = [
295295
ContactTitle: "Marketing Manager",
296296
Address: "Berliner Platz 43",
297297
City: "München",
298-
Region: null,
298+
Region: "East",
299299
PostalCode: "80805",
300300
Country: "Germany",
301301
Phone: "089-0877310",
@@ -307,7 +307,7 @@ export const DATA = [
307307
ContactTitle: "Marketing Manager",
308308
Address: "54, rue Royale",
309309
City: "Nantes",
310-
Region: null,
310+
Region: "South",
311311
PostalCode: "44000",
312312
Country: "France",
313313
Phone: "40.32.21.21",
@@ -319,7 +319,7 @@ export const DATA = [
319319
ContactTitle: "Sales Representative",
320320
Address: "Via Monte Bianco 34",
321321
City: "Torino",
322-
Region: null,
322+
Region: "East",
323323
PostalCode: "10100",
324324
Country: "Italy",
325325
Phone: "011-4988260",

‎src/app/grid/custom-grid-paging-style/custom-grid-paging-style.component.scss‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ $my-primary: #231c2c;
55
$my-secondary: #d0ab23;
66
$dark-gray: #333;
77
$light-gray: #999;
8-
$inactive-color: #9b7829;
8+
$inactive-color: #826217;
99

1010
$dark-paginator: paginator-theme(
1111
$text-color: $my-secondary,
1212
$background-color: $my-primary,
1313
$border-color: $my-secondary
1414
);
1515

16-
$dark-button: icon-button-theme(
16+
$dark-button: flat-icon-button-theme(
1717
$foreground: $my-secondary,
1818
$hover-foreground: $dark-gray,
1919
$hover-background: $my-secondary,
@@ -59,13 +59,12 @@ $dark-drop-down-theme: drop-down-theme(
5959

6060
:host {
6161
::ng-deep {
62-
@include css-vars($dark-drop-down-theme);
63-
62+
@include css-vars($dark-drop-down-theme);
63+
6464
igx-paginator {
6565
@include css-vars($dark-button);
6666
@include css-vars($dark-input-group);
6767
@include css-vars($dark-select);
6868
}
6969
}
7070
}
71-

‎src/app/grid/grid-sample-pinning-both-sides/grid-toolbar-pinning-both-sides.component.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,25 @@ export class GridBothSideToolbarPinningSampleComponent implements OnInit {
4949

5050
public pinLeft() {
5151
this.grid1.selectedColumns().forEach((col: IgxColumnComponent) => {
52-
col.pinningPosition = ColumnPinningPosition.Start;
53-
col.pinned = true;
52+
if (col.pinned) {
53+
col.unpin();
54+
}
55+
col.pin(undefined, ColumnPinningPosition.Start);
5456
});
5557
}
58+
5659
public pinRight() {
5760
this.grid1.selectedColumns().forEach((col: IgxColumnComponent) => {
58-
col.pinningPosition = ColumnPinningPosition.End;
59-
col.pinned = true;
61+
if (col.pinned) {
62+
col.unpin();
63+
}
64+
col.pin(undefined, ColumnPinningPosition.End);
6065
});
6166
}
6267

6368
public unpinColumn() {
6469
this.grid1.selectedColumns().forEach((col: IgxColumnComponent) => {
65-
col.pinned = false;
70+
col.unpin();
6671
});
6772
}
6873
}

‎src/app/grid/grid-validator-service-cross-field/grid-validator-service-cross-field.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</div>
6262
}
6363
@if (!isRowValid(cell)) {
64-
<div [igxTooltipTarget]="tooltipRef" class="valid-image">
64+
<div [igxTooltipTarget]="tooltipRef" class="invalid-image">
6565
<img width="18" src="assets/images/grid/expired.png"/>
6666
</div>
6767
}

‎src/app/grid/grid-validator-service-cross-field/grid-validator-service-cross-field.component.scss‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
padding-bottom: 0;
44
}
55

6-
.valid-image {
7-
margin-left: -5px;
6+
.valid-image,
7+
.invalid-image {
8+
margin-left: -10px;
9+
10+
img {
11+
max-width: none;
12+
}
813
}
914

1015
.buttons-wrapper {

‎src/app/hierarchical-grid/hierarchical-grid-lod/hierarchical-grid-lod.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class HierarchicalGridLoDSampleComponent implements OnInit, AfterViewInit
6363
ignoreCase: false,
6464
condition: IgxNumberFilteringOperand.instance().condition('greaterThanOrEqualTo'),
6565
conditionName: IgxNumberFilteringOperand.instance().condition('greaterThanOrEqualTo').name,
66-
searchVal: '500'
66+
searchVal: 500
6767
});
6868

6969
const customersTree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Customers', ['customerId', 'companyName', 'contactName', 'contactTitle']);

‎src/app/hierarchical-grid/hierarchical-grid-paging-style/hierarchical-grid-paging-style.component.scss‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ $my-primary: #231c2c;
55
$my-secondary: #d0ab23;
66
$dark-gray: #333;
77
$light-gray: #999;
8-
$inactive-color: #9b7829;
8+
$inactive-color: #826217;
99

1010
$dark-paginator: paginator-theme(
1111
$text-color: $my-secondary,
1212
$background-color: $my-primary,
1313
$border-color: $my-secondary
1414
);
1515

16-
$dark-button: icon-button-theme(
16+
$dark-button: flat-icon-button-theme(
1717
$foreground: $my-secondary,
1818
$hover-foreground: $dark-gray,
1919
$hover-background: $my-secondary,
@@ -59,7 +59,7 @@ $dark-drop-down-theme: drop-down-theme(
5959

6060
:host {
6161
::ng-deep {
62-
@include css-vars($dark-drop-down-theme);
62+
@include css-vars($dark-drop-down-theme);
6363

6464
igx-paginator {
6565
@include css-vars($dark-button);
@@ -68,4 +68,3 @@ $dark-drop-down-theme: drop-down-theme(
6868
}
6969
}
7070
}
71-

0 commit comments

Comments
 (0)