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

Edit-message (2/n): Implement variant of content input without a typing notifier #1431

Merged
merged 2 commits into from
Apr 2, 2025
Merged

Edit-message (2/n): Implement variant of content input without a typing notifier #1431

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f9aa1a
compose [nfc]: New helper widget for _ContentInput's typing-notifier …
chrisbobbe Mar 20, 2025
6a75033
compose [nfc]: Make _ContentInput stateless
gnprice Apr 2, 2025
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
59 changes: 38 additions & 21 deletions lib/widgets/compose_box.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,24 +394,22 @@ class ComposeContentController extends ComposeController<ContentValidationError>
}
}

class _ContentInput extends StatefulWidget {
const _ContentInput({
required this.narrow,
class _TypingNotifier extends StatefulWidget {
const _TypingNotifier({
required this.destination,
required this.controller,
required this.hintText,
required this.child,
});

final Narrow narrow;
final SendableNarrow destination;
final ComposeBoxController controller;
final String hintText;
final Widget child;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: remove extra newline

@override
State<_ContentInput> createState() => _ContentInputState();
State<_TypingNotifier> createState() => _TypingNotifierState();
}

class _ContentInputState extends State<_ContentInput> with WidgetsBindingObserver {
class _TypingNotifierState extends State<_TypingNotifier> with WidgetsBindingObserver {
@override
void initState() {
super.initState();
Expand All @@ -421,7 +419,7 @@ class _ContentInputState extends State<_ContentInput> with WidgetsBindingObserve
}

@override
void didUpdateWidget(covariant _ContentInput oldWidget) {
void didUpdateWidget(covariant _TypingNotifier oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.controller != oldWidget.controller) {
oldWidget.controller.content.removeListener(_contentChanged);
Expand Down Expand Up @@ -484,6 +482,21 @@ class _ContentInputState extends State<_ContentInput> with WidgetsBindingObserve
}
}

@override
Widget build(BuildContext context) => widget.child;
}

class _ContentInput extends StatelessWidget {
const _ContentInput({
required this.narrow,
required this.controller,
required this.hintText,
});

final Narrow narrow;
final ComposeBoxController controller;
final String hintText;

static double maxHeight(BuildContext context) {
final clampingTextScaler = MediaQuery.textScalerOf(context)
.clamp(maxScaleFactor: 1.5);
Expand Down Expand Up @@ -514,9 +527,9 @@ class _ContentInputState extends State<_ContentInput> with WidgetsBindingObserve
final designVariables = DesignVariables.of(context);

return ComposeAutocomplete(
narrow: widget.narrow,
controller: widget.controller.content,
focusNode: widget.controller.contentFocusNode,
narrow: narrow,
controller: controller.content,
focusNode: controller.contentFocusNode,
fieldViewBuilder: (context) => ConstrainedBox(
constraints: BoxConstraints(maxHeight: maxHeight(context)),
// This [ClipRect] replaces the [TextField] clipping we disable below.
Expand All @@ -525,8 +538,8 @@ class _ContentInputState extends State<_ContentInput> with WidgetsBindingObserve
top: _verticalPadding, bottom: _verticalPadding,
color: designVariables.composeBoxBg,
child: TextField(
controller: widget.controller.content,
focusNode: widget.controller.contentFocusNode,
controller: controller.content,
focusNode: controller.contentFocusNode,
// Let the content show through the `contentPadding` so that
// our [InsetShadowBox] can fade it smoothly there.
clipBehavior: Clip.none,
Expand All @@ -552,7 +565,7 @@ class _ContentInputState extends State<_ContentInput> with WidgetsBindingObserve
// that 54px distance while also making the scrolling work like
// this and offering two lines of touchable area.
contentPadding: const EdgeInsets.symmetric(vertical: _verticalPadding),
hintText: widget.hintText,
hintText: hintText,
hintStyle: TextStyle(
color: designVariables.textInput.withFadedAlpha(0.5))))))));
}
Expand Down Expand Up @@ -645,12 +658,14 @@ class _StreamContentInputState extends State<_StreamContentInput> {
// ignore: dead_null_aware_expression // null topic names soon to be enabled
: '#$streamName > ${hintTopic.displayName ?? store.realmEmptyTopicDisplayName}';

return _ContentInput(
narrow: widget.narrow,
return _TypingNotifier(
destination: TopicNarrow(widget.narrow.streamId,
TopicName(widget.controller.topic.textNormalized)),
controller: widget.controller,
hintText: zulipLocalizations.composeBoxChannelContentHint(hintDestination));
child: _ContentInput(
narrow: widget.narrow,
controller: widget.controller,
hintText: zulipLocalizations.composeBoxChannelContentHint(hintDestination)));
}
}

Expand Down Expand Up @@ -732,11 +747,13 @@ class _FixedDestinationContentInput extends StatelessWidget {

@override
Widget build(BuildContext context) {
return _ContentInput(
narrow: narrow,
return _TypingNotifier(
destination: narrow,
controller: controller,
hintText: _hintText(context));
child: _ContentInput(
narrow: narrow,
controller: controller,
hintText: _hintText(context)));
}
}

Expand Down