Revert "Fix typings for FullChatComposer (#5580)"

This reverts commit 0f28670.

Author: OEvgeny

CHANGELOG.md

@@ -308,8 +308,6 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
 - Fixed aria-label only announcing placeholder in feedback form, in PR [#5567](https://github.com/microsoft/BotFramework-WebChat/pull/5567)
 - Fixed placing focus on the code block content, so it is possible to scroll code via keyboard, in PR [#5575](https://github.com/microsoft/BotFramework-WebChat/pull/5575), by [@OEvgeny](https://github.com/OEvgeny)
 - Fixed [#5581](https://github.com/microsoft/BotFramework-WebChat/issues/5581). Activities should be displayed after upgrading via `npm install`, in PR [#5582](https://github.com/microsoft/BotFramework-WebChat/pull/5582), by [@compulim](https://github.com/compulim)
-- Fixed Composer props types not resolving correctly in React 16 in PR [#5580](https://github.com/microsoft/BotFramework-WebChat/pull/5580),
-by [@lexi-taylor](https://github.com/lexi-taylor)
 
 ### Removed
 

packages/bundle/src/AddFullBundle.tsx

@@ -14,14 +14,12 @@ import { type AdaptiveCardsPackage } from './types/AdaptiveCardsPackage';
 import { type StrictFullBundleStyleOptions } from './types/FullBundleStyleOptions';
 import useComposerProps from './useComposerProps';
 
-type AddFullBundleChildren = ({ extraStyleSet }: { extraStyleSet: any }) => ReactNode;
-
 type AddFullBundleProps = Readonly<{
   adaptiveCardsHostConfig?: any;
   adaptiveCardsPackage?: AdaptiveCardsPackage;
   attachmentForScreenReaderMiddleware?: OneOrMany<AttachmentForScreenReaderMiddleware>;
   attachmentMiddleware?: OneOrMany<AttachmentMiddleware>;
-  children: AddFullBundleChildren;
+  children: ({ extraStyleSet }: { extraStyleSet: any }) => ReactNode;
   htmlContentTransformMiddleware?: HTMLContentTransformMiddleware[];
   renderMarkdown?: (
     markdown: string,
@@ -76,4 +74,4 @@ function AddFullBundle({
 
 export default memo(AddFullBundle);
 
-export type { AddFullBundleProps, AddFullBundleChildren };
+export type { AddFullBundleProps };

packages/bundle/src/FullComposer.tsx

@@ -1,20 +1,12 @@
 import { Components, type ComposerProps } from 'botframework-webchat-component';
 import PropTypes from 'prop-types';
 import React from 'react';
-import AddFullBundle, { type AddFullBundleProps, type AddFullBundleChildren } from './AddFullBundle';
 
-const { Composer } = Components;
-
-type BaseFullComposerProps = ComposerProps & AddFullBundleProps;
+import AddFullBundle, { type AddFullBundleProps } from './AddFullBundle';
 
-type ComposerPropsChildren = ComposerProps['children'];
+const { Composer } = Components;
 
-/* The props of FullComposer are the union of Composer and AddFullBundle, except "children".
- * The union type of ComposerProps and AddFullBundleProps was not resolving correctly, so manually constructing the type here.
- */
-type FullComposerProps = Omit<BaseFullComposerProps, 'children'> & {
-  children?: ComposerPropsChildren | AddFullBundleChildren;
-};
+type FullComposerProps = ComposerProps & AddFullBundleProps;
 
 const FullComposer = (props: FullComposerProps) => (
   <AddFullBundle {...props}>