diff --git a/AUTHORS b/AUTHORS index 5df0e03f..16d4cb55 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,3 +6,4 @@ Google Inc. Abhijeeth Padarthi Alex Li +Satya Prakash diff --git a/packages/flutter_simple_treeview/lib/src/node_widget.dart b/packages/flutter_simple_treeview/lib/src/node_widget.dart index 509628f7..29591311 100644 --- a/packages/flutter_simple_treeview/lib/src/node_widget.dart +++ b/packages/flutter_simple_treeview/lib/src/node_widget.dart @@ -67,7 +67,7 @@ class _NodeWidgetState extends State { ), if (_isExpanded && !_isLeaf) Padding( - padding: EdgeInsets.only(left: widget.indent!), + padding: EdgeInsetsDirectional.only(start: widget.indent!), child: buildNodes(widget.treeNode.children!, widget.indent, widget.state, widget.iconSize), ) diff --git a/packages/scrollable_positioned_list/lib/src/positioned_list.dart b/packages/scrollable_positioned_list/lib/src/positioned_list.dart index 5c6929e0..3b70eb4f 100644 --- a/packages/scrollable_positioned_list/lib/src/positioned_list.dart +++ b/packages/scrollable_positioned_list/lib/src/positioned_list.dart @@ -44,6 +44,7 @@ class PositionedList extends StatefulWidget { this.addSemanticIndexes = true, this.addRepaintBoundaries = true, this.addAutomaticKeepAlives = true, + this.keyboardDismissBehavior, }) : assert(itemCount != null), assert(itemBuilder != null), assert((positionedIndex == 0) || (positionedIndex < itemCount)), @@ -131,7 +132,9 @@ class PositionedList extends StatefulWidget { /// /// See [SliverChildBuilderDelegate.addAutomaticKeepAlives]. final bool addAutomaticKeepAlives; - + /// A representation of how a [ScrollView] should dismiss + /// the on-screen keyboard. + final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; @override State createState() => _PositionedListState(); } @@ -177,6 +180,7 @@ class _PositionedListState extends State { physics: widget.physics, shrinkWrap: widget.shrinkWrap, semanticChildCount: widget.semanticChildCount ?? widget.itemCount, + keyboardDismissBehavior: widget.keyboardDismissBehavior, slivers: [ if (widget.positionedIndex > 0) SliverPadding( diff --git a/packages/scrollable_positioned_list/lib/src/scroll_view.dart b/packages/scrollable_positioned_list/lib/src/scroll_view.dart index 31acda40..563361c6 100644 --- a/packages/scrollable_positioned_list/lib/src/scroll_view.dart +++ b/packages/scrollable_positioned_list/lib/src/scroll_view.dart @@ -28,6 +28,7 @@ class UnboundedCustomScrollView extends CustomScrollView { List slivers = const [], int? semanticChildCount, DragStartBehavior dragStartBehavior = DragStartBehavior.start, + ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior, }) : _shrinkWrap = shrinkWrap, _anchor = anchor, super( @@ -43,6 +44,8 @@ class UnboundedCustomScrollView extends CustomScrollView { semanticChildCount: semanticChildCount, dragStartBehavior: dragStartBehavior, slivers: slivers, + keyboardDismissBehavior: keyboardDismissBehavior ?? + ScrollViewKeyboardDismissBehavior.manual, ); // [CustomScrollView] enforces constraints on [CustomScrollView.anchor], so diff --git a/packages/scrollable_positioned_list/lib/src/scrollable_positioned_list.dart b/packages/scrollable_positioned_list/lib/src/scrollable_positioned_list.dart index 60045e9b..6f246b10 100644 --- a/packages/scrollable_positioned_list/lib/src/scrollable_positioned_list.dart +++ b/packages/scrollable_positioned_list/lib/src/scrollable_positioned_list.dart @@ -57,6 +57,7 @@ class ScrollablePositionedList extends StatefulWidget { this.addAutomaticKeepAlives = true, this.addRepaintBoundaries = true, this.minCacheExtent, + this.keyboardDismissBehavior, }) : assert(itemCount != null), assert(itemBuilder != null), itemPositionsNotifier = itemPositionsListener as ItemPositionsNotifier?, @@ -87,6 +88,7 @@ class ScrollablePositionedList extends StatefulWidget { this.addAutomaticKeepAlives = true, this.addRepaintBoundaries = true, this.minCacheExtent, + this.keyboardDismissBehavior, }) : assert(itemCount != null), assert(itemBuilder != null), assert(separatorBuilder != null), @@ -185,6 +187,9 @@ class ScrollablePositionedList extends StatefulWidget { /// in builds of widgets that would otherwise already be built in the /// cache extent. final double? minCacheExtent; + /// A representation of how a [ScrollView] should dismiss + /// the on-screen keyboard. + final ScrollViewKeyboardDismissBehavior? keyboardDismissBehavior; @override State createState() => _ScrollablePositionedListState(); @@ -437,6 +442,7 @@ class _ScrollablePositionedListState extends State padding: widget.padding, addAutomaticKeepAlives: widget.addAutomaticKeepAlives, addRepaintBoundaries: widget.addRepaintBoundaries, + keyboardDismissBehavior: widget.keyboardDismissBehavior, ), ), ), @@ -467,6 +473,7 @@ class _ScrollablePositionedListState extends State padding: widget.padding, addAutomaticKeepAlives: widget.addAutomaticKeepAlives, addRepaintBoundaries: widget.addRepaintBoundaries, + keyboardDismissBehavior: widget.keyboardDismissBehavior, ), ), ),