fix: microphone and camera select issue in legacy call (#12105)

Signed-off-by: Murat Ersin <muratersin@yahoo.com>
pull/28788/head^2
Murat Ersin 2024-01-04 17:44:37 +03:00 committed by GitHub
parent 9350583ecf
commit baaf8ad68b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 24 deletions

View File

@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React, { ComponentProps, createRef, useState } from "react"; import React, { ComponentProps, createRef, useState, forwardRef } from "react";
import classNames from "classnames"; import classNames from "classnames";
import { MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
@ -48,14 +48,8 @@ type ButtonProps = Omit<ComponentProps<typeof AccessibleTooltipButton>, "title"
offLabel?: string; offLabel?: string;
}; };
const LegacyCallViewToggleButton: React.FC<ButtonProps> = ({ const LegacyCallViewToggleButton = forwardRef<HTMLElement, ButtonProps>(
children, ({ children, state: isOn, className, onLabel, offLabel, ...props }, ref) => {
state: isOn,
className,
onLabel,
offLabel,
...props
}) => {
const classes = classNames("mx_LegacyCallViewButtons_button", className, { const classes = classNames("mx_LegacyCallViewButtons_button", className, {
mx_LegacyCallViewButtons_button_on: isOn, mx_LegacyCallViewButtons_button_on: isOn,
mx_LegacyCallViewButtons_button_off: !isOn, mx_LegacyCallViewButtons_button_off: !isOn,
@ -63,6 +57,7 @@ const LegacyCallViewToggleButton: React.FC<ButtonProps> = ({
return ( return (
<AccessibleTooltipButton <AccessibleTooltipButton
ref={ref}
className={classes} className={classes}
title={isOn ? onLabel : offLabel} title={isOn ? onLabel : offLabel}
alignment={Alignment.Top} alignment={Alignment.Top}
@ -71,7 +66,8 @@ const LegacyCallViewToggleButton: React.FC<ButtonProps> = ({
{children} {children}
</AccessibleTooltipButton> </AccessibleTooltipButton>
); );
}; },
);
interface IDropdownButtonProps extends ButtonProps { interface IDropdownButtonProps extends ButtonProps {
deviceKinds: MediaDeviceKindEnum[]; deviceKinds: MediaDeviceKindEnum[];