Fix some tests.

This commit is contained in:
Will Hunt
2024-11-04 12:48:35 +00:00
parent c64c4e61d7
commit ece04fdd68
7 changed files with 31 additions and 83 deletions

View File

@@ -1,52 +0,0 @@
.raisedHandWidget {
display: flex;
background-color: var(--cpd-color-bg-subtle-primary);
border-radius: var(--cpd-radius-pill-effect);
color: var(--cpd-color-icon-secondary);
}
.raisedHandWidget > p {
padding: none;
margin-top: auto;
margin-bottom: auto;
width: 4em;
}
.raisedHandWidgetLarge > p {
padding: var(--cpd-space-2x);
}
.raisedHandLarge {
margin: var(--cpd-space-2x);
padding: var(--cpd-space-2x);
padding-block: var(--cpd-space-2x);
}
.raisedHand {
margin: var(--cpd-space-1x);
color: var(--cpd-color-icon-secondary);
background-color: var(--cpd-color-icon-secondary);
display: flex;
align-items: center;
border-radius: var(--cpd-radius-pill-effect);
user-select: none;
overflow: hidden;
box-shadow: var(--small-drop-shadow);
box-sizing: border-box;
max-inline-size: 100%;
max-width: fit-content;
}
.raisedHand > span {
width: var(--cpd-space-6x);
height: var(--cpd-space-6x);
display: inline-block;
text-align: center;
font-size: 16px;
}
.raisedHandLarge > span {
width: var(--cpd-space-8x);
height: var(--cpd-space-8x);
font-size: 22px;
}

View File

@@ -33,10 +33,10 @@ describe("RaisedHandIndicator", () => {
); );
expect(container.firstChild).toMatchSnapshot(); 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 dateTime = new Date();
const { container } = render( const { container } = render(
<RaisedHandIndicator raisedHandTime={dateTime} minature showTimer />, <RaisedHandIndicator raisedHandTime={dateTime} miniature showTimer />,
); );
expect(container.firstChild).toMatchSnapshot(); expect(container.firstChild).toMatchSnapshot();
}); });

View File

