mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-11 11:32:52 +08:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

chore: rename theme separated to inherit

Browse Source
This commit is contained in:
MadCcc 2022-11-17 01:06:33 +08:00
parent c0de3b2737
commit a77f1aa8fc
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/config-provider/__tests__/theme.test.tsx
View File

@ -186,7 +186,7 @@ describe('ConfigProvider.Theme', () => {
}; };
render( render(
<ConfigProvider theme={{ token: { colorPrimary: '#1890ff' } }}> <ConfigProvider theme={{ token: { colorPrimary: '#1890ff' } }}>
<ConfigProvider theme={{ seperated: true }}> <ConfigProvider theme={{ inherit: false }}>
<Demo /> <Demo />
</ConfigProvider> </ConfigProvider>
</ConfigProvider>, </ConfigProvider>,

2
components/config-provider/context.tsx
View File

@ -30,7 +30,7 @@ export interface ThemeConfig {
components?: OverrideToken; components?: OverrideToken;
algorithm?: MappingAlgorithm | MappingAlgorithm[]; algorithm?: MappingAlgorithm | MappingAlgorithm[];
hashed?: boolean; hashed?: boolean;
seperated?: boolean; inherit?: boolean;
} }
export interface ConfigConsumerProps { export interface ConfigConsumerProps {

2
components/config-provider/hooks/useTheme.ts
View File

@ -10,7 +10,7 @@ export default function useTheme(
): ThemeConfig | undefined { ): ThemeConfig | undefined {
const themeConfig = theme || {}; const themeConfig = theme || {};
const parentThemeConfig: ThemeConfig = const parentThemeConfig: ThemeConfig =
themeConfig.seperated || !parentTheme ? defaultConfig : parentTheme; themeConfig.inherit === false || !parentTheme ? defaultConfig : parentTheme;
const mergedTheme = useMemo<ThemeConfig | undefined>( const mergedTheme = useMemo<ThemeConfig | undefined>(
() => { () => {

2
docs/react/customize-theme-v5.en-US.md
View File

@ -195,7 +195,7 @@ const theme = {
| 属性 | 说明 | 类型 | 默认值 | | 属性 | 说明 | 类型 | 默认值 |
| --- | --- | --- | --- | | --- | --- | --- | --- |
| token | Modify Design Token | `AliasToken` | - | | token | Modify Design Token | `AliasToken` | - |
| seperated | Ignore theme configured in upper ConfigProvider | boolean | - | | inherit | Inherit theme configured in upper ConfigProvider | boolean | true |
| algorithm | Modify the algorithms of theme | `(token: SeedToken) => MapToken` \| `((token: SeedToken) => MapToken)[]` | `defaultAlgorithm` | | algorithm | Modify the algorithms of theme | `(token: SeedToken) => MapToken` \| `((token: SeedToken) => MapToken)[]` | `defaultAlgorithm` |
| components | Modify Component Token and Alias Token applied to components | OverrideToken | - | | components | Modify Component Token and Alias Token applied to components | OverrideToken | - |

2
docs/react/customize-theme-v5.zh-CN.md
View File

@ -195,7 +195,7 @@ const theme = {
| 属性 | 说明 | 类型 | 默认值 | | 属性 | 说明 | 类型 | 默认值 |
| --- | --- | --- | --- | | --- | --- | --- | --- |
| token | 用于修改 Design Token | `AliasToken` | - | | token | 用于修改 Design Token | `AliasToken` | - |
| seperated | 隔离上层 ConfigProvider 中配置的主题。 | boolean | - | | inherit | 继承上层 ConfigProvider 中配置的主题。 | boolean | true |
| algorithm | 用于修改 Seed Token 到 Map Token 的算法 | `(token: SeedToken) => MapToken` \| `((token: SeedToken) => MapToken)[]` | `defaultAlgorithm` | | algorithm | 用于修改 Seed Token 到 Map Token 的算法 | `(token: SeedToken) => MapToken` \| `((token: SeedToken) => MapToken)[]` | `defaultAlgorithm` |
| components | 用于修改各个组件的 Component Token 以及覆盖该组件消费的 Alias Token | OverrideToken | - | | components | 用于修改各个组件的 Component Token 以及覆盖该组件消费的 Alias Token | OverrideToken | - |