Integrate LinkControl changes

WordPress · Sep 22, 2020 · 78f0862 · 78f0862
1 parent ed1061a
commit 78f0862
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/packages/block-editor/src/components/block-toolbar-link-control/index.js b/packages/block-editor/src/components/block-toolbar-link-control/index.js
@@ -8,7 +8,7 @@ import { useCallback, useMemo, useState } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import BlockControls from '../block-controls';
+import BlockToolbarInlineEdit from '../block-toolbar-inline-edit';
 import SettingsToolbarItem from './settings-toolbar-item';
 import LinkInputToolbarItem from './link-input-toolbar-item';
 import computeDisplayUrl from './compute-display-url';
@@ -70,7 +70,7 @@ export default function ToolbarLinkControl( {
 	);
 
 	return (
-		<BlockControls __experimentalIsExpanded={ true }>
+		<BlockToolbarInlineEdit.Fill onClose={ close }>
 			<ToolbarLinkControlContext.Provider value={ contextValue }>
 				<ToolbarGroup>
 					<LinkInputToolbarItem />
@@ -86,6 +86,6 @@ export default function ToolbarLinkControl( {
 					</ToolbarButton>
 				</ToolbarGroup>
 			</ToolbarLinkControlContext.Provider>
-		</BlockControls>
+		</BlockToolbarInlineEdit.Fill>
 	);
 }
diff --git a/packages/block-editor/src/components/block-toolbar-link-control/link-input-toolbar-item.js b/packages/block-editor/src/components/block-toolbar-link-control/link-input-toolbar-item.js
@@ -7,7 +7,7 @@ import { unstable_CompositeItemWidget as ToolbarWidget } from 'reakit/Composite'
  * WordPress dependencies
  */
 import {
-	__experimentalToolbarItem as ToolbarItem,
+	ToolbarItem,
 	Popover,
 	__experimentalToolbarContext as ToolbarContext,
 	__experimentalInputControl as InputControl,

diff --git a/packages/block-editor/src/components/block-toolbar-link-control/settings-toolbar-item.js b/packages/block-editor/src/components/block-toolbar-link-control/settings-toolbar-item.js
@@ -5,7 +5,7 @@ import {
 	DropdownMenu,
 	MenuGroup,
 	MenuItem,
-	__experimentalToolbarItem as ToolbarItem,
+	ToolbarItem,
 } from '@wordpress/components';
 import {
 	chevronDown as arrowDownIcon,

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
@@ -152,8 +152,6 @@ function NavigationLinkEdit( {
 	} = attributes;
 	const link = {
 		url,
-		rel,
-		label,
 		opensInNewTab,
 	};
 	const { saveEntityRecord } = useDispatch( 'core' );
@@ -271,7 +269,7 @@ function NavigationLinkEdit( {
 			{ isExperimentalNavScreen && isLinkOpen && (
 				<BlockToolbarLinkControl
 					initialLink={ link }
-					createSuggestion={ handleCreatePage }
+					createSuggestion={ handleCreate }
 					close={ () => setIsLinkOpen( false ) }
 					onChange={ ( args ) => setAttributes( args ) }
 				/>

diff --git a/packages/edit-navigation/src/index.js b/packages/edit-navigation/src/index.js
@@ -125,6 +125,7 @@ export function initialize( id, settings ) {
 		fetchLinkSuggestions,
 		settings
 	);
+
 	settings.__experimentalNavigationScreen = true;
 
 	render(
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,6 +125,7 @@ export function initialize( id, settings ) { @@
     		fetchLinkSuggestions,
     		settings
     	);
     	settings.__experimentalNavigationScreen = true;
     	render(
@@ Expand Down @@