Fix removal of polymorphism for RangeControl

WordPress · Jun 23, 2022 · f0d1336 · f0d1336
1 parent 26fed6f
commit f0d1336
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/packages/components/src/range-control/index.tsx b/packages/components/src/range-control/index.tsx
@@ -35,12 +35,17 @@ import {
 	Wrapper,
 } from './styles/range-control-styles';
 
-import type { UnforwardedRangeControlProps } from './types';
+import type { RangeControlProps } from './types';
+import type { WordPressComponentProps } from '../ui/context';
 
 const noop = () => {};
 
 function UnforwardedRangeControl< IconProps = unknown >(
-	props: UnforwardedRangeControlProps< IconProps >,
+	props: WordPressComponentProps<
+		RangeControlProps< IconProps >,
+		'div',
+		false
+	>,
 	ref: ForwardedRef< HTMLDivElement >
 ) {
 	const {

diff --git a/packages/components/src/range-control/types.ts b/packages/components/src/range-control/types.ts
@@ -13,7 +13,6 @@ import type {
  */
 import type { BaseControlProps } from '../base-control/types';
 import type { IconType } from '../icon';
-import type { WordPressComponentProps } from '../ui/context';
 
 export type NumericProps = {
 	/**
@@ -229,11 +228,6 @@ export type RangeControlProps< IconProps = unknown > = Pick<
 		withInputField?: boolean;
 	};
 
-export type UnforwardedRangeControlProps< IconProps = unknown > = Omit<
-	WordPressComponentProps< RangeControlProps< IconProps >, 'div' >,
-	'as'
->;
-
 export type RailProps = MarksProps & {
 	railColor?: CSSProperties[ 'color' ];
 };