react-native-timer-picker 2.3.1 → 2.5.0

package/README.md

@@ -3,7 +3,7 @@
 [![license](https://img.shields.io/github/license/mashape/apistatus.svg?style=for-the-badge)]()
 ![platforms](https://img.shields.io/badge/platforms-Android%20%7C%20iOS-brightgreen.svg?style=for-the-badge&colorB=191A17)
 [![Version](https://img.shields.io/npm/v/react-native-timer-picker.svg?style=for-the-badge)](https://www.npmjs.com/package/react-native-timer-picker)
-<!-- [![npm](https://img.shields.io/npm/dt/react-native-timer-picker.svg?style=for-the-badge&cacheSeconds=86400)](https://www.npmjs.com/package/react-native-timer-picker) -->
+[![npm](https://img.shields.io/npm/dt/react-native-timer-picker.svg?style=for-the-badge&cacheSeconds=86400)](https://www.npmjs.com/package/react-native-timer-picker)
 
 A simple, flexible, performant duration picker component for React Native apps 🔥
 
@@ -13,37 +13,37 @@ Works with Expo and bare React Native apps ✅
 
 Includes iOS-style haptic and audio feedback 🍏
 
-- [Demos 📱](#demos-)
-- [Installation 🚀](#installation-)
-- [Peer Dependencies 👶](#peer-dependencies-)
-    - [Linear Gradient](#linear-gradient)
-    - [Masked View](#masked-view)
-- [Examples 😎](#examples-)
-- [Timer Picker Modal (Dark Mode) 🌚](#timer-picker-modal-dark-mode-)
-- [Timer Picker Modal (Light Mode) 🌞](#timer-picker-modal-light-mode-)
-- [Timer Picker Modal with Custom Buttons 🎨](#timer-picker-modal-with-custom-buttons-)
-- [Timer Picker with Transparent Fade-Out (Dark Mode) 🌒](#timer-picker-with-transparent-fade-out-dark-mode-)
-- [Timer Picker with Customisation (Light Mode) 🌔](#timer-picker-with-customisation-light-mode-)
-- [Props 💅](#props-)
-- [TimerPicker ⏲️](#timerpicker-️)
-    - [Custom Styles 👗](#custom-styles-)
-    - [Performance](#performance)
-    - [Custom FlatList](#custom-flatlist)
-- [TimerPickerModal ⏰](#timerpickermodal-)
-    - [Custom Styles 👕](#custom-styles--1)
-- [Methods 🔄](#methods-)
-- [TimerPicker](#timerpicker)
-- [TimerPickerModal](#timerpickermodal)
-- [Picker Feedback 📳🔉](#picker-feedback-)
-- [Audio Feedack](#audio-feedack)
-- [Haptic Feedback](#haptic-feedback)
-- [Feedback Example](#feedback-example)
-- [Expo-Specific Audio/Haptic Feedback (DEPRECATED)](#expo-specific-audiohaptic-feedback-deprecated)
-- [Contributing 🧑‍🤝‍🧑](#contributing-)
-- [Dev Setup](#dev-setup)
-- [GitHub Guidelines](#github-guidelines)
-- [Limitations ⚠](#limitations-)
-- [License 📝](#license-)
+  - [Demos 📱](#demos-)
+  - [Installation 🚀](#installation-)
+    - [Peer Dependencies 👶](#peer-dependencies-)
+      - [Linear Gradient](#linear-gradient)
+      - [Masked View](#masked-view)
+  - [Examples 😎](#examples-)
+    - [Timer Picker Modal (Dark Mode) 🌚](#timer-picker-modal-dark-mode-)
+    - [Timer Picker Modal (Light Mode) 🌞](#timer-picker-modal-light-mode-)
+    - [Timer Picker Modal with Custom Buttons 🎨](#timer-picker-modal-with-custom-buttons-)
+    - [Timer Picker with Transparent Fade-Out (Dark Mode) 🌒](#timer-picker-with-transparent-fade-out-dark-mode-)
+    - [Timer Picker with Customisation (Light Mode) 🌔](#timer-picker-with-customisation-light-mode-)
+  - [Props 💅](#props-)
+    - [TimerPicker ⏲️](#timerpicker-️)
+      - [Custom Styles 👗](#custom-styles-)
+      - [Performance](#performance)
+      - [Custom FlatList](#custom-flatlist)
+    - [TimerPickerModal ⏰](#timerpickermodal-)
+      - [Custom Styles 👕](#custom-styles--1)
+  - [Methods 🔄](#methods-)
+    - [TimerPicker](#timerpicker)
+    - [TimerPickerModal](#timerpickermodal)
+  - [Picker Feedback 📳🔉](#picker-feedback-)
+    - [Audio Feedack](#audio-feedack)
+    - [Haptic Feedback](#haptic-feedback)
+    - [Feedback Example](#feedback-example)
+    - [Expo-Specific Audio/Haptic Feedback (DEPRECATED)](#expo-specific-audiohaptic-feedback-deprecated)
+  - [Contributing 🧑‍🤝‍🧑](#contributing-)
+    - [Dev Setup](#dev-setup)
+    - [GitHub Guidelines](#github-guidelines)
+  - [Limitations ⚠](#limitations-)
+  - [License 📝](#license-)
 
 <br>
 
@@ -99,7 +99,7 @@ To make the numbers fade in/out on a transparent background (e.g. if the picker
 
 `import MaskedView from "@react-native-masked-view/masked-view";`
 
-**To enable the fade-out on a transparent background, you need to supply the imported `MaskedView` component AND one of the LinearGradient components as props to either TimerPickerModal or TimerPicker. (see [this example](#timer-picker-with-transparent-fade-out-dark-mode-))**
+**To enable the fade-out on a transparent background, you need to supply the imported `MaskedView` component AND one of the LinearGradient components as props to either TimerPickerModal or TimerPicker (see [this example](#timer-picker-with-transparent-fade-out-dark-mode-)).**
 
 <br>
 
@@ -146,7 +146,7 @@ const formatTime = ({
 return (
     <View style={{backgroundColor: "#514242", alignItems: "center", justifyContent: "center"}}>
         <Text style={{fontSize: 18, color: "#F1F1F1"}}>
-            {alarmStringExample !== null
+            {alarmString !== null
                 ? "Alarm set for"
                 : "No alarm set"}
         </Text>
@@ -181,22 +181,22 @@ return (
             </View>
         </TouchableOpacity>
         <TimerPickerModal
-            visible={showPicker}
-            setIsVisible={setShowPicker}
+            closeOnOverlayPress
+            LinearGradient={LinearGradient}
+            modalProps={{
+                overlayOpacity: 0.2,
+            }}
+            modalTitle="Set Alarm"
+            onCancel={() => setShowPicker(false)}
             onConfirm={(pickedDuration) => {
                 setAlarmString(formatTime(pickedDuration));
                 setShowPicker(false);
             }}
-            modalTitle="Set Alarm"
-            onCancel={() => setShowPicker(false)}
-            closeOnOverlayPress
-            LinearGradient={LinearGradient}
+            setIsVisible={setShowPicker}
             styles={{
                 theme: "dark",
             }}
-            modalProps={{
-                overlayOpacity: 0.2,
-            }}
+            visible={showPicker}
         />
     </View>
 )
@@ -244,7 +244,7 @@ const formatTime = ({
 return (
     <View style={{backgroundColor: "#F1F1F1", alignItems: "center", justifyContent: "center"}}>
         <Text style={{fontSize: 18, color: "#202020"}}>
-            {alarmStringExample !== null
+            {alarmString !== null
                 ? "Alarm set for"
                 : "No alarm set"}
         </Text>
@@ -271,27 +271,27 @@ return (
                             borderColor: "#8C8C8C",
                             color: "#8C8C8C"
                             }}>
-                            Set Alarm 🔔
+                            {"Set Alarm 🔔"}
                         </Text>
                     </View>
                 </TouchableOpacity>
             </View>
         </TouchableOpacity>
         <TimerPickerModal
-            visible={showPicker}
-            setIsVisible={setShowPicker}
+            closeOnOverlayPress
+            LinearGradient={LinearGradient}
+            modalTitle="Set Alarm"
+            onCancel={() => setShowPicker(false)}
             onConfirm={(pickedDuration) => {
                 setAlarmString(formatTime(pickedDuration));
                 setShowPicker(false);
             }}
-            modalTitle="Set Alarm"
-            onCancel={() => setShowPicker(false)}
-            closeOnOverlayPress
-            use12HourPicker
-            LinearGradient={LinearGradient}
+            setIsVisible={setShowPicker}
             styles={{
                 theme: "light",
             }}
+            use12HourPicker
+            visible={showPicker}
         />
     </View>
 )
@@ -305,15 +305,15 @@ return (
 ```jsx
 import { TimerPickerModal } from "react-native-timer-picker";
 import { LinearGradient } from "expo-linear-gradient"; // or `import LinearGradient from "react-native-linear-gradient"`
-import { TouchableOpacity, Text, StyleSheet, Platform } from "react-native";
+import { TouchableOpacity, Text, StyleSheet } from "react-native";
 
 // Custom Button Component
-interface MyCustomButtonProps {
+interface CustomButtonProps {
     label: string;
     onPress?: () => void;
 }
 
-const MyCustomButton: React.FC<MyCustomButtonProps> = ({ label, onPress }) => {
+const CustomButton: React.FC<CustomButtonProps> = ({ label, onPress }) => {
     return (
         <TouchableOpacity onPress={onPress} style={styles.customButtonContainer}>
             <LinearGradient
@@ -410,23 +410,24 @@ return (
             </View>
         </TouchableOpacity>
         <TimerPickerModal
-            visible={showPicker}
-            setIsVisible={setShowPicker}
+            cancelButton={<CustomButton label="Cancel" />}
+            closeOnOverlayPress
+            confirmButton={<CustomButton label="Confirm" />}
+            LinearGradient={LinearGradient}
+            modalProps={{
+                overlayOpacity: 0.2,
+            }}
+            modalTitle="Set Alarm"
+            onCancel={() => setShowPicker(false)}
             onConfirm={(pickedDuration) => {
                 setAlarmString(formatTime(pickedDuration));
                 setShowPicker(false);
             }}
-            modalTitle="Set Alarm"
-            onCancel={() => setShowPicker(false)}
-            closeOnOverlayPress
-            use12HourPicker
-            LinearGradient={LinearGradient}
-            // Custom buttons
-            cancelButton={<MyCustomButton label="Cancel" />}
-            confirmButton={<MyCustomButton label="Confirm" />}
+            setIsVisible={setShowPicker}
             styles={{
-                theme: "light",
+                theme: "dark",
             }}
+            visible={showPicker}
         />
     </View>
 )
@@ -443,46 +444,36 @@ import MaskedView from "@react-native-masked-view/masked-view"; // for transpare
 import { LinearGradient } from "expo-linear-gradient"; // or `import LinearGradient from "react-native-linear-gradient"`
 
 ....
-const [showPicker, setShowPicker] = useState(false);
-const [alarmString, setAlarmString] = useState<
-        string | null
-    >(null);
 
 return (
     <LinearGradient
         colors={["#202020", "#220578"]}
-        start={{ x: 0, y: 0 }}
         end={{ x: 1, y: 1 }}
+        start={{ x: 0, y: 0 }}
         style={{alignItems: "center", justifyContent: "center"}}>
         <TimerPicker
-            padWithNItems={2}
             hourLabel=":"
-            minuteLabel=":"
-            secondLabel=""
             LinearGradient={LinearGradient}
             MaskedView={MaskedView}
+            minuteLabel=":"
+            padWithNItems={2}
+            secondLabel=""
             styles={{
                 theme: "dark",
-                backgroundColor: "transparent", // transparent fade-out
+                backgroundColor: "transparent",
                 pickerItem: {
                     fontSize: 34,
                 },
+                pickerLabelContainer: {
+                    marginTop: -4,
+                    right: 0,
+                    left: undefined,
+                },
                 pickerLabel: {
                     fontSize: 32,
-                    marginTop: 0,
                 },
                 pickerContainer: {
-                    marginRight: 6,
-                },
-                pickerItemContainer: {
-                    width: 100
-                },
-                pickerLabelContainer: {
-                    right: -20,
-                    top: 0,
-                    bottom: 6,
-                    width: 40,
-                    alignItems: "center",
+                    paddingHorizontal: 50,
                 },
             }}
         />
@@ -500,33 +491,26 @@ import { TimerPicker } from "react-native-timer-picker";
 import { LinearGradient } from "expo-linear-gradient"; // or `import LinearGradient from "react-native-linear-gradient"`
 
 ....
-const [showPicker, setShowPicker] = useState(false);
-const [alarmString, setAlarmString] = useState<
-        string | null
-    >(null);
 
 return (
     <View style={{backgroundColor: "#F1F1F1", alignItems: "center", justifyContent: "center"}}>
         <TimerPicker
-            padWithNItems={3}
             hideHours
+            LinearGradient={LinearGradient}
             minuteLabel="min"
+            padWithNItems={3}
             secondLabel="sec"
-            LinearGradient={LinearGradient}
             styles={{
                 theme: "light",
+                labelOffsetPercentage: 0,
                 pickerItem: {
                     fontSize: 34,
                 },
                 pickerLabel: {
                     fontSize: 26,
-                    right: -20,
                 },
-                pickerLabelContainer: {
-                    width: 60,
-                },
-                pickerItemContainer: {
-                    width: 150,
+                pickerContainer: {
+                    paddingHorizontal: 50,
                 },
             }}
         />
@@ -598,28 +582,35 @@ return (
 
 #### Custom Styles 👗
 
-The following custom styles can be supplied to re-style the component in any way. Various styles are applied by default - you can take a look at these [here](src/components/TimerPicker/styles.ts).
+The component should look good straight out of the box, but you can use these styles to make it fit in with your App's theme:
+
+|      Style Prop       | Description                                                              |       Type        |
+| :-------------------: | :----------------------------------------------------------------------- | :---------------: |
+|         theme         | Theme of the component                                                   | "light" \| "dark" |
+|    backgroundColor    | Main background color                                                    |      string       |
+|         text          | Base text style                                                          |     TextStyle     |
+| labelOffsetPercentage | Percentage offset for horizonal label positioning relative to the picker |      number       |
+
+For deeper style customization, you can supply the following custom styles to adjust the component in any way. These are applied on top of the default styling so take a look at those [styles](src/components/TimerPicker/styles.ts) if something isn't adjusting in the way you'd expect.
 
 |               Style Prop               | Description                                                          |                   Type                   |
 | :------------------------------------: | :------------------------------------------------------------------- | :--------------------------------------: |
-|                 theme                  | Theme of the component                                               |            "light" \| "dark"             |
-|            backgroundColor             | Main background color                                                |                  string                  |
-|                  text                  | Base text style                                                      |                TextStyle                 |
 |            pickerContainer             | Main container for the picker                                        | ViewStyle & { backgroundColor?: string } |
 |          pickerLabelContainer          | Container for the picker's labels                                    |                ViewStyle                 |
 |              pickerLabel               | Style for the picker's labels                                        |                TextStyle                 |
 |          pickerAmPmContainer           | Style for the picker's labels                                        |                ViewStyle                 |
 |            pickerAmPmLabel             | Style for the picker's labels                                        |                TextStyle                 |
 |          pickerItemContainer           | Container for each number in the picker                              |     ViewStyle & { height?: number }      |
-|               pickerItem               | Style for each individual picker number                              |                TextStyle                 |
+|               pickerItem               | Style for each number                                                |                TextStyle                 |
 |           disabledPickerItem           | Style for any numbers outside any set limits                         |                TextStyle                 |
+|           selectedPickerItem           | Style for the currently selected number                              |                TextStyle                 |
 |        disabledPickerContainer         | Style for disabled pickers                                           |                ViewStyle                 |
 |         pickerGradientOverlay          | Style for the gradient overlay (fade out)                            |                ViewStyle                 |
 |         durationScrollFlatList         | Style for the Flatlist in each picker                                |                ViewStyle                 |
 |    durationScrollFlatListContainer     | Style for the View that contains the Flatlist in each picker         |                ViewStyle                 |
 | durationScrollFlatListContentContainer | Style for the Flatlist's `contentContainerStyle` prop in each picker |                ViewStyle                 |
 
-Note the minor limitations to the allowed styles for `pickerContainer` and `pickerItemContainer`. These are made because these styles are used for internal calculations and all possible `backgroundColor`/`height` types are not supported.
+**Note:** There are minor limitations on `pickerContainer.backgroundColor` and `pickerItemContainer.height`. These properties must be simple values (string and number respectively) as they are used in internal calculations for scroll positioning, gradient overlays, and snap behavior. Complex computed values or union types are not supported for these specific properties.
 
 #### Performance
 
@@ -680,17 +671,18 @@ The TimerPickerModal component accepts all [TimerPicker props](#timerpicker-️)
 
 #### Custom Styles 👕
 
-The following custom styles can be supplied to re-style the component in any way. You can also supply all of the styles specified in [CustomTimerPickerStyles](#custom-styles-). Various styles are applied by default - you can take a look at these [here](src/components/TimerPickerModal/styles.ts).
-
-|    Style Prop    | Description                                |   Type    |
-| :--------------: | :----------------------------------------- | :-------: |
-|    container     | Main container's style                     | ViewStyle |
-| contentContainer | Style for the content's container          | ViewStyle |
-| buttonContainer  | Style for the container around the buttons | ViewStyle |
-|      button      | General style for both buttons             | TextStyle |
-|   cancelButton   | Style for the cancel button                | TextStyle |
-|  confirmButton   | Style for the confirm button               | TextStyle |
-|    modalTitle    | Style for the title of the modal           | TextStyle |
+The following custom styles can be supplied to re-style the component in any way. You can also supply all of the styles specified in [CustomTimerPickerStyles](#custom-styles-). These are applied on top of the default styling so take a look at those [styles](src/components/TimerPickerModal/styles.ts) if something isn't adjusting in the way you'd expect.
+
+|    Style Prop    | Description                                                      |   Type    |
+| :--------------: | :--------------------------------------------------------------- | :-------: |
+|    container     | Style for the modal container                                    | ViewStyle |
+| contentContainer | Style for the modal content's container                          | ViewStyle |
+| buttonContainer  | Style for the container for the buttons                          | ViewStyle |
+|      button      | General style for both buttons                                   | TextStyle |
+|   cancelButton   | Style for the cancel button                                      | TextStyle |
+|  confirmButton   | Style for the confirm button                                     | TextStyle |
+|    modalTitle    | Style for the title of the modal                                 | TextStyle |
+|       ...        | Supply any of [TimerPicker's custom styles](<(#custom-styles-)>) |     -     |
 
 <br>
 

package/dist/commonjs/components/DurationScroll/DurationScroll.js

@@ -11,6 +11,8 @@ var _generateNumbers = require("../../utils/generateNumbers");
 var _getAdjustedLimit = require("../../utils/getAdjustedLimit");
 var _getDurationAndIndexFromScrollOffset = require("../../utils/getDurationAndIndexFromScrollOffset");
 var _getInitialScrollIndex = require("../../utils/getInitialScrollIndex");
+var _PickerItem = _interopRequireDefault(require("../PickerItem"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -43,6 +45,7 @@ const DurationScroll = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
     pmLabel,
     repeatNumbersNTimes = 3,
     repeatNumbersNTimesNotExplicitlySet,
+    selectedValue,
     styles,
     testID
   } = props;
@@ -150,32 +153,17 @@ const DurationScroll = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
   }, [clickSound]);
   const renderItem = (0, _react.useCallback)(({
     item
-  }) => {
-    let stringItem = item;
-    let intItem;
-    let isAm;
-    if (!is12HourPicker) {
-      intItem = parseInt(item);
-    } else {
-      isAm = item.includes("AM");
-      stringItem = item.replace(/\s[AP]M/g, "");
-      intItem = parseInt(stringItem);
-    }
-    return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-      key: item,
-      style: styles.pickerItemContainer,
-      testID: "picker-item"
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      allowFontScaling: allowFontScaling,
-      style: [styles.pickerItem, intItem > adjustedLimited.max || intItem < adjustedLimited.min ? styles.disabledPickerItem : {}]
-    }, stringItem), is12HourPicker ? /*#__PURE__*/_react.default.createElement(_reactNative.View, {
-      pointerEvents: "none",
-      style: styles.pickerAmPmContainer
-    }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
-      allowFontScaling: allowFontScaling,
-      style: [styles.pickerAmPmLabel]
-    }, isAm ? amLabel : pmLabel)) : null);
-  }, [adjustedLimited.max, adjustedLimited.min, allowFontScaling, amLabel, is12HourPicker, pmLabel, styles.disabledPickerItem, styles.pickerAmPmContainer, styles.pickerAmPmLabel, styles.pickerItem, styles.pickerItemContainer]);
+  }) => /*#__PURE__*/_react.default.createElement(_PickerItem.default, {
+    adjustedLimitedMax: adjustedLimited.max,
+    adjustedLimitedMin: adjustedLimited.min,
+    allowFontScaling: allowFontScaling,
+    amLabel: amLabel,
+    is12HourPicker: is12HourPicker,
+    item: item,
+    pmLabel: pmLabel,
+    selectedValue: selectedValue,
+    styles: styles
+  }), [adjustedLimited.max, adjustedLimited.min, allowFontScaling, amLabel, is12HourPicker, pmLabel, selectedValue, styles]);
   const onScroll = (0, _react.useCallback)(e => {
     // this function is only used when the picker is in a modal and/or has Haptic/Audio feedback
     // it is used to ensure that the modal gets the latest duration on clicking
@@ -375,7 +363,7 @@ const DurationScroll = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
       allowFontScaling: allowFontScaling,
       style: styles.pickerLabel
     }, label) : label ?? null));
-  }, [FlatList, allowFontScaling, flatListRenderKey, getItemLayout, initialScrollIndex, isDisabled, label, numberOfItemsToShow, numbersForFlatList, onMomentumScrollEnd, onScroll, renderItem, styles.durationScrollFlatList, styles.durationScrollFlatListContentContainer, styles.pickerItemContainer.height, styles.pickerLabel, styles.pickerLabelContainer, viewabilityConfigCallbackPairs, decelerationRate]);
+  }, [FlatList, allowFontScaling, decelerationRate, flatListRenderKey, getItemLayout, initialScrollIndex, isDisabled, label, numberOfItemsToShow, numbersForFlatList, onMomentumScrollEnd, onScroll, renderItem, styles.durationScrollFlatList, styles.durationScrollFlatListContentContainer, styles.pickerItemContainer.height, styles.pickerLabel, styles.pickerLabelContainer, viewabilityConfigCallbackPairs]);
   const renderLinearGradient = (0, _react.useMemo)(() => {
     if (!LinearGradient) {
       return null;