Block Library: Handle Popover onClose for LinkControl

WordPress · Jan 24, 2020 · 24961ae · 24961ae
1 parent 361d2df
commit 24961ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
@@ -97,7 +97,10 @@ function URLPicker( { isSelected, url, title, setAttributes, opensInNewTab, onTo
 		setIsURLPickerOpen( true );
 	};
 	const linkControl = isURLPickerOpen && (
-		<Popover position="bottom center">
+		<Popover
+			position="bottom center"
+			onClose={ () => setIsURLPickerOpen( false ) }
+		>
 			<LinkControl
 				className="wp-block-navigation-link__inline-link-input"
 				value={ { url, title, opensInNewTab } }
@@ -111,9 +114,6 @@ function URLPicker( { isSelected, url, title, setAttributes, opensInNewTab, onTo
 						onToggleOpenInNewTab( newOpensInNewTab );
 					}
 				} }
-				onClose={ () => {
-					setIsURLPickerOpen( false );
-				} }
 			/>
 		</Popover>
 	);

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
@@ -175,7 +175,10 @@ function NavigationLinkEdit( {
 						</span>
 					}
 					{ isLinkOpen && (
-						<Popover position="bottom center">
+						<Popover
+							position="bottom center"
+							onClose={ () => setIsLinkOpen( false ) }
+						>
 							<LinkControl
 								className="wp-block-navigation-link__inline-link-input"
 								value={ link }
@@ -202,7 +205,6 @@ function NavigationLinkEdit( {
 									opensInNewTab: newOpensInNewTab,
 									id,
 								} ) }
-								onClose={ () => setIsLinkOpen( false ) }
 							/>
 						</Popover>
 					) }