@wordpress/block-library 9.30.1-next.836ecdcae.0 → 9.31.0

package/build-types/table-of-contents/list.d.ts

@@ -6,9 +6,10 @@ import type { MouseEvent, ReactElement } from 'react';
  * Internal dependencies
  */
 import type { NestedHeadingData } from './utils';
-export default function TableOfContentsList({ nestedHeadingList, disableLinkActivation, onClick, }: {
+export default function TableOfContentsList({ nestedHeadingList, disableLinkActivation, onClick, ordered, }: {
     nestedHeadingList: NestedHeadingData[];
     disableLinkActivation?: boolean;
     onClick?: (event: MouseEvent<HTMLAnchorElement>) => void;
+    ordered?: boolean;
 }): ReactElement;
 //# sourceMappingURL=list.d.ts.map

package/build-types/table-of-contents/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/table-of-contents/list.tsx"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAEtD;;GAEG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAIjD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,EAC5C,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,GACP,EAAE;IACF,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;IACvC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,CAAE,KAAK,EAAE,UAAU,CAAE,iBAAiB,CAAE,KAAM,IAAI,CAAC;CAC7D,GAAI,YAAY,CAgDhB"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/table-of-contents/list.tsx"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAEtD;;GAEG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAIjD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,EAC5C,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACP,OAAc,GACd,EAAE;IACF,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;IACvC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,CAAE,KAAK,EAAE,UAAU,CAAE,iBAAiB,CAAE,KAAM,IAAI,CAAC;IAC7D,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB,GAAI,YAAY,CAmDhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "9.30.1-next.836ecdcae.0",
+	"version": "9.31.0",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -42,39 +42,39 @@
 	],
 	"dependencies": {
 		"@babel/runtime": "7.25.7",
-		"@wordpress/a11y": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/api-fetch": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/autop": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/blob": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/block-editor": "^15.3.1-next.836ecdcae.0",
-		"@wordpress/blocks": "^15.3.1-next.836ecdcae.0",
-		"@wordpress/components": "^30.3.2-next.836ecdcae.0",
-		"@wordpress/compose": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/core-data": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/data": "^10.30.1-next.836ecdcae.0",
-		"@wordpress/date": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/deprecated": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/dom": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/element": "^6.30.1-next.836ecdcae.0",
-		"@wordpress/escape-html": "^3.30.1-next.836ecdcae.0",
-		"@wordpress/hooks": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/html-entities": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/i18n": "^6.3.1-next.836ecdcae.0",
-		"@wordpress/icons": "^10.30.1-next.836ecdcae.0",
-		"@wordpress/interactivity": "^6.30.1-next.836ecdcae.0",
-		"@wordpress/interactivity-router": "^2.30.1-next.836ecdcae.0",
-		"@wordpress/keyboard-shortcuts": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/keycodes": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/notices": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/patterns": "^2.30.1-next.836ecdcae.0",
-		"@wordpress/primitives": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/private-apis": "^1.30.1-next.836ecdcae.0",
-		"@wordpress/reusable-blocks": "^5.30.1-next.836ecdcae.0",
-		"@wordpress/rich-text": "^7.30.1-next.836ecdcae.0",
-		"@wordpress/server-side-render": "^6.6.1-next.836ecdcae.0",
-		"@wordpress/url": "^4.30.1-next.836ecdcae.0",
-		"@wordpress/viewport": "^6.30.1-next.836ecdcae.0",
-		"@wordpress/wordcount": "^4.30.1-next.836ecdcae.0",
+		"@wordpress/a11y": "^4.31.0",
+		"@wordpress/api-fetch": "^7.31.0",
+		"@wordpress/autop": "^4.31.0",
+		"@wordpress/blob": "^4.31.0",
+		"@wordpress/block-editor": "^15.4.0",
+		"@wordpress/blocks": "^15.4.0",
+		"@wordpress/components": "^30.4.0",
+		"@wordpress/compose": "^7.31.0",
+		"@wordpress/core-data": "^7.31.0",
+		"@wordpress/data": "^10.31.0",
+		"@wordpress/date": "^5.31.0",
+		"@wordpress/deprecated": "^4.31.0",
+		"@wordpress/dom": "^4.31.0",
+		"@wordpress/element": "^6.31.0",
+		"@wordpress/escape-html": "^3.31.0",
+		"@wordpress/hooks": "^4.31.0",
+		"@wordpress/html-entities": "^4.31.0",
+		"@wordpress/i18n": "^6.4.0",
+		"@wordpress/icons": "^10.31.0",
+		"@wordpress/interactivity": "^6.31.0",
+		"@wordpress/interactivity-router": "^2.31.0",
+		"@wordpress/keyboard-shortcuts": "^5.31.0",
+		"@wordpress/keycodes": "^4.31.0",
+		"@wordpress/notices": "^5.31.0",
+		"@wordpress/patterns": "^2.31.0",
+		"@wordpress/primitives": "^4.31.0",
+		"@wordpress/private-apis": "^1.31.0",
+		"@wordpress/reusable-blocks": "^5.31.0",
+		"@wordpress/rich-text": "^7.31.0",
+		"@wordpress/server-side-render": "^6.7.0",
+		"@wordpress/url": "^4.31.0",
+		"@wordpress/viewport": "^6.31.0",
+		"@wordpress/wordcount": "^4.31.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
@@ -92,5 +92,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "3e60b4c1e78d7b27acbf1d7dd172bbd64358a0f2"
+	"gitHead": "d7601d30d49462ea942168e8ab6bf449fb93097e"
 }

package/src/button/edit.js

@@ -27,6 +27,7 @@ import {
 	TextControl,
 	ToolbarButton,
 	Popover,
+	ExternalLink,
 	__experimentalToolsPanel as ToolsPanel,
 	__experimentalToolsPanelItem as ToolsPanelItem,
 	__experimentalToggleGroupControl as ToggleGroupControl,
@@ -474,7 +475,17 @@ function ButtonEdit( props ) {
 					<TextControl
 						__next40pxDefaultSize
 						__nextHasNoMarginBottom
-						label={ __( 'Link rel' ) }
+						label={ __( 'Link relation' ) }
+						help={ createInterpolateElement(
+							__(
+								'The <a>Link Relation</a> attribute defines the relationship between a linked resource and the current document.'
+							),
+							{
+								a: (
+									<ExternalLink href="https://developer.mozilla.org/docs/Web/HTML/Attributes/rel" />
+								),
+							}
+						) }
 						value={ rel || '' }
 						onChange={ ( newRel ) =>
 							setAttributes( { rel: newRel } )

package/src/button/edit.native.js

@@ -180,7 +180,7 @@ function ButtonEdit( props ) {
 			label: __( 'Open in new tab' ),
 		},
 		linkRel: {
-			label: __( 'Link Rel' ),
+			label: __( 'Link relation' ),
 			placeholder: _x( 'None', 'Link rel attribute value placeholder' ),
 		},
 	};

package/src/buttons/block.json

@@ -62,7 +62,8 @@
 		},
 		"interactivity": {
 			"clientNavigation": true
-		}
+		},
+		"contentRole": true
 	},
 	"editorStyle": "wp-block-buttons-editor",
 	"style": "wp-block-buttons"

