Product Details Block > Fix the review form rating

assets/js/atomic/blocks/index.js

@@ -14,3 +14,4 @@ import './product-elements/tag-list';
 import './product-elements/stock-indicator';
 import './product-elements/add-to-cart';
 import './product-elements/product-image-gallery';
+import './product-elements/product-details';

assets/js/atomic/blocks/product-elements/product-details/block.json

@@ -0,0 +1,14 @@
+{
+	"name": "woocommerce/product-details",
+	"version": "1.0.0",
+	"icon": "info",
+	"title": "Product Details",
+	"description": "A block that allows your customers to see details and reviews about the product.",
+	"category": "woocommerce",
+	"keywords": [ "WooCommerce" ],
+	"supports": {},
+	"attributes": {},
+	"textdomain": "woo-gutenberg-products-block",
+	"apiVersion": 2,
+	"$schema": "https://schemas.wp.org/trunk/block.json"
+}

assets/js/atomic/blocks/product-elements/product-details/block.tsx

@@ -0,0 +1,95 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+import { __ } from '@wordpress/i18n';
+import { useBlockProps } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+
+interface SingleProductTab {
+	id: string;
+	title: string;
+	active: boolean;
+	content: string | undefined;
+}
+
+const ProductTabTitle = ( {
+	id,
+	title,
+	active,
+}: Pick< SingleProductTab, 'id' | 'title' | 'active' > ) => {
+	return (
+		<li
+			className={ classnames( `${ id }_tab`, {
+				active,
+			} ) }
+			id={ `tab-title-${ id }` }
+			role="tab"
+			aria-controls={ `tab-${ id }` }
+		>
+			<a href={ `#tab-${ id }` }>{ title }</a>
+		</li>
+	);
+};
+
+const ProductTabContent = ( {
+	id,
+	content,
+}: Pick< SingleProductTab, 'id' | 'content' > ) => {
+	return (
+		<div
+			className={ `${ id }_tab` }
+			id={ `tab-title-${ id }` }
+			role="tab"
+			aria-controls={ `tab-${ id }` }
+		>
+			{ content }
+		</div>
+	);
+};
+
+export const SingleProductDetails = () => {
+	const blockProps = useBlockProps();
+	const productTabs = [
+		{
+			id: 'description',
+			title: 'Description',
+			active: true,
+			content: __(
+				'This block lists description, attributes and reviews for a single product.',
+				'woo-gutenberg-products-block'
+			),
+		},
+		{
+			id: 'additional_information',
+			title: 'Additional Information',
+			active: false,
+		},
+		{ id: 'reviews', title: 'Reviews', active: false },
+	];
+	const tabsTitle = productTabs.map( ( { id, title, active } ) => (
+		<ProductTabTitle
+			key={ id }
+			id={ id }
+			title={ title }
+			active={ active }
+		/>
+	) );
+	const tabsContent = productTabs.map( ( { id, content } ) => (
+		<ProductTabContent key={ id } id={ id } content={ content } />
+	) );
+
+	return (
+		<div { ...blockProps }>
+			<ul className="tabs" role="tablist">
+				{ tabsTitle }
+			</ul>
+			{ tabsContent }
+		</div>
+	);
+};
+
+export default SingleProductDetails;

assets/js/atomic/blocks/product-elements/product-details/edit.tsx

@@ -0,0 +1,31 @@
+/**
+ * External dependencies
+ */
+import { useBlockProps } from '@wordpress/block-editor';
+import { Disabled } from '@wordpress/components';
+import type { BlockEditProps } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import Block from './block';
+import { Attributes } from './types';
+
+const Edit = ( { attributes }: BlockEditProps< Attributes > ) => {
+	const { className } = attributes;
+	const blockProps = useBlockProps( {
+		className,
+	} );
+
+	return (
+		<>
+			<div { ...blockProps }>
+				<Disabled>
+					<Block />
+				</Disabled>
+			</div>
+		</>
+	);
+};
+
+export default Edit;

