Skip to content

Commit 68de8ba

Browse files
AhmedLSayed9AhmedLSayed9
committedSep 4, 2023
Fix formatting
·
v3.0.0-beta.21dropdown_button2-v3.0.0-beta.1
1 parent 195fc4a commit 68de8ba

19 files changed

+220
-118
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ coverage/
2020
# VS Code which you may wish to be included in version control, so this line
2121
# is commented out by default.
2222
#.vscode/
23+
.vscode/settings.json
2324

2425
# Flutter/Dart/Pub related
2526
**/doc/api/

‎melos.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ scripts:
2424
description: Run `flutter analyze` for all packages.
2525

2626
format:
27-
run: melos exec dart format . --line-length=100 --fix
27+
run: melos exec dart format . --fix
2828
description: Run `dart format` for all packages.
2929

3030
test:select:

‎packages/dropdown_button2/lib/src/dropdown_button2.dart

+83-43
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,20 @@ const Duration _kDropdownMenuDuration = Duration(milliseconds: 300);
2424
const double _kMenuItemHeight = kMinInteractiveDimension;
2525
const double _kDenseButtonHeight = 24.0;
2626
const EdgeInsets _kMenuItemPadding = EdgeInsets.symmetric(horizontal: 16.0);
27-
const EdgeInsetsGeometry _kAlignedButtonPadding = EdgeInsetsDirectional.only(start: 16.0, end: 4.0);
27+
const EdgeInsetsGeometry _kAlignedButtonPadding =
28+
EdgeInsetsDirectional.only(start: 16.0, end: 4.0);
2829
const EdgeInsets _kUnalignedButtonPadding = EdgeInsets.zero;
2930

3031
/// A builder to customize the selected menu item.
31-
typedef SelectedMenuItemBuilder = Widget Function(BuildContext context, Widget child);
32+
typedef SelectedMenuItemBuilder = Widget Function(
33+
BuildContext context, Widget child);
3234

3335
/// Signature for the callback that's called when when the dropdown menu opens or closes.
3436
typedef OnMenuStateChangeFn = void Function(bool isOpen);
3537

3638
/// Signature for the callback for the match function used for searchable dropdowns.
37-
typedef SearchMatchFn<T> = bool Function(DropdownItem<T> item, String searchValue);
39+
typedef SearchMatchFn<T> = bool Function(
40+
DropdownItem<T> item, String searchValue);
3841

3942
/// A Material Design button for selecting from a list of items.
4043
///
@@ -361,7 +364,8 @@ class DropdownButton2<T> extends StatefulWidget {
361364
}
362365

