diff --git a/packages/webpack-plugin/lib/runtime/components/react/mpx-picker-view-column.tsx b/packages/webpack-plugin/lib/runtime/components/react/mpx-picker-view-column.tsx index c5f5413d8..078aa0e47 100644 --- a/packages/webpack-plugin/lib/runtime/components/react/mpx-picker-view-column.tsx +++ b/packages/webpack-plugin/lib/runtime/components/react/mpx-picker-view-column.tsx @@ -70,7 +70,7 @@ const _PickerViewColumn = forwardRef, const pickerItemH = useMemo( () => { - const match = (itemHeight + '').match(/^(\d+)px$/) || [0] + const match = (itemHeight + '').match(/\d+/g) || [0] return +match[0] || DefaultPickerItemH }, [itemHeight] diff --git a/packages/webpack-plugin/lib/runtime/components/react/pickerOverlay.tsx b/packages/webpack-plugin/lib/runtime/components/react/pickerOverlay.tsx index 4a646028b..9400a19a7 100644 --- a/packages/webpack-plugin/lib/runtime/components/react/pickerOverlay.tsx +++ b/packages/webpack-plugin/lib/runtime/components/react/pickerOverlay.tsx @@ -7,18 +7,24 @@ type OverlayProps = { overlayContainerStyle?: ViewStyle } -const Overlay = ({ itemHeight, overlayItemStyle, overlayContainerStyle }: OverlayProps) => { - const itemWidth = overlayItemStyle?.width - if (typeof itemWidth === 'string') { - const match = itemWidth.match(/^(\d+)px$/) +const transPx2Number = (value?: string | number) => { + if (typeof value === 'string') { + const match = value.toString().match(/\d+/g) if (match) { - overlayItemStyle!.width = +match[1] + return +match[0] } } + return value +} + +const Overlay = ({ itemHeight, overlayItemStyle, overlayContainerStyle }: OverlayProps) => { + let { width, borderRadius, ...restStyle } = overlayItemStyle || {} + width = transPx2Number(width) + borderRadius = transPx2Number(borderRadius) return ( ) diff --git a/packages/webpack-plugin/lib/runtime/components/react/utils.tsx b/packages/webpack-plugin/lib/runtime/components/react/utils.tsx index 73906ad88..bf0f3612a 100644 --- a/packages/webpack-plugin/lib/runtime/components/react/utils.tsx +++ b/packages/webpack-plugin/lib/runtime/components/react/utils.tsx @@ -563,10 +563,9 @@ export const useStableCallback = ( export const usePrevious = (value: T): T | undefined => { const ref = useRef(undefined) - useEffect(() => { - ref.current = value - }) - return ref.current + const prev = ref.current + ref.current = value + return prev } export interface GestureHandler {