From 4cca83b20258fe8cfecbc2177d461b89b88ec4b3 Mon Sep 17 00:00:00 2001 From: Ramon Souza <contato@ramonsouza.com> Date: Tue, 23 Mar 2021 17:30:51 -0300 Subject: [PATCH] fix userlist rtl/ltr when language is changed --- .../user-list-content/user-participants/component.jsx | 3 +++ .../user-participants/user-list-item/component.jsx | 2 ++ .../user-list-item/user-dropdown/component.jsx | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx index e918f217c2..d0ad95959a 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/component.jsx @@ -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} diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx index 66981efbd1..6c23eca09b 100644 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx @@ -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, }} /> ); diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx index fe9f8f1980..1741728708 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx @@ -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}> -- GitLab