Skip to content

Commit 99aa96c

Browse files
authored
fix: [main branch] Broken UI - message input & settings menu (#1265)
[CLNP-5910](https://sendbird.atlassian.net/browse/CLNP-5910) [CLNP-5909](https://sendbird.atlassian.net/browse/CLNP-5909) * fixed broken UI on message input & channel settings operator menu
1 parent 813c71f commit 99aa96c

File tree

3 files changed

+33
-31
lines changed

3 files changed

+33
-31
lines changed

src/modules/ChannelSettings/components/ChannelSettingsUI/channel-settings-ui.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@
5757
padding: 12px 22px 10px 56px;
5858
@include themed() {
5959
border-top: 1px solid t(on-bg-4);
60-
&:last-child {
61-
border-bottom: 1px solid t(on-bg-4);
62-
}
6360
}
6461
&:focus {
6562
outline: none;
@@ -71,7 +68,8 @@
7168

7269
.sendbird-channel-settings__panel-item__leave-channel {
7370
@include themed() {
74-
border-top: 0;
71+
border-top: 1px solid t(on-bg-4);
72+
border-bottom: 1px solid t(on-bg-4);
7573
}
7674
}
7775

src/modules/ChannelSettings/components/ModerationPanel/MemberList.tsx

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export const MemberList = ({
3737
} = useChannelSettingsContext();
3838
const { stringSet } = useContext(LocalizationContext);
3939

40+
const isOperator = channel.myRole === Role.OPERATOR;
4041
const refreshList = useCallback(() => {
4142
if (!channel) {
4243
setMembers([]);
@@ -63,35 +64,37 @@ export const MemberList = ({
6364
channel,
6465
size: 'small',
6566
avatarSize: '24px',
66-
renderListItemMenu: (props) => (
67-
<UserListItemMenu {...props}
68-
onToggleOperatorState={({ newStatus: isOperator }) => {
69-
const newMembers = [...members];
70-
for (const newMember of newMembers) {
71-
if (newMember.userId === member.userId) {
72-
newMember.role = isOperator ? Role.OPERATOR : Role.NONE;
73-
break;
67+
renderListItemMenu: isOperator
68+
? (props) => (
69+
<UserListItemMenu {...props}
70+
onToggleOperatorState={({ newStatus: isOperator }) => {
71+
const newMembers = [...members];
72+
for (const newMember of newMembers) {
73+
if (newMember.userId === member.userId) {
74+
newMember.role = isOperator ? Role.OPERATOR : Role.NONE;
75+
break;
76+
}
7477
}
75-
}
76-
setMembers(newMembers);
77-
}}
78-
onToggleMuteState={({ newStatus: isMuted }) => {
79-
const newMembers = [...members];
80-
for (const newMember of newMembers) {
81-
if (newMember.userId === member.userId) {
82-
newMember.isMuted = isMuted;
83-
break;
78+
setMembers(newMembers);
79+
}}
80+
onToggleMuteState={({ newStatus: isMuted }) => {
81+
const newMembers = [...members];
82+
for (const newMember of newMembers) {
83+
if (newMember.userId === member.userId) {
84+
newMember.isMuted = isMuted;
85+
break;
86+
}
8487
}
85-
}
86-
setMembers(newMembers);
87-
}}
88-
onToggleBanState={() => {
89-
setMembers(members.filter(({ userId }) => {
90-
return userId !== member.userId;
91-
}));
92-
}}
93-
/>
94-
),
88+
setMembers(newMembers);
89+
}}
90+
onToggleBanState={() => {
91+
setMembers(members.filter(({ userId }) => {
92+
return userId !== member.userId;
93+
}));
94+
}}
95+
/>
96+
)
97+
: () => <></>,
9598
})
9699
}
97100
</React.Fragment>

src/ui/MessageInput/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
font-style: normal;
1616
line-height: 1.43;
1717
max-height: 92px;
18+
min-height: 58px;
1819
overflow-y: scroll;
1920
letter-spacing: normal;
2021
padding: 18px 64px 18px 16px;

0 commit comments

Comments
 (0)