refactor: 类型文件统一为 types，增加 fixednavitem 类型 (#1789)

* refactor: 类型文件统一为 types，增加 fixednavitem 类型

* refactor: 类型文件统一为 types，增加 fixednavitem 类型

src/packages/address/address.taro.tsx

@@ -9,7 +9,7 @@ import Popup from '@/packages/popup/index.taro'
 import { ExistRender } from './existRender.taro'
 import { CustomRender } from './customRender.taro'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
-import { AddressList } from './type'
+import { AddressList } from './types'
 import {
   CascaderOption,
   CascaderOptionKey,

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 './type'
+import { AddressList } from './types'
 import {
   CascaderOption,
   CascaderOptionKey,

src/packages/address/existRender.taro.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent, MouseEventHandler, ReactNode } from 'react'
 import { Check, Location } from '@nutui/icons-react-taro'
 import { ScrollView } from '@tarojs/components'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
-import { AddressList } from './type'
+import { AddressList } from './types'
 
 export interface ExistRenderProps {
   type: string

src/packages/address/existRender.tsx

@@ -1,7 +1,7 @@
 import React, { FunctionComponent, MouseEventHandler, ReactNode } from 'react'
 import { Check, Location } from '@nutui/icons-react'
 import { useConfig } from '@/packages/configprovider'
-import { AddressList } from './type'
+import { AddressList } from './types'
 
 export interface ExistRenderProps {
   type: string

src/packages/animate/__tests__/animate.spec.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { render, waitFor, fireEvent } from '@testing-library/react'
 import '@testing-library/jest-dom'
-import { AnimateType } from '../type'
+import { AnimateType } from '../types'
 
 import { Animate } from '../animate'
 

src/packages/animate/animate.taro.tsx

@@ -1,6 +1,6 @@
 import React, { useState, FunctionComponent } from 'react'
 import classNames from 'classnames'
-import { AnimateType, AnimateAction } from './type'
+import { AnimateType, AnimateAction } from './types'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 

src/packages/animate/animate.tsx

@@ -1,6 +1,6 @@
 import React, { useState, FunctionComponent } from 'react'
 import classNames from 'classnames'
-import { AnimateType, AnimateAction } from './type'
+import { AnimateType, AnimateAction } from './types'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 

src/packages/animate/index.taro.ts

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

src/packages/animate/index.ts

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

src/packages/animatingnumbers/__tests__/animatingnumbers.spec.tsx

@@ -29,10 +29,13 @@ test('test aysnc value and  duration props', async () => {
   const listNumbers = container.querySelectorAll('.nut-countup-number')
   expect(listNumbers.length).toBe(8)
   jest.advanceTimersByTime(CountUp.defaultProps?.delay ?? 0)
-  expect(listNumbers[0]).toHaveAttribute(
-    'style',
-    'transition: transform 1.2s ease-in-out; transform: translate(0, -50%); webkit-transform: translate(0, -50%);'
-  )
+  await waitFor(() => {
+    expect(listNumbers[0]).toHaveAttribute(
+      'style',
+      'transition: transform 1.2s ease-in-out; transform: translate(0, -50%); webkit-transform: translate(0, -50%);'
+    )
+  })
+
   value = `${Math.floor(Math.random() * 999999)}.${Math.floor(
     Math.random() * 89 + 10
   )}`

src/packages/calendar/calendar.taro.tsx

@@ -3,7 +3,7 @@ import Popup from '@/packages/popup/index.taro'
 import CalendarItem from '@/packages/calendaritem/index.taro'
 import { Utils } from '@/utils/date'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
-import { Day, SelectedType } from './type'
+import { Day, SelectedType } from './types'
 import { ComponentDefaults } from '@/utils/typings'
 
 type CalendarRef = {

src/packages/calendar/calendar.tsx

@@ -3,7 +3,7 @@ import Popup from '@/packages/popup'
 import CalendarItem from '@/packages/calendaritem'
 import { Utils } from '@/utils/date'
 import { useConfig } from '@/packages/configprovider'
-import { Day, SelectedType } from './type'
+import { Day, SelectedType } from './types'
 import { ComponentDefaults } from '@/utils/typings'
 
 type CalendarRef = {

src/packages/calendar/utils.tsx

@@ -1,5 +1,5 @@
 import { Utils } from '@/utils/date'
-import { Day, MonthInfo } from './type'
+import { Day, MonthInfo } from './types'
 
 export const splitDate = (date: string) => {
   const split = date.indexOf('-') !== -1 ? '-' : '/'

src/packages/calendaritem/calendaritem.taro.tsx

@@ -22,7 +22,7 @@ import {
   isEnd,
   isStartAndEnd,
 } from '../calendar/utils'
-import { Day, MonthInfo, InputDate, SelectedType } from '../calendar/type'
+import { Day, MonthInfo, InputDate, SelectedType } from '../calendar/types'
 
 type CalendarRef = {
   scrollToDate: (date: string) => void

src/packages/calendaritem/calendaritem.tsx

@@ -21,7 +21,7 @@ import {
   isEnd,
   isStartAndEnd,
 } from '../calendar/utils'
-import { Day, MonthInfo, InputDate, SelectedType } from '../calendar/type'
+import { Day, MonthInfo, InputDate, SelectedType } from '../calendar/types'
 
 type CalendarRef = {
   scrollToDate: (date: string) => void

src/packages/checkboxgroup/checkboxgroup.taro.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useImperativeHandle } from 'react'
 import classNames from 'classnames'
-import { RadioGroupOptionType } from '@/packages/radiogroup/type'
+import { RadioGroupOptionType } from '@/packages/radiogroup/types'
 import { Checkbox } from '../checkbox/checkbox.taro'
 import Context from './context'
 import { usePropsValue } from '@/utils/use-props-value'

src/packages/checkboxgroup/checkboxgroup.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useImperativeHandle } from 'react'
 import classNames from 'classnames'
-import { RadioGroupOptionType } from '@/packages/radiogroup/type'
+import { RadioGroupOptionType } from '@/packages/radiogroup/types'
 import { Checkbox } from '../checkbox/checkbox'
 import Context from './context'
 import { usePropsValue } from '@/utils/use-props-value'

src/packages/fixednav/__tests__/fixednav.spec.tsx

@@ -2,9 +2,9 @@ import * as React from 'react'
 import { render, fireEvent, screen } from '@testing-library/react'
 import '@testing-library/jest-dom'
 
-import FixedNav from '../index'
+import FixedNav, { FixedNavItem } from '../index'
 
-const list = [
+const list: FixedNavItem[] = [
   {
     id: 1,
     text: '首页',

src/packages/fixednav/fixednav.taro.tsx

@@ -4,17 +4,16 @@ import { ArrowLeft } from '@nutui/icons-react-taro'
 import Overlay from '@/packages/overlay/index.taro'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-
-export type FixedNavDirection = 'right' | 'left'
-export type FixedNavPosition = {
-  top?: string
-  bottom?: string
-}
+import {
+  FixedNavDirection,
+  FixedNavItem,
+  FixedNavPosition,
+} from '@/packages/fixednav/types'
 
 export interface FixedNavProps extends BasicComponent {
   visible: boolean
   overlay: boolean
-  list: Array<any>
+  list: Array<FixedNavItem>
   activeText: string
   inactiveText: string
   position: FixedNavPosition

src/packages/fixednav/fixednav.tsx

@@ -4,17 +4,16 @@ import { ArrowLeft } from '@nutui/icons-react'
 import Overlay from '@/packages/overlay'
 import { useConfig } from '@/packages/configprovider'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-
-export type FixedNavDirection = 'right' | 'left'
-export type FixedNavPosition = {
-  top?: string
-  bottom?: string
-}
+import {
+  FixedNavDirection,
+  FixedNavItem,
+  FixedNavPosition,
+} from '@/packages/fixednav/types'
 
 export interface FixedNavProps extends BasicComponent {
   visible: boolean
   overlay: boolean
-  list: Array<any>
+  list: Array<FixedNavItem>
   activeText: string
   inactiveText: string
   position: FixedNavPosition

src/packages/fixednav/index.taro.ts

@@ -1,8 +1,6 @@
 import { FixedNav } from './fixednav.taro'
 
-export type {
-  FixedNavProps,
-  FixedNavDirection,
-  FixedNavPosition,
-} from './fixednav.taro'
+export type { FixedNavDirection, FixedNavPosition, FixedNavItem } from './types'
+
+export type { FixedNavProps } from './fixednav.taro'
 export default FixedNav

src/packages/fixednav/index.ts

@@ -1,8 +1,6 @@
 import { FixedNav } from './fixednav'
 
-export type {
-  FixedNavProps,
-  FixedNavDirection,
-  FixedNavPosition,
-} from './fixednav'
+export type { FixedNavDirection, FixedNavPosition, FixedNavItem } from './types'
+
+export type { FixedNavProps } from './fixednav'
 export default FixedNav

src/packages/fixednav/types.ts

@@ -0,0 +1,14 @@
+import { Key, ReactNode } from 'react'
+
+export type FixedNavDirection = 'right' | 'left'
+export type FixedNavPosition = {
+  top?: string
+  bottom?: string
+}
+
+export interface FixedNavItem {
+  id: Key
+  num?: number
+  text: ReactNode
+  icon: ReactNode
+}

src/packages/radiogroup/radiogroup.taro.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react'
 import classNames from 'classnames'
-import { RadioGroupOptionType } from './type'
+import { RadioGroupOptionType } from './types'
 import RadioContext from './context'
 import Radio from '@/packages/radio/index.taro'
 import { usePropsValue } from '@/utils/use-props-value'

src/packages/radiogroup/radiogroup.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react'
 import classNames from 'classnames'
-import { RadioGroupOptionType } from './type'
+import { RadioGroupOptionType } from './types'
 import RadioContext from './context'
 import Radio from '@/packages/radio/index'
 import { usePropsValue } from '@/utils/use-props-value'

src/packages/virtuallist/utils.ts

@@ -1,4 +1,4 @@
-import { PositionType, Data } from './type'
+import { PositionType, Data } from './types'
 
 // 缓存列表初始化信息
 const initPositinoCache = (reaItemSize: number, length = 0): PositionType[] => {

src/packages/virtuallist/virtuallist.taro.tsx

@@ -9,7 +9,7 @@ import React, {
 import { ScrollView } from '@tarojs/components'
 import { getSystemInfoSync } from '@tarojs/taro'
 import classNames from 'classnames'
-import { Data, PositionType, VirtualListState } from './type'
+import { Data, PositionType, VirtualListState } from './types'
 import { binarySearch, initPositinoCache, updateItemSize } from './utils'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 

src/packages/virtuallist/virtuallist.tsx

@@ -7,7 +7,7 @@ import React, {
   useState,
 } from 'react'
 import classNames from 'classnames'
-import type { Data, VirtualListState, PositionType } from './type'
+import type { Data, VirtualListState, PositionType } from './types'
 import {
   initPositinoCache,
   getListTotalSize,