@@ -26,6 +26,18 @@ export function useToolsPanelDropdownMenuProps() {
 	return ! isMobile ? { popoverProps: dropdown } : {};
 }
 
+/**
+ * @typedef {Pick<
+ *   NonNullable<import('react').ComponentProps<import('@wordpress/components').Dropdown>['popoverProps']>,
+ *   'placement' | 'offset' | 'shift'
+ * >} ToolsPanelPopoverProps
+ */
+
+/**
+ * Popover props for a tools panel item.
+ *
+ * @return {ToolsPanelPopoverProps} Popover props for a tools panel item.
+ */
 export function useToolsPanelItemPopoverProps() {
 	return useContext( ToolsPanelPopoverPropsContext ).item;
 }
 
@@ -45,6 +45,7 @@
 ### Internal
 
 -   `Menu`: Deprecate the private API while preserving it for older bundled consumers. Target removal for WordPress 7.3 after package compatibility checks pass ([#82947](https://github.com/WordPress/gutenberg/pull/82947)).
+-   Fix internal `WordPressComponent` polymorphic typings to avoid unsupported `as` props unintentionally surfacing ([#82704](https://github.com/WordPress/gutenberg/pull/82704)).
 -   `ProgressBar`: Use the WordPress Design System color tokens. ([#83779](https://github.com/WordPress/gutenberg/pull/83779)).
 
 ## 41.0.0 (2026-09-23)
 
@@ -8,7 +8,6 @@ const meta: Meta< typeof ColorPicker > = {
 	title: 'Components/@wordpress-components/Selection & Input/Color/ColorPicker',
 	id: 'components-colorpicker',
 	argTypes: {
-		as: { control: false },
 		color: { control: false },
 	},
 	args: {
 
@@ -2,6 +2,7 @@ import { describe, it } from 'vitest';
 import type { ForwardedRef } from 'react';
 import { forwardRef } from '@wordpress/element';
 import type { WordPressComponentProps } from '../wordpress-component';
+import { contextConnect, contextConnectWithoutRef } from '../context-connect';
 
 // Static TypeScript checks
 /* eslint-disable vitest/expect-expect -- TypeScript checks these cases during typecheck. */
@@ -25,4 +26,26 @@ describe( 'WordPressComponentProps', () => {
 		<ForwardedFoo ref={ null } />;
 	} );
 } );
+
+describe( 'WordPressComponentFromProps', () => {
+	it( 'should preserve as for polymorphic connected components', () => {
+		const Unconnected = (
+			props: WordPressComponentProps< {}, 'div' >,
+			ref: ForwardedRef< any >
+		) => <div { ...props } ref={ ref } />;
+		const Connected = contextConnect( Unconnected, 'Polymorphic' );
+
+		<Connected as="label" htmlFor="field" />;
+	} );
+
+	it( 'should reject as on a non-polymorphic connected component', () => {
+		const Unconnected = (
+			props: WordPressComponentProps< {}, null, false >
+		) => <div { ...props } />;
+		const Foo = contextConnectWithoutRef( Unconnected, 'Foo' );
+
+		// @ts-expect-error Non-polymorphic components must not accept `as`.
+		<Foo as="div" />;
+	} );
+} );
 /* eslint-enable vitest/expect-expect */
@@ -82,17 +82,20 @@ export type WordPressComponent<
 	selector?: `.${ string }`;
 };
 
+type RefProps< ForwardsRef extends boolean > = ForwardsRef extends true
+	? Pick< React.RefAttributes< any >, 'ref' >
+	: {};
+
 export type WordPressComponentFromProps<
 	Props,
 	ForwardsRef extends boolean = true,
-> =
-	Props extends WordPressComponentProps< infer P, infer T, infer I >
-		? WordPressComponent<
-				T,
-				P &
-					( ForwardsRef extends true
-						? React.RefAttributes< any >
-						: {} ),
-				I
-			>
-		: never;
+> = 'as' extends keyof Props
+	? // When `Props` includes `as`, treat the component as polymorphic and
+		// reverse-infer `P` / `T` from the component props.
+		Props extends WordPressComponentProps< infer P, infer T, true >
+		? WordPressComponent< T, P & RefProps< ForwardsRef >, true >
+		: never
+	: // Otherwise, keep `Props` intact and force types non-polymorphic, since
+		// reverse-inferring `T`/`IsPolymorphic` widens them (`ElementType | null`
+		// and `boolean`), leaving the connected type open to arbitrary props.
+		WordPressComponent< null, Props & RefProps< ForwardsRef >, false >;
@@ -19,13 +19,6 @@ This component is deprecated. When building for the Gutenberg repo, use `Menu` f
 
 ## Props
 
-### `as`
-
- - Type: `any`
- - Required: No
-
-The HTML element or React component to render the component as.
-
 ### `children`
 
  - Type: `ReactNode`
@@ -66,7 +59,7 @@ A callback that gets called when the `open` state changes.
 
 ### `placement`
 
- - Type: `"left" | "right" | "top" | "bottom" | "left-start" | "right-start" | "top-start" | "bottom-start" | "left-end" | "right-end" | ...`
+ - Type: `"top" | "bottom" | "left" | "right" | "top-start" | "bottom-start" | "left-start" | "right-start" | "top-end" | "bottom-end" | ...`
  - Required: No
  - Default: `'bottom-start' for root-level menus, 'right-start' for submenus`
 
 
@@ -20,6 +20,7 @@
 ### Internal
 
 -   Remove the `use-memo-one` dependency, which the `./wp` bundle no longer imports ([#83952](https://github.com/WordPress/gutenberg/pull/83952)).
+-   Keep popover `placement` values as string literals so they remain valid after stricter component prop types ([#82704](https://github.com/WordPress/gutenberg/pull/82704)).
 
 ### Documentation
 
 
@@ -80,14 +80,15 @@ function PanelDropdown< Item >( {
 	);
 	// Memoize popoverProps to avoid returning a new object every time.
 	const popoverProps = useMemo(
-		() => ( {
-			// Anchor the popover to the middle of the entire row so that it doesn't
-			// move around when the label changes.
-			anchor: popoverAnchor,
-			placement: 'left-start',
-			offset: 36,
-			shift: true,
-		} ),
+		() =>
+			( {
+				// Anchor the popover to the middle of the entire row so that it doesn't
+				// move around when the label changes.
+				anchor: popoverAnchor,
+				placement: 'left-start',
+				offset: 36,
+				shift: true,
+			} ) as const,
 		[ popoverAnchor ]
 	);
 	const [ dialogRef, dialogProps ] = useDialog( {
 
@@ -25,7 +25,7 @@ const DATAVIEWS_CONFIG_POPOVER_PROPS = {
 	className: 'dataviews-config__popover',
 	placement: 'bottom-end',
 	offset: 9,
-};
+} as const;
 
 export function ViewTypeMenu() {
 	const { view, onChangeView, defaultLayouts } =
 
@@ -9,7 +9,7 @@ import { hasBlockSupport, store as blocksStore } from '@wordpress/blocks';
 const POPOVER_PROPS = {
 	className: 'block-editor-block-settings-menu__popover',
 	placement: 'bottom-start',
-};
+} as const;
 
 export default function LeafMoreMenu( {
 	clientId,