refactor: DRY up Omit types

Author: logonoff

packages/react-core/src/components/Dropdown/Dropdown.tsx

@@ -1,10 +1,10 @@
 import { forwardRef, useEffect, useRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Menu, MenuContent, MenuProps } from '../Menu';
-import { Popper, PopperProps } from '../../helpers/Popper/Popper';
+import { Popper, PopperOptions } from '../../helpers/Popper/Popper';
 import { useOUIAProps, OUIAProps, onToggleArrowKeydownDefault } from '../../helpers';
 
-export type DropdownPopperProps = Omit<PopperProps, 'trigger' | 'triggerRef' | 'popper' | 'popperRef' | 'isVisible'>;
+export type DropdownPopperProps = PopperOptions;
 
 export interface DropdownToggleProps {
   /**  Dropdown toggle node. */

packages/react-core/src/components/Menu/MenuContainer.tsx

@@ -1,8 +1,8 @@
 import { useEffect, useRef } from 'react';
 import { onToggleArrowKeydownDefault, Popper } from '../../helpers';
-import type { PopperProps } from '../../helpers/Popper/Popper';
+import type { PopperOptions } from '../../helpers/Popper/Popper';
 
-export type MenuPopperProps = Omit<PopperProps, 'trigger' | 'triggerRef' | 'popper' | 'popperRef' | 'isVisible'>;
+export type MenuPopperProps = PopperOptions;
 
 export interface MenuContainerProps {
   /** Menu to be rendered */

packages/react-core/src/components/Select/Select.tsx

@@ -1,10 +1,10 @@
 import { forwardRef, useEffect, useRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Menu, MenuContent, MenuProps } from '../Menu';
-import { Popper, PopperProps } from '../../helpers/Popper/Popper';
+import { Popper, PopperOptions } from '../../helpers/Popper/Popper';
 import { getOUIAProps, OUIAProps, getDefaultOUIAId, onToggleArrowKeydownDefault } from '../../helpers';
 
-export type SelectPopperProps = Omit<PopperProps, 'trigger' | 'triggerRef' | 'popper' | 'popperRef' | 'isVisible'>;
+export type SelectPopperProps = PopperOptions;
 
 export interface SelectToggleProps {
   /**  Select toggle node. */

packages/react-core/src/components/Tabs/OverflowTab.tsx

@@ -2,16 +2,13 @@ import { Fragment, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
 import { css } from '@patternfly/react-styles';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
-import { Popper, PopperProps } from '../../helpers';
+import { Popper, PopperOptions } from '../../helpers';
 import { Menu, MenuContent, MenuList, MenuItem } from '../Menu';
 import { TabsContext } from './TabsContext';
 import { TabProps } from './Tab';
 import { TabTitleText } from './TabTitleText';
 
-export type HorizontalOverflowPopperProps = Omit<
-  PopperProps,
-  'trigger' | 'triggerRef' | 'popper' | 'popperRef' | 'isVisible'
->;
+export type HorizontalOverflowPopperProps = PopperOptions;
 
 export interface OverflowTabProps extends React.HTMLProps<HTMLLIElement> {
   /** Additional classes added to the overflow tab */

packages/react-core/src/helpers/Popper/Popper.tsx

@@ -47,24 +47,8 @@ const getOppositePlacement = (placement: Placement): any =>
 export const getOpacityTransition = (animationDuration: number) =>
   `opacity ${animationDuration}ms cubic-bezier(.54, 1.5, .38, 1.11)`;
 
-export interface PopperProps {
-  /**
-   * Trigger reference element to which the popper is relatively placed to.
-   */
-  trigger?: React.ReactNode;
-  /**
-   * A reference to the trigger reference element that can be passed instead of or along
-   * with the trigger prop. When passed along with the trigger prop, the div element that
-   * wraps the trigger will be removed.
-   */
-  triggerRef?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
-  /** The popper (menu/tooltip/popover) element */
-  popper: React.ReactElement<any>;
-  /**
-   * Reference to the popper (menu/tooltip/popover) element.
-   * Passing this prop will remove the wrapper div element from the popper.
-   */
-  popperRef?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
+/** Properties of Popper that can be used to customize its behavior. */
+export interface PopperOptions {
   /** popper direction */
   direction?: 'up' | 'down';
   /** popper position */
@@ -81,8 +65,6 @@ export interface PopperProps {
   appendTo?: HTMLElement | (() => HTMLElement) | 'inline';
   /** z-index of the popper element */
   zIndex?: number;
-  /** True to make the popper visible */
-  isVisible?: boolean;
   /**
    * Map class names to positions, for example:
    * {
@@ -179,6 +161,29 @@ export interface PopperProps {
   preventOverflow?: boolean;
 }
 
+/** Extends PopperOptions */
+export interface PopperProps extends PopperOptions {
+  /**
+   * Trigger reference element to which the popper is relatively placed to.
+   */
+  trigger?: React.ReactNode;
+  /**
+   * A reference to the trigger reference element that can be passed instead of or along
+   * with the trigger prop. When passed along with the trigger prop, the div element that
+   * wraps the trigger will be removed.
+   */
+  triggerRef?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
+  /** The popper (menu/tooltip/popover) element */
+  popper: React.ReactElement<any>;
+  /**
+   * Reference to the popper (menu/tooltip/popover) element.
+   * Passing this prop will remove the wrapper div element from the popper.
+   */
+  popperRef?: HTMLElement | (() => HTMLElement) | React.RefObject<any>;
+  /** True to make the popper visible */
+  isVisible?: boolean;
+}
+
 export const Popper: React.FunctionComponent<PopperProps> = ({
   trigger,
   popper,