From a39544800353a416304d6e369d340da174351109 Mon Sep 17 00:00:00 2001 From: Vadim Kalushko Date: Thu, 30 Apr 2026 10:09:20 +0300 Subject: [PATCH 1/3] =?UTF-8?q?feat(steps):=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20deprecated=20Badge=20[DS-10790]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/long-bats-attend.md | 8 ++++++++ packages/steps/package.json | 1 - packages/steps/src/Component.test.tsx | 20 +++++++++++++++---- packages/steps/src/Component.tsx | 6 +++--- .../components/step-indicator/Component.tsx | 8 ++------ .../steps/src/components/step/Component.tsx | 3 +-- packages/steps/src/types/common-props.ts | 2 +- packages/steps/tsconfig.build.json | 3 --- packages/steps/tsconfig.json | 3 --- 9 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 .changeset/long-bats-attend.md diff --git a/.changeset/long-bats-attend.md b/.changeset/long-bats-attend.md new file mode 100644 index 0000000000..9b668a4fc7 --- /dev/null +++ b/.changeset/long-bats-attend.md @@ -0,0 +1,8 @@ +--- +'@alfalab/core-components-steps': major +'@alfalab/core-components': major +--- + +##### Steps + +- Убрали поддержку deprecated `Badge` в `Steps` и полностью перевели индикаторы шага на `StatusBadge`. diff --git a/packages/steps/package.json b/packages/steps/package.json index 87b2e4a92b..6f8310270e 100644 --- a/packages/steps/package.json +++ b/packages/steps/package.json @@ -10,7 +10,6 @@ "main": "index.js", "module": "./esm/index.js", "dependencies": { - "@alfalab/core-components-badge": "^7.0.2", "@alfalab/core-components-shared": "^2.1.1", "@alfalab/core-components-status-badge": "^3.0.2", "@alfalab/hooks": "^1.13.1", diff --git a/packages/steps/src/Component.test.tsx b/packages/steps/src/Component.test.tsx index bc3947e069..233960e7b4 100644 --- a/packages/steps/src/Component.test.tsx +++ b/packages/steps/src/Component.test.tsx @@ -63,7 +63,7 @@ describe('Steps', () => { }); describe('Render tests', () => { - test('should render with default active step', () => { + it('should render with default active step', () => { const defaultActiveStep = 2; const { container } = render( @@ -79,7 +79,7 @@ describe('Steps', () => { expect(steps[defaultActiveStep - 1]).toHaveClass('selected'); }); - test('should render ordered steps', () => { + it('should render ordered steps', () => { const { queryAllByText } = render(
Подготовка
@@ -93,7 +93,7 @@ describe('Steps', () => { expect(steps[1].innerHTML).toBe('2'); }); - test('should render unordered steps', () => { + it('should render unordered steps', () => { const { container } = render(
Шаг 1
@@ -107,7 +107,19 @@ describe('Steps', () => { expect(unorderedSteps.length).toBe(3); }); - test('should unmount without errors', () => { + it('should render custom status badge indicator', () => { + const { queryByText, getByText } = render( + (stepNumber === 1 ? { view: 'negative-alert' } : null)}> +
Первый шаг
+
Второй шаг
+ , + ); + + expect(queryByText(/^1$/)).not.toBeInTheDocument(); + expect(getByText(/^2$/)).toBeInTheDocument(); + }); + + it('should unmount without errors', () => { const { unmount } = render(
Шаг 1
diff --git a/packages/steps/src/Component.tsx b/packages/steps/src/Component.tsx index 7a23d72941..6ff2b36963 100644 --- a/packages/steps/src/Component.tsx +++ b/packages/steps/src/Component.tsx @@ -7,7 +7,7 @@ import { type CommonProps } from './types/common-props'; import styles from './index.module.css'; -export type StepsProps = { +export interface StepsProps extends CommonProps { /** * Дополнительный класс */ @@ -76,7 +76,7 @@ export type StepsProps = { /** * Кастомный метод для установки кастомного индикатора шага * @param stepNumber - номер шага - * @return Объект StepIndicatorProps { className, content, iconColor } или null + * @return Объект StepIndicatorProps { view, className, colors } или null */ checkIsStepCustom?: (stepNumber: number) => StepIndicatorProps | null; @@ -85,7 +85,7 @@ export type StepsProps = { * @param stepNumber - номер активного шага */ onChange?: (stepNumber: number) => void; -} & CommonProps; +} export const Steps: React.FC = ({ className, diff --git a/packages/steps/src/components/step-indicator/Component.tsx b/packages/steps/src/components/step-indicator/Component.tsx index 871e0dd6af..8ceaeb5557 100644 --- a/packages/steps/src/components/step-indicator/Component.tsx +++ b/packages/steps/src/components/step-indicator/Component.tsx @@ -1,17 +1,13 @@ import React from 'react'; import cn from 'classnames'; -import { type BadgeProps } from '@alfalab/core-components-badge'; import { StatusBadge, type StatusBadgeProps } from '@alfalab/core-components-status-badge'; import styles from './index.module.css'; -/** @description В `@alfalab/core-components@51.0.0` тип будет изменен на Pick */ -export type StepIndicatorProps = Pick; +export type StepIndicatorProps = Pick; -type StatusBadgeIndicatorProps = Pick; - -export const StepIndicator: React.FC = ({ view, className, colors }) => ( +export const StepIndicator: React.FC = ({ view, className, colors }) => ( = ({ const getStepIndicator = () => { if (customStepIndicator) { - return ; + return ; } if (isCriticalError) { return ; diff --git a/packages/steps/src/types/common-props.ts b/packages/steps/src/types/common-props.ts index 5ac7f282a4..c167a20fa4 100644 --- a/packages/steps/src/types/common-props.ts +++ b/packages/steps/src/types/common-props.ts @@ -1,7 +1,7 @@ import { type ReactNode } from 'react'; /** Обобщенный набор типов который подходит для Steps, но также прокинут в дочерний Step */ -export type CommonProps = { +export interface CommonProps { /** * Идентификатор для систем автоматизированного тестирования */ diff --git a/packages/steps/tsconfig.build.json b/packages/steps/tsconfig.build.json index c4682710ca..2def86d9e8 100644 --- a/packages/steps/tsconfig.build.json +++ b/packages/steps/tsconfig.build.json @@ -7,8 +7,6 @@ "rootDir": "src", "outDir": "ts-dist", "paths": { - "@alfalab/core-components-badge": ["../badge/src"], - "@alfalab/core-components-badge/*": ["../badge/src/*"], "@alfalab/core-components-shared": ["../shared/src"], "@alfalab/core-components-shared/*": ["../shared/src/*"], "@alfalab/core-components-status-badge": ["../status-badge/src"], @@ -18,7 +16,6 @@ } }, "references": [ - { "path": "../badge/tsconfig.build.json" }, { "path": "../shared/tsconfig.build.json" }, { "path": "../status-badge/tsconfig.build.json" } ] diff --git a/packages/steps/tsconfig.json b/packages/steps/tsconfig.json index 50baf0fa47..33c7f3a473 100644 --- a/packages/steps/tsconfig.json +++ b/packages/steps/tsconfig.json @@ -6,8 +6,6 @@ "rootDir": "src", "outDir": "no-dist", "paths": { - "@alfalab/core-components-badge": ["../badge/src"], - "@alfalab/core-components-badge/*": ["../badge/src/*"], "@alfalab/core-components-screenshot-utils": ["../screenshot-utils/src"], "@alfalab/core-components-screenshot-utils/*": ["../screenshot-utils/src/*"], "@alfalab/core-components-shared": ["../shared/src"], @@ -21,7 +19,6 @@ } }, "references": [ - { "path": "../badge/tsconfig.build.json" }, { "path": "../screenshot-utils/tsconfig.build.json" }, { "path": "../shared/tsconfig.build.json" }, { "path": "../status-badge/tsconfig.build.json" }, From 964e2856ddfd7f443fc4baaa41878a44531fad79 Mon Sep 17 00:00:00 2001 From: Vadim Kalushko Date: Thu, 30 Apr 2026 10:14:01 +0300 Subject: [PATCH 2/3] fix yarn.lock --- yarn.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index d141741be8..0c2b25af6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1846,7 +1846,6 @@ __metadata: version: 0.0.0-use.local resolution: "@alfalab/core-components-steps@workspace:packages/steps" dependencies: - "@alfalab/core-components-badge": "npm:^7.0.2" "@alfalab/core-components-shared": "npm:^2.1.1" "@alfalab/core-components-status-badge": "npm:^3.0.2" "@alfalab/hooks": "npm:^1.13.1" From b955b3ccbf077cbb9abef2afb5dc922598a19894 Mon Sep 17 00:00:00 2001 From: Vadim Kalushko Date: Thu, 30 Apr 2026 10:31:54 +0300 Subject: [PATCH 3/3] fix eslint --- packages/steps/src/Component.test.tsx | 6 +++++- packages/steps/src/types/common-props.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/steps/src/Component.test.tsx b/packages/steps/src/Component.test.tsx index 233960e7b4..d73b1b570f 100644 --- a/packages/steps/src/Component.test.tsx +++ b/packages/steps/src/Component.test.tsx @@ -109,7 +109,11 @@ describe('Steps', () => { it('should render custom status badge indicator', () => { const { queryByText, getByText } = render( - (stepNumber === 1 ? { view: 'negative-alert' } : null)}> + + stepNumber === 1 ? { view: 'negative-alert' } : null + } + >
Первый шаг
Второй шаг
, diff --git a/packages/steps/src/types/common-props.ts b/packages/steps/src/types/common-props.ts index c167a20fa4..e3f29ba569 100644 --- a/packages/steps/src/types/common-props.ts +++ b/packages/steps/src/types/common-props.ts @@ -45,4 +45,4 @@ export interface CommonProps { * Цвет тире выполненного шага */ completedDashColor?: string; -}; +}