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

fix: Stage filmstrip (#11495)

This commit is contained in:
Robert Pintilii 2022-05-05 12:20:20 +03:00 committed by GitHub
parent 5b86182f94
commit bb0d3b4c66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
react/features/filmstrip/reducer.js
View File

@ -59,7 +59,7 @@ const DEFAULT_STATE = {
* @public * @public
* @type {Number} * @type {Number}
*/ */
maxStageParticipants: 4, maxStageParticipants: 1,
/** /**
* The custom audio volume levels per participant. * The custom audio volume levels per participant.

6
react/features/settings/components/web/MoreTab.js
View File

@ -531,7 +531,11 @@ class MoreTab extends AbstractDialogTab<Props, State> {
* @returns {ReactElement} * @returns {ReactElement}
*/ */
_renderMaxStageParticipantsSelect() { _renderMaxStageParticipantsSelect() {
const { maxStageParticipants, t } = this.props; const { maxStageParticipants, t, stageFilmstripEnabled } = this.props;
if (!stageFilmstripEnabled) {
return null;
}
const maxParticipantsItems = Array(MAX_ACTIVE_PARTICIPANTS).fill(0) const maxParticipantsItems = Array(MAX_ACTIVE_PARTICIPANTS).fill(0)
.map((no, index) => ( .map((no, index) => (
<DropdownItem <DropdownItem

5
react/features/settings/functions.js
View File

@ -12,6 +12,7 @@ import { toState } from '../base/redux';
import { getHideSelfView } from '../base/settings'; import { getHideSelfView } from '../base/settings';
import { parseStandardURIString } from '../base/util'; import { parseStandardURIString } from '../base/util';
import { getBreakoutRoomsConfig, isInBreakoutRoom } from '../breakout-rooms/functions'; import { getBreakoutRoomsConfig, isInBreakoutRoom } from '../breakout-rooms/functions';
import { isStageFilmstripEnabled } from '../filmstrip/functions';
import { isFollowMeActive } from '../follow-me'; import { isFollowMeActive } from '../follow-me';
import { isReactionsEnabled } from '../reactions/functions.any'; import { isReactionsEnabled } from '../reactions/functions.any';
@ -116,6 +117,7 @@ export function getMoreTabProps(stateful: Object | Function) {
const language = i18next.language || DEFAULT_LANGUAGE; const language = i18next.language || DEFAULT_LANGUAGE;
const configuredTabs = interfaceConfig.SETTINGS_SECTIONS || []; const configuredTabs = interfaceConfig.SETTINGS_SECTIONS || [];
const enabledNotifications = getNotificationsMap(stateful); const enabledNotifications = getNotificationsMap(stateful);
const stageFilmstripEnabled = isStageFilmstripEnabled(state);
// when self view is controlled by the config we hide the settings // when self view is controlled by the config we hide the settings
const { disableSelfView, disableSelfViewSettings } = state['features/base/config']; const { disableSelfView, disableSelfViewSettings } = state['features/base/config'];
@ -132,7 +134,8 @@ export function getMoreTabProps(stateful: Object | Function) {
showNotificationsSettings: Object.keys(enabledNotifications).length > 0, showNotificationsSettings: Object.keys(enabledNotifications).length > 0,
showPrejoinPage: !state['features/base/settings'].userSelectedSkipPrejoin, showPrejoinPage: !state['features/base/settings'].userSelectedSkipPrejoin,
showPrejoinSettings: state['features/base/config'].prejoinConfig?.enabled, showPrejoinSettings: state['features/base/config'].prejoinConfig?.enabled,
maxStageParticipants: state['features/filmstrip'].maxStageParticipants maxStageParticipants: state['features/filmstrip'].maxStageParticipants,
stageFilmstripEnabled
}; };
} }