feat: 类型规范化

src/packages/actionsheet/actionsheet.taro.tsx

@@ -1,20 +1,10 @@
-import React, { FunctionComponent, ReactNode } from 'react'
+import React, { FunctionComponent } from 'react'
 import { View } from '@tarojs/components'
-import Popup, { PopupProps } from '@/packages/popup/index.taro'
+import Popup from '@/packages/popup/index.taro'
 import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
+import { ActionSheetOption, TaroActionSheetProps } from '@/types'
 
-export type ActionSheetOption<T> = { [key: string]: T }
-
-export interface ActionSheetProps extends PopupProps {
-  visible: boolean
-  description: ReactNode
-  options: ActionSheetOption<string | boolean>[]
-  optionKey: ActionSheetOption<string>
-  cancelText: ReactNode
-  onCancel: () => void
-  onSelect: (item: ActionSheetOption<string | boolean>, index: number) => void
-}
 const defaultProps = {
   ...ComponentDefaults,
   visible: false,
@@ -24,9 +14,9 @@ const defaultProps = {
   cancelText: '',
   onCancel: () => {},
   onSelect: () => {},
-} as unknown as ActionSheetProps
+} as unknown as TaroActionSheetProps
 export const ActionSheet: FunctionComponent<
-  Partial<ActionSheetProps> &
+  Partial<TaroActionSheetProps> &
     Omit<React.HTMLAttributes<HTMLDivElement>, 'title' | 'onSelect' | 'onClick'>
 > = (props) => {
   const {

src/packages/actionsheet/actionsheet.tsx

@@ -1,19 +1,9 @@
-import React, { FunctionComponent, ReactNode } from 'react'
-import Popup, { PopupProps } from '@/packages/popup/index'
+import React, { FunctionComponent } from 'react'
+import Popup from '@/packages/popup/index'
 import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
+import { ActionSheetOption, WebActionSheetProps } from '@/types'
 
-export type ActionSheetOption<T> = { [key: string]: T }
-
-export interface ActionSheetProps extends PopupProps {
-  visible: boolean
-  description: ReactNode
-  options: ActionSheetOption<string | boolean>[]
-  optionKey: ActionSheetOption<string>
-  cancelText: ReactNode
-  onCancel: () => void
-  onSelect: (item: ActionSheetOption<string | boolean>, index: number) => void
-}
 const defaultProps = {
   ...ComponentDefaults,
   visible: false,
@@ -23,9 +13,9 @@ const defaultProps = {
   cancelText: '',
   onCancel: () => {},
   onSelect: () => {},
-} as unknown as ActionSheetProps
+} as unknown as WebActionSheetProps
 export const ActionSheet: FunctionComponent<
-  Partial<ActionSheetProps> &
+  Partial<WebActionSheetProps> &
     Omit<React.HTMLAttributes<HTMLDivElement>, 'title' | 'onSelect'>
 > = (props) => {
   const {

src/packages/actionsheet/index.taro.ts

@@ -1,5 +1,8 @@
 import { ActionSheet } from './actionsheet.taro'
 
-export type { ActionSheetOption, ActionSheetProps } from './actionsheet.taro'
+export type {
+  ActionSheetOption,
+  TaroActionSheetProps as ActionSheetProps,
+} from '@/types'
 
 export default ActionSheet

src/packages/actionsheet/index.ts

@@ -1,5 +1,8 @@
 import { ActionSheet } from './actionsheet'
 
-export type { ActionSheetOption, ActionSheetProps } from './actionsheet'
+export type {
+  ActionSheetOption,
+  WebActionSheetProps as ActionSheetProps,
+} from '@/types'
 
 export default ActionSheet

src/packages/address/address.taro.tsx

@@ -10,7 +10,7 @@ import Popup from '@/packages/popup/index.taro'
 import { ExistRender } from './existRender.taro'
 import { CustomRender } from './customRender.taro'
 import { useConfig } from '@/packages/configprovider/index.taro'
-import { AddressList } from './types'
+import { AddressList, AddressRef } from './types'
 import {
   CascaderOption,
   CascaderOptionKey,
@@ -20,11 +20,6 @@ import {
 import { ComponentDefaults } from '@/utils/typings'
 import { usePropsValue } from '@/hooks/use-props-value'
 
-type AddressRef = {
-  open: () => void
-  close: () => void
-}
-
 export interface AddressProps extends CascaderProps {
   visible: boolean
   defaultVisible: boolean

src/packages/address/address.tsx

@@ -9,7 +9,7 @@ import Popup from '@/packages/popup'
 import { CustomRender } from './customRender'
 import { ExistRender } from './existRender'
 import { useConfig } from '@/packages/configprovider'
-import { AddressList } from './types'
+import { AddressList, AddressRef } from './types'
 import {
   CascaderOption,
   CascaderOptionKey,
@@ -19,11 +19,6 @@ import {
 import { ComponentDefaults } from '@/utils/typings'
 import { usePropsValue } from '@/hooks/use-props-value'
 
-type AddressRef = {
-  open: () => void
-  close: () => void
-}
-
 export interface AddressProps extends CascaderProps {
   visible: boolean
   defaultVisible: boolean

src/packages/address/index.taro.ts

@@ -1,4 +1,5 @@
 import { Address } from './address.taro'
 
 export type { AddressProps } from './address.taro'
+export type { AddressList, AddressRef } from './types'
 export default Address

src/packages/address/index.ts

@@ -1,5 +1,6 @@
 import { Address } from './address'
 
 export type { AddressProps } from './address'
+export type { AddressList, AddressRef } from './types'
 
 export default Address

src/packages/address/types.ts

@@ -13,6 +13,11 @@ export interface CloseCallBackData extends Regions {
   addressStr: string
 }
 
+export type AddressRef = {
+  open: () => void
+  close: () => void
+}
+
 export interface ResultData {
   data: CloseCallBackData | AddressList
   type: string

src/packages/animate/animate.taro.tsx

@@ -1,29 +1,22 @@
-import React, { useState, FunctionComponent } from 'react'
+import React, { FunctionComponent, useState } from 'react'
 import classNames from 'classnames'
-import { View, ITouchEvent } from '@tarojs/components'
-import { AnimateType, AnimateAction } from './types'
-import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-
-export interface AnimateProps extends BasicComponent {
-  type: AnimateType
-  action: AnimateAction
-  loop: boolean
-  onClick: (event: React.MouseEvent<Element, MouseEvent> | ITouchEvent) => void
-}
+import { ITouchEvent, View } from '@tarojs/components'
+import { ComponentDefaults } from '@/utils/typings'
+import { TaroAnimateProps } from '@/types'
 
 const defaultProps = {
   ...ComponentDefaults,
   type: 'shake',
   action: 'initial',
   loop: false,
-  onClick: (event: React.MouseEvent<Element, MouseEvent> | ITouchEvent) => {},
-} as AnimateProps
+  onClick: (event) => {},
+} as TaroAnimateProps
 
 const classPrefix = 'nut-animate'
 
-export const Animate: FunctionComponent<
-  Partial<AnimateProps> & React.HTMLAttributes<HTMLDivElement>
-> = (props) => {
+export const Animate: FunctionComponent<Partial<TaroAnimateProps>> = (
+  props
+) => {
   const { className, type, action, loop, onClick, children, style } = {
     ...defaultProps,
     ...props,
@@ -40,9 +33,7 @@ export const Animate: FunctionComponent<
     className
   )
 
-  const handleClick = (
-    event: React.MouseEvent<Element, MouseEvent> | ITouchEvent
-  ) => {
+  const handleClick = (event: ITouchEvent) => {
     setClicked(true)
     // 如果不是无限循环，清除类名
     if (!loop) {

src/packages/animate/animate.tsx

@@ -1,26 +1,19 @@
 import React, { useState, FunctionComponent } from 'react'
 import classNames from 'classnames'
-import { AnimateType, AnimateAction } from './types'
+import { ComponentDefaults } from '@/utils/typings'
+import { WebAnimateProps } from '@/types'
 
-import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-
-export interface AnimateProps extends BasicComponent {
-  type: AnimateType
-  action: AnimateAction
-  loop: boolean
-  onClick: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void
-}
 const defaultProps = {
   ...ComponentDefaults,
   type: 'shake',
   action: 'initial',
   loop: false,
   onClick: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {},
-} as AnimateProps
+} as WebAnimateProps
 
 const classPrefix = 'nut-animate'
 export const Animate: FunctionComponent<
-  Partial<AnimateProps> & React.HTMLAttributes<HTMLDivElement>
+  Partial<WebAnimateProps> & React.HTMLAttributes<HTMLDivElement>
 > = (props) => {
   const { className, type, action, loop, onClick, children, ...rest } = {
     ...defaultProps,

src/packages/animate/index.taro.ts

@@ -1,5 +1,8 @@
 import { Animate } from './animate.taro'
 
-export type { AnimateType, AnimateAction } from './types'
-export type { AnimateProps } from './animate.taro'
+export type {
+  TaroAnimateProps as AnimateProps,
+  AnimateType,
+  AnimateAction,
+} from '@/types'
 export default Animate

src/packages/animate/index.ts

@@ -1,5 +1,8 @@
 import { Animate } from './animate'
 
-export type { AnimateType, AnimateAction } from './types'
-export type { AnimateProps } from './animate'
+export type {
+  WebAnimateProps as AnimateProps,
+  AnimateType,
+  AnimateAction,
+} from '@/types'
 export default Animate

src/packages/animatingnumbers/countup.taro.tsx

@@ -8,25 +8,21 @@
 } from 'react'
 import { View, Text } from '@tarojs/components'
 import { createSelectorQuery } from '@tarojs/taro'
-import { BasicComponent, ComponentDefaults } from '@/utils/typings'
+import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
+import { TaroCountUpProps } from '@/types'
 
-export interface CountUpProps extends BasicComponent {
-  length: number
-  value: string
-  delay?: number
-  duration: number
-  thousands: boolean
-}
 const defaultProps = {
   ...ComponentDefaults,
   length: 0,
   value: '',
   delay: 300,
   duration: 1,
   thousands: false,
-} as CountUpProps
-export const CountUp: FunctionComponent<Partial<CountUpProps>> = (props) => {
+} as TaroCountUpProps
+export const CountUp: FunctionComponent<Partial<TaroCountUpProps>> = (
+  props
+) => {
   const {
     length,
     value,
@@ -85,7 +81,7 @@
         })
         .exec()
     }
   }, [numberArr])
 
   useEffect(() => {
     if (numberArr.length) {

src/packages/animatingnumbers/countup.tsx

@@ -6,25 +6,19 @@ import React, {
   useMemo,
   useRef,
 } from 'react'
-import { BasicComponent, ComponentDefaults } from '@/utils/typings'
+import { ComponentDefaults } from '@/utils/typings'
 import { mergeProps } from '@/utils/merge-props'
+import { WebCountUpProps } from '@/types'
 
-export interface CountUpProps extends BasicComponent {
-  length: number
-  value: string
-  delay?: number
-  duration: number
-  thousands: boolean
-}
 const defaultProps = {
   ...ComponentDefaults,
   length: 0,
   value: '',
   delay: 300,
   duration: 1,
   thousands: false,
-} as CountUpProps
-export const CountUp: FunctionComponent<Partial<CountUpProps>> = (props) => {
+} as WebCountUpProps
+export const CountUp: FunctionComponent<Partial<WebCountUpProps>> = (props) => {
   const {
     length,
     value,

src/packages/animatingnumbers/index.taro.ts

@@ -1,6 +1,6 @@
 import { AnimatingNumbers } from './animatingnumbers.taro'
 import { CountUp } from './countup.taro'
 
-export type { CountUpProps } from './countup.taro'
+export type { TaroCountUpProps as CountUpProps } from '@/types'
 AnimatingNumbers.CountUp = CountUp
 export default AnimatingNumbers

src/packages/animatingnumbers/index.ts

@@ -2,5 +2,5 @@ import { AnimatingNumbers } from './animatingnumbers'
 import { CountUp } from './countup'
 
 AnimatingNumbers.CountUp = CountUp
-export type { CountUpProps } from './countup'
+export type { WebCountUpProps as CountUpProps } from '@/types'
 export default AnimatingNumbers