@@ -442,17 +442,10 @@ class _ContentInputState extends State<_ContentInput> with WidgetsBindingObserve
442
442
443
443
/// The content input for _StreamComposeBox.
444
444
class _StreamContentInput extends StatefulWidget {
445
- const _StreamContentInput ({
446
- required this .narrow,
447
- required this .controller,
448
- required this .topicController,
449
- required this .focusNode,
450
- });
445
+ const _StreamContentInput ({required this .narrow, required this .controller});
451
446
452
447
final ChannelNarrow narrow;
453
- final ComposeContentController controller;
454
- final ComposeTopicController topicController;
455
- final FocusNode focusNode;
448
+ final StreamComposeBoxController controller;
456
449
457
450
@override
458
451
State <_StreamContentInput > createState () => _StreamContentInputState ();
@@ -463,29 +456,29 @@ class _StreamContentInputState extends State<_StreamContentInput> {
463
456
464
457
void _topicChanged () {
465
458
setState (() {
466
- _topicTextNormalized = widget.topicController .textNormalized;
459
+ _topicTextNormalized = widget.controller.topic .textNormalized;
467
460
});
468
461
}
469
462
470
463
@override
471
464
void initState () {
472
465
super .initState ();
473
- _topicTextNormalized = widget.topicController .textNormalized;
474
- widget.topicController .addListener (_topicChanged);
466
+ _topicTextNormalized = widget.controller.topic .textNormalized;
467
+ widget.controller.topic .addListener (_topicChanged);
475
468
}
476
469
477
470
@override
478
471
void didUpdateWidget (covariant _StreamContentInput oldWidget) {
479
472
super .didUpdateWidget (oldWidget);
480
- if (widget.topicController != oldWidget.topicController ) {
481
- oldWidget.topicController .removeListener (_topicChanged);
482
- widget.topicController .addListener (_topicChanged);
473
+ if (widget.controller.topic != oldWidget.controller.topic ) {
474
+ oldWidget.controller.topic .removeListener (_topicChanged);
475
+ widget.controller.topic .addListener (_topicChanged);
483
476
}
484
477
}
485
478
486
479
@override
487
480
void dispose () {
488
- widget.topicController .removeListener (_topicChanged);
481
+ widget.controller.topic .removeListener (_topicChanged);
489
482
super .dispose ();
490
483
}
491
484
@@ -498,8 +491,8 @@ class _StreamContentInputState extends State<_StreamContentInput> {
498
491
return _ContentInput (
499
492
narrow: widget.narrow,
500
493
destination: TopicNarrow (widget.narrow.streamId, _topicTextNormalized),
501
- controller: widget.controller,
502
- focusNode: widget.focusNode ,
494
+ controller: widget.controller.content ,
495
+ focusNode: widget.controller.contentFocusNode ,
503
496
hintText: zulipLocalizations.composeBoxChannelContentHint (streamName, _topicTextNormalized));
504
497
}
505
498
}
@@ -1156,9 +1149,7 @@ class _StreamComposeBoxBody extends _ComposeBoxBody {
1156
1149
1157
1150
@override Widget contentInput () => _StreamContentInput (
1158
1151
narrow: narrow,
1159
- topicController: controller.topic,
1160
- controller: controller.content,
1161
- focusNode: controller.contentFocusNode,
1152
+ controller: controller,
1162
1153
);
1163
1154
1164
1155
@override Widget sendButton () => _SendButton (
0 commit comments