@wordpress/block-library 9.44.1-next.v.202604201441.0 → 9.45.0

package/src/tab/index.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tabs Block
+ * Tab Block
  *
  * @package WordPress
  */
@@ -8,81 +8,62 @@
 /**
  * Render callback for core/tab.
  *
+ * Injects the tab label and IAPI directives into the saved button HTML.
+ * Per-item context (index, id, label) is provided by the parent tab-list
+ * render callback before this is called.
+ *
  * @since 7.0.0
  *
  * @param array     $attributes Block attributes.
-* @param array     $attributes Block attributes.
-* @param string    $content    Block content.
-* @param \WP_Block $block      Block instance.
+ * @param string    $content    Block content (styled button from save.js).
+ * @param \WP_Block $block      WP_Block instance.
  *
  * @return string Updated HTML.
  */
-function block_core_tab_render( array $attributes, string $content, \WP_Block $block ): string {
-	$tabs_id = $block->context['core/tabs-id'] ?? '';
-
-	static $tab_counters = array();
+function block_core_tab_render_callback( array $attributes, string $content, \WP_Block $block ): string {
+	$tab_index = $block->context['core/tab-index'] ?? 0;
+	$tab_id    = $block->context['core/tab-id'] ?? '';
+	$tab_label = $block->context['core/tab-label'] ?? '';
 
-	if ( ! isset( $tab_counters[ $tabs_id ] ) ) {
-		$tab_counters[ $tabs_id ] = 0;
+	if ( empty( $tab_id ) ) {
+		$tab_id = 'tab-' . $tab_index;
 	}
 
-	$tab_index = $tab_counters[ $tabs_id ];
-	++$tab_counters[ $tabs_id ];
-
+	// Add Interactivity API directives and tab-specific attributes to the button.
 	$tag_processor = new WP_HTML_Tag_Processor( $content );
-	$tag_processor->next_tag( array( 'class_name' => 'wp-block-tab' ) );
 
-	// Use the user's custom anchor if present, otherwise fall back to
-	// the generated position-based ID.
-	$tab_id = (string) $tag_processor->get_attribute( 'id' );
-	if ( empty( $tab_id ) ) {
-		$tab_id = ! empty( $tabs_id )
-			? $tabs_id . '-tab-' . $tab_index
-			: 'tab-' . $tab_index;
-		$tag_processor->set_attribute( 'id', $tab_id );
+	if ( $tag_processor->next_tag() ) {
+		$tag_processor->set_attribute( 'id', 'tab__' . $tab_id );
+		$tag_processor->set_attribute( 'aria-controls', $tab_id );
+		$tag_processor->set_attribute( 'data-wp-on--click', 'actions.handleTabClick' );
+		$tag_processor->set_attribute( 'data-wp-on--keydown', 'actions.handleTabKeyDown' );
+		$tag_processor->set_attribute( 'data-wp-bind--aria-selected', 'state.isActiveTab' );
+		$tag_processor->set_attribute( 'data-wp-bind--tabindex', 'state.tabIndexAttribute' );
+		$tag_processor->set_attribute(
+			'data-wp-context',
+			wp_json_encode( array( 'tabIndex' => $tab_index ) )
+		);
 	}
 
-	/**
-	 * Add interactivity to the tab element.
-	 */
-	$tag_processor->set_attribute(
-		'data-wp-interactive',
-		'core/tabs/private'
+	// Inject the tab label into the button.
+	return preg_replace(
+		'/(<button\b[^>]*>).*?(<\/button>)/s',
+		'$1<span>' . wp_kses_post( $tab_label ) . '</span>$2',
+		$tag_processor->get_updated_html(),
+		1
 	);
-	$tag_processor->set_attribute(
-		'data-wp-context',
-		wp_json_encode(
-			array(
-				'tab' => array(
-					'id' => $tab_id,
-				),
-			)
-		)
-	);
-
-	/**
-	 * Process accessibility and interactivity attributes.
-	 */
-	$tag_processor->set_attribute( 'role', 'tabpanel' );
-	$tag_processor->set_attribute( 'aria-labelledby', 'tab__' . $tab_id );
-	$tag_processor->set_attribute( 'data-wp-bind--hidden', '!state.isActiveTab' );
-	$tag_processor->set_attribute( 'tabindex', 0 );
-
-	return (string) $tag_processor->get_updated_html();
 }
 
 /**
  * Registers the `core/tab` block on the server.
  *
- * @hook init
- *
  * @since 7.0.0
  */
 function register_block_core_tab() {
 	register_block_type_from_metadata(
 		__DIR__ . '/tab',
 		array(
-			'render_callback' => 'block_core_tab_render',
+			'render_callback' => 'block_core_tab_render_callback',
 		)
 	);
 }

package/src/tab/save.js

@@ -1,13 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
+import { useBlockProps } from '@wordpress/block-editor';
 
 export default function save() {
 	const blockProps = useBlockProps.save( {
-		role: 'tabpanel',
+		type: 'button',
+		role: 'tab',
 	} );
-	const innerBlocksProps = useInnerBlocksProps.save( blockProps );
 
-	return <section { ...innerBlocksProps } />;
+	return <button { ...blockProps } />;
 }

package/src/tab/style.scss

@@ -1,23 +1,40 @@
 .wp-block-tab {
-	max-width: 100%;
-	flex-basis: 100%;
-	flex-grow: 1;
 	box-sizing: border-box;
+	color: inherit;
+	display: block;
+	width: max-content;
+	text-decoration: none;
+	cursor: pointer;
+	flex-basis: inherit !important;
+	flex-grow: inherit !important;
+	position: relative;
 
-	& > *:first-child {
-		margin-top: 0;
-	}
-	& > *:last-child {
-		margin-bottom: 0;
-	}
+	// Button reset
+	border: none;
+	background: none;
+	appearance: none;
+	-webkit-appearance: none;
 
-	&[hidden],
-	&:empty {
-		display: none !important;
-	}
-}
+	margin: 0;
+	padding: var(--wp--preset--spacing--20, 0.5em) var(--wp--preset--spacing--30, 1em);
+
+	// Inherit typography from parent
+	font-size: inherit;
+	font-family: inherit;
+	font-weight: inherit;
+	line-height: inherit;
+	letter-spacing: inherit;
+	text-transform: inherit;
+	text-align: inherit;
 
-.wp-block-tab.wp-block.has-background,
-.wp-block-tab:not(.wp-block).has-background {
-	padding: var(--wp--preset--spacing--30);
+	&[aria-selected="true"]::before,
+	&.is-active::before {
+		content: "";
+		position: absolute;
+		border-bottom: 2px solid currentColor;
+		pointer-events: none;
+		left: 0;
+		width: 100%;
+		bottom: 0;
+	}
 }

package/{build/tabs-menu → src/tab-list}/block.json

@@ -2,13 +2,13 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"__experimental": true,
 	"apiVersion": 3,
-	"name": "core/tabs-menu",
-	"title": "Tabs Menu",
+	"name": "core/tab-list",
+	"title": "Tab List",
 	"description": "Display the tab buttons for a tabbed interface.",
 	"category": "design",
 	"textdomain": "default",
 	"parent": [ "core/tabs" ],
-	"allowedBlocks": [ "core/tabs-menu-item" ],
+	"allowedBlocks": [ "core/tab" ],
 	"usesContext": [ "core/tabs-list" ],
 	"attributes": {},
 	"supports": {

package/src/{tabs-menu → tab-list}/edit.js

@@ -11,8 +11,8 @@ import { useSelect } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import AddTabToolbarControl from '../tab/add-tab-toolbar-control';
-import RemoveTabToolbarControl from '../tab/remove-tab-toolbar-control';
+import AddTabToolbarControl from '../tab-panel/add-tab-toolbar-control';
+import RemoveTabToolbarControl from '../tab-panel/remove-tab-toolbar-control';
 
 function Edit( { clientId } ) {
 	const tabsClientId = useSelect(
@@ -24,7 +24,7 @@ function Edit( { clientId } ) {
 	const blockProps = useBlockProps();
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		allowedBlocks: [ 'core/tabs-menu-item' ],
+		allowedBlocks: [ 'core/tab' ],
 		orientation: 'horizontal',
 		templateLock: false,
 		renderAppender: false,

package/src/{tabs-menu → tab-list}/editor.scss

@@ -1,10 +1,10 @@
-.wp-block-tabs-menu {
+.wp-block-tab-list {
 	// Allow the inner block list to be displayed in the flex layout, so the tab buttons appear as direct flex children in the editor.
 	> .block-editor-block-list__layout {
 		display: contents;
 	}
 
-	.block-editor-block-list__block:has(> .wp-block-tabs-menu-item) {
+	.block-editor-block-list__block:has(> .wp-block-tab) {
 		display: contents;
 	}
 }

package/src/{tabs-menu → tab-list}/index.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { tabsMenu as icon } from '@wordpress/icons';
+import { tabList as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies

package/src/tab-list/index.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Tab List Block
+ *
+ * @package WordPress
+ */
+
+/**
+ * Render callback for core/tab-list.
+ *
+ * Re-renders each tab inner block with per-item context (index, id,
+ * label) injected from the tabs-list, so the tab render callback
+ * can add the correct IAPI directives for each button.
+ *
+ * @since 7.0.0
+ *
+ * @param array     $attributes Block attributes.
+ * @param string    $content    Block content (rendered inner blocks from save.js).
+ * @param \WP_Block $block      WP_Block instance.
+ *
+ * @return string Updated HTML.
+ */
+function block_core_tab_list_render_callback( array $attributes, string $content, \WP_Block $block ): string {
+	$tabs_list = $block->context['core/tabs-list'] ?? array();
+
+	if ( empty( $tabs_list ) ) {
+		return $content;
+	}
+
+	// Re-render each tab with per-item context (index, id, label).
+	// Match by position so items align with their corresponding tabs.
+	$buttons_html = '';
+	$tab_position = 0;
+
+	foreach ( $block->parsed_block['innerBlocks'] ?? array() as $parsed_tab ) {
+		if ( 'core/tab' !== ( $parsed_tab['blockName'] ?? '' ) ) {
+			continue;
+		}
+
+		$tab       = $tabs_list[ $tab_position ] ?? null;
+		$tab_index = $tab_position;
+		++$tab_position;
+
+		// Skip tabs with no matching tab panel.
+		if ( null === $tab ) {
+			continue;
+		}
+
+		$item_context = array_merge(
+			$block->context,
+			array(
+				'core/tab-index' => $tab_index,
+				'core/tab-id'    => $tab['id'] ?? '',
+				'core/tab-label' => $tab['label'] ?? '',
+			)
+		);
+
+		$tab_block     = new WP_Block( $parsed_tab, $item_context );
+		$buttons_html .= $tab_block->render();
+	}
+
+	// Rebuild the wrapper using get_block_wrapper_attributes().
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'role' => 'tablist' ) );
+	return sprintf( '<div %s>%s</div>', $wrapper_attributes, $buttons_html );
+}
+
+/**
+ * Registers the `core/tab-list` block on the server.
+ *
+ * @since 7.0.0
+ */
+function register_block_core_tab_list() {
+	register_block_type_from_metadata(
+		__DIR__ . '/tab-list',
+		array(
+			'render_callback' => 'block_core_tab_list_render_callback',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_tab_list' );

package/src/{tab → tab-panel}/add-tab-toolbar-control.js

@@ -11,9 +11,9 @@ import { ToolbarGroup, ToolbarButton } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 /**
- * "Add tab" button in the block toolbar for the tab block.
- * Inserts a new core/tab into the tab-panel and a new core/tabs-menu-item
- * into the tabs-menu, keeping both in sync.
+ * "Add tab" button in the block toolbar for the tabs block.
+ * Inserts a new core/tab-panel into the tab-panels and a new core/tab
+ * into the tab-list, keeping both in sync.
  *
  * @param {Object} props
  * @param {string} props.tabsClientId The client ID of the parent tabs block.
@@ -22,44 +22,44 @@ import { useDispatch, useSelect } from '@wordpress/data';
 export default function AddTabToolbarControl( { tabsClientId } ) {
 	const { insertBlock } = useDispatch( blockEditorStore );
 
-	const { tabPanelClientId, tabsMenuClientId } = useSelect(
+	const { tabPanelsClientId, tabsListClientId } = useSelect(
 		( select ) => {
 			if ( ! tabsClientId ) {
 				return {
-					tabPanelClientId: null,
-					tabsMenuClientId: null,
+					tabPanelsClientId: null,
+					tabsListClientId: null,
 				};
 			}
 			const { getBlocks } = select( blockEditorStore );
 			const innerBlocks = getBlocks( tabsClientId );
-			const tabPanel = innerBlocks.find(
-				( block ) => block.name === 'core/tab-panel'
+			const tabPanels = innerBlocks.find(
+				( block ) => block.name === 'core/tab-panels'
 			);
-			const tabsMenu = innerBlocks.find(
-				( block ) => block.name === 'core/tabs-menu'
+			const tabList = innerBlocks.find(
+				( block ) => block.name === 'core/tab-list'
 			);
 			return {
-				tabPanelClientId: tabPanel?.clientId || null,
-				tabsMenuClientId: tabsMenu?.clientId || null,
+				tabPanelsClientId: tabPanels?.clientId || null,
+				tabsListClientId: tabList?.clientId || null,
 			};
 		},
 		[ tabsClientId ]
 	);
 
 	const addTab = () => {
-		if ( ! tabPanelClientId ) {
+		if ( ! tabPanelsClientId ) {
 			return;
 		}
 
-		const newTabBlock = createBlock( 'core/tab', {
+		const newTabPanelBlock = createBlock( 'core/tab-panel', {
 			label: __( 'Tab' ),
 		} );
-		insertBlock( newTabBlock, undefined, tabPanelClientId );
+		insertBlock( newTabPanelBlock, undefined, tabPanelsClientId );
 
-		// Insert a corresponding menu item into the tabs-menu.
-		if ( tabsMenuClientId ) {
-			const newMenuItemBlock = createBlock( 'core/tabs-menu-item', {} );
-			insertBlock( newMenuItemBlock, undefined, tabsMenuClientId );
+		// Insert a corresponding tab into the tab-list.
+		if ( tabsListClientId ) {
+			const newTabBlock = createBlock( 'core/tab', {} );
+			insertBlock( newTabBlock, undefined, tabsListClientId );
 		}
 	};
 

package/src/tab-panel/block.json

@@ -4,62 +4,52 @@
 	"apiVersion": 3,
 	"name": "core/tab-panel",
 	"title": "Tab Panel",
-	"description": "Container for tab panel content in a tabbed interface.",
+	"description": "Content for a tab in a tabbed interface.",
 	"category": "design",
 	"textdomain": "default",
-	"parent": [ "core/tabs" ],
-	"allowedBlocks": [ "core/tab" ],
-	"attributes": {},
+	"attributes": {
+		"label": {
+			"type": "string",
+			"default": ""
+		}
+	},
+	"parent": [ "core/tab-panels" ],
+	"usesContext": [
+		"core/tabs-activeTabIndex",
+		"core/tabs-editorActiveTabIndex",
+		"core/tabs-id"
+	],
 	"supports": {
-		"anchor": false,
+		"anchor": true,
 		"html": false,
 		"reusable": false,
-		"visibility": false,
-		"lock": false,
-		"dimensions": {
-			"aspectRatio": false,
-			"height": false,
-			"minHeight": false,
-			"width": false
-		},
 		"color": {
 			"background": true,
 			"text": true,
-			"heading": true,
-			"link": true,
 			"__experimentalDefaultControls": {
 				"background": true,
 				"text": true
 			}
 		},
+		"layout": true,
 		"spacing": {
-			"blockGap": false,
+			"blockGap": true,
 			"padding": true,
-			"margin": true
+			"margin": false
 		},
 		"typography": {
 			"fontSize": true,
-			"__experimentalFontFamily": true
-		},
-		"layout": {
-			"default": {
-				"type": "flex",
-				"flexWrap": "nowrap",
-				"justifyContent": "stretch",
-				"orientation": "vertical"
-			},
-			"allowSwitching": false,
-			"allowVerticalAlignment": false,
-			"allowOrientation": false,
-			"allowJustification": true,
-			"allowSizingOnChildren": false
+			"__experimentalFontFamily": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true,
+				"__experimentalFontFamily": true
+			}
 		},
-		"__experimentalBorder": {
-			"radius": true,
-			"color": true,
-			"width": true,
-			"style": true
-		}
+		"renaming": true,
+		"visibility": false
+	},
+	"providesContext": {
+		"core/tab-label": "label"
 	},
 	"editorScript": "file:./index.js",
 	"style": "file:./style-index.css"

package/src/tab-panel/controls.js

@@ -0,0 +1,65 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	InspectorControls,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import {
+	CheckboxControl,
+	__experimentalToolsPanel as ToolsPanel,
+	__experimentalToolsPanelItem as ToolsPanelItem,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { useDispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import AddTabToolbarControl from './add-tab-toolbar-control';
+import RemoveTabToolbarControl from './remove-tab-toolbar-control';
+import { useToolsPanelDropdownMenuProps } from '../utils/hooks';
+
+export default function Controls( { tabsClientId, blockIndex, isDefaultTab } ) {
+	const { updateBlockAttributes } = useDispatch( blockEditorStore );
+	const dropdownMenuProps = useToolsPanelDropdownMenuProps();
+
+	return (
+		<>
+			<AddTabToolbarControl tabsClientId={ tabsClientId } />
+			<RemoveTabToolbarControl tabsClientId={ tabsClientId } />
+			<InspectorControls>
+				<ToolsPanel
+					label={ __( 'Settings' ) }
+					resetAll={ () => {
+						updateBlockAttributes( tabsClientId, {
+							activeTabIndex: 0,
+						} );
+					} }
+					dropdownMenuProps={ dropdownMenuProps }
+				>
+					<ToolsPanelItem
+						label={ __( 'Default tab' ) }
+						hasValue={ () => isDefaultTab && blockIndex !== 0 }
+						onDeselect={ () => {
+							updateBlockAttributes( tabsClientId, {
+								activeTabIndex: 0,
+							} );
+						} }
+						isShownByDefault
+					>
+						<CheckboxControl
+							label={ __( 'Default tab' ) }
+							checked={ isDefaultTab }
+							onChange={ ( value ) => {
+								updateBlockAttributes( tabsClientId, {
+									activeTabIndex: value ? blockIndex : 0,
+								} );
+							} }
+						/>
+					</ToolsPanelItem>
+				</ToolsPanel>
+			</InspectorControls>
+		</>
+	);
+}