From 9f13cfa22eac49cd27e65ce5801dfcfac3a0dc6a Mon Sep 17 00:00:00 2001 From: Glen Davies Date: Fri, 3 Sep 2021 10:03:27 +1200 Subject: [PATCH] Update PolymorphicComponent* references to WordPressComponentProps* --- .../src/tools-panel/tools-panel-header/component.tsx | 4 ++-- .../components/src/tools-panel/tools-panel-header/hook.ts | 4 ++-- .../components/src/tools-panel/tools-panel-item/component.tsx | 4 ++-- packages/components/src/tools-panel/tools-panel-item/hook.ts | 4 ++-- packages/components/src/tools-panel/tools-panel/component.tsx | 4 ++-- packages/components/src/tools-panel/tools-panel/hook.ts | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/components/src/tools-panel/tools-panel-header/component.tsx b/packages/components/src/tools-panel/tools-panel-header/component.tsx index e98543de9e769..cdf1c4f49388e 100644 --- a/packages/components/src/tools-panel/tools-panel-header/component.tsx +++ b/packages/components/src/tools-panel/tools-panel-header/component.tsx @@ -17,11 +17,11 @@ import DropdownMenu from '../../dropdown-menu'; import MenuGroup from '../../menu-group'; import MenuItem from '../../menu-item'; import { useToolsPanelHeader } from './hook'; -import { contextConnect, PolymorphicComponentProps } from '../../ui/context'; +import { contextConnect, WordPressComponentProps } from '../../ui/context'; import type { ToolsPanelHeaderProps } from '../types'; const ToolsPanelHeader = ( - props: PolymorphicComponentProps< ToolsPanelHeaderProps, 'h2' >, + props: WordPressComponentProps< ToolsPanelHeaderProps, 'h2' >, forwardedRef: Ref< any > ) => { const { diff --git a/packages/components/src/tools-panel/tools-panel-header/hook.ts b/packages/components/src/tools-panel/tools-panel-header/hook.ts index 69efca776d20d..f2907a6663968 100644 --- a/packages/components/src/tools-panel/tools-panel-header/hook.ts +++ b/packages/components/src/tools-panel/tools-panel-header/hook.ts @@ -8,12 +8,12 @@ import { useMemo } from '@wordpress/element'; */ import * as styles from '../styles'; import { useToolsPanelContext } from '../context'; -import { useContextSystem, PolymorphicComponentProps } from '../../ui/context'; +import { useContextSystem, WordPressComponentProps } from '../../ui/context'; import { useCx } from '../../utils/hooks/use-cx'; import type { ToolsPanelHeaderProps } from '../types'; export function useToolsPanelHeader( - props: PolymorphicComponentProps< ToolsPanelHeaderProps, 'h2' > + props: WordPressComponentProps< ToolsPanelHeaderProps, 'h2' > ) { const { className, ...otherProps } = useContextSystem( props, diff --git a/packages/components/src/tools-panel/tools-panel-item/component.tsx b/packages/components/src/tools-panel/tools-panel-item/component.tsx index d2627930d50c7..cde52e5f3ec0f 100644 --- a/packages/components/src/tools-panel/tools-panel-item/component.tsx +++ b/packages/components/src/tools-panel/tools-panel-item/component.tsx @@ -9,13 +9,13 @@ import type { Ref } from 'react'; */ import { useToolsPanelItem } from './hook'; import { View } from '../../view'; -import { contextConnect, PolymorphicComponentProps } from '../../ui/context'; +import { contextConnect, WordPressComponentProps } from '../../ui/context'; import type { ToolsPanelItemProps } from '../types'; // This wraps controls to be conditionally displayed within a tools panel. It // prevents props being applied to HTML elements that would make them invalid. const ToolsPanelItem = ( - props: PolymorphicComponentProps< ToolsPanelItemProps, 'div' >, + props: WordPressComponentProps< ToolsPanelItemProps, 'div' >, forwardedRef: Ref< any > ) => { const { children, isShown, ...toolsPanelItemProps } = useToolsPanelItem( diff --git a/packages/components/src/tools-panel/tools-panel-item/hook.ts b/packages/components/src/tools-panel/tools-panel-item/hook.ts index f6065bc38b50f..687b2b638e973 100644 --- a/packages/components/src/tools-panel/tools-panel-item/hook.ts +++ b/packages/components/src/tools-panel/tools-panel-item/hook.ts @@ -9,12 +9,12 @@ import { useEffect, useMemo } from '@wordpress/element'; */ import * as styles from '../styles'; import { useToolsPanelContext } from '../context'; -import { useContextSystem, PolymorphicComponentProps } from '../../ui/context'; +import { useContextSystem, WordPressComponentProps } from '../../ui/context'; import { useCx } from '../../utils/hooks/use-cx'; import type { ToolsPanelItemProps } from '../types'; export function useToolsPanelItem( - props: PolymorphicComponentProps< ToolsPanelItemProps, 'div' > + props: WordPressComponentProps< ToolsPanelItemProps, 'div' > ) { const { className, diff --git a/packages/components/src/tools-panel/tools-panel/component.tsx b/packages/components/src/tools-panel/tools-panel/component.tsx index f4c63b6834658..a95ea52a512a5 100644 --- a/packages/components/src/tools-panel/tools-panel/component.tsx +++ b/packages/components/src/tools-panel/tools-panel/component.tsx @@ -11,11 +11,11 @@ import ToolsPanelHeader from '../tools-panel-header'; import { ToolsPanelContext } from '../context'; import { useToolsPanel } from './hook'; import { View } from '../../view'; -import { contextConnect, PolymorphicComponentProps } from '../../ui/context'; +import { contextConnect, WordPressComponentProps } from '../../ui/context'; import type { ToolsPanelProps } from '../types'; const ToolsPanel = ( - props: PolymorphicComponentProps< ToolsPanelProps, 'div' >, + props: WordPressComponentProps< ToolsPanelProps, 'div' >, forwardedRef: Ref< any > ) => { const { diff --git a/packages/components/src/tools-panel/tools-panel/hook.ts b/packages/components/src/tools-panel/tools-panel/hook.ts index de3228ecec804..e08511808d99c 100644 --- a/packages/components/src/tools-panel/tools-panel/hook.ts +++ b/packages/components/src/tools-panel/tools-panel/hook.ts @@ -7,12 +7,12 @@ import { useEffect, useMemo, useState } from '@wordpress/element'; * Internal dependencies */ import * as styles from '../styles'; -import { useContextSystem, PolymorphicComponentProps } from '../../ui/context'; +import { useContextSystem, WordPressComponentProps } from '../../ui/context'; import { useCx } from '../../utils/hooks/use-cx'; import type { ToolsPanelProps, ToolsPanelItem } from '../types'; export function useToolsPanel( - props: PolymorphicComponentProps< ToolsPanelProps, 'div' > + props: WordPressComponentProps< ToolsPanelProps, 'div' > ) { const { className, resetAll, ...otherProps } = useContextSystem( props,