Skip to content

Post list preview: trim trailing newline in generated excerpt #25349

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
YuF-9468 wants to merge 3 commits into
base: trunk
Choose a base branch
from
+16 −2
Open

Post list preview: trim trailing newline in generated excerpt #25349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1954c7b
Fix post preview to trim leading/trailing newlines
cl-22 Mar 5, 2026
9f5831e
test: assert explicit preview content for newline trim case
Mar 7, 2026
ead6a8e
Merge branch 'trunk' into fix-12673-trim-preview-newlines
YuF-9468 Mar 13, 2026
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
9 changes: 7 additions & 2 deletions Sources/WordPressData/Swift/Post.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,14 @@ public class Post: AbstractPost {
if let preview = PostPreviewCache.shared.excerpt[excerpt] {
return preview
}
let preview = excerpt.makePlainText().withCollapsedNewlines()
let preview = excerpt.makePlainText().withCollapsedNewlines().trimmedForPreview()
PostPreviewCache.shared.excerpt[excerpt] = preview
return preview
} else if let content {
if let preview = PostPreviewCache.shared.content[content] {
return preview
}
let preview = GutenbergExcerptGenerator.firstParagraph(from: content, maxLength: 200).withCollapsedNewlines()
let preview = GutenbergExcerptGenerator.firstParagraph(from: content, maxLength: 200).withCollapsedNewlines().trimmedForPreview()
PostPreviewCache.shared.content[content] = preview
return preview
} else {
Expand All @@ -253,6 +253,11 @@ private extension String {
func withCollapsedNewlines() -> String {
replacingOccurrences(of: "[\n]{2,}", with: "\n", options: .regularExpression)
}

// Remove leading/trailing line breaks to avoid rendering blank trailing lines in preview labels.
func trimmedForPreview() -> String {
trimmingCharacters(in: .whitespacesAndNewlines)
}
}

private final class PostPreviewCache {
Expand Down
9 changes: 9 additions & 0 deletions Tests/KeystoneTests/Tests/Models/PostTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,15 @@ class PostTests: CoreDataTestCase {
XCTAssertEqual(post.contentPreviewForDisplay(), "some contents\u{A0}go here")
}

func testThatContentPreviewForDisplayTrimsLeadingAndTrailingNewlines() {
let post = newTestPost()

post.content = "<p>Paragraph 1</p><p>Paragraph 2</p>"
let preview = post.contentPreviewForDisplay()

XCTAssertEqual("Paragraph 1\nParagraph 2", preview)
}

func testThatEnablingDisablingPublicizeConnectionsWorks() {
let post = newTestPost()

Expand Down