haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show reactions buttons at all times 

Don't send reactions via the channel if there's only one participant in the meeting
This commit is contained in:
robertpin 2021-09-14 11:15:03 +03:00 committed by vp8x8
parent b801e0115d
commit 61c3613de0
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
react/features/reactions/components/native/ReactionMenu.js
View File

@ -5,7 +5,6 @@ import { View } from 'react-native';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { ColorSchemeRegistry } from '../../../base/color-scheme'; import { ColorSchemeRegistry } from '../../../base/color-scheme';
import { getParticipantCount } from '../../../base/participants';
import { REACTIONS } from '../../constants'; import { REACTIONS } from '../../constants';
import RaiseHandButton from './RaiseHandButton'; import RaiseHandButton from './RaiseHandButton';
@ -37,20 +36,17 @@ function ReactionMenu({
overflowMenu overflowMenu
}: Props) { }: Props) {
const _styles = useSelector(state => ColorSchemeRegistry.get(state, 'Toolbox')); const _styles = useSelector(state => ColorSchemeRegistry.get(state, 'Toolbox'));
const _participantCount = useSelector(state => getParticipantCount(state));
return ( return (
<View style = { overflowMenu ? _styles.overflowReactionMenu : _styles.reactionMenu }> <View style = { overflowMenu ? _styles.overflowReactionMenu : _styles.reactionMenu }>
{_participantCount > 1 <View style = { _styles.reactionRow }>
&& <View style = { _styles.reactionRow }> {Object.keys(REACTIONS).map(key => (
{Object.keys(REACTIONS).map(key => ( <ReactionButton
<ReactionButton key = { key }
key = { key } reaction = { key }
reaction = { key } styles = { _styles.reactionButton } />
styles = { _styles.reactionButton } /> ))}
))} </View>
</View>
}
<RaiseHandButton onCancel = { onCancel } /> <RaiseHandButton onCancel = { onCancel } />
</View> </View>
); );

16
react/features/reactions/components/web/ReactionsMenu.js
View File

@ -9,7 +9,7 @@ import {
sendAnalytics sendAnalytics
} from '../../../analytics'; } from '../../../analytics';
import { translate } from '../../../base/i18n'; import { translate } from '../../../base/i18n';
import { getLocalParticipant, getParticipantCount, participantUpdated } from '../../../base/participants'; import { getLocalParticipant, participantUpdated } from '../../../base/participants';
import { connect } from '../../../base/redux'; import { connect } from '../../../base/redux';
import { dockToolbox } from '../../../toolbox/actions.web'; import { dockToolbox } from '../../../toolbox/actions.web';
import { addReactionToBuffer } from '../../actions.any'; import { addReactionToBuffer } from '../../actions.any';
@ -20,11 +20,6 @@ import ReactionButton from './ReactionButton';
type Props = { type Props = {
/**
* The number of conference participants.
*/
_participantCount: number,
/** /**
* Used for translation. * Used for translation.
*/ */
@ -182,13 +177,13 @@ class ReactionsMenu extends Component<Props> {
* @inheritdoc * @inheritdoc
*/ */
render() { render() {
const { _participantCount, _raisedHand, t, overflowMenu } = this.props; const { _raisedHand, t, overflowMenu } = this.props;
return ( return (
<div className = { `reactions-menu ${overflowMenu ? 'overflow' : ''}` }> <div className = { `reactions-menu ${overflowMenu ? 'overflow' : ''}` }>
{ _participantCount > 1 && <div className = 'reactions-row'> <div className = 'reactions-row'>
{ this._getReactionButtons() } { this._getReactionButtons() }
</div> } </div>
<div className = 'raise-hand-row'> <div className = 'raise-hand-row'>
<ReactionButton <ReactionButton
accessibilityLabel = { t('toolbar.accessibilityLabel.raiseHand') } accessibilityLabel = { t('toolbar.accessibilityLabel.raiseHand') }
@ -217,8 +212,7 @@ function mapStateToProps(state) {
return { return {
_localParticipantID: localParticipant.id, _localParticipantID: localParticipant.id,
_raisedHand: localParticipant.raisedHand, _raisedHand: localParticipant.raisedHand
_participantCount: getParticipantCount(state)
}; };
} }

6
react/features/reactions/middleware.js
View File

@ -3,6 +3,7 @@
import { batch } from 'react-redux'; import { batch } from 'react-redux';
import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app'; import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app';
import { getParticipantCount } from '../base/participants';
import { MiddlewareRegistry } from '../base/redux'; import { MiddlewareRegistry } from '../base/redux';
import { updateSettings } from '../base/settings'; import { updateSettings } from '../base/settings';
import { playSound, registerSound, unregisterSound } from '../base/sounds'; import { playSound, registerSound, unregisterSound } from '../base/sounds';
@ -91,9 +92,12 @@ MiddlewareRegistry.register(store => next => action => {
case FLUSH_REACTION_BUFFER: { case FLUSH_REACTION_BUFFER: {
const state = getState(); const state = getState();
const { buffer } = state['features/reactions']; const { buffer } = state['features/reactions'];
const participantCount = getParticipantCount(state);
batch(() => { batch(() => {
dispatch(sendReactions()); if (participantCount > 1) {
dispatch(sendReactions());
}
dispatch(addReactionsToChat(getReactionMessageFromBuffer(buffer))); dispatch(addReactionsToChat(getReactionMessageFromBuffer(buffer)));
dispatch(pushReactions(buffer)); dispatch(pushReactions(buffer));
}); });