ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2026-05-23 02:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(unmute/track creation): pending indicator.

Browse Source
This commit is contained in:
Hristo Terezov
2023-05-18 14:16:37 -05:00
parent 06e86a2f3e
commit bb7ae777b0
20 changed files with 412 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
react/features/toolbox/components/web/VideoSettingsButton.tsx
View File

@@ -6,6 +6,7 @@ import { IReduxState } from '../../../app/types';
import { isMobileBrowser } from '../../../base/environment/utils';
import { translate } from '../../../base/i18n/functions';
import { IconArrowUp } from '../../../base/icons/svg';
import { IGUMPendingState } from '../../../base/media/types';
import ToolboxButtonWithIcon from '../../../base/toolbox/components/web/ToolboxButtonWithIcon';
import { getLocalJitsiVideoTrack } from '../../../base/tracks/functions.web';
import { toggleVideoSettings } from '../../../settings/actions';
@@ -22,6 +23,11 @@ interface IProps extends WithTranslation {
*/
buttonKey?: string;
/**
* The gumPending state from redux.
*/
gumPending: IGUMPendingState;
/**
* External handler for click action.
*/
@@ -91,9 +97,9 @@ class VideoSettingsButton extends Component<IProps> {
* @returns {boolean}
*/
_isIconDisabled() {
const { hasPermissions, hasVideoTrack, isDisabled } = this.props;
const { gumPending, hasPermissions, hasVideoTrack, isDisabled } = this.props;
return (!hasPermissions || isDisabled) && !hasVideoTrack;
return ((!hasPermissions || isDisabled) && !hasVideoTrack) || gumPending !== IGUMPendingState.NONE;
}
/**
@@ -131,7 +137,7 @@ class VideoSettingsButton extends Component<IProps> {
* @inheritdoc
*/
render() {
const { t, visible, isOpen, buttonKey, notifyMode } = this.props;
const { gumPending, t, visible, isOpen, buttonKey, notifyMode } = this.props;
return visible ? (
<VideoSettingsPopup>
@@ -142,7 +148,7 @@ class VideoSettingsButton extends Component<IProps> {
ariaLabel = { this.props.t('toolbar.videoSettings') }
buttonKey = { buttonKey }
icon = { IconArrowUp }
iconDisabled = { this._isIconDisabled() }
iconDisabled = { this._isIconDisabled() || gumPending !== IGUMPendingState.NONE }
iconId = 'video-settings-button'
iconTooltip = { t('toolbar.videoSettings') }
notifyMode = { notifyMode }
@@ -168,8 +174,10 @@ class VideoSettingsButton extends Component<IProps> {
function mapStateToProps(state: IReduxState) {
const { permissions = { video: false } } = state['features/base/devices'];
const { isNarrowLayout } = state['features/base/responsive-ui'];
const { gumPending } = state['features/base/media'].video;
return {
gumPending,
hasPermissions: permissions.video,
hasVideoTrack: Boolean(getLocalJitsiVideoTrack(state)),
isDisabled: isVideoSettingsButtonDisabled(state),