Skip to content

semantics: Fix content navigation order in message content when links present #1966

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

semantics: Fix content navigation order in message content when links present #1966

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
111 changes: 57 additions & 54 deletions lib/widgets/content.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,14 @@ class MessageContent extends StatelessWidget {
@override
Widget build(BuildContext context) {
final content = this.content;
return InheritedMessage(message: message,
child: DefaultTextStyle(
style: ContentTheme.of(context).textStylePlainParagraph,
child: switch (content) {
ZulipContent() => BlockContentList(nodes: content.nodes),
PollContent() => PollWidget(messageId: message.id, poll: content.poll),
}));
return MergeSemantics(
child: InheritedMessage(message: message,
child: DefaultTextStyle(
style: ContentTheme.of(context).textStylePlainParagraph,
child: switch (content) {
ZulipContent() => BlockContentList(nodes: content.nodes),
PollContent() => PollWidget(messageId: message.id, poll: content.poll),
})));
}
}

Expand Down Expand Up @@ -333,53 +334,55 @@ class BlockContentList extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
...nodes.map((node) {
return switch (node) {
LineBreakNode() =>
// This goes in a Column. So to get the effect of a newline,
// just use an empty Text.
const Text(''),
ThematicBreakNode() => const ThematicBreak(),
ParagraphNode() => Paragraph(node: node),
HeadingNode() => Heading(node: node),
QuotationNode() => Quotation(node: node),
ListNode() => ListNodeWidget(node: node),
SpoilerNode() => Spoiler(node: node),
CodeBlockNode() => CodeBlock(node: node),
MathBlockNode() => MathBlock(node: node),
ImagePreviewNodeList() => MessageImagePreviewList(node: node),
ImagePreviewNode() => (){
assert(false,
"[ImagePreviewNode] not allowed in [BlockContentList]. "
"It should be wrapped in [ImagePreviewNodeList]."
);
return MessageImagePreview(node: node);
}(),
InlineVideoNode() => MessageInlineVideo(node: node),
EmbedVideoNode() => MessageEmbedVideo(node: node),
TableNode() => MessageTable(node: node),
TableRowNode() => () {
assert(false,
"[TableRowNode] not allowed in [BlockContentList]. "
"It should be wrapped in [TableNode]."
);
return const SizedBox.shrink();
}(),
TableCellNode() => () {
assert(false,
"[TableCellNode] not allowed in [BlockContentList]. "
"It should be wrapped in [TableRowNode]."
);
return const SizedBox.shrink();
}(),
WebsitePreviewNode() => WebsitePreview(node: node),
UnimplementedBlockContentNode() =>
Text.rich(_errorUnimplemented(node, context: context)),
};

}),
]);
return Semantics(
explicitChildNodes: true,
child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [
...nodes.map((node) {
return switch (node) {
LineBreakNode() =>
// This goes in a Column. So to get the effect of a newline,
// just use an empty Text.
const Text(''),
ThematicBreakNode() => const ThematicBreak(),
ParagraphNode() => Paragraph(node: node),
HeadingNode() => Heading(node: node),
QuotationNode() => Quotation(node: node),
ListNode() => ListNodeWidget(node: node),
SpoilerNode() => Spoiler(node: node),
CodeBlockNode() => CodeBlock(node: node),
MathBlockNode() => MathBlock(node: node),
ImagePreviewNodeList() => MessageImagePreviewList(node: node),
ImagePreviewNode() => (){
assert(false,
"[ImagePreviewNode] not allowed in [BlockContentList]. "
"It should be wrapped in [ImagePreviewNodeList]."
);
return MessageImagePreview(node: node);
}(),
InlineVideoNode() => MessageInlineVideo(node: node),
EmbedVideoNode() => MessageEmbedVideo(node: node),
TableNode() => MessageTable(node: node),
TableRowNode() => () {
assert(false,
"[TableRowNode] not allowed in [BlockContentList]. "
"It should be wrapped in [TableNode]."
);
return const SizedBox.shrink();
}(),
TableCellNode() => () {
assert(false,
"[TableCellNode] not allowed in [BlockContentList]. "
"It should be wrapped in [TableRowNode]."
);
return const SizedBox.shrink();
}(),
WebsitePreviewNode() => WebsitePreview(node: node),
UnimplementedBlockContentNode() =>
Text.rich(_errorUnimplemented(node, context: context)),
};

}),
]));
}
}

