Rename Trigger and Content to Header and Panel.

docs/reference-guides/core-blocks.md

@@ -8,17 +8,6 @@ This page lists the blocks included in the block-library package.
 
 <!-- START TOKEN Autogenerated - DO NOT EDIT -->
 
-## Content
-
-Accordion item content ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/accordion-content))
-
--	**Name:** core/accordion-content
--	**Experimental:** true
--	**Category:** design
--	**Parent:** core/accordion-item
--	**Supports:** border, color (background, gradient, text), interactivity, layout, shadow, spacing (blockGap, margin, padding), typography (fontSize, lineHeight)
--	**Attributes:** allowedBlocks, isSelected, openByDefault, templateLock
-
 ## Accordion Group
 
 A group of headers and associated expandable content. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/accordion-group))
@@ -30,6 +19,17 @@ A group of headers and associated expandable content. ([Source](https://github.c
 -	**Supports:** align (full, wide), background (backgroundImage, backgroundSize), color (background, gradient, text), interactivity, layout, shadow, spacing (blockGap, margin, padding), ~~html~~
 -	**Attributes:** allowedBlocks, autoclose, iconPosition
 
+## Accordion Header
+
+Accordion header. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/accordion-header))
+
+-	**Name:** core/accordion-header
+-	**Experimental:** true
+-	**Category:** design
+-	**Parent:** core/accordion-item
+-	**Supports:** anchor, border, color (background, gradient, text), interactivity, layout, shadow, spacing (margin, padding), typography (fontSize, textAlign), ~~align~~
+-	**Attributes:** icon, iconPosition, level, levelOptions, openByDefault, textAlignment, title
+
 ## Accordion
 
 A single accordion that displays a header and expandable content. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/accordion-item))
@@ -38,20 +38,20 @@ A single accordion that displays a header and expandable content. ([Source](http
 -	**Experimental:** true
 -	**Category:** design
 -	**Parent:** core/accordion-group
--	**Allowed Blocks:** core/accordion-trigger, core/accordion-content
+-	**Allowed Blocks:** core/accordion-header, core/accordion-panel
 -	**Supports:** align (full, wide), color (background, gradient, text), interactivity, layout, shadow, spacing (blockGap, margin)
 -	**Attributes:** openByDefault
 
-## Trigger
+## Accordion Panel
 
-Accordion item trigger. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/accordion-trigger))
+Accordion Panel ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/accordion-panel))
 
--	**Name:** core/accordion-trigger
+-	**Name:** core/accordion-panel
 -	**Experimental:** true
 -	**Category:** design
 -	**Parent:** core/accordion-item
--	**Supports:** anchor, border, color (background, gradient, text), interactivity, layout, shadow, spacing (margin, padding), typography (fontSize, textAlign), ~~align~~
--	**Attributes:** icon, iconPosition, level, levelOptions, openByDefault, textAlignment, title
+-	**Supports:** border, color (background, gradient, text), interactivity, layout, shadow, spacing (blockGap, margin, padding), typography (fontSize, lineHeight)
+-	**Attributes:** allowedBlocks, isSelected, openByDefault, templateLock
 
 ## Archives
 

lib/blocks.php

