sevenhill/Qlyra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(chat): краш при редактировании сообщения с фото

Browse Source 
RichMessageController уничтожался сразу после закрытия шторки
редактирования, пока TextField ещё жил во время анимации закрытия.
Шторка выделена в _EditMessageSheet, который владеет контроллером
и освобождает его в dispose после полного демонтажа роута.
This commit is contained in:
bigtaed-sys
2026-08-15 16:02:10 +07:00
committed by Jganenokk
parent 0638b0c99d
commit 45f59ced3d
1 changed files with 97 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/frontend/screens/chats/chat_screen.dart
+97 -55
View File
@@ -2811,75 +2811,28 @@ class _ChatScreenState extends State<ChatScreen>
Future<void> _startEditMessage(CachedMessage message) async {
final cs = Theme.of(context).colorScheme;
final controller = RichMessageController(text: message.text ?? '')
..setFormatRanges(message.formatRanges);
final saved = await showModalBottomSheet<bool>(
final content = await showModalBottomSheet<
({String text, List<Map<String, dynamic>> elements})
>(
context: context,
isScrollControlled: true,
backgroundColor: cs.surfaceContainerHigh,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
),
builder: (sheetContext) => Padding(
padding: EdgeInsets.only(
left: 20,
right: 20,
top: 20,
bottom: MediaQuery.viewInsetsOf(sheetContext).bottom + 20,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'Изменить сообщение',
style: TextStyle(
color: cs.onSurface,
fontSize: 18,
fontWeight: FontWeight.w600,
fontFamily: displayFontOf(context),
),
),
const SizedBox(height: 16),
TextField(
controller: controller,
autofocus: true,
minLines: 1,
maxLines: 6,
style: TextStyle(color: cs.onSurface),
contextMenuBuilder: (ctx, state) =>
_formatContextMenu(controller, ctx, state),
decoration: InputDecoration(
hintText: 'Текст сообщения',
filled: true,
fillColor: cs.surfaceContainerHighest,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(14),
borderSide: BorderSide.none,
),
),
),
const SizedBox(height: 20),
FilledButton(
onPressed: () => Navigator.of(sheetContext).pop(true),
child: const Text('Сохранить'),
),
],
),
builder: (sheetContext) => _EditMessageSheet(
text: message.text ?? '',
formatRanges: message.formatRanges,
contextMenuBuilder: _formatContextMenu,
),
);
if (saved != true || !mounted) {
controller.dispose();
return;
}
if (content == null || !mounted) return;
final content = controller.buildContent();
final rawText = content.text;
final newText = rawText.trim();
final elements = _trimmedElements(content.elements, rawText, newText);
controller.dispose();
final oldElements = serializeFormatElements(
message.formatRanges.where((r) => composerFormats.contains(r.format)),
@@ -7586,3 +7539,92 @@ class _ChatMessageListState extends State<_ChatMessageList> {
);
}
}
class _EditMessageSheet extends StatefulWidget {
final String text;
final Iterable<FormatRange> formatRanges;
final Widget Function(
RichMessageController controller,
BuildContext context,
EditableTextState editableState,
)
contextMenuBuilder;
const _EditMessageSheet({
required this.text,
required this.formatRanges,
required this.contextMenuBuilder,
});
@override
State<_EditMessageSheet> createState() => _EditMessageSheetState();
}
class _EditMessageSheetState extends State<_EditMessageSheet> {
late final RichMessageController _controller;
@override
void initState() {
super.initState();
_controller = RichMessageController(text: widget.text)
..setFormatRanges(widget.formatRanges);
}
@override
void dispose() {
_controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
final cs = Theme.of(context).colorScheme;
return Padding(
padding: EdgeInsets.only(
left: 20,
right: 20,
top: 20,
bottom: MediaQuery.viewInsetsOf(context).bottom + 20,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(
'Изменить сообщение',
style: TextStyle(
color: cs.onSurface,
fontSize: 18,
fontWeight: FontWeight.w600,
fontFamily: displayFontOf(context),
),
),
const SizedBox(height: 16),
TextField(
controller: _controller,
autofocus: true,
minLines: 1,
maxLines: 6,
style: TextStyle(color: cs.onSurface),
contextMenuBuilder: (ctx, state) =>
widget.contextMenuBuilder(_controller, ctx, state),
decoration: InputDecoration(
hintText: 'Текст сообщения',
filled: true,
fillColor: cs.surfaceContainerHighest,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(14),
borderSide: BorderSide.none,
),
),
),
const SizedBox(height: 20),
FilledButton(
onPressed: () => Navigator.of(context).pop(_controller.buildContent()),
child: const Text('Сохранить'),
),
],
),
);
}
}