Navigation: URL, mailto, tel, and internal urls should be persisted a…

…s a custom type in block attributes
WordPress · May 1, 2021 · f77b6d7 · f77b6d7
1 parent c367c4e
commit f77b6d7
Show file tree

Hide file tree

Showing 3 changed files with 346 additions and 44 deletions.
diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
@@ -133,6 +133,50 @@ function getSuggestionsQuery( type, kind ) {
 	}
 }
 
+export const updateNavigationLinkBlockAttributes = (
+	updatedValue = {},
+	{ setAttributes, label = '' }
+) => {
+	const {
+		title = '',
+		url = '',
+		opensInNewTab,
+		id,
+		kind = '',
+		type = '',
+	} = updatedValue;
+
+	const normalizedTitle = title.replace( /http(s?):\/\//gi, '' );
+	const normalizedURL = url.replace( /http(s?):\/\//gi, '' );
+	const escapeTitle =
+		title !== '' && normalizedTitle !== normalizedURL && label !== title;
+	const newLabel = escapeTitle
+		? escape( title )
+		: label || escape( normalizedURL );
+
+	const isBuiltInType =
+		[ 'post', 'page', 'tag', 'category', 'post_type' ].indexOf( type ) > -1;
+
+	if ( ! kind && ! isBuiltInType ) {
+		return setAttributes( {
+			url: encodeURI( url ),
+			label: newLabel,
+			opensInNewTab,
+			...( Number.isInteger( id ) && { id } ),
+			kind: 'custom',
+		} );
+	}
+
+	return setAttributes( {
+		url: encodeURI( url ),
+		label: newLabel,
+		opensInNewTab,
+		...( Number.isInteger( id ) && { id } ),
+		...( kind && { kind } ),
+		...( type && { type } ),
+	} );
+};
+
 export default function NavigationLinkEdit( {
 	attributes,
 	isSelected,
@@ -519,49 +563,11 @@ export default function NavigationLinkEdit( {
 									type,
 									kind
 								) }
-								onChange={ ( {
-									title: newTitle = '',
-									url: newURL = '',
-									opensInNewTab: newOpensInNewTab,
-									id,
-									kind: newKind = '',
-									type: newType = '',
-								} = {} ) =>
-									setAttributes( {
-										url: encodeURI( newURL ),
-										label: ( () => {
-											const normalizedTitle = newTitle.replace(
-												/http(s?):\/\//gi,
-												''
-											);
-											const normalizedURL = newURL.replace(
-												/http(s?):\/\//gi,
-												''
-											);
-											if (
-												newTitle !== '' &&
-												normalizedTitle !==
-													normalizedURL &&
-												label !== newTitle
-											) {
-												return escape( newTitle );
-											} else if ( label ) {
-												return label;
-											}
-											// If there's no label, add the URL.
-											return escape( normalizedURL );
-										} )(),
-										opensInNewTab: newOpensInNewTab,
-										id,
-										...( newKind && {
-											kind: newKind,
-										} ),
-										...( newType &&
-											newType !== 'URL' &&
-											newType !== 'post-format' && {
-												type: newType,
-											} ),
-									} )
+								onChange={ ( updatedValue ) =>
+									updateNavigationLinkBlockAttributes(
+										updatedValue,
+										{ setAttributes, label }
+									)
 								}
 							/>
 						</Popover>