@@ -14,8 +14,8 @@ function gutenberg_reregister_core_block_types() {
 	$blocks_dirs = array(
 		__DIR__ . '/../build/block-library/blocks/' => array(
 			'block_folders' => array(
-				'accordion-trigger',
-				'accordion-content',
+				'accordion-header',
+				'accordion-panel',
 				'audio',
 				'button',
 				'buttons',

packages/block-library/src/accordion-group/style.scss

@@ -39,13 +39,13 @@
 	width: 100%;
 }
 
-.is-layout-flow > .wp-block-accordion-content,
-.wp-block-accordion-content {
+.is-layout-flow > .wp-block-accordion-panel,
+.wp-block-accordion-panel {
 	overflow: hidden;
 	margin: 0;
 }
 
-.accordion-content__wrapper {
+.accordion-panel__wrapper {
 	padding-bottom: var(--wp--preset--spacing--20, 1em);
 }
 
@@ -54,7 +54,7 @@
 	background-color: unset;
 }
 
-.wp-block-accordion-trigger.icon-position-left .accordion-item__toggle {
+.wp-block-accordion-header.icon-position-left .accordion-item__toggle {
 	/* stylelint-disable-next-line declaration-property-value-allowed-list -- This should be refactored to not use the row-reverse value. */
 	flex-direction: row-reverse;
 }

packages/block-library/src/accordion-trigger/block.json → packages/block-library/src/accordion-header/block.json

@@ -1,11 +1,11 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
-	"name": "core/accordion-trigger",
+	"name": "core/accordion-header",
 	"version": "0.1.0",
-	"title": "Trigger",
+	"title": "Accordion Header",
 	"category": "design",
-	"description": "Accordion item trigger.",
+	"description": "Accordion header.",
 	"example": {},
 	"__experimental": true,
 	"parent": [ "core/accordion-item" ],

packages/block-library/src/accordion-item/block.json

@@ -9,7 +9,7 @@
 	"example": {},
 	"__experimental": true,
 	"parent": [ "core/accordion-group" ],
-	"allowedBlocks": [ "core/accordion-trigger", "core/accordion-content" ],
+	"allowedBlocks": [ "core/accordion-header", "core/accordion-panel" ],
 	"supports": {
 		"align": [ "wide", "full" ],
 		"color": {

packages/block-library/src/accordion-item/edit.js

@@ -66,9 +66,9 @@ export default function Edit( {
 		},
 		{
 			template: [
-				[ 'core/accordion-trigger', {} ],
+				[ 'core/accordion-header', {} ],
 				[
-					'core/accordion-content',
+					'core/accordion-panel',
 					{
 						isSelected: true,
 						openByDefault,

packages/block-library/src/accordion-item/index.php

@@ -40,11 +40,11 @@ function block_core_accordion_item_render( $attributes, $content ) {
 		if ( $p->next_tag( array( 'class_name' => 'accordion-item__toggle' ) ) ) {
 			$p->set_attribute( 'data-wp-on--click', 'actions.toggle' );
 			$p->set_attribute( 'id', $unique_id );
-			$p->set_attribute( 'aria-controls', $unique_id . '-content' );
+			$p->set_attribute( 'aria-controls', $unique_id . '-panel' );
 			$p->set_attribute( 'data-wp-bind--aria-expanded', 'state.isOpen' );
 
-			if ( $p->next_tag( array( 'class_name' => 'wp-block-accordion-content' ) ) ) {
-				$p->set_attribute( 'id', $unique_id . '-content' );
+			if ( $p->next_tag( array( 'class_name' => 'wp-block-accordion-panel' ) ) ) {
+				$p->set_attribute( 'id', $unique_id . '-panel' );
 				$p->set_attribute( 'aria-labelledby', $unique_id );
 				$p->set_attribute( 'data-wp-bind--inert', '!state.isOpen' );
 				$p->set_attribute( 'data-wp-watch', 'callbacks.setTabIndex' );

packages/block-library/src/accordion-content/block.json → packages/block-library/src/accordion-panel/block.json

@@ -1,11 +1,11 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
-	"name": "core/accordion-content",
+	"name": "core/accordion-panel",
 	"version": "0.1.0",
-	"title": "Content",
+	"title": "Accordion Panel",
 	"category": "design",
-	"description": "Accordion item content",
+	"description": "Accordion Panel",
 	"example": {},
 	"__experimental": true,
 	"parent": [ "core/accordion-item" ],

packages/block-library/src/index.js

@@ -22,8 +22,8 @@ import {
 // See https://github.com/WordPress/gutenberg/pull/40655 for more context.
 import * as accordionGroup from './accordion-group';
 import * as accordionItem from './accordion-item';
-import * as accordionTrigger from './accordion-trigger';
-import * as accordionContent from './accordion-content';
+import * as accordionHeader from './accordion-header';
+import * as accordionPanel from './accordion-panel';
 import * as archives from './archives';
 import * as avatar from './avatar';
 import * as audio from './audio';
@@ -240,8 +240,8 @@ const getAllBlocks = () => {
 	if ( window?.__experimentalEnableBlockExperiments ) {
 		blocks.push( accordionGroup );
 		blocks.push( accordionItem );
-		blocks.push( accordionTrigger );
-		blocks.push( accordionContent );
+		blocks.push( accordionHeader );
+		blocks.push( accordionPanel );
 	}
 
 	if ( window?.__experimentalEnableFormBlocks ) {