chore: refactor the directory structure of hooks

packages/nutui-taro-demo/config/index.js

@@ -120,6 +120,7 @@ const config = {
     '@/sites': path.resolve(__dirname, '../../../src/sites'),
     '@/locales': path.resolve(__dirname, '../../../src/locales'),
     '@/utils': path.resolve(__dirname, '../../../src/utils'),
+    '@/hooks': path.resolve(__dirname, '../../../src/hooks'),
     '@nutui/nutui-react-taro': path.resolve(
       __dirname,
       '../../../src/packages/nutui.react.taro.ts'

packages/nutui-taro-demo/tsconfig.json

@@ -30,6 +30,9 @@
       ],
       "@/utils": [
         "src/utils/*"
+      ],
+      "@/hooks": [
+        "src/hooks/*"
       ]
     },
     "typeRoots": [

scripts/build-taro.mjs

@@ -80,6 +80,7 @@ async function buildES(p) {
       'src/packages/**/context.ts',
       'src/packages/**/utils.ts',
       'src/utils/**/*.{ts,tsx}',
+      'src/hooks/**/*.{ts,tsx}',
       'src/locales/*.ts',
     ],
     {
@@ -105,6 +106,7 @@ async function buildES(p) {
           '@/packages/*': ['src/packages/*'],
           '@/utils/*': ['src/utils/*'],
           '@/utils': ['src/utils'],
+          '@/hooks/*': ['src/hooks/*'],
           '@/locales/*': ['src/locales/*'],
         },
         externalHelpers: true,
@@ -168,6 +170,7 @@ async function buildDeclaration() {
     `${dist}/types/src/packages/**/utils.d.ts`,
     `${dist}/types/src/locales/*.d.ts`,
     `${dist}/types/src/utils/*.d.ts`,
+    `${dist}/types/src/hooks/*.d.ts`,
   ])
 
   for (const file of files) {

scripts/build.mjs

@@ -39,6 +39,7 @@ async function buildES(p) {
     [
       'src/packages/**/*.{ts,tsx}',
       'src/utils/**/*.{ts,tsx}',
+      'src/hooks/**/*.{ts,tsx}',
       'src/locales/*.ts',
     ],
     {
@@ -64,6 +65,7 @@ async function buildES(p) {
           '@/packages/*': ['src/packages/*'],
           '@/utils/*': ['src/utils/*'],
           '@/utils': ['src/utils'],
+          '@/hooks/*': ['src/hooks/*'],
           '@/locales/*': ['src/locales/*'],
         },
         externalHelpers: true,

src/utils/use-click-away.ts → src/hooks/use-click-away.ts

@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { isFunction } from './index'
+import { isFunction } from '../utils'
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 type TargetType = Function | HTMLElement | Element
@@ -20,6 +20,7 @@ const getTargetElement = (target: TargetType) => {
 export default function useClickAway(
   onClickAway: () => void,
   target: TargetType | TargetType[],
+  // eslint-disable-next-line default-param-last
   eventName = 'click',
   useCapture: boolean,
   isListener?: boolean,

src/utils/use-custom-event.ts → src/hooks/use-custom-event.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'react'
 import isEqual from 'react-fast-compare'
 import { Events, getCurrentInstance } from '@tarojs/taro'
-import { useForceUpdate } from '@/utils/use-force-update'
+import { useForceUpdate } from '@/hooks/use-force-update'
 
 export const customEvents = new Events()
 

src/utils/use-lock-scoll-taro.ts → src/hooks/use-lock-scoll-taro.ts

@@ -1,6 +1,6 @@
 import { useRef } from 'react'
 import { getEnv } from '@tarojs/taro'
-import { useLockScroll } from '@/utils/use-lock-scroll'
+import { useLockScroll } from '@/hooks/use-lock-scroll'
 
 export const useLockScrollTaro = (shouldLock: boolean) => {
   const refObject = useRef(null)

src/utils/use-lock-scroll.ts → src/hooks/use-lock-scroll.ts

@@ -1,7 +1,7 @@
 import { useEffect, RefObject } from 'react'
 import { useTouch } from './use-touch'
-import { getScrollParent } from './get-scroll-parent'
-import { passiveSupported } from './supports-passive'
+import { getScrollParent } from '../utils/get-scroll-parent'
+import { passiveSupported } from '../utils/supports-passive'
 
 let totalLockCount = 0
 

src/utils/use-props-value.ts → src/hooks/use-props-value.ts

@@ -1,5 +1,5 @@
 import { useRef, useCallback } from 'react'
-import { useForceUpdate } from '@/utils/use-force-update'
+import { useForceUpdate } from '@/hooks/use-force-update'
 
 interface UsePropsValue<T> {
   value?: T

src/packages/address/address.taro.tsx

@@ -18,7 +18,7 @@ import {
   CascaderValue,
 } from '@/packages/cascader/index.taro'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 type AddressRef = {
   open: () => void

src/packages/address/address.tsx

@@ -17,7 +17,7 @@ import {
   CascaderValue,
 } from '@/packages/cascader/index'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 type AddressRef = {
   open: () => void

src/packages/avatarcropper/avatarcropper.taro.tsx

@@ -13,7 +13,7 @@ import { Button } from '@/packages/button/button.taro'
 import { useConfig } from '@/packages/configprovider/index.taro'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { useTouch } from '@/utils/use-touch'
+import { useTouch } from '@/hooks/use-touch'
 import { clamp, preventDefault } from '@/utils'
 
 export type AvatarCropperToolbarPosition = 'top' | 'bottom'

src/packages/avatarcropper/avatarcropper.tsx

@@ -9,9 +9,9 @@ import React, {
 import classNames from 'classnames'
 import Button from '@/packages/button'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { useTouch } from '@/utils/use-touch'
+import { useTouch } from '@/hooks/use-touch'
 import { clamp, preventDefault } from '@/utils'
-import { getRect } from '@/utils/use-client-rect'
+import { getRect } from '@/hooks/use-client-rect'
 import { useConfig } from '@/packages/configprovider'
 
 export type AvatarCropperToolbarPosition = 'top' | 'bottom'

src/packages/calendarcard/calendarcard.taro.tsx

@@ -17,7 +17,7 @@ import type {
   CalendarCardRef,
   CalendarCardValue,
 } from './types'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export interface CalendarCardProps extends BasicComponent {
   // 日视图-选择一个日期 | 日视图-选择多个日期 | 日视图-选择范围 | 周视图-选择某一周

src/packages/calendarcard/calendarcard.tsx

@@ -16,7 +16,7 @@ import type {
   CalendarCardRef,
   CalendarCardValue,
 } from './types'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export interface CalendarCardProps extends BasicComponent {
   // 日视图-选择一个日期 | 日视图-选择多个日期 | 日视图-选择范围 | 周视图-选择某一周

src/packages/calendaritem/calendaritem.taro.tsx

@@ -12,7 +12,7 @@ import {
 } from '@/utils/date'
 import requestAniFrame from '@/utils/raf'
 import { useConfig } from '@/packages/configprovider/index.taro'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import {
   splitDate,
   isMultiple,

src/packages/calendaritem/calendaritem.tsx

@@ -11,7 +11,7 @@ import {
 } from '@/utils/date'
 import requestAniFrame from '@/utils/raf'
 import { useConfig } from '@/packages/configprovider'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import {
   splitDate,
   isMultiple,

src/packages/cascader/cascader.taro.tsx

@@ -24,7 +24,7 @@ import {
   CascaderFormat,
 } from './types'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { useConfig } from '@/packages/configprovider/index.taro'
 
 export interface CascaderProps

src/packages/cascader/cascader.tsx

@@ -20,7 +20,7 @@ import {
   CascaderFormat,
 } from './types'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { useConfig } from '@/packages/configprovider'
 
 export interface CascaderProps

src/packages/checkbox/checkbox.taro.tsx

@@ -4,7 +4,7 @@ import classNames from 'classnames'
 import { View } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import Context from '../checkboxgroup/context'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { CheckboxLabelPosition } from '@/packages/checkboxgroup/types'
 
 export type CheckboxShape = 'button' | 'round'

src/packages/checkbox/checkbox.tsx

@@ -9,7 +9,7 @@ import { CheckDisabled, Checked, CheckNormal } from '@nutui/icons-react'
 import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import Context from '../checkboxgroup/context'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { CheckboxLabelPosition } from '@/packages/checkboxgroup/types'
 
 export type CheckboxShape = 'button' | 'round'

src/packages/checkboxgroup/checkboxgroup.taro.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames'
 import { RadioGroupOption } from '@/packages/radiogroup/types'
 import { Checkbox } from '../checkbox/checkbox.taro'
 import Context from './context'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import {
   CheckboxDirection,
   CheckboxLabelPosition,

src/packages/checkboxgroup/checkboxgroup.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames'
 import { RadioGroupOption } from '@/packages/radiogroup/types'
 import { Checkbox } from '../checkbox/checkbox'
 import Context from './context'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import {
   CheckboxDirection,
   CheckboxLabelPosition,

src/packages/circleprogress/circleprogress.taro.tsx

@@ -4,7 +4,7 @@ import { View } from '@tarojs/components'
 import { isObject } from '@/utils'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { useForceUpdate } from '@/utils/use-force-update'
+import { useForceUpdate } from '@/hooks/use-force-update'
 
 export interface Color {
   [key: string]: string

src/packages/collapse/collapse.taro.tsx

@@ -4,7 +4,7 @@ import { View } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import CollapseItem from '../collapseitem/index.taro'
 import CollapseContext from './context'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export type CollapseActiveName = Array<string> | string
 

src/packages/collapse/collapse.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import CollapseItem from '../collapseitem'
 import CollapseContext from './context'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export type CollapseActiveName = Array<string> | string
 

src/packages/configprovider/configprovider.taro.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames'
 import kebabCase from 'lodash.kebabcase'
 import isEqual from 'react-fast-compare'
 import { View } from '@tarojs/components'
-import useMemo from '@/utils/use-memo'
+import useMemo from '@/hooks/use-memo'
 import { BasicComponent } from '@/utils/typings'
 import { BaseLang } from '@/locales/base'
 import zhCN from '@/locales/zh-CN'

src/packages/configprovider/configprovider.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent, createContext, useContext } from 'react'
 import classNames from 'classnames'
 import kebabCase from 'lodash.kebabcase'
 import isEqual from 'react-fast-compare'
-import useMemo from '@/utils/use-memo'
+import useMemo from '@/hooks/use-memo'
 import { BasicComponent } from '@/utils/typings'
 import { BaseLang } from '@/locales/base'
 import zhCN from '@/locales/zh-CN'

src/packages/datepicker/datepicker.taro.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent, useState, useEffect } from 'react'
 import { View } from '@tarojs/components'
 import Picker, { PickerOption, PickerProps } from '@/packages/picker/index.taro'
 import { useConfig } from '@/packages/configprovider/index.taro'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { isDate } from '@/utils/is-date'
 import { padZero } from '@/utils/pad-zero'

src/packages/datepicker/datepicker.tsx

@@ -2,7 +2,7 @@ import React, { FunctionComponent, useState, useEffect } from 'react'
 import Picker from '@/packages/picker'
 import { PickerOption, PickerProps } from '@/packages/picker/index'
 import { useConfig } from '@/packages/configprovider'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { isDate } from '@/utils/is-date'
 import { padZero } from '@/utils/pad-zero'

src/packages/dialog/dialog.taro.tsx

@@ -13,8 +13,8 @@ import {
   useCustomEvent,
   useCustomEventsPath,
   useParams,
-} from '@/utils/use-custom-event'
-import { useLockScrollTaro } from '@/utils/use-lock-scoll-taro'
+} from '@/hooks/use-custom-event'
+import { useLockScrollTaro } from '@/hooks/use-lock-scoll-taro'
 import { mergeProps } from '@/utils/merge-props'
 import { defaultOverlayProps } from '@/packages/overlay/overlay.taro'
 

src/packages/elevator/elevator.taro.tsx

@@ -11,7 +11,7 @@ import { ScrollView, View, Text } from '@tarojs/components'
 import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { harmony } from '@/utils/platform-taro'
-import useUuid from '@/utils/use-uuid'
+import useUuid from '@/hooks/use-uuid'
 
 export const elevatorContext = createContext({} as ElevatorData)
 

src/packages/ellipsis/ellipsis.tsx

@@ -1,7 +1,7 @@
 import React, { FunctionComponent, useState, useRef } from 'react'
 import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { useIsomorphicLayoutEffect } from '@/utils/use-isomprphic-layout-effect'
+import { useIsomorphicLayoutEffect } from '@/hooks/use-isomprphic-layout-effect'
 import { useRtl } from '../configprovider'
 
 export type EllipsisDirection = 'start' | 'end' | 'middle'

src/packages/imagepreview/imagepreview.taro.tsx

@@ -16,7 +16,7 @@ import Swiper from '@/packages/swiper/index.taro'
 import SwiperItem from '@/packages/swiperitem/index.taro'
 
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 interface Store {
   scale: number

src/packages/imagepreview/imagepreview.tsx

@@ -14,7 +14,7 @@ import Video from '@/packages/video'
 import Swiper from '@/packages/swiper'
 import SwiperItem from '@/packages/swiperitem'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 interface Store {
   scale: number

src/packages/input/input.taro.tsx

@@ -17,7 +17,7 @@ import Taro, { ENV_TYPE, getEnv } from '@tarojs/taro'
 import { formatNumber } from './utils'
 import { useConfig, useRtl } from '@/packages/configprovider/index.taro'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export type InputAlign = 'left' | 'center' | 'right'
 export type InputFormatTrigger = 'onChange' | 'onBlur'

src/packages/input/input.tsx

@@ -11,7 +11,7 @@ import { MaskClose } from '@nutui/icons-react'
 import { formatNumber } from './utils'
 import { useConfig, useRtl } from '@/packages/configprovider'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export type InputAlign = 'left' | 'center' | 'right'
 export type InputFormatTrigger = 'onChange' | 'onBlur'

src/packages/inputnumber/inputnumber.taro.tsx

@@ -8,7 +8,7 @@ import React, {
 import classNames from 'classnames'
 import { ITouchEvent, InputProps, View, Text } from '@tarojs/components'
 import { Minus, Plus } from '@nutui/icons-react-taro'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { harmony } from '@/utils/platform-taro'
 

src/packages/inputnumber/inputnumber.tsx

@@ -7,7 +7,7 @@ import React, {
 } from 'react'
 import { Minus, Plus } from '@nutui/icons-react'
 import classNames from 'classnames'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 
 export interface InputNumberProps extends BasicComponent {

src/packages/lottie/mp.taro.tsx

@@ -2,7 +2,7 @@ import React, { useImperativeHandle, useRef } from 'react'
 import { createSelectorQuery, getEnv, useReady, useUnload } from '@tarojs/taro'
 import lottie from 'lottie-miniprogram'
 import { getWindowInfo } from '@/utils/get-system-info'
-import useUuid from '@/utils/use-uuid'
+import useUuid from '@/hooks/use-uuid'
 import { LottieProps } from './types'
 
 export const Lottie = React.forwardRef((props: LottieProps, ref: any) => {

src/packages/menuitem/menuitem.taro.tsx

@@ -17,7 +17,7 @@ import { getWindowInfo } from '@/utils/get-system-info'
 import { Overlay } from '@/packages/overlay/overlay.taro'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export interface OptionItem {
   text: string