From 1fd687985a7bc8fc0fe0190a078d86378b9e6eea Mon Sep 17 00:00:00 2001 From: CHB61 Date: Mon, 14 Mar 2022 13:31:34 -0400 Subject: [PATCH] Fix merge commit --- CHANGELOG.md | 5 +++ example/lib/main.dart | 2 +- example/pubspec.lock | 2 +- lib/chip_field/multi_select_chip_field.dart | 34 ++++++++++++--------- lib/dialog/mult_select_dialog.dart | 1 - lib/dialog/multi_select_dialog_field.dart | 3 -- pubspec.yaml | 2 +- 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8bbe96..436bd2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,14 @@ All notable changes to this project will be documented in this file. +## [4.1.2] - 2022-03-14 +### Changed +- Merged [PR #87](https://github.com/CHB61/multi_select_flutter/pull/87). Thanks @benyaminbeyzaie + ## [4.1.1] - 2022-03-14 ### Changed - Created a bug in 4.0.0 by removing the 'collection' dependency. It's only used to call firstWhereOrNull in _buildInheritedChipDisplay in both MultiSelectDialogField and MultiSelectBottomSheetField. This function is meant to automatically build the chips, but it may be changed or removed in the future as I don't think it is really necessary, and has caused some issues. For now, the package still depends on collection. + ## [4.1.0] - 2022-03-14 ### Changed - BREAKING: re-named the 'width' and 'height' fields to dialogWidth and dialogHeight. diff --git a/example/lib/main.dart b/example/lib/main.dart index 8f0f3cd..104cb60 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -233,7 +233,7 @@ class _MyHomePageState extends State { onConfirm: (val) { _selectedAnimals5 = val; }, - width: MediaQuery.of(context).size.width * 0.7, + dialogWidth: MediaQuery.of(context).size.width * 0.7, items: _items, initialValue: _selectedAnimals5, // setting the value of this in initState() to pre-select values. diff --git a/example/pubspec.lock b/example/pubspec.lock index bcd3d9c..31e424f 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -94,7 +94,7 @@ packages: path: ".." relative: true source: path - version: "3.1.8" + version: "4.1.2" path: dependency: transitive description: diff --git a/lib/chip_field/multi_select_chip_field.dart b/lib/chip_field/multi_select_chip_field.dart index 8799c2b..1f420ce 100644 --- a/lib/chip_field/multi_select_chip_field.dart +++ b/lib/chip_field/multi_select_chip_field.dart @@ -150,7 +150,8 @@ class MultiSelectChipField extends FormField> { showHeader: showHeader, chipWidth: chipWidth, ); - return _MultiSelectChipFieldView.withState(view as _MultiSelectChipFieldView, state); + return _MultiSelectChipFieldView.withState( + view as _MultiSelectChipFieldView, state); }); } @@ -378,8 +379,7 @@ class __MultiSelectChipFieldViewState MediaQuery.of(context).size.height * 0.08, child: widget.scrollBar != null ? Scrollbar( - isAlwaysShown: - widget.scrollBar!.isAlwaysShown, + isAlwaysShown: widget.scrollBar!.isAlwaysShown, controller: _scrollController, child: ListView.builder( controller: _scrollController, @@ -388,8 +388,10 @@ class __MultiSelectChipFieldViewState itemBuilder: (ctx, index) { return widget.itemBuilder != null ? widget.itemBuilder!( - _items[index] as MultiSelectItem, widget.state!) - : _buildItem(_items[index] as MultiSelectItem); + _items[index] as MultiSelectItem, + widget.state!) + : _buildItem( + _items[index] as MultiSelectItem); }, ), ) @@ -400,8 +402,10 @@ class __MultiSelectChipFieldViewState itemBuilder: (ctx, index) { return widget.itemBuilder != null ? widget.itemBuilder!( - _items[index] as MultiSelectItem, widget.state!) - : _buildItem(_items[index] as MultiSelectItem); + _items[index] as MultiSelectItem, + widget.state!) + : _buildItem( + _items[index] as MultiSelectItem); }, ), ) @@ -411,14 +415,14 @@ class __MultiSelectChipFieldViewState padding: EdgeInsets.symmetric(horizontal: 10), child: Wrap( children: widget.itemBuilder != null - ? _items - .map((item) => - widget.itemBuilder!(item as MultiSelectItem, widget.state!)) - .toList() - : _items - .map((item) => _buildItem(item as MultiSelectItem)) - .toList() - , + ? _items + .map((item) => widget.itemBuilder!( + item as MultiSelectItem, widget.state!)) + .toList() + : _items + .map((item) => + _buildItem(item as MultiSelectItem)) + .toList(), ), ), ], diff --git a/lib/dialog/mult_select_dialog.dart b/lib/dialog/mult_select_dialog.dart index b7d187a..8d00c2b 100644 --- a/lib/dialog/mult_select_dialog.dart +++ b/lib/dialog/mult_select_dialog.dart @@ -103,7 +103,6 @@ class MultiSelectDialog extends StatefulWidget with MultiSelectActions { this.selectedItemsTextStyle, this.separateSelectedItems = false, this.checkColor, - this.width, }); @override diff --git a/lib/dialog/multi_select_dialog_field.dart b/lib/dialog/multi_select_dialog_field.dart index 4642561..ed72e6c 100644 --- a/lib/dialog/multi_select_dialog_field.dart +++ b/lib/dialog/multi_select_dialog_field.dart @@ -60,9 +60,6 @@ class MultiSelectDialogField extends FormField> { /// Sets a fixed width on the dialog. final double? dialogWidth; - /// Give the dialog a fixed width - final double? width; - /// Set the placeholder text of the search field. final String? searchHint; diff --git a/pubspec.yaml b/pubspec.yaml index 638bfda..50eff1c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: multi_select_flutter description: A flexible multi select package for Flutter. Make multi select widgets the way you want. -version: 4.1.1 +version: 4.1.2 repository: https://github.com/CHB61/flutter-multi-select issue_tracker: https://github.com/CHB61/flutter-multi-select documentation: https://github.com/CHB61/flutter-multi-select