Skip to content

Commit ac85e1f

Browse files
committed
feat: delete default config context
1 parent f36d4eb commit ac85e1f

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

src/context/config-provider.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,7 @@ interface CSPConfig {
1010
nonce?: string;
1111
}
1212

13-
const defaultGetPrefixCls = (suffixCls?: string, customizePrefixCls?: string) => {
14-
if (customizePrefixCls) {
15-
return customizePrefixCls;
16-
}
17-
return suffixCls ? `ant-${suffixCls}` : 'ant';
18-
};
19-
20-
const defaultIconPrefixCls = 'anticon';
21-
22-
23-
export const DefaultConfigProviderContext = React.createContext<DefaultConfigConsumerProps>({
24-
// We provide a default function for Context without provider
25-
getPrefixCls: defaultGetPrefixCls,
26-
iconPrefixCls: defaultIconPrefixCls,
27-
});
13+
export const DefaultConfigProviderContext = React.createContext<DefaultConfigConsumerProps>({});
2814

2915
export type GetConfigProviderContext = () => [React.Context<DefaultConfigConsumerProps>];
3016

src/util/genStyleUtils.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ export default function genStyleUtils<CompTokenMap extends Object>(
289289
return (prefixCls: string, rootCls: string = prefixCls): UseComponentStyleResult => {
290290
const [theme, realToken, hashId, token, cssVar] = useToken();
291291

292-
const { getPrefixCls, iconPrefixCls, csp = {} } = useMergedConfigContext(getConfigProviderContext);
292+
const { getPrefixCls, iconPrefixCls = '', csp = {} } = useMergedConfigContext(getConfigProviderContext);
293293

294-
const rootPrefixCls = getPrefixCls();
294+
const rootPrefixCls = getPrefixCls?.() ?? '';
295295

296296
const type = cssVar ? 'css' : 'js';
297297

@@ -338,7 +338,6 @@ export default function genStyleUtils<CompTokenMap extends Object>(
338338
);
339339

340340
// Generate style for icons
341-
// useResetIconStyle(iconPrefixCls, csp);
342341

343342
const wrapSSR = useStyleRegister(
344343
{ ...sharedConfig, path: [concatComponent, prefixCls, iconPrefixCls] },
@@ -373,8 +372,8 @@ export default function genStyleUtils<CompTokenMap extends Object>(
373372
{
374373
componentCls,
375374
prefixCls,
376-
iconCls: `.${iconPrefixCls}`,
377-
antCls: `.${rootPrefixCls}`,
375+
iconCls: !!iconPrefixCls.length ? '' : `.${iconPrefixCls}`,
376+
antCls: !!rootPrefixCls.length ? '' : `.${rootPrefixCls}`,
378377
calc,
379378
// @ts-ignore
380379
max,

0 commit comments

Comments
 (0)