Skip to content

Commit f2d5067

Browse files
ChronosSFChronosSF
authored
Merge pull request #3527 from IgniteUI/vnext
Merging vnext to master to add latest fixes
2 parents bcaaaff + f19cdce commit f2d5067

15 files changed

+224
-252
lines changed

‎package-lock.json

Lines changed: 8 additions & 8 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
@@ -65,7 +65,7 @@
6565
"bootstrap": "5.3.2",
6666
"file-saver": "^2.0.2",
6767
"hammerjs": "^2.0.8",
68-
"igniteui-angular": "^18.1.0",
68+
"igniteui-angular": "^18.1.7",
6969
"igniteui-angular-charts": "^18.0.0",
7070
"igniteui-angular-core": "^18.0.0",
7171
"igniteui-angular-extras": "^18.0.5",

‎src/app/grid/grid-external-excel-style-filtering/grid-external-excel-style-filtering.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</igx-select-item>
88
</igx-select>
99

10-
<igx-grid-excel-style-filtering [column]="grid1.getColumnByName(gridColums.value)">
10+
<igx-grid-excel-style-filtering [column]="grid1.getColumnByName(gridColums.value)" [maxHeight]="'590px'">
1111
</igx-grid-excel-style-filtering>
1212
</div>
1313

‎src/app/grid/grid-external-excel-style-filtering/grid-external-excel-style-filtering.component.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
display: flex;
33
flex-flow: row;
44
margin: 15px;
5+
column-gap: 5px;
56
}
67

78
.flex-column {
@@ -12,4 +13,4 @@
1213

1314
.igSelect {
1415
margin-left: 1px;
15-
}
16+
}

‎src/app/grid/grid-row-editing-style/grid-row-editing-style.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!--The following template can be omitted (grid handles this internally) but it is here as an example of custom cell editor.-->
88
<ng-template igxCellEditor let-cell="cell">
99
<igx-input-group>
10-
<input igxInput [igxFocus]='true' name="units" [(ngModel)]="cell.editValue" style="color: black" />
10+
<input igxInput type="number" [igxFocus]='true' name="units" [(ngModel)]="cell.editValue" style="color: black" />
1111
</igx-input-group>
1212
</ng-template>
1313
</igx-column>

‎src/app/hierarchical-grid/hierarchical-grid-external-excel-style-filtering/hierarchical-grid-external-excel-style-filtering.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</igx-select-item>
88
</igx-select>
99

10-
<igx-grid-excel-style-filtering [column]="hierarchicalGrid.getColumnByName(gridColums.value)">
10+
<igx-grid-excel-style-filtering [column]="hierarchicalGrid.getColumnByName(gridColums.value)" [maxHeight]="'590px'">
1111
</igx-grid-excel-style-filtering>
1212
</div>
1313

‎src/app/hierarchical-grid/hierarchical-grid-external-excel-style-filtering/hierarchical-grid-external-excel-style-filtering.component.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
margin: 15px;
33
display: flex;
44
flex-flow: row;
5+
column-gap: 5px;
56
}
67

78
.photo {
@@ -21,4 +22,4 @@
2122

2223
.igSelect {
2324
margin-left: 1px;
24-
}
25+
}

‎src/app/lists/list/list-chat-sample/list-chat-sample.component.html

