From 84761ed06877cdfc88d4bae6bca0bdea91761850 Mon Sep 17 00:00:00 2001 From: Katie McFaul Date: Mon, 31 Oct 2022 11:27:57 -0400 Subject: [PATCH 1/4] feat(Popper, misc): remove removeFindDomNode, wrap divs by default --- .../ApplicationLauncher.tsx | 7 +-- .../ContextSelector/ContextSelector.tsx | 7 +-- .../src/components/Dropdown/Dropdown.tsx | 10 +--- .../Dropdown/DropdownWithContext.tsx | 2 - .../react-core/src/components/Nav/NavItem.tsx | 4 -- .../components/OptionsMenu/OptionsMenu.tsx | 4 -- .../src/components/Popover/Popover.tsx | 4 -- .../components/SearchInput/SearchInput.tsx | 4 -- .../src/components/Select/Select.tsx | 7 +-- .../src/components/Tabs/OverflowTab.tsx | 4 -- .../src/components/TimePicker/TimePicker.tsx | 7 +-- .../src/components/Tooltip/Tooltip.tsx | 4 -- .../src/helpers/Popper/FindRefWrapper.tsx | 28 ---------- .../react-core/src/helpers/Popper/Popper.tsx | 54 ++++++------------- .../src/next/components/Dropdown/Dropdown.tsx | 1 - .../src/next/components/Select/Select.tsx | 1 - 16 files changed, 22 insertions(+), 126 deletions(-) delete mode 100644 packages/react-core/src/helpers/Popper/FindRefWrapper.tsx diff --git a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx index fbdd6548ce8..54bbc7525f0 100644 --- a/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx +++ b/packages/react-core/src/components/ApplicationLauncher/ApplicationLauncher.tsx @@ -58,8 +58,6 @@ export interface ApplicationLauncherProps extends React.HTMLProps { @@ -82,8 +80,7 @@ export class ApplicationLauncher extends React.Component { @@ -123,7 +120,6 @@ export class ApplicationLauncher extends React.Component ); } diff --git a/packages/react-core/src/components/Dropdown/Dropdown.tsx b/packages/react-core/src/components/Dropdown/Dropdown.tsx index 4685fca9afa..8014f93cb49 100644 --- a/packages/react-core/src/components/Dropdown/Dropdown.tsx +++ b/packages/react-core/src/components/Dropdown/Dropdown.tsx @@ -56,8 +56,6 @@ export interface DropdownProps extends React.HTMLProps, OUIAProp * appended inline, e.g. `menuAppendTo="parent"` */ isFlipEnabled?: boolean; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** Value to overwrite the randomly generated data-ouia-component-id.*/ ouiaId?: number | string; /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */ @@ -74,7 +72,6 @@ export const Dropdown: React.FunctionComponent = ({ contextProps, menuAppendTo = 'inline', isFlipEnabled = true, - removeFindDomNode = false, ...props }: DropdownProps) => ( = ({ ...contextProps }} > - + ); Dropdown.displayName = 'Dropdown'; diff --git a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx index 1cf7ff0638f..29c8600d1bc 100644 --- a/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx +++ b/packages/react-core/src/components/Dropdown/DropdownWithContext.tsx @@ -77,7 +77,6 @@ export class DropdownWithContext extends React.Component ); diff --git a/packages/react-core/src/components/Nav/NavItem.tsx b/packages/react-core/src/components/Nav/NavItem.tsx index 3e8c78a3abe..36eae7851dd 100644 --- a/packages/react-core/src/components/Nav/NavItem.tsx +++ b/packages/react-core/src/components/Nav/NavItem.tsx @@ -32,8 +32,6 @@ export interface NavItemProps extends Omit, ' flyout?: React.ReactElement; /** Callback when flyout is opened or closed */ onShowFlyout?: () => void; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** Value to overwrite the randomly generated data-ouia-component-id.*/ ouiaId?: number | string; /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */ @@ -55,7 +53,6 @@ export const NavItem: React.FunctionComponent = ({ onShowFlyout, ouiaId, ouiaSafe, - removeFindDomNode = false, ...props }: NavItemProps) => { const { flyoutRef, setFlyoutRef } = React.useContext(NavContext); @@ -224,7 +221,6 @@ export const NavItem: React.FunctionComponent = ({ placement="right-start" isVisible={flyoutVisible} onDocumentKeyDown={handleFlyout} - removeFindDomNode={removeFindDomNode} /> ); diff --git a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx index bf63bacc05f..a26728b5494 100644 --- a/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx +++ b/packages/react-core/src/components/OptionsMenu/OptionsMenu.tsx @@ -43,8 +43,6 @@ export interface OptionsMenuProps extends React.HTMLProps, OUIAP * menuAppendTo={document.getElementById('target')} */ menuAppendTo?: HTMLElement | (() => HTMLElement) | 'inline' | 'parent'; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** Value to overwrite the randomly generated data-ouia-component-id.*/ ouiaId?: number | string; /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */ @@ -63,7 +61,6 @@ export const OptionsMenu: React.FunctionComponent = ({ menuAppendTo = 'inline', ouiaId, ouiaSafe = true, - removeFindDomNode = false, ...props }: OptionsMenuProps) => ( = ({ isGrouped={isGrouped} toggle={toggle} menuAppendTo={menuAppendTo} - removeFindDomNode={removeFindDomNode} {...props} /> diff --git a/packages/react-core/src/components/Popover/Popover.tsx b/packages/react-core/src/components/Popover/Popover.tsx index 4ee492261e2..790eed4b44d 100644 --- a/packages/react-core/src/components/Popover/Popover.tsx +++ b/packages/react-core/src/components/Popover/Popover.tsx @@ -190,8 +190,6 @@ export interface PopoverProps { * Usage: document.getElementById('reference-element')} /> */ reference?: HTMLElement | (() => HTMLElement) | React.RefObject; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** * 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. @@ -267,7 +265,6 @@ export const Popover: React.FunctionComponent = ({ reference, hasNoPadding = false, hasAutoWidth = false, - removeFindDomNode = false, ...rest }: PopoverProps) => { // could make this a prop in the future (true | false | 'toggle') @@ -475,7 +472,6 @@ export const Popover: React.FunctionComponent = ({ enableFlip={enableFlip} zIndex={zIndex} flipBehavior={flipBehavior} - removeFindDomNode={removeFindDomNode} /> ); diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx index 28a05a42790..ede8bd987c3 100644 --- a/packages/react-core/src/components/SearchInput/SearchInput.tsx +++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx @@ -117,8 +117,6 @@ export interface SearchInputProps extends Omit, placeholder?: string; /** Accessible label for the button to navigate to previous result. */ previousNavigationButtonAriaLabel?: string; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** Label for the button which resets the advanced search form and clears the search input. */ resetButtonLabel?: string; /** The number of search results returned. Either a total number of results, @@ -159,7 +157,6 @@ const SearchInputBase: React.FunctionComponent = ({ submitSearchButtonLabel = 'Search', isDisabled = false, appendTo, - removeFindDomNode = false, type = 'text', ...props }: SearchInputProps) => { @@ -415,7 +412,6 @@ const SearchInputBase: React.FunctionComponent = ({ isVisible={isSearchMenuOpen} enableFlip={true} appendTo={() => appendTo || searchInputRef.current} - removeFindDomNode={removeFindDomNode} /> ); diff --git a/packages/react-core/src/components/Select/Select.tsx b/packages/react-core/src/components/Select/Select.tsx index fc8393ac1db..ca2ce1def12 100644 --- a/packages/react-core/src/components/Select/Select.tsx +++ b/packages/react-core/src/components/Select/Select.tsx @@ -183,8 +183,6 @@ export interface SelectProps * appended inline, e.g. `menuAppendTo="parent"` */ isFlipEnabled?: boolean; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; /** Value to overwrite the randomly generated data-ouia-component-id.*/ ouiaId?: number | string; /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */ @@ -265,8 +263,7 @@ export class Select extends React.Component )} diff --git a/packages/react-core/src/components/Tabs/OverflowTab.tsx b/packages/react-core/src/components/Tabs/OverflowTab.tsx index faf696d6979..0ba47419e4f 100644 --- a/packages/react-core/src/components/Tabs/OverflowTab.tsx +++ b/packages/react-core/src/components/Tabs/OverflowTab.tsx @@ -19,8 +19,6 @@ export interface OverflowTabProps extends React.HTMLProps { defaultTitleText?: string; /** The aria label applied to the button which toggles the tab overflow menu */ toggleAriaLabel?: string; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; } export const OverflowTab: React.FunctionComponent = ({ @@ -29,7 +27,6 @@ export const OverflowTab: React.FunctionComponent = ({ showTabCount, defaultTitleText = 'More', toggleAriaLabel, - removeFindDomNode = false, ...props }: OverflowTabProps) => { const menuRef = React.useRef(); @@ -138,7 +135,6 @@ export const OverflowTab: React.FunctionComponent = ({ isVisible={isExpanded} popperMatchesTriggerWidth={false} appendTo={overflowLIRef.current} - removeFindDomNode={removeFindDomNode} /> ); }; diff --git a/packages/react-core/src/components/TimePicker/TimePicker.tsx b/packages/react-core/src/components/TimePicker/TimePicker.tsx index 3983310965b..ea83d55ae75 100644 --- a/packages/react-core/src/components/TimePicker/TimePicker.tsx +++ b/packages/react-core/src/components/TimePicker/TimePicker.tsx @@ -71,8 +71,6 @@ export interface TimePickerProps isOpen?: boolean; /** Handler invoked each time the open state of time picker updates */ setIsOpen?: (isOpen?: boolean) => void; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; } interface TimePickerState { @@ -110,8 +108,7 @@ export class TimePicker extends React.Component {}, - removeFindDomNode: false + setIsOpen: () => {} }; constructor(props: TimePickerProps) { @@ -444,7 +441,6 @@ export class TimePicker extends React.Component diff --git a/packages/react-core/src/components/Tooltip/Tooltip.tsx b/packages/react-core/src/components/Tooltip/Tooltip.tsx index 8fe2c413df8..816bf24a63c 100644 --- a/packages/react-core/src/components/Tooltip/Tooltip.tsx +++ b/packages/react-core/src/components/Tooltip/Tooltip.tsx @@ -133,8 +133,6 @@ export interface TooltipProps extends Omit, 'con id?: string; /** CSS fade transition animation duration */ animationDuration?: number; - /** @beta Opt-in for updated popper that does not use findDOMNode. */ - removeFindDomNode?: boolean; } // id for associating trigger with the content aria-describedby or aria-labelledby @@ -162,7 +160,6 @@ export const Tooltip: React.FunctionComponent = ({ animationDuration = 300, reference, 'aria-live': ariaLive = reference ? 'polite' : 'off', - removeFindDomNode = false, onTooltipHidden = () => {}, ...rest }: TooltipProps) => { @@ -338,7 +335,6 @@ export const Tooltip: React.FunctionComponent = ({ enableFlip={enableFlip} zIndex={zIndex} flipBehavior={flipBehavior} - removeFindDomNode={removeFindDomNode} /> ); }; diff --git a/packages/react-core/src/helpers/Popper/FindRefWrapper.tsx b/packages/react-core/src/helpers/Popper/FindRefWrapper.tsx deleted file mode 100644 index fd7ec45959e..00000000000 --- a/packages/react-core/src/helpers/Popper/FindRefWrapper.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import * as React from 'react'; -import * as ReactDOM from 'react-dom'; - -interface FindRefWrapperProps { - children: React.ReactNode; - onFoundRef: any; -} - -/** - * This component wraps any ReactNode and finds its ref - * It has to be a class for findDOMNode to work - * Ideally, all components used as triggers/toggles are either: - * - class based components we can assign our own ref to - * - functional components that have forwardRef implemented - * However, there is no guarantee that is what will get passed in as trigger/toggle in the case of tooltips and popovers - */ -export class FindRefWrapper extends React.Component { - static displayName = 'FindRefWrapper'; - componentDidMount() { - // eslint-disable-next-line react/no-find-dom-node - const root = ReactDOM.findDOMNode(this); - this.props.onFoundRef(root); - } - - render() { - return this.props.children || null; - } -} diff --git a/packages/react-core/src/helpers/Popper/Popper.tsx b/packages/react-core/src/helpers/Popper/Popper.tsx index 7ed5a3a07ed..a936d82a183 100644 --- a/packages/react-core/src/helpers/Popper/Popper.tsx +++ b/packages/react-core/src/helpers/Popper/Popper.tsx @@ -3,7 +3,6 @@ import * as ReactDOM from 'react-dom'; import { usePopper } from './thirdparty/react-popper/usePopper'; import { Placement, Modifier } from './thirdparty/popper-core'; import { css } from '@patternfly/react-styles'; -import { FindRefWrapper } from './FindRefWrapper'; import '@patternfly/react-styles/css/components/Popper/Popper.css'; const hash = { @@ -54,7 +53,6 @@ export interface PopperProps { /** * The reference element to which the Popover is relatively placed to. * Use either trigger or reference, not both. - * Passing this property or the removeFindDomNode property, will bypass the use of findDOMNode for the trigger in react strict mode. */ reference?: HTMLElement | (() => HTMLElement) | React.RefObject; /** The popper (menu/tooltip/popover) element */ @@ -139,9 +137,7 @@ export interface PopperProps { | 'right-start' | 'right-end' )[]; - /** @beta Bypasses the use of findDOMNode for both the popper and trigger in react strict mode. Without this flag, the trigger and popper will require passed references via the reference property (trigger) and popperRef property (popper) for strict mode. */ - removeFindDomNode?: boolean; - /** @beta Reference to the popper (menu/tooltip/popover) element. Passing this property or the removeFindDomNode property, will bypass the use of findDOMNode for the popper in react strict mode. The popper property is still required. */ + /** @beta Reference to the popper (menu/tooltip/popover) element. */ popperRef?: HTMLElement | (() => HTMLElement) | React.RefObject; } @@ -171,7 +167,6 @@ export const Popper: React.FunctionComponent = ({ enableFlip = true, flipBehavior = 'flip', reference, - removeFindDomNode = false, popperRef }) => { const [triggerElement, setTriggerElement] = React.useState(null); @@ -357,40 +352,25 @@ export const Popper: React.FunctionComponent = ({ return appendTo; }; - /** - * To enable strict mode, the popper must either have its reference defined via the popperRef property, - * or the removeFindDomNode flag must be present. Even if the reference is passed in, unlike the trigger, - * the popper property must still be passed. - * The trigger must similarly have either its reference defined via the reference property, or the - * removeFindDomNode flag must be present. The trigger property is not required when the reference is passed. - * - * Strict mode may be enabled by passing both reference properties to Popper, or by passing the - * removeFindDomNode flag with either reference property, or by solely passing the removeFindDomNode - * flag. - */ - let popperPortal; - if (removeFindDomNode) { - // If removeFindDomNode is passed, use the removeFindDomNode method of wrapping divs - popperPortal =
setPopperElement(node?.firstElementChild as HTMLElement)}>{menuWithPopper}
; - } else if (popperRef) { - // If removeFindDomNode is not passed and popperRef is passed, use the popperRef method - popperPortal = menuWithPopper; - } else { - // If neither removeFindDomNode and popperRef exist, use the old method of FindRefWrapper - popperPortal = ( - setPopperElement(foundRef)}>{menuWithPopper} - ); - } - return ( <> - {!reference && trigger && React.isValidElement(trigger) && !removeFindDomNode && ( - setTriggerElement(foundRef)}>{trigger} - )} - {!reference && trigger && React.isValidElement(trigger) && removeFindDomNode && ( -
setTriggerElement(node?.firstElementChild as HTMLElement)}>{trigger}
+ {!reference && trigger && React.isValidElement(trigger) && ( +
setTriggerElement(node?.firstElementChild as HTMLElement)}> + {trigger} +
)} - {ready && isVisible && ReactDOM.createPortal(popperPortal, getTarget())} + {ready && + isVisible && + ReactDOM.createPortal( + popperRef ? ( + menuWithPopper + ) : ( +
setPopperElement(node?.firstElementChild as HTMLElement)}> + {menuWithPopper} +
+ ), + getTarget() + )} ); }; diff --git a/packages/react-core/src/next/components/Dropdown/Dropdown.tsx b/packages/react-core/src/next/components/Dropdown/Dropdown.tsx index 83a9996ee1a..d5a1e15eb8e 100644 --- a/packages/react-core/src/next/components/Dropdown/Dropdown.tsx +++ b/packages/react-core/src/next/components/Dropdown/Dropdown.tsx @@ -115,7 +115,6 @@ const DropdownBase: React.FunctionComponent = ({
= ({
Date: Tue, 1 Nov 2022 13:35:57 -0400 Subject: [PATCH 2/4] update tests --- .../__snapshots__/CatalogTile.test.tsx.snap | 200 +++--- .../__snapshots__/CodeEditor.test.tsx.snap | 138 ++-- .../__tests__/ApplicationLauncher.test.tsx | 10 +- .../ApplicationLauncher.test.tsx.snap | 29 +- .../__snapshots__/ClipboardCopy.test.tsx.snap | 50 +- .../ClipboardCopyButton.test.tsx.snap | 50 +- .../__tests__/ContextSelector.test.tsx | 2 +- .../__snapshots__/DatePicker.test.tsx.snap | 68 +- .../Dropdown/__tests__/Dropdown.test.tsx | 1 - .../src/components/Nav/__tests__/Nav.test.tsx | 2 +- .../__tests__/OptionsMenu.test.tsx | 1 - .../__snapshots__/Popover.test.tsx.snap | 40 +- .../__tests__/SearchInput.test.tsx | 1 - .../__snapshots__/SearchInput.test.tsx.snap | 662 +++++++++--------- .../Select/__tests__/Select.test.tsx | 11 +- .../__snapshots__/Slider.test.tsx.snap | 24 +- .../src/components/Tabs/OverflowTab.tsx | 18 +- .../Tabs/__tests__/OverflowTab.test.tsx | 1 - .../TimePicker/__tests__/TimePicker.test.tsx | 2 +- .../__snapshots__/Tooltip.test.tsx.snap | 12 +- .../Generated/FindRefWrapper.test.tsx | 11 - .../FindRefWrapper.test.tsx.snap | 9 - .../cypress/integration/alert.spec.ts | 2 +- .../cypress/integration/datepicker.spec.ts | 1 + .../integration/descriptionlist.spec.ts | 2 +- .../cypress/integration/dropdown.spec.ts | 4 +- .../notificationdrawerbasic.spec.ts | 4 +- .../notificationdrawergroups.spec.ts | 4 +- .../TopologyControlBar.test.tsx.snap | 372 +++++----- 29 files changed, 910 insertions(+), 821 deletions(-) delete mode 100644 packages/react-core/src/helpers/Popper/__tests__/Generated/FindRefWrapper.test.tsx delete mode 100644 packages/react-core/src/helpers/Popper/__tests__/Generated/__snapshots__/FindRefWrapper.test.tsx.snap diff --git a/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap b/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap index f8a94f89095..4033ee84f46 100644 --- a/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap +++ b/packages/react-catalog-view-extension/src/components/CatalogTile/__snapshots__/CatalogTile.test.tsx.snap @@ -65,28 +65,32 @@ exports[`CatalogTile renders properly 1`] = ` class="catalog-tile-pf-badge-container" > - - - Certified + + + Certified + - +
- - - Certified + + + Certified + - +
- - - USDA Approved + + + USDA Approved + - + @@ -266,28 +278,32 @@ exports[`CatalogTile renders properly 1`] = ` class="catalog-tile-pf-badge-container" > - - - USDA Approved + + + USDA Approved + - + @@ -340,28 +356,32 @@ exports[`CatalogTile renders properly 1`] = ` class="catalog-tile-pf-badge-container" > - - - Certified + + + Certified + - + diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap index 62ff4d89587..3edfa6df0dd 100644 --- a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap +++ b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap @@ -16,75 +16,87 @@ exports[`CodeEditor matches snapshot with all props 1`] = `
- - +
+
- - - +
+
- - + + +
{ test('custom icon', () => { const { asFragment } = render( - - } /> - + } /> ); expect(asFragment()).toMatchSnapshot(); }); test('Renders in strict mode', () => { const consoleError = jest.spyOn(console, 'error'); - const { asFragment } = render(); + const { asFragment } = render( + + {' '} + + ); expect(consoleError).not.toHaveBeenCalled(); expect(asFragment()).toMatchSnapshot(); }); diff --git a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap index 478ec5517a2..76aba94ee2f 100644 --- a/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap +++ b/packages/react-core/src/components/ApplicationLauncher/__tests__/__snapshots__/ApplicationLauncher.test.tsx.snap @@ -16,7 +16,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = ` data-ouia-component-id="OUIA-Generated-DropdownToggle-8" data-ouia-component-type="PF4/DropdownToggle" data-ouia-safe="true" - id="pf-dropdown-toggle-id-7" + id="pf-dropdown-toggle-id-6" type="button" > @@ -36,7 +36,7 @@ exports[`ApplicationLauncher Renders in strict mode 1`] = ` + `; @@ -159,7 +160,7 @@ exports[`ApplicationLauncher custom icon 1`] = ` aria-haspopup="true" aria-label="Application launcher" class="pf-c-app-launcher__toggle" - data-ouia-component-id="OUIA-Generated-DropdownToggle-7" + data-ouia-component-id="OUIA-Generated-DropdownToggle-6" data-ouia-component-type="PF4/DropdownToggle" data-ouia-safe="true" id="pf-dropdown-toggle-id-5" @@ -193,7 +194,7 @@ exports[`ApplicationLauncher custom icon 1`] = ` - + + +
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap index a736ec271d5..c4f121ead8e 100644 --- a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap +++ b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap @@ -2,30 +2,34 @@ exports[`copy button render 1`] = ` - + + + `; diff --git a/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx b/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx index 50b1a58f065..d0fcc7fc758 100644 --- a/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx +++ b/packages/react-core/src/components/ContextSelector/__tests__/ContextSelector.test.tsx @@ -33,7 +33,7 @@ describe('ContextSelector', () => { const consoleError = jest.spyOn(console, 'error'); const { asFragment } = render( - + {items} diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap index 9a4bb7ed87c..7f443f9bb13 100644 --- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap +++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap @@ -7,43 +7,47 @@ exports[`disabled date picker 1`] = ` style="--pf-c-date-picker__input--c-form-control--width-chars: 10;" >
- - + + +
diff --git a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx index 0a26700b785..77e6fd7abc0 100644 --- a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx +++ b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx @@ -132,7 +132,6 @@ describe('Dropdown', () => { isOpen dropdownItems={dropdownItems} toggle={Dropdown} - removeFindDomNode /> ); diff --git a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx index 2c471ccfd54..306266cef77 100644 --- a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx +++ b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx @@ -48,7 +48,7 @@ describe('Nav', () => {