Skip to content

Focus gets wrong when min or max value changes #144

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Focus gets wrong when min or max value changes #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 24 additions & 27 deletions lib/src/numberpicker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,9 @@ class _NumberPickerState extends State<NumberPicker> {
@override
void initState() {
super.initState();
final initialOffset =
(widget.value - widget.minValue) ~/ widget.step * itemExtent;
final initialOffset = (widget.value - widget.minValue) ~/ widget.step * itemExtent;
if (widget.infiniteLoop) {
_scrollController =
InfiniteScrollController(initialScrollOffset: initialOffset);
_scrollController = InfiniteScrollController(initialScrollOffset: initialOffset);
} else {
_scrollController = ScrollController(initialScrollOffset: initialOffset);
}
Expand All @@ -106,8 +104,7 @@ class _NumberPickerState extends State<NumberPicker> {
} else {
indexOfMiddleElement = indexOfMiddleElement.clamp(0, itemCount - 1);
}
final intValueInTheMiddle =
_intValueFromIndex(indexOfMiddleElement + additionalItemsOnEachSide);
final intValueInTheMiddle = _intValueFromIndex(indexOfMiddleElement + additionalItemsOnEachSide);

if (widget.value != intValueInTheMiddle) {
widget.onChanged(intValueInTheMiddle);
Expand All @@ -126,6 +123,8 @@ class _NumberPickerState extends State<NumberPicker> {
super.didUpdateWidget(oldWidget);
if (oldWidget.value != widget.value) {
_maybeCenterValue();
} else if (oldWidget.minValue != widget.minValue || oldWidget.maxValue != widget.maxValue) {
_maybeCenterValue(onlyMinMaxChanged: true);
}
}

Expand All @@ -137,8 +136,7 @@ class _NumberPickerState extends State<NumberPicker> {

bool get isScrolling => _scrollController.position.isScrollingNotifier.value;

double get itemExtent =>
widget.axis == Axis.vertical ? widget.itemHeight : widget.itemWidth;
double get itemExtent => widget.axis == Axis.vertical ? widget.itemHeight : widget.itemWidth;

int get itemCount => (widget.maxValue - widget.minValue) ~/ widget.step + 1;

Expand All @@ -149,12 +147,8 @@ class _NumberPickerState extends State<NumberPicker> {
@override
Widget build(BuildContext context) {
return SizedBox(
width: widget.axis == Axis.vertical
? widget.itemWidth
: widget.itemCount * widget.itemWidth,
height: widget.axis == Axis.vertical
? widget.itemCount * widget.itemHeight
: widget.itemHeight,
width: widget.axis == Axis.vertical ? widget.itemWidth : widget.itemCount * widget.itemWidth,
height: widget.axis == Axis.vertical ? widget.itemCount * widget.itemHeight : widget.itemHeight,
child: NotificationListener<ScrollEndNotification>(
onNotification: (not) {
if (not.dragDetails?.primaryVelocity == 0) {
Expand Down Expand Up @@ -196,13 +190,11 @@ class _NumberPickerState extends State<NumberPicker> {
final themeData = Theme.of(context);
final defaultStyle = widget.textStyle ?? themeData.textTheme.bodyMedium;
final selectedStyle = widget.selectedTextStyle ??
themeData.textTheme.headlineSmall
?.copyWith(color: themeData.colorScheme.secondary);
themeData.textTheme.headlineSmall?.copyWith(color: themeData.colorScheme.secondary);

final value = _intValueFromIndex(index % itemCount);
final isExtra = !widget.infiniteLoop &&
(index < additionalItemsOnEachSide ||
index >= listItemsCount - additionalItemsOnEachSide);
(index < additionalItemsOnEachSide || index >= listItemsCount - additionalItemsOnEachSide);
final itemStyle = value == widget.value ? selectedStyle : defaultStyle;

final child = isExtra
Expand All @@ -221,9 +213,8 @@ class _NumberPickerState extends State<NumberPicker> {
}

String _getDisplayedValue(int value) {
final text = widget.zeroPad
? value.toString().padLeft(widget.maxValue.toString().length, '0')
: value.toString();
final text =
widget.zeroPad ? value.toString().padLeft(widget.maxValue.toString().length, '0') : value.toString();
if (widget.textMapper != null) {
return widget.textMapper!(text);
} else {
Expand All @@ -237,7 +228,7 @@ class _NumberPickerState extends State<NumberPicker> {
return widget.minValue + index * widget.step;
}

void _maybeCenterValue() {
void _maybeCenterValue({bool onlyMinMaxChanged = false}) {
if (_scrollController.hasClients && !isScrolling) {
int diff = widget.value - widget.minValue;
int index = diff ~/ widget.step;
Expand All @@ -246,11 +237,17 @@ class _NumberPickerState extends State<NumberPicker> {
final cycles = (offset / (itemCount * itemExtent)).floor();
index += cycles * itemCount;
}
_scrollController.animateTo(
index * itemExtent,
duration: Duration(milliseconds: 300),
curve: Curves.easeOutCubic,
);
if (onlyMinMaxChanged) {
_scrollController.jumpTo(
index * itemExtent,
);
} else {
_scrollController.animateTo(
index * itemExtent,
duration: Duration(milliseconds: 300),
curve: Curves.easeOutCubic,
);
}
}
}
}
Expand Down