Clean up

Author: compulim

packages/api/src/types/AvatarMiddleware.ts

@@ -9,6 +9,8 @@ import ComponentMiddleware, { ComponentFactory } from './ComponentMiddleware';
 
 type AvatarComponentFactoryArguments = [
   {
+    // We need to keep the original polymiddleweare request while running inside legacy middleware.
+    // When we transit from legacy middleware back to polymiddleware, we can restore the request object.
     [__INTERNAL_DO_NOT_USE__legacyAvatarMiddlewareOriginalRequestSymbol]: AvatarPolymiddlewareRequest;
     activity: WebChatActivity;
     fromUser: boolean;

packages/component/src/Composer.tsx

@@ -376,7 +376,7 @@ const Composer = ({
   const { nonce, onTelemetry } = composerProps;
   const theme = useTheme();
 
-  const patchedActivityMiddleware = useMemo<readonly LegacyActivityMiddleware[]>(
+  const patchedActivityMiddleware = useMemoIterable<readonly LegacyActivityMiddleware[]>(
     () => Object.freeze([...singleToArray(activityMiddleware ?? []), ...theme.activityMiddleware]),
     [activityMiddleware, theme.activityMiddleware]
   );
@@ -481,7 +481,7 @@ const Composer = ({
     [sendBoxMiddlewareFromProps, theme.sendBoxMiddleware]
   );
 
-  const sendBoxToolbarMiddleware = useMemo<readonly SendBoxToolbarMiddleware[]>(
+  const sendBoxToolbarMiddleware = useMemoIterable<readonly SendBoxToolbarMiddleware[]>(
     () =>
       Object.freeze([
         ...extractSendBoxToolbarMiddleware(sendBoxToolbarMiddlewareFromProps),

packages/component/src/Middleware/Activity/defaultActivityPolymiddleware.tsx

@@ -1,13 +1,13 @@
 /* eslint complexity: ["error", 21] */
 import { ActivityMiddleware } from 'botframework-webchat-api';
+import { createActivityPolymiddlewareFromLegacy, type Polymiddleware } from 'botframework-webchat-api/middleware';
 import {
   getActivityLivestreamingMetadata,
   getOrgSchemaMessage,
   isVoiceTranscriptActivity
 } from 'botframework-webchat-core';
 import React from 'react';
 
-import { createActivityPolymiddlewareFromLegacy, type Polymiddleware } from 'botframework-webchat-api/middleware';
 import CarouselLayout from '../../Activity/CarouselLayout';
 import StackedLayout from '../../Activity/StackedLayout';
 
@@ -96,4 +96,7 @@ const defaultActivityPolymiddleware: Polymiddleware = createActivityPolymiddlewa
 );
 
 export default defaultActivityPolymiddleware;
-export { createCoreActivityMiddleware };
+export {
+  // Exporting `createCoreActivityMiddleware()` for backward compatibility.
+  createCoreActivityMiddleware
+};

packages/component/src/Middleware/Avatar/createDefaultAvatarPolymiddleware.tsx

@@ -2,6 +2,7 @@ import type { StyleOptions } from 'botframework-webchat-api';
 import {
   avatarComponent,
   createAvatarPolymiddleware,
+  // For type portability.
   type __INTERNAL_DO_NOT_USE__avatarPolymiddlewareRequestStyleOptionsSymbol
 } from 'botframework-webchat-api/middleware';
 import DefaultAvatar from './DefaultAvatar';

packages/component/src/boot/internal.ts

@@ -12,4 +12,4 @@ export { default as parseDocumentFragmentFromString } from '../Utils/parseDocume
 export { default as serializeDocumentFragmentIntoString } from '../Utils/serializeDocumentFragmentIntoString';
 
 // For type portability
-export { __INTERNAL_DO_NOT_USE__avatarPolymiddlewareRequestStyleOptionsSymbol } from 'botframework-webchat-api/internal';
+export { type __INTERNAL_DO_NOT_USE__avatarPolymiddlewareRequestStyleOptionsSymbol } from 'botframework-webchat-api/internal';