@wordpress/block-library 9.45.1-next.v.202605131032.0 → 9.47.0

package/src/navigation-link/shared/use-handle-link-change.js

@@ -4,6 +4,8 @@
 import { useCallback } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
+import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+import { escapeHTML } from '@wordpress/escape-html';
 
 /**
  * Internal dependencies
@@ -16,13 +18,19 @@ import { useEntityBinding } from './use-entity-binding';
  * Manages the transition between entity links and custom links,
  * including proper binding creation and cleanup.
  *
- * @param {Object}   options               - Configuration options
- * @param {string}   options.clientId      - Block client ID
- * @param {Object}   options.attributes    - Current block attributes
- * @param {Function} options.setAttributes - Standard setAttribute function
+ * @param {Object}   options                 - Configuration options
+ * @param {string}   options.clientId        - Block client ID
+ * @param {Object}   options.attributes      - Current block attributes
+ * @param {Function} options.setAttributes   - Standard setAttribute function
+ * @param {boolean}  options.allowTextUpdate - Whether this control can update the link text
  * @return {Function} Callback function to handle link changes
  */
-export function useHandleLinkChange( { clientId, attributes, setAttributes } ) {
+export function useHandleLinkChange( {
+	clientId,
+	attributes,
+	setAttributes,
+	allowTextUpdate = false,
+} ) {
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
 	const { hasUrlBinding, createBinding, clearBinding } = useEntityBinding( {
 		clientId,
@@ -42,12 +50,25 @@ export function useHandleLinkChange( { clientId, attributes, setAttributes } ) {
 				id: updatedLink.id,
 			};
 
-			// Only include title when there's no existing label
-			// This preserves user-customized labels when updating links
-			if ( ! attributes.label || attributes.label === '' ) {
+			const currentText = attributes.label
+				? stripHTML( attributes.label )
+				: '';
+			const updatedText = updatedLink.title ?? '';
+			const hasTextUpdate =
+				allowTextUpdate &&
+				updatedLink.title !== undefined &&
+				updatedText !== currentText;
+			const textUpdateAttributes = hasTextUpdate
+				? { label: escapeHTML( updatedText ) }
+				: {};
+
+			if (
+				! attributes.label ||
+				attributes.label === '' ||
+				hasTextUpdate
+			) {
 				attrs.title = updatedLink.title;
 			}
-
 			// Check if transitioning from entity to custom link
 			const willBeCustomLink = ! updatedLink.id && hasUrlBinding;
 
@@ -62,6 +83,7 @@ export function useHandleLinkChange( { clientId, attributes, setAttributes } ) {
 					kind: 'custom',
 					type: 'custom',
 					id: undefined,
+					...textUpdateAttributes,
 				} );
 			} else {
 				// Normal flow for entity links or unbound custom links
@@ -76,10 +98,15 @@ export function useHandleLinkChange( { clientId, attributes, setAttributes } ) {
 				} else {
 					clearBinding();
 				}
+
+				if ( Object.keys( textUpdateAttributes ).length ) {
+					updateBlockAttributes( clientId, textUpdateAttributes );
+				}
 			}
 		},
 		[
 			attributes,
+			allowTextUpdate,
 			clientId,
 			hasUrlBinding,
 			createBinding,

package/src/navigation-link/test/__snapshots__/hooks.js.snap

@@ -8,14 +8,30 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
     {
       "attributes": {},
       "description": "A link to a custom URL.",
-      "icon": <SVG
-        viewBox="0 0 24 24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <Path
-          d="M4 20h9v-1.5H4V20zm0-5.5V16h16v-1.5H4zm.8-4l.7.7 2-2V12h1V9.2l2 2 .7-.7-2-2H12v-1H9.2l2-2-.7-.7-2 2V4h-1v2.8l-2-2-.7.7 2 2H4v1h2.8l-2 2z"
-        />
-      </SVG>,
+      "icon": {
+        "$$typeof": Symbol(react.transitional.element),
+        "_owner": null,
+        "_store": {},
+        "key": null,
+        "props": {
+          "children": {
+            "$$typeof": Symbol(react.transitional.element),
+            "_owner": null,
+            "_store": {},
+            "key": null,
+            "props": {
+              "d": "M4 20h9v-1.5H4V20zm0-5.5V16h16v-1.5H4zm.8-4l.7.7 2-2V12h1V9.2l2 2 .7-.7-2-2H12v-1H9.2l2-2-.7-.7-2 2V4h-1v2.8l-2-2-.7.7 2 2H4v1h2.8l-2 2z",
+            },
+            "type": [Function],
+          },
+          "viewBox": "0 0 24 24",
+          "xmlns": "http://www.w3.org/2000/svg",
+        },
+        "type": {
+          "$$typeof": Symbol(react.forward_ref),
+          "render": [Function],
+        },
+      },
       "isActive": [Function],
       "name": "link",
       "title": "Custom Link",
@@ -25,14 +41,30 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
         "type": "post",
       },
       "description": "A link to a post.",
-      "icon": <SVG
-        viewBox="0 0 24 24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <Path
-          d="M18 5.5H6a.5.5 0 0 0-.5.5v12a.5.5 0 0 0 .5.5h12a.5.5 0 0 0 .5-.5V6a.5.5 0 0 0-.5-.5ZM6 4h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2Zm1 5h1.5v1.5H7V9Zm1.5 4.5H7V15h1.5v-1.5ZM10 9h7v1.5h-7V9Zm7 4.5h-7V15h7v-1.5Z"
-        />
-      </SVG>,
+      "icon": {
+        "$$typeof": Symbol(react.transitional.element),
+        "_owner": null,
+        "_store": {},
+        "key": null,
+        "props": {
+          "children": {
+            "$$typeof": Symbol(react.transitional.element),
+            "_owner": null,
+            "_store": {},
+            "key": null,
+            "props": {
+              "d": "M18 5.5H6a.5.5 0 0 0-.5.5v12a.5.5 0 0 0 .5.5h12a.5.5 0 0 0 .5-.5V6a.5.5 0 0 0-.5-.5ZM6 4h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2Zm1 5h1.5v1.5H7V9Zm1.5 4.5H7V15h1.5v-1.5ZM10 9h7v1.5h-7V9Zm7 4.5h-7V15h7v-1.5Z",
+            },
+            "type": [Function],
+          },
+          "viewBox": "0 0 24 24",
+          "xmlns": "http://www.w3.org/2000/svg",
+        },
+        "type": {
+          "$$typeof": Symbol(react.forward_ref),
+          "render": [Function],
+        },
+      },
       "isActive": [Function],
       "name": "post",
       "title": "Post Link",
@@ -42,17 +74,42 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
         "type": "page",
       },
       "description": "A link to a page.",
-      "icon": <SVG
-        viewBox="0 0 24 24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <Path
-          d="M15.5 7.5h-7V9h7V7.5Zm-7 3.5h7v1.5h-7V11Zm7 3.5h-7V16h7v-1.5Z"
-        />
-        <Path
-          d="M17 4H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2ZM7 5.5h10a.5.5 0 0 1 .5.5v12a.5.5 0 0 1-.5.5H7a.5.5 0 0 1-.5-.5V6a.5.5 0 0 1 .5-.5Z"
-        />
-      </SVG>,
+      "icon": {
+        "$$typeof": Symbol(react.transitional.element),
+        "_owner": null,
+        "_store": {},
+        "key": null,
+        "props": {
+          "children": [
+            {
+              "$$typeof": Symbol(react.transitional.element),
+              "_owner": null,
+              "_store": {},
+              "key": null,
+              "props": {
+                "d": "M15.5 7.5h-7V9h7V7.5Zm-7 3.5h7v1.5h-7V11Zm7 3.5h-7V16h7v-1.5Z",
+              },
+              "type": [Function],
+            },
+            {
+              "$$typeof": Symbol(react.transitional.element),
+              "_owner": null,
+              "_store": {},
+              "key": null,
+              "props": {
+                "d": "M17 4H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2ZM7 5.5h10a.5.5 0 0 1 .5.5v12a.5.5 0 0 1-.5.5H7a.5.5 0 0 1-.5-.5V6a.5.5 0 0 1 .5-.5Z",
+              },
+              "type": [Function],
+            },
+          ],
+          "viewBox": "0 0 24 24",
+          "xmlns": "http://www.w3.org/2000/svg",
+        },
+        "type": {
+          "$$typeof": Symbol(react.forward_ref),
+          "render": [Function],
+        },
+      },
       "isActive": [Function],
       "name": "page",
       "title": "Page Link",
@@ -62,16 +119,32 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
         "type": "category",
       },
       "description": "A link to a category.",
-      "icon": <SVG
-        viewBox="0 0 24 24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <Path
-          clipRule="evenodd"
-          d="M6 5.5h3a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H6a.5.5 0 01-.5-.5V6a.5.5 0 01.5-.5zM4 6a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2H6a2 2 0 01-2-2V6zm11-.5h3a.5.5 0 01.5.5v3a.5.5 0 01-.5.5h-3a.5.5 0 01-.5-.5V6a.5.5 0 01.5-.5zM13 6a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2h-3a2 2 0 01-2-2V6zm5 8.5h-3a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5zM15 13a2 2 0 00-2 2v3a2 2 0 002 2h3a2 2 0 002-2v-3a2 2 0 00-2-2h-3zm-9 1.5h3a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H6a.5.5 0 01-.5-.5v-3a.5.5 0 01.5-.5zM4 15a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2H6a2 2 0 01-2-2v-3z"
-          fillRule="evenodd"
-        />
-      </SVG>,
+      "icon": {
+        "$$typeof": Symbol(react.transitional.element),
+        "_owner": null,
+        "_store": {},
+        "key": null,
+        "props": {
+          "children": {
+            "$$typeof": Symbol(react.transitional.element),
+            "_owner": null,
+            "_store": {},
+            "key": null,
+            "props": {
+              "clipRule": "evenodd",
+              "d": "M6 5.5h3a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H6a.5.5 0 01-.5-.5V6a.5.5 0 01.5-.5zM4 6a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2H6a2 2 0 01-2-2V6zm11-.5h3a.5.5 0 01.5.5v3a.5.5 0 01-.5.5h-3a.5.5 0 01-.5-.5V6a.5.5 0 01.5-.5zM13 6a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2h-3a2 2 0 01-2-2V6zm5 8.5h-3a.5.5 0 00-.5.5v3a.5.5 0 00.5.5h3a.5.5 0 00.5-.5v-3a.5.5 0 00-.5-.5zM15 13a2 2 0 00-2 2v3a2 2 0 002 2h3a2 2 0 002-2v-3a2 2 0 00-2-2h-3zm-9 1.5h3a.5.5 0 01.5.5v3a.5.5 0 01-.5.5H6a.5.5 0 01-.5-.5v-3a.5.5 0 01.5-.5zM4 15a2 2 0 012-2h3a2 2 0 012 2v3a2 2 0 01-2 2H6a2 2 0 01-2-2v-3z",
+              "fillRule": "evenodd",
+            },
+            "type": [Function],
+          },
+          "viewBox": "0 0 24 24",
+          "xmlns": "http://www.w3.org/2000/svg",
+        },
+        "type": {
+          "$$typeof": Symbol(react.forward_ref),
+          "render": [Function],
+        },
+      },
       "isActive": [Function],
       "name": "category",
       "title": "Category Link",
@@ -81,14 +154,30 @@ exports[`hooks enhanceNavigationLinkVariations enhances variations with icon and
         "type": "tag",
       },
       "description": "A link to a tag.",
-      "icon": <SVG
-        viewBox="0 0 24 24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <Path
-          d="M4.75 4a.75.75 0 0 0-.75.75v7.826c0 .2.08.39.22.53l6.72 6.716a2.313 2.313 0 0 0 3.276-.001l5.61-5.611-.531-.53.532.528a2.315 2.315 0 0 0 0-3.264L13.104 4.22a.75.75 0 0 0-.53-.22H4.75ZM19 12.576a.815.815 0 0 1-.236.574l-5.61 5.611a.814.814 0 0 1-1.153 0L5.5 12.264V5.5h6.763l6.5 6.502a.816.816 0 0 1 .237.574ZM8.75 9.75a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z"
-        />
-      </SVG>,
+      "icon": {
+        "$$typeof": Symbol(react.transitional.element),
+        "_owner": null,
+        "_store": {},
+        "key": null,
+        "props": {
+          "children": {
+            "$$typeof": Symbol(react.transitional.element),
+            "_owner": null,
+            "_store": {},
+            "key": null,
+            "props": {
+              "d": "M4.75 4a.75.75 0 0 0-.75.75v7.826c0 .2.08.39.22.53l6.72 6.716a2.313 2.313 0 0 0 3.276-.001l5.61-5.611-.531-.53.532.528a2.315 2.315 0 0 0 0-3.264L13.104 4.22a.75.75 0 0 0-.53-.22H4.75ZM19 12.576a.815.815 0 0 1-.236.574l-5.61 5.611a.814.814 0 0 1-1.153 0L5.5 12.264V5.5h6.763l6.5 6.502a.816.816 0 0 1 .237.574ZM8.75 9.75a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z",
+            },
+            "type": [Function],
+          },
+          "viewBox": "0 0 24 24",
+          "xmlns": "http://www.w3.org/2000/svg",
+        },
+        "type": {
+          "$$typeof": Symbol(react.forward_ref),
+          "render": [Function],
+        },
+      },
       "isActive": [Function],
       "name": "tag",
       "title": "Tag Link",

package/src/navigation-submenu/edit.js

@@ -35,8 +35,8 @@ import { ItemSubmenuIcon } from './icons';
 import {
 	Controls,
 	LinkUI,
-	updateAttributes,
 	useEntityBinding,
+	useHandleLinkChange,
 	useIsInvalidLink,
 	InvalidDraftDisplay,
 	useEnableLinkStatusValidation,
@@ -92,15 +92,17 @@ export default function NavigationSubmenuEdit( {
 		blockEditingMode !== 'default' ? true : submenuVisibility === 'click';
 
 	// URL binding logic
-	const {
-		clearBinding,
-		createBinding,
-		hasUrlBinding,
-		isBoundEntityAvailable,
-		entityRecord,
-	} = useEntityBinding( {
+	const { hasUrlBinding, isBoundEntityAvailable, entityRecord } =
+		useEntityBinding( {
+			clientId,
+			attributes,
+		} );
+
+	const handleLinkChange = useHandleLinkChange( {
 		clientId,
 		attributes,
+		setAttributes,
+		allowTextUpdate: true,
 	} );
 
 	const { __unstableMarkNextChangeAsNotPersistent, replaceBlock } =
@@ -398,26 +400,7 @@ export default function NavigationSubmenuEdit( {
 								setAttributes( { url: '' } );
 								speak( __( 'Link removed.' ), 'assertive' );
 							} }
-							onChange={ ( updatedValue ) => {
-								// updateAttributes determines the final state and returns metadata
-								const {
-									isEntityLink,
-									attributes: updatedAttributes,
-								} = updateAttributes(
-									updatedValue,
-									setAttributes,
-									attributes
-								);
-
-								// Handle URL binding based on the final computed state
-								// Only create bindings for entity links (posts, pages, taxonomies)
-								// Never create bindings for custom links (manual URLs)
-								if ( isEntityLink ) {
-									createBinding( updatedAttributes );
-								} else {
-									clearBinding();
-								}
-							} }
+							onChange={ handleLinkChange }
 						/>
 					) }
 				</ParentElement>

package/src/navigation-submenu/index.php

@@ -9,6 +9,19 @@ require_once __DIR__ . '/navigation-link/shared/item-should-render.php';
 require_once __DIR__ . '/navigation-link/shared/render-submenu-icon.php';
 require_once __DIR__ . '/navigation-link/shared/build-css-font-sizes.php';
 
+/**
+ * Renders the submenu icon SVG for the Navigation Submenu block.
+ *
+ * @since 5.9.0
+ * @deprecated 7.0.0 Use block_core_shared_navigation_render_submenu_icon() instead.
+ *
+ * @return string SVG markup for the submenu icon.
+ */
+function block_core_navigation_submenu_render_submenu_icon() {
+	_deprecated_function( __FUNCTION__, '7.0.0', 'block_core_shared_navigation_render_submenu_icon()' );
+	return block_core_shared_navigation_render_submenu_icon();
+}
+
 /**
  * Returns the submenu visibility value with backward compatibility
  * for the deprecated openSubmenusOnClick attribute.

package/src/paragraph/use-enter.js

@@ -2,7 +2,10 @@
  * WordPress dependencies
  */
 import { useRef } from '@wordpress/element';
-import { useRefEffect } from '@wordpress/compose';
+import {
+	useRefEffect,
+	privateApis as composePrivateApis,
+} from '@wordpress/compose';
 import { ENTER } from '@wordpress/keycodes';
 import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
@@ -13,6 +16,13 @@ import {
 	getDefaultBlockName,
 } from '@wordpress/blocks';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+
+const { subscribeDelegatedListener } = unlock( composePrivateApis );
+
 export function useOnEnter( props ) {
 	const { batch } = useRegistry();
 	const { moveBlocksToPosition, replaceBlocks, selectionChange } =
@@ -119,9 +129,13 @@ export function useOnEnter( props ) {
 			} );
 		}
 
-		element.addEventListener( 'keydown', onKeyDown );
-		return () => {
-			element.removeEventListener( 'keydown', onKeyDown );
-		};
+		// Capture phase so we run before writing-flow's ancestor-bubble
+		// keydown handlers that gate on `event.defaultPrevented`.
+		return subscribeDelegatedListener(
+			element,
+			'keydown',
+			onKeyDown,
+			true
+		);
 	}, [] );
 }

package/src/post-date/edit.js

@@ -99,11 +99,15 @@ export default function PostDateEdit( props ) {
 
 	const blockEditingMode = useBlockEditingMode();
 
+	const validDatetime = datetime || new Date();
 	let postDate = (
-		<time dateTime={ dateI18n( 'c', datetime ) } ref={ setPopoverAnchor }>
+		<time
+			dateTime={ dateI18n( 'c', validDatetime ) }
+			ref={ setPopoverAnchor }
+		>
 			{ format === 'human-diff'
-				? humanTimeDiff( datetime )
-				: dateI18n( format || siteFormat, datetime ) }
+				? humanTimeDiff( validDatetime )
+				: dateI18n( format || siteFormat, validDatetime ) }
 		</time>
 	);
 

package/src/post-featured-image/edit.js

@@ -278,7 +278,6 @@ export default function PostFeaturedImageEdit( {
 							}
 						>
 							<ToggleControl
-								__nextHasNoMarginBottom
 								label={ __( 'Make image a link' ) }
 								onChange={ () =>
 									setAttributes( { isLink: ! isLink } )

package/src/search/edit.native.js

@@ -17,7 +17,7 @@ import {
 	PanelBody,
 	SelectControl,
 	ToggleControl,
-	Icon,
+	Icon as WCIcon,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { search } from '@wordpress/icons';
@@ -374,7 +374,7 @@ export default function SearchEdit( {
 		return (
 			<View style={ richTextButtonContainerStyle }>
 				{ buttonUseIcon && (
-					<Icon
+					<WCIcon
 						icon={ search }
 						{ ...iconStyles }
 						onLayout={ onLayoutButton }

package/src/search/test/edit.native.js

@@ -6,7 +6,7 @@ import { render } from 'test/helpers';
 /**
  * WordPress dependencies
  */
-import { Icon } from '@wordpress/components';
+import { Icon as WCIcon } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -129,7 +129,7 @@ describe( 'Search Block', () => {
 		} );
 
 		it( 'search button uses icon', () => {
-			const button = instance.UNSAFE_getByType( Icon );
+			const button = instance.UNSAFE_getByType( WCIcon );
 			expect( button ).toBeTruthy();
 		} );
 

package/src/site-logo/edit.js

@@ -116,8 +116,9 @@ const SiteLogo = ( {
 		}
 	}, [ isSelected ] );
 
+	// Always apply modal updates as snackbar Undo may restore the original id.
 	const handleMediaUpdate = ( { id: newId } ) => {
-		if ( typeof newId === 'number' && newId !== logoId ) {
+		if ( typeof newId === 'number' ) {
 			setLogo( newId );
 		}
 	};

package/src/social-link/edit.js

@@ -19,7 +19,7 @@ import {
 } from '@wordpress/block-editor';
 import { useState, useRef, createInterpolateElement } from '@wordpress/element';
 import {
-	Icon,
+	Icon as WCIcon,
 	Button,
 	Dropdown,
 	TextControl,
@@ -277,7 +277,7 @@ const SocialLinkEdit = ( {
 				 */
 				/* eslint-disable jsx-a11y/no-redundant-roles */ }
 				<button aria-haspopup="dialog" { ...blockProps } role="button">
-					<Icon icon={ icon } />
+					<WCIcon icon={ icon } />
 					<span
 						className={ clsx( 'wp-block-social-link-label', {
 							'screen-reader-text': ! showLabels,

package/src/tab-list/edit.js

@@ -14,6 +14,8 @@ import { useSelect } from '@wordpress/data';
 import AddTabToolbarControl from '../tab-panel/add-tab-toolbar-control';
 import RemoveTabToolbarControl from '../tab-panel/remove-tab-toolbar-control';
 
+const TAB_LIST_TEMPLATE = [ [ 'core/tab' ], [ 'core/tab' ] ];
+
 function Edit( { clientId } ) {
 	const tabsClientId = useSelect(
 		( select ) =>
@@ -26,6 +28,7 @@ function Edit( { clientId } ) {
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		allowedBlocks: [ 'core/tab' ],
 		orientation: 'horizontal',
+		template: TAB_LIST_TEMPLATE,
 		templateLock: false,
 		renderAppender: false,
 	} );

package/src/tab-panels/edit.js

@@ -7,6 +7,7 @@ import {
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -14,7 +15,15 @@ import { useSelect } from '@wordpress/data';
 import AddTabToolbarControl from '../tab-panel/add-tab-toolbar-control';
 import RemoveTabToolbarControl from '../tab-panel/remove-tab-toolbar-control';
 
-const TAB_PANELS_TEMPLATE = [ [ 'core/tab-panel', {} ] ];
+/**
+ * Initial template applied only when the block is first inserted (i.e. when
+ * inner blocks are empty). templateLock is false, so this is never applied to
+ * existing blocks that already have tab panels saved.
+ */
+const TAB_PANELS_TEMPLATE = [
+	[ 'core/tab-panel', { label: __( 'Tab' ) } ],
+	[ 'core/tab-panel', { label: __( 'Tab' ) } ],
+];
 
 export default function Edit( { clientId } ) {
 	const blockProps = useBlockProps();

package/src/table/edit.js

@@ -631,6 +631,7 @@ const Cell = memo( function ( {
 			) }
 		>
 			<RichText
+				identifier={ `${ name }.${ rowIndex }.cells.${ columnIndex }.content` }
 				value={ content }
 				onChange={ onChange }
 				onFocus={ () => {

package/src/tabs/edit.js

@@ -8,8 +8,7 @@ import {
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
-import { useMemo, useEffect } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
+import { useMemo } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -19,50 +18,23 @@ import useTabListSync from './use-tab-list-sync';
 
 const EMPTY_ARRAY = [];
 
-const TABS_TEMPLATE = [
-	[
-		'core/tab-list',
-		{},
-		[
-			[ 'core/tab', {} ],
-			[ 'core/tab', {} ],
-		],
-	],
-	[
-		'core/tab-panels',
-		{},
-		[
-			[
-				'core/tab-panel',
-				{
-					label: __( 'Tab' ),
-				},
-				[ [ 'core/paragraph' ] ],
-			],
-			[
-				'core/tab-panel',
-				{
-					label: __( 'Tab' ),
-				},
-				[ [ 'core/paragraph' ] ],
-			],
-		],
-	],
-];
+/**
+ * Only the two structural child blocks are specified here — without inner
+ * block entries for core/tab-list or core/tab-panels.
+ *
+ * If inner blocks were included in this template, `synchronizeBlocksWithTemplate`
+ * (called whenever templateLock === 'all') would recurse into the containers and
+ * truncate them to the template count, causing data loss when a saved block with
+ * more than two tabs is re-opened in the editor.
+ *
+ * Initial tab/panel creation is delegated to the tab-panels template in
+ * tab-panels/edit.js (templateLock: false, applied only when empty).
+ */
+const TABS_TEMPLATE = [ [ 'core/tab-list' ], [ 'core/tab-panels' ] ];
 
 function Edit( { clientId, attributes, setAttributes } ) {
 	const { anchor, activeTabIndex, editorActiveTabIndex } = attributes;
 
-	/**
-	 * Initialize editorActiveTabIndex to activeTabIndex on mount.
-	 * This ensures the ephemeral editor state starts at the persisted default.
-	 */
-	useEffect( () => {
-		if ( editorActiveTabIndex === undefined ) {
-			setAttributes( { editorActiveTabIndex: activeTabIndex } );
-		}
-	}, [] ); // eslint-disable-line react-hooks/exhaustive-deps
-
 	const { tabPanels, tabPanelsClientId, tabs, tabListClientId } = useSelect(
 		( select ) => {
 			const { getBlocks } = select( blockEditorStore );