assets/js/atomic/blocks/product-elements/product-details/index.tsx

@@ -0,0 +1,24 @@
+/**
+ * External dependencies
+ */
+import { registerBlockSingleProductTemplate } from '@woocommerce/atomic-utils';
+import { registerBlockType, unregisterBlockType } from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import metadata from './block.json';
+import edit from './edit';
+
+registerBlockSingleProductTemplate( {
+	registerBlockFn: () => {
+		// @ts-expect-error: `registerBlockType` is a function that is typed in WordPress core.
+		registerBlockType( metadata, {
+			edit,
+		} );
+	},
+	unregisterBlockFn: () => {
+		unregisterBlockType( metadata.name );
+	},
+	blockName: metadata.name,
+} );

assets/js/atomic/blocks/product-elements/product-details/style.scss

@@ -0,0 +1,46 @@
+.wp-block-woocommerce-product-details {
+	ul.tabs {
+		list-style: none;
+		padding: 0 0 0 1em;
+		margin: 0 0 1.618em;
+		overflow: hidden;
+		position: relative;
+		border-bottom: 1px solid $gray-200;
+
+		li {
+			border: 1px solid $gray-200;
+			background-color: $white;
+			display: inline-block;
+			position: relative;
+			z-index: 0;
+			border-radius: 4px 4px 0 0;
+			margin: 0;
+			padding: 0.5em 1em;
+			opacity: 0.5;
+
+			a {
+				display: inline-block;
+				font-weight: 700;
+				color: $black;
+				text-decoration: none;
+
+				&:hover {
+					text-decoration: none;
+					color: color.adjust($black, $lightness: 10%);
+				}
+			}
+
+			&.active {
+				background: $gray-100;
+				z-index: 2;
+				border-bottom-color: $gray-200;
+				opacity: 1;
+
+				a {
+					color: inherit;
+					text-shadow: inherit;
+				}
+			}
+		}
+	}
+}

assets/js/atomic/blocks/product-elements/product-details/types.ts

@@ -0,0 +1,3 @@
+export interface Attributes {
+	className?: string;
+}

src/BlockTemplatesController.php

