From 686922c08418efa098499155935f03a8b251821e Mon Sep 17 00:00:00 2001 From: chris <1729889531@qq.com> Date: Sun, 23 Jul 2023 18:41:46 +0800 Subject: [PATCH] fix: optimize configProvider type writting style --- src/config-provider/ConfigContext.tsx | 12 ++++++------ src/config-provider/ConfigProvider.tsx | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/config-provider/ConfigContext.tsx b/src/config-provider/ConfigContext.tsx index 369a03d3d..b559f4341 100644 --- a/src/config-provider/ConfigContext.tsx +++ b/src/config-provider/ConfigContext.tsx @@ -17,7 +17,9 @@ export const defaultAnimation = { exclude: [], }; -export const defaultGlobalConfig = { +type DefaultGlobalConfig = Partial + +export const defaultGlobalConfig: DefaultGlobalConfig = { animation: defaultAnimation, classPrefix: defaultClassPrefix, ...merge(defaultLocale, defaultConfig), @@ -25,15 +27,13 @@ export const defaultGlobalConfig = { export type Locale = typeof defaultLocale; -export type GlobalConfig = typeof defaultGlobalConfig; -export interface Config { - globalConfig?: GlobalConfigProvider; -} -export const defaultContext: { globalConfig: GlobalConfig } = { +export const defaultContext = { globalConfig: defaultGlobalConfig, }; +export type Config = typeof defaultContext; + const ConfigContext = createContext(defaultContext); export default ConfigContext; diff --git a/src/config-provider/ConfigProvider.tsx b/src/config-provider/ConfigProvider.tsx index 8964d937e..1b8746360 100644 --- a/src/config-provider/ConfigProvider.tsx +++ b/src/config-provider/ConfigProvider.tsx @@ -1,6 +1,6 @@ import React from 'react'; import _mergeWith from 'lodash/mergeWith'; -import ConfigContext, { Config, defaultGlobalConfig, GlobalConfig } from './ConfigContext'; +import ConfigContext, { defaultGlobalConfig, Config } from './ConfigContext'; import { GlobalConfigProvider } from './type'; export interface ConfigProviderProps extends Config { @@ -18,7 +18,7 @@ export const merge = (src: GlobalConfigProvider, config: GlobalConfigProvider) = export default function ConfigProvider({ children, globalConfig }: ConfigProviderProps) { const mergedGlobalConfig = merge(defaultGlobalConfig, globalConfig); return ( - + {children} );