Skip to content
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.

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

fix: position calculation for inline popups #1350

Draft
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions includes/class-newspack-popups-inserter.php
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,18 @@ public static function get_block_content( $block ) {
return $block_content;
}

/**
* Get the length of a given block.
*
* @param array $block A block.
*
* @return int
*/
private static function get_block_length( $block ) {
$block_content = self::get_block_content( $block );
return strlen( wp_strip_all_tags( $block_content ) );
}

/**
* Insert popups in a post content.
*
Expand Down Expand Up @@ -349,8 +361,7 @@ function ( $block_groups, $block ) use ( &$block_index, $parsed_blocks, $max_ind
// Give length-ignored blocks a length of 1 so that prompts at 0% can still be inserted before them.
$total_length++;
} else {
$block_content = self::get_block_content( $block );
$total_length += strlen( wp_strip_all_tags( $block_content ) );
$total_length += self::get_block_length( $block );
}
}

Expand Down Expand Up @@ -385,7 +396,7 @@ function ( $block_groups, $block ) use ( &$block_index, $parsed_blocks, $max_ind
// Give length-ignored blocks a length of 1 so that prompts at 0% can still be inserted before them.
$pos++;
} else {
$pos += strlen( wp_strip_all_tags( $block['innerHTML'] ) );
$pos += self::get_block_length( $block );
}
}

Expand Down