@@ -67,7 +67,6 @@ protected function init() {
 		add_filter( 'get_block_templates', array( $this, 'add_block_templates' ), 10, 3 );
 		add_filter( 'current_theme_supports-block-templates', array( $this, 'remove_block_template_support_for_shop_page' ) );
 		add_filter( 'taxonomy_template_hierarchy', array( $this, 'add_archive_product_to_eligible_for_fallback_templates' ), 10, 1 );
-
 		if ( $this->package->is_experimental_build() ) {
 			add_action( 'after_switch_theme', array( $this, 'check_should_use_blockified_product_grid_templates' ), 10, 2 );
 		}

src/BlockTypes/ProductDetails.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * ProductDetails class.
+ */
+class ProductDetails extends AbstractBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'product-details';
+
+	/**
+	 * Render the block.
+	 *
+	 * @param array    $attributes Block attributes.
+	 * @param string   $content Block content.
+	 * @param WP_Block $block Block instance.
+	 *
+	 * @return string Rendered block output.
+	 */
+	protected function render( $attributes, $content, $block ) {
+		$tabs = $this->render_tabs();
+
+		$classname = $attributes['className'] ?? '';
+
+		return sprintf(
+			'<div class="wp-block-woocommerce-single-product-details %1$s">
+				%2$s
+			</div>',
+			esc_attr( $classname ),
+			$tabs
+		);
+	}
+
+	/**
+	 * Gets the tabs with their content to be rendered by the block.
+	 *
+	 * @return string The tabs html to be rendered by the block
+	 */
+	protected function render_tabs() {
+		// This filter ensures the review form is properly rendered when the Product Details block is used alongside
+		// the Classic Single Product Block. It can be removed as soon as the Classic Single Product Block is deprecated.
+		add_filter( 'woocommerce_product_review_comment_form_args', array( $this, 'review_comment_form' ), 0 );
+
+		ob_start();
+
+		while ( have_posts() ) {
+			the_post();
+			woocommerce_output_product_data_tabs();
+		}
+
+		return ob_get_clean();
+	}
+
+	/**
+	 * Ensures the review form is properly rendered when the Product Details block is used alongside the Classic Single Product Block.
+	 *
+	 * This method can be removed as soon as the Classic Single Product Block is deprecated.
+	 *
+	 * @param array $comment_form The comment form arguments.
+	 *
+	 * @return array The updated comment form arguments.
+	 */
+	public function review_comment_form( $comment_form ) {
+		$comment_form['comment_field'] = '<div class="comment-form-rating"><label for="rating">' . esc_html__( 'Your rating', 'woo-gutenberg-products-block' ) . ( wc_review_ratings_required() ? '&nbsp;<span class="required">*</span>' : '' ) . '</label><select name="rating" id="rating-select" required>
+						<option value="">' . esc_html__( 'Rate&hellip;', 'woo-gutenberg-products-block' ) . '</option>
+						<option value="5">' . esc_html__( 'Perfect', 'woo-gutenberg-products-block' ) . '</option>
+						<option value="4">' . esc_html__( 'Good', 'woo-gutenberg-products-block' ) . '</option>
+						<option value="3">' . esc_html__( 'Average', 'woo-gutenberg-products-block' ) . '</option>
+						<option value="2">' . esc_html__( 'Not that bad', 'woo-gutenberg-products-block' ) . '</option>
+						<option value="1">' . esc_html__( 'Very poor', 'woo-gutenberg-products-block' ) . '</option>
+					</select></div>';
+
+		$comment_form['comment_field'] .= '<p class="comment-form-comment"><label for="comment">' . esc_html__( 'Your review', 'woo-gutenberg-products-block' ) . '&nbsp;<span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" required></textarea></p>';
+
+		return $comment_form;
+	}
+}

src/BlockTypesController.php

@@ -207,6 +207,7 @@ protected function get_block_types() {
 			'RatingFilter',
 			'ReviewsByCategory',
 			'ReviewsByProduct',
+			'ProductDetails',
 			'StockFilter',
 		];
 
@@ -255,6 +256,7 @@ protected function get_block_types() {
 					'CatalogSorting',
 					'ClassicTemplate',
 					'ProductResultsCount',
+					'ProductDetails',
 					'StoreNotices',
 				]
 			);

tests/e2e/config/custom-matchers/__fixtures__/single-product-details.fixture.json

@@ -0,0 +1 @@
+{"title":"Product Details Block","pageContent":"<!-- wp:woocommerce/single-product-details /-->"}

tests/e2e/specs/backend/single-produt-details.test.js

@@ -0,0 +1,32 @@
+/**
+ * External dependencies
+ */
+import { getAllBlocks, switchUserToAdmin } from '@wordpress/e2e-test-utils';
+import { visitBlockPage } from '@woocommerce/blocks-test-utils';
+
+/**
+ * Internal dependencies
+ */
+import { insertBlockDontWaitForInsertClose } from '../../utils.js';
+
+const block = {
+	name: 'Product Details',
+	slug: 'woocommerce/single-product-details',
+	class: '.wc-block-single-product-details',
+};
+
+describe( `${ block.name } Block`, () => {
+	beforeAll( async () => {
+		await switchUserToAdmin();
+		await visitBlockPage( `${ block.name } Block` );
+	} );
+
+	it( 'can be inserted more than once', async () => {
+		await insertBlockDontWaitForInsertClose( block.name );
+		expect( await getAllBlocks() ).toHaveLength( 2 );
+	} );
+
+	it( 'renders without crashing', async () => {
+		await expect( page ).toRenderBlock( block );
+	} );
+} );