363366
// ignore: public_member_api_docs
364-
class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBindingObserver {
367+
class DropdownButton2State<T> extends State<DropdownButton2<T>>
368+
with WidgetsBindingObserver {
365369
int? _selectedIndex;
366370
_DropdownRoute<T>? _dropdownRoute;
367371
Orientation? _lastOrientation;
@@ -439,13 +443,17 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
439443
widget.items!.isEmpty ||
440444
(widget.value == null &&
441445
widget.items!
442-
.where((DropdownItem<T> item) => item.enabled && item.value == widget.value)
446+
.where((DropdownItem<T> item) =>
447+
item.enabled && item.value == widget.value)
443448
.isEmpty)) {
444449
_selectedIndex = null;
445450
return;
446451
}
447452

448-
assert(widget.items!.where((DropdownItem<T> item) => item.value == widget.value).length == 1);
453+
assert(widget.items!
454+
.where((DropdownItem<T> item) => item.value == widget.value)
455+
.length ==
456+
1);
449457
for (int itemIndex = 0; itemIndex < widget.items!.length; itemIndex++) {
450458
if (widget.items![itemIndex].value == widget.value) {
451459
_selectedIndex = itemIndex;
@@ -468,18 +476,20 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
468476
_rect.value = newRect;
469477
}
470478

471-
TextStyle? get _textStyle => widget.style ?? Theme.of(context).textTheme.titleMedium;
479+
TextStyle? get _textStyle =>
480+
widget.style ?? Theme.of(context).textTheme.titleMedium;
472481

473482
Rect _getRect() {
474483
final TextDirection? textDirection = Directionality.maybeOf(context);
475484
const EdgeInsetsGeometry menuMargin = EdgeInsets.zero;
476485
final NavigatorState navigator = Navigator.of(context,
477-
rootNavigator: _dropdownStyle.isFullScreen ?? _dropdownStyle.useRootNavigator);
486+
rootNavigator:
487+
_dropdownStyle.isFullScreen ?? _dropdownStyle.useRootNavigator);
478488

479489
final RenderBox itemBox = context.findRenderObject()! as RenderBox;
480-
final Rect itemRect =
481-
itemBox.localToGlobal(Offset.zero, ancestor: navigator.context.findRenderObject()) &
482-
itemBox.size;
490+
final Rect itemRect = itemBox.localToGlobal(Offset.zero,
491+
ancestor: navigator.context.findRenderObject()) &
492+
itemBox.size;
483493

484494
return menuMargin.resolve(textDirection).inflateRect(itemRect);
485495
}
@@ -494,7 +504,8 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
494504

495505
void _handleTap() {
496506
final NavigatorState navigator = Navigator.of(context,
497-
rootNavigator: _dropdownStyle.isFullScreen ?? _dropdownStyle.useRootNavigator);
507+
rootNavigator:
508+
_dropdownStyle.isFullScreen ?? _dropdownStyle.useRootNavigator);
498509

499510
final items = widget.items!;
500511
final separator = widget.dropdownSeparator;
@@ -506,12 +517,13 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
506517
buttonRect: _rect,
507518
selectedIndex: _selectedIndex ?? 0,
508519
isNoSelectedItem: _selectedIndex == null,
509-
capturedThemes: InheritedTheme.capture(from: context, to: navigator.context),
520+
capturedThemes:
521+
InheritedTheme.capture(from: context, to: navigator.context),
510522
style: _textStyle!,
511523
barrierDismissible: widget.barrierDismissible,
512524
barrierColor: widget.barrierColor,
513-
barrierLabel:
514-
widget.barrierLabel ?? MaterialLocalizations.of(context).modalBarrierDismissLabel,
525+
barrierLabel: widget.barrierLabel ??
526+
MaterialLocalizations.of(context).modalBarrierDismissLabel,
515527
parentFocusNode: _focusNode,
516528
enableFeedback: widget.enableFeedback ?? true,
517529
dropdownStyle: _dropdownStyle,
@@ -527,7 +539,9 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
527539
WidgetsBinding.instance.addPostFrameCallback((_) {
528540
_dropdownRoute?._childNode.requestFocus();
529541
});
530-
navigator.push(_dropdownRoute!).then<void>((_DropdownRouteResult<T>? newValue) {
542+
navigator
543+
.push(_dropdownRoute!)
544+
.then<void>((_DropdownRouteResult<T>? newValue) {
531545
_removeDropdownRoute();
532546
_isMenuOpen.value = false;
533547
widget.onMenuStateChange?.call(false);
@@ -550,10 +564,11 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
550564
// would be clipped.
551565
double get _denseButtonHeight {
552566
final double textScaleFactor = MediaQuery.textScaleFactorOf(context);
553-
final double fontSize =
554-
_textStyle!.fontSize ?? Theme.of(context).textTheme.titleMedium!.fontSize!;
567+
final double fontSize = _textStyle!.fontSize ??
568+
Theme.of(context).textTheme.titleMedium!.fontSize!;
555569
final double scaledFontSize = textScaleFactor * fontSize;
556-
return math.max(scaledFontSize, math.max(_iconStyle.iconSize, _kDenseButtonHeight));
570+
return math.max(
571+
scaledFontSize, math.max(_iconStyle.iconSize, _kDenseButtonHeight));
557572
}
558573

559574
Color get _iconColor {
@@ -583,7 +598,10 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
583598
}
584599
}
585600

586-
bool get _enabled => widget.items != null && widget.items!.isNotEmpty && widget.onChanged != null;
601+
bool get _enabled =>
602+
widget.items != null &&
603+
widget.items!.isNotEmpty &&
604+
widget.onChanged != null;
587605

588606
Orientation _getOrientation(BuildContext context) {
589607
// TODO(Ahmed): use maybeOrientationOf [flutter>=v3.10.0].
@@ -594,7 +612,9 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
594612
// TODO(Ahmed): use View.of(context) and update the comment [flutter>=v3.10.0].
595613
// ignore: deprecated_member_use
596614
final Size size = WidgetsBinding.instance.window.physicalSize;
597-
result = size.width > size.height ? Orientation.landscape : Orientation.portrait;
615+
result = size.width > size.height
616+
? Orientation.landscape
617+
: Orientation.portrait;
598618
}
599619
return result;
600620
}
@@ -635,7 +655,8 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
635655

636656
int? hintIndex;
637657
if (widget.hint != null || (!_enabled && widget.disabledHint != null)) {
638-
final Widget displayedHint = _enabled ? widget.hint! : widget.disabledHint ?? widget.hint!;
658+
final Widget displayedHint =
659+
_enabled ? widget.hint! : widget.disabledHint ?? widget.hint!;
639660

640661
hintIndex = buttonItems.length;
641662
buttonItems.add(DefaultTextStyle(
@@ -649,8 +670,9 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
649670
));
650671
}
651672

652-
final EdgeInsetsGeometry padding =
653-
ButtonTheme.of(context).alignedDropdown ? _kAlignedButtonPadding : _kUnalignedButtonPadding;
673+
final EdgeInsetsGeometry padding = ButtonTheme.of(context).alignedDropdown
674+
? _kAlignedButtonPadding
675+
: _kUnalignedButtonPadding;
654676

655677
// If value is null (then _selectedIndex is null) then we
656678
// display the hint or nothing at all.
@@ -663,9 +685,10 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
663685
//from the maximum width of menu items or the hint text (width of IndexedStack).
664686
//We need to add MenuHorizontalPadding so menu width adapts to max items width with padding properly
665687
padding: EdgeInsets.symmetric(
666-
horizontal: _buttonStyle?.width == null && _dropdownStyle.width == null
667-
? _getMenuHorizontalPadding()
668-
: 0.0,
688+
horizontal:
689+
_buttonStyle?.width == null && _dropdownStyle.width == null
690+
? _getMenuHorizontalPadding()
691+
: 0.0,
669692
),
670693
child: IndexedStack(
671694
index: _selectedIndex ?? hintIndex,
@@ -676,7 +699,9 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
676699
: buttonItems.mapIndexed((item, index) {
677700
return SizedBox(
678701
// hintIndex is the last item in buttonItems.
679-
height: index == hintIndex ? _kMenuItemHeight : widget.items![index].height,
702+
height: index == hintIndex
703+
? _kMenuItemHeight
704+
: widget.items![index].height,
680705
child: item,
681706
);
682707
}).toList(),
@@ -685,21 +710,28 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
685710
}
686711

687712
Widget result = DefaultTextStyle(
688-
style: _enabled ? _textStyle! : _textStyle!.copyWith(color: Theme.of(context).disabledColor),
713+
style: _enabled
714+
? _textStyle!
715+
: _textStyle!.copyWith(color: Theme.of(context).disabledColor),
689716
child: widget.customButton ??
690717
Container(
691718
decoration: _buttonStyle?.decoration?.copyWith(
692719
boxShadow: _buttonStyle!.decoration!.boxShadow ??
693720
kElevationToShadow[_buttonStyle!.elevation ?? 0],
694721
),
695-
padding: _buttonStyle?.padding ?? padding.resolve(Directionality.of(context)),
696-
height: _buttonStyle?.height ?? (widget.isDense ? _denseButtonHeight : null),
722+
padding: _buttonStyle?.padding ??
723+
padding.resolve(Directionality.of(context)),
724+
height: _buttonStyle?.height ??
725+
(widget.isDense ? _denseButtonHeight : null),
697726
width: _buttonStyle?.width,
698727
child: Row(
699728
mainAxisAlignment: MainAxisAlignment.spaceBetween,
700729
mainAxisSize: MainAxisSize.min,
701730
children: <Widget>[
702-
if (widget.isExpanded) Expanded(child: innerItemsWidget) else innerItemsWidget,
731+
if (widget.isExpanded)
732+
Expanded(child: innerItemsWidget)
733+
else
734+
innerItemsWidget,
703735
IconTheme(
704736
data: IconThemeData(
705737
color: _iconColor,
@@ -747,7 +779,8 @@ class DropdownButton2State<T> extends State<DropdownButton2<T>> with WidgetsBind
747779
);
748780
}
749781

750-
final MouseCursor effectiveMouseCursor = MaterialStateProperty.resolveAs<MouseCursor>(
782+
final MouseCursor effectiveMouseCursor =
783+
MaterialStateProperty.resolveAs<MouseCursor>(
751784
MaterialStateMouseCursor.clickable,
752785
<MaterialState>{
753786
if (!_enabled) MaterialState.disabled,
@@ -901,23 +934,29 @@ class DropdownButtonFormField2<T> extends FormField<T> {
901934
builder: (FormFieldState<T> field) {
902935
final _DropdownButtonFormFieldState<T> state =
903936
field as _DropdownButtonFormFieldState<T>;
904-
final InputDecoration decorationArg = _getInputDecoration(decoration, buttonStyleData);
905-
final InputDecoration effectiveDecoration = decorationArg.applyDefaults(
937+
final InputDecoration decorationArg =
938+
_getInputDecoration(decoration, buttonStyleData);
939+
final InputDecoration effectiveDecoration =
940+
decorationArg.applyDefaults(
906941
Theme.of(field.context).inputDecorationTheme,
907942
);
908943

909944
final bool showSelectedItem = items != null &&
910-
items.where((DropdownItem<T> item) => item.value == state.value).isNotEmpty;
945+
items
946+
.where((DropdownItem<T> item) => item.value == state.value)
947+
.isNotEmpty;
911948
bool isHintOrDisabledHintAvailable() {
912-
final bool isDropdownDisabled = onChanged == null || (items == null || items.isEmpty);
949+
final bool isDropdownDisabled =
950+
onChanged == null || (items == null || items.isEmpty);
913951
if (isDropdownDisabled) {
914952
return hint != null || disabledHint != null;
915953
} else {
916954
return hint != null;
917955
}
918956
}
919957

920-
final bool isEmpty = !showSelectedItem && !isHintOrDisabledHintAvailable();
958+
final bool isEmpty =
959+
!showSelectedItem && !isHintOrDisabledHintAvailable();
921960

922961
// An unFocusable Focus widget so that this widget can detect if its
923962
// descendants have focus or not.
@@ -954,7 +993,8 @@ class DropdownButtonFormField2<T> extends FormField<T> {
954993
barrierDismissible: barrierDismissible,
955994
barrierColor: barrierColor,
956995
barrierLabel: barrierLabel,
957-
inputDecoration: effectiveDecoration.copyWith(errorText: field.errorText),
996+
inputDecoration: effectiveDecoration.copyWith(
997+
errorText: field.errorText),
958998
isEmpty: isEmpty,
959999
isFocused: Focus.of(context).hasFocus,
9601000
),
@@ -987,10 +1027,10 @@ class DropdownButtonFormField2<T> extends FormField<T> {
9871027
InputDecoration? decoration, ButtonStyleData? buttonStyleData) {
9881028
return decoration ??
9891029
InputDecoration(
990-
focusColor:
991-
buttonStyleData?.overlayColor?.resolve(<MaterialState>{MaterialState.focused}),
992-
hoverColor:
993-
buttonStyleData?.overlayColor?.resolve(<MaterialState>{MaterialState.hovered}),
1030+
focusColor: buttonStyleData?.overlayColor
1031+
?.resolve(<MaterialState>{MaterialState.focused}),
1032+
hoverColor: buttonStyleData?.overlayColor
1033+
?.resolve(<MaterialState>{MaterialState.hovered}),
9941034
);
9951035
}
9961036

0 commit comments

Comments
 (0)
Please sign in to comment.