Skip to content

Commit d23385f

Browse files
committed
Fix avatarMiddleware
1 parent f8c2274 commit d23385f

1 file changed

Lines changed: 10 additions & 14 deletions

File tree

packages/component/src/Composer.tsx

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,11 @@ const Composer = ({
369369
const { nonce, onTelemetry } = composerProps;
370370
const theme = useTheme();
371371

372-
const patchedActivityMiddleware = useMemo<readonly LegacyActivityMiddleware[] | undefined>(
373-
() =>
374-
activityMiddleware?.length || theme?.activityMiddleware?.length
375-
? Object.freeze([...singleToArray(activityMiddleware ?? []), ...theme.activityMiddleware])
376-
: undefined,
377-
[activityMiddleware, theme.activityMiddleware]
378-
);
372+
const patchedActivityMiddleware = useMemo<readonly LegacyActivityMiddleware[] | undefined>(() => {
373+
const middleware = Object.freeze([...singleToArray(activityMiddleware ?? []), ...theme.activityMiddleware]);
374+
375+
return middleware.length ? middleware : undefined;
376+
}, [activityMiddleware, theme.activityMiddleware]);
379377

380378
const patchedActivityStatusMiddleware = useMemo(
381379
() =>
@@ -407,13 +405,11 @@ const Composer = ({
407405
[attachmentMiddleware, theme.attachmentMiddleware]
408406
);
409407

410-
const patchedAvatarMiddleware = useMemo<readonly AvatarMiddleware[] | undefined>(
411-
() =>
412-
avatarMiddleware?.length || theme?.avatarMiddleware?.length
413-
? Object.freeze([...singleToArray(avatarMiddleware), ...theme.avatarMiddleware])
414-
: undefined,
415-
[avatarMiddleware, theme.avatarMiddleware]
416-
);
408+
const patchedAvatarMiddleware = useMemo<readonly AvatarMiddleware[] | undefined>(() => {
409+
const middleware = Object.freeze([...singleToArray(avatarMiddleware), ...theme.avatarMiddleware]);
410+
411+
return middleware.length ? middleware : undefined;
412+
}, [avatarMiddleware, theme.avatarMiddleware]);
417413

418414
const patchedCardActionMiddleware = useMemo(
419415
() =>

0 commit comments

Comments
 (0)