Skip to content
Open
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
})

const { height: pickerH, itemHeight } = wrapperStyle
const [itemRawH, setItemRawH] = useState(itemHeight)
const [itemRawH, setItemRawH] = useState(Math.round(itemHeight))
const maxIndex = useMemo(() => columnData.length - 1, [columnData])
const prevScrollingInfo = useRef({ index: initialIndex, y: 0 })
const dragging = useRef(false)
const scrolling = useRef(false)
const timerResetPosition = useRef<NodeJS.Timeout | null>(null)
const timerScrollTo = useRef<NodeJS.Timeout | null>(null)
const timerClickOnce = useRef<NodeJS.Timeout | null>(null)
const timerResetPosition = useRef<ReturnType<typeof setTimeout> | null>(null)
const timerScrollTo = useRef<ReturnType<typeof setTimeout> | null>(null)
const timerClickOnce = useRef<ReturnType<typeof setTimeout> | null>(null)
const activeIndex = useRef(initialIndex)
const prevIndex = usePrevious(initialIndex)
const prevMaxIndex = usePrevious(maxIndex)
Expand All @@ -89,8 +89,8 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
})

const paddingHeight = useMemo(
() => Math.round((pickerH - itemHeight) / 2),
[pickerH, itemHeight]
() => (pickerH - itemRawH) / 2,
[pickerH, itemRawH]
)

const snapToOffsets = useMemo(
Expand Down Expand Up @@ -164,13 +164,20 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
}, isIOS ? 0 : 200)
}, [itemRawH, maxIndex, initialIndex])

useEffect(() => {
const roundedH = Math.round(itemHeight)
if (roundedH) {
setItemRawH(roundedH)
}
}, [itemHeight])

const onItemLayout = useCallback((e: LayoutChangeEvent) => {
const { height: rawH } = e.nativeEvent.layout
const roundedH = Math.round(rawH)
if (roundedH && roundedH !== itemRawH) {
if (roundedH) {
setItemRawH(roundedH)
}
}, [itemRawH])
}, [])

const resetScrollPosition = useCallback((y: number) => {
if (dragging.current || scrolling.current) {
Expand Down Expand Up @@ -293,15 +300,15 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
key={index}
item={item}
index={index}
itemHeight={itemHeight}
itemHeight={itemRawH}
visibleCount={visibleCount}
onItemLayout={onItemLayout}
/>)
: (<MpxPickerViewColumnItemLite
key={index}
item={item}
index={index}
itemHeight={itemHeight}
itemHeight={itemRawH}
onItemLayout={onItemLayout}
/>)
})
Expand Down Expand Up @@ -346,14 +353,14 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,

const renderIndicator = () => (
<PickerIndicator
itemHeight={itemHeight}
itemHeight={itemRawH}
indicatorItemStyle={pickerIndicatorStyle}
/>
)

const renderMask = () => (
<PickerMask
itemHeight={itemHeight}
itemHeight={itemRawH}
maskContainerStyle={pickerMaskStyle}
/>
)
Expand Down
Loading