removes checking by type

also fixes LinkControl to not set URL as if for manual entries

packages/block-editor/src/components/link-control/index.js

@@ -269,7 +269,6 @@ function LinkControl( {
 
 		return Promise.resolve( [
 			{
-				id: val,
 				title: val,
 				url: type === 'URL' ? prependHTTP( val ) : val,
 				type,

packages/block-library/src/navigation-link/block.json

@@ -9,9 +9,6 @@
 			"type": "boolean",
 			"default": false
 		},
-		"type": {
-			"type": "string"
-		},
 		"description": {
 			"type": "string"
 		},

packages/block-library/src/navigation-link/edit.js

@@ -245,7 +245,6 @@ function NavigationLinkEdit( {
 									title: newTitle = '',
 									url: newURL = '',
 									opensInNewTab: newOpensInNewTab,
-									type,
 									id,
 								} = {} ) =>
 									setAttributes( {
@@ -273,8 +272,7 @@ function NavigationLinkEdit( {
 											return escape( normalizedURL );
 										} )(),
 										opensInNewTab: newOpensInNewTab,
-										type,
-										id,
+										id: id ? Number( id ) : undefined,
 									} )
 								}
 							/>

packages/block-library/src/navigation/index.php

@@ -216,23 +216,16 @@ function block_core_navigation_build_html( $attributes, $block, $colors, $font_s
 			( $is_active ? ' current-menu-item' : '' ) . '"' . $style_attribute . '>' .
 			'<a class="wp-block-navigation-link__content"';
 
-		// Start appending HTML attributes to anchor tag.
 		if (
-			isset( $block['attrs']['url'] ) &&
-			isset( $block['attrs']['type'] ) &&
-			'URL' === $block['attrs']['type']
+			isset( $block['attrs']['id'] )
 		) {
+			$html .= ' href="' .
+				esc_url( get_permalink( $block['attrs']['id'] ) ) .
+			'"';
+		} else {
 			$html .= ' href="' . esc_url( $block['attrs']['url'] ) . '"';
 		}
 
-		if (
-			isset( $block['attrs']['type'] ) &&
-			isset( $block['attrs']['id'] ) &&
-			'URL' !== $block['attrs']['type']
-		) {
-			$html .= ' href="' . get_permalink( $block['attrs']['id'] ) . '"';
-		}
-
 		if ( isset( $block['attrs']['opensInNewTab'] ) && true === $block['attrs']['opensInNewTab'] ) {
 			$html .= ' target="_blank"  ';
 		}

packages/e2e-tests/specs/experiments/__snapshots__/navigation.test.js.snap

@@ -9,16 +9,16 @@ exports[`Navigation allows a navigation menu to be created from an empty menu us
 
 exports[`Navigation allows a navigation menu to be created using existing pages 1`] = `
 "<!-- wp:navigation {\\"orientation\\":\\"horizontal\\"} -->
-<!-- wp:navigation-link {\\"label\\":\\"Home\\",\\"type\\":\\"page\\",\\"id\\":1,\\"url\\":\\"https://this/is/a/test/page/home\\"} /-->
+<!-- wp:navigation-link {\\"label\\":\\"Home\\",\\"id\\":1,\\"url\\":\\"https://this/is/a/test/page/home\\"} /-->
 
-<!-- wp:navigation-link {\\"label\\":\\"About\\",\\"type\\":\\"page\\",\\"id\\":2,\\"url\\":\\"https://this/is/a/test/page/about\\"} /-->
+<!-- wp:navigation-link {\\"label\\":\\"About\\",\\"id\\":2,\\"url\\":\\"https://this/is/a/test/page/about\\"} /-->
 
-<!-- wp:navigation-link {\\"label\\":\\"Contact Us\\",\\"type\\":\\"page\\",\\"id\\":3,\\"url\\":\\"https://this/is/a/test/page/contact\\"} /-->
+<!-- wp:navigation-link {\\"label\\":\\"Contact Us\\",\\"id\\":3,\\"url\\":\\"https://this/is/a/test/page/contact\\"} /-->
 <!-- /wp:navigation -->"
 `;
 
 exports[`Navigation allows pages to be created from the navigation block and their links added to menu 1`] = `
 "<!-- wp:navigation {\\"orientation\\":\\"horizontal\\"} -->
-<!-- wp:navigation-link {\\"label\\":\\"A really long page name that will not exist\\",\\"type\\":\\"page\\",\\"id\\":1,\\"url\\":\\"https://this/is/a/test/create/page/my-new-page\\"} /-->
+<!-- wp:navigation-link {\\"label\\":\\"A really long page name that will not exist\\",\\"id\\":1,\\"url\\":\\"https://this/is/a/test/create/page/my-new-page\\"} /-->
 <!-- /wp:navigation -->"
 `;