diff --git a/src/packages/address/address.taro.tsx b/src/packages/address/address.taro.tsx index 11268e97bf..aa1c4bb459 100644 --- a/src/packages/address/address.taro.tsx +++ b/src/packages/address/address.taro.tsx @@ -9,7 +9,7 @@ import { ArrowLeft } from '@nutui/icons-react-taro' 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 { useConfig } from '@/packages/configprovider/index.taro' import { AddressList } from './types' import { CascaderOption, diff --git a/src/packages/address/existRender.taro.tsx b/src/packages/address/existRender.taro.tsx index 44f1649e8f..a5d2074078 100644 --- a/src/packages/address/existRender.taro.tsx +++ b/src/packages/address/existRender.taro.tsx @@ -1,7 +1,7 @@ import React, { FunctionComponent, ReactNode } from 'react' import { Check, Location } from '@nutui/icons-react-taro' import { ScrollView, View, ITouchEvent } from '@tarojs/components' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { AddressList } from './types' export interface ExistRenderProps { diff --git a/src/packages/audio/audio.taro.tsx b/src/packages/audio/audio.taro.tsx index b09faf61cc..84410060d7 100644 --- a/src/packages/audio/audio.taro.tsx +++ b/src/packages/audio/audio.taro.tsx @@ -10,7 +10,7 @@ import { Service } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Range from '@/packages/range/index.taro' import Button from '@/packages/button/index.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' export interface AudioProps extends BasicComponent { diff --git a/src/packages/avatarcropper/avatarcropper.taro.tsx b/src/packages/avatarcropper/avatarcropper.taro.tsx index 20f0b83f2e..92e2b8f979 100644 --- a/src/packages/avatarcropper/avatarcropper.taro.tsx +++ b/src/packages/avatarcropper/avatarcropper.taro.tsx @@ -9,7 +9,7 @@ import Taro, { useReady, createSelectorQuery } from '@tarojs/taro' import classNames from 'classnames' import { Canvas, CommonEventFunction, View } from '@tarojs/components' import { Button } from '@/packages/button/button.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { useTouch } from '@/utils/use-touch' diff --git a/src/packages/backtop/backtop.scss b/src/packages/backtop/backtop.scss index 91341391b2..e65f50644a 100644 --- a/src/packages/backtop/backtop.scss +++ b/src/packages/backtop/backtop.scss @@ -1,3 +1,6 @@ +@import '../hoverbutton/hoverbutton.scss'; +@import '../hoverbuttonitem/hoverbuttonitem.scss'; + .nut-backtop { display: none; diff --git a/src/packages/calendar/calendar.taro.tsx b/src/packages/calendar/calendar.taro.tsx index 713eabee14..b315b3d8a6 100644 --- a/src/packages/calendar/calendar.taro.tsx +++ b/src/packages/calendar/calendar.taro.tsx @@ -2,7 +2,7 @@ import React, { useRef, ReactNode } from 'react' 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 { useConfig } from '@/packages/configprovider/index.taro' import type { CalendarDay, CalendarType, CalendarRef } from './types' import { ComponentDefaults } from '@/utils/typings' diff --git a/src/packages/calendarcard/calendarcard.taro.tsx b/src/packages/calendarcard/calendarcard.taro.tsx index f551bfe2f6..439e07ac1a 100644 --- a/src/packages/calendarcard/calendarcard.taro.tsx +++ b/src/packages/calendarcard/calendarcard.taro.tsx @@ -10,7 +10,7 @@ import { getCurrentWeekDays, getPrevMonthDays, } from './utils' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import type { CalendarCardDay, CalendarCardMonth, diff --git a/src/packages/calendaritem/calendaritem.taro.tsx b/src/packages/calendaritem/calendaritem.taro.tsx index 4c917425eb..e757e5df76 100644 --- a/src/packages/calendaritem/calendaritem.taro.tsx +++ b/src/packages/calendaritem/calendaritem.taro.tsx @@ -11,7 +11,7 @@ import { getPreMonthDates, } from '@/utils/date' import requestAniFrame from '@/utils/raf' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { usePropsValue } from '@/utils/use-props-value' import { splitDate, diff --git a/src/packages/cascader/cascader.taro.tsx b/src/packages/cascader/cascader.taro.tsx index e5a1419f18..905349c528 100644 --- a/src/packages/cascader/cascader.taro.tsx +++ b/src/packages/cascader/cascader.taro.tsx @@ -22,7 +22,7 @@ import { } from './types' import { ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' export interface CascaderProps extends Pick< diff --git a/src/packages/fixednav/fixednav.taro.tsx b/src/packages/fixednav/fixednav.taro.tsx index 5090d79a7d..7bbc34fe3e 100644 --- a/src/packages/fixednav/fixednav.taro.tsx +++ b/src/packages/fixednav/fixednav.taro.tsx @@ -3,7 +3,7 @@ import classNames from 'classnames' import { ArrowLeft } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Overlay from '@/packages/overlay/index.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { FixedNavType, diff --git a/src/packages/infiniteloading/infiniteloading.taro.tsx b/src/packages/infiniteloading/infiniteloading.taro.tsx index 13a3547c8a..846c891969 100644 --- a/src/packages/infiniteloading/infiniteloading.taro.tsx +++ b/src/packages/infiniteloading/infiniteloading.taro.tsx @@ -8,7 +8,7 @@ import React, { import classNames from 'classnames' import { ScrollView, ScrollViewProps, View } from '@tarojs/components' import { createSelectorQuery } from '@tarojs/taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { InfiniteLoadingType } from './types' diff --git a/src/packages/inputnumber/demos/taro/demo9.tsx b/src/packages/inputnumber/demos/taro/demo9.tsx index 08ec94e19f..c1f768a77e 100644 --- a/src/packages/inputnumber/demos/taro/demo9.tsx +++ b/src/packages/inputnumber/demos/taro/demo9.tsx @@ -1,6 +1,10 @@ import React, { useState } from 'react' -import { Cell, InputNumber, Toast } from '@nutui/nutui-react-taro' -import ConfigProvider from '@/packages/configprovider' +import { + Cell, + InputNumber, + Toast, + ConfigProvider, +} from '@nutui/nutui-react-taro' const Demo9 = () => { const customTheme3 = { diff --git a/src/packages/numberkeyboard/numberkeyboard.taro.tsx b/src/packages/numberkeyboard/numberkeyboard.taro.tsx index af9d0b554c..e459b9abd4 100644 --- a/src/packages/numberkeyboard/numberkeyboard.taro.tsx +++ b/src/packages/numberkeyboard/numberkeyboard.taro.tsx @@ -4,7 +4,7 @@ import { ArrowDown } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Popup from '@/packages/popup/index.taro' import { PopupProps } from '@/packages/popup/popup.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { ComponentDefaults } from '@/utils/typings' import { mergeProps } from '@/utils/merge-props' diff --git a/src/packages/picker/picker.taro.tsx b/src/packages/picker/picker.taro.tsx index 824dbc4102..0eae715b2a 100644 --- a/src/packages/picker/picker.taro.tsx +++ b/src/packages/picker/picker.taro.tsx @@ -12,7 +12,7 @@ import { View, PickerView, PickerViewColumn } from '@tarojs/components' import { Popup, PopupProps } from '@/packages/popup/popup.taro' import PickerPanel from './pickerpanel.taro' import useRefs from '@/utils/use-refs' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { PickerOption } from './types' import { usePropsValue } from '@/utils/use-props-value' import { BasicComponent, ComponentDefaults } from '@/utils/typings' diff --git a/src/packages/searchbar/searchbar.taro.tsx b/src/packages/searchbar/searchbar.taro.tsx index 5d49a61a2f..76d9ec5c93 100644 --- a/src/packages/searchbar/searchbar.taro.tsx +++ b/src/packages/searchbar/searchbar.taro.tsx @@ -2,7 +2,7 @@ import React, { FunctionComponent, useEffect, useRef, useState } from 'react' import type { ChangeEvent, FocusEvent, MouseEvent } from 'react' import { View, ITouchEvent, Input as TaroInput } from '@tarojs/components' import { MaskClose, Search, ArrowLeft } from '@nutui/icons-react-taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' export interface SearchBarProps extends BasicComponent { diff --git a/src/packages/table/table.taro.tsx b/src/packages/table/table.taro.tsx index 7869247cdd..fa56e8b332 100644 --- a/src/packages/table/table.taro.tsx +++ b/src/packages/table/table.taro.tsx @@ -3,10 +3,7 @@ import classNames from 'classnames' import { ArrowDown } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import { BasicTableProps, TableColumnProps } from './types' -import { - useConfig, - useRtl, -} from '@/packages/configprovider/configprovider.taro' +import { useConfig, useRtl } from '@/packages/configprovider/index.taro' import { ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' import { useTableSticky } from './utils' diff --git a/src/packages/textarea/textarea.taro.tsx b/src/packages/textarea/textarea.taro.tsx index e31aab6edb..4f69f69e93 100644 --- a/src/packages/textarea/textarea.taro.tsx +++ b/src/packages/textarea/textarea.taro.tsx @@ -2,10 +2,7 @@ import React, { FunctionComponent, useRef } from 'react' import classNames from 'classnames' import Taro from '@tarojs/taro' import { Textarea, TextareaProps, View, Text } from '@tarojs/components' -import { - useConfig, - useRtl, -} from '@/packages/configprovider/configprovider.taro' +import { useConfig, useRtl } from '@/packages/configprovider/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { usePropsValue } from '@/utils/use-props-value' diff --git a/src/packages/timeselect/timeselect.taro.tsx b/src/packages/timeselect/timeselect.taro.tsx index 8ae31f7626..9d8532e4cf 100644 --- a/src/packages/timeselect/timeselect.taro.tsx +++ b/src/packages/timeselect/timeselect.taro.tsx @@ -4,7 +4,7 @@ import { View } from '@tarojs/components' import Popup from '@/packages/popup/index.taro' import TimeDetail from '@/packages/timedetail/index.taro' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' export interface TimeType { value?: string diff --git a/src/packages/tour/tour.taro.tsx b/src/packages/tour/tour.taro.tsx index 98ed5f3288..06fd71f3ad 100644 --- a/src/packages/tour/tour.taro.tsx +++ b/src/packages/tour/tour.taro.tsx @@ -7,7 +7,7 @@ import Popover from '@/packages/popover/index.taro' import { PopoverLocation } from '@/packages/popover/types' import { getTaroRectById } from '@/utils/use-taro-rect' import { BasicComponent, ComponentDefaults } from '@/utils/typings' -import { useConfig } from '@/packages/configprovider' +import { useConfig } from '@/packages/configprovider/index.taro' export interface TourList { target: Element | string diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx index 51d82712dc..e60cbf3b37 100644 --- a/src/packages/uploader/uploader.taro.tsx +++ b/src/packages/uploader/uploader.taro.tsx @@ -11,7 +11,7 @@ import Taro, { chooseImage, getEnv, chooseMedia } from '@tarojs/taro' import { Failure, Photograph } from '@nutui/icons-react-taro' import { View } from '@tarojs/components' import Button from '@/packages/button/index.taro' -import { useConfig } from '@/packages/configprovider/configprovider.taro' +import { useConfig } from '@/packages/configprovider/index.taro' import { funcInterceptor } from '@/utils/interceptor' import { BasicComponent, ComponentDefaults } from '@/utils/typings' import { FileItem } from './types'