Skip to content

fix: ensure cardinality validation considers block content #1562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix: ensure cardinality validation considers block content #1562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion ...elabs/silverback_gutenberg/src/GutenbergValidation/GutenbergCardinalityValidatorTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,27 @@ public function validateCardinality(array $block, array $expected_children): arr
if (!isset($countInnerBlockInstances[$innerBlock['blockName']])) {
$countInnerBlockInstances[$innerBlock['blockName']] = 0;
}
$countInnerBlockInstances[$innerBlock['blockName']]++;

$hasContent = FALSE;

// Check if the inner blocks have content.
if (!empty($innerBlock['innerBlocks'])) {
foreach ($innerBlock['innerBlocks'] as $innerBlockContent) {
if (trim(strip_tags($innerBlockContent['innerHTML'])) !== '') {
$hasContent = TRUE;
break;
}
}
}
else {
// Check the content of the block itself if there are no inner blocks.
$hasContent = trim(strip_tags($innerBlock['innerHTML'])) !== '';
}

// Increment the counter if the block has meaningful content.
if ($hasContent) {
$countInnerBlockInstances[$innerBlock['blockName']]++;
}
}

foreach ($expected_children as $child) {
Expand Down