Merge branch 'livekit' into toger5/tiles_based_on_rtc_member

This commit is contained in:
Hugh Nimmo-Smith
2024-11-06 16:33:57 +00:00
7 changed files with 27 additions and 25 deletions

View File

@@ -33,10 +33,10 @@ describe("RaisedHandIndicator", () => {
);
expect(container.firstChild).toMatchSnapshot();
});
test("renders a smaller indicator when minature is specified", () => {
test("renders a smaller indicator when miniature is specified", () => {
const dateTime = new Date();
const { container } = render(
<RaisedHandIndicator raisedHandTime={dateTime} minature showTimer />,
<RaisedHandIndicator raisedHandTime={dateTime} miniature showTimer />,
);
expect(container.firstChild).toMatchSnapshot();
});

View File

@@ -27,12 +27,12 @@ const durationFormatter = new DurationFormat(undefined, {
export function RaisedHandIndicator({
raisedHandTime,
minature,
miniature,
showTimer,
onClick,
}: {
raisedHandTime?: Date;
minature?: boolean;
miniature?: boolean;
showTimer?: boolean;
onClick?: () => void;
}): ReactNode {
@@ -78,12 +78,12 @@ export function RaisedHandIndicator({
const content = (
<div
className={classNames(styles.raisedHandWidget, {
[styles.raisedHandWidgetLarge]: !minature,
[styles.raisedHandWidgetLarge]: !miniature,
})}
>
<div
className={classNames(styles.raisedHand, {
[styles.raisedHandLarge]: !minature,
[styles.raisedHandLarge]: !miniature,
})}
>
<span role="img" aria-label="raised hand">

View File

@@ -1,6 +1,6 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`RaisedHandIndicator > renders a smaller indicator when minature is specified 1`] = `
exports[`RaisedHandIndicator > renders a smaller indicator when miniature is specified 1`] = `
<div
class="raisedHandWidget"
>

View File

@@ -72,11 +72,7 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
<animated.div
className={classNames(styles.media, className, {
[styles.mirror]: mirror,
[styles.videoMuted]:
!videoEnabled ||
![EncryptionStatus.Connecting, EncryptionStatus.Okay].includes(
encryptionStatus,
),
[styles.videoMuted]: !videoEnabled,
})}
style={style}
ref={ref}
@@ -118,7 +114,7 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
)}
<RaisedHandIndicator
raisedHandTime={raisedHandTime}
minature={avatarSize < 96}
miniature={avatarSize < 96}
showTimer={handRaiseTimerVisible}
onClick={raisedHandOnClick}
/>