diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx index e0540d54dfb..300b8e3d751 100644 --- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx +++ b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx @@ -9,12 +9,9 @@ import { ApplicationLauncherGroup } from './ApplicationLauncherGroup'; import { ApplicationLauncherSeparator } from './ApplicationLauncherSeparator'; import { ApplicationLauncherItem } from './ApplicationLauncherItem'; import { ApplicationLauncherContext } from './ApplicationLauncherContext'; -import { ToggleMenuBaseProps } from '../../helpers/Popper/Popper'; import { createRenderableFavorites, extendItemsWithFavorite } from '../../helpers/favorites'; -export interface ApplicationLauncherProps - extends Omit, - React.HTMLProps { +export interface ApplicationLauncherProps extends React.HTMLProps { /** Additional element css classes */ className?: string; /** Display menu above or below dropdown toggle */ diff --git a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx index 307c81ddfc1..5603eed98e3 100644 --- a/packages/react-core/src/components/ContextSelector/ContextSelector.tsx +++ b/packages/react-core/src/components/ContextSelector/ContextSelector.tsx @@ -10,11 +10,10 @@ import { TextInput } from '../TextInput'; import { InputGroup } from '../InputGroup'; import { KeyTypes } from '../../helpers/constants'; import { FocusTrap, getUniqueId } from '../../helpers'; -import { ToggleMenuBaseProps } from '../../helpers/Popper/Popper'; import { Popper } from '../../helpers/Popper/Popper'; import { getOUIAProps, OUIAProps, getDefaultOUIAId } from '../../helpers'; -export interface ContextSelectorProps extends Omit, OUIAProps { +export interface ContextSelectorProps extends OUIAProps { /** content rendered inside the Context Selector */ children?: React.ReactNode; /** Classes applied to root element of Context Selector */ diff --git a/packages/react-core/src/components/Dropdown/Dropdown.tsx b/packages/react-core/src/components/Dropdown/Dropdown.tsx index 622b0cd7e96..93973d5686f 100644 --- a/packages/react-core/src/components/Dropdown/Dropdown.tsx +++ b/packages/react-core/src/components/Dropdown/Dropdown.tsx @@ -2,13 +2,9 @@ import * as React from 'react'; import styles from '@patternfly/react-styles/css/components/Dropdown/dropdown'; import { DropdownPosition, DropdownDirection, DropdownContext } from './dropdownConstants'; import { DropdownWithContext } from './DropdownWithContext'; -import { ToggleMenuBaseProps } from '../../helpers/Popper/Popper'; import { OUIAProps, useOUIAId } from '../../helpers'; -export interface DropdownProps - extends Omit, - React.HTMLProps, - OUIAProps { +export interface DropdownProps extends React.HTMLProps, OUIAProps { /** Anything which can be rendered in a dropdown */ children?: React.ReactNode; /** Classes applied to root element of dropdown */ diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx index 7b627ec6531..bf63bacc05f 100644 --- a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx +++ b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx @@ -3,7 +3,6 @@ import styles from '@patternfly/react-styles/css/components/OptionsMenu/options- import { DropdownContext } from '../Dropdown'; import { DropdownWithContext } from '../Dropdown/DropdownWithContext'; import { OUIAProps, useOUIAId } from '../../helpers'; -import { ToggleMenuBaseProps } from '../../helpers/Popper/Popper'; export enum OptionsMenuPosition { right = 'right', @@ -15,10 +14,7 @@ export enum OptionsMenuDirection { down = 'down' } -export interface OptionsMenuProps - extends Omit, - React.HTMLProps, - OUIAProps { +export interface OptionsMenuProps extends React.HTMLProps, OUIAProps { /** Classes applied to root element of the options menu */ className?: string; /** Id of the root element of the options menu */ diff --git a/packages/react-core/src/components/Select/Select.tsx b/packages/react-core/src/components/Select/Select.tsx index a4962d75a35..4f9ad2d52e7 100644 --- a/packages/react-core/src/components/Select/Select.tsx +++ b/packages/react-core/src/components/Select/Select.tsx @@ -33,7 +33,7 @@ import { } from '../../helpers'; import { KeyTypes } from '../../helpers/constants'; import { Divider } from '../Divider'; -import { ToggleMenuBaseProps, Popper } from '../../helpers/Popper/Popper'; +import { Popper } from '../../helpers/Popper/Popper'; import { createRenderableFavorites, extendItemsWithFavorite } from '../../helpers/favorites'; import { ValidatedOptions } from '../../helpers/constants'; import { findTabbableElements } from '../../helpers/util'; @@ -48,8 +48,7 @@ export interface SelectViewMoreObject { onClick: (event: React.MouseEvent | React.ChangeEvent) => void; } export interface SelectProps - extends Omit, - Omit, 'onSelect' | 'ref' | 'checked' | 'selected'>, + extends Omit, 'onSelect' | 'ref' | 'checked' | 'selected'>, OUIAProps { /** Content rendered inside the Select. Must be React.ReactElement[] */ children?: React.ReactElement[]; diff --git a/packages/react-core/src/helpers/Popper/Popper.tsx b/packages/react-core/src/helpers/Popper/Popper.tsx index 3d45ebe4f44..bc7755b4567 100644 --- a/packages/react-core/src/helpers/Popper/Popper.tsx +++ b/packages/react-core/src/helpers/Popper/Popper.tsx @@ -14,18 +14,6 @@ const getOppositePlacement = (placement: Placement): any => (matched: string) => hash[matched as 'left' | 'right' | 'bottom' | 'top'] as BasePlacement ); -/** @deprecated Please use the menuAppendTo prop directly from within the PF component which uses it. */ -export interface ToggleMenuBaseProps { - /** The container to append the menu to. Defaults to 'inline' - * If your menu is being cut off you can append it to an element higher up the DOM tree. - * Some examples: - * menuAppendTo="parent" - * menuAppendTo={() => document.body} - * menuAppendTo={document.getElementById('target')} - */ - menuAppendTo?: HTMLElement | (() => HTMLElement) | 'parent' | 'inline'; -} - export const getOpacityTransition = (animationDuration: number) => `opacity ${animationDuration}ms cubic-bezier(.54, 1.5, .38, 1.11)`;