Skip to content

Commit f43d1f8

Browse files
authored
Merge pull request #10 from GetStream/angular-sdk-compatibility-sprint2
Angular SDK compatibility - sprint2
2 parents 588a0db + 35ffe7a commit f43d1f8

5 files changed

Lines changed: 26 additions & 4 deletions

File tree

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
node_modules
2+
build
3+
dist

.prettierrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"arrowParens": "always",
3+
"jsxSingleQuote": true,
4+
"printWidth": 100,
5+
"singleQuote": true,
6+
"tabWidth": 2,
7+
"trailingComma": "all"
8+
}
9+

src/styles/Avatar.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
&--top,
7171
&--middle {
7272
.str-chat__message {
73-
> .str-chat__avatar {
73+
> .str-chat__avatar,
74+
> .str-chat-angular__avatar-host {
7475
visibility: hidden;
7576
}
7677
}

src/styles/MessageList.scss

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
.str-chat__list {
2-
flex: 1;
1+
%scrollable {
32
overflow-x: hidden;
43
overflow-y: auto;
4+
}
5+
6+
.str-chat-angular__message-list-host {
7+
@extend %scrollable;
8+
}
9+
10+
.str-chat__list {
11+
@extend %scrollable;
12+
flex: 1;
513
-webkit-overflow-scrolling: touch; /* enable smooth scrolling on ios */
614
padding: 0;
715

src/styles/_base.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ $emoji-flag-unicode-range: U+1F1E6-1F1FF;
125125
height: 100%;
126126
display: flex;
127127

128-
.str-chat__main-panel {
128+
.str-chat__main-panel,
129+
.str-chat-angular__main-panel-inner {
129130
height: 100%;
130131
width: 100%;
131132
min-width: 250px;

0 commit comments

Comments
 (0)