@@ -20,11 +20,11 @@ const durationFormatter = new DurationFormat(undefined, {
export function RaisedHandIndicator({ export function RaisedHandIndicator({
raisedHandTime, raisedHandTime,
minature, miniature,
showTimer, showTimer,
}: { }: {
raisedHandTime?: Date; raisedHandTime?: Date;
minature?: boolean; miniature?: boolean;
showTimer?: boolean; showTimer?: boolean;
}): ReactNode { }): ReactNode {
const [raisedHandDuration, setRaisedHandDuration] = useState(""); const [raisedHandDuration, setRaisedHandDuration] = useState("");
@@ -53,7 +53,7 @@ export function RaisedHandIndicator({
if (raisedHandTime) { if (raisedHandTime) {
return ( return (
<ReactionIndicator emoji="✋" minature={minature}> <ReactionIndicator emoji="✋" miniature={miniature}>
{showTimer && <p>{raisedHandDuration}</p>} {showTimer && <p>{raisedHandDuration}</p>}
</ReactionIndicator> </ReactionIndicator>
); );

View File

@@ -1,28 +1,28 @@
.raisedHandWidget { .reactionIndicatorWidget {
display: flex; display: flex;
background-color: var(--cpd-color-bg-subtle-primary); background-color: var(--cpd-color-bg-subtle-primary);
border-radius: var(--cpd-radius-pill-effect); border-radius: var(--cpd-radius-pill-effect);
color: var(--cpd-color-icon-secondary); color: var(--cpd-color-icon-secondary);
} }
.raisedHandWidget > p { .reactionIndicatorWidget > p {
padding: none; padding: none;
margin-top: auto; margin-top: auto;
margin-bottom: auto; margin-bottom: auto;
width: 4em; width: 4em;
} }
.raisedHandWidgetLarge > p { .reactionIndicatorWidgetLarge > p {
padding: var(--cpd-space-2x); padding: var(--cpd-space-2x);
} }
.raisedHandLarge { .reactionLarge {
margin: var(--cpd-space-2x); margin: var(--cpd-space-2x);
padding: var(--cpd-space-2x); padding: var(--cpd-space-2x);
padding-block: var(--cpd-space-2x); padding-block: var(--cpd-space-2x);
} }
.raisedHand { .reaction {
margin: var(--cpd-space-1x); margin: var(--cpd-space-1x);
color: var(--cpd-color-icon-secondary); color: var(--cpd-color-icon-secondary);
background-color: var(--cpd-color-icon-secondary); background-color: var(--cpd-color-icon-secondary);
@@ -37,7 +37,7 @@
max-width: fit-content; max-width: fit-content;
} }
.raisedHand > span { .reaction > span {
width: var(--cpd-space-6x); width: var(--cpd-space-6x);
height: var(--cpd-space-6x); height: var(--cpd-space-6x);
display: inline-block; display: inline-block;
@@ -45,7 +45,7 @@
font-size: 16px; font-size: 16px;
} }
.raisedHandLarge > span { .reactionLarge > span {
width: var(--cpd-space-8x); width: var(--cpd-space-8x);
height: var(--cpd-space-8x); height: var(--cpd-space-8x);
font-size: 22px; font-size: 22px;

View File

@@ -13,24 +13,24 @@ import styles from "./ReactionIndicator.module.css";
export function ReactionIndicator({ export function ReactionIndicator({
emoji, emoji,
minature, miniature,
children, children,
}: PropsWithChildren<{ }: PropsWithChildren<{
minature?: boolean; miniature?: boolean;
emoji: string; emoji: string;
}>): ReactNode { }>): ReactNode {
return ( return (
<div <div
className={classNames(styles.raisedHandWidget, { className={classNames(styles.reactionIndicatorWidget, {
[styles.raisedHandWidgetLarge]: !minature, [styles.reactionIndicatorWidgetLarge]: !miniature,
})} })}
> >
<div <div
className={classNames(styles.raisedHand, { className={classNames(styles.reaction, {
[styles.raisedHandLarge]: !minature, [styles.reactionLarge]: !miniature,
})} })}
> >
<span role="img" aria-label="raised hand"> <span role="img" aria-label="reaction indicator">
{emoji} {emoji}
</span> </span>
</div> </div>

View File

@@ -1,14 +1,14 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html // 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 <div
class="raisedHandWidget" class="reactionIndicatorWidget"
> >
<div <div
class="raisedHand" class="reaction"
> >
<span <span
aria-label="raised hand" aria-label="reaction indicator"
role="img" role="img"
> >
@@ -22,13 +22,13 @@ exports[`RaisedHandIndicator > renders a smaller indicator when minature is spec
exports[`RaisedHandIndicator > renders an indicator when a hand has been raised 1`] = ` exports[`RaisedHandIndicator > renders an indicator when a hand has been raised 1`] = `
<div <div
class="raisedHandWidget raisedHandWidgetLarge" class="reactionIndicatorWidget reactionIndicatorWidgetLarge"
> >
<div <div
class="raisedHand raisedHandLarge" class="reaction reactionLarge"
> >
<span <span
aria-label="raised hand" aria-label="reaction indicator"
role="img" role="img"
> >
@@ -42,13 +42,13 @@ exports[`RaisedHandIndicator > renders an indicator when a hand has been raised
exports[`RaisedHandIndicator > renders an indicator when a hand has been raised with the expected time 1`] = ` exports[`RaisedHandIndicator > renders an indicator when a hand has been raised with the expected time 1`] = `
<div <div
class="raisedHandWidget raisedHandWidgetLarge" class="reactionIndicatorWidget reactionIndicatorWidgetLarge"
> >
<div <div
class="raisedHand raisedHandLarge" class="reaction reactionLarge"
> >
<span <span
aria-label="raised hand" aria-label="reaction indicator"
role="img" role="img"
> >

View File

@@ -100,12 +100,12 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
<div className={styles.reactionSet}> <div className={styles.reactionSet}>
<RaisedHandIndicator <RaisedHandIndicator
raisedHandTime={raisedHandTime} raisedHandTime={raisedHandTime}
minature={avatarSize < 96} miniature={avatarSize < 96}
showTimer={handRaiseTimerVisible} showTimer={handRaiseTimerVisible}
/> />
{currentReaction && ( {currentReaction && (
<ReactionIndicator <ReactionIndicator
minature={avatarSize < 96} miniature={avatarSize < 96}
emoji={currentReaction.emoji} emoji={currentReaction.emoji}
/> />
)} )}