fix: ts types

Author: xiaoyatong

src/packages/fixednav/fixednav.taro.tsx

@@ -19,7 +19,7 @@ const defaultProps: FixedNavProps = {
     bottom: 'auto',
   },
   zIndex: 200,
-  onChange: () => {},
+  onChange: (value: boolean) => {},
   onSelect: () => {},
 }
 

src/packages/fixednav/fixednav.tsx

@@ -18,7 +18,7 @@ const defaultProps: FixedNavProps = {
     bottom: 'auto',
   },
   zIndex: 200,
-  onChange: () => {},
+  onChange: (value: boolean) => {},
   onSelect: () => {},
 }
 

src/packages/fixednav/types.ts

@@ -22,9 +22,9 @@ export interface FixedNavProps extends Omit<OverlayProps, 'onClick'> {
   type: FixedNavType
   content?: React.ReactNode
   list: Array<FixedNavItem>
-  onChange: (item: any) => void
+  onChange: (value: boolean) => void
   onSelect: (
-    item: any,
+    item: FixedNavItem,
     event: React.MouseEvent<HTMLDivElement, MouseEvent>
   ) => void
 }

src/packages/overlay/overlay.taro.tsx

@@ -19,7 +19,10 @@ export const defaultOverlayProps: OverlayProps = {
   afterClose: () => {},
 }
 export const Overlay: FunctionComponent<
-  Partial<OverlayProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onClick'>
+  Partial<OverlayProps> &
+    Omit<React.HTMLAttributes<HTMLDivElement>, 'onClick'> & {
+      onClick: (event: React.MouseEvent | ITouchEvent) => void
+    }
 > = (props) => {
   const {
     children,

src/packages/overlay/types.ts

@@ -6,7 +6,7 @@ export interface OverlayProps extends BasicComponent {
   closeOnOverlayClick: boolean
   visible: boolean
   lockScroll: boolean
-  onClick: (event: TouchEvent) => void
+  onClick: (event: React.MouseEvent) => void
   afterShow: () => void
   afterClose: () => void
 }

src/packages/popup/popup.taro.tsx

@@ -12,12 +12,11 @@ import { Close } from '@nutui/icons-react-taro'
 import { View, ITouchEvent } from '@tarojs/components'
 import { defaultOverlayProps } from '@/packages/overlay/overlay.taro'
 import Overlay from '@/packages/overlay/index.taro'
-import { ComponentDefaults } from '@/utils/typings'
 import { useLockScrollTaro } from '@/utils/use-lock-scoll-taro'
 import { PopupProps, Teleport } from './types'
 
 const defaultProps: PopupProps = {
-  ...ComponentDefaults,
+  ...defaultOverlayProps,
   position: 'center',
   transition: '',
   overlayStyle: {},
@@ -33,7 +32,6 @@ const defaultProps: PopupProps = {
   onClose: () => {},
   onOverlayClick: () => true,
   onCloseIconClick: () => true,
-  ...defaultOverlayProps,
 }
 
 // 默认1000，参看variables

src/packages/popup/popup.tsx

@@ -11,12 +11,11 @@ import classNames from 'classnames'
 import { Close } from '@nutui/icons-react'
 import { defaultOverlayProps } from '@/packages/overlay/overlay'
 import Overlay from '@/packages/overlay'
-import { ComponentDefaults } from '@/utils/typings'
 import { useLockScroll } from '@/utils/use-lock-scroll'
 import { PopupProps, Teleport } from './types'
 
 const defaultProps: PopupProps = {
-  ...ComponentDefaults,
+  ...defaultOverlayProps,
   position: 'center',
   transition: '',
   overlayStyle: {},
@@ -32,7 +31,6 @@ const defaultProps: PopupProps = {
   onClose: () => {},
   onOverlayClick: () => true,
   onCloseIconClick: () => true,
-  ...defaultOverlayProps,
 }
 
 // 默认1000，参看variables
@@ -118,14 +116,14 @@ export const Popup: FunctionComponent<
     }
   }
 
-  const handleOverlayClick = (e: any) => {
+  const handleOverlayClick = (e: React.MouseEvent) => {
     e.stopPropagation()
     if (closeOnOverlayClick && onOverlayClick(e)) {
       close()
     }
   }
 
-  const handleCloseIconClick = (e: any) => {
+  const handleCloseIconClick = (e: React.MouseEvent) => {
     onCloseIconClick(e) && close()
   }
 

src/packages/popup/types.ts

@@ -19,6 +19,6 @@ export interface PopupProps extends OverlayProps {
   round: boolean
   onOpen: () => void
   onClose: () => void
-  onOverlayClick: (e: TouchEvent) => boolean | void
-  onCloseIconClick: (e: TouchEvent) => boolean | void
+  onOverlayClick: (e: React.MouseEvent) => boolean | undefined
+  onCloseIconClick: (e: React.MouseEvent) => boolean | undefined
 }

src/packages/toast/types.ts

@@ -14,7 +14,7 @@ export interface ToastProps extends OverlayProps {
   id: string
   position: ToastPosition
   title: string
-  size: string | number
+  size: ToastSize
   icon: ToastIcon
   content: React.ReactNode
   contentClassName: string