Expand Down
95 changes: 48 additions & 47 deletions lib/widgets/message_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2205,53 +2205,54 @@ class MessageWithPossibleSender extends StatelessWidget {
: () => showMessageActionSheet(context: context, message: message),
child: Padding(
padding: const EdgeInsets.only(top: 4),
child: Column(children: [
if (item.showSender)
SenderRow(message: message,
timestampStyle: MessageTimestampStyle.timeOnly),
Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: localizedTextBaseline(context),
children: [
const SizedBox(width: 16),
Expanded(child: showAsMuted
? Align(
alignment: AlignmentDirectional.topStart,
child: ZulipWebUiKitButton(
label: zulipLocalizations.revealButtonLabel,
icon: ZulipIcons.eye,
size: ZulipWebUiKitButtonSize.small,
intent: ZulipWebUiKitButtonIntent.neutral,
attention: ZulipWebUiKitButtonAttention.minimal,
onPressed: () {
MessageListPage.ancestorOf(context).revealMutedMessage(message.id);
}))
: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
content,
if ((message.reactions?.total ?? 0) > 0)
ReactionChipsList(messageId: message.id, reactions: message.reactions!),
if (editMessageErrorStatus != null)
_EditMessageStatusRow(messageId: message.id, status: editMessageErrorStatus)
else if (editStateText != null)
Padding(
padding: const EdgeInsets.only(bottom: 4),
child: Text(editStateText,
textAlign: TextAlign.end,
style: TextStyle(
color: designVariables.labelEdited,
fontSize: 12,
height: (12 / 12),
letterSpacing: proportionalLetterSpacing(context,
0.05, baseFontSize: 12))))
else
Padding(padding: const EdgeInsets.only(bottom: 4))
])),
SizedBox(width: 16,
child: star),
]),
])));
child: MergeSemantics(
child: Column(children: [
if (item.showSender)
SenderRow(message: message,
timestampStyle: MessageTimestampStyle.timeOnly),
Row(
crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: localizedTextBaseline(context),
children: [
const SizedBox(width: 16),
Expanded(child: showAsMuted
? Align(
alignment: AlignmentDirectional.topStart,
child: ZulipWebUiKitButton(
label: zulipLocalizations.revealButtonLabel,
icon: ZulipIcons.eye,
size: ZulipWebUiKitButtonSize.small,
intent: ZulipWebUiKitButtonIntent.neutral,
attention: ZulipWebUiKitButtonAttention.minimal,
onPressed: () {
MessageListPage.ancestorOf(context).revealMutedMessage(message.id);
}))
: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
content,
if ((message.reactions?.total ?? 0) > 0)
ReactionChipsList(messageId: message.id, reactions: message.reactions!),
if (editMessageErrorStatus != null)
_EditMessageStatusRow(messageId: message.id, status: editMessageErrorStatus)
else if (editStateText != null)
Padding(
padding: const EdgeInsets.only(bottom: 4),
child: Text(editStateText,
textAlign: TextAlign.end,
style: TextStyle(
color: designVariables.labelEdited,
fontSize: 12,
height: (12 / 12),
letterSpacing: proportionalLetterSpacing(context,
0.05, baseFontSize: 12))))
else
Padding(padding: const EdgeInsets.only(bottom: 4))
])),
SizedBox(width: 16,
child: star),
]),
]))));
}
}

Expand Down