Skip to content

Commit f8c2274

Browse files
committed
Clean up polymiddleware array
1 parent 004af6c commit f8c2274

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

packages/api/src/hooks/Composer.tsx

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -477,11 +477,8 @@ const ComposerCore = ({
477477
[groupActivitiesMiddlewareFromProps]
478478
);
479479

480-
const polymiddlewareForLegacyAvatarMiddleware = useMemo<readonly Polymiddleware[] | undefined>(
481-
() =>
482-
avatarMiddleware
483-
? Object.freeze([createAvatarPolymiddlewareFromLegacy(...singleToArray(avatarMiddleware))])
484-
: undefined,
480+
const polymiddlewareForLegacyAvatarMiddleware = useMemo<Polymiddleware | undefined>(
481+
() => (avatarMiddleware ? createAvatarPolymiddlewareFromLegacy(...singleToArray(avatarMiddleware)) : undefined),
485482
[avatarMiddleware]
486483
);
487484

@@ -526,11 +523,9 @@ const ComposerCore = ({
526523
[scrollToEndButtonMiddleware]
527524
);
528525

529-
const polymiddlewareForLegacyActivityMiddleware = useMemo<readonly Polymiddleware[] | undefined>(
526+
const polymiddlewareForLegacyActivityMiddleware = useMemo<Polymiddleware | undefined>(
530527
() =>
531-
activityMiddleware
532-
? Object.freeze([createActivityPolymiddlewareFromLegacy(...singleToArray(activityMiddleware))])
533-
: undefined,
528+
activityMiddleware ? createActivityPolymiddlewareFromLegacy(...singleToArray(activityMiddleware)) : undefined,
534529
[activityMiddleware]
535530
);
536531

@@ -560,8 +555,8 @@ const ComposerCore = ({
560555
//
561556
// The simplest and logical move is #3: render legacy middleware before polymiddleware.
562557

563-
...(polymiddlewareForLegacyActivityMiddleware ?? []),
564-
...(polymiddlewareForLegacyAvatarMiddleware ?? []),
558+
...(polymiddlewareForLegacyActivityMiddleware ? [polymiddlewareForLegacyActivityMiddleware] : []),
559+
...(polymiddlewareForLegacyAvatarMiddleware ? [polymiddlewareForLegacyAvatarMiddleware] : []),
565560
...(polymiddlewareFromProps ?? []),
566561
activityFallbackPolymiddleware
567562
]),

0 commit comments

Comments
 (0)