Skip to content

Commit 5840ed1

Browse files
committed
Merge branch 'patch/v2.0.2'
2 parents d6915ee + 0eaeecb commit 5840ed1

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,9 @@ The following custom styles can be supplied to re-style the component in any way
495495
| disabledPickerItem | Style for any numbers outside any set limits | TextStyle |
496496
| disabledPickerContainer | Style for disabled pickers | ViewStyle |
497497
| pickerGradientOverlay | Style for the gradient overlay (fade out) | ViewStyle |
498+
| durationScrollFlatList | Style for the Flatlist in each picker | ViewStyle |
499+
| durationScrollFlatListContainer | Style for the View that contains the Flatlist in each picker | ViewStyle |
500+
| durationScrollFlatListContentContainer | Style for the Flatlist's `contentContainerStyle` prop in each picker | ViewStyle |
498501

499502
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.
500503

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"url": "https://github.com/troberts-28"
77
},
88
"license": "MIT",
9-
"version": "2.0.1",
9+
"version": "2.0.2",
1010
"main": "dist/commonjs/index.js",
1111
"module": "dist/module/index.js",
1212
"types": "dist/typescript/index.d.ts",

src/components/DurationScroll/index.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -499,18 +499,21 @@ const DurationScroll = forwardRef<DurationScrollRef, DurationScrollProps>(
499499
<View
500500
pointerEvents={isDisabled ? "none" : undefined}
501501
style={[
502+
styles.durationScrollFlatListContainer,
502503
{
503504
height:
504505
styles.pickerItemContainer.height *
505506
numberOfItemsToShow,
506-
overflow: "visible",
507507
},
508508
isDisabled && styles.disabledPickerContainer,
509509
]}
510510
testID={testID}>
511511
<FlatList
512512
key={flatListRenderKey}
513513
ref={flatListRef}
514+
contentContainerStyle={
515+
styles.durationScrollFlatListContentContainer
516+
}
514517
data={numbersForFlatList}
515518
decelerationRate={0.88}
516519
getItemLayout={getItemLayout}
@@ -528,6 +531,7 @@ const DurationScroll = forwardRef<DurationScrollRef, DurationScrollProps>(
528531
snapToOffsets={[...Array(numbersForFlatList.length)].map(
529532
(_, i) => i * styles.pickerItemContainer.height
530533
)}
534+
style={styles.durationScrollFlatList}
531535
testID="duration-scroll-flatlist"
532536
viewabilityConfigCallbackPairs={
533537
viewabilityConfigCallbackPairs

src/components/TimerPicker/styles.ts

+14
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ export interface CustomTimerPickerStyles {
55
backgroundColor?: string;
66
disabledPickerContainer?: ViewStyle;
77
disabledPickerItem?: TextStyle;
8+
durationScrollFlatList?: ViewStyle;
9+
durationScrollFlatListContainer?: ViewStyle;
10+
durationScrollFlatListContentContainer?: ViewStyle;
811
pickerAmPmContainer?: ViewStyle;
912
pickerAmPmLabel?: TextStyle;
1013
pickerContainer?: ViewStyle & { backgroundColor?: string };
@@ -120,4 +123,15 @@ export const generateStyles = (
120123
: (customStyles?.pickerItemContainer?.height ?? 50) * 0.8,
121124
...customStyles?.pickerGradientOverlay,
122125
},
126+
durationScrollFlatList: {
127+
minWidth: 1,
128+
...customStyles?.durationScrollFlatList,
129+
},
130+
durationScrollFlatListContainer: {
131+
overflow: "visible",
132+
...customStyles?.durationScrollFlatListContainer,
133+
},
134+
durationScrollFlatListContentContainer: {
135+
...customStyles?.durationScrollFlatListContentContainer,
136+
},
123137
});

0 commit comments

Comments
 (0)