Merge pull request #5 from mariogasparoni/small-fixes-on-13015

chore(audio): small fixes on "Update media selection dropdown" #13015
This commit is contained in:
KDSBrowne 2021-08-30 11:14:42 -04:00 committed by GitHub
commit e8d68795cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions

View File

@ -131,7 +131,7 @@ class AudioControls extends PureComponent {
ghost={!inAudio}
icon={joinIcon}
size="lg"
circle
circle
accessKey={inAudio ? shortcuts.leaveaudio : shortcuts.joinaudio}
/>
);
@ -157,7 +157,8 @@ class AudioControls extends PureComponent {
if (_enableDynamicDeviceSelection) {
return AudioControls.renderLeaveButtonWithLiveStreamSelector(this
.props);
}
}
return this.renderLeaveButtonWithoutLiveStreamSelector();
}
@ -188,7 +189,7 @@ class AudioControls extends PureComponent {
className={cx(styles.muteToggle, !talking || styles.glow, !muted || styles.btn)}
onClick={handleToggleMuteMicrophone}
disabled={disable}
hideLabel
hideLabel
label={label}
aria-label={label}
color={!muted ? 'primary' : 'default'}

View File

@ -219,6 +219,7 @@ class InputStreamLiveSelector extends Component {
label: title,
disabled: true,
dividerTop: (!renderSeparator),
onClick: () => {},
},
];
const deviceList = (listLength > 0)
@ -238,6 +239,7 @@ class InputStreamLiveSelector extends Component {
? intl.formatMessage(intlMessages.loading)
: intl.formatMessage(intlMessages.noDeviceFound),
className: styles.disableDeviceSelection,
onClick: () => {},
},
];
return listTitle.concat(deviceList);

View File

@ -36,13 +36,17 @@ const defaultProps = {
};
const ButtonEmoji = (props) => {
const {
hideLabel,
...newProps
} = props;
const {
emoji,
label,
tabIndex,
hideLabel,
onClick,
} = props;
} = newProps;
const IconComponent = (
<Icon
@ -55,8 +59,9 @@ const ButtonEmoji = (props) => {
<span>
<TooltipContainer title={label}>
<button
type="button"
tabIndex={tabIndex}
{...props}
{...newProps}
className={styles.emojiButton}
aria-label={label}
onClick={onClick}