Skip to content

Commit 8e26889

Browse files
author
Konstantin Dinev
authored
Merge branch 'vNext' into didimmova/expansion-panel-samples
2 parents 57ecbd0 + e94ffb5 commit 8e26889

54 files changed

Lines changed: 11911 additions & 11926 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎live-editing/configs/app-dv-configs/DVHierarchicalGridConfig.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class DVHierarchicalGridConfigGenerator implements IConfigGenerator {
1515
const configs = new Array<Config>();
1616

1717
configs.push(new Config({
18-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts', '/src/app/hierarchical-grid/models.ts',
18+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts', '/src/app/hierarchical-grid/models.ts',
1919
'/projects/app-lob/src/_app-layout.scss', '/projects/app-lob/src/_variables.scss', '/src/app/services/remoteValues.service.ts'],
2020
additionalDependencies: ['igniteui-angular-charts', 'igniteui-angular-core'],
2121
appModuleConfig: new AppModuleConfig({

‎package-lock.json‎

Lines changed: 11331 additions & 11362 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
@@ -62,7 +62,7 @@
6262
"domino": "^2.1.4",
6363
"file-saver": "^2.0.2",
6464
"hammerjs": "^2.0.8",
65-
"igniteui-angular": "13.1.5",
65+
"igniteui-angular": "^13.2.0-rc.0",
6666
"igniteui-angular-charts": "^12.1.1",
6767
"igniteui-angular-core": "^12.1.1",
6868
"igniteui-angular-i18n": "^12.2.4",

‎projects/app-crm/src/index.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"
1515
integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
1616
</head>
17-
</head>
1817

1918
<body class="igx-typography igx-scrollbar">
2019
<app-root></app-root>
2120
</body>
2221

23-
</html>
22+
</html>

‎src/app/data-display/igxFor/igxFor-horizontal-sample/igxFor-horizontal.component.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
<igx-list-item [isHeader]="true">Contacts: {{(data | igxFilter: fo).length}} </igx-list-item>
1616
<div class="list-container" [style.width]="'880px'" [style.overflow]="'hidden'" [style.position]="'relative'">
1717
<igx-list-item
18+
style="overflow: hidden;"
19+
[style.min-width]="'220px'"
1820
[style.width]="'220px'"
21+
[style.max-width]="'220px'"
1922
*igxFor="let item of data | igxFilter: fo; scrollOrientation : 'horizontal'; containerSize: '880px'; itemSize: '220px'">
2023
<div class="item-container">
2124
<div class="contact">

‎src/app/data-display/igxFor/igxFor-horizontal-sample/igxFor-horizontal.component.scss‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
:host {
22
display: block;
33
padding: 16px;
4+
::ng-deep {
5+
.list-container {
6+
display: flex;
7+
flex-direction: column;
8+
padding: 16px 8px 0;
9+
> igx-display-container {
10+
flex-direction: row;
11+
overflow: visible;
12+
}
13+
}
14+
}
415
}
516

617
.sample-content{
@@ -21,12 +32,6 @@
2132
0px 2px 1px -1px rgba(0, 0, 0, 0.12);
2233
}
2334

24-
.list-container {
25-
display: flex;
26-
flex-direction: column;
27-
padding: 16px 8px 0;
28-
}
29-
3035
.item-container {
3136
display: flex;
3237
justify-content: space-between;

‎src/app/grid/grid-batch-editing/grid-batch-editing-sample.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[rowEditable]="true">
44
<igx-column [editable]="false">
55
<ng-template igxCell let-cell="cell" let-val>
6-
<button igxButton (click)="cell.id.rowID"
6+
<button igxButton (click)="deleteRow(cell.id.rowID)"
77
[disabled]="cell.row.deleted">Delete</button>
88
</ng-template>
99
</igx-column>
@@ -48,4 +48,4 @@
4848
<button igxButton (click)="dialog.close()">Cancel</button>
4949
</div>
5050
</igx-dialog>
51-
</div>
51+
</div>

‎src/app/grid/grid-batch-editing/grid-batch-editing-sample.component.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ export class GridBatchEditingSampleComponent implements OnInit {
4141
});
4242
}
4343

44+
public deleteRow(id) {
45+
this.grid.deleteRow(id);
46+
}
47+
4448
public undo() {
4549
/* exit edit mode and commit changes */
4650
this.grid.endEdit(true);

‎src/app/grid/grid-cellSelection-sample/grid-cellSelection.component.html‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,7 @@
11
<div class="grid__wrapper">
2-
<span style="display: flex">
2+
<span class="button-group-wrapper">
33
<igx-buttongroup [values]="selectionModes" (selected)="selectCellSelectionMode($event)"></igx-buttongroup>
4-
<igx-snackbar #snackbar actionText="Got it. Thanks!" (clicked)="snackbar.close()">
5-
<div class="container">
6-
<igx-icon>notification_important</igx-icon>
7-
<ng-container *ngIf="selectionMode === 'multiple'">
8-
<ul>
9-
<li><b>This is the default selection behavior.</b></li>
10-
<li>Click on a cell and while pressing the mouse key perform drag action.
11-
</li>
12-
<li>Select a cell and press Shift + Arrow down key, this will start range selection as well.</li>
13-
</ul>
14-
</ng-container>
15-
<ng-container *ngIf="selectionMode === 'single'">
16-
<ul>
17-
<li><b>Now you can select only one cell within the grid.</b></li>
18-
<li>On single cell click the previous selection state will be cleared.</li>
19-
<li>The mouse drag will not work and instead of selecting a cell, this will make default text selection.</li>
20-
</ul>
21-
</ng-container>
22-
<ng-container *ngIf="selectionMode === 'none'">
23-
<ul>
24-
<li><b>Now you are unable to select a cell while interacting with grid UI.</b></li>
25-
<li>If you need to select a cell, you can use the grid API methods.</li>
26-
</ul>
27-
</ng-container>
28-
</div>
29-
</igx-snackbar>
304
</span>
31-
<br />
325
<igx-grid igxPreventDocumentScroll #grid [data]="data" [height]="'600px'" [width]="'100%'" [cellSelection]="selectionMode">
336
<igx-column [field]="'ProductID'"></igx-column>
347
<igx-column [field]="'ProductName'"></igx-column>
@@ -38,4 +11,31 @@
3811
</igx-column>
3912
<igx-column [field]="'OrderDate'" [dataType]="'date'"></igx-column>
4013
</igx-grid>
41-
</div>
14+
</div>
15+
16+
<igx-snackbar #snackbar actionText="Got it. Thanks!" (clicked)="snackbar.close()">
17+
<div class="container">
18+
<igx-icon>notification_important</igx-icon>
19+
<ng-container *ngIf="selectionMode === 'multiple'">
20+
<ul>
21+
<li><b>This is the default selection behavior.</b></li>
22+
<li>Click on a cell and while pressing the mouse key perform drag action.
23+
</li>
24+
<li>Select a cell and press Shift + Arrow down key, this will start range selection as well.</li>
25+
</ul>
26+
</ng-container>
27+
<ng-container *ngIf="selectionMode === 'single'">
28+
<ul>
29+
<li><b>Now you can select only one cell within the grid.</b></li>
30+
<li>On single cell click the previous selection state will be cleared.</li>
31+
<li>The mouse drag will not work and instead of selecting a cell, this will make default text selection.</li>
32+
</ul>
33+
</ng-container>
34+
<ng-container *ngIf="selectionMode === 'none'">
35+
<ul>
36+
<li><b>Now you are unable to select a cell while interacting with grid UI.</b></li>
37+
<li>If you need to select a cell, you can use the grid API methods.</li>
38+
</ul>
39+
</ng-container>
40+
</div>
41+
</igx-snackbar>

‎src/app/grid/grid-cellSelection-sample/grid-cellSelection.component.scss‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77
position: relative;
88
}
99

10-
igx-snackbar {
11-
position: absolute;
12-
top: 0;
13-
right: 0;
14-
left: 0;
15-
z-index: 2;
10+
.button-group-wrapper {
11+
margin-bottom: 16px;
1612
}
1713

1814
.igx-snackbar {
@@ -24,4 +20,4 @@ igx-snackbar {
2420
igx-icon {
2521
margin: 20px;
2622
}
27-
}
23+
}

0 commit comments

Comments
 (0)