Merge pull request #11724 from ramonlsouza/userlist-rtl

Fix userlist RTL/LTR for userlist when language is changed
This commit is contained in:
Anton Georgiev 2021-03-24 11:50:10 -04:00 committed by GitHub
commit 8c6e7b8849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions

View File

@ -12,6 +12,7 @@ import {
} from 'react-virtualized';
import UserListItemContainer from './user-list-item/container';
import UserOptionsContainer from './user-options/container';
import Settings from '/imports/ui/services/settings';
const propTypes = {
compact: PropTypes.bool,
@ -135,6 +136,7 @@ class UserParticipants extends Component {
} = this.props;
const { scrollArea } = this.state;
const user = users[index];
const isRTL = Settings.application.isRTL;
return (
<CellMeasurer
@ -157,6 +159,7 @@ class UserParticipants extends Component {
currentUser,
meetingIsBreakout,
scrollArea,
isRTL,
}}
user={user}
getScrollContainerRef={this.getScrollContainerRef}

View File

@ -50,6 +50,7 @@ class UserListItem extends PureComponent {
notify,
raiseHandAudioAlert,
raiseHandPushAlert,
isRTL,
} = this.props;
const contents = (
@ -86,6 +87,7 @@ class UserListItem extends PureComponent {
notify,
raiseHandAudioAlert,
raiseHandPushAlert,
isRTL,
}}
/>
);

View File

@ -577,6 +577,7 @@ class UserDropdown extends PureComponent {
intl,
isThisMeetingLocked,
isMe,
isRTL,
} = this.props;
const {
@ -615,7 +616,7 @@ class UserDropdown extends PureComponent {
<div
data-test={isMe(user.userId) ? 'userListItemCurrent' : 'userListItem'}
className={!actions.length ? styles.userListItem : null}
style={{ direction: document.documentElement.dir }}
style={{ direction: isRTL ? 'rtl' : 'ltr' }}
>
<div className={styles.userItemContents}>
<div className={styles.userAvatar}>