package/src/categories/edit.js

@@ -52,7 +52,8 @@ export default function CategoriesEdit( {
 
 	const { records: allTaxonomies, isResolvingTaxonomies } = useEntityRecords(
 		'root',
-		'taxonomy'
+		'taxonomy',
+		{ per_page: -1 }
 	);
 
 	const taxonomies = allTaxonomies?.filter( ( t ) => t.visibility.public );

package/src/editor.scss

@@ -46,6 +46,7 @@
 @import "./table/editor.scss";
 @import "./tag-cloud/editor.scss";
 @import "./template-part/editor.scss";
+@import "./term-template/editor.scss";
 @import "./text-columns/editor.scss";
 @import "./video/editor.scss";
 @import "./query/editor.scss";

package/src/image/edit.native.js

@@ -147,7 +147,7 @@ function LinkSettings( {
 			label: __( 'Open in new tab' ),
 		},
 		linkRel: {
-			label: __( 'Link Rel' ),
+			label: __( 'Link relation' ),
 			placeholder: _x( 'None', 'Link rel attribute value placeholder' ),
 		},
 	};

package/src/image/image.js

@@ -625,7 +625,7 @@ export default function Image( {
 		lockAltControlsMessage,
 		lockTitleControls = false,
 		lockTitleControlsMessage,
-		lockCaption = false,
+		hideCaptionControls = false,
 	} = useSelect(
 		( select ) => {
 			if ( ! isSingleSelected ) {
@@ -635,6 +635,7 @@ export default function Image( {
 				url: urlBinding,
 				alt: altBinding,
 				title: titleBinding,
+				caption: captionBinding,
 			} = metadata?.bindings || {};
 			const hasParentPattern = !! context[ 'pattern/overrides' ];
 			const urlBindingSource = getBlockBindingsSource(
@@ -658,10 +659,7 @@ export default function Image( {
 					// Disable editing the link of the URL if the image is inside a pattern instance.
 					// This is a temporary solution until we support overriding the link on the frontend.
 					hasParentPattern || arePatternOverridesEnabled,
-				lockCaption:
-					// Disable editing the caption if the image is inside a pattern instance.
-					// This is a temporary solution until we support overriding the caption on the frontend.
-					hasParentPattern,
+				hideCaptionControls: !! captionBinding,
 				lockAltControls:
 					!! altBinding &&
 					! altBindingSource?.canUserEditValue?.( {
@@ -1147,10 +1145,9 @@ export default function Image( {
 				label={ __( 'Image caption text' ) }
 				showToolbarButton={
 					isSingleSelected &&
-					hasNonContentControls &&
-					! arePatternOverridesEnabled
+					( hasNonContentControls || isContentOnlyMode ) &&
+					! hideCaptionControls
 				}
-				readOnly={ lockCaption }
 			/>
 		</>
 	);

package/src/image/save.js

@@ -31,6 +31,7 @@ export default function save( { attributes } ) {
 		linkTarget,
 		sizeSlug,
 		title,
+		metadata: { bindings = {} } = {},
 	} = attributes;
 
 	const newRel = ! rel ? undefined : rel;
@@ -70,6 +71,11 @@ export default function save( { attributes } ) {
 		/>
 	);
 
+	const displayCaption =
+		! RichText.isEmpty( caption ) ||
+		bindings.caption ||
+		bindings?.__default?.source === 'core/pattern-overrides';
+
 	const figure = (
 		<>
 			{ href ? (
@@ -84,7 +90,7 @@ export default function save( { attributes } ) {
 			) : (
 				image
 			) }
-			{ ! RichText.isEmpty( caption ) && (
+			{ displayCaption && (
 				<RichText.Content
 					className={ __experimentalGetElementClassName( 'caption' ) }
 					tagName="figcaption"

package/src/index.js

@@ -122,6 +122,8 @@ import * as tableOfContents from './table-of-contents';
 import * as tagCloud from './tag-cloud';
 import * as templatePart from './template-part';
 import * as termDescription from './term-description';
+import * as termsQuery from './terms-query';
+import * as termTemplate from './term-template';
 import * as textColumns from './text-columns';
 import * as verse from './verse';
 import * as video from './video';
@@ -244,6 +246,8 @@ const getAllBlocks = () => {
 		blocks.push( accordionContent );
 		blocks.push( accordionHeader );
 		blocks.push( accordionPanel );
+		blocks.push( termsQuery );
+		blocks.push( termTemplate );
 	}
 
 	if ( window?.__experimentalEnableFormBlocks ) {

package/src/navigation/edit/index.js

@@ -112,7 +112,6 @@ function NavigationAddPageButton( { clientId } ) {
 				<ToolbarButton
 					name="add-page"
 					icon={ page }
-					title={ __( 'Add page' ) }
 					onClick={ onAddPage }
 				>
 					{ __( 'Add page' ) }

package/src/navigation-link/block-inserter.js

@@ -0,0 +1,65 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import {
+	store as blockEditorStore,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import DialogWrapper from './dialog-wrapper';
+import { unlock } from '../lock-unlock';
+
+const { PrivateQuickInserter: QuickInserter } = unlock(
+	blockEditorPrivateApis
+);
+
+/**
+ * Component for inserting blocks within the Navigation Link UI.
+ *
+ * @param {Object}   props               Component props.
+ * @param {string}   props.clientId      Client ID of the navigation link block.
+ * @param {Function} props.onBack        Callback when user wants to go back.
+ * @param {Function} props.onBlockInsert Callback when a block is inserted.
+ */
+function LinkUIBlockInserter( { clientId, onBack, onBlockInsert } ) {
+	const { rootBlockClientId } = useSelect(
+		( select ) => {
+			const { getBlockRootClientId } = select( blockEditorStore );
+
+			return {
+				rootBlockClientId: getBlockRootClientId( clientId ),
+			};
+		},
+		[ clientId ]
+	);
+
+	if ( ! clientId ) {
+		return null;
+	}
+
+	return (
+		<DialogWrapper
+			className="link-ui-block-inserter"
+			title={ __( 'Add block' ) }
+			description={ __( 'Choose a block to add to your Navigation.' ) }
+			onBack={ onBack }
+		>
+			<QuickInserter
+				rootClientId={ rootBlockClientId }
+				clientId={ clientId }
+				isAppender={ false }
+				prioritizePatterns={ false }
+				selectBlockOnInsert={ ! onBlockInsert }
+				onSelect={ onBlockInsert ? onBlockInsert : undefined }
+				hasSearch={ false }
+			/>
+		</DialogWrapper>
+	);
+}
+
+export default LinkUIBlockInserter;

package/src/navigation-link/dialog-wrapper.js

@@ -0,0 +1,74 @@
+/**
+ * WordPress dependencies
+ */
+import { Button, VisuallyHidden } from '@wordpress/components';
+import { __, isRTL } from '@wordpress/i18n';
+import { chevronLeftSmall, chevronRightSmall } from '@wordpress/icons';
+import { useInstanceId, useFocusOnMount } from '@wordpress/compose';
+
+/**
+ * Shared BackButton component for consistent navigation across LinkUI sub-components.
+ *
+ * @param {Object}   props           Component props.
+ * @param {string}   props.className CSS class name for the button.
+ * @param {Function} props.onBack    Callback when user wants to go back.
+ */
+function BackButton( { className, onBack } ) {
+	return (
+		<Button
+			className={ className }
+			icon={ isRTL() ? chevronRightSmall : chevronLeftSmall }
+			onClick={ ( e ) => {
+				e.preventDefault();
+				onBack();
+			} }
+			size="small"
+		>
+			{ __( 'Back' ) }
+		</Button>
+	);
+}
+
+/**
+ * Shared DialogWrapper component for consistent dialog structure across LinkUI sub-components.
+ *
+ * @param {Object}   props             Component props.
+ * @param {string}   props.className   CSS class name for the dialog container.
+ * @param {string}   props.title       Dialog title for accessibility.
+ * @param {string}   props.description Dialog description for accessibility.
+ * @param {Function} props.onBack      Callback when user wants to go back.
+ * @param {Object}   props.children    Child components to render inside the dialog.
+ */
+function DialogWrapper( { className, title, description, onBack, children } ) {
+	const dialogTitleId = useInstanceId(
+		DialogWrapper,
+		'link-ui-dialog-title'
+	);
+	const dialogDescriptionId = useInstanceId(
+		DialogWrapper,
+		'link-ui-dialog-description'
+	);
+	const focusOnMountRef = useFocusOnMount( 'firstElement' );
+	const backButtonClassName = `${ className }__back`;
+
+	return (
+		<div
+			className={ className }
+			role="dialog"
+			aria-labelledby={ dialogTitleId }
+			aria-describedby={ dialogDescriptionId }
+			ref={ focusOnMountRef }
+		>
+			<VisuallyHidden>
+				<h2 id={ dialogTitleId }>{ title }</h2>
+				<p id={ dialogDescriptionId }>{ description }</p>
+			</VisuallyHidden>
+
+			<BackButton className={ backButtonClassName } onBack={ onBack } />
+
+			{ children }
+		</div>
+	);
+}
+
+export default DialogWrapper;

package/src/navigation-link/link-ui.js

@@ -8,13 +8,8 @@ import {
 	VisuallyHidden,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
-import { __, isRTL } from '@wordpress/i18n';
-import {
-	LinkControl,
-	store as blockEditorStore,
-	privateApis as blockEditorPrivateApis,
-	useBlockEditingMode,
-} from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+import { LinkControl, useBlockEditingMode } from '@wordpress/block-editor';
 import {
 	useMemo,
 	useState,
@@ -23,19 +18,14 @@ import {
 	forwardRef,
 } from '@wordpress/element';
 import { useResourcePermissions } from '@wordpress/core-data';
-import { useSelect } from '@wordpress/data';
-import { chevronLeftSmall, chevronRightSmall, plus } from '@wordpress/icons';
-import { useInstanceId, useFocusOnMount } from '@wordpress/compose';
+import { plus } from '@wordpress/icons';
+import { useInstanceId } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
-import { unlock } from '../lock-unlock';
 import { LinkUIPageCreator } from './page-creator';
-
-const { PrivateQuickInserter: QuickInserter } = unlock(
-	blockEditorPrivateApis
-);
+import LinkUIBlockInserter from './block-inserter';
 
 /**
  * Given the Link block's type attribute, return the query params to give to
@@ -75,74 +65,6 @@ export function getSuggestionsQuery( type, kind ) {
 	}
 }
 
-function LinkUIBlockInserter( { clientId, onBack, onBlockInsert } ) {
-	const { rootBlockClientId } = useSelect(
-		( select ) => {
-			const { getBlockRootClientId } = select( blockEditorStore );
-
-			return {
-				rootBlockClientId: getBlockRootClientId( clientId ),
-			};
-		},
-		[ clientId ]
-	);
-
-	const focusOnMountRef = useFocusOnMount( 'firstElement' );
-
-	const dialogTitleId = useInstanceId(
-		LinkControl,
-		`link-ui-block-inserter__title`
-	);
-	const dialogDescriptionId = useInstanceId(
-		LinkControl,
-		`link-ui-block-inserter__description`
-	);
-
-	if ( ! clientId ) {
-		return null;
-	}
-
-	return (
-		<div
-			className="link-ui-block-inserter"
-			role="dialog"
-			aria-labelledby={ dialogTitleId }
-			aria-describedby={ dialogDescriptionId }
-			ref={ focusOnMountRef }
-		>
-			<VisuallyHidden>
-				<h2 id={ dialogTitleId }>{ __( 'Add block' ) }</h2>
-
-				<p id={ dialogDescriptionId }>
-					{ __( 'Choose a block to add to your Navigation.' ) }
-				</p>
-			</VisuallyHidden>
-
-			<Button
-				className="link-ui-block-inserter__back"
-				icon={ isRTL() ? chevronRightSmall : chevronLeftSmall }
-				onClick={ ( e ) => {
-					e.preventDefault();
-					onBack();
-				} }
-				size="small"
-			>
-				{ __( 'Back' ) }
-			</Button>
-
-			<QuickInserter
-				rootClientId={ rootBlockClientId }
-				clientId={ clientId }
-				isAppender={ false }
-				prioritizePatterns={ false }
-				selectBlockOnInsert={ ! onBlockInsert }
-				onSelect={ onBlockInsert ? onBlockInsert : undefined }
-				hasSearch={ false }
-			/>
-		</div>
-	);
-}
-
 function UnforwardedLinkUI( props, ref ) {
 	const { label, url, opensInNewTab, type, kind } = props.link;
 	const postType = type || 'page';
@@ -176,11 +98,11 @@ function UnforwardedLinkUI( props, ref ) {
 
 	const dialogTitleId = useInstanceId(
 		LinkUI,
-		`link-ui-link-control__title`
+		'link-ui-link-control__title'
 	);
 	const dialogDescriptionId = useInstanceId(
 		LinkUI,
-		`link-ui-link-control__description`
+		'link-ui-link-control__description'
 	);
 
 	const blockEditingMode = useBlockEditingMode();
@@ -220,8 +142,13 @@ function UnforwardedLinkUI( props, ref ) {
 						onChange={ props.onChange }
 						onRemove={ props.onRemove }
 						onCancel={ props.onCancel }
-						renderControlBottom={ () =>
-							! link?.url?.length && (
+						renderControlBottom={ () => {
+							// Don't show the tools when there is submitted link (preview state).
+							if ( link?.url?.length ) {
+								return null;
+							}
+
+							return (
 								<LinkUITools
 									focusAddBlockButton={ focusAddBlockButton }
 									focusAddPageButton={ focusAddPageButton }
@@ -233,11 +160,16 @@ function UnforwardedLinkUI( props, ref ) {
 										setAddingPage( true );
 										setFocusAddPageButton( false );
 									} }
-									canCreatePage={ permissions.canCreate }
-									blockEditingMode={ blockEditingMode }
+									canAddPage={
+										permissions?.canCreate &&
+										type === 'page'
+									}
+									canAddBlock={
+										blockEditingMode === 'default'
+									}
 								/>
-							)
-						}
+							);
+						} }
 					/>
 				</div>
 			) }
@@ -277,8 +209,8 @@ const LinkUITools = ( {
 	setAddingPage,
 	focusAddBlockButton,
 	focusAddPageButton,
-	canCreatePage,
-	blockEditingMode,
+	canAddPage,
+	canAddBlock,
 } ) => {
 	const blockInserterAriaRole = 'listbox';
 	const addBlockButtonRef = useRef();
@@ -298,9 +230,14 @@ const LinkUITools = ( {
 		}
 	}, [ focusAddPageButton ] );
 
+	// Don't render anything if neither button should be shown
+	if ( ! canAddPage && ! canAddBlock ) {
+		return null;
+	}
+
 	return (
 		<VStack spacing={ 0 } className="link-ui-tools">
-			{ canCreatePage && (
+			{ canAddPage && (
 				<Button
 					__next40pxDefaultSize
 					ref={ addPageButtonRef }
@@ -314,7 +251,7 @@ const LinkUITools = ( {
 					{ __( 'Create page' ) }
 				</Button>
 			) }
-			{ blockEditingMode === 'default' && (
+			{ canAddBlock && (
 				<Button
 					__next40pxDefaultSize
 					ref={ addBlockButtonRef }