Skip to content

Post excerpt: Fix JavaScript error and other misc. bug fixes #48730

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

Merged
aristath merged 11 commits into from
Mar 24, 2023
Merged

Post excerpt: Fix JavaScript error and other misc. bug fixes #48730

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
213aa20
Try to improve when the ellipsis shows
carolinan Mar 3, 2023
6034547
Prevent editing excerpts when it is not supported
carolinan Mar 8, 2023
2ef5354
Update edit.js
carolinan Mar 9, 2023
afc2add
Remove unnecessary setExcerpt
carolinan Mar 9, 2023
8890e76
Update edit.js
carolinan Mar 9, 2023
36bebd6
Update edit.js
carolinan Mar 9, 2023
aab350d
Merge branch 'trunk' into update/excerpt-ellipsis
carolinan Mar 9, 2023
564abcc
Update packages/block-library/src/post-excerpt/edit.js
aristath Mar 22, 2023
67ca5f3
Merge branch 'trunk' into update/excerpt-ellipsis
carolinan Mar 23, 2023
439a690
Add a constant for the ellipsis.
carolinan Mar 23, 2023
1bf5831
Update postTypeSupportsExcerpts to use an early return, simplify rawO…
carolinan Mar 23, 2023
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
21 changes: 11 additions & 10 deletions packages/block-library/src/post-excerpt/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,15 @@ export default function PostExcerptEditor( {
* The excerpt length setting needs to be applied to both
* the raw and the rendered excerpt depending on which is being used.
*/
const rawOrRenderedExcerpt = !! renderedExcerpt
let rawOrRenderedExcerpt = !! renderedExcerpt
? strippedRenderedExcerpt
: rawExcerpt;

rawOrRenderedExcerpt = rawOrRenderedExcerpt.trim();

let trimmedExcerpt = '';
if ( wordCountType === 'words' ) {
trimmedExcerpt = rawOrRenderedExcerpt
.trim()
.split( ' ', excerptLength )
.join( ' ' );
} else if ( wordCountType === 'characters_excluding_spaces' ) {
Expand All @@ -143,7 +144,6 @@ export default function PostExcerptEditor( {
* so that the spaces are excluded from the word count.
*/
const excerptWithSpaces = rawOrRenderedExcerpt
.trim()
.split( '', excerptLength )
.join( '' );

Expand All @@ -152,14 +152,13 @@ export default function PostExcerptEditor( {
excerptWithSpaces.replaceAll( ' ', '' ).length;

trimmedExcerpt = rawOrRenderedExcerpt
.trim()
.split( '', excerptLength + numberOfSpaces )
.join( '' );
} else if ( wordCountType === 'characters_including_spaces' ) {
trimmedExcerpt = rawOrRenderedExcerpt.trim().split( '', excerptLength );
trimmedExcerpt = rawOrRenderedExcerpt.split( '', excerptLength );
}

trimmedExcerpt = trimmedExcerpt + '...';
const isTrimmed = trimmedExcerpt !== rawOrRenderedExcerpt ? true : false;

const excerptContent = isEditable ? (
<RichText
Expand All @@ -168,17 +167,19 @@ export default function PostExcerptEditor( {
value={
isSelected
? rawOrRenderedExcerpt
: ( trimmedExcerpt !== '...' ? trimmedExcerpt : '' ) ||
: ( ! isTrimmed
? rawOrRenderedExcerpt
: trimmedExcerpt + '…' ) ||
__( 'No post excerpt found' )
}
onChange={ setExcerpt }
tagName="p"
/>
) : (
<p className={ excerptClassName }>
{ trimmedExcerpt !== '...'
? trimmedExcerpt
: __( 'No post excerpt found' ) }
{ ! isTrimmed
? rawOrRenderedExcerpt || __( 'No post excerpt found' )
: trimmedExcerpt + '…' }
</p>
);
return (
Expand Down