EX-1142 fix access of null offset error and add validation on columns of last row

dist/editor/blocks.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-primitives'), 'version' => '7369bf1f984476aa1081');
+<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-primitives'), 'version' => 'a9d2811d6f17d28c57df');

inc/blocks/helpers.php

@@ -199,3 +199,23 @@ function get_border_styles( array $attributes = [] ): array {
 		'inline_styles' => $inline_styles,
 	];
 }
+
+/**
+ * Get block wrapper attributes.
+ *
+ * @param mixed[] $attributes The block attributes.
+ *
+ * @return string
+ */
+function get_block_wrapper_attributes( array $attributes = [] ): string {
+	if ( ! is_array( $attributes ) ) {
+		return '';
+	}
+
+	$normalized_attributes = [];
+	foreach ( $attributes as $key => $value ) {
+		$normalized_attributes[] = $key . '="' . esc_attr( $value ) . '"';
+	}
+
+	return implode( ' ', $normalized_attributes );
+}

inc/blocks/table-column.php

@@ -7,6 +7,7 @@
 
 namespace Travelopia\Blocks\TableColumn;
 
+use function Travelopia\Blocks\Helpers\get_block_wrapper_attributes;
 use function Travelopia\Blocks\Helpers\get_border_styles;
 use function Travelopia\Blocks\Helpers\get_css_classes;
 use function Travelopia\Blocks\Helpers\get_css_styles;

inc/blocks/table-row-container.php

@@ -7,6 +7,7 @@
 
 namespace Travelopia\Blocks\TableRowContainer;
 
+use function Travelopia\Blocks\Helpers\get_block_wrapper_attributes;
 use function Travelopia\Blocks\Helpers\get_css_classes;
 
 const BLOCK_NAME = 'travelopia/table-row-container';

inc/blocks/table-row.php

@@ -7,6 +7,7 @@
 
 namespace Travelopia\Blocks\TableRow;
 
+use function Travelopia\Blocks\Helpers\get_block_wrapper_attributes;
 use function Travelopia\Blocks\Helpers\get_border_styles;
 use function Travelopia\Blocks\Helpers\get_css_classes;
 use function Travelopia\Blocks\Helpers\get_css_styles;

inc/blocks/table.php

@@ -7,6 +7,7 @@
 
 namespace Travelopia\Blocks\Table;
 
+use function Travelopia\Blocks\Helpers\get_block_wrapper_attributes;
 use function Travelopia\Blocks\Helpers\get_css_classes;
 use function Travelopia\Blocks\Helpers\get_css_styles;
 

src/editor/blocks/table-column/toolbar.tsx

@@ -81,6 +81,7 @@ export default function Toolbar( {
 	} = dispatch( 'core/block-editor' );
 
 	const [ maximumColumnsInCurrentRow, setMaximumColumnsInCurrentRow ] = useState( 0 );
+	const [ maximumRowsInCurrentColumn, setMaximumRowsInCurrentColumn ] = useState( 0 );
 
 	const rowContainerBlockType = useMemo( () => getBlock( rowContainerId )?.attributes?.type, [ rowContainerId, getBlock ] );
 
@@ -97,17 +98,33 @@ export default function Toolbar( {
 			return;
 		}
 
-		// Traverse rows.
-		tableBlock.innerBlocks.some( ( rowBlock, index ): boolean => {
-			// Get current row.
-			if ( rowBlock.name !== rowBlockName || index + 1 !== tableRow || ! rowBlock.innerBlocks.length ) {
+		// Traverse table.
+		tableBlock.innerBlocks.some( ( rowContainerBlock ): boolean => {
+			if ( rowContainerBlock.name !== rowContainerBlockName || ! rowContainerBlock.innerBlocks.length ) {
 				return false;
 			}
 
-			// Set maximum columns in current row.
-			setMaximumColumnsInCurrentRow( rowBlock.innerBlocks.length );
+			let maxRows = 0;
+			rowContainerBlock.innerBlocks.forEach( ( rowBlock, rowIndex ) => {
+				if ( rowBlock.name !== rowBlockName || ! rowBlock.innerBlocks.length ) {
+					return;
+				}
+
+				// Set maximum columns in current row.
+				if ( rowIndex + 1 === tableRow ) {
+					setMaximumColumnsInCurrentRow( rowBlock.innerBlocks.length );
+				}
+
+				rowBlock.innerBlocks.forEach( ( columnBlock, columnIndex ) => {
+					if ( columnBlock.name !== columnBlockName || columnIndex + 1 !== tableColumn ) {
+						return;
+					}
+
+					maxRows++;
+				} );
+			} );
 
-			// Short-circuit loop.
+			setMaximumRowsInCurrentColumn( maxRows );
 			return true;
 		} );
 	}, [ tableRow, tableColumn, getBlock, tableId ] );
@@ -649,7 +666,7 @@ export default function Toolbar( {
 		{
 			icon: arrowDown,
 			title: __( 'Merge column down', 'tp' ),
-			isDisabled: ( rowContainerBlockType === 'tfoot' || rowContainerBlockType === 'thead' ),
+			isDisabled: ( tableRow === maximumRowsInCurrentColumn || rowContainerBlockType === 'tfoot' || rowContainerBlockType === 'thead' ),
 			onClick: onMergeColumnDown,
 		},
 	] as DropdownOption[];