Edit Site: Append query vars in NavigateToLink properly.

WordPress · Feb 25, 2020 · 5432e83 · 5432e83
1 parent fef82a7
commit 5432e83
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
@@ -516,9 +516,10 @@ function LinkControl( {
 		);
 	};
 
-	const viewerSlotFillProps = useMemo( () => ( { url: value.url } ), [
-		value.url,
-	] );
+	const viewerSlotFillProps = useMemo(
+		() => ( { url: value && value.url } ),
+		[ value && value.url ]
+	);
 	return (
 		<div
 			tabIndex={ -1 }

diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
@@ -33,6 +33,7 @@
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/media-utils": "file:../media-utils",
 		"@wordpress/notices": "file:../notices",
+		"@wordpress/url": "file:../url",
 		"file-saver": "^2.0.2",
 		"jszip": "^3.2.2"
 	},

diff --git a/packages/edit-site/src/components/navigate-to-link/index.js b/packages/edit-site/src/components/navigate-to-link/index.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { useState, useEffect, useMemo } from '@wordpress/element';
+import { addQueryArgs } from '@wordpress/url';
 import { select } from '@wordpress/data';
 import { Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
@@ -22,7 +23,7 @@ export default function NavigateToLink( {
 		const effect = async () => {
 			try {
 				const { success, data } = await fetch(
-					`${ url }?_wp-find-template`
+					addQueryArgs( url, { '_wp-find-template': true } )
 				).then( ( res ) => res.json() );
 				if ( success ) {
 					let newTemplateId = data.ID;