Skip to content

Fix blocks props logic #199

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
nelsonamaya82 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −10
Open

Fix blocks props logic #199

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
31 changes: 21 additions & 10 deletions backend/functions/blocks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,15 @@ function( string $block_content, array $block ) {
*/
function lean_add_block_props( string $block_content, array $block ) : string {
$block_name = $block['blockName'];
$close_pos = strpos( $block_content, '>' );

$close_pos = strpos( $block_content, '>' );
$data_type_pos = strpos( $block_content, 'data-type' );
if ( false !== $close_pos && false === $data_type_pos ) {
Copy link
Copy Markdown
Member

@adamf321 adamf321 Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you could have simply kept it as was and changed the if as follows:

if ( false !== $close_pos && ( false === $data_type_pos || $data_type_pos > $close_pos ) ) {

Copy link
Copy Markdown
Contributor Author

@nelsonamaya82 nelsonamaya82 Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I initially considered that solution, but I think it's more performant to search for the data-type attribute just in the opening tag of the block instead of the whole block content (e.g. if the block had a lot of content and just at the end an element with this data attribute).

$block_content = substr_replace( $block_content, ' data-type="' . $block_name . '">', $close_pos, 1 );
if ( false !== $close_pos ) {
$block_opening = substr( $block_content, 0, $close_pos );
$data_type_pos = strpos( $block_opening, ' data-type=' );
// If data-type attribute doesn't exist yet in the block opening, then add it.
if ( false === $data_type_pos ) {
$block_content = substr_replace( $block_content, ' data-type="' . $block_name . '">', $close_pos, 1 );
}
}

$block_config = BlockSettings::CORE_BLOCKS[ $block_name ] ?? false;
Expand Down Expand Up @@ -153,13 +157,20 @@ function lean_column_props( string $block_content, array $block ) : string {

$close_pos = strpos( $block_content, '>' );
if ( false !== $close_pos ) {
$block_content = substr_replace( $block_content, ' data-width="' . $width . '">', $close_pos, 1 );
}
$block_opening = substr( $block_content, 0, $close_pos );
$data_width_pos = strpos( $block_opening, ' data-width=' );
$style_pos = strpos( $block_opening, ' style="' );

$style_pos = strpos( $block_content, 'style="' );
if ( false !== $style_pos ) {
$style_end_pos = strpos( $block_content, '"', $style_pos + 8 );
$block_content = substr_replace( $block_content, '', $style_pos, $style_end_pos - $style_pos + 1 );
// If data-width attribute doesn't exist yet in the block opening, then add it.
if ( false === $data_width_pos ) {
$block_content = substr_replace( $block_content, ' data-width="' . $width . '">', $close_pos, 1 );
}

// If style attribute exists, remove it.
if ( false !== $style_pos ) {
$style_end_pos = strpos( $block_content, '"', $style_pos + 9 );
$block_content = substr_replace( $block_content, '', $style_pos, $style_end_pos - $style_pos + 1 );
}
}

return $block_content;
Expand Down