fix: types

Author: xiaoyatong

src/packages/dialog/content.taro.tsx

@@ -9,7 +9,7 @@ export const defaultContentProps: ContentProps = {
   header: null,
   footer: null,
   close: '',
-  footerDirection: '',
+  footerDirection: 'horizontal',
   onClick: () => {},
 }
 
@@ -39,7 +39,7 @@ export const Content: FunctionComponent<
       footer && (
         <View
           className={classNames(`${classPrefix}-footer`, {
-            [footerDirection as any]: footerDirection,
+            [footerDirection]: footerDirection,
           })}
         >
           {footer}
@@ -65,9 +65,7 @@ export const Content: FunctionComponent<
         style={{ display: visible ? 'flex' : 'none' }}
       >
         {renderHeader()}
-        <View className={`${classPrefix}-content`}>
-          <>{children}</>
-        </View>
+        <View className={`${classPrefix}-content`}>{children}</View>
         {renderFooter()}
       </View>
     </View>

src/packages/dialog/content.tsx

@@ -8,7 +8,7 @@ export const defaultContentProps: ContentProps = {
   header: '',
   footer: '',
   close: '',
-  footerDirection: '',
+  footerDirection: 'horizontal',
   onClick: () => {},
 }
 
@@ -23,24 +23,24 @@ export const Content: FunctionComponent<
     footer,
     close,
     footerDirection,
-    onClick,
     children,
     style,
     className,
+    onClick,
   } = { ...defaultContentProps, ...props }
 
   const classPrefix = 'nut-dialog'
 
   const renderHeader = () => {
-    return title ? <div className={`${classPrefix}-header`}>{title}</div> : null
+    return title && <div className={`${classPrefix}-header`}>{title}</div>
   }
 
   const renderFooter = () => {
     return (
       footer && (
         <div
           className={classNames(`${classPrefix}-footer`, {
-            [footerDirection as any]: footerDirection,
+            [footerDirection]: footerDirection,
           })}
         >
           {footer}
@@ -66,9 +66,7 @@ export const Content: FunctionComponent<
         style={{ display: visible ? 'flex' : 'none' }}
       >
         {renderHeader()}
-        <div className={`${classPrefix}-content`}>
-          <>{children}</>
-        </div>
+        <div className={`${classPrefix}-content`}>{children}</div>
         {renderFooter()}
       </div>
     </div>

src/packages/dialog/dialog.taro.tsx

@@ -182,7 +182,7 @@ export const BaseDialog: FunctionComponent<Partial<DialogBasicProps>> & {
     )
   }
 
-  const onHandleClickOverlay = (e: any) => {
+  const onHandleClickOverlay = (e: React.MouseEvent<HTMLElement>) => {
     if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
       const closed = onOverlayClick && onOverlayClick(e)
       closed && onClose && onClose()

src/packages/dialog/dialogwrap.tsx

@@ -34,7 +34,7 @@ export const DialogWrap: FunctionComponent<
     ...restProps
   } = { ...defaultDialogWrapProps, ...props }
 
-  const onHandleClickOverlay = (e: any) => {
+  const onHandleClickOverlay = (e: React.MouseEvent<HTMLElement>) => {
     if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
       const closed = onOverlayClick && onOverlayClick(e)
       closed && onClose?.()

src/packages/dialog/types.ts

@@ -9,15 +9,15 @@ export type DialogConfigType = {
 }
 
 export type DialogCloseIconPosition = 'top-right' | 'top-left' | 'bottom'
-
+export type DialogFooterDirection = 'horizontal' | 'vertical'
 export interface ContentProps extends BasicComponent {
   visible: boolean
   title: ReactNode
   header: ReactNode
   footer: ReactNode
   close: ReactNode
-  footerDirection: string
-  onClick: (event: any) => void
+  footerDirection: DialogFooterDirection
+  onClick: (event: MouseEvent<HTMLElement>) => void
 }
 export type DialogWrapProps = OverlayProps &
   ContentProps & {
@@ -27,7 +27,7 @@ export type DialogWrapProps = OverlayProps &
     overlayClassName: string
     onCancel: () => void
     onClose: () => void
-    onOverlayClick: (e: MouseEvent) => boolean | void
+    onOverlayClick: (e: MouseEvent<HTMLElement>) => boolean | void
   }
 
 export type DialogBasicProps = DialogWrapProps &

src/packages/fixednav/demos/taro/demo1.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { FixedNav } from '@nutui/nutui-react-taro'
+import { FixedNav, FixedNavItem } from '@nutui/nutui-react-taro'
 
 const Demo1 = () => {
   const list = [
@@ -29,7 +29,10 @@ const Demo1 = () => {
   const change = (value: boolean) => {
     setVisible(value)
   }
-  const selected = (item: any, event: any) => {
+  const selected = (
+    item: FixedNavItem,
+    event: React.MouseEvent<HTMLDivElement, MouseEvent>
+  ) => {
     console.log(item, event)
   }
   return (

src/packages/overlay/overlay.taro.tsx

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

src/packages/toast/demos/taro/demo4.tsx

@@ -16,13 +16,13 @@ const Demo4 = () => {
     duration?: number,
     title?: string
   ) => {
-    const changeState = Object.assign(state, {
+    setState({
+      ...state,
       icon,
       content,
-      duration,
-      title,
+      duration: duration || 0,
+      title: title || '',
     })
-    setState(changeState)
   }
   return (
     <>