Lines changed: 90 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,99 @@
1-
<div class="chat-sample-wrapper">
2-
<form class="chat-sample__form">
3-
<igx-list #list>
4-
<ng-template #othersMessage let-message="message" let-contact="contact" let-messageIndex="index">
5-
<igx-list-item class="contact" *ngIf="isFirstMessage(messageIndex)">
6-
<div class="contact__panel">
7-
<igx-avatar [src]="contact.photo" shape="circle"></igx-avatar>
8-
<span class="message__info">
9-
{{ contact.name }}, {{ message.timestamp | date: 'shortTime'}}
1+
<form #form class="sample-form">
2+
<igx-list #list>
3+
<ng-template
4+
#othersMessage
5+
let-message="message"
6+
let-contact="contact"
7+
let-messageIndex="index"
8+
>
9+
<igx-list-item class="contact" *ngIf="isFirstMessage(messageIndex)">
10+
<section class="contact__panel">
11+
<igx-avatar
12+
[src]="contact.photo"
13+
shape="circle"
14+
></igx-avatar>
15+
<header class="message__info">
16+
<h6>{{ contact.name }}</h6>
17+
<span>
18+
{{ message.timestamp | date: "shortTime" }}
1019
</span>
11-
</div>
12-
</igx-list-item>
13-
<igx-list-item [ngClass]="{
14-
'others-message': true,
15-
'others-message--first': isFirstMessage(messageIndex)}">
16-
<span>
17-
{{ message.message }}
18-
</span>
19-
</igx-list-item>
20-
</ng-template>
21-
<ng-template #myMessage let-message="message" let-messageIndex="index">
22-
<igx-list-item class="contact" *ngIf="isFirstMessage(messageIndex)">
23-
<span class="my-message__info">
24-
{{ message.timestamp | date: 'shortTime'}}
20+
</header>
21+
</section>
22+
</igx-list-item>
23+
<igx-list-item>
24+
<div
25+
[ngClass]="{
26+
message: true,
27+
'other-message': true,
28+
'other-message--first': isFirstMessage(messageIndex)
29+
}"
30+
>
31+
<span>{{ message.message }}</span>
32+
</div>
33+
</igx-list-item>
34+
</ng-template>
35+
<ng-template #myMessage let-message="message" let-messageIndex="index">
36+
<igx-list-item class="contact" *ngIf="isFirstMessage(messageIndex)">
37+
<header class="own-message message__info">
38+
<h6>You</h6>
39+
<span class="message__info">
40+
{{ message.timestamp | date: "shortTime" }}
2541
</span>
26-
</igx-list-item>
27-
<igx-list-item class="my-message" [ngClass]="{
28-
'my-message': true,
29-
'my-message--first': isFirstMessage(messageIndex)}">
42+
</header>
43+
</igx-list-item>
44+
<igx-list-item>
45+
<div
46+
[ngClass]="{
47+
message: true,
48+
'own-message': true,
49+
'own-message--first': isFirstMessage(messageIndex)
50+
}"
51+
>
3052
<span>
3153
{{ message.message }}
3254
</span>
33-
</igx-list-item>
34-
</ng-template>
55+
</div>
56+
</igx-list-item>
57+
</ng-template>
3558

36-
<ng-container *ngFor="let message of messagesService.getMessages(); index as i">
37-
<ng-container *ngTemplateOutlet="getMessageTemplate(message); context: {message: message, contact: contactsService.getContact(message.authorId), index: i}">
38-
</ng-container>
59+
<ng-container
60+
*ngFor="let message of messagesService.getMessages(); index as i"
61+
>
62+
<ng-container
63+
*ngTemplateOutlet="
64+
getMessageTemplate(message);
65+
context: {
66+
message: message,
67+
contact: contactsService.getContact(message.authorId),
68+
index: i
69+
}
70+
"
71+
>
3972
</ng-container>
40-
</igx-list>
73+
</ng-container>
74+
</igx-list>
75+
76+
<div class="overflow-anchor"></div>
77+
78+
<div class="massage-field">
79+
<igx-input-group type="box">
80+
<input
81+
#newMessage
82+
igxInput
83+
name="newMessage"
84+
placeholder="Send message"
85+
autocomplete="off"
86+
[(ngModel)]="message"
87+
(keypress)="onMessageKeypress($event)"
88+
/>
4189

42-
<div class="chat-massage-field">
43-
<igx-input-group class="chat-input-group" type="box">
44-
<input class="input-round-box" placeholder="Send message" autocomplete="off" igxInput #newMessage name="newMessage"
45-
[(ngModel)]="message" (keypress)="onMessageKeypress($event)" />
46-
</igx-input-group>
47-
<button class="send-message-button" igxIconButton="flat"
48-
igxRipple="#09f" [igxRippleCentered]="true" (click)="onSendButtonClick()">
49-
<igx-icon family="material">send</igx-icon>
90+
<button
91+
igxSuffix
92+
igxIconButton="flat"
93+
(click)="onSendButtonClick()"
94+
>
95+
<igx-icon name="send" family="material"></igx-icon>
5096
</button>
51-
</div>
52-
</form>
53-
</div>
97+
</igx-input-group>
98+
</div>
99+
</form>

0 commit comments

Comments
 (0)