Merge branch 'main' into feature/MOOSE-360/refactor-horizontal-tabs-block

Author: GeoffDusome

CHANGELOG.md

@@ -6,7 +6,8 @@ item (Added, Changed, Depreciated, Removed, Fixed, Security).
 
 ## [2026.03]
 
-- Refactor Horizontal Tabs block into a dynamic block. Add reordering functionality. 
+- Updated: Refactor Horizontal Tabs block into a dynamic block. Add reordering functionality. 
+- Updated: Refactor Vertical Tabs block to dynamic block; allow sorting.
 
 ## [2026.02]
 - Added: `moderntribe/tribe_embed` composer package v1.1.0.

composer.json

@@ -133,7 +133,7 @@
 		"wpengine/advanced-custom-fields-pro": "^6.4"
 	},
 	"extra": {
-		"wordpress-version": "6.9.1",
+		"wordpress-version": "6.9.4",
 		"installer-paths": {
 			"wp-content/plugins/{$name}": [
 				"type:wordpress-plugin"

wp-content/plugins/core/src/Components/Blocks/Vertical_Tabs_Block_Controller.php

@@ -0,0 +1,74 @@
+<?php declare(strict_types=1);
+
+namespace Tribe\Plugin\Components\Blocks;
+
+use Tribe\Plugin\Components\Abstracts\Abstract_Block_Controller;
+
+/**
+ * Controller for the Vertical Tabs block.
+ * Builds tab data from inner blocks (saved order).
+ */
+class Vertical_Tabs_Block_Controller extends Abstract_Block_Controller {
+
+	/**
+	 * Tab items built from inner blocks.
+	 *
+	 * @var array<int, array{id: string, buttonId: string, title: string, content: string}>
+	 */
+	protected array $tabs = [];
+
+	protected \WP_Block $block;
+
+	public function __construct( array $args = [] ) {
+		parent::__construct( $args );
+
+		$this->block = $args['block'] ?? new \WP_Block( [ 'blockName' => 'tribe/vertical-tabs' ] );
+		$this->tabs  = $this->build_tabs_from_inner_blocks();
+	}
+
+	/**
+	 * @return array<int, array{id: string, buttonId: string, title: string, content: string}>
+	 */
+	public function get_tabs(): array {
+		return $this->tabs;
+	}
+
+	/**
+	 * Whether the given tab (by index) should be selected. First tab is always active on the front-end.
+	 */
+	public function is_tab_selected( int $index ): bool {
+		return $index === 0;
+	}
+
+	/**
+	 * Build tab list from parsed inner blocks (preserves saved order).
+	 *
+	 * @return array<int, array{id: string, buttonId: string, title: string, content: string}>
+	 */
+	protected function build_tabs_from_inner_blocks(): array {
+		$block        = $this->block->parsed_block;
+		$inner_blocks = $block['innerBlocks'] ?? [];
+		$tabs         = [];
+
+		foreach ( $inner_blocks as $inner ) {
+			if ( ( $inner['blockName'] ?? '' ) !== 'tribe/vertical-tab' ) {
+				continue;
+			}
+
+			$attrs   = $inner['attrs'] ?? [];
+			$id      = $attrs['blockId'] ?? '';
+			$title   = $attrs['title'] ?? '';
+			$content = $attrs['content'] ?? '';
+
+			$tabs[] = [
+				'id'       => $id,
+				'buttonId' => 'vt-button-' . $id,
+				'title'    => $title !== '' ? $title : __( 'Tab Heading', 'tribe' ),
+				'content'  => $content,
+			];
+		}
+
+		return $tabs;
+	}
+
+}

wp-content/themes/core/blocks/tribe/vertical-tabs/_variables.pcss

@@ -9,10 +9,18 @@
 	--vertical-tabs-border-color: var(--color-black-20);
 	--vertical-tabs-border-selected-color: var(--color-blue);
 	--vertical-tabs-title-selected-color: var(--color-blue);
+	--vertical-tabs-editor-grab-icon-color: var(--color-black);
+	--vertical-tabs-editor-grab-icon-hover-color: var(--color-neutral-80);
+	--vertical-tabs-editor-delete-icon-color: var(--color-alert-error);
+	--vertical-tabs-editor-delete-icon-hover-color: var(--color-alert-error-dark);
 }
 
 :--dark-themes {
 	--vertical-tabs-border-color: var(--color-white-20);
 	--vertical-tabs-border-selected-color: var(--color-white);
 	--vertical-tabs-title-selected-color: var(--color-white);
+	--vertical-tabs-editor-grab-icon-color: var(--color-white);
+	--vertical-tabs-editor-grab-icon-hover-color: var(--color-neutral-20);
+	--vertical-tabs-editor-delete-icon-color: var(--color-white);
+	--vertical-tabs-editor-delete-icon-hover-color: var(--color-neutral-20);
 }

wp-content/themes/core/blocks/tribe/vertical-tabs/block.json

@@ -8,17 +8,9 @@
 	"icon": "align-pull-right",
 	"description": "Tab content displayed vertically",
 	"attributes": {
-		"blockUpdated": {
-			"type": "string",
-			"default": ""
-		},
 		"currentActiveTabInstanceId": {
 			"type": "string",
 			"default": ""
-		},
-		"tabs": {
-			"type": "array",
-			"default": []
 		}
 	},
 	"supports": {