From 39eeb546a1155dc878290fef6074dbbd26c1cfff Mon Sep 17 00:00:00 2001
From: Giorgenes Gelatti <giorgenes@gmail.com>
Date: Fri, 4 Jun 2021 18:22:59 +1000
Subject: [PATCH 1/2] Support custom widget builder

---
 lib/src/numberpicker.dart           | 25 ++++++++++++++-----------
 test/integer_numberpicker_test.dart | 12 ++++++++++++
 test/test_utils.dart                |  3 +++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/src/numberpicker.dart b/lib/src/numberpicker.dart
index 63b97a1..4d89884 100644
--- a/lib/src/numberpicker.dart
+++ b/lib/src/numberpicker.dart
@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:infinite_listview/infinite_listview.dart';
 
 typedef TextMapper = String Function(String numberText);
+typedef ItemMapper = Widget Function(String numberText, TextStyle? style);
 
 class NumberPicker extends StatefulWidget {
   /// Min value user can pick
@@ -49,6 +50,9 @@ class NumberPicker extends StatefulWidget {
   /// Build the text of each item on the picker
   final TextMapper? textMapper;
 
+  /// Build the widget of each item on the picker
+  final ItemMapper? itemMapper;
+
   /// Pads displayed integer values up to the length of maxValue
   final bool zeroPad;
 
@@ -74,6 +78,7 @@ class NumberPicker extends StatefulWidget {
     this.decoration,
     this.zeroPad = false,
     this.textMapper,
+    this.itemMapper,
     this.infiniteLoop = false,
   })  : assert(minValue <= value),
         assert(value <= maxValue),
@@ -205,29 +210,27 @@ class _NumberPickerState extends State<NumberPicker> {
             index >= listItemsCount - additionalItemsOnEachSide);
     final itemStyle = value == widget.value ? selectedStyle : defaultStyle;
 
-    final child = isExtra
-        ? SizedBox.shrink()
-        : Text(
-            _getDisplayedValue(value),
-            style: itemStyle,
-          );
+    final child =
+        isExtra ? SizedBox.shrink() : _getDisplayedValue(value, itemStyle);
 
     return Container(
       width: widget.itemWidth,
       height: widget.itemHeight,
       alignment: Alignment.center,
-      child: child,
+      child: Center(child: child),
     );
   }
 
-  String _getDisplayedValue(int value) {
+  Widget _getDisplayedValue(int value, TextStyle? style) {
     final text = widget.zeroPad
         ? value.toString().padLeft(widget.maxValue.toString().length, '0')
         : value.toString();
-    if (widget.textMapper != null) {
-      return widget.textMapper!(text);
+    if (widget.itemMapper != null) {
+      return widget.itemMapper!(text, style);
+    } else if (widget.textMapper != null) {
+      return Text(widget.textMapper!(text), style: style);
     } else {
-      return text;
+      return Text(text, style: style);
     }
   }
 
diff --git a/test/integer_numberpicker_test.dart b/test/integer_numberpicker_test.dart
index 58a7d1a..8f553fd 100644
--- a/test/integer_numberpicker_test.dart
+++ b/test/integer_numberpicker_test.dart
@@ -1,4 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter/material.dart';
 
 import 'test_utils.dart';
 
@@ -100,4 +101,15 @@ void main() {
         textMapper: (text) => '$text days',
         expectedDisplayValues: ['2 days', '3 days', '4 days']);
   });
+
+  testWidgets('Item mapper works', (WidgetTester tester) async {
+    await testMultipleValuesInPicker(
+        tester: tester,
+        minValue: 0,
+        maxValue: 10,
+        initialValue: 2,
+        scrollBy: 1,
+        itemMapper: (text, style) => Text('$text days', style: style),
+        expectedDisplayValues: ['2 days', '3 days', '4 days']);
+  });
 }
diff --git a/test/test_utils.dart b/test/test_utils.dart
index 9675e7e..a4bb044 100644
--- a/test/test_utils.dart
+++ b/test/test_utils.dart
@@ -77,6 +77,7 @@ Future<NumberPicker> testMultipleValuesInPicker({
   required int scrollBy,
   int step = 1,
   TextMapper? textMapper,
+  ItemMapper? itemMapper,
   bool animateToItself = false,
   Axis axis = Axis.vertical,
   bool zeroPad = false,
@@ -94,6 +95,7 @@ Future<NumberPicker> testMultipleValuesInPicker({
               maxValue: maxValue,
               step: step,
               textMapper: textMapper,
+              itemMapper: itemMapper,
               onChanged: (newValue) => setState(() => value = newValue),
               zeroPad: zeroPad,
             )
@@ -103,6 +105,7 @@ Future<NumberPicker> testMultipleValuesInPicker({
               maxValue: maxValue,
               step: step,
               textMapper: textMapper,
+              itemMapper: itemMapper,
               zeroPad: zeroPad,
               onChanged: (newValue) => setState(() => value = newValue),
             );

From 2e46abbb291d9939b35b39cb8481133dc8abae79 Mon Sep 17 00:00:00 2001
From: Giorgenes Gelatti <giorgenes@gmail.com>
Date: Mon, 5 Jul 2021 15:05:27 +1000
Subject: [PATCH 2/2] Remove unneeded Center

---
 lib/src/numberpicker.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/numberpicker.dart b/lib/src/numberpicker.dart
index 4d89884..5cbd52d 100644
--- a/lib/src/numberpicker.dart
+++ b/lib/src/numberpicker.dart
@@ -217,7 +217,7 @@ class _NumberPickerState extends State<NumberPicker> {
       width: widget.itemWidth,
       height: widget.itemHeight,
       alignment: Alignment.center,
-      child: Center(child: child),
+      child: child,
     );
   }