From 2a45e62cd9f12758b0ba289ebf42ea428fbd7302 Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Mon, 15 Jul 2024 11:33:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(infiniteLoading):=20=E7=BB=A7=E6=89=BF=20s?= =?UTF-8?q?crollView=20=E7=9A=84=20props=20=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infiniteloading/infiniteloading.taro.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/packages/infiniteloading/infiniteloading.taro.tsx b/src/packages/infiniteloading/infiniteloading.taro.tsx index 56765aa75e..f0807d2432 100644 --- a/src/packages/infiniteloading/infiniteloading.taro.tsx +++ b/src/packages/infiniteloading/infiniteloading.taro.tsx @@ -1,19 +1,21 @@ import React, { - useState, - useEffect, - useRef, FunctionComponent, ReactNode, + useEffect, + useRef, + useState, } from 'react' import classNames from 'classnames' -import { ScrollView } from '@tarojs/components' +import { ScrollView, ScrollViewProps } from '@tarojs/components' import { createSelectorQuery } from '@tarojs/taro' import { useConfig } from '@/packages/configprovider/configprovider.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { InfiniteLoadingType } from './types' -export interface InfiniteLoadingProps extends BasicComponent { +export interface InfiniteLoadingProps + extends BasicComponent, + Omit { type: InfiniteLoadingType hasMore: boolean threshold: number @@ -56,6 +58,7 @@ export const InfiniteLoading: FunctionComponent< onRefresh, onLoadMore, onScroll, + ...rest } = { ...defaultProps, ...props, @@ -174,6 +177,7 @@ export const InfiniteLoading: FunctionComponent< onTouchStart={touchStart} onTouchMove={touchMove} onTouchEnd={touchEnd} + {...rest} >