diff --git a/packages/react-core/src/components/DatePicker/DatePicker.tsx b/packages/react-core/src/components/DatePicker/DatePicker.tsx
index 8ab88887d78..1203566b1e9 100644
--- a/packages/react-core/src/components/DatePicker/DatePicker.tsx
+++ b/packages/react-core/src/components/DatePicker/DatePicker.tsx
@@ -222,7 +222,7 @@ const DatePickerBase = (
}
showClose={false}
isVisible={popoverOpen}
- shouldClose={(_1, _2, event) => {
+ shouldClose={(_1, event) => {
event = event as KeyboardEvent;
if (event.key === KeyTypes.Escape && selectOpen) {
event.stopPropagation();
diff --git a/packages/react-core/src/components/Popover/Popover.tsx b/packages/react-core/src/components/Popover/Popover.tsx
index e8d6c607014..12a8dfd91f4 100644
--- a/packages/react-core/src/components/Popover/Popover.tsx
+++ b/packages/react-core/src/components/Popover/Popover.tsx
@@ -16,7 +16,6 @@ import { ReactElement } from 'react';
import { FocusTrap } from '../../helpers';
import { Popper, getOpacityTransition } from '../../helpers/Popper/Popper';
import { getUniqueId } from '../../helpers/util';
-import { Instance as TippyInstance, Props as TippyProps } from '../../helpers/Popper/DeprecatedTippyTypes';
export enum PopoverPosition {
auto = 'auto',
@@ -60,10 +59,6 @@ export interface PopoverProps {
* bodyContent={hide => }
*/
bodyContent: React.ReactNode | ((hide: () => void) => React.ReactNode);
- /** @deprecated - no longer used. if you want to constrain the popper to a specific element
- * use the appendTo prop instead.
- */
- boundary?: 'scrollParent' | 'window' | 'viewport' | HTMLElement;
/**
* The reference element to which the popover is relatively placed to. If you cannot wrap
* the reference with the Popover, you can use the reference prop instead.
@@ -151,29 +146,24 @@ export interface PopoverProps {
minWidth?: string;
/**
* Lifecycle function invoked when the popover has fully transitioned out.
- * Note: The tip argument is no longer passed and has been deprecated.
*/
- onHidden?: (tip?: TippyInstance) => void;
+ onHidden?: () => void;
/**
* Lifecycle function invoked when the popover begins to transition out.
- * Note: The tip argument is no longer passed and has been deprecated.
*/
- onHide?: (tip?: TippyInstance) => void;
+ onHide?: () => void;
/**
* Lifecycle function invoked when the popover has been mounted to the DOM.
- * Note: The tip argument is no longer passed and has been deprecated.
*/
- onMount?: (tip?: TippyInstance) => void;
+ onMount?: () => void;
/**
* Lifecycle function invoked when the popover begins to transition in.
- * Note: The tip argument is no longer passed and has been deprecated.
*/
- onShow?: (tip?: TippyInstance) => void;
+ onShow?: () => void;
/**
* Lifecycle function invoked when the popover has fully transitioned in.
- * Note: The tip argument is no longer passed and has been deprecated.
*/
- onShown?: (tip?: TippyInstance) => void;
+ onShown?: () => void;
/**
* Popover position. Note: With the enableFlip property set to true, it will change the
* position if there is not enough space for the starting position. The behavior of where it
@@ -205,9 +195,8 @@ export interface PopoverProps {
/**
* Callback function that is only invoked when isVisible is also controlled. Called when the
* popover close button is clicked, the enter key was used on it, or the escape key is used.
- * Note: The tip argument is no longer passed and has been deprecated.
*/
- shouldClose?: (tip?: TippyInstance, hideFunction?: () => void, event?: MouseEvent | KeyboardEvent) => void;
+ shouldClose?: (hideFunction?: () => void, event?: MouseEvent | KeyboardEvent) => void;
/**
* Callback function that is only invoked when isVisible is also controlled. Called when the
* enter key is used on the focused trigger.
@@ -215,8 +204,6 @@ export interface PopoverProps {
shouldOpen?: (showFunction?: () => void, event?: MouseEvent | KeyboardEvent) => void;
/** Flag indicating whether the close button should be shown. */
showClose?: boolean;
- /** @deprecated - no longer used. */
- tippyProps?: Partial;
/** Whether to trap focus in the popover. */
withFocusTrap?: boolean;
/** The z-index of the popover. */
@@ -265,21 +252,12 @@ export const Popover: React.FunctionComponent = ({
animationDuration = 300,
id,
withFocusTrap: propWithFocusTrap,
- boundary,
- tippyProps,
reference,
hasNoPadding = false,
hasAutoWidth = false,
removeFindDomNode = false,
...rest
}: PopoverProps) => {
- if (process.env.NODE_ENV !== 'production') {
- boundary !== undefined &&
- console.warn(
- 'The Popover boundary prop has been deprecated. If you want to constrain the popper to a specific element use the appendTo prop instead.'
- );
- tippyProps !== undefined && console.warn('The Popover tippyProps prop has been deprecated and is no longer used.');
- }
// could make this a prop in the future (true | false | 'toggle')
// const hideOnClick = true;
const uniqueId = id || getUniqueId();
@@ -351,7 +329,7 @@ export const Popover: React.FunctionComponent = ({
const onDocumentKeyDown = (event: KeyboardEvent) => {
if (event.key === KeyTypes.Escape && visible) {
if (triggerManually) {
- shouldClose(null, hide, event);
+ shouldClose(hide, event);
} else {
hide();
}
@@ -366,7 +344,7 @@ export const Popover: React.FunctionComponent = ({
return;
}
if (triggerManually) {
- shouldClose(null, hide, event);
+ shouldClose(hide, event);
} else {
hide();
}
@@ -375,7 +353,7 @@ export const Popover: React.FunctionComponent = ({
const onTriggerClick = (event: MouseEvent) => {
if (triggerManually) {
if (visible) {
- shouldClose(null, hide, event);
+ shouldClose(hide, event);
} else {
shouldOpen(show, event);
}
@@ -395,7 +373,7 @@ export const Popover: React.FunctionComponent = ({
const closePopover = (event: any) => {
event.stopPropagation();
if (triggerManually) {
- shouldClose(null, hide, event);
+ shouldClose(hide, event);
} else {
hide();
}
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx
index a53ec3f7fc2..56f8af16ab1 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx
@@ -1,6 +1,5 @@
import { Popover } from '@patternfly/react-core';
import React, { Component } from 'react';
-import { Instance as TippyInstance } from '@patternfly/react-core/dist/esm/helpers/Popper/DeprecatedTippyTypes';
export class PopoverDemo extends Component {
popoverRef: React.RefObject;
@@ -30,13 +29,6 @@ export class PopoverDemo extends Component {
>
{this.myPopoverProps.children}
- !tip}
- >
-
-