Skip to content

fix(Wizard - next): Show parent name instead of child step name as first label when Wizard is in collapsed mode #8663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2023
Merged

fix(Wizard - next): Show parent name instead of child step name as first label when Wizard is in collapsed mode #8663

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions packages/react-core/src/next/components/Wizard/WizardToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,9 @@ export const WizardToggle = ({
'aria-label': ariaLabel = 'Wizard toggle'
}: WizardToggleProps) => {
const isActiveSubStep = isWizardSubStep(activeStep);
const parentStep = isActiveSubStep && steps.find(step => step.id === activeStep.parentId);
const nonSubSteps = steps.filter(step => !isWizardSubStep(step));
const wizardToggleIndex =
nonSubSteps.indexOf(
isWizardSubStep(activeStep) ? steps.find(step => step.id === activeStep.parentId) : activeStep
) + 1;
const wizardToggleIndex = nonSubSteps.indexOf(parentStep || activeStep) + 1;

const handleKeyClicks = React.useCallback(
(event: KeyboardEvent): void => {
Expand Down Expand Up @@ -91,7 +89,8 @@ export const WizardToggle = ({
>
<span className={css(styles.wizardToggleList)}>
<span className={css(styles.wizardToggleListItem)}>
<span className={css(styles.wizardToggleNum)}>{wizardToggleIndex}</span> {activeStep?.name}
<span className={css(styles.wizardToggleNum)}>{wizardToggleIndex}</span>{' '}
{parentStep?.name || activeStep?.name}
{isActiveSubStep && <AngleRightIcon className={css(styles.wizardToggleSeparator)} aria-hidden="true" />}
</span>
{isActiveSubStep && <span className={css(styles.wizardToggleListItem)}>{activeStep?.name}</span>}
Expand Down