Compare commits

...

10 Commits

Author SHA1 Message Date
二货机器人
38f32d5cf7 feat(Typography): add semantic type support for classNames and styles
Add semantic type support to Typography component, allowing type-specific classNames and styles similar to Alert. This includes:

- Add BaseTypographyProps interface and semantic type definitions
- Add useMergeSemantic hook integration for merging semantic props
- Create useTypographySemantic hook for Typography component
- Add semantic demo and unit tests
- Export TypographyProps type from index

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-12 20:00:13 +08:00
二货机器人
065ff3d2ad Merge remote-tracking branch 'origin/feature' into typography-semantic 2026-02-12 14:35:24 +08:00
github-actions[bot]
77fecc07ca chore: auto merge branches (#56959)
chore: feature merge master
2026-02-12 05:06:52 +00:00
二货机器人
08a0e26973 chore: init 2026-02-12 11:45:53 +08:00
lijianan
0088e0221c feat: App should support ref (#56951)
* feat: App should support ref

* update

* update

* add test case

* update test case

* test: improve App warning and Ref test cases

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* refactor: simplify JSX props spread in App

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-12 11:41:55 +08:00
github-actions[bot]
88bd8f6de8 chore: auto merge branches (#56953)
chore: sync master into feature
2026-02-11 17:03:59 +00:00
github-actions[bot]
5d3c93bdd6 chore: auto merge branches (#56929)
chore: sync master into feature
2026-02-10 12:46:22 +00:00
二货爱吃白萝卜
61729477bb feat: Space.Addon supprot design token (#56915)
* feat(Space.Addon): add ComponentToken interface and init function

- Create token.ts with 6 customizable tokens
- Add paddingInline, paddingInlineSM, borderRadius, borderRadiusSM, borderRadiusLG, lineWidth
- Include JSDoc comments with Chinese and English descriptions

* feat(Space.Addon): consume component tokens in addon styles

- Update addon.ts to use ComponentToken from token.ts
- Replace global token usage with component tokens (paddingSM -> paddingInline, etc.)
- Register with genStyleHooks using 'Addon' and initComponentToken

* feat(theme): register Addon component in ComponentTokenMap

- Add AddonComponentToken import
- Add Addon entry to ComponentTokenMap interface

* docs(Space.Addon): add demo, tests and documentation for theme customization

- Add component-token.tsx demo showing ConfigProvider usage
- Add demo descriptions in English and Chinese
- Add demo references to index.en-US.md and index.zh-CN.md
- Add test for Addon component token in theme.test.tsx

* fix(Space.Addon): correct type signature for prepareComponentToken

- Use GetDefaultToken<'Addon'> type instead of (token: FullToken<'Addon'>) => ComponentToken
- Import GetDefaultToken from theme/internal
- Update function name from initComponentToken to prepareComponentToken
- Update genStyleHooks call to use prepareComponentToken

* test(Space.Addon): update snapshots for new component-token demo

* test(Space.Addon): use toHaveStyle to check CSS variable

- Add cssVar: true to enable CSS variable generation for Addon tokens
- Use toHaveStyle to verify --ant-addon-padding-inline CSS variable
- Follow the pattern from Select component token test

* docs(Space.Addon): merge zh-CN and en-US into single demo md file

- Remove redundant component-token.zh-CN.md
- Update component-token.md to include both zh-CN and en-US sections
- Follow the pattern used by other demo md files

* refactor(Space.Addon): remove component token system

Remove the ComponentToken interface and prepareComponentToken function as they are no longer needed for the Addon component styling.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* refactor(Space.Addon): use Space component tokens instead of separate token system

Register Addon as a subcomponent of Space and directly use Space's padding tokens instead of maintaining a separate component token system.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* docs(Space.Addon): mark component-token demo as debug

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* test: update Space demo snapshots

* test(Space.Addon): update snapshot for component-token demo simplification

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix(ConfigProvider): test should use Addon component token instead of Space

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-10 14:33:03 +08:00
二货爱吃白萝卜
fdb0d6ca6e fix: adjust Select option active style priority higher than selected (#56924) 2026-02-10 14:32:53 +08:00
github-actions[bot]
e93868198b chore: auto merge branches (#56914)
merge feature into master
2026-02-09 09:54:16 +00:00
19 changed files with 476 additions and 48 deletions

View File

@@ -21,7 +21,7 @@ export interface AppProps<P = AnyObject> extends AppConfig {
component?: CustomComponent<P> | false;
}
const App: React.FC<AppProps> = (props) => {
const App = React.forwardRef<HTMLElement, AppProps>((props, ref) => {
const {
prefixCls: customizePrefixCls,
children,
@@ -79,6 +79,12 @@ const App: React.FC<AppProps> = (props) => {
'When using cssVar, ensure `component` is assigned a valid React component string.',
);
devUseWarning('App')(
!ref || component !== false,
'usage',
'`ref` is not supported when `component` is `false`. Please provide a valid `component` instead.',
);
// ============================ Render ============================
const Component = component === false ? React.Fragment : component;
@@ -90,7 +96,7 @@ const App: React.FC<AppProps> = (props) => {
return (
<AppContext.Provider value={memoizedContextValue}>
<AppConfigContext.Provider value={mergedAppConfig}>
<Component {...(component === false ? undefined : rootProps)}>
<Component {...(component === false ? undefined : { ...rootProps, ref })}>
{ModalContextHolder}
{messageContextHolder}
{notificationContextHolder}
@@ -99,7 +105,7 @@ const App: React.FC<AppProps> = (props) => {
</AppConfigContext.Provider>
</AppContext.Provider>
);
};
});
if (process.env.NODE_ENV !== 'production') {
App.displayName = 'App';

View File

@@ -247,5 +247,20 @@ describe('App', () => {
'Warning: [antd: App] When using cssVar, ensure `component` is assigned a valid React component string.',
);
});
it('should warn if component is false and ref is not empty', () => {
const domRef = React.createRef<HTMLSpanElement>();
render(<App ref={domRef} component={false} />);
expect(errorSpy).toHaveBeenCalledWith(
'Warning: [antd: App] `ref` is not supported when `component` is `false`. Please provide a valid `component` instead.',
);
});
it('App should support Ref', () => {
const domRef = React.createRef<HTMLSpanElement>();
const { container } = render(<App ref={domRef} className="bamboo" component="span" />);
expect(domRef.current).toBe(container.querySelector('.bamboo'));
});
});
});

View File

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
import { Modal } from 'antd';
import ConfigProvider from '..';
import { Button, InputNumber, Select } from '../..';
import { Button, InputNumber, Select, Space } from '../..';
import { render, waitFakeTimer } from '../../../tests/utils';
import theme from '../../theme';
import type { GlobalToken } from '../../theme/internal';
@@ -113,6 +113,21 @@ describe('ConfigProvider.Theme', () => {
).toBeTruthy();
});
it('should support Addon component token', () => {
const { container } = render(
<ConfigProvider theme={{ components: { Addon: { colorText: '#0000FF', algorithm: true } } }}>
<Space.Compact>
<Space.Addon className="test-addon">Addon Content</Space.Addon>
</Space.Compact>
</ConfigProvider>,
);
const addon = container.querySelector('.test-addon')!;
expect(addon).toHaveStyle({
'--ant-color-text': '#0000FF',
});
});
it('hashed should be true if not changed', () => {
let hashId = 'hashId';

View File

@@ -121,10 +121,6 @@ const genSingleStyle: GenerateStyle<SelectToken> = (token) => {
alignItems: 'center',
},
[`&-active:not(${selectItemCls}-option-disabled)`]: {
backgroundColor: token.optionActiveBg,
},
[`&-selected:not(${selectItemCls}-option-disabled)`]: {
color: token.optionSelectedColor,
fontWeight: token.optionSelectedFontWeight,
@@ -135,6 +131,10 @@ const genSingleStyle: GenerateStyle<SelectToken> = (token) => {
},
},
[`&-active:not(${selectItemCls}-option-disabled)`]: {
backgroundColor: token.optionActiveBg,
},
'&-disabled': {
[`&${selectItemCls}-option-selected`]: {
backgroundColor: token.colorBgContainerDisabled,

View File

@@ -16066,6 +16066,28 @@ exports[`renders components/space/demo/compact-nested.tsx extend context correct
exports[`renders components/space/demo/compact-nested.tsx extend context correctly 2`] = `[]`;
exports[`renders components/space/demo/component-token.tsx extend context correctly 1`] = `
<div
class="ant-space-compact"
>
<div
class="ant-space-addon ant-space-addon-compact-item ant-space-addon-compact-first-item css-var-test-id ant-space-addon-variant-outlined"
>
Addon
</div>
<button
class="ant-btn css-var-test-id ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-compact-item ant-btn-compact-last-item"
type="button"
>
<span>
Button
</span>
</button>
</div>
`;
exports[`renders components/space/demo/component-token.tsx extend context correctly 2`] = `[]`;
exports[`renders components/space/demo/debug.tsx extend context correctly 1`] = `
<div
class="ant-space ant-space-horizontal ant-space-align-center ant-space-gap-row-small ant-space-gap-col-small css-var-test-id"

View File

@@ -4097,6 +4097,26 @@ exports[`renders components/space/demo/compact-nested.tsx correctly 1`] = `
</div>
`;
exports[`renders components/space/demo/component-token.tsx correctly 1`] = `
<div
class="ant-space-compact"
>
<div
class="ant-space-addon ant-space-addon-compact-item ant-space-addon-compact-first-item css-var-test-id ant-space-addon-variant-outlined"
>
Addon
</div>
<button
class="ant-btn css-var-test-id ant-btn-primary ant-btn-color-primary ant-btn-variant-solid ant-btn-compact-item ant-btn-compact-last-item"
type="button"
>
<span>
Button
</span>
</button>
</div>
`;
exports[`renders components/space/demo/debug.tsx correctly 1`] = `
<div
class="ant-space ant-space-horizontal ant-space-align-center ant-space-gap-row-small ant-space-gap-col-small css-var-test-id"

View File

@@ -0,0 +1,7 @@
## zh-CN
使用 `ConfigProvider` 自定义 `Space.Addon` 的主题样式。
## en-US
Use `ConfigProvider` to customize the theme of `Space.Addon`.

View File

@@ -0,0 +1,19 @@
import React from 'react';
import { Button, ConfigProvider, Space } from 'antd';
const App: React.FC = () => (
<ConfigProvider
theme={{
components: {
Addon: { colorText: 'blue', algorithm: true },
},
}}
>
<Space.Compact>
<Space.Addon>Addon</Space.Addon>
<Button type="primary">Button</Button>
</Space.Compact>
</ConfigProvider>
);
export default App;

View File

@@ -34,6 +34,7 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*37T2R6O9oi0AAA
<code src="./demo/debug.tsx" debug>Diverse Child</code>
<code src="./demo/gap-in-line.tsx" debug>Flex gap style</code>
<code src="./demo/style-class.tsx" version="6.0.0">Custom semantic dom styling</code>
<code src="./demo/component-token.tsx" debug>Customize Addon with theme</code>
## API

View File

@@ -38,6 +38,7 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*37T2R6O9oi0AAA
<code src="./demo/debug.tsx" debug>多样的 Child</code>
<code src="./demo/gap-in-line.tsx" debug>Flex gap 样式</code>
<code src="./demo/style-class.tsx" version="6.0.0">自定义语义结构的样式和类</code>
<code src="./demo/component-token.tsx" debug>自定义主题</code>
## API

View File

@@ -1,3 +1,4 @@
import { resetComponent } from '../../style';
import { genCompactItemStyle } from '../../style/compact-item';
import { genStyleHooks } from '../../theme/internal';
import type { FullToken, GenerateStyle } from '../../theme/internal';
@@ -7,11 +8,11 @@ import { genCssVar } from '../../theme/util/genStyleUtils';
// biome-ignore lint/suspicious/noEmptyInterface: ComponentToken need to be empty by default
export interface ComponentToken {}
interface SpaceToken extends FullToken<'Space'> {
interface AddonToken extends FullToken<'Space'> {
// Custom token here
}
const genSpaceAddonStyle: GenerateStyle<SpaceToken> = (token) => {
const genSpaceAddonStyle: GenerateStyle<AddonToken> = (token) => {
const {
componentCls,
borderRadius,
@@ -27,7 +28,7 @@ const genSpaceAddonStyle: GenerateStyle<SpaceToken> = (token) => {
antCls,
} = token;
const [varName, varRef] = genCssVar(antCls, 'space');
const [varName, varRef] = genCssVar(antCls, 'space-addon');
return {
[componentCls]: [
@@ -35,6 +36,7 @@ const genSpaceAddonStyle: GenerateStyle<SpaceToken> = (token) => {
// == Base ==
// ==========================================================
{
...resetComponent(token),
display: 'inline-flex',
alignItems: 'center',
gap: 0,
@@ -144,7 +146,7 @@ const genSpaceAddonStyle: GenerateStyle<SpaceToken> = (token) => {
};
// ============================== Export ==============================
export default genStyleHooks(['Space', 'Addon'], (token) => [
export default genStyleHooks('Addon', (token) => [
genSpaceAddonStyle(token),
genCompactItemStyle(token, { focus: false }),
]);

View File

@@ -49,6 +49,7 @@ import type { ComponentToken as SelectComponentToken } from '../../select/style'
import type { ComponentToken as SkeletonComponentToken } from '../../skeleton/style';
import type { ComponentToken as SliderComponentToken } from '../../slider/style';
import type { ComponentToken as SpaceComponentToken } from '../../space/style';
import type { ComponentToken as AddonComponentToken } from '../../space/style/addon';
import type { ComponentToken as SpinComponentToken } from '../../spin/style';
import type { ComponentToken as SplitterComponentToken } from '../../splitter/style';
import type { ComponentToken as StatisticComponentToken } from '../../statistic/style';
@@ -68,6 +69,7 @@ import type { ComponentToken as UploadComponentToken } from '../../upload/style'
export interface ComponentTokenMap {
Affix?: AffixComponentToken;
Addon?: AddonComponentToken;
Alert?: AlertComponentToken;
Anchor?: AnchorComponentToken;
Avatar?: AvatarComponentToken;

View File

@@ -8,9 +8,13 @@ import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect';
import { composeRef } from '@rc-component/util/lib/ref';
import { clsx } from 'clsx';
import { useMergeSemantic } from '../../_util/hooks';
import type { SemanticType } from '../../_util/hooks';
import isNonNullable from '../../_util/isNonNullable';
import { isStyleSupport } from '../../_util/styleChecker';
import type { DirectionType } from '../../config-provider';
import { ConfigContext } from '../../config-provider';
import { useComponentConfig } from '../../config-provider/context';
import useLocale from '../../locale/useLocale';
import type { TooltipProps } from '../../tooltip';
import Tooltip from '../../tooltip';
@@ -28,6 +32,41 @@ import { isEleEllipsis, isValidText } from './util';
export type BaseType = 'secondary' | 'success' | 'warning' | 'danger';
// Base typography props without generic parameter for semantic types
export interface BaseTypographyProps extends React.HTMLAttributes<HTMLElement> {
id?: string;
prefixCls?: string;
className?: string;
rootClassName?: string;
style?: React.CSSProperties;
classNames?: TypographyClassNamesType;
styles?: TypographyStylesType;
children?: React.ReactNode;
'aria-label'?: string;
direction?: DirectionType;
/** @private */
component?: keyof JSX.IntrinsicElements;
}
export type TypographySemanticClassNames = {
root?: string;
actions?: string;
action?: string;
};
export type TypographySemanticStyles = {
root?: React.CSSProperties;
actions?: React.CSSProperties;
action?: React.CSSProperties;
};
export type TypographyClassNamesType = SemanticType<
BaseTypographyProps,
TypographySemanticClassNames
>;
export type TypographyStylesType = SemanticType<BaseTypographyProps, TypographySemanticStyles>;
export interface CopyConfig {
text?: string | (() => string | Promise<string>);
onCopy?: (event?: React.MouseEvent<HTMLButtonElement>) => void;
@@ -65,9 +104,8 @@ export interface EllipsisConfig {
tooltip?: React.ReactNode | TooltipProps;
}
export interface BlockProps<
C extends keyof JSX.IntrinsicElements = keyof JSX.IntrinsicElements,
> extends TypographyProps<C> {
export interface BlockProps<C extends keyof JSX.IntrinsicElements = keyof JSX.IntrinsicElements>
extends TypographyProps<C> {
title?: string;
editable?: boolean | EditConfig;
copyable?: boolean | CopyConfig;
@@ -126,6 +164,8 @@ const Base = React.forwardRef<HTMLElement, BlockProps>((props, ref) => {
prefixCls: customizePrefixCls,
className,
style,
classNames,
styles,
type,
disabled,
children,
@@ -141,6 +181,8 @@ const Base = React.forwardRef<HTMLElement, BlockProps>((props, ref) => {
const { getPrefixCls, direction } = React.useContext(ConfigContext);
const [textLocale] = useLocale('Text');
const { classNames: contextClassNames, styles: contextStyles } = useComponentConfig('typography');
const typographyRef = React.useRef<HTMLElement>(null);
const editIconRef = React.useRef<HTMLButtonElement>(null);
@@ -149,6 +191,18 @@ const Base = React.forwardRef<HTMLElement, BlockProps>((props, ref) => {
const textProps = omit(restProps, DECORATION_PROPS);
// ============================ Semantic ============================
const [mergedClassNames, mergedStyles] = useMergeSemantic<
TypographyClassNamesType,
TypographyStylesType,
Partial<BlockProps>
>([contextClassNames, classNames], [contextStyles, styles], {
props: {
...props,
prefixCls,
},
});
// ========================== Editable ==========================
const [enableEdit, editConfig] = useMergedConfig<EditConfig>(editable);
const [editing, setEditing] = useControlledState(false, editConfig.editing);
@@ -424,7 +478,8 @@ const Base = React.forwardRef<HTMLElement, BlockProps>((props, ref) => {
return (
<span
key="operations"
className={`${prefixCls}-actions`}
className={clsx(`${prefixCls}-actions`, mergedClassNames.actions)}
style={mergedStyles.actions}
onMouseEnter={() => setIsHoveringOperations(true)}
onMouseLeave={() => setIsHoveringOperations(false)}
>
@@ -474,6 +529,8 @@ const Base = React.forwardRef<HTMLElement, BlockProps>((props, ref) => {
},
className,
)}
classNames={classNames}
styles={styles}
prefixCls={customizePrefixCls}
style={{
...style,

View File

@@ -3,53 +3,49 @@ import type { JSX } from 'react';
import { clsx } from 'clsx';
import type { DirectionType } from '../config-provider';
import { useComponentConfig } from '../config-provider/context';
import type { BaseTypographyProps } from './Base';
import { useTypographySemantic } from './hooks/useTypographySemantic';
import useStyle from './style';
export interface TypographyProps<C extends keyof JSX.IntrinsicElements>
extends React.HTMLAttributes<HTMLElement> {
id?: string;
prefixCls?: string;
extends BaseTypographyProps {
component?: C;
}
interface InternalProps {
className?: string;
rootClassName?: string;
style?: React.CSSProperties;
children?: React.ReactNode;
/** @internal */
component?: C;
'aria-label'?: string;
component?: keyof JSX.IntrinsicElements;
direction?: DirectionType;
mergedClassNames?: any;
mergedStyles?: any;
prefixCls?: string;
contextClassName?: string;
contextStyle?: React.CSSProperties;
hashId?: string;
cssVarCls?: string;
}
interface InternalTypographyProps<C extends keyof JSX.IntrinsicElements>
extends TypographyProps<C> {}
const Typography = React.forwardRef<
HTMLElement,
InternalTypographyProps<keyof JSX.IntrinsicElements>
>((props, ref) => {
const InternalTypography = React.forwardRef<HTMLElement, InternalProps>((props, ref) => {
const {
prefixCls: customizePrefixCls,
component: Component = 'article',
className,
rootClassName,
children,
direction: typographyDirection,
direction,
style,
mergedClassNames,
mergedStyles,
prefixCls,
contextClassName,
contextStyle,
hashId,
cssVarCls,
...restProps
} = props;
const {
getPrefixCls,
direction: contextDirection,
className: contextClassName,
style: contextStyle,
} = useComponentConfig('typography');
const direction = typographyDirection ?? contextDirection;
const prefixCls = getPrefixCls('typography', customizePrefixCls);
// Style
const [hashId, cssVarCls] = useStyle(prefixCls);
const componentClassName = clsx(
prefixCls,
contextClassName,
@@ -58,22 +54,74 @@ const Typography = React.forwardRef<
},
className,
rootClassName,
mergedClassNames?.root,
hashId,
cssVarCls,
);
const mergedStyle: React.CSSProperties = { ...contextStyle, ...style };
const mergedStyle: React.CSSProperties = {
...contextStyle,
...mergedStyles?.root,
...style,
};
return (
// @ts-expect-error: Expression produces a union type that is too complex to represent.
<Component className={componentClassName} style={mergedStyle} ref={ref} {...restProps}>
<Component {...restProps} className={componentClassName} style={mergedStyle} ref={ref}>
{children}
</Component>
);
});
if (process.env.NODE_ENV !== 'production') {
InternalTypography.displayName = 'InternalTypography';
}
const Typography = React.forwardRef<HTMLElement, TypographyProps<keyof JSX.IntrinsicElements>>(
(props, ref) => {
const {
prefixCls: customizePrefixCls,
className,
rootClassName,
children,
direction: typographyDirection,
style,
classNames,
styles,
...restProps
} = props;
const { mergedClassNames, mergedStyles, prefixCls, direction, contextClassName, contextStyle } =
useTypographySemantic(customizePrefixCls, classNames, styles, typographyDirection, props);
const [hashId, cssVarCls] = useStyle(prefixCls);
return (
<InternalTypography
ref={ref}
component="article"
className={className}
rootClassName={rootClassName}
direction={direction}
style={style}
mergedClassNames={mergedClassNames}
mergedStyles={mergedStyles}
prefixCls={prefixCls}
contextClassName={contextClassName}
contextStyle={contextStyle}
hashId={hashId}
cssVarCls={cssVarCls}
{...restProps}
>
{children}
</InternalTypography>
);
},
);
if (process.env.NODE_ENV !== 'production') {
Typography.displayName = 'Typography';
}
export default Typography;
export { InternalTypography };

View File

@@ -0,0 +1,3 @@
import { semanticDemoTest } from '../../../tests/shared/demoTest';
semanticDemoTest('typography');

View File

@@ -0,0 +1,109 @@
import React from 'react';
import { clsx } from 'clsx';
import Typography from '..';
import { render } from '../../../tests/utils';
import ConfigProvider from '../../config-provider';
import type { TypographyClassNamesType, TypographyStylesType } from '../Base';
describe('Typography.Semantic', () => {
it('should support classNames and styles as functions', () => {
const classNamesFn: TypographyClassNamesType = jest.fn(() => {
return { root: 'custom-typography' };
});
const stylesFn: TypographyStylesType = jest.fn(() => {
return { root: { color: '#1890ff' } };
});
const { rerender } = render(
<Typography classNames={classNamesFn} styles={stylesFn}>
Test Typography
</Typography>,
);
expect(classNamesFn).toHaveBeenCalled();
expect(stylesFn).toHaveBeenCalled();
const rootElement = document.querySelector<HTMLElement>('.ant-typography');
expect(rootElement).toHaveClass('custom-typography');
expect(rootElement).toHaveStyle({ color: 'rgb(24, 144, 255)' });
rerender(
<Typography classNames={classNamesFn} styles={stylesFn}>
Updated Typography
</Typography>,
);
const updatedRootElement = document.querySelector<HTMLElement>('.ant-typography');
expect(updatedRootElement).toHaveClass('custom-typography');
expect(updatedRootElement).toHaveStyle({ color: 'rgb(24, 144, 255)' });
});
it('should merge context and component classNames and styles', () => {
const contextClassNames: TypographyClassNamesType = {
root: 'context-root',
actions: 'context-actions',
};
const contextStyles: TypographyStylesType = {
root: { padding: '10px' },
actions: { margin: '5px' },
};
const componentClassNames: TypographyClassNamesType = {
root: 'component-root',
};
const componentStyles: TypographyStylesType = {
root: { fontSize: '14px' },
};
render(
<ConfigProvider>
<ConfigProvider
typography={
{
className: undefined,
style: undefined,
classNames: contextClassNames,
styles: contextStyles,
} as any
}
>
<Typography.Paragraph classNames={componentClassNames} styles={componentStyles} copyable>
Test Typography
</Typography.Paragraph>
</ConfigProvider>
</ConfigProvider>,
);
const rootElement = document.querySelector<HTMLElement>('.ant-typography');
const actionsElement = document.querySelector<HTMLElement>('.ant-typography-actions');
expect(rootElement).toHaveClass(clsx(contextClassNames.root, componentClassNames.root));
expect(actionsElement).toHaveClass(contextClassNames.actions!);
expect(rootElement).toHaveStyle({
padding: contextStyles.root?.padding,
fontSize: componentStyles.root?.fontSize,
});
expect(actionsElement).toHaveStyle({ margin: contextStyles.actions?.margin });
});
it('should support semantic className and style on actions', () => {
render(
<Typography.Paragraph
classNames={{ actions: 'custom-actions' }}
styles={{ actions: { backgroundColor: '#f0f0f0' } }}
copyable
>
Test Typography with Action
</Typography.Paragraph>,
);
const rootElement = document.querySelector<HTMLElement>('.ant-typography');
expect(rootElement).toBeInTheDocument();
const actionsElement = document.querySelector<HTMLElement>('.ant-typography-actions');
expect(actionsElement).toHaveClass('custom-actions');
expect(actionsElement).toHaveStyle({ backgroundColor: 'rgb(240, 240, 240)' });
});
});

View File

@@ -0,0 +1,39 @@
import React from 'react';
import { Typography } from 'antd';
import useLocale from '../../../.dumi/hooks/useLocale';
import SemanticPreview from '../../../.dumi/theme/common/SemanticPreview';
const locales = {
cn: {
root: '根元素,包含排版基础样式、布局和定位',
actions: '操作区域元素,包含复制、编辑、展开/收起等操作按钮的布局和间距样式',
},
en: {
root: 'Root element with base typography styles, layout, and positioning',
actions:
'Actions element with layout and spacing styles for copy, edit, expand/collapse buttons',
},
};
const App: React.FC = () => {
const [locale] = useLocale(locales);
return (
<SemanticPreview
componentName="Typography"
semantics={[
{ name: 'root', desc: locale.root, version: '6.0.0' },
{ name: 'actions', desc: locale.actions, version: '6.0.0' },
]}
>
<Typography.Paragraph copyable editable ellipsis={{ rows: 2, expandable: true }}>
Ant Design is a design language for background applications, refined by Ant UED Team. It
aims to uniform the user interface specs for internal background projects, lower the
unnecessary cost of design differences and implementation and liberate the resources of
design and front-end development.
</Typography.Paragraph>
</SemanticPreview>
);
};
export default App;

View File

@@ -0,0 +1,60 @@
import type { DirectionType } from '../../config-provider';
import { useComponentConfig } from '../../config-provider/context';
import { useMergeSemantic } from '../../_util/hooks';
import type { BaseTypographyProps, TypographyClassNamesType, TypographyStylesType } from '../Base';
interface UseTypographySemanticResult {
mergedClassNames: ReturnType<
typeof useMergeSemantic<TypographyClassNamesType, TypographyStylesType, BaseTypographyProps>
>[0];
mergedStyles: ReturnType<
typeof useMergeSemantic<TypographyClassNamesType, TypographyStylesType, BaseTypographyProps>
>[1];
prefixCls: string;
direction: DirectionType | undefined;
contextClassName: string | undefined;
contextStyle: React.CSSProperties | undefined;
}
export const useTypographySemantic = (
customizePrefixCls?: string,
classNames?: TypographyClassNamesType | undefined,
styles?: TypographyStylesType | undefined,
typographyDirection?: DirectionType,
props?: any,
): UseTypographySemanticResult => {
const {
getPrefixCls,
direction: contextDirection,
className: contextClassName,
style: contextStyle,
classNames: contextClassNames,
styles: contextStyles,
} = useComponentConfig('typography');
const direction = typographyDirection ?? contextDirection;
const prefixCls = getPrefixCls('typography', customizePrefixCls);
const mergedProps: BaseTypographyProps = {
...props,
prefixCls,
direction,
};
const [mergedClassNames, mergedStyles] = useMergeSemantic<
TypographyClassNamesType,
TypographyStylesType,
BaseTypographyProps
>([contextClassNames, classNames], [contextStyles, styles], {
props: mergedProps,
});
return {
mergedClassNames,
mergedStyles,
prefixCls,
direction,
contextClassName,
contextStyle,
};
};

View File

@@ -4,14 +4,16 @@ import Text from './Text';
import Title from './Title';
import OriginTypography from './Typography';
export type TypographyProps = typeof OriginTypography & {
export type { TypographyProps } from './Typography';
type CompoundedComponent = typeof OriginTypography & {
Text: typeof Text;
Link: typeof Link;
Title: typeof Title;
Paragraph: typeof Paragraph;
};
const Typography = OriginTypography as TypographyProps;
const Typography = OriginTypography as CompoundedComponent;
Typography.Text = Text;
Typography.Link = Link;
Typography.Title = Title;