fix: optimized code volume

ant-design · May 9, 2024 · 33f84f4 · 33f84f4
1 parent e4da3e1
commit 33f84f4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/components/progress/progress.tsx b/components/progress/progress.tsx
@@ -120,15 +120,15 @@ const Progress = React.forwardRef<HTMLDivElement, ProgressProps>((props, ref) =>
  const prefixCls = getPrefixCls('progress', customizePrefixCls);
  const [wrapCSSVar, hashId, cssVarCls] = useStyle(prefixCls);
 
+ const isLineType = type === 'line';
+ const isPureLineType = isLineType && !steps;
  const progressInfo = React.useMemo<React.ReactNode>(() => {
  if (!showInfo) {
  return null;
  }
  const successPercent = getSuccessPercent(props);
  let text: React.ReactNode;
  const textFormatter = format || ((number) => `${number}%`);
- const isLineType = type === 'line';
- const isPureLineType = isLineType && !steps;
  const isBrightInnerColor = isLineType && strokeColorIsBright && infoPosition === 'inner';
  if (
  infoPosition === 'inner' ||
@@ -220,9 +220,9 @@ const Progress = React.forwardRef<HTMLDivElement, ProgressProps>((props, ref) =>
  {
  [`${prefixCls}-${(type === 'dashboard' && 'circle') || type}`]: type !== 'line',
  [`${prefixCls}-inline-circle`]: type === 'circle' && getSize(size, 'circle')[0] <= 20,
- [`${prefixCls}-line`]: !steps && type === 'line',
- [`${prefixCls}-line-align-${infoAlign}`]: !steps && type === 'line',
- [`${prefixCls}-line-position-${infoPosition}`]: !steps && type === 'line',
+ [`${prefixCls}-line`]: isPureLineType,
+ [`${prefixCls}-line-align-${infoAlign}`]: isPureLineType,
+ [`${prefixCls}-line-position-${infoPosition}`]: isPureLineType,
  [`${prefixCls}-steps`]: steps,
  [`${prefixCls}-show-info`]: showInfo,
  [`${prefixCls}-${size}`]: typeof size === 'string',

diff --git a/components/progress/style/index.ts b/components/progress/style/index.ts
@@ -142,6 +142,14 @@ const genBaseStyle: GenerateStyle<ProgressToken> = (token) => {
  },
  [`&${progressCls}-bg-inner`]: {
  minWidth: 'max-content',
+ [`${progressCls}-text-inner`]: {
+ color: token.colorWhite,
+ position: 'relative',
+ zIndex: 1,
+ [`&${progressCls}-text-bright`]: {
+ color: 'rgba(0, 0, 0, 0.45)',
+ },
+ },
  },
  },
 
@@ -173,15 +181,6 @@ const genBaseStyle: GenerateStyle<ProgressToken> = (token) => {
  marginInlineStart: 0,
  marginInlineEnd: token.marginXS,
  },
- [`&${progressCls}-text-inner`]: {
- color: token.colorWhite,
- width: '100%',
- position: 'relative',
- zIndex: 1,
- [`&${progressCls}-text-bright`]: {
- color: 'rgba(0, 0, 0, 0.45)',
- },
- },
  },
 
  [`${progressCls}-text-inner`]: {
@@ -243,14 +242,6 @@ const genBaseStyle: GenerateStyle<ProgressToken> = (token) => {
  },
  [`${progressCls}-text`]: {
  color: token.colorSuccess,
- [`&${progressCls}-text-inner`]: {
- color: token.colorWhite,
- position: 'relative',
- zIndex: 1,
- [`&${progressCls}-text-bright`]: {
- color: 'rgba(0, 0, 0, 0.45)',
- },
- },
  },
  },