Skip to content

fix: Broken UI - message input & settings menu #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AhyoungRyu merged 5 commits into from
Dec 2, 2024
Merged

fix: Broken UI - message input & settings menu #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65ac483
fixed broken UI on message input & channel settings operator menu
HoonBaek Dec 2, 2024
6af1b7f
Do not use useMemo
HoonBaek Dec 2, 2024
48a2583
Update MemberList.tsx
HoonBaek Dec 2, 2024
58396b6
Merge branch 'feat/state-mgmt-migration-1' into fix/CLNP-5910/Broken-…
AhyoungRyu Dec 2, 2024
7651047
Merge branch 'feat/state-mgmt-migration-1' into fix/CLNP-5910/Broken-…
HoonBaek Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/modules/ChannelSettings/components/ChannelSettingsUI/channel-settings-ui.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@
padding: 12px 22px 10px 56px;
@include themed() {
border-top: 1px solid t(on-bg-4);
&:last-child {
border-bottom: 1px solid t(on-bg-4);
}
}
&:focus {
outline: none;
Expand All @@ -71,7 +68,8 @@

.sendbird-channel-settings__panel-item__leave-channel {
@include themed() {
border-top: 0;
border-top: 1px solid t(on-bg-4);
border-bottom: 1px solid t(on-bg-4);
}
}

Expand Down
57 changes: 30 additions & 27 deletions src/modules/ChannelSettings/components/ModerationPanel/MemberList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export const MemberList = ({
const { state: { channel, forceUpdateUI } } = useChannelSettings();
const { stringSet } = useContext(LocalizationContext);

const isOperator = channel.myRole === Role.OPERATOR;
const refreshList = useCallback(() => {
if (!channel) {
setMembers([]);
Expand All @@ -60,35 +61,37 @@ export const MemberList = ({
channel,
size: 'small',
avatarSize: '24px',
renderListItemMenu: (props) => (
<UserListItemMenu {...props}
onToggleOperatorState={({ newStatus: isOperator }) => {
const newMembers = [...members];
for (const newMember of newMembers) {
if (newMember.userId === member.userId) {
newMember.role = isOperator ? Role.OPERATOR : Role.NONE;
break;
renderListItemMenu: isOperator
? (props) => (
<UserListItemMenu {...props}
onToggleOperatorState={({ newStatus: isOperator }) => {
const newMembers = [...members];
for (const newMember of newMembers) {
if (newMember.userId === member.userId) {
newMember.role = isOperator ? Role.OPERATOR : Role.NONE;
break;
}
}
}
setMembers(newMembers);
}}
onToggleMuteState={({ newStatus: isMuted }) => {
const newMembers = [...members];
for (const newMember of newMembers) {
if (newMember.userId === member.userId) {
newMember.isMuted = isMuted;
break;
setMembers(newMembers);
}}
onToggleMuteState={({ newStatus: isMuted }) => {
const newMembers = [...members];
for (const newMember of newMembers) {
if (newMember.userId === member.userId) {
newMember.isMuted = isMuted;
break;
}
}
}
setMembers(newMembers);
}}
onToggleBanState={() => {
setMembers(members.filter(({ userId }) => {
return userId !== member.userId;
}));
}}
/>
),
setMembers(newMembers);
}}
onToggleBanState={() => {
setMembers(members.filter(({ userId }) => {
return userId !== member.userId;
}));
}}
/>
)
: () => <></>,
})
}
</React.Fragment>
Expand Down
1 change: 1 addition & 0 deletions src/ui/MessageInput/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
font-style: normal;
line-height: 1.43;
max-height: 92px;
min-height: 58px;
overflow-y: scroll;
letter-spacing: normal;
padding: 18px 64px 18px 16px;
Expand Down