feat: configprovider

src/locales/en-US.ts

@@ -1,6 +1,6 @@
-import { BaseLang } from './base'
+import { Locales } from '@/types'
 
-const enUS: BaseLang = {
+const enUS: Locales = {
   save: 'Save',
   confirm: 'Confirm',
   cancel: 'Cancel',

src/locales/id-ID.ts

@@ -1,6 +1,6 @@
-import { BaseLang } from './base'
+import { Locales } from '@/types'
 
-const idID: BaseLang = {
+const idID: Locales = {
   save: 'Simpan',
   confirm: 'Konfirmasi',
   cancel: 'Batal',

src/locales/tr-TR.ts

@@ -1,6 +1,6 @@
-import { BaseLang } from './base'
+import { Locales } from '@/types'
 
-const trTR: BaseLang = {
+const trTR: Locales = {
   save: 'Kaydet',
   confirm: 'Onayla',
   cancel: 'İptal',

src/locales/zh-CN.ts

@@ -1,6 +1,6 @@
-import { BaseLang } from './base'
+import { Locales } from '@/types'
 
-const zhCN: BaseLang = {
+const zhCN: Locales = {
   save: '保存',
   confirm: '确认',
   cancel: '取消',

src/locales/zh-TW.ts

@@ -1,6 +1,6 @@
-import { BaseLang } from './base'
+import { Locales } from '@/types'
 
-const zhCN: BaseLang = {
+const zhCN: Locales = {
   save: '保存',
   confirm: '確認',
   cancel: '取消',

src/locales/zh-UG.ts

@@ -1,6 +1,6 @@
-import { BaseLang } from './base'
+import { Locales } from '@/types'
 
-const zhUG: BaseLang = {
+const zhUG: Locales = {
   save: 'ساقلاش',
   confirm: 'ھەئە',
   cancel: 'ياق',

src/packages/configprovider/configprovider.taro.tsx

@@ -4,39 +4,30 @@ import kebabCase from 'lodash.kebabcase'
 import isEqual from 'react-fast-compare'
 import { View } from '@tarojs/components'
 import { useMemo } from '@/hooks/use-memo'
-import { BasicComponent } from '@/utils/typings'
-import { BaseLang } from '@/locales/base'
 import zhCN from '@/locales/zh-CN'
-import type { NutCSSVariables } from './types'
-
-export interface ConfigProviderProps extends BasicComponent {
-  locale: BaseLang
-  direction?: ConfigProviderDirection
-  theme?: Record<string | NutCSSVariables, string>
-}
-
-export type ConfigProviderDirection = 'ltr' | 'rtl' | undefined
-
-const classPrefix = 'nut-configprovider'
+import { TaroConfigProviderProps, Locales as LocalesType } from '@/types'
 
+type Locales = Partial<LocalesType>
 export const defaultConfigRef: {
-  current: ConfigProviderProps
+  current: TaroConfigProviderProps<Locales>
 } = {
   current: {
     locale: zhCN,
     direction: 'ltr',
   },
 }
 
-export const setDefaultConfig = (config: ConfigProviderProps) => {
+export const setDefaultConfig = (config: TaroConfigProviderProps<Locales>) => {
   defaultConfigRef.current = config
 }
 
 export const getDefaultConfig = () => {
   return defaultConfigRef.current
 }
 
-const ConfigContext = createContext<ConfigProviderProps | null>(null)
+const ConfigContext = createContext<TaroConfigProviderProps<Locales> | null>(
+  null
+)
 
 export const useConfig = () => {
   return useContext(ConfigContext) ?? getDefaultConfig()
@@ -56,10 +47,10 @@ export const useRtl = () => {
 }
 
 export const ConfigProvider: FunctionComponent<
-  Partial<ConfigProviderProps & BasicComponent>
+  Partial<TaroConfigProviderProps<Locales>>
 > = (props) => {
   const { style, className, children, direction, ...config } = props
-
+  const classPrefix = 'nut-configprovider'
   const mergedConfig = useMemo(
     () => {
       return {
@@ -74,7 +65,7 @@ export const ConfigProvider: FunctionComponent<
         const nextTheme = next[index]
         return !isEqual(prevTheme, nextTheme)
       })
-  ) as ConfigProviderProps
+  ) as TaroConfigProviderProps<Locales>
 
   const cssVarStyle = React.useMemo(() => {
     return convertThemeVarsToCSSVars(mergedConfig.theme || {})

src/packages/configprovider/configprovider.tsx

@@ -3,39 +3,32 @@ import classNames from 'classnames'
 import kebabCase from 'lodash.kebabcase'
 import isEqual from 'react-fast-compare'
 import { useMemo } from '@/hooks/use-memo'
-import { BasicComponent } from '@/utils/typings'
-import { BaseLang } from '@/locales/base'
 import zhCN from '@/locales/zh-CN'
-import type { NutCSSVariables } from './types'
 import { inBrowser } from '@/utils'
+import { WebConfigProviderProps, Locales as LocalesType } from '@/types'
 
-export interface ConfigProviderProps extends BasicComponent {
-  locale: BaseLang
-  direction?: ConfigProviderDirection
-  theme?: Record<string | NutCSSVariables, string>
-}
-
-export type ConfigProviderDirection = 'ltr' | 'rtl' | undefined
-
-const classPrefix = 'nut-configprovider'
+type Locales = Partial<LocalesType>
 
 export const defaultConfigRef: {
-  current: ConfigProviderProps
+  current: WebConfigProviderProps<Locales>
 } = {
   current: {
     locale: zhCN,
+    direction: 'ltr',
   },
 }
 
-export const setDefaultConfig = (config: ConfigProviderProps) => {
+export const setDefaultConfig = (config: WebConfigProviderProps<Locales>) => {
   defaultConfigRef.current = config
 }
 
 export const getDefaultConfig = () => {
   return defaultConfigRef.current
 }
 
-const ConfigContext = createContext<ConfigProviderProps | null>(null)
+const ConfigContext = createContext<WebConfigProviderProps<Locales> | null>(
+  null
+)
 
 export const useConfig = () => {
   return useContext(ConfigContext) ?? getDefaultConfig()
@@ -58,10 +51,10 @@ export const useRtl = () => {
 }
 
 export const ConfigProvider: FunctionComponent<
-  Partial<ConfigProviderProps & BasicComponent>
+  Partial<WebConfigProviderProps<Locales>>
 > = (props) => {
   const { style, className, children, direction, ...config } = props
-
+  const classPrefix = 'nut-configprovider'
   const mergedConfig = useMemo(
     () => {
       return {
@@ -76,7 +69,7 @@ export const ConfigProvider: FunctionComponent<
         const nextTheme = next[index]
         return !isEqual(prevTheme, nextTheme)
       })
-  ) as ConfigProviderProps
+  ) as WebConfigProviderProps<Locales>
 
   const cssVarStyle = React.useMemo(() => {
     return convertThemeVarsToCSSVars(mergedConfig.theme || {})

src/packages/configprovider/index.taro.ts

@@ -7,9 +7,9 @@ import {
 } from './configprovider.taro'
 
 export type {
-  ConfigProviderProps,
-  ConfigProviderDirection,
-} from './configprovider.taro'
+  TaroConfigProviderProps,
+  PageDirection as ConfigProviderDirection,
+} from '@/types'
 export type { NutCSSVariables } from './types'
 export { useConfig, setDefaultConfig, getDefaultConfig, useRtl }
 export default ConfigProvider

src/packages/configprovider/index.ts

@@ -7,9 +7,9 @@ import {
 } from './configprovider'
 
 export type {
-  ConfigProviderProps,
-  ConfigProviderDirection,
-} from './configprovider'
+  WebConfigProviderProps,
+  PageDirection as ConfigProviderDirection,
+} from '@/types'
 export type { NutCSSVariables } from './types'
 export { useConfig, setDefaultConfig, getDefaultConfig, useRtl }
 export default ConfigProvider