Skip to content

switch from AttributedTextView to Text + AttributedString #113

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

Draft
glasfisch3000 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

switch from AttributedTextView to Text + AttributedString #113

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions Mactrix/Views/ChatView/FormattedBodyView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ struct FormattedBodyView: View {
@AppStorage("fontSize") private var fontSize = 13

let rawBody: String
let htmlBody: String?
var formattedBody: AttributedString? = nil

init(messageContent: some MessageContent) {
self.rawBody = messageContent.body

if let formatted = messageContent.formatted, formatted.format == .html {
self.htmlBody = formatted.body
} else {
self.htmlBody = nil
let parsed = parseFormattedBody(formatted.body, baseFontSize: CGFloat(fontSize))
self.formattedBody = AttributedString(parsed.trimmed)
}
}

var body: some View {
if let htmlBody {
AttributedTextView(attributedString: parseFormattedBody(htmlBody, baseFontSize: CGFloat(fontSize)))
if let formattedBody {
Text(formattedBody)
.textSelection(.enabled)
.fixedSize(horizontal: false, vertical: true)
} else {
Text(rawBody)
Expand Down
2 changes: 1 addition & 1 deletion MactrixLibrary/Sources/MessageFormatting/AttributedTextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public struct AttributedTextView: NSViewRepresentable {
}

extension NSAttributedString {
var trimmed: NSAttributedString {
public var trimmed: NSAttributedString {
let nonWhitespaces = CharacterSet.whitespacesAndNewlines.inverted
let startRange = string.rangeOfCharacter(from: nonWhitespaces)
let endRange = string.rangeOfCharacter(from: nonWhitespaces, options: .backwards)
Expand Down
Loading