From 81dec11e30ab7ac9c6ac2bde44845fcfbb6d46f4 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Wed, 12 Feb 2025 19:35:20 +0800
Subject: [PATCH 1/5] chore: refactor the directory structure of hooks

---
 scripts/build-taro.mjs                               | 7 +++++--
 scripts/build.mjs                                    | 2 ++
 src/{utils => hooks}/use-click-away.ts               | 3 ++-
 src/{utils => hooks}/use-client-rect.ts              | 0
 src/{utils => hooks}/use-custom-event.ts             | 2 +-
 src/{utils => hooks}/use-force-update.ts             | 0
 src/{utils => hooks}/use-isomprphic-layout-effect.ts | 0
 src/{utils => hooks}/use-lock-scoll-taro.ts          | 2 +-
 src/{utils => hooks}/use-lock-scroll.ts              | 4 ++--
 src/{utils => hooks}/use-memo.ts                     | 0
 src/{utils => hooks}/use-props-value.ts              | 2 +-
 src/{utils => hooks}/use-ref-state.ts                | 0
 src/{utils => hooks}/use-refs.ts                     | 0
 src/{utils => hooks}/use-taro-rect.ts                | 0
 src/{utils => hooks}/use-touch.ts                    | 0
 src/{utils => hooks}/use-uuid.ts                     | 0
 src/{utils/use-watch.tsx => hooks/use-watch.ts}      | 0
 src/packages/address/address.taro.tsx                | 2 +-
 src/packages/address/address.tsx                     | 2 +-
 src/packages/avatarcropper/avatarcropper.taro.tsx    | 2 +-
 src/packages/avatarcropper/avatarcropper.tsx         | 4 ++--
 src/packages/calendarcard/calendarcard.taro.tsx      | 2 +-
 src/packages/calendarcard/calendarcard.tsx           | 2 +-
 src/packages/calendaritem/calendaritem.taro.tsx      | 2 +-
 src/packages/calendaritem/calendaritem.tsx           | 2 +-
 src/packages/cascader/cascader.taro.tsx              | 2 +-
 src/packages/cascader/cascader.tsx                   | 2 +-
 src/packages/checkbox/checkbox.taro.tsx              | 2 +-
 src/packages/checkbox/checkbox.tsx                   | 2 +-
 src/packages/checkboxgroup/checkboxgroup.taro.tsx    | 2 +-
 src/packages/checkboxgroup/checkboxgroup.tsx         | 2 +-
 src/packages/circleprogress/circleprogress.taro.tsx  | 2 +-
 src/packages/collapse/collapse.taro.tsx              | 2 +-
 src/packages/collapse/collapse.tsx                   | 2 +-
 src/packages/configprovider/configprovider.taro.tsx  | 2 +-
 src/packages/configprovider/configprovider.tsx       | 2 +-
 src/packages/datepicker/datepicker.taro.tsx          | 2 +-
 src/packages/datepicker/datepicker.tsx               | 2 +-
 src/packages/dialog/dialog.taro.tsx                  | 4 ++--
 src/packages/elevator/elevator.taro.tsx              | 2 +-
 src/packages/ellipsis/ellipsis.tsx                   | 2 +-
 src/packages/imagepreview/imagepreview.taro.tsx      | 2 +-
 src/packages/imagepreview/imagepreview.tsx           | 2 +-
 src/packages/input/input.taro.tsx                    | 2 +-
 src/packages/input/input.tsx                         | 2 +-
 src/packages/inputnumber/inputnumber.taro.tsx        | 2 +-
 src/packages/inputnumber/inputnumber.tsx             | 2 +-
 src/packages/lottie/mp.taro.tsx                      | 2 +-
 src/packages/menuitem/menuitem.taro.tsx              | 2 +-
 src/packages/menuitem/menuitem.tsx                   | 4 ++--
 src/packages/noticebar/noticebar.tsx                 | 2 +-
 src/packages/notify/notify.taro.tsx                  | 2 +-
 src/packages/overlay/overlay.taro.tsx                | 2 +-
 src/packages/overlay/overlay.tsx                     | 2 +-
 src/packages/pagination/pagination.taro.tsx          | 2 +-
 src/packages/pagination/pagination.tsx               | 2 +-
 src/packages/picker/picker.taro.tsx                  | 4 ++--
 src/packages/picker/picker.tsx                       | 4 ++--
 src/packages/picker/pickerpanel.taro.tsx             | 2 +-
 src/packages/picker/pickerpanel.tsx                  | 2 +-
 src/packages/popover/popover.taro.tsx                | 2 +-
 src/packages/popover/popover.tsx                     | 4 ++--
 src/packages/popup/popup.taro.tsx                    | 2 +-
 src/packages/popup/popup.tsx                         | 2 +-
 src/packages/progress/progress.taro.tsx              | 2 +-
 src/packages/pulltorefresh/pulltorefresh.taro.tsx    | 2 +-
 src/packages/radio/radio.taro.tsx                    | 2 +-
 src/packages/radio/radio.tsx                         | 2 +-
 src/packages/radiogroup/radiogroup.taro.tsx          | 2 +-
 src/packages/radiogroup/radiogroup.tsx               | 2 +-
 src/packages/range/range.taro.tsx                    | 4 ++--
 src/packages/range/range.tsx                         | 6 +++---
 src/packages/rate/rate.taro.tsx                      | 4 ++--
 src/packages/rate/rate.tsx                           | 6 +++---
 src/packages/segmented/segmented.taro.tsx            | 2 +-
 src/packages/segmented/segmented.tsx                 | 2 +-
 src/packages/shortpassword/shortpassword.taro.tsx    | 2 +-
 src/packages/shortpassword/shortpassword.tsx         | 2 +-
 src/packages/sidebar/sidebar.taro.tsx                | 6 +++---
 src/packages/sidebar/sidebar.tsx                     | 4 ++--
 src/packages/sticky/sticky.taro.tsx                  | 2 +-
 src/packages/sticky/sticky.tsx                       | 4 ++--
 src/packages/swipe/swipe.taro.tsx                    | 4 ++--
 src/packages/swipe/swipe.tsx                         | 4 ++--
 src/packages/swiper/effects/focus.tsx                | 2 +-
 src/packages/swiper/swiper.tsx                       | 2 +-
 src/packages/switch/switch.taro.tsx                  | 2 +-
 src/packages/switch/switch.tsx                       | 2 +-
 src/packages/tabbar/tabbar.taro.tsx                  | 2 +-
 src/packages/tabbar/tabbar.tsx                       | 2 +-
 src/packages/table/table.taro.tsx                    | 2 +-
 src/packages/table/table.tsx                         | 2 +-
 src/packages/tabs/tabs.taro.tsx                      | 6 +++---
 src/packages/tabs/tabs.tsx                           | 4 ++--
 src/packages/textarea/textarea.taro.tsx              | 2 +-
 src/packages/textarea/textarea.tsx                   | 2 +-
 src/packages/toast/toast.taro.tsx                    | 4 ++--
 src/packages/tour/tour.taro.tsx                      | 2 +-
 src/packages/tour/tour.tsx                           | 2 +-
 src/packages/uploader/uploader.taro.tsx              | 2 +-
 src/packages/uploader/uploader.tsx                   | 2 +-
 src/utils/get-rect-by-taro.ts                        | 2 +-
 tsconfig.h5.json                                     | 1 +
 103 files changed, 122 insertions(+), 115 deletions(-)
 rename src/{utils => hooks}/use-click-away.ts (93%)
 rename src/{utils => hooks}/use-client-rect.ts (100%)
 rename src/{utils => hooks}/use-custom-event.ts (95%)
 rename src/{utils => hooks}/use-force-update.ts (100%)
 rename src/{utils => hooks}/use-isomprphic-layout-effect.ts (100%)
 rename src/{utils => hooks}/use-lock-scoll-taro.ts (84%)
 rename src/{utils => hooks}/use-lock-scroll.ts (95%)
 rename src/{utils => hooks}/use-memo.ts (100%)
 rename src/{utils => hooks}/use-props-value.ts (93%)
 rename src/{utils => hooks}/use-ref-state.ts (100%)
 rename src/{utils => hooks}/use-refs.ts (100%)
 rename src/{utils => hooks}/use-taro-rect.ts (100%)
 rename src/{utils => hooks}/use-touch.ts (100%)
 rename src/{utils => hooks}/use-uuid.ts (100%)
 rename src/{utils/use-watch.tsx => hooks/use-watch.ts} (100%)

diff --git a/scripts/build-taro.mjs b/scripts/build-taro.mjs
index 9391a6fda6..334435031b 100644
--- a/scripts/build-taro.mjs
+++ b/scripts/build-taro.mjs
@@ -50,8 +50,8 @@ const transform = (file, api, replace) => {
     if (!path.node.source) return
     if (!alias) {
       // 处理这里，文件引入中的相对路径下的types的引入。
-      path.node.source.value = (!replace || replace && !isTypesTaro(path.node.source.value, 'types.taro')) 
-        ? path.node.source.value.replace('.taro', '') 
+      path.node.source.value = (!replace || replace && !isTypesTaro(path.node.source.value, 'types.taro'))
+        ? path.node.source.value.replace('.taro', '')
         : path.node.source.value
       return
     }
@@ -78,6 +78,7 @@ async function buildES(p) {
       'src/packages/**/context.ts',
       'src/packages/**/utils.ts',
       'src/utils/**/*.{ts,tsx}',
+      'src/hooks/**/*.{ts,tsx}',
       'src/locales/*.ts',
     ],
     {
@@ -103,6 +104,7 @@ async function buildES(p) {
           '@/packages/*': ['src/packages/*'],
           '@/utils/*': ['src/utils/*'],
           '@/utils': ['src/utils'],
+          '@/hooks/*': ['src/hooks/*'],
           '@/locales/*': ['src/locales/*'],
         },
         externalHelpers: true,
@@ -166,6 +168,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) {
diff --git a/scripts/build.mjs b/scripts/build.mjs
index 7bb0b41170..038f4e0a2f 100644
--- a/scripts/build.mjs
+++ b/scripts/build.mjs
@@ -37,6 +37,7 @@ async function buildES(p) {
     [
       'src/packages/**/*.{ts,tsx}',
       'src/utils/**/*.{ts,tsx}',
+      'src/hooks/**/*.{ts,tsx}',
       'src/locales/*.ts',
     ],
     {
@@ -62,6 +63,7 @@ async function buildES(p) {
           '@/packages/*': ['src/packages/*'],
           '@/utils/*': ['src/utils/*'],
           '@/utils': ['src/utils'],
+          '@/hooks/*': ['src/hooks/*'],
           '@/locales/*': ['src/locales/*'],
         },
         externalHelpers: true,
diff --git a/src/utils/use-click-away.ts b/src/hooks/use-click-away.ts
similarity index 93%
rename from src/utils/use-click-away.ts
rename to src/hooks/use-click-away.ts
index 4cd873faa0..880abca5e5 100644
--- a/src/utils/use-click-away.ts
+++ b/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,
diff --git a/src/utils/use-client-rect.ts b/src/hooks/use-client-rect.ts
similarity index 100%
rename from src/utils/use-client-rect.ts
rename to src/hooks/use-client-rect.ts
diff --git a/src/utils/use-custom-event.ts b/src/hooks/use-custom-event.ts
similarity index 95%
rename from src/utils/use-custom-event.ts
rename to src/hooks/use-custom-event.ts
index 59d515afce..79176c01bd 100644
--- a/src/utils/use-custom-event.ts
+++ b/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()
 
diff --git a/src/utils/use-force-update.ts b/src/hooks/use-force-update.ts
similarity index 100%
rename from src/utils/use-force-update.ts
rename to src/hooks/use-force-update.ts
diff --git a/src/utils/use-isomprphic-layout-effect.ts b/src/hooks/use-isomprphic-layout-effect.ts
similarity index 100%
rename from src/utils/use-isomprphic-layout-effect.ts
rename to src/hooks/use-isomprphic-layout-effect.ts
diff --git a/src/utils/use-lock-scoll-taro.ts b/src/hooks/use-lock-scoll-taro.ts
similarity index 84%
rename from src/utils/use-lock-scoll-taro.ts
rename to src/hooks/use-lock-scoll-taro.ts
index 7b8d615a88..c7d62d349f 100644
--- a/src/utils/use-lock-scoll-taro.ts
+++ b/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)
diff --git a/src/utils/use-lock-scroll.ts b/src/hooks/use-lock-scroll.ts
similarity index 95%
rename from src/utils/use-lock-scroll.ts
rename to src/hooks/use-lock-scroll.ts
index 11484ff65d..6f5c212740 100644
--- a/src/utils/use-lock-scroll.ts
+++ b/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
 
diff --git a/src/utils/use-memo.ts b/src/hooks/use-memo.ts
similarity index 100%
rename from src/utils/use-memo.ts
rename to src/hooks/use-memo.ts
diff --git a/src/utils/use-props-value.ts b/src/hooks/use-props-value.ts
similarity index 93%
rename from src/utils/use-props-value.ts
rename to src/hooks/use-props-value.ts
index 1021b344ef..f8c58bb457 100644
--- a/src/utils/use-props-value.ts
+++ b/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
diff --git a/src/utils/use-ref-state.ts b/src/hooks/use-ref-state.ts
similarity index 100%
rename from src/utils/use-ref-state.ts
rename to src/hooks/use-ref-state.ts
diff --git a/src/utils/use-refs.ts b/src/hooks/use-refs.ts
similarity index 100%
rename from src/utils/use-refs.ts
rename to src/hooks/use-refs.ts
diff --git a/src/utils/use-taro-rect.ts b/src/hooks/use-taro-rect.ts
similarity index 100%
rename from src/utils/use-taro-rect.ts
rename to src/hooks/use-taro-rect.ts
diff --git a/src/utils/use-touch.ts b/src/hooks/use-touch.ts
similarity index 100%
rename from src/utils/use-touch.ts
rename to src/hooks/use-touch.ts
diff --git a/src/utils/use-uuid.ts b/src/hooks/use-uuid.ts
similarity index 100%
rename from src/utils/use-uuid.ts
rename to src/hooks/use-uuid.ts
diff --git a/src/utils/use-watch.tsx b/src/hooks/use-watch.ts
similarity index 100%
rename from src/utils/use-watch.tsx
rename to src/hooks/use-watch.ts
diff --git a/src/packages/address/address.taro.tsx b/src/packages/address/address.taro.tsx
index aa1c4bb459..3cad6a55f7 100644
--- a/src/packages/address/address.taro.tsx
+++ b/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
diff --git a/src/packages/address/address.tsx b/src/packages/address/address.tsx
index e7b0db7b53..eeead6d081 100644
--- a/src/packages/address/address.tsx
+++ b/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
diff --git a/src/packages/avatarcropper/avatarcropper.taro.tsx b/src/packages/avatarcropper/avatarcropper.taro.tsx
index 6ef647a323..9bb306deaf 100644
--- a/src/packages/avatarcropper/avatarcropper.taro.tsx
+++ b/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'
diff --git a/src/packages/avatarcropper/avatarcropper.tsx b/src/packages/avatarcropper/avatarcropper.tsx
index 6317a009c3..70a7d1e8d0 100644
--- a/src/packages/avatarcropper/avatarcropper.tsx
+++ b/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'
diff --git a/src/packages/calendarcard/calendarcard.taro.tsx b/src/packages/calendarcard/calendarcard.taro.tsx
index 439e07ac1a..ad4d471321 100644
--- a/src/packages/calendarcard/calendarcard.taro.tsx
+++ b/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 {
   // 日视图-选择一个日期 | 日视图-选择多个日期 | 日视图-选择范围 | 周视图-选择某一周
diff --git a/src/packages/calendarcard/calendarcard.tsx b/src/packages/calendarcard/calendarcard.tsx
index 7b337594fd..80877edba7 100644
--- a/src/packages/calendarcard/calendarcard.tsx
+++ b/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 {
   // 日视图-选择一个日期 | 日视图-选择多个日期 | 日视图-选择范围 | 周视图-选择某一周
diff --git a/src/packages/calendaritem/calendaritem.taro.tsx b/src/packages/calendaritem/calendaritem.taro.tsx
index deffb4f4da..e1f23da730 100644
--- a/src/packages/calendaritem/calendaritem.taro.tsx
+++ b/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,
diff --git a/src/packages/calendaritem/calendaritem.tsx b/src/packages/calendaritem/calendaritem.tsx
index 96a33e7f16..4584a5d757 100644
--- a/src/packages/calendaritem/calendaritem.tsx
+++ b/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,
diff --git a/src/packages/cascader/cascader.taro.tsx b/src/packages/cascader/cascader.taro.tsx
index b357121989..3306ea6d57 100644
--- a/src/packages/cascader/cascader.taro.tsx
+++ b/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
diff --git a/src/packages/cascader/cascader.tsx b/src/packages/cascader/cascader.tsx
index 700ca99ca5..d6c633d731 100644
--- a/src/packages/cascader/cascader.tsx
+++ b/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
diff --git a/src/packages/checkbox/checkbox.taro.tsx b/src/packages/checkbox/checkbox.taro.tsx
index 41cdce02e0..e6cbb18268 100644
--- a/src/packages/checkbox/checkbox.taro.tsx
+++ b/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'
diff --git a/src/packages/checkbox/checkbox.tsx b/src/packages/checkbox/checkbox.tsx
index 71c8dd4300..a92da8b34a 100644
--- a/src/packages/checkbox/checkbox.tsx
+++ b/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'
diff --git a/src/packages/checkboxgroup/checkboxgroup.taro.tsx b/src/packages/checkboxgroup/checkboxgroup.taro.tsx
index 73a2e3ab32..086b087ef2 100644
--- a/src/packages/checkboxgroup/checkboxgroup.taro.tsx
+++ b/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,
diff --git a/src/packages/checkboxgroup/checkboxgroup.tsx b/src/packages/checkboxgroup/checkboxgroup.tsx
index 636545da48..6f7731ce13 100644
--- a/src/packages/checkboxgroup/checkboxgroup.tsx
+++ b/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,
diff --git a/src/packages/circleprogress/circleprogress.taro.tsx b/src/packages/circleprogress/circleprogress.taro.tsx
index c7b78c526a..cc7b3c9b84 100644
--- a/src/packages/circleprogress/circleprogress.taro.tsx
+++ b/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
diff --git a/src/packages/collapse/collapse.taro.tsx b/src/packages/collapse/collapse.taro.tsx
index 08120a38ab..fec63c166a 100644
--- a/src/packages/collapse/collapse.taro.tsx
+++ b/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
 
diff --git a/src/packages/collapse/collapse.tsx b/src/packages/collapse/collapse.tsx
index 95ef0c0dfa..ec7332c297 100644
--- a/src/packages/collapse/collapse.tsx
+++ b/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
 
diff --git a/src/packages/configprovider/configprovider.taro.tsx b/src/packages/configprovider/configprovider.taro.tsx
index 26d5f6b35f..9235bfbbcf 100644
--- a/src/packages/configprovider/configprovider.taro.tsx
+++ b/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'
diff --git a/src/packages/configprovider/configprovider.tsx b/src/packages/configprovider/configprovider.tsx
index 4e59d9532f..89ffd132c5 100644
--- a/src/packages/configprovider/configprovider.tsx
+++ b/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'
diff --git a/src/packages/datepicker/datepicker.taro.tsx b/src/packages/datepicker/datepicker.taro.tsx
index 2d14f28e42..702f1e4e07 100644
--- a/src/packages/datepicker/datepicker.taro.tsx
+++ b/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'
diff --git a/src/packages/datepicker/datepicker.tsx b/src/packages/datepicker/datepicker.tsx
index 7a7f818b20..47011cdc27 100644
--- a/src/packages/datepicker/datepicker.tsx
+++ b/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'
diff --git a/src/packages/dialog/dialog.taro.tsx b/src/packages/dialog/dialog.taro.tsx
index cfaf85967d..9f14971362 100644
--- a/src/packages/dialog/dialog.taro.tsx
+++ b/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'
 
diff --git a/src/packages/elevator/elevator.taro.tsx b/src/packages/elevator/elevator.taro.tsx
index ce97fa3872..ce2b647bba 100644
--- a/src/packages/elevator/elevator.taro.tsx
+++ b/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)
 
diff --git a/src/packages/ellipsis/ellipsis.tsx b/src/packages/ellipsis/ellipsis.tsx
index a32dce929d..a6d2339348 100644
--- a/src/packages/ellipsis/ellipsis.tsx
+++ b/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'
diff --git a/src/packages/imagepreview/imagepreview.taro.tsx b/src/packages/imagepreview/imagepreview.taro.tsx
index 3c1185f6a8..798fe943a7 100644
--- a/src/packages/imagepreview/imagepreview.taro.tsx
+++ b/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
diff --git a/src/packages/imagepreview/imagepreview.tsx b/src/packages/imagepreview/imagepreview.tsx
index 6fa6c844c7..b6440c3161 100644
--- a/src/packages/imagepreview/imagepreview.tsx
+++ b/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
diff --git a/src/packages/input/input.taro.tsx b/src/packages/input/input.taro.tsx
index 14bf459591..7ff39d1be6 100644
--- a/src/packages/input/input.taro.tsx
+++ b/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'
diff --git a/src/packages/input/input.tsx b/src/packages/input/input.tsx
index 4d79153a28..ab1763d345 100644
--- a/src/packages/input/input.tsx
+++ b/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'
diff --git a/src/packages/inputnumber/inputnumber.taro.tsx b/src/packages/inputnumber/inputnumber.taro.tsx
index 6c7f42955e..0da91a128a 100644
--- a/src/packages/inputnumber/inputnumber.taro.tsx
+++ b/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'
 
diff --git a/src/packages/inputnumber/inputnumber.tsx b/src/packages/inputnumber/inputnumber.tsx
index 7b8ce212bf..4b58a875cc 100644
--- a/src/packages/inputnumber/inputnumber.tsx
+++ b/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 {
diff --git a/src/packages/lottie/mp.taro.tsx b/src/packages/lottie/mp.taro.tsx
index 3f7af7b67f..5a2c6279b4 100644
--- a/src/packages/lottie/mp.taro.tsx
+++ b/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) => {
diff --git a/src/packages/menuitem/menuitem.taro.tsx b/src/packages/menuitem/menuitem.taro.tsx
index 05445422db..563baf3c31 100644
--- a/src/packages/menuitem/menuitem.taro.tsx
+++ b/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
diff --git a/src/packages/menuitem/menuitem.tsx b/src/packages/menuitem/menuitem.tsx
index 6f81dd1415..3139f44bab 100644
--- a/src/packages/menuitem/menuitem.tsx
+++ b/src/packages/menuitem/menuitem.tsx
@@ -12,9 +12,9 @@ import classNames from 'classnames'
 import { CSSTransition } from 'react-transition-group'
 import { Check } from '@nutui/icons-react'
 import { Overlay } from '@/packages/overlay/overlay'
-import useClickAway from '@/utils/use-click-away'
+import useClickAway from '@/hooks/use-click-away'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { getScrollParent } from '@/utils/get-scroll-parent'
 
 export interface OptionItem {
diff --git a/src/packages/noticebar/noticebar.tsx b/src/packages/noticebar/noticebar.tsx
index 4130f6cd9b..fa010357ef 100644
--- a/src/packages/noticebar/noticebar.tsx
+++ b/src/packages/noticebar/noticebar.tsx
@@ -9,7 +9,7 @@ import React, {
 } from 'react'
 import { Close, Notice } from '@nutui/icons-react'
 import classNames from 'classnames'
-import { getRect } from '@/utils/use-client-rect'
+import { getRect } from '@/hooks/use-client-rect'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { NoticeBarAlign } from './types'
 import { useRtl } from '@/packages/configprovider'
diff --git a/src/packages/notify/notify.taro.tsx b/src/packages/notify/notify.taro.tsx
index 7179e715b9..87bc37911a 100644
--- a/src/packages/notify/notify.taro.tsx
+++ b/src/packages/notify/notify.taro.tsx
@@ -7,7 +7,7 @@ import {
   customEvents,
   useCustomEvent,
   useCustomEventsPath,
-} from '@/utils/use-custom-event'
+} from '@/hooks/use-custom-event'
 import { mergeProps } from '@/utils/merge-props'
 
 export type NotifyPosition = 'top' | 'bottom'
diff --git a/src/packages/overlay/overlay.taro.tsx b/src/packages/overlay/overlay.taro.tsx
index 6a8b7f9c27..51b3b88481 100644
--- a/src/packages/overlay/overlay.taro.tsx
+++ b/src/packages/overlay/overlay.taro.tsx
@@ -3,7 +3,7 @@ import { CSSTransition } from 'react-transition-group'
 import classNames from 'classnames'
 import { View, ITouchEvent } from '@tarojs/components'
 import { ComponentDefaults } from '@/utils/typings'
-import { useLockScrollTaro } from '@/utils/use-lock-scoll-taro'
+import { useLockScrollTaro } from '@/hooks/use-lock-scoll-taro'
 import { harmony } from '@/utils/platform-taro'
 import { OverlayProps } from './types.taro'
 
diff --git a/src/packages/overlay/overlay.tsx b/src/packages/overlay/overlay.tsx
index 562eb3160f..46a41c063e 100644
--- a/src/packages/overlay/overlay.tsx
+++ b/src/packages/overlay/overlay.tsx
@@ -8,7 +8,7 @@ import React, {
 import { CSSTransition } from 'react-transition-group'
 import classNames from 'classnames'
 import { ComponentDefaults } from '@/utils/typings'
-import { useLockScroll } from '@/utils/use-lock-scroll'
+import { useLockScroll } from '@/hooks/use-lock-scroll'
 import { OverlayProps } from './types'
 
 export const defaultOverlayProps: OverlayProps = {
diff --git a/src/packages/pagination/pagination.taro.tsx b/src/packages/pagination/pagination.taro.tsx
index dc83a70f3b..06a1de73f2 100644
--- a/src/packages/pagination/pagination.taro.tsx
+++ b/src/packages/pagination/pagination.taro.tsx
@@ -2,7 +2,7 @@ import React, { FunctionComponent, ReactNode, useMemo } from 'react'
 import classNames from 'classnames'
 import { View } from '@tarojs/components'
 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 addColorForHarmony from '@/utils/add-color-for-harmony'
 
diff --git a/src/packages/pagination/pagination.tsx b/src/packages/pagination/pagination.tsx
index 34c2224dd3..2e92581962 100644
--- a/src/packages/pagination/pagination.tsx
+++ b/src/packages/pagination/pagination.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent, useMemo, ReactNode } from 'react'
 import classNames from 'classnames'
 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'
 
 export interface PaginationProps extends BasicComponent {
diff --git a/src/packages/picker/picker.taro.tsx b/src/packages/picker/picker.taro.tsx
index 2e09a66e59..19c1fff276 100644
--- a/src/packages/picker/picker.taro.tsx
+++ b/src/packages/picker/picker.taro.tsx
@@ -11,10 +11,10 @@ import Taro from '@tarojs/taro'
 import { View, PickerView, PickerViewColumn } from '@tarojs/components'
 import Popup, { PopupProps } from '@/packages/popup/index.taro'
 import PickerPanel from './pickerpanel.taro'
-import useRefs from '@/utils/use-refs'
+import useRefs from '@/hooks/use-refs'
 import { useConfig } from '@/packages/configprovider/index.taro'
 import { PickerOption } from './types'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 
 export type PickerActions = {
diff --git a/src/packages/picker/picker.tsx b/src/packages/picker/picker.tsx
index 2dcb88ec7c..3ffbb5c2e0 100644
--- a/src/packages/picker/picker.tsx
+++ b/src/packages/picker/picker.tsx
@@ -10,10 +10,10 @@ import classNames from 'classnames'
 import Popup, { PopupProps } from '@/packages/popup/index'
 import { SafeArea } from '@/packages/safearea/safearea'
 import PickerPanel from './pickerpanel'
-import useRefs from '@/utils/use-refs'
+import useRefs from '@/hooks/use-refs'
 import { useConfig } from '@/packages/configprovider'
 import { PickerOption } from './types'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 
 export type PickerActions = {
diff --git a/src/packages/picker/pickerpanel.taro.tsx b/src/packages/picker/pickerpanel.taro.tsx
index 8a5975c1c6..0ecb888d61 100644
--- a/src/packages/picker/pickerpanel.taro.tsx
+++ b/src/packages/picker/pickerpanel.taro.tsx
@@ -7,7 +7,7 @@ import React, {
 } from 'react'
 import { View } from '@tarojs/components'
 import { PickerOption } from './types'
-import { useTouch } from '@/utils/use-touch'
+import { useTouch } from '@/hooks/use-touch'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
 import { passiveSupported } from '@/utils/supports-passive'
 
diff --git a/src/packages/picker/pickerpanel.tsx b/src/packages/picker/pickerpanel.tsx
index 15e66ce773..efe7e986fe 100644
--- a/src/packages/picker/pickerpanel.tsx
+++ b/src/packages/picker/pickerpanel.tsx
@@ -6,7 +6,7 @@ import React, {
   useImperativeHandle,
 } from 'react'
 import { PickerOption } from './types'
-import { useTouch } from '@/utils/use-touch'
+import { useTouch } from '@/hooks/use-touch'
 import { passiveSupported } from '@/utils/supports-passive'
 
 interface PickerPanelProps {
diff --git a/src/packages/popover/popover.taro.tsx b/src/packages/popover/popover.taro.tsx
index 8a7763d9f0..35e9933314 100644
--- a/src/packages/popover/popover.taro.tsx
+++ b/src/packages/popover/popover.taro.tsx
@@ -12,7 +12,7 @@ import { ArrowRadius } from '@nutui/icons-react-taro'
 import Popup, { PopupProps } from '@/packages/popup/index.taro'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
 import { ComponentDefaults } from '@/utils/typings'
-import { getRect } from '@/utils/use-client-rect'
+import { getRect } from '@/hooks/use-client-rect'
 import { PopoverTheme, PopoverLocation, PopoverList } from './types'
 import { useRtl } from '@/packages/configprovider/index.taro'
 
diff --git a/src/packages/popover/popover.tsx b/src/packages/popover/popover.tsx
index d2738a7886..fb0f956fb0 100644
--- a/src/packages/popover/popover.tsx
+++ b/src/packages/popover/popover.tsx
@@ -11,9 +11,9 @@ import classNames from 'classnames'
 import { createPortal } from 'react-dom'
 import { ArrowRadius } from '@nutui/icons-react'
 import Popup, { PopupProps } from '@/packages/popup/index'
-import { getRect } from '@/utils/use-client-rect'
+import { getRect } from '@/hooks/use-client-rect'
 import { ComponentDefaults } from '@/utils/typings'
-import useClickAway from '@/utils/use-click-away'
+import useClickAway from '@/hooks/use-click-away'
 import { canUseDom } from '@/utils/can-use-dom'
 import { getAllScrollableParents } from '@/utils/get-scroll-parent'
 import { PopoverTheme, PopoverLocation, PopoverList } from './types'
diff --git a/src/packages/popup/popup.taro.tsx b/src/packages/popup/popup.taro.tsx
index d3e6e5327e..760ba8daa1 100644
--- a/src/packages/popup/popup.taro.tsx
+++ b/src/packages/popup/popup.taro.tsx
@@ -12,7 +12,7 @@ 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 { useLockScrollTaro } from '@/utils/use-lock-scoll-taro'
+import { useLockScrollTaro } from '@/hooks/use-lock-scoll-taro'
 import { PopupProps, Teleport } from './types.taro'
 
 const defaultProps: PopupProps = {
diff --git a/src/packages/popup/popup.tsx b/src/packages/popup/popup.tsx
index e9b05faf53..66328408d1 100644
--- a/src/packages/popup/popup.tsx
+++ b/src/packages/popup/popup.tsx
@@ -11,7 +11,7 @@ import classNames from 'classnames'
 import { Close } from '@nutui/icons-react'
 import { defaultOverlayProps } from '@/packages/overlay/overlay'
 import Overlay from '@/packages/overlay'
-import { useLockScroll } from '@/utils/use-lock-scroll'
+import { useLockScroll } from '@/hooks/use-lock-scroll'
 import { PopupProps, Teleport } from './types'
 
 const defaultProps: PopupProps = {
diff --git a/src/packages/progress/progress.taro.tsx b/src/packages/progress/progress.taro.tsx
index 21e102ba98..d76cba0265 100644
--- a/src/packages/progress/progress.taro.tsx
+++ b/src/packages/progress/progress.taro.tsx
@@ -5,7 +5,7 @@ import { View } from '@tarojs/components'
 import pxTransform from '@/utils/px-transform'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { useRtl } from '../configprovider/index.taro'
-import useUuid from '@/utils/use-uuid'
+import useUuid from '@/hooks/use-uuid'
 import { harmony, web } from '@/utils/platform-taro'
 
 export interface ProgressProps extends BasicComponent {
diff --git a/src/packages/pulltorefresh/pulltorefresh.taro.tsx b/src/packages/pulltorefresh/pulltorefresh.taro.tsx
index da2fb4870c..83d75db3f1 100644
--- a/src/packages/pulltorefresh/pulltorefresh.taro.tsx
+++ b/src/packages/pulltorefresh/pulltorefresh.taro.tsx
@@ -4,7 +4,7 @@ import { ITouchEvent, View } from '@tarojs/components'
 import { Loading, More } from '@nutui/icons-react-taro'
 import Taro from '@tarojs/taro'
 import { useConfig } from '@/packages/configprovider/index.taro'
-import { useTouch } from '@/utils/use-touch'
+import { useTouch } from '@/hooks/use-touch'
 import { rubberbandIfOutOfBounds } from '@/utils/rubberband'
 import { sleep } from '@/utils/sleep'
 import { BasicComponent, ComponentDefaults, Timeout } from '@/utils/typings'
diff --git a/src/packages/radio/radio.taro.tsx b/src/packages/radio/radio.taro.tsx
index 1b4b46eb5e..e313646aa7 100644
--- a/src/packages/radio/radio.taro.tsx
+++ b/src/packages/radio/radio.taro.tsx
@@ -8,7 +8,7 @@ import classNames, { Mapping } from 'classnames'
 import { ITouchEvent, View } from '@tarojs/components'
 import RadioContext from '../radiogroup/context'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { RadioPosition, RadioShape } from '@/packages/radio/types'
 
 export interface RadioProps extends BasicComponent {
diff --git a/src/packages/radio/radio.tsx b/src/packages/radio/radio.tsx
index 5eeab9ba28..26802142bd 100644
--- a/src/packages/radio/radio.tsx
+++ b/src/packages/radio/radio.tsx
@@ -3,7 +3,7 @@ import { CheckChecked, CheckNormal, CheckDisabled } from '@nutui/icons-react'
 import classNames from 'classnames'
 import RadioContext from '../radiogroup/context'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { RadioPosition, RadioShape } from '@/packages/radio/types'
 
 export interface RadioProps extends BasicComponent {
diff --git a/src/packages/radiogroup/radiogroup.taro.tsx b/src/packages/radiogroup/radiogroup.taro.tsx
index aaec98a75c..0a31ceacd5 100644
--- a/src/packages/radiogroup/radiogroup.taro.tsx
+++ b/src/packages/radiogroup/radiogroup.taro.tsx
@@ -10,7 +10,7 @@ import {
 } from './types'
 import RadioContext from './context'
 import Radio from '@/packages/radio/index.taro'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export interface RadioGroupProps {
   value?: string | number
diff --git a/src/packages/radiogroup/radiogroup.tsx b/src/packages/radiogroup/radiogroup.tsx
index 44526e7d53..da3b1750b8 100644
--- a/src/packages/radiogroup/radiogroup.tsx
+++ b/src/packages/radiogroup/radiogroup.tsx
@@ -8,7 +8,7 @@ import {
 } from './types'
 import RadioContext from './context'
 import Radio from '@/packages/radio/index'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 
 export interface RadioGroupProps {
   value?: string | number
diff --git a/src/packages/range/range.taro.tsx b/src/packages/range/range.taro.tsx
index b2bd9c11c5..542dac04cd 100644
--- a/src/packages/range/range.taro.tsx
+++ b/src/packages/range/range.taro.tsx
@@ -10,9 +10,9 @@ import React, {
 import classNames from 'classnames'
 import { View, Text } from '@tarojs/components'
 import pxTransform from '@/utils/px-transform'
-import { useTouch } from '@/utils/use-touch'
+import { useTouch } from '@/hooks/use-touch'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
 import { RangeMark, RangeValue } from './types'
 import { useRtl } from '../configprovider/index.taro'
diff --git a/src/packages/range/range.tsx b/src/packages/range/range.tsx
index 4e47827ce0..1e62d148b2 100644
--- a/src/packages/range/range.tsx
+++ b/src/packages/range/range.tsx
@@ -9,10 +9,10 @@ import React, {
 } from 'react'
 import type { TouchEvent } from 'react'
 import classNames from 'classnames'
-import { useTouch } from '@/utils/use-touch'
-import { getRect } from '@/utils/use-client-rect'
+import { useTouch } from '@/hooks/use-touch'
+import { getRect } from '@/hooks/use-client-rect'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { RangeMark, RangeValue } from './types'
 import { useRtl } from '../configprovider'
 
diff --git a/src/packages/rate/rate.taro.tsx b/src/packages/rate/rate.taro.tsx
index 6511c7ac77..8010558f9b 100644
--- a/src/packages/rate/rate.taro.tsx
+++ b/src/packages/rate/rate.taro.tsx
@@ -10,9 +10,9 @@ import { StarFill } from '@nutui/icons-react-taro'
 import { useReady } from '@tarojs/taro'
 import { View, Text, ITouchEvent } from '@tarojs/components'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
-import useRefs from '@/utils/use-refs'
+import useRefs from '@/hooks/use-refs'
 import { RateProps } from './types'
 
 const defaultProps = {
diff --git a/src/packages/rate/rate.tsx b/src/packages/rate/rate.tsx
index 17a382fab9..46460c6956 100644
--- a/src/packages/rate/rate.tsx
+++ b/src/packages/rate/rate.tsx
@@ -8,9 +8,9 @@ import React, {
 import classNames from 'classnames'
 import { StarFill } from '@nutui/icons-react'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
-import { getRect } from '@/utils/use-client-rect'
-import useRefs from '@/utils/use-refs'
+import { usePropsValue } from '@/hooks/use-props-value'
+import { getRect } from '@/hooks/use-client-rect'
+import useRefs from '@/hooks/use-refs'
 import { RateProps } from './types'
 
 const defaultProps = {
diff --git a/src/packages/segmented/segmented.taro.tsx b/src/packages/segmented/segmented.taro.tsx
index 75edfb8df5..cf4b5e6e74 100644
--- a/src/packages/segmented/segmented.taro.tsx
+++ b/src/packages/segmented/segmented.taro.tsx
@@ -2,7 +2,7 @@ import React, { useCallback } from 'react'
 import classNames from 'classnames'
 import { View } from '@tarojs/components'
 import { SegmentedItem, SegmentedProps } from './types'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { mergeProps } from '@/utils/merge-props'
 
 const defaultProps = {
diff --git a/src/packages/segmented/segmented.tsx b/src/packages/segmented/segmented.tsx
index 654d1f5fb1..9ae457c0e5 100644
--- a/src/packages/segmented/segmented.tsx
+++ b/src/packages/segmented/segmented.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react'
 import classNames from 'classnames'
 import { SegmentedItem, SegmentedProps } from './types'
-import { usePropsValue } from '../../utils/use-props-value'
+import { usePropsValue } from '../../hooks/use-props-value'
 import { mergeProps } from '@/utils/merge-props'
 
 const defaultProps = {
diff --git a/src/packages/shortpassword/shortpassword.taro.tsx b/src/packages/shortpassword/shortpassword.taro.tsx
index 10217b9368..9f9cc84087 100644
--- a/src/packages/shortpassword/shortpassword.taro.tsx
+++ b/src/packages/shortpassword/shortpassword.taro.tsx
@@ -11,7 +11,7 @@ import { View } from '@tarojs/components'
 import Popup, { PopupProps } from '@/packages/popup/index.taro'
 import { useConfig } from '@/packages/configprovider/index.taro'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { ShortPasswordActions } from '@/packages/shortpassword/types'
 
 export interface ShortPasswordProps extends PopupProps {
diff --git a/src/packages/shortpassword/shortpassword.tsx b/src/packages/shortpassword/shortpassword.tsx
index 38706710e2..c72c2cf113 100644
--- a/src/packages/shortpassword/shortpassword.tsx
+++ b/src/packages/shortpassword/shortpassword.tsx
@@ -10,7 +10,7 @@ import classNames from 'classnames'
 import Popup, { PopupProps } from '@/packages/popup/index'
 import { useConfig } from '@/packages/configprovider'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { ShortPasswordActions } from '@/packages/shortpassword/types'
 
 export interface ShortPasswordProps extends PopupProps {
diff --git a/src/packages/sidebar/sidebar.taro.tsx b/src/packages/sidebar/sidebar.taro.tsx
index 42d8020fd2..c37f2f9819 100644
--- a/src/packages/sidebar/sidebar.taro.tsx
+++ b/src/packages/sidebar/sidebar.taro.tsx
@@ -3,10 +3,10 @@ import { ScrollView, View } from '@tarojs/components'
 import classNames from 'classnames'
 import Taro, { nextTick, createSelectorQuery } from '@tarojs/taro'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
-import { useForceUpdate } from '@/utils/use-force-update'
+import { usePropsValue } from '@/hooks/use-props-value'
+import { useForceUpdate } from '@/hooks/use-force-update'
 import raf from '@/utils/raf'
-import useUuid from '@/utils/use-uuid'
+import useUuid from '@/hooks/use-uuid'
 import { SideBarItemProps, SideBarProps } from './types'
 import SideBarItem from '@/packages/sidebaritem/index.taro'
 import { mergeProps } from '@/utils/merge-props'
diff --git a/src/packages/sidebar/sidebar.tsx b/src/packages/sidebar/sidebar.tsx
index f6cd035a00..48669a34c7 100644
--- a/src/packages/sidebar/sidebar.tsx
+++ b/src/packages/sidebar/sidebar.tsx
@@ -3,8 +3,8 @@ import classNames from 'classnames'
 import { ComponentDefaults } from '@/utils/typings'
 import SideBarItem from '@/packages/sidebaritem'
 import raf from '@/utils/raf'
-import { usePropsValue } from '@/utils/use-props-value'
-import { useForceUpdate } from '@/utils/use-force-update'
+import { usePropsValue } from '@/hooks/use-props-value'
+import { useForceUpdate } from '@/hooks/use-force-update'
 import { mergeProps } from '@/utils/merge-props'
 
 import { SideBarItemProps, SideBarProps } from './types'
diff --git a/src/packages/sticky/sticky.taro.tsx b/src/packages/sticky/sticky.taro.tsx
index 61683d1103..6f1c5485a5 100644
--- a/src/packages/sticky/sticky.taro.tsx
+++ b/src/packages/sticky/sticky.taro.tsx
@@ -12,7 +12,7 @@ import { getEnv, PageScrollObject, usePageScroll } from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import { getWindowInfo } from '@/utils/get-system-info'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import useWatch from '@/utils/use-watch'
+import useWatch from '@/hooks/use-watch'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
 import { getScrollParent } from '@/utils/get-scroll-parent'
 
diff --git a/src/packages/sticky/sticky.tsx b/src/packages/sticky/sticky.tsx
index 70ba6510c6..660a51e90e 100644
--- a/src/packages/sticky/sticky.tsx
+++ b/src/packages/sticky/sticky.tsx
@@ -8,8 +8,8 @@ import React, {
 } from 'react'
 import classNames from 'classnames'
 import { getScrollParent } from '@/utils/get-scroll-parent'
-import { getRect } from '@/utils/use-client-rect'
-import useWatch from '@/utils/use-watch'
+import { getRect } from '@/hooks/use-client-rect'
+import useWatch from '@/hooks/use-watch'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 
 export interface StickyProps extends BasicComponent {
diff --git a/src/packages/swipe/swipe.taro.tsx b/src/packages/swipe/swipe.taro.tsx
index f2df884092..dfa64570ba 100644
--- a/src/packages/swipe/swipe.taro.tsx
+++ b/src/packages/swipe/swipe.taro.tsx
@@ -9,12 +9,12 @@ import React, {
 import classNames from 'classnames'
 import { ITouchEvent, View } from '@tarojs/components'
 import { BaseEventOrig } from '@tarojs/components/types/common'
-import { useTouch } from '@/utils/use-touch'
+import { useTouch } from '@/hooks/use-touch'
 import { getRectByTaro } from '@/utils/get-rect-by-taro'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { harmony } from '@/utils/platform-taro'
 import pxTransform from '@/utils/px-transform'
-import { useRefState } from '@/utils/use-ref-state'
+import { useRefState } from '@/hooks/use-ref-state'
 
 export type SwipeSide = 'left' | 'right'
 
diff --git a/src/packages/swipe/swipe.tsx b/src/packages/swipe/swipe.tsx
index 74872b846f..6046305bd3 100644
--- a/src/packages/swipe/swipe.tsx
+++ b/src/packages/swipe/swipe.tsx
@@ -8,8 +8,8 @@ import React, {
 } from 'react'
 import type { TouchEvent, MouseEvent } from 'react'
 import classNames from 'classnames'
-import { useTouch } from '@/utils/use-touch'
-import { getRect } from '@/utils/use-client-rect'
+import { useTouch } from '@/hooks/use-touch'
+import { getRect } from '@/hooks/use-client-rect'
 import { BasicComponent } from '@/utils/typings'
 
 export type SwipeSide = 'left' | 'right'
diff --git a/src/packages/swiper/effects/focus.tsx b/src/packages/swiper/effects/focus.tsx
index 9a4393827a..9c56343762 100644
--- a/src/packages/swiper/effects/focus.tsx
+++ b/src/packages/swiper/effects/focus.tsx
@@ -1,6 +1,6 @@
 import React, { ReactNode, useEffect } from 'react'
 import { animated } from '@react-spring/web'
-import { getRefValue, useRefState } from '@/utils/use-ref-state'
+import { getRefValue, useRefState } from '@/hooks/use-ref-state'
 import { useRtl } from '@/packages/configprovider'
 
 export interface FocusEffect {
diff --git a/src/packages/swiper/swiper.tsx b/src/packages/swiper/swiper.tsx
index da370c5278..cab8e0c3a0 100644
--- a/src/packages/swiper/swiper.tsx
+++ b/src/packages/swiper/swiper.tsx
@@ -4,7 +4,7 @@ import { useSpring } from '@react-spring/web'
 import classNames from 'classnames'
 import { BasicComponent } from '@/utils/typings'
 import Indicator from '@/packages/indicator'
-import { getRefValue, useRefState } from '@/utils/use-ref-state'
+import { getRefValue, useRefState } from '@/hooks/use-ref-state'
 import { defaultEffect } from '@/packages/swiper/effects/default'
 import {
   focusEffect,
diff --git a/src/packages/switch/switch.taro.tsx b/src/packages/switch/switch.taro.tsx
index 64976f2005..b3a0263ef3 100644
--- a/src/packages/switch/switch.taro.tsx
+++ b/src/packages/switch/switch.taro.tsx
@@ -3,7 +3,7 @@ import React, { FunctionComponent } from 'react'
 import { ITouchEvent, View } from '@tarojs/components'
 import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { useRtl } from '@/packages/configprovider/index.taro'
 
 export interface SwitchProps extends BasicComponent {
diff --git a/src/packages/switch/switch.tsx b/src/packages/switch/switch.tsx
index 7cdda7d524..306a98d6f0 100644
--- a/src/packages/switch/switch.tsx
+++ b/src/packages/switch/switch.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent } from 'react'
 import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { useRtl } from '@/packages/configprovider'
 
 export interface SwitchProps extends BasicComponent {
diff --git a/src/packages/tabbar/tabbar.taro.tsx b/src/packages/tabbar/tabbar.taro.tsx
index bb9a938eb2..b94d7bdde2 100644
--- a/src/packages/tabbar/tabbar.taro.tsx
+++ b/src/packages/tabbar/tabbar.taro.tsx
@@ -2,7 +2,7 @@ import React, { FunctionComponent } from 'react'
 import classNames from 'classnames'
 import { View } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import TabbarItem from '../tabbaritem/index.taro'
 import TabbarContext from './context'
 
diff --git a/src/packages/tabbar/tabbar.tsx b/src/packages/tabbar/tabbar.tsx
index 02318c9dc7..40eb756999 100644
--- a/src/packages/tabbar/tabbar.tsx
+++ b/src/packages/tabbar/tabbar.tsx
@@ -1,7 +1,7 @@
 import React, { FunctionComponent } from 'react'
 import classNames from 'classnames'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import TabbarItem from '../tabbaritem'
 import TabbarContext from './context'
 
diff --git a/src/packages/table/table.taro.tsx b/src/packages/table/table.taro.tsx
index fa56e8b332..7bec8f0750 100644
--- a/src/packages/table/table.taro.tsx
+++ b/src/packages/table/table.taro.tsx
@@ -5,7 +5,7 @@ import { View } from '@tarojs/components'
 import { BasicTableProps, TableColumnProps } from './types'
 import { useConfig, useRtl } from '@/packages/configprovider/index.taro'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { useTableSticky } from './utils'
 
 export type TableProps = BasicTableProps
diff --git a/src/packages/table/table.tsx b/src/packages/table/table.tsx
index 80e2d6d797..bbbabdb32b 100644
--- a/src/packages/table/table.tsx
+++ b/src/packages/table/table.tsx
@@ -4,7 +4,7 @@ import { ArrowDown } from '@nutui/icons-react'
 import { BasicTableProps, TableColumnProps } from './types'
 import { useConfig, useRtl } from '@/packages/configprovider'
 import { ComponentDefaults } from '@/utils/typings'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { useTableSticky } from './utils'
 
 export type TableProps = BasicTableProps
diff --git a/src/packages/tabs/tabs.taro.tsx b/src/packages/tabs/tabs.taro.tsx
index 8ba48cb7f7..1c2ebb80c0 100644
--- a/src/packages/tabs/tabs.taro.tsx
+++ b/src/packages/tabs/tabs.taro.tsx
@@ -5,10 +5,10 @@ import { JoySmile } from '@nutui/icons-react-taro'
 import Taro, { nextTick, createSelectorQuery } from '@tarojs/taro'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import TabPane from '@/packages/tabpane/index.taro'
-import { usePropsValue } from '@/utils/use-props-value'
-import { useForceUpdate } from '@/utils/use-force-update'
+import { usePropsValue } from '@/hooks/use-props-value'
+import { useForceUpdate } from '@/hooks/use-force-update'
 import raf from '@/utils/raf'
-import useUuid from '@/utils/use-uuid'
+import useUuid from '@/hooks/use-uuid'
 import { useRtl } from '../configprovider/configprovider.taro'
 
 export type TabsTitle = {
diff --git a/src/packages/tabs/tabs.tsx b/src/packages/tabs/tabs.tsx
index 8216127caf..522beab6ec 100644
--- a/src/packages/tabs/tabs.tsx
+++ b/src/packages/tabs/tabs.tsx
@@ -4,8 +4,8 @@ import { JoySmile } from '@nutui/icons-react'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import TabPane from '@/packages/tabpane'
 import raf from '@/utils/raf'
-import { usePropsValue } from '@/utils/use-props-value'
-import { useForceUpdate } from '@/utils/use-force-update'
+import { usePropsValue } from '@/hooks/use-props-value'
+import { useForceUpdate } from '@/hooks/use-force-update'
 import { useRtl } from '../configprovider'
 
 export type TabsTitle = {
diff --git a/src/packages/textarea/textarea.taro.tsx b/src/packages/textarea/textarea.taro.tsx
index 4f69f69e93..c01034cecb 100644
--- a/src/packages/textarea/textarea.taro.tsx
+++ b/src/packages/textarea/textarea.taro.tsx
@@ -4,7 +4,7 @@ import Taro from '@tarojs/taro'
 import { Textarea, TextareaProps, View, Text } from '@tarojs/components'
 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 interface TextAreaProps
   extends Omit<TextareaProps, 'showCount' | 'onFocus' | 'onBlur'>,
diff --git a/src/packages/textarea/textarea.tsx b/src/packages/textarea/textarea.tsx
index 15f2f4a4b4..c08d55d130 100644
--- a/src/packages/textarea/textarea.tsx
+++ b/src/packages/textarea/textarea.tsx
@@ -3,7 +3,7 @@ import type { ChangeEvent, FocusEvent } from 'react'
 import classNames from 'classnames'
 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 interface TextAreaProps extends BasicComponent {
   value: string
diff --git a/src/packages/toast/toast.taro.tsx b/src/packages/toast/toast.taro.tsx
index 601a07c9b6..e7c98569a8 100644
--- a/src/packages/toast/toast.taro.tsx
+++ b/src/packages/toast/toast.taro.tsx
@@ -10,8 +10,8 @@ import {
   useCustomEvent,
   useCustomEventsPath,
   useParams,
-} from '@/utils/use-custom-event'
-import { usePropsValue } from '@/utils/use-props-value'
+} from '@/hooks/use-custom-event'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { useRtl } from '@/packages/configprovider/index.taro'
 import { harmony } from '@/utils/platform-taro'
 import { mergeProps } from '@/utils/merge-props'
diff --git a/src/packages/tour/tour.taro.tsx b/src/packages/tour/tour.taro.tsx
index 06fd71f3ad..81dde534e8 100644
--- a/src/packages/tour/tour.taro.tsx
+++ b/src/packages/tour/tour.taro.tsx
@@ -5,7 +5,7 @@ import classNames from 'classnames'
 import { View, ITouchEvent } from '@tarojs/components'
 import Popover from '@/packages/popover/index.taro'
 import { PopoverLocation } from '@/packages/popover/types'
-import { getTaroRectById } from '@/utils/use-taro-rect'
+import { getTaroRectById } from '@/hooks/use-taro-rect'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { useConfig } from '@/packages/configprovider/index.taro'
 
diff --git a/src/packages/tour/tour.tsx b/src/packages/tour/tour.tsx
index 27e29fbc04..edca36e403 100644
--- a/src/packages/tour/tour.tsx
+++ b/src/packages/tour/tour.tsx
@@ -4,7 +4,7 @@ import { Close } from '@nutui/icons-react'
 import classNames from 'classnames'
 import Popover from '@/packages/popover'
 import { PopoverLocation } from '@/packages/popover/types'
-import { getRect } from '@/utils/use-client-rect'
+import { getRect } from '@/hooks/use-client-rect'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { useConfig } from '@/packages/configprovider'
 
diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx
index e60cbf3b37..1b690e0fde 100644
--- a/src/packages/uploader/uploader.taro.tsx
+++ b/src/packages/uploader/uploader.taro.tsx
@@ -15,7 +15,7 @@ import { useConfig } from '@/packages/configprovider/index.taro'
 import { funcInterceptor } from '@/utils/interceptor'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import { FileItem } from './types'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { Preview } from '@/packages/uploader/preview.taro'
 
 interface sizeType {
diff --git a/src/packages/uploader/uploader.tsx b/src/packages/uploader/uploader.tsx
index 53a1194a81..ec48139f10 100644
--- a/src/packages/uploader/uploader.tsx
+++ b/src/packages/uploader/uploader.tsx
@@ -12,7 +12,7 @@ import { useConfig } from '@/packages/configprovider'
 import { funcInterceptor } from '@/utils/interceptor'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 import Button from '@/packages/button'
-import { usePropsValue } from '@/utils/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { Preview } from '@/packages/uploader/preview'
 import { FileItem } from './types'
 import { mergeProps } from '@/utils/merge-props'
diff --git a/src/utils/get-rect-by-taro.ts b/src/utils/get-rect-by-taro.ts
index cf3abd59df..3b6a42256e 100644
--- a/src/utils/get-rect-by-taro.ts
+++ b/src/utils/get-rect-by-taro.ts
@@ -1,5 +1,5 @@
 import { createSelectorQuery } from '@tarojs/taro'
-import { getRect, inBrowser } from './use-client-rect'
+import { getRect, inBrowser } from '../hooks/use-client-rect'
 
 export interface Rect {
   dataset: Record<string, any>
diff --git a/tsconfig.h5.json b/tsconfig.h5.json
index 552af15f6a..f8a733b97d 100644
--- a/tsconfig.h5.json
+++ b/tsconfig.h5.json
@@ -3,6 +3,7 @@
   "include": [
     "./src/packages",
     "./src/utils",
+    "./src/hooks",
     "./src/locales",
     "./src/vite-env.d.ts"
   ],

From 6fa7ce6f73c1ea9e048714289217be0b24969240 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Thu, 13 Feb 2025 09:37:24 +0800
Subject: [PATCH 2/5] fix: alias

---
 packages/nutui-taro-demo/tsconfig.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nutui-taro-demo/tsconfig.json b/packages/nutui-taro-demo/tsconfig.json
index 6fdd6ecc45..20a0d147ab 100644
--- a/packages/nutui-taro-demo/tsconfig.json
+++ b/packages/nutui-taro-demo/tsconfig.json
@@ -30,6 +30,9 @@
       ],
       "@/utils": [
         "src/utils/*"
+      ],
+      "@/hooks": [
+        "src/hooks/*"
       ]
     },
     "typeRoots": [

From c1d93ddcaaa0ecba31abb994d385ae3cb54ffab1 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Thu, 13 Feb 2025 14:04:23 +0800
Subject: [PATCH 3/5] fix: alias configuration in the taro project

---
 packages/nutui-taro-demo/config/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nutui-taro-demo/config/index.js b/packages/nutui-taro-demo/config/index.js
index e0c8379093..27dca226ee 100644
--- a/packages/nutui-taro-demo/config/index.js
+++ b/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'

From 6e97437204442a4e70360d9e115149567e057f38 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Thu, 13 Feb 2025 14:28:15 +0800
Subject: [PATCH 4/5] fix: review

---
 src/packages/segmented/segmented.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/packages/segmented/segmented.tsx b/src/packages/segmented/segmented.tsx
index 9ae457c0e5..2b0f175445 100644
--- a/src/packages/segmented/segmented.tsx
+++ b/src/packages/segmented/segmented.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react'
 import classNames from 'classnames'
 import { SegmentedItem, SegmentedProps } from './types'
-import { usePropsValue } from '../../hooks/use-props-value'
+import { usePropsValue } from '@/hooks/use-props-value'
 import { mergeProps } from '@/utils/merge-props'
 
 const defaultProps = {

From d21e478031593c124bbc934d142777927771ae6b Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Thu, 13 Feb 2025 15:03:28 +0800
Subject: [PATCH 5/5] fix: review

---
 src/utils/get-rect-by-taro.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/get-rect-by-taro.ts b/src/utils/get-rect-by-taro.ts
index 3b6a42256e..a415dfd2ca 100644
--- a/src/utils/get-rect-by-taro.ts
+++ b/src/utils/get-rect-by-taro.ts
@@ -1,5 +1,5 @@
 import { createSelectorQuery } from '@tarojs/taro'
-import { getRect, inBrowser } from '../hooks/use-client-rect'
+import { getRect, inBrowser } from '@/hooks/use-client-rect'
 
 export interface Rect {
   dataset: Record<string, any>