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.

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

fix: when merging punctuation into tokens to prevent line breaks, acc… #1812

Merged
merged 1 commit into from
Feb 17, 2025
Merged

fix: when merging punctuation into tokens to prevent line breaks, acc… #1812

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
24 changes: 17 additions & 7 deletions lib/pangea/events/utils/message_text_util.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MessageTextUtil {
final tokens = pangeaMessageEvent.messageDisplayRepresentation!.tokens!;
int pointer = 0;
while (pointer < tokens.length) {
final token = tokens[pointer];
PangeaToken token = tokens[pointer];
final start = token.start;
final end = token.end;

Expand Down Expand Up @@ -56,13 +56,23 @@ class MessageTextUtil {
);
}

// group tokens with punctuation next to it so punctuation doesn't cause newline
final List<PangeaToken> followingPunctTokens = [];
// group tokens with punctuation before and after so punctuation doesn't cause newline
int nextTokenPointer = pointer + 1;
while (nextTokenPointer < tokens.length) {
final nextToken = tokens[nextTokenPointer];
if (nextToken.pos == 'PUNCT') {
followingPunctTokens.add(nextToken);
if (token.pos == 'PUNCT' && token.end == nextToken.start) {
token = nextToken;
nextTokenPointer++;
endIndex = messageCharacters.take(nextToken.end).length;
continue;
}
break;
}

while (nextTokenPointer < tokens.length) {
final nextToken = tokens[nextTokenPointer];

if (nextToken.pos == 'PUNCT' && token.end == nextToken.start) {
nextTokenPointer++;
endIndex = messageCharacters.take(nextToken.end).length;
continue;
Expand All @@ -74,8 +84,8 @@ class MessageTextUtil {
TokenPosition(
start: startIndex,
end: endIndex,
tokenStart: startIndex,
tokenEnd: messageCharacters.take(end).length,
tokenStart: messageCharacters.take(token.start).length,
tokenEnd: messageCharacters.take(token.end).length,
token: token,
hideContent: hideContent,
selected: (isSelected?.call(token) ?? false) &&
Expand Down
38 changes: 30 additions & 8 deletions lib/pangea/toolbar/widgets/message_token_text.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,24 @@ class MessageTextWidget extends StatelessWidget {
);
}

// if the tokenPosition is a combination of the token and following punctuation
// if the tokenPosition is a combination of the token and preceding / following punctuation
// split them so that only the token itself is highlighted when clicked
String firstSubstring = substring;
String secondSubstring = '';
String start = '';
String middle = substring;
String end = '';

if (tokenPosition.tokenStart != tokenPosition.start) {
final splitIndex =
(tokenPosition.tokenStart - tokenPosition.start);
start = substring.substring(0, splitIndex);
middle = substring.substring(splitIndex);
}

if (tokenPosition.end != tokenPosition.tokenEnd) {
final splitIndex = (tokenPosition.end - tokenPosition.start) -
(tokenPosition.end - tokenPosition.tokenEnd);
firstSubstring = substring.substring(0, splitIndex);
secondSubstring = substring.substring(splitIndex);
middle = middle.substring(0, splitIndex);
end = substring.substring(splitIndex);
}

return WidgetSpan(
Expand All @@ -260,8 +268,22 @@ class MessageTextWidget extends StatelessWidget {
child: RichText(
text: TextSpan(
children: [
if (start.isNotEmpty)
LinkifySpan(
text: start,
style: style,
linkStyle: TextStyle(
decoration: TextDecoration.underline,
color: Theme.of(context).brightness ==
Brightness.light
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.onPrimary,
),
onOpen: (url) =>
UrlLauncher(context, url.url).launchUrl(),
),
LinkifySpan(
text: firstSubstring,
text: middle,
style: style.merge(
TextStyle(
backgroundColor: backgroundColor,
Expand All @@ -277,9 +299,9 @@ class MessageTextWidget extends StatelessWidget {
onOpen: (url) =>
UrlLauncher(context, url.url).launchUrl(),
),
if (secondSubstring.isNotEmpty)
if (end.isNotEmpty)
LinkifySpan(
text: secondSubstring,
text: end,
style: style,
linkStyle: TextStyle(
decoration: TextDecoration.underline,
Expand Down
Loading