Refactor the popover component using React Hooks (#15053)

WordPress · May 17, 2019 · a15cfa0 · a15cfa0
1 parent afd2fbe
commit a15cfa0
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 407 deletions.
diff --git a/packages/block-editor/src/components/url-popover/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/url-popover/test/__snapshots__/index.js.snap
@@ -4,7 +4,6 @@ exports[`URLPopover matches the snapshot in its default state 1`] = `
 <Popover
   className="editor-url-popover block-editor-url-popover"
   focusOnMount="firstElement"
-  noArrow={false}
   position="bottom center"
 >
   <div
@@ -28,7 +27,6 @@ exports[`URLPopover matches the snapshot when the settings are toggled open 1`]
 <Popover
   className="editor-url-popover block-editor-url-popover"
   focusOnMount="firstElement"
-  noArrow={false}
   position="bottom center"
 >
   <div
@@ -59,7 +57,6 @@ exports[`URLPopover matches the snapshot when there are no settings 1`] = `
 <Popover
   className="editor-url-popover block-editor-url-popover"
   focusOnMount="firstElement"
-  noArrow={false}
   position="bottom center"
 >
   <div

diff --git a/packages/components/src/dropdown-menu/test/index.js b/packages/components/src/dropdown-menu/test/index.js
@@ -14,7 +14,6 @@ import { Component } from '@wordpress/element';
  * Internal dependencies
  */
 import DropdownMenu from '../';
-import Popover from '../../popover';
 
 describe( 'DropdownMenu', () => {
 	let controls;
@@ -79,7 +78,7 @@ describe( 'DropdownMenu', () => {
 				}
 			);
 
-			expect( TestUtils.scryRenderedComponentsWithType( wrapper, Popover ) ).toHaveLength( 1 );
+			expect( TestUtils.scryRenderedDOMComponentsWithClass( wrapper, 'components-popover' ) ).toHaveLength( 1 );
 		} );
 	} );
 } );
diff --git a/packages/components/src/dropdown/test/index.js b/packages/components/src/dropdown/test/index.js
@@ -7,12 +7,11 @@ import TestUtils from 'react-dom/test-utils';
  * Internal dependencies
  */
 import Dropdown from '../';
-import Popover from '../../popover';
 
 describe( 'Dropdown', () => {
 	const expectPopoverVisible = ( wrapper, visible ) => {
 		expect(
-			TestUtils.scryRenderedComponentsWithType( wrapper, Popover ) )
+			TestUtils.scryRenderedDOMComponentsWithClass( wrapper, 'components-popover' ) )
 			.toHaveLength( visible ? 1 : 0 );
 	};
 	const buttonElement = ( wrapper ) => TestUtils.findRenderedDOMComponentWithTag(
@@ -31,13 +30,14 @@ describe( 'Dropdown', () => {
 				buttonElement( wrapper ).getAttribute( 'aria-expanded' )
 			).toBe( expanded.toString() );
 		};
+
 		const wrapper = TestUtils.renderIntoDocument( <Dropdown
 			className="container"
 			contentClassName="content"
 			renderToggle={ ( { isOpen, onToggle } ) => (
 				<button aria-expanded={ isOpen } onClick={ onToggle }>Toggleee</button>
 			) }
-			renderContent={ () => null }
+			renderContent={ () => <span>test</span> }
 		/> );
 
 		expectButtonExpanded( wrapper, false );