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

fix(filmstrip) Fix resizing on chat toggle (#11305) 

Fix pinned indicator to be displayed only for pinned participants
This commit is contained in:
Robert Pintilii 2022-04-04 15:39:32 +03:00 committed by GitHub
parent d415d02f35
commit 4b84f71021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
react/features/filmstrip/components/web/Filmstrip.js
View File

@ -18,7 +18,6 @@ import { translate } from '../../../base/i18n';
import { Icon, IconMenuDown, IconMenuUp } from '../../../base/icons'; import { Icon, IconMenuDown, IconMenuUp } from '../../../base/icons';
import { connect } from '../../../base/redux'; import { connect } from '../../../base/redux';
import { shouldHideSelfView } from '../../../base/settings/functions.any'; import { shouldHideSelfView } from '../../../base/settings/functions.any';
import { CHAT_SIZE } from '../../../chat';
import { showToolbox } from '../../../toolbox/actions.web'; import { showToolbox } from '../../../toolbox/actions.web';
import { isButtonEnabled, isToolboxVisible } from '../../../toolbox/functions.web'; import { isButtonEnabled, isToolboxVisible } from '../../../toolbox/functions.web';
import { LAYOUTS } from '../../../video-layout'; import { LAYOUTS } from '../../../video-layout';
@ -58,11 +57,6 @@ type Props = {
*/ */
_className: string, _className: string,
/**
* Whether or not the chat is open.
*/
_chatOpen: boolean,
/** /**
* The current layout of the filmstrip. * The current layout of the filmstrip.
*/ */
@ -305,7 +299,6 @@ class Filmstrip extends PureComponent <Props, State> {
render() { render() {
const filmstripStyle = { }; const filmstripStyle = { };
const { const {
_chatOpen,
_currentLayout, _currentLayout,
_disableSelfView, _disableSelfView,
_resizableFilmstrip, _resizableFilmstrip,
@ -329,7 +322,7 @@ class Filmstrip extends PureComponent <Props, State> {
} }
case LAYOUTS.TILE_VIEW: { case LAYOUTS.TILE_VIEW: {
if (_stageFilmstrip && _visible) { if (_stageFilmstrip && _visible) {
filmstripStyle.maxWidth = `calc(100% - ${_verticalViewMaxWidth}px - ${_chatOpen ? CHAT_SIZE : 0}px)`; filmstripStyle.maxWidth = `calc(100% - ${_verticalViewMaxWidth}px)`;
} }
break; break;
} }

4
react/features/filmstrip/components/web/PinnedIndicator.js
View File

@ -6,7 +6,6 @@ import { useSelector } from 'react-redux';
import { IconPinParticipant } from '../../../base/icons'; import { IconPinParticipant } from '../../../base/icons';
import { BaseIndicator } from '../../../base/react'; import { BaseIndicator } from '../../../base/react';
import { getActiveParticipantsIds } from '../../functions.web';
/** /**
* The type of the React {@code Component} props of {@link PinnedIndicator}. * The type of the React {@code Component} props of {@link PinnedIndicator}.
@ -53,7 +52,8 @@ const PinnedIndicator = ({
participantId, participantId,
tooltipPosition tooltipPosition
}: Props) => { }: Props) => {
const isPinned = useSelector(getActiveParticipantsIds).find(id => id === participantId); const isPinned = useSelector(state => state['features/filmstrip'].activeParticipants)
.find(p => p.id === participantId && p.pinned);
const styles = useStyles(); const styles = useStyles();
if (!isPinned) { if